X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsgml.cpp;h=75802c2bd44d2113da87253c0c31ffb0fc267df0;hb=f58638c704b0b4ac66e5f88431901977cc7801be;hp=a9fc1ca8480be3f730b977980e8dc17055fdef69;hpb=e0d54dd3b497b78094ea16ab0f38ccdc8c1642e2;p=lyx.git diff --git a/src/sgml.cpp b/src/sgml.cpp index a9fc1ca848..75802c2bd4 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. @@ -16,28 +16,25 @@ #include "Buffer.h" #include "BufferParams.h" #include "Counters.h" -#include "Text.h" +#include "Layout.h" #include "OutputParams.h" #include "Paragraph.h" +#include "Text.h" +#include "TextClass.h" -#include "support/docstring.h" -#include "support/lstrings.h" -#include "support/std_ostream.h" #include "support/convert.h" +#include "support/docstream.h" +#include "support/lstrings.h" #include "support/textutils.h" #include -#include +#include +using namespace std; +using namespace lyx::support; namespace lyx { -using support::subst; - -using std::map; -using std::ostream; -using std::ostringstream; -using std::string; docstring sgml::escapeChar(char_type c) { @@ -97,17 +94,20 @@ docstring sgml::escapeChar(char_type c) docstring sgml::escapeString(docstring const & raw) { - odocstringstream bin; + docstring bin; + bin.reserve(raw.size() * 2); // crude approximation is sufficient + for (size_t i = 0; i != raw.size(); ++i) + bin += sgml::escapeChar(raw[i]); - for(docstring::size_type i = 0; i < raw.size(); ++i) { - bin << sgml::escapeChar(raw[i]); - } - return bin.str(); + return bin; } -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(++seed); } @@ -124,9 +124,9 @@ docstring sgml::cleanID(Buffer const & buf, OutputParams const & runparams, // and adds a number for uniqueness. // If you know what you are doing, you can set allowed=="" // to disable this mangling. - TextClass const & tclass = buf.params().getTextClass(); - string const allowed = - runparams.flavor == OutputParams::XML? ".-_:":tclass.options(); + DocumentClass const & tclass = buf.params().documentClass(); + docstring const allowed = from_ascii( + runparams.flavor == OutputParams::XML ? ".-_:" : tclass.options()); if (allowed.empty()) return orig; @@ -137,12 +137,14 @@ docstring sgml::cleanID(Buffer const & buf, OutputParams const & runparams, docstring content; typedef map MangledMap; - static MangledMap mangledNames; - static int mangleID = 1; + static QThreadStorage tMangledNames; + static QThreadStorage tMangleID; + + MangledMap & mangledNames = tMangledNames.localData(); MangledMap::const_iterator const known = mangledNames.find(orig); if (known != mangledNames.end()) - return (*known).second; + return known->second; // make sure it starts with a letter if (!isAlphaASCII(*it) && allowed.find(*it) >= allowed.size()) @@ -150,7 +152,7 @@ docstring sgml::cleanID(Buffer const & buf, OutputParams const & runparams, bool mangle = false; for (; it != end; ++it) { - char c = *it; + char_type c = *it; if (isAlphaASCII(c) || isDigitASCII(c) || c == '-' || c == '.' || allowed.find(c) < allowed.size()) content += c; @@ -166,12 +168,12 @@ docstring sgml::cleanID(Buffer const & buf, OutputParams const & runparams, mangle = true; } } + if (mangle) { + int & mangleID = tMangleID.localData(); content += "-" + convert(mangleID++); - } - else if (isDigitASCII(content[content.size() - 1])) { + } else if (isDigitASCII(content[content.size() - 1])) content += "."; - } mangledNames[orig] = content; @@ -181,12 +183,17 @@ docstring sgml::cleanID(Buffer const & buf, OutputParams const & runparams, void sgml::openTag(odocstream & os, string const & name, string const & attribute) { - // FIXME UNICODE + // FIXME UNICODE // This should be fixed in layout files later. 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); @@ -197,7 +204,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 << "'; } @@ -205,15 +212,15 @@ void sgml::closeTag(odocstream & os, string const & name) void sgml::openTag(Buffer const & buf, odocstream & os, OutputParams const & runparams, Paragraph const & par) { - Layout_ptr const & style = par.layout(); - string const & name = style->latexname(); - string param = style->latexparam(); - Counters & counters = buf.params().getTextClass().counters(); + Layout const & style = par.layout(); + string const & name = style.latexname(); + string param = style.latexparam(); + Counters & counters = buf.params().documentClass().counters(); string id = par.getID(buf, runparams); string attribute; - if(!id.empty()) { + if (!id.empty()) { if (param.find('#') != string::npos) { string::size_type pos = param.find("id=<"); string::size_type end = param.find(">"); @@ -224,10 +231,13 @@ void sgml::openTag(Buffer const & buf, odocstream & os, } else { if (param.find('#') != string::npos) { // FIXME UNICODE - if(!style->counter.empty()) - counters.step(style->counter); + if (!style.counter.empty()) + // 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(i)); } else { @@ -240,8 +250,8 @@ void sgml::openTag(Buffer const & buf, odocstream & os, void sgml::closeTag(odocstream & os, Paragraph const & par) { - Layout_ptr const & style = par.layout(); - closeTag(os, style->latexname()); + Layout const & style = par.layout(); + closeTag(os, style.latexname()); }