This should do it for the delimiters.

[lyx.git] / src / output_xhtml.h

diff --git a/src/output_xhtml.h b/src/output_xhtml.h
index 8c96fd57df2295336b8aef2f0ed9cac9394113a7..de88282a8044a773f03a3cf8fb956a6988d8d770 100644 (file)
--- a/src/output_xhtml.h
+++ b/src/output_xhtml.h
@@ -13,6 +13,7 @@
 #define OUTPUT_XHTML_H
 
 #include "support/docstream.h"
+#include "support/strfwd.h"
 
 #include <deque>
 #include <vector>
@@ -26,11 +27,13 @@ class Text;
 // Inspiration for the *Tag structs and for XHTMLStream
 // came from MathStream and its cousins.
 
+/// Attributes will be escaped automatically and so should NOT
+/// be escaped before passing to the constructor.
 struct StartTag {
        ///
-       StartTag(std::string const & tag) : tag_(tag) {}
+       explicit StartTag(std::string const & tag) : tag_(tag) {}
        ///
-       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_>
@@ -49,7 +52,7 @@ struct StartTag {
 
 struct EndTag {
        ///
-       EndTag(std::string tag) : tag_(tag) {}
+       explicit EndTag(std::string tag) : tag_(tag) {}
        /// </tag_>
        docstring asEndTag() const;
        ///
@@ -57,10 +60,15 @@ struct EndTag {
 };
 
 
-// Tags like <img />
+/// Tags like <img />
+/// Attributes will be escaped automatically and so should NOT
+/// be escaped before passing 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;
@@ -89,6 +97,8 @@ public:
        ///
        XHTMLStream & operator<<(docstring const &);
        ///
+       XHTMLStream & operator<<(const char *);
+       ///
        XHTMLStream & operator<<(char_type);
        ///
        XHTMLStream & operator<<(StartTag const &);
@@ -96,12 +106,20 @@ public:
        XHTMLStream & operator<<(EndTag const &);
        ///
        XHTMLStream & operator<<(CompTag const &);
+       /// A trivial struct that functions as a stream modifier.
+       /// << NextRaw() causes the next string-like thing sent to the
+       /// stream not to be escaped.
+       struct NextRaw {};
+       ///
+       XHTMLStream & operator<<(NextRaw const &);
 private:
        ///
        void clearTagDeque();
        ///
        bool isTagOpen(std::string const &);
        ///
+       void writeError(std::string const &);
+       ///
        odocstream & os_;
        ///
        // int tab_;
@@ -113,6 +131,8 @@ private:
        TagDeque pending_tags_;
        /// remembers the history, so we can make sure we nest properly.
        TagStack tag_stack_;
+       /// 
+       bool nextraw_;
 };
 
 ///
@@ -126,6 +146,15 @@ namespace html {
 docstring escapeChar(char_type c);
 /// converts a string to a form safe for links, etc
 docstring htmlize(docstring const & str);
+/// cleans \param str for use as an atttribute by replacing
+/// all non-alnum by "_"
+docstring cleanAttr(docstring const & str);
+///
+std::string escapeChar(char c);
+/// 
+std::string htmlize(std::string const & str);
+/// 
+std::string cleanAttr(std::string const & str);
 
 // to be removed
 /// \return true if tag was opened, false if not