* ANNOUNCE

[lyx.git] / src / output_xhtml.h

diff --git a/src/output_xhtml.h b/src/output_xhtml.h
index 91b4e685223d31add1b498317444f9275c2df446..986070ddd6745155144f5afcb119ff60ef0547f9 100644 (file)
--- 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"
 
@@ -29,10 +30,10 @@ class Text;
 
 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) 
@@ -67,7 +68,7 @@ struct EndTag {
 // 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)
@@ -83,7 +84,7 @@ struct CompTag {
        std::string attr_;
 };
 
-} // namespace HTML
+} // namespace html
 
 class XHTMLStream {
 public:
@@ -109,6 +110,8 @@ public:
        ///
        XHTMLStream & operator<<(int);
        ///
+       XHTMLStream & operator<<(char);
+       ///
        XHTMLStream & operator<<(html::StartTag const &);
        ///
        XHTMLStream & operator<<(html::EndTag const &);
@@ -149,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);
@@ -164,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