X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsgml.h;h=d32b799b4997211b1b8d9f41fce60ffb3eeb3fa3;hb=848c89564fce9c4bfec79b915746dc6bc47abc3d;hp=332535bc70d0877358a7a1a8653f8bcc3752e78c;hpb=236ea81bc5c0ce7101c9460d1ee97b8f3c9be9df;p=lyx.git

diff --git a/src/sgml.h b/src/sgml.h
index 332535bc70..d32b799b49 100644
--- a/src/sgml.h
+++ b/src/sgml.h
@@ -13,28 +13,53 @@
 #ifndef SGML_H
 #define SGML_H
 
-#include "paragraph.h"
+#include "support/types.h"
+#include "support/docstream.h"
 
-#include "support/std_string.h"
-#include <algorithm>
 #include <iosfwd>
+#include <string>
+#include <utility>
+
+
+namespace lyx {
+
+class Buffer;
+class Paragraph;
+class OutputParams;
 
 namespace sgml {
 
 /**
- * Escape the given character if necessary
- * to an SGML entity. Returns true
- * if it was a whitespace character.
+ * Escape the given character, if necessary,
+ * to an SGML entity.
  */
-std::pair<bool, string> escapeChar(char c);
+docstring escapeChar(char_type c);
+
+/// Escape a word instead of a single character
+docstring escapeString(docstring const & raw);
+
+/// replaces illegal characters from SGML/XML ID attributes
+docstring cleanID(Buffer const & buf, OutputParams const & runparams,
+		    docstring const & orig);
+
+/// returns a unique numeric id
+docstring const uniqueID(docstring const label);
+
+/// Opens tag
+void openTag(odocstream & os, std::string const & name,
+	    std::string const & attribute = std::string());
+
+/// Open tag
+void openTag(Buffer const & buf, odocstream & os,
+	     OutputParams const & runparams, Paragraph const & par);
+
+/// Close tag
+void closeTag(odocstream & os, std::string const & name);
 
-/// FIXME
-int openTag(std::ostream & os, Paragraph::depth_type depth,
-	    bool mixcont, string const & latexname);
+/// Close tag
+void closeTag(odocstream & os, Paragraph const & par);
 
-/// FIXME
-int closeTag(std::ostream & os, Paragraph::depth_type depth,
-	    bool mixcont, string const & latexname);
-}
+} // namespace sgml
+} // namespace lyx
 
 #endif // SGML_H