X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Foutput_xhtml.h;h=327c40274b281dbb62d9b13e92992a6120d7f5b5;hb=021f51e19b3751f8f15d8bd89f7aa6a109624b29;hp=09d58ea16734aee2980066a6d10e0adfe35d0400;hpb=62b624031047eb2eae8d09bde05a65baff2ea69a;p=lyx.git

diff --git a/src/output_xhtml.h b/src/output_xhtml.h
index 09d58ea167..327c40274b 100644
--- a/src/output_xhtml.h
+++ b/src/output_xhtml.h
@@ -23,11 +23,20 @@ class Buffer;
 class OutputParams;
 class Text;
 
+// Inspiration for the *Tag structs and for XHTMLStream
+// came from MathStream and its cousins.
+
 struct StartTag {
+	///
+	StartTag(std::string const & tag) : tag_(tag) {}
 	///
 	StartTag(std::string const & tag, std::string const & attr, 
 		bool keepempty = false) 
 		: tag_(tag), attr_(attr), keepempty_(keepempty) {}
+	/// <tag_ attr_>
+	docstring asTag() const;
+	/// </tag_>
+	docstring asEndTag() const;
 	///
 	std::string tag_;
 	///
@@ -41,6 +50,8 @@ struct StartTag {
 struct EndTag {
 	///
 	EndTag(std::string tag) : tag_(tag) {}
+	/// </tag_>
+	docstring asEndTag() const;
 	///
 	std::string tag_;
 };
@@ -51,6 +62,8 @@ struct CompTag {
 	///
 	CompTag(std::string const & tag, std::string const & attr)
 		: tag_(tag), attr_(attr) {}
+	/// <tag_ attr_ />
+	docstring asTag() const;
 	///
 	std::string tag_;
 	///
@@ -76,7 +89,9 @@ public:
 	///
 	XHTMLStream & operator<<(docstring const &);
 	///
-	//XHTMLStream & operator<<(char_type);
+	XHTMLStream & operator<<(const char *);
+	///
+	XHTMLStream & operator<<(char_type);
 	///
 	XHTMLStream & operator<<(StartTag const &);
 	///
@@ -105,7 +120,7 @@ private:
 ///
 void xhtmlParagraphs(Text const & text,
 		       Buffer const & buf,
-		       odocstream & os,
+		       XHTMLStream & xs,
 		       OutputParams const & runparams);
 
 namespace html {
@@ -113,6 +128,8 @@ namespace html {
 docstring escapeChar(char_type c);
 /// converts a string to a form safe for links, etc
 docstring htmlize(docstring const & str);
+
+// to be removed
 /// \return true if tag was opened, false if not 
 bool openTag(odocstream & os, std::string const & tag, 
 						 std::string const & attr);