X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxlayout.C;h=b81ea994251c7bcc7da7ffffd2770320830d31bd;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=f0a0e339105435683bbb5165f87b65f96d8afd03;hpb=cf4293824f406c03e940bed6bf7274b57629a857;p=lyx.git

diff --git a/src/lyxlayout.C b/src/lyxlayout.C
index f0a0e33910..b81ea99425 100644
--- a/src/lyxlayout.C
+++ b/src/lyxlayout.C
@@ -19,8 +19,11 @@
 
 #include "support/lstrings.h"
 
-using lyx::support::subst;
-using lyx::support::trim;
+
+namespace lyx {
+
+using support::subst;
+using support::trim;
 
 using std::endl;
 using std::string;
@@ -357,7 +360,7 @@ bool LyXLayout::read(LyXLex & lexrc, LyXTextClass const & tclass)
 			break;
 
 		case LT_PREAMBLE:
-			preamble_ = lexrc.getLongString("EndPreamble");
+			preamble_ = from_utf8(lexrc.getLongString("EndPreamble"));
 			break;
 
 		case LT_LABELTYPE:
@@ -448,22 +451,22 @@ bool LyXLayout::read(LyXLex & lexrc, LyXTextClass const & tclass)
 
 		case LT_LABELSTRING:	// label string definition
 			if (lexrc.next())
-				labelstring_ = trim(lexrc.getString());
+				labelstring_ = trim(lexrc.getDocString());
 			break;
 
 		case LT_ENDLABELSTRING:	// endlabel string definition
 			if (lexrc.next())
-				endlabelstring_ = trim(lexrc.getString());
+				endlabelstring_ = trim(lexrc.getDocString());
 			break;
 
 		case LT_LABELSTRING_APPENDIX: // label string appendix definition
 			if (lexrc.next())
-				labelstring_appendix_ = trim(lexrc.getString());
+				labelstring_appendix_ = trim(lexrc.getDocString());
 			break;
 
 		case LT_LABELCOUNTER: // name of counter to use
 			if (lexrc.next())
-				counter = trim(lexrc.getString());
+				counter = lyx::from_ascii(trim(lexrc.getString()));
 			break;
 
 		case LT_FREE_SPACING:	// Allow for free spacing.
@@ -816,3 +819,6 @@ string const & LyXLayout::depends_on() const
 {
 	return depends_on_;
 }
+
+
+} // namespace lyx