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

diff --git a/src/Layout.cpp b/src/Layout.cpp
index 4d0a468d2b..79694fe0be 100644
--- a/src/Layout.cpp
+++ b/src/Layout.cpp
@@ -375,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
@@ -420,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;