#ifndef OUTPUT_XHTML_H
#define OUTPUT_XHTML_H
+#include "LayoutEnums.h"
+
#include "support/docstream.h"
+#include "support/shared_ptr.h"
#include "support/strfwd.h"
#include <deque>
-#include <vector>
namespace lyx {
namespace html {
/// Attributes will be escaped automatically and so should NOT
/// be escaped before being passed to the constructor.
-struct StartTag {
+struct StartTag
+{
///
explicit StartTag(std::string const & tag) : tag_(tag), keepempty_(false) {}
///
explicit StartTag(std::string const & tag, std::string const & attr,
bool keepempty = false)
: tag_(tag), attr_(attr), keepempty_(keepempty) {}
+ ///
+ ~StartTag() {}
/// <tag_ attr_>
- docstring asTag() const;
+ virtual docstring asTag() const;
/// </tag_>
- docstring asEndTag() const;
+ virtual docstring asEndTag() const;
///
std::string tag_;
///
};
-struct EndTag {
+/// A special case of StartTag, used exclusively for tags that wrap paragraphs.
+struct ParTag : public StartTag
+{
+ ///
+ ParTag(std::string const & tag, std::string const & attr,
+ std::string const & parid)
+ : StartTag(tag, attr), parid_(parid)
+ {}
+ ///
+ ~ParTag() {}
+ ///
+ docstring asTag() const;
+ /// the "magic par label" for this paragraph
+ std::string parid_;
+};
+
+
+struct EndTag
+{
///
explicit EndTag(std::string tag) : tag_(tag) {}
/// </tag_>
};
-// 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 {
+struct CompTag
+{
///
explicit CompTag(std::string const & tag)
: tag_(tag) {}
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(bool keep_empty);
+ /// 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<<(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 &);
+ XHTMLStream & operator<<(html::ParTag 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);
+#if 0
+ /// This routine is for debugging the tag stack, etc. Code
+ /// for it is disabled by default, however, so you will need
+ /// to enable it if you want to use it.
+ void dumpTagStack(std::string const & msg) const;
+#endif
private:
///
void clearTagDeque();
///
- bool isTagOpen(std::string const &);
- ///
- void writeError(std::string const &);
+ bool isTagOpen(std::string const &) const;
///
- odocstream & os_;
+ bool isTagPending(std::string const &) const;
///
- // int tab_;
+ void writeError(std::string const &) const;
///
- typedef std::deque<html::StartTag> TagDeque;
+ odocstream & os_;
+ ///
+ EscapeSettings escape_;
+ // What we would really like to do here is simply use a
+ // deque<StartTag>. But we want to store both StartTags and
+ // sub-classes thereof on this stack, which means we run into the
+ // so-called polymorphic class problem with the STL. We therefore have
+ // to use a deque<StartTag *>, which leads to the question who will
+ // own these pointers and how they will be deleted, so we use shared
+ // pointers.
+ ///
+ typedef shared_ptr<html::StartTag> TagPtr;
+ typedef std::deque<TagPtr> TagDeque;
+ ///
+ template <typename T>
+ shared_ptr<T> makeTagPtr(T const & tag)
+ { return shared_ptr<T>(new T(tag)); }
///
- 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.
- TagStack tag_stack_;
- ///
- bool nextraw_;
+ ///
+ TagDeque tag_stack_;
};
///
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);
projects / lyx.git / blobdiff