Fix sgml::escapeChar and sgml::escapeString to return docstring.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15444 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/insets/insetindex.C b/src/insets/insetindex.C
index 4b1ca064a6476ad2f84a78f5dbf3f2d6fd7e359e..c175cf1ffd14cb5e05d7aafff22049ef7542ac57 100644 (file)
--- a/src/insets/insetindex.C
+++ b/src/insets/insetindex.C
@@ -46,9 +46,8 @@ docstring const InsetIndex::getScreenLabel(Buffer const &) const
 int InsetIndex::docbook(Buffer const &, odocstream & os,
                        OutputParams const &) const
 {
-        // FIXME UNICODE
        os << "<indexterm><primary>"
-           << from_ascii(sgml::escapeString(lyx::to_ascii(getParam("name"))))
+           << sgml::escapeString(getParam("name"))
           << "</primary></indexterm>";
        return 0;
 }

diff --git a/src/paragraph.C b/src/paragraph.C
index fa45cbd99b40269ebd950c46d0187e7b96dd29d4..9010c675564e90869919e899cb5fcf7fd5ce0fef 100644 (file)
--- a/src/paragraph.C
+++ b/src/paragraph.C
@@ -1179,14 +1179,8 @@ pos_type Paragraph::getFirstWord(Buffer const & buf, odocstream & os, OutputPara
                        value_type c = getChar(i);
                        if (c == ' ')
                                break;
-                       bool ws;
-                       string str;
-                       // FIXME UNICODE
-                       // sgml::escapeChar takes a char, not lyx::char_type
-                       boost::tie(ws, str) = sgml::escapeChar(c);
-                        // FIXME UNICODE
-                       os << from_ascii(str);
-               }
+                       os << sgml::escapeChar(c);
+               }
        }
        return i;
 }
@@ -1244,17 +1238,12 @@ void Paragraph::simpleDocBookOnePar(Buffer const & buf,
                        inset->docbook(buf, os, runparams);
                } else {
                        value_type c = getChar(i);
-                       bool ws;
-                       string str;
-                       // FIXME UNICODE
-                       // sgml::escapeChar takes a char, not lyx::char_type
-                       boost::tie(ws, str) = sgml::escapeChar(c);
 
                        if (style->pass_thru)
                                 os.put(c);
                        else
                                 // FIXME UNICODE
-                                os << from_ascii(str);
+                                os << sgml::escapeChar(c);
                }
                font_old = font;
        }

diff --git a/src/sgml.C b/src/sgml.C
index bc8704c01b9502bb88fd9233e39f1475eb5b3090..ee8fe4e150c2e0002adf0539fc03d0a005c36a78 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,82 +33,73 @@ 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();
 }

diff --git a/src/sgml.h b/src/sgml.h
index 71b6aa1b6eec40e2aff8a8fec54681251a2132f0..b4c02f5cc8511c258258b6c3975e1e16b8e6546f 100644 (file)
--- a/src/sgml.h
+++ b/src/sgml.h
@@ -31,13 +31,12 @@ namespace sgml {
 
 /**
  * Escape the given character, if necessary,
- * to an SGML entity. Returns true
- * if it was a whitespace character.
+ * to an SGML entity.
  */
-std::pair<bool, std::string> escapeChar(char c);
+docstring escapeChar(char_type c);
 
 /// Escape a word instead of a single character
-std::string escapeString(std::string const & raw);
+docstring escapeString(docstring const & raw);
 
 /// replaces illegal characters from SGML/XML ID attributes
 std::string cleanID(Buffer const & buf, OutputParams const & runparams,