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

diff --git a/src/output_xhtml.h b/src/output_xhtml.h
index 57bde40868..327c40274b 100644
--- a/src/output_xhtml.h
+++ b/src/output_xhtml.h
@@ -12,24 +12,129 @@
 #ifndef OUTPUT_XHTML_H
 #define OUTPUT_XHTML_H
 
-#include "support/strfwd.h"
+#include "support/docstream.h"
+
+#include <deque>
+#include <vector>
 
 namespace lyx {
 
 class Buffer;
 class OutputParams;
-class ParagraphList;
+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_;
+	///
+	std::string attr_;
+	/// whether to keep things like "<tag></tag>" or discard them
+	/// you would want this for td, e.g, but maybe not for a div
+	bool keepempty_;
+};
+
+
+struct EndTag {
+	///
+	EndTag(std::string tag) : tag_(tag) {}
+	/// </tag_>
+	docstring asEndTag() const;
+	///
+	std::string tag_;
+};
+
+
+// Tags like <img />
+struct CompTag {
+	///
+	CompTag(std::string const & tag, std::string const & attr)
+		: tag_(tag), attr_(attr) {}
+	/// <tag_ attr_ />
+	docstring asTag() const;
+	///
+	std::string tag_;
+	///
+	std::string attr_;
+};
+
+
+class XHTMLStream {
+public:
+	///
+	explicit XHTMLStream(odocstream & os);
+	///
+	void cr();
+	///
+	odocstream & os() { return os_; }
+	///
+	// int & tab() { return tab_; }
+	/// closes any font tags that are eligible to be closed,
+	/// i.e., last on the tag_stack_.
+	/// \return false if there are open font tags we could not close.
+	/// because they are "blocked" by open non-font tags on the stack.
+	bool closeFontTags();
+	///
+	XHTMLStream & operator<<(docstring const &);
+	///
+	XHTMLStream & operator<<(const char *);
+	///
+	XHTMLStream & operator<<(char_type);
+	///
+	XHTMLStream & operator<<(StartTag const &);
+	///
+	XHTMLStream & operator<<(EndTag const &);
+	///
+	XHTMLStream & operator<<(CompTag const &);
+private:
+	///
+	void clearTagDeque();
+	///
+	bool isTagOpen(std::string const &);
+	///
+	odocstream & os_;
+	///
+	// int tab_;
+	///
+	typedef std::deque<StartTag> TagDeque;
+	///
+	typedef std::vector<StartTag> TagStack;
+	/// holds start tags until we know there is content in them.
+	TagDeque pending_tags_;
+	/// remembers the history, so we can make sure we nest properly.
+	TagStack tag_stack_;
+};
 
 ///
-void xhtmlParagraphs(ParagraphList const & subset,
+void xhtmlParagraphs(Text const & text,
 		       Buffer const & buf,
-		       odocstream & os,
+		       XHTMLStream & xs,
 		       OutputParams const & runparams);
 
 namespace html {
-	docstring escapeChar(char_type c);
-	void openTag(odocstream & os, std::string tag, std::string attr);
-	void closeTag(odocstream & os, std::string tag);
+///
+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);
+/// \return true if tag was opened, false if not 
+bool closeTag(odocstream & os, std::string const & tag);
 }
 } // namespace lyx