Merge branch 'master' of git.lyx.org:lyx

[lyx.git] / src / Layout.h

diff --git a/src/Layout.h b/src/Layout.h
index 4f4f1c7899c3a3e1e6ef430103f1ff16b38c0337..53fb682a6ef279c5b5ed87f23796f591a8105b1c 100644 (file)
--- a/src/Layout.h
+++ b/src/Layout.h
@@ -106,9 +106,12 @@ public:
                FontInfo labelfont;
                bool autoinsert;
                bool insertcotext;
+               bool insertonnewline;
                ArgPassThru passthru;
                docstring pass_thru_chars;
                bool is_toc_caption;
+               bool free_spacing;
+               std::string newlinecmd;
        };
        ///
        typedef std::map<std::string, latexarg> LaTeXArgMap;
@@ -317,6 +320,9 @@ public:
        /** true when the verbatim stuff of this layout needs to be
            \cprotect'ed. */
        bool needcprotect;
+       /** true when specific commands in this paragraph need to be
+           protected in an \mbox. */
+       bool needmboxprotect;
        /// true when empty paragraphs should be kept.
        bool keepempty;
        /// Type of LaTeX object