X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Foutput_xhtml.h;h=ac405cdebd00a880a052d7cb38248ca70e1772d1;hb=80dfb44171bdb081ec56ae9bd7bcc301359cb1ab;hp=ceabc42dcf38150e23353f4a66c24cbeacfe47a6;hpb=ad56bb7286cabddefb4d2e470b833ac1874623a3;p=lyx.git
diff --git a/src/output_xhtml.h b/src/output_xhtml.h
index ceabc42dcf..ac405cdebd 100644
--- a/src/output_xhtml.h
+++ b/src/output_xhtml.h
@@ -30,6 +30,10 @@ class Text;
// came from MathStream and its cousins.
namespace html {
+
+struct FontTag;
+struct EndFontTag;
+
/// Attributes will be escaped automatically and so should NOT
/// be escaped before being passed to the constructor.
struct StartTag
@@ -43,9 +47,19 @@ struct StartTag
///
~StartTag() {}
///
- virtual docstring asTag() const;
+ virtual docstring writeTag() const;
///
- virtual docstring asEndTag() const;
+ virtual docstring writeEndTag() const;
+ ///
+ virtual FontTag const * asFontTag() const { return 0; }
+ ///
+ virtual bool operator==(StartTag const & rhs) const
+ { return tag_ == rhs.tag_; }
+ ///
+ virtual bool operator!=(StartTag const & rhs) const
+ { return !(*this == rhs); }
+ ///
+ virtual bool operator==(FontTag const & rhs) const;
///
std::string tag_;
///
@@ -56,29 +70,21 @@ struct StartTag
};
-/// 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) {}
///
- docstring asEndTag() const;
+ virtual docstring writeEndTag() const;
+ ///
+ bool operator==(StartTag const & rhs) const
+ { return tag_ == rhs.tag_; }
+ ///
+ bool operator!=(StartTag const & rhs) const
+ { return !(*this == rhs); }
+ ///
+ virtual EndFontTag const * asFontTag() const { return 0; }
///
std::string tag_;
};
@@ -96,7 +102,7 @@ struct CompTag
explicit CompTag(std::string const & tag, std::string const & attr)
: tag_(tag), attr_(attr) {}
///
- docstring asTag() const;
+ docstring writeTag() const;
///
std::string tag_;
///
@@ -104,6 +110,85 @@ struct CompTag
};
+/// A special case of StartTag, used exclusively for tags that wrap paragraphs.
+struct ParTag : public StartTag
+{
+ ///
+ explicit ParTag(std::string const & tag, std::string const & attr,
+ std::string const & parid)
+ : StartTag(tag, attr), parid_(parid)
+ {}
+ ///
+ ~ParTag() {}
+ ///
+ docstring writeTag() const;
+ /// the "magic par label" for this paragraph
+ std::string parid_;
+};
+
+
+///
+enum FontTypes {
+ // ranges
+ FT_EMPH,
+ FT_NOUN,
+ FT_UBAR,
+ FT_DBAR,
+ FT_WAVE,
+ FT_SOUT,
+ // bold
+ FT_BOLD,
+ // shapes
+ FT_UPRIGHT,
+ FT_ITALIC,
+ FT_SLANTED,
+ FT_SMALLCAPS,
+ // families
+ FT_ROMAN,
+ FT_SANS,
+ FT_TYPE,
+ // sizes
+ FT_SIZE_TINY,
+ FT_SIZE_SCRIPT,
+ FT_SIZE_FOOTNOTE,
+ FT_SIZE_SMALL,
+ FT_SIZE_NORMAL,
+ FT_SIZE_LARGE,
+ FT_SIZE_LARGER,
+ FT_SIZE_LARGEST,
+ FT_SIZE_HUGE,
+ FT_SIZE_HUGER,
+ FT_SIZE_INCREASE,
+ FT_SIZE_DECREASE
+};
+
+
+///
+struct FontTag : public StartTag
+{
+ ///
+ explicit FontTag(FontTypes type);
+ ///
+ FontTag const * asFontTag() const { return this; }
+ ///
+ bool operator==(StartTag const &) const;
+ ///
+ FontTypes font_type_;
+};
+
+
+///
+struct EndFontTag : public EndTag
+{
+ ///
+ explicit EndFontTag(FontTypes type);
+ ///
+ EndFontTag const * asFontTag() const { return this; }
+ ///
+ FontTypes font_type_;
+};
+
+
// trivial struct for output of newlines
struct CR{};
@@ -147,6 +232,8 @@ public:
///
XHTMLStream & operator<<(html::ParTag const &);
///
+ XHTMLStream & operator<<(html::FontTag const &);
+ ///
XHTMLStream & operator<<(html::CR const &);
///
enum EscapeSettings {
@@ -167,9 +254,11 @@ private:
///
void clearTagDeque();
///
- bool isTagOpen(std::string const &) const;
+ bool isTagOpen(html::StartTag const &) const;
+ ///
+ bool isTagOpen(html::EndTag const &) const;
///
- bool isTagPending(std::string const &) const;
+ bool isTagPending(html::StartTag const &) const;
///
void writeError(std::string const &) const;
///