X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Foutput_xhtml.h;h=4c389bd0aabfa1683d4b713c74262b12dda71c7a;hb=16c2ee1f49f512f2f0bc0c3fee028835b0cc95e9;hp=4b6c297e85fd907139f51f07b734e98cc73d2297;hpb=ad132e2e99f851b42e71397e6a32d86dc8eac43d;p=lyx.git

diff --git a/src/output_xhtml.h b/src/output_xhtml.h
index 4b6c297e85..4c389bd0aa 100644
--- a/src/output_xhtml.h
+++ b/src/output_xhtml.h
@@ -12,10 +12,11 @@
 #ifndef OUTPUT_XHTML_H
 #define OUTPUT_XHTML_H
 
+#include "LayoutEnums.h"
 #include "support/docstream.h"
+#include "support/strfwd.h"
 
 #include <deque>
-#include <vector>
 
 namespace lyx {
 
@@ -23,11 +24,17 @@ class Buffer;
 class OutputParams;
 class Text;
 
+// Inspiration for the *Tag structs and for XHTMLStream
+// came from MathStream and its cousins.
+
+namespace html {
+/// Attributes will be escaped automatically and so should NOT
+/// be escaped before being passed to the constructor.
 struct StartTag {
 	///
-	StartTag(std::string const & tag) : tag_(tag) {}
+	explicit StartTag(std::string const & tag) : tag_(tag), keepempty_(false) {}
 	///
-	StartTag(std::string const & tag, std::string const & attr, 
+	explicit StartTag(std::string const & tag, std::string const & attr, 
 		bool keepempty = false) 
 		: tag_(tag), attr_(attr), keepempty_(keepempty) {}
 	/// <tag_ attr_>
@@ -46,7 +53,7 @@ struct StartTag {
 
 struct EndTag {
 	///
-	EndTag(std::string tag) : tag_(tag) {}
+	explicit EndTag(std::string tag) : tag_(tag) {}
 	/// </tag_>
 	docstring asEndTag() const;
 	///
@@ -54,10 +61,19 @@ struct EndTag {
 };
 
 
-// Tags like <img />
+// FIXME XHTML
+// We need to allow these to be deferrable, which means it should
+// inherit from StartTag. This is probably better, anyway, but we'll
+// need to re-work a bit of code....
+/// Tags like <img />
+/// Attributes will be escaped automatically and so should NOT
+/// be escaped before being passed to the constructor.
 struct CompTag {
 	///
-	CompTag(std::string const & tag, std::string const & attr)
+	explicit CompTag(std::string const & tag)
+		: tag_(tag) {}
+	///
+	explicit CompTag(std::string const & tag, std::string const & attr)
 		: tag_(tag), attr_(attr) {}
 	/// <tag_ attr_ />
 	docstring asTag() const;
@@ -67,14 +83,16 @@ struct CompTag {
 	std::string attr_;
 };
 
+// trivial struct for output of newlines
+struct CR{};
+
+} // namespace html
 
 class XHTMLStream {
 public:
 	///
 	explicit XHTMLStream(odocstream & os);
 	///
-	void cr();
-	///
 	odocstream & os() { return os_; }
 	///
 	// int & tab() { return tab_; }
@@ -83,33 +101,56 @@ public:
 	/// \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();
+	/// call at start of paragraph. sets a mark so we know what tags
+	/// to close at the end. 
+	void startParagraph();
+	/// call at end of paragraph to clear that mark. note that this
+	/// will also close any tags still open. 
+	void endParagraph();
 	///
 	XHTMLStream & operator<<(docstring const &);
 	///
+	XHTMLStream & operator<<(const char *);
+	///
 	XHTMLStream & operator<<(char_type);
 	///
-	XHTMLStream & operator<<(StartTag const &);
+	XHTMLStream & operator<<(int);
+	///
+	XHTMLStream & operator<<(char);
+	///
+	XHTMLStream & operator<<(html::StartTag const &);
 	///
-	XHTMLStream & operator<<(EndTag const &);
+	XHTMLStream & operator<<(html::EndTag const &);
 	///
-	XHTMLStream & operator<<(CompTag const &);
+	XHTMLStream & operator<<(html::CompTag const &);
+	///
+	XHTMLStream & operator<<(html::CR const &);
+	///
+	enum EscapeSettings {
+		ESCAPE_NONE,
+		ESCAPE_AND, // meaning &
+		ESCAPE_ALL  // meaning <, >, &, at present
+	};
+	/// Sets what we are going to escape on the NEXT write.
+	/// Everything is reset for the next time.
+	XHTMLStream & operator<<(EscapeSettings);
 private:
 	///
 	void clearTagDeque();
 	///
 	bool isTagOpen(std::string const &);
 	///
-	odocstream & os_;
-	///
-	// int tab_;
+	void writeError(std::string const &);
 	///
-	typedef std::deque<StartTag> TagDeque;
+	odocstream & os_;
 	///
-	typedef std::vector<StartTag> TagStack;
+	typedef std::deque<html::StartTag> TagStack;
 	/// holds start tags until we know there is content in them.
-	TagDeque pending_tags_;
+	TagStack pending_tags_;
 	/// remembers the history, so we can make sure we nest properly.
 	TagStack tag_stack_;
+	/// 
+	EscapeSettings escape_;
 };
 
 ///
@@ -118,19 +159,26 @@ void xhtmlParagraphs(Text const & text,
 		       XHTMLStream & xs,
 		       OutputParams const & runparams);
 
+/// \return a string appropriate for setting alignment in CSS
+/// Does NOT return "justify" for "block"
+std::string alignmentToCSS(LyXAlignment align);
+
 namespace html {
 ///
-docstring escapeChar(char_type c);
+docstring escapeChar(char_type c, XHTMLStream::EscapeSettings e);
 /// 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);
-}
+docstring htmlize(docstring const & str, XHTMLStream::EscapeSettings e);
+/// cleans \param str for use as an atttribute by replacing
+/// all non-alnum by "_"
+docstring cleanAttr(docstring const & str);
+///
+std::string escapeChar(char c, XHTMLStream::EscapeSettings e);
+/// 
+std::string htmlize(std::string const & str, XHTMLStream::EscapeSettings e);
+/// 
+std::string cleanAttr(std::string const & str);
+
+} // namespace html
 } // namespace lyx
 
 #endif