X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsgml.C;h=7ebaf187a694782a4d7f21052c1fc83b7372b79a;hb=67f9c9fdae42211aa3ff8d0c6f62485bd721d8eb;hp=52ada720fc27fbdc13717fae7a31c155ad73cc27;hpb=6a1167adab9c33e0800cf1e7b314344a21cf93fe;p=lyx.git

diff --git a/src/sgml.C b/src/sgml.C
index 52ada720fc..7ebaf187a6 100644
--- a/src/sgml.C
+++ b/src/sgml.C
@@ -1,23 +1,28 @@
 /**
  * \file sgml.C
- * Copyright 2002 the LyX Team
- * Read the file COPYING
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
  * \author José Matos
- * \author John Levon <levon@movementarian.org>
+ * \author John Levon
+ *
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 
-#include "support/LOstream.h"
+#include "support/std_ostream.h"
 
 #include "paragraph.h"
 #include "sgml.h"
 
-using std::pair;
+using std::endl;
 using std::make_pair;
+
 using std::ostream;
-using std::endl;
+using std::pair;
+using std::string;
+
 
 namespace sgml {
 
@@ -26,11 +31,6 @@ pair<bool, string> escapeChar(char c)
 	string str;
 
 	switch (c) {
-	case Paragraph::META_HFILL:
-		break;
-	case Paragraph::META_NEWLINE:
-		str = '\n';
-		break;
 	case ' ':
 		return make_pair(true, string(" "));
 		break;
@@ -85,12 +85,16 @@ pair<bool, string> escapeChar(char c)
 
 
 int openTag(ostream & os, Paragraph::depth_type depth,
-	    bool mixcont, string const & latexname)
+	    bool mixcont, string const & latexname,
+		string const & latexparam)
 {
 	if (!latexname.empty() && latexname != "!-- --") {
 		if (!mixcont)
-			os << string(" ", depth);
-		os << "<" << latexname << ">";
+			os << string(depth, ' ');
+		os << '<' << latexname;
+		if (!latexparam.empty())
+			os << " " << latexparam;
+		os << '>';
 	}
 
 	if (!mixcont)
@@ -105,8 +109,8 @@ int closeTag(ostream & os, Paragraph::depth_type depth,
 {
 	if (!latexname.empty() && latexname != "!-- --") {
 		if (!mixcont)
-			os << endl << string(" ", depth);
-		os << "</" << latexname << ">";
+			os << endl << string(depth, ' ');
+		os << "</" << latexname << '>';
 	}
 
 	if (!mixcont)
@@ -115,4 +119,21 @@ int closeTag(ostream & os, Paragraph::depth_type depth,
 	return !mixcont;
 }
 
+
+unsigned int closeEnvTags(ostream & os, bool mixcont,
+			string const & environment_inner_depth,
+			string const & itemtag,
+			lyx::depth_type total_depth)
+{
+	unsigned int lines = 0;
+	if (environment_inner_depth != "!-- --") {
+		lines += closeTag(os, total_depth, mixcont, itemtag);
+		if (!environment_inner_depth.empty())
+			lines += closeTag(os, total_depth, mixcont,
+				environment_inner_depth);
+	}
+	return lines;
+}
+
+
 } // namespace sgml