X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Foutput_xhtml.h;h=986070ddd6745155144f5afcb119ff60ef0547f9;hb=a3c84666b2dbfc75c9a80cf4f94612149cb2b570;hp=de88282a8044a773f03a3cf8fb956a6988d8d770;hpb=c5738e5af62822bf44dfb8d03c729aa569ecc9aa;p=lyx.git
diff --git a/src/output_xhtml.h b/src/output_xhtml.h
index de88282a80..986070ddd6 100644
--- a/src/output_xhtml.h
+++ b/src/output_xhtml.h
@@ -12,6 +12,7 @@
#ifndef OUTPUT_XHTML_H
#define OUTPUT_XHTML_H
+#include "LayoutEnums.h"
#include "support/docstream.h"
#include "support/strfwd.h"
@@ -27,11 +28,12 @@ class Text;
// 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)
@@ -60,9 +62,13 @@ struct EndTag {
};
+// 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
/// 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)
@@ -78,6 +84,7 @@ struct CompTag {
std::string attr_;
};
+} // namespace html
class XHTMLStream {
public:
@@ -101,11 +108,15 @@ public:
///
XHTMLStream & operator<<(char_type);
///
- XHTMLStream & operator<<(StartTag const &);
+ XHTMLStream & operator<<(int);
+ ///
+ XHTMLStream & operator<<(char);
///
- XHTMLStream & operator<<(EndTag const &);
+ XHTMLStream & operator<<(html::StartTag const &);
///
- XHTMLStream & operator<<(CompTag 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.
@@ -124,9 +135,9 @@ private:
///
// int tab_;
///
- typedef std::deque TagDeque;
+ typedef std::deque TagDeque;
///
- typedef std::vector TagStack;
+ typedef std::vector 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.
@@ -141,6 +152,10 @@ 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);
@@ -156,13 +171,7 @@ std::string htmlize(std::string const & str);
///
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