X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsgml.h;h=ed0f1403a5475d9f59c01869a9ffe790cd204702;hb=90f7007a2e6c78ffd031e4636ff909ab1bc2ddec;hp=cb9a063b5a7e531a2f9d43ca08946c14d725b593;hpb=0d449056ef9ace3ef737e4b9aba8d3994615dc18;p=lyx.git

diff --git a/src/sgml.h b/src/sgml.h
index cb9a063b5a..ed0f1403a5 100644
--- a/src/sgml.h
+++ b/src/sgml.h
@@ -4,7 +4,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.
@@ -14,11 +14,9 @@
 #define SGML_H
 
 #include "support/types.h"
-#include "support/docstream.h"
+#include "support/docstring.h"
 
-#include <iosfwd>
-#include <string>
-#include <utility>
+namespace lyx {
 
 class Buffer;
 class Paragraph;
@@ -28,33 +26,35 @@ namespace sgml {
 
 /**
  * Escape the given character, if necessary,
- * to an SGML entity. Returns true
- * if it was a whitespace character.
+ * to an SGML entity.
  */
-std::pair<bool, std::string> escapeChar(char c);
+docstring escapeChar(char_type c);
 
 /// Escape a word instead of a single character
-std::string escapeString(std::string const & raw);
+docstring escapeString(docstring const & raw);
 
 /// replaces illegal characters from SGML/XML ID attributes
-std::string cleanID(Buffer const & buf, OutputParams const & runparams,
-		    std::string const & orig);
+docstring cleanID(Buffer const & buf, OutputParams const & runparams,
+		    docstring const & orig);
 
 /// returns a unique numeric id
-std::string const uniqueID(std::string const label);
+docstring const uniqueID(docstring const label);
 
 /// Opens tag
-void openTag(lyx::odocstream & os, std::string const & name,
+void openTag(odocstream & os, std::string const & name,
 	    std::string const & attribute = std::string());
 
 /// Open tag
-void openTag(Buffer const & buf, lyx::odocstream & os,
+void openTag(Buffer const & buf, odocstream & os,
 	     OutputParams const & runparams, Paragraph const & par);
 
 /// Close tag
-void closeTag(lyx::odocstream & os, std::string const & name);
+void closeTag(odocstream & os, std::string const & name);
 
 /// Close tag
-void closeTag(lyx::odocstream & os, Paragraph const & par);
-}
+void closeTag(odocstream & os, Paragraph const & par);
+
+} // namespace sgml
+} // namespace lyx
+
 #endif // SGML_H