X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLayout.cpp;h=79694fe0be2ca0f28d42f44f8829db79aca494df;hb=c1b155fbe87ce9bacab931edfcaaf21a447b6430;hp=6ea0ee5dc2c8b4e94e07f14204e834ca16538d8b;hpb=6add1994c75c0f3e0db50ab6c94ac3b73deb1561;p=lyx.git

diff --git a/src/Layout.cpp b/src/Layout.cpp
index 6ea0ee5dc2..79694fe0be 100644
--- a/src/Layout.cpp
+++ b/src/Layout.cpp
@@ -115,7 +115,7 @@ Layout::Layout ()
 	labelbottomsep = 0.0;
 	parsep = 0;
 	align = LYX_ALIGN_BLOCK;
-	alignpossible = LYX_ALIGN_BLOCK;
+	alignpossible = LYX_ALIGN_NONE | LYX_ALIGN_LAYOUT;
 	labeltype = LABEL_NO_LABEL;
 	endlabeltype = END_LABEL_NO_LABEL;
 	// Should or should not. That is the question.
@@ -212,16 +212,16 @@ bool Layout::read(Lexer & lexrc, TextClass const & tclass)
 
 		case LT_COPYSTYLE:     // initialize with a known style
 			if (lexrc.next()) {
-				string const style = subst(lexrc.getString(),
+				docstring const style = subst(lexrc.getDocString(),
 								'_', ' ');
 
 				if (tclass.hasLayout(style)) {
-					string const tmpname = name_;
+					docstring const tmpname = name_;
 					this->operator=(*tclass[style]);
 					name_ = tmpname;
 				} else {
 					lyxerr << "Cannot copy unknown style `"
-					       << style << "'\n"
+					       << to_utf8(style) << "'\n"
 					       << "All layouts so far:"
 					       << endl;
 					TextClass::const_iterator it =
@@ -229,7 +229,7 @@ bool Layout::read(Lexer & lexrc, TextClass const & tclass)
 					TextClass::const_iterator end =
 						tclass.end();
 					for (; it != end; ++it) {
-						lyxerr << (*it)->name()
+						lyxerr << to_utf8((*it)->name())
 						       << endl;
 					}
 
@@ -241,16 +241,18 @@ bool Layout::read(Lexer & lexrc, TextClass const & tclass)
 
 		case LT_OBSOLETEDBY:     // replace with a known style
 			if (lexrc.next()) {
-				string const style = lexrc.getString();
+				docstring const style = 
+					subst(lexrc.getDocString(), '_', ' ');
 
 				if (tclass.hasLayout(style)) {
-					string const tmpname = name_;
+					docstring const tmpname = name_;
 					this->operator=(*tclass[style]);
 					name_ = tmpname;
 					if (obsoleted_by().empty())
 						obsoleted_by_ = style;
 				} else {
-					lyxerr << "Cannot replace with unknown style `" << style << '\'' << endl;
+					lyxerr << "Cannot replace with unknown style `" 
+						<< to_utf8(style) << '\'' << endl;
 
 					//lexrc.printError("Cannot replace with"
 					//		 " unknown style "
@@ -261,7 +263,7 @@ bool Layout::read(Lexer & lexrc, TextClass const & tclass)
 
 		case LT_DEPENDSON:
 			if (lexrc.next())
-				depends_on_ = lexrc.getString();
+			depends_on_ = subst(lexrc.getDocString(), '_', ' ');
 			break;
 
 		case LT_MARGIN:		// margin style definition.
@@ -373,22 +375,22 @@ bool Layout::read(Lexer & lexrc, TextClass const & tclass)
 
 		case LT_LEFTMARGIN:	// left margin type
 			if (lexrc.next())
-				leftmargin = lexrc.getString();
+				leftmargin = lexrc.getDocString();
 			break;
 
 		case LT_RIGHTMARGIN:	// right margin type
 			if (lexrc.next())
-				rightmargin = lexrc.getString();
+				rightmargin = lexrc.getDocString();
 			break;
 
 		case LT_LABELINDENT:	// label indenting flag
 			if (lexrc.next())
-				labelindent = lexrc.getString();
+				labelindent = lexrc.getDocString();
 			break;
 
 		case LT_PARINDENT:	// paragraph indent. flag
 			if (lexrc.next())
-				parindent = lexrc.getString();
+				parindent = lexrc.getDocString();
 			break;
 
 		case LT_PARSKIP:	// paragraph skip size
@@ -418,7 +420,7 @@ bool Layout::read(Lexer & lexrc, TextClass const & tclass)
 
 		case LT_LABELSEP:	// label separator
 			if (lexrc.next()) {
-				labelsep = subst(lexrc.getString(), 'x', ' ');
+				labelsep = from_utf8(subst(lexrc.getString(), 'x', ' '));
 			}
 			break;
 
@@ -550,7 +552,7 @@ void Layout::readAlignPossible(Lexer & lexrc)
 	};
 
 	lexrc.pushTable(alignTags, AT_LAYOUT);
-	alignpossible = LYX_ALIGN_NONE;
+	alignpossible = LYX_ALIGN_NONE | LYX_ALIGN_LAYOUT;
 	int lineno = lexrc.getLineNo();
 	do {
 		int le = lexrc.lex();
@@ -797,28 +799,40 @@ void Layout::readSpacing(Lexer & lexrc)
 }
 
 
-string const & Layout::name() const
+docstring const & Layout::name() const
 {
 	return name_;
 }
 
 
-void Layout::setName(string const & n)
+void Layout::setName(docstring const & n)
 {
 	name_ = n;
 }
 
 
-string const & Layout::obsoleted_by() const
+docstring const & Layout::obsoleted_by() const
 {
 	return obsoleted_by_;
 }
 
 
-string const & Layout::depends_on() const
+docstring const & Layout::depends_on() const
 {
 	return depends_on_;
 }
 
 
+Layout * Layout::forCaption()
+{
+	Layout * lay = new Layout();
+	lay->name_ = from_ascii("Caption");
+	lay->latexname_ = "caption";
+	lay->latextype = LATEX_COMMAND;
+	lay->optionalargs = 1;
+	return lay;
+}
+
+
+
 } // namespace lyx