Fix bug 2029 (RtL space width)

[lyx.git] / src / sgml.C

diff --git a/src/sgml.C b/src/sgml.C
index 57f89219b487cf0342f1150c7fd7fbe209cd5bcd..6e3f732ef78235cd135feb7598db658bd019d73c 100644 (file)
--- a/src/sgml.C
+++ b/src/sgml.C
@@ -17,20 +17,22 @@
 #include "bufferparams.h"
 #include "counters.h"
 #include "lyxtext.h"
+#include "outputparams.h"
 #include "paragraph.h"
 
 #include "support/lstrings.h"
 #include "support/std_ostream.h"
-#include "support/tostr.h"
+#include "support/convert.h"
 
 #include <boost/tuple/tuple.hpp>
 
+#include <map>
 #include <sstream>
 
 using lyx::support::subst;
 
 using std::make_pair;
-
+using std::map;
 using std::ostream;
 using std::ostringstream;
 using std::pair;
@@ -112,12 +114,86 @@ string escapeString(string const & raw)
 }
 
 
+string const uniqueID(string const label)
+{
+       static unsigned int seed = 1000;
+       return label + convert<string>(++seed);
+}
+
+
+string cleanID(Buffer const & buf, OutputParams const & runparams, std::string const & orig)
+{
+       // The standard DocBook SGML declaration only allows letters,
+       // digits, '-' and '.' in a name.
+       // Since users might change that declaration one has to cater
+       // for additional allowed characters.
+       // This routine replaces illegal characters by '-' or '.'
+       // and adds a number for uniqueness.
+       // 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();
+
+       if (allowed.empty())
+               return orig;
+
+       string::const_iterator it  = orig.begin();
+       string::const_iterator end = orig.end();
+
+       string content;
+
+       typedef map<string, string> MangledMap;
+       static MangledMap mangledNames;
+       static int mangleID = 1;
+
+       MangledMap::const_iterator const known = mangledNames.find(orig);
+       if (known != mangledNames.end())
+               return (*known).second;
+
+       // make sure it starts with a letter
+       if (!isalpha(*it) && allowed.find(*it) >= allowed.size())
+               content += "x";
+
+       bool mangle = false;
+       for (; it != end; ++it) {
+               char c = *it;
+               if (isalpha(c) || isdigit(c) || c == '-' || c == '.' || allowed.find(c) < allowed.size())
+                       content += c;
+               else if (c == '_' || c == ' ') {
+                       mangle = true;
+                       content += "-";
+               }
+               else if (c == ':' || c == ',' || c == ';' || c == '!') {
+                       mangle = true;
+                       content += ".";
+               }
+               else {
+                       mangle = true;
+               }
+       }
+       if (mangle) {
+               content += "-" + convert<string>(mangleID++);
+       }
+       else if (isdigit(content[content.size() - 1])) {
+               content += ".";
+       }
+
+       mangledNames[orig] = content;
+
+       return content;
+}
+
+
 void openTag(ostream & os, string const & name, string const & attribute)
 {
+       // This should be fixed in layout files later.
+       string param = subst(attribute, "<", "\"");
+       param = subst(param, ">", "\"");
+
        if (!name.empty() && name != "!-- --") {
                os << '<' << name;
-               if (!attribute.empty())
-                       os << " " << attribute;
+               if (!param.empty())
+                       os << " " << param;
                os << '>';
        }
 }
@@ -130,22 +206,21 @@ void closeTag(ostream & os, string const & name)
 }
 
 
-void openTag(Buffer const & buf, ostream & os, Paragraph const & par)
+void openTag(Buffer const & buf, ostream & os, OutputParams const & runparams, Paragraph const & par)
 {
        LyXLayout_ptr const & style = par.layout();
        string const & name = style->latexname();
        string param = style->latexparam();
        Counters & counters = buf.params().getLyXTextClass().counters();
 
-       string id = par.getDocbookId();
-       id = id.empty()? "" : " id = \"" + id + "\"";
+       string id = par.getID(buf, runparams);
 
        string attribute;
        if(!id.empty()) {
                if (param.find('#') != string::npos) {
                        string::size_type pos = param.find("id=<");
                        string::size_type end = param.find(">");
-                       if( pos != string::npos and end != string::npos)
+                       if( pos != string::npos && end != string::npos)
                                param.erase(pos, end-pos + 1);
                }
                attribute = id + ' ' + param;
@@ -156,9 +231,7 @@ void openTag(Buffer const & buf, ostream & os, Paragraph const & par)
                        else
                                counters.step(style->latexname());
                        int i = counters.value(name);
-                       attribute = subst(param, "#", tostr(i));
-                       attribute = subst(attribute, "<", "\"");
-                       attribute = subst(attribute, ">", "\"");
+                       attribute = subst(param, "#", convert<string>(i));
                } else {
                        attribute = param;
                }