Partial fix bug 2092: branches not propagated to child documents

[lyx.git] / src / sgml.C

diff --git a/src/sgml.C b/src/sgml.C
index 412fb8f127f601dc08957a760bf77cb8f09345ba..6e3f732ef78235cd135feb7598db658bd019d73c 100644 (file)
--- a/src/sgml.C
+++ b/src/sgml.C
@@ -22,7 +22,7 @@
 
 #include "support/lstrings.h"
 #include "support/std_ostream.h"
-#include "support/tostr.h"
+#include "support/convert.h"
 
 #include <boost/tuple/tuple.hpp>
 
@@ -117,7 +117,7 @@ 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);
 }
 
 
@@ -153,8 +153,8 @@ string cleanID(Buffer const & buf, OutputParams const & runparams, std::string c
        // 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())
@@ -172,9 +172,9 @@ string cleanID(Buffer const & buf, OutputParams const & runparams, std::string c
                }
        }
        if (mangle) {
-               content += "-" + tostr(mangleID++);
+               content += "-" + convert<string>(mangleID++);
        }
-       else if (isdigit(content[content.size()-1])) {
+       else if (isdigit(content[content.size() - 1])) {
                content += ".";
        }
 
@@ -220,7 +220,7 @@ void openTag(Buffer const & buf, ostream & os, OutputParams const & runparams, P
                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;
@@ -231,7 +231,7 @@ void openTag(Buffer const & buf, ostream & os, OutputParams const & runparams, P
                        else
                                counters.step(style->latexname());
                        int i = counters.value(name);
-                       attribute = subst(param, "#", tostr(i));
+                       attribute = subst(param, "#", convert<string>(i));
                } else {
                        attribute = param;
                }