Account for old versions of Pygments

[lyx.git] / src / Layout.h

diff --git a/src/Layout.h b/src/Layout.h
index b18271a0a5c56afd40a7c38863d15592f64636ae..ba4d26fb37c76a475a280f1bf2a91c5bde7615a0 100644 (file)
--- a/src/Layout.h
+++ b/src/Layout.h
@@ -105,7 +105,9 @@ public:
                FontInfo labelfont;
                bool autoinsert;
                bool insertcotext;
+               ArgPassThru passthru;
                docstring pass_thru_chars;
+               bool is_toc_caption;
        };
        ///
        typedef std::map<std::string, latexarg> LaTeXArgMap;
@@ -115,6 +117,9 @@ public:
        LaTeXArgMap const & postcommandargs() const { return postcommandargs_; }
        ///
        LaTeXArgMap const & itemargs() const { return itemargs_; }
+       /// Returns true is the layout has arguments. If false, then an
+       /// InsetArgument in this layout stands for the parent InsetText.
+       bool hasArgs() const;
        /// Returns latexargs() + postcommandargs() + itemargs().
        /// But note that it returns a *copy*, not a reference, so do not do
        /// anything like:
@@ -190,10 +195,7 @@ public:
        }
        /// Is this the kind of layout in which adjacent paragraphs
        /// are handled as one group?
-       bool isParagraphGroup() const {
-       return latextype == LATEX_ENVIRONMENT
-               || latextype == LATEX_BIB_ENVIRONMENT;
-       }
+       bool isParagraphGroup() const { return par_group_; }
        ///
        bool labelIsInline() const {
                return labeltype == LABEL_STATIC
@@ -206,6 +208,12 @@ public:
                        || labeltype == LABEL_CENTERED
                  || labeltype == LABEL_BIBLIO;
        }
+       ///
+       bool addToToc() const { return add_to_toc_; }
+       ///
+       std::string tocType() const { return toc_type_; }
+       ///
+       bool isTocCaption() const { return is_toc_caption_; }
 
        ///
        bool operator==(Layout const &) const;
@@ -309,6 +317,10 @@ public:
        bool inpreamble;
        /// Which counter to step
        docstring counter;
+       /// Resume counter?
+       bool resumecounter;
+       /// Step master counter?
+       bool stepmastercounter;
        /// Prefix to use when creating labels
        docstring refprefix;
        /// Depth of XML command
@@ -452,6 +464,8 @@ private:
        docstring langpreamble_;
        /// Language and babel dependent macro definitions needed for this layout
        docstring babelpreamble_;
+       /// Are adjacent paragraphs handled as one group?
+       bool par_group_;
        /// Packages needed for this layout
        std::set<std::string> requires_;
        ///
@@ -460,8 +474,15 @@ private:
        LaTeXArgMap postcommandargs_;
        ///
        LaTeXArgMap itemargs_;
+       ///
+       bool add_to_toc_;
+       ///
+       std::string toc_type_;
+       ///
+       bool is_toc_caption_;
 };
 
+
 } // namespace lyx
 
 #endif