Properly restore the file encoding after a LaTeX environment with local scope.

[lyx.git] / src / Layout.h

diff --git a/src/Layout.h b/src/Layout.h
index e41c3069e5fc3ce7128efa233ef798bac8a2a92c..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_; }
        ///
@@ -120,15 +121,13 @@ public:
        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_; }
        ///
-       docstring const & labelstring_appendix() const {
-               return labelstring_appendix_;
-       }
-       ///
        bool isParagraph() const { return latextype == LATEX_PARAGRAPH; }
        ///
        bool isCommand() const { return latextype == LATEX_COMMAND; }
@@ -306,6 +305,13 @@ private:
        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.