#include "support/textutils.h"
#include <map>
+#include <QThreadStorage>
using namespace std;
using namespace lyx::support;
}
-docstring const sgml::uniqueID(docstring const label)
+docstring const sgml::uniqueID(docstring const & label)
{
+ // FIXME THREAD
+ // It seems unlikely there could be a problem here,
+ // but we could have concurrent access, in principle.
static unsigned int seed = 1000;
return label + convert<docstring>(++seed);
}
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())
}
}
- 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;
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);
void sgml::closeTag(odocstream & os, string const & name)
{
- if (!name.empty() && name != "!-- --")
+ if (!name.empty() && name != "!-- --" && name != "dummy")
os << "</" << from_ascii(name) << '>';
}
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 {