X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxlayout.C;h=b81ea994251c7bcc7da7ffffd2770320830d31bd;hb=80328d2053869dc089c23c25adbed4167d7bf0b1;hp=96c6befd7318671c8c61706cc33543cc34a88202;hpb=6c300f72a217722652dc27db9108e1050028979c;p=lyx.git diff --git a/src/lyxlayout.C b/src/lyxlayout.C index 96c6befd73..b81ea99425 100644 --- 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: @@ -451,17 +451,17 @@ bool LyXLayout::read(LyXLex & lexrc, LyXTextClass const & tclass) case LT_LABELSTRING: // label string definition if (lexrc.next()) - labelstring_ = lyx::from_ascii(trim(lexrc.getString())); + labelstring_ = trim(lexrc.getDocString()); 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