// 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 passing to the constructor.
+/// be escaped before being passed to the constructor.
struct StartTag {
///
- explicit StartTag(std::string const & tag) : tag_(tag) {}
+ explicit StartTag(std::string const & tag) : tag_(tag), keepempty_(false) {}
///
explicit StartTag(std::string const & tag, std::string const & attr,
bool keepempty = false)
// need to re-work a bit of code....
/// Tags like <img />
/// Attributes will be escaped automatically and so should NOT
-/// be escaped before passing to the constructor.
+/// be escaped before being passed to the constructor.
struct CompTag {
///
explicit CompTag(std::string const & tag)
std::string attr_;
};
+} // namespace html
class XHTMLStream {
public:
///
XHTMLStream & operator<<(int);
///
- XHTMLStream & operator<<(StartTag const &);
+ XHTMLStream & operator<<(html::StartTag const &);
///
- XHTMLStream & operator<<(EndTag const &);
+ XHTMLStream & operator<<(html::EndTag const &);
///
- XHTMLStream & operator<<(CompTag 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.
///
// int tab_;
///
- typedef std::deque<StartTag> TagDeque;
+ typedef std::deque<html::StartTag> TagDeque;
///
- typedef std::vector<StartTag> TagStack;
+ typedef std::vector<html::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.
///
std::string cleanAttr(std::string 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 html
} // namespace lyx
#endif