X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsgml.cpp;h=4842b07912e8f2f4524782a12093a5b3865174b8;hb=889182eb1a19da1cb4d5b5efeea434a5e6592ef0;hp=6ac6c8653b95af30c777cae4ed13e23c4bf6ac9d;hpb=2e7d1199dfa7ec7b7d963c374a014f2a2227ae7c;p=lyx.git

diff --git a/src/sgml.cpp b/src/sgml.cpp
index 6ac6c8653b..4842b07912 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.
@@ -28,7 +28,6 @@
 #include "support/textutils.h"
 
 #include <map>
-#include <ostream>
 
 using namespace std;
 using namespace lyx::support;
@@ -121,9 +120,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();
+	DocumentClass const & tclass = buf.params().documentClass();
 	docstring const allowed = from_ascii(
-		runparams.flavor == OutputParams::XML? ".-_:":tclass.options());
+		runparams.flavor == OutputParams::XML ? ".-_:" : tclass.options());
 
 	if (allowed.empty())
 		return orig;
@@ -139,7 +138,7 @@ docstring sgml::cleanID(Buffer const & buf, OutputParams const & runparams,
 
 	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())
@@ -182,7 +181,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 +197,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) << '>';
 }
 
@@ -201,10 +205,10 @@ void sgml::closeTag(odocstream & os, string const & name)
 void sgml::openTag(Buffer const & buf, odocstream & os,
 	OutputParams const & runparams, Paragraph const & par)
 {
-	LayoutPtr 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);
 
@@ -220,10 +224,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<string>(i));
 		} else {
@@ -236,8 +243,8 @@ void sgml::openTag(Buffer const & buf, odocstream & os,
 
 void sgml::closeTag(odocstream & os, Paragraph const & par)
 {
-	LayoutPtr const & style = par.layout();
-	closeTag(os, style->latexname());
+	Layout const & style = par.layout();
+	closeTag(os, style.latexname());
 }