X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsgml.cpp;h=2facb3ed539e280d459fed50a9f9fba1ba7f3b48;hb=268ae66e3c7df04effc329373dc887715d9c6f06;hp=068a831f8bf9ca99ab0449647de345bdf432ea8b;hpb=a01cb111a07717a337c18860216359cdbe22af3c;p=lyx.git

diff --git a/src/sgml.cpp b/src/sgml.cpp
index 068a831f8b..2facb3ed53 100644
--- 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,8 +27,9 @@
 #include "support/lstrings.h"
 #include "support/textutils.h"
 
+#include <atomic>
 #include <map>
-#include <ostream>
+#include <QThreadStorage>
 
 using namespace std;
 using namespace lyx::support;
@@ -103,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);
 }
 
@@ -134,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())
@@ -164,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;
@@ -182,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);
@@ -193,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) << '>';
 }
 
@@ -221,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 {