Account for old versions of Pygments

[lyx.git] / src / sgml.cpp

diff --git a/src/sgml.cpp b/src/sgml.cpp
index d41806d6dfba82419bc0e1dd259f6ce9ba47033e..2facb3ed539e280d459fed50a9f9fba1ba7f3b48 100644 (file)
--- a/src/sgml.cpp
+++ b/src/sgml.cpp
@@ -3,7 +3,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author José Matos
+ * \author José Matos
  * \author John Levon
  *
  * Full author contact details are available in file CREDITS.
@@ -27,7 +27,9 @@
 #include "support/lstrings.h"
 #include "support/textutils.h"
 
+#include <atomic>
 #include <map>
+#include <QThreadStorage>
 
 using namespace std;
 using namespace lyx::support;
@@ -102,9 +104,10 @@ docstring sgml::escapeString(docstring const & raw)
 }
 
 
-docstring const sgml::uniqueID(docstring const label)
+docstring const sgml::uniqueID(docstring const & label)
 {
-       static unsigned int seed = 1000;
+       // thread-safe
+       static atomic_uint seed(1000);
        return label + convert<docstring>(++seed);
 }
 
@@ -133,8 +136,10 @@ docstring sgml::cleanID(Buffer const & buf, OutputParams const & runparams,
        docstring content;
 
        typedef map<docstring, docstring> MangledMap;
-       static MangledMap mangledNames;
-       static int mangleID = 1;
+       static QThreadStorage<MangledMap> tMangledNames;
+       static QThreadStorage<int> tMangleID;
+
+       MangledMap & mangledNames = tMangledNames.localData();
 
        MangledMap::const_iterator const known = mangledNames.find(orig);
        if (known != mangledNames.end())
@@ -163,9 +168,10 @@ docstring sgml::cleanID(Buffer const & buf, OutputParams const & runparams,
                }
        }
 
-       if (mangle)
+       if (mangle) {
+               int & mangleID = tMangleID.localData();
                content += "-" + convert<docstring>(mangleID++);
-       else if (isDigitASCII(content[content.size() - 1]))
+       } else if (isDigitASCII(content[content.size() - 1]))
                content += ".";
 
        mangledNames[orig] = content;
@@ -181,7 +187,12 @@ void sgml::openTag(odocstream & os, string const & name, string const & attribut
        string param = subst(attribute, "<", "\"");
        param = subst(param, ">", "\"");
 
-       if (!name.empty() && name != "!-- --") {
+       // Note: we ignore the name if it empty or if it is a comment "<!-- -->" or
+       // if the name is *dummy*.
+       // We ignore dummy because dummy is not a valid docbook element and it is
+       // the internal name given to single paragraphs in the latex output.
+       // This allow us to simplify the code a lot and is a reasonable compromise.
+       if (!name.empty() && name != "!-- --" && name != "dummy") {
                os << '<' << from_ascii(name);
                if (!param.empty())
                        os << ' ' << from_ascii(param);
@@ -192,7 +203,7 @@ void sgml::openTag(odocstream & os, string const & name, string const & attribut
 
 void sgml::closeTag(odocstream & os, string const & name)
 {
-       if (!name.empty() && name != "!-- --")
+       if (!name.empty() && name != "!-- --" && name != "dummy")
                os << "</" << from_ascii(name) << '>';
 }
 
@@ -220,9 +231,12 @@ void sgml::openTag(Buffer const & buf, odocstream & os,
                if (param.find('#') != string::npos) {
                        // FIXME UNICODE
                        if (!style.counter.empty())
-                               counters.step(style.counter);
+                               // This uses InternalUpdate at the moment becuase sgml output
+                               // does not do anything with tracked counters, and it would need
+                               // to track layouts if it did want to use them.
+                               counters.step(style.counter, InternalUpdate);
                        else
-                               counters.step(from_ascii(name));
+                               counters.step(from_ascii(name), InternalUpdate);
                        int i = counters.value(from_ascii(name));
                        attribute = subst(param, "#", convert<string>(i));
                } else {