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

[lyx.git] / src / sgml.C

diff --git a/src/sgml.C b/src/sgml.C
index bc8704c01b9502bb88fd9233e39f1475eb5b3090..a5aa601c8f208c59207ea96d09368692598672b9 100644 (file)
--- a/src/sgml.C
+++ b/src/sgml.C
@@ -20,12 +20,11 @@
 #include "outputparams.h"
 #include "paragraph.h"
 
+#include "support/docstring.h"
 #include "support/lstrings.h"
 #include "support/std_ostream.h"
 #include "support/convert.h"
 
-#include <boost/tuple/tuple.hpp>
-
 #include <map>
 #include <sstream>
 
@@ -34,95 +33,87 @@ namespace lyx {
 
 using support::subst;
 
-using std::make_pair;
 using std::map;
 using std::ostream;
 using std::ostringstream;
-using std::pair;
 using std::string;
 
-pair<bool, string> sgml::escapeChar(char c)
+docstring sgml::escapeChar(char_type c)
 {
-       string str;
-
+       docstring str;
        switch (c) {
        case ' ':
-               return make_pair(true, string(" "));
-               break;
-       case '\0': // Ignore :-)
-               str.erase();
+               str += " ";
                break;
        case '&':
-               str = "&amp;";
+               str += "&amp;";
                break;
        case '<':
-               str = "&lt;";
+               str += "&lt;";
                break;
        case '>':
-               str = "&gt;";
+               str += "&gt;";
                break;
 #if 0
        case '$':
-               str = "&dollar;";
+               str += "&dollar;";
                break;
        case '#':
-               str = "&num;";
+               str += "&num;";
                break;
        case '%':
-               str = "&percnt;";
+               str += "&percnt;";
                break;
        case '[':
-               str = "&lsqb;";
+               str += "&lsqb;";
                break;
        case ']':
-               str = "&rsqb;";
+               str += "&rsqb;";
                break;
        case '{':
-               str = "&lcub;";
+               str += "&lcub;";
                break;
        case '}':
-               str = "&rcub;";
+               str += "&rcub;";
                break;
        case '~':
-               str = "&tilde;";
+               str += "&tilde;";
                break;
        case '"':
-               str = "&quot;";
+               str += "&quot;";
                break;
        case '\\':
-               str = "&bsol;";
+               str += "&bsol;";
                break;
 #endif
        default:
-               str = c;
+               str += c;
                break;
        }
-       return make_pair(false, str);
+       return str;
 }
 
 
-string sgml::escapeString(string const & raw)
+docstring sgml::escapeString(docstring const & raw)
 {
-       ostringstream bin;
+       odocstringstream bin;
 
-       for(string::size_type i = 0; i < raw.size(); ++i) {
-               bool ws;
-               string str;
-               boost::tie(ws, str) = sgml::escapeChar(raw[i]);
-               bin << str;
+       for(docstring::size_type i = 0; i < raw.size(); ++i) {
+               bin  << sgml::escapeChar(raw[i]);
        }
        return bin.str();
 }
 
 
-string const sgml::uniqueID(string const label)
+docstring const sgml::uniqueID(docstring const label)
 {
        static unsigned int seed = 1000;
-       return 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.
@@ -133,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;
 
@@ -158,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;
@@ -173,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 += ".";
@@ -193,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 << '>';
        }
 }
@@ -203,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();