Trivial fixes to some warnings thrown up by MSVS.Net 2003.

[lyx.git] / src / sgml.C

diff --git a/src/sgml.C b/src/sgml.C
index 12f3ae53e374117c499202236635028575ec2e4a..6e3f732ef78235cd135feb7598db658bd019d73c 100644 (file)
--- a/src/sgml.C
+++ b/src/sgml.C
@@ -17,11 +17,12 @@
 #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>
 
@@ -116,11 +117,11 @@ string escapeString(string const & raw)
 string const uniqueID(string const label)
 {
        static unsigned int seed = 1000;
-       return label + tostr(++seed);
+       return label + convert<string>(++seed);
 }
 
 
-string cleanID(std::string const & orig, std::string const & allowed)
+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.
@@ -130,16 +131,17 @@ string cleanID(std::string const & orig, std::string const & allowed)
        // 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;
 
-       if (allowed.empty()) {
-               return orig;
-       }
-
        typedef map<string, string> MangledMap;
        static MangledMap mangledNames;
        static int mangleID = 1;
@@ -151,8 +153,8 @@ string cleanID(std::string const & orig, std::string const & allowed)
        // make sure it starts with a letter
        if (!isalpha(*it) && allowed.find(*it) >= allowed.size())
                content += "x";
-       
-       bool mangle = false;    
+
+       bool mangle = false;
        for (; it != end; ++it) {
                char c = *it;
                if (isalpha(c) || isdigit(c) || c == '-' || c == '.' || allowed.find(c) < allowed.size())
@@ -170,9 +172,9 @@ string cleanID(std::string const & orig, std::string const & allowed)
                }
        }
        if (mangle) {
-               content += "-" + tostr(mangleID++);
+               content += "-" + convert<string>(mangleID++);
        }
-       else if (isdigit(content[content.size()-1])) {
+       else if (isdigit(content[content.size() - 1])) {
                content += ".";
        }
 
@@ -204,21 +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.getID();
+       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;
@@ -229,7 +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(param, "#", convert<string>(i));
                } else {
                        attribute = param;
                }