Restore the version number position on the splash screen

[lyx.git] / src / lyxlayout.C

diff --git a/src/lyxlayout.C b/src/lyxlayout.C
index 96c6befd7318671c8c61706cc33543cc34a88202..b5f7223c6e48aaec86550fb5fdaff44f0f7ade29 100644 (file)
--- a/src/lyxlayout.C
+++ b/src/lyxlayout.C
@@ -360,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:
@@ -450,18 +450,20 @@ bool LyXLayout::read(LyXLex & lexrc, LyXTextClass const & tclass)
                        break;
 
                case LT_LABELSTRING:    // label string definition
-                       if (lexrc.next())
-                               labelstring_ = lyx::from_ascii(trim(lexrc.getString()));
+                       if (lexrc.next()) {
+                               labelstring_ = trim(lexrc.getDocString());
+                               labelstring_appendix_ = labelstring_;
+                       }
                        break;
 
                case LT_ENDLABELSTRING: // endlabel string definition
                        if (lexrc.next())
-                               endlabelstring_ = lyx::from_ascii(trim(lexrc.getString()));
+                               endlabelstring_ = trim(lexrc.getDocString());
                        break;
 
                case LT_LABELSTRING_APPENDIX: // label string appendix definition
                        if (lexrc.next())
-                               labelstring_appendix_ = lyx::from_ascii(trim(lexrc.getString()));
+                               labelstring_appendix_ = trim(lexrc.getDocString());
                        break;
 
                case LT_LABELCOUNTER: // name of counter to use
@@ -486,8 +488,6 @@ bool LyXLayout::read(LyXLex & lexrc, LyXTextClass const & tclass)
        }
        lexrc.popTable();
 
-       if (labelstring_appendix_.empty())
-               labelstring_appendix_ = labelstring_;
        return error;
 }