X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsgml.C;h=a5aa601c8f208c59207ea96d09368692598672b9;hb=e7f4618bcce770369cf46335c2c7f0164b4b8857;hp=aabf234a59793feb3bd7f3ba307bc00695b2b855;hpb=1c0c1a195284536137430ee2154ee38578ad6c8d;p=lyx.git

diff --git a/src/sgml.C b/src/sgml.C
index aabf234a59..a5aa601c8f 100644
--- a/src/sgml.C
+++ b/src/sgml.C
@@ -17,141 +17,231 @@
 #include "bufferparams.h"
 #include "counters.h"
 #include "lyxtext.h"
+#include "outputparams.h"
 #include "paragraph.h"
 
+#include "support/docstring.h"
 #include "support/lstrings.h"
 #include "support/std_ostream.h"
-#include "support/tostr.h"
-
-#include <boost/tuple/tuple.hpp>
+#include "support/convert.h"
 
+#include <map>
 #include <sstream>
 
-using lyx::support::subst;
 
-using std::make_pair;
+namespace lyx {
+
+using support::subst;
 
+using std::map;
 using std::ostream;
 using std::ostringstream;
-using std::pair;
 using std::string;
 
-namespace sgml {
-
-pair<bool, string> escapeChar(char c)
+docstring sgml::escapeChar(char_type c)
 {
-	string str;
-
+	docstring str;
 	switch (c) {
 	case ' ':
-		return make_pair(true, string(" "));
-		break;
-	case '\0': // Ignore :-)
-		str.erase();
+		str += " ";
 		break;
 	case '&':
-		str = "&amp;";
+		str += "&amp;";
 		break;
 	case '<':
-		str = "&lt;";
+		str += "&lt;";
 		break;
 	case '>':
-		str = "&gt;";
+		str += "&gt;";
 		break;
 #if 0
 	case '$':
-		str = "&dollar;";
+		str += "&dollar;";
 		break;
 	case '#':
-		str = "&num;";
+		str += "&num;";
 		break;
 	case '%':
-		str = "&percnt;";
+		str += "&percnt;";
 		break;
 	case '[':
-		str = "&lsqb;";
+		str += "&lsqb;";
 		break;
 	case ']':
-		str = "&rsqb;";
+		str += "&rsqb;";
 		break;
 	case '{':
-		str = "&lcub;";
+		str += "&lcub;";
 		break;
 	case '}':
-		str = "&rcub;";
+		str += "&rcub;";
 		break;
 	case '~':
-		str = "&tilde;";
+		str += "&tilde;";
 		break;
 	case '"':
-		str = "&quot;";
+		str += "&quot;";
 		break;
 	case '\\':
-		str = "&bsol;";
+		str += "&bsol;";
 		break;
 #endif
 	default:
-		str = c;
+		str += c;
 		break;
 	}
-	return make_pair(false, str);
+	return str;
 }
 
 
-string escapeString(string const & raw)
+docstring sgml::escapeString(docstring const & raw)
 {
-	ostringstream bin;
+	odocstringstream bin;
 
-	for(string::size_type i = 0; i < raw.size(); ++i) {
-		bool ws;
-		string str;
-		boost::tie(ws, str) = sgml::escapeChar(raw[i]);
-		bin << str;
+	for(docstring::size_type i = 0; i < raw.size(); ++i) {
+		bin  << sgml::escapeChar(raw[i]);
 	}
 	return bin.str();
 }
 
 
-int openTag(Buffer const & buf, ostream & os, Paragraph::depth_type depth,
-	    bool mixcont, string const & name, string const & param)
+docstring const sgml::uniqueID(docstring const label)
 {
-	Counters & counters = buf.params().getLyXTextClass().counters();
-	LyXLayout_ptr const & defaultstyle = buf.params().getLyXTextClass().defaultLayout();
-
-	string attribute = param;
-	// code for paragraphs like the standard paragraph in AGU.
-	if ( defaultstyle->latexname() == name and !defaultstyle->latexparam().empty()) {
-		counters.step(name);
-		int i = counters.value(name);
-		attribute += "" + subst(defaultstyle->latexparam(), "#", tostr(i));
+	static unsigned int seed = 1000;
+	return label + convert<docstring>(++seed);
+}
+
+
+docstring sgml::cleanID(Buffer const & buf, OutputParams const & runparams,
+	docstring const & orig)
+{
+	// The standard DocBook SGML declaration only allows letters,
+	// digits, '-' and '.' in a name.
+	// Since users might change that declaration one has to cater
+	// for additional allowed characters.
+	// This routine replaces illegal characters by '-' or '.'
+	// and adds a number for uniqueness.
+	// If you know what you are doing, you can set allowed==""
+	// to disable this mangling.
+	LyXTextClass const & tclass = buf.params().getLyXTextClass();
+	string const allowed =
+		runparams.flavor == OutputParams::XML? ".-_:":tclass.options();
+
+	if (allowed.empty())
+		return orig;
+
+	docstring::const_iterator it  = orig.begin();
+	docstring::const_iterator end = orig.end();
+
+	docstring content;
+
+	typedef map<docstring, docstring> MangledMap;
+	static MangledMap mangledNames;
+	static int mangleID = 1;
+
+	MangledMap::const_iterator const known = mangledNames.find(orig);
+	if (known != mangledNames.end())
+		return (*known).second;
+
+	// make sure it starts with a letter
+	if (!isalpha(*it) && allowed.find(*it) >= allowed.size())
+		content += "x";
+
+	bool mangle = false;
+	for (; it != end; ++it) {
+		char c = *it;
+		if (isalpha(c) || isdigit(c) || c == '-' || c == '.'
+		      || allowed.find(c) < allowed.size())
+			content += c;
+		else if (c == '_' || c == ' ') {
+			mangle = true;
+			content += "-";
+		}
+		else if (c == ':' || c == ',' || c == ';' || c == '!') {
+			mangle = true;
+			content += ".";
+		}
+		else {
+			mangle = true;
+		}
+	}
+	if (mangle) {
+		content += "-" + convert<docstring>(mangleID++);
 	}
+	else if (isdigit(content[content.size() - 1])) {
+		content += ".";
+	}
+
+	mangledNames[orig] = content;
+
+	return content;
+}
+
+
+void sgml::openTag(odocstream & os, string const & name, string const & attribute)
+{
+        // FIXME UNICODE
+	// This should be fixed in layout files later.
+	string param = subst(attribute, "<", "\"");
+	param = subst(param, ">", "\"");
 
 	if (!name.empty() && name != "!-- --") {
-		if (!mixcont)
-			os << string(depth, ' ');
-		os << '<' << name;
-		if (!attribute.empty())
-			os << " " << attribute;
+		os << '<' << from_ascii(name);
+		if (!param.empty())
+			os << ' ' << from_ascii(param);
 		os << '>';
 	}
+}
+
 
-	return !mixcont;
+void sgml::closeTag(odocstream & os, string const & name)
+{
+	if (!name.empty() && name != "!-- --")
+		os << "</" << from_ascii(name) << '>';
 }
 
 
-int closeTag(ostream & os, Paragraph::depth_type depth,
-	     bool mixcont, string const & name)
+void sgml::openTag(Buffer const & buf, odocstream & os,
+	OutputParams const & runparams, Paragraph const & par)
 {
-	if (!name.empty() && name != "!-- --") {
-		if (!mixcont)
-			os << '\n' << string(depth, ' ');
-		os << "</" << name << '>';
+	LyXLayout_ptr const & style = par.layout();
+	string const & name = style->latexname();
+	string param = style->latexparam();
+	Counters & counters = buf.params().getLyXTextClass().counters();
+
+	string id = par.getID(buf, runparams);
+
+	string attribute;
+	if(!id.empty()) {
+		if (param.find('#') != string::npos) {
+			string::size_type pos = param.find("id=<");
+			string::size_type end = param.find(">");
+			if( pos != string::npos && end != string::npos)
+				param.erase(pos, end-pos + 1);
+		}
+		attribute = id + ' ' + param;
+	} else {
+		if (param.find('#') != string::npos) {
+			// FIXME UNICODE
+			if(!style->counter.empty())
+				counters.step(style->counter);
+			else
+				counters.step(from_ascii(name));
+			int i = counters.value(from_ascii(name));
+			attribute = subst(param, "#", convert<string>(i));
+		} else {
+			attribute = param;
+		}
 	}
+	openTag(os, name, attribute);
+}
 
-	if (!mixcont)
-		os << '\n';
 
-	return !mixcont;
+void sgml::closeTag(odocstream & os, Paragraph const & par)
+{
+	LyXLayout_ptr const & style = par.layout();
+	closeTag(os, style->latexname());
 }
 
-} // namespace sgml
+
+} // namespace lyx