#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;
break;
case LT_PREAMBLE:
- preamble_ = lexrc.getLongString("EndPreamble");
+ preamble_ = from_utf8(lexrc.getLongString("EndPreamble"));
break;
case LT_LABELTYPE:
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.
{
return depends_on_;
}
+
+
+} // namespace lyx