Fix MathML output of wide characters.

[lyx.git] / src / Layout.h

diff --git a/src/Layout.h b/src/Layout.h
index 2601baad068a93186b654e6e46e104f1305a61e2..596c082b5d6aca131dbaf661714cfd732cf2b1e6 100644 (file)
--- a/src/Layout.h
+++ b/src/Layout.h
@@ -73,7 +73,7 @@ public:
        ///
        void readSpacing(Lexer &);
        ///
-       docstring const & name() const { return name_; };
+       docstring const & name() const { return name_; }
        ///
        void setName(docstring const & n) { name_ = n; }
        ///
@@ -122,6 +122,8 @@ public:
        /// 
        std::string const & htmllabelattr() const;
        ///
+       std::string defaultCSSClass() const;
+       ///
        bool htmllabelfirst() const { return htmllabelfirst_; }
        /// 
        docstring htmlstyle() const;
@@ -235,6 +237,8 @@ public:
        LatexType latextype;
        /// Does this object belong in the title part of the document?
        bool intitle;
+       /// Is the content to go in the preamble rather than the body?
+       bool inpreamble;
        /// Does this layout allow for an optional parameter?
        int optionalargs;
        /// Which counter to step
@@ -252,11 +256,9 @@ private:
        /// generates the default CSS for this layout
        void makeDefaultCSS() const;
        ///
-       std::string defaultCSSClass() const;
-       ///
-       std::string defaultCSSItemClass() const { return to_utf8(name()) + "item"; }
+       std::string defaultCSSItemClass() const { return defaultCSSClass() + "_item"; }
        ///
-       std::string defaultCSSLabelClass() const { return to_utf8(name()) + "label"; }
+       std::string defaultCSSLabelClass() const { return defaultCSSClass() + "_label"; }
        
        /// Name of the layout/paragraph environment
        docstring name_;
@@ -317,7 +319,7 @@ private:
        /// Note that when I said "environment", I meant it: This has no
        /// effect for LATEX_PARAGRAPH type layouts.
        mutable std::string htmlitemtag_;
-       /// Attributes for htmlitemtag_. Default is: class="layoutnameitem".
+       /// Attributes for htmlitemtag_. Default is: class="layoutname_item".
        mutable 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
@@ -325,7 +327,7 @@ private:
        /// sections. Defaults to "span".
        /// If set to "NONE", this suppresses the printing of the label.
        mutable std::string htmllabeltag_;
-       /// Attributes for the label. Defaults to: class="layoutnamelabel".
+       /// Attributes for the label. Defaults to: class="layoutname_label".
        mutable std::string htmllabelattr_;
        /// Whether to put the label before the item, or within the item.
        /// I.e., do we have (true):
@@ -340,7 +342,7 @@ private:
        /// has been given? Default is false.
        /// Note that the default CSS is output first, then the user CSS, so it is
        /// possible to override what one does not want.
-       bool htmlforcedefault_;
+       bool htmlforcecss_;
        /// A cache for the default style info so generated.
        mutable docstring htmldefaultstyle_;
        /// Any other info for the HTML header.