* src/tabular.[Ch]: simplify plaintext methods, because there

[lyx.git] / src / sgml.C

diff --git a/src/sgml.C b/src/sgml.C
index 526b51e64b421c5958e425ccb047ca4a0849a424..a5aa601c8f208c59207ea96d09368692598672b9 100644 (file)
--- a/src/sgml.C
+++ b/src/sgml.C
@@ -105,14 +105,15 @@ docstring sgml::escapeString(docstring const & raw)
 }
 
 
-docstring const sgml::uniqueID(string const label)
+docstring const sgml::uniqueID(docstring const label)
 {
        static unsigned int seed = 1000;
-       return from_ascii(label + convert<string>(++seed));
+       return label + convert<docstring>(++seed);
 }
 
 
-string sgml::cleanID(Buffer const & buf, OutputParams const & runparams, std::string const & orig)
+docstring sgml::cleanID(Buffer const & buf, OutputParams const & runparams,
+       docstring const & orig)
 {
        // The standard DocBook SGML declaration only allows letters,
        // digits, '-' and '.' in a name.
@@ -123,17 +124,18 @@ string sgml::cleanID(Buffer const & buf, OutputParams const & runparams, std::st
        // If you know what you are doing, you can set allowed==""
        // to disable this mangling.
        LyXTextClass const & tclass = buf.params().getLyXTextClass();
-       string const allowed = runparams.flavor == OutputParams::XML? ".-_:":tclass.options();
+       string const allowed =
+               runparams.flavor == OutputParams::XML? ".-_:":tclass.options();
 
        if (allowed.empty())
                return orig;
 
-       string::const_iterator it  = orig.begin();
-       string::const_iterator end = orig.end();
+       docstring::const_iterator it  = orig.begin();
+       docstring::const_iterator end = orig.end();
 
-       string content;
+       docstring content;
 
-       typedef map<string, string> MangledMap;
+       typedef map<docstring, docstring> MangledMap;
        static MangledMap mangledNames;
        static int mangleID = 1;
 
@@ -148,7 +150,8 @@ string sgml::cleanID(Buffer const & buf, OutputParams const & runparams, std::st
        bool mangle = false;
        for (; it != end; ++it) {
                char c = *it;
-               if (isalpha(c) || isdigit(c) || c == '-' || c == '.' || allowed.find(c) < allowed.size())
+               if (isalpha(c) || isdigit(c) || c == '-' || c == '.'
+                     || allowed.find(c) < allowed.size())
                        content += c;
                else if (c == '_' || c == ' ') {
                        mangle = true;
@@ -163,7 +166,7 @@ string sgml::cleanID(Buffer const & buf, OutputParams const & runparams, std::st
                }
        }
        if (mangle) {
-               content += "-" + convert<string>(mangleID++);
+               content += "-" + convert<docstring>(mangleID++);
        }
        else if (isdigit(content[content.size() - 1])) {
                content += ".";
@@ -183,9 +186,9 @@ void sgml::openTag(odocstream & os, string const & name, string const & attribut
        param = subst(param, ">", "\"");
 
        if (!name.empty() && name != "!-- --") {
-                os << '<' << from_ascii(name);
+               os << '<' << from_ascii(name);
                if (!param.empty())
-                    os << ' ' << from_ascii(param);
+                       os << ' ' << from_ascii(param);
                os << '>';
        }
 }
@@ -193,13 +196,13 @@ void sgml::openTag(odocstream & os, string const & name, string const & attribut
 
 void sgml::closeTag(odocstream & os, string const & name)
 {
-        // FIXME UNICODE
        if (!name.empty() && name != "!-- --")
-                os << "</" << from_ascii(name) << '>';
+               os << "</" << from_ascii(name) << '>';
 }
 
 
-void sgml::openTag(Buffer const & buf, odocstream & os, OutputParams const & runparams, Paragraph const & par)
+void sgml::openTag(Buffer const & buf, odocstream & os,
+       OutputParams const & runparams, Paragraph const & par)
 {
        LyXLayout_ptr const & style = par.layout();
        string const & name = style->latexname();