Don't disable apply button if one (or more) of vertical alignment, rotation,

[lyx.git] / src / output_xhtml.h

diff --git a/src/output_xhtml.h b/src/output_xhtml.h
index 874cc9903e68ea181dcf301dc31a017fe0d6f4ab..94bdf0bd2b7f643fbf18802175444dfa6550323b 100644 (file)
--- a/src/output_xhtml.h
+++ b/src/output_xhtml.h
@@ -12,11 +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 {
 
@@ -109,17 +109,22 @@ public:
        ///
        XHTMLStream & operator<<(int);
        ///
+       XHTMLStream & operator<<(char);
+       ///
        XHTMLStream & operator<<(html::StartTag const &);
        ///
        XHTMLStream & operator<<(html::EndTag const &);
        ///
        XHTMLStream & operator<<(html::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 &);
+       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();
@@ -130,17 +135,13 @@ private:
        ///
        odocstream & os_;
        ///
-       // int tab_;
-       ///
-       typedef std::deque<html::StartTag> TagDeque;
-       ///
-       typedef std::vector<html::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_;
        /// 
-       bool nextraw_;
+       EscapeSettings escape_;
 };
 
 ///
@@ -149,18 +150,22 @@ 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);
+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);
+std::string escapeChar(char c, XHTMLStream::EscapeSettings e);
 /// 
-std::string htmlize(std::string const & str);
+std::string htmlize(std::string const & str, XHTMLStream::EscapeSettings e);
 /// 
 std::string cleanAttr(std::string const & str);