#include "ParagraphParameters.h"
#include "buffer.h"
-#include "BufferView.h"
#include "gettext.h"
#include "lyxlayout.h"
#include "lyxlex.h"
#include <sstream>
-using lyx::support::rtrim;
+namespace lyx {
+
+using support::rtrim;
using std::istringstream;
using std::ostream;
using std::ostringstream;
using std::string;
-// anonym namespace
-namespace {
-int findToken(char const * const str[], string const & search_token)
+
+static int findToken(char const * const str[], string const & search_token)
{
return search_token == "default" ?
0 :
- lyx::support::findToken(str, search_token);
-}
-
+ support::findToken(str, search_token);
}
}
-ParagraphParameters::depth_type ParagraphParameters::depth() const
+depth_type ParagraphParameters::depth() const
{
return depth_;
}
}
-string const & ParagraphParameters::labelString() const
+docstring const & ParagraphParameters::labelString() const
{
return labelstring_;
}
-void ParagraphParameters::labelString(string const & ls)
+void ParagraphParameters::labelString(docstring const & ls)
{
labelstring_ = ls;
}
-string const & ParagraphParameters::labelWidthString() const
+docstring const & ParagraphParameters::labelWidthString() const
{
return labelwidthstring_;
}
-void ParagraphParameters::labelWidthString(string const & lws)
+void ParagraphParameters::labelWidthString(docstring const & lws)
{
labelwidthstring_ = lws;
}
align(LyXAlignment(1 << tmpret));
} else if (token == "\\labelwidthstring") {
lex.eatLine();
- labelWidthString(lex.getString());
+ labelWidthString(lex.getDocString());
} else {
lex.pushToken(token);
break;
// The labelwidth string used in lists.
if (!labelWidthString().empty())
os << "\\labelwidthstring "
- << labelWidthString() << '\n';
+ << to_utf8(labelWidthString()) << '\n';
// Start of appendix?
if (startOfAppendix())
&& ps1.leftindent == ps2.leftindent;
}
*/
+
+
+} // namespace lyx