#include "support/strfwd.h"
#include <deque>
-#include <vector>
namespace lyx {
std::string attr_;
};
+// trivial struct for output of newlines
+struct CR{};
+
} // namespace html
class XHTMLStream {
///
explicit XHTMLStream(odocstream & os);
///
- void cr();
- ///
odocstream & os() { return os_; }
///
// int & tab() { return tab_; }
/// \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<<(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 &);
+ 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();
///
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_;
};
///
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);