Add a pending space after math if it is not the last of the selection. This fixes...

[lyx.git] / src / Layout.h

diff --git a/src/Layout.h b/src/Layout.h
index 3c1d0847d63a50bfb18a5e27fd81922f83533a28..b9d33473894d04c2071e551d7ae1c7ef861af12c 100644 (file)
--- a/src/Layout.h
+++ b/src/Layout.h
@@ -85,7 +85,8 @@ public:
        ///
        void setLatexName(std::string const & n) { latexname_ = n; }
        ///
-       docstring const & labelstring() const { return labelstring_; }
+       docstring const & labelstring(bool in_appendix) const 
+       { return in_appendix ? labelstring_appendix_ : labelstring_; }
        ///
        docstring const & endlabelstring() const { return endlabelstring_; }
        ///
@@ -108,10 +109,24 @@ public:
        std::string const & labeltag() const { return labeltag_; }
        ///
        std::string const & itemtag() const { return itemtag_; }
-       ///
-       docstring const & labelstring_appendix() const {
-               return labelstring_appendix_;
-       }
+       /// 
+       std::string const & htmltag() const { return htmltag_; }
+       /// 
+       std::string const & htmlattr() const { return htmlattr_; }
+       /// 
+       std::string const & htmlitem() const { return htmlitem_; }
+       /// 
+       std::string const & htmlitemattr() const { return htmlitemattr_; }
+       /// 
+       std::string const & htmllabel() const { return htmllabel_; }
+       /// 
+       std::string const & htmllabelattr() const { return htmllabelattr_; }
+       ///
+       bool htmllabelfirst() const { return htmllabelfirst_; }
+       /// 
+       docstring const & htmlstyle() const { return htmlstyle_; }
+       /// 
+       docstring const & htmlpreamble() const { return htmlpreamble_; }
        ///
        bool isParagraph() const { return latextype == LATEX_PARAGRAPH; }
        ///
@@ -271,6 +286,36 @@ private:
        std::string labeltag_;
        /// Internal tag to surround the item text in a list)
        std::string itemtag_;
+       /// Tag for HTML output, e.g., h2.
+       std::string htmltag_;
+       /// Additional attributes for inclusion with the start tag, 
+       /// e.g.: class='section'.
+       std::string htmlattr_;
+       /// Tag for individual paragraphs in an environment. In lists, this
+       /// would be something like "li". But it also needs to be set for
+       /// quotation, e.g., since the paragraphs in a quote need to be 
+       /// in "p" tags.
+       std::string htmlitem_;
+       /// Attributes for htmlitem_
+       std::string htmlitemattr_;
+       /// Tag for labels, of whatever sort. One use for this is in setting
+       /// descriptions, in which case it would be: dt. Another use is to
+       /// customize the display of, say, the auto-generated label for 
+       /// sections (in that case, it might be: span).
+       std::string htmllabel_;
+       /// Attributes for the label.
+       std::string htmllabelattr_;
+       /// Whether to put the label before the item, or within the item.
+       /// I.e., do we have (true):
+       ///    <label>...</label><item>...</item>
+       /// or instead (false):
+       ///    <item><label>...</label>...</item>
+       /// The latter is the default.
+       bool htmllabelfirst_;
+       /// CSS information needed by this layout.
+       docstring htmlstyle_;
+       /// Any other info for the HTML header.
+       docstring htmlpreamble_;
        /// This is the `category' for this layout. The following are
        /// recommended basic categories: FrontMatter, BackMatter, MainText,
        /// Section, Starred, List, Theorem.