GuiBox.cpp: a compile fix

[lyx.git] / src / OutputParams.h

diff --git a/src/OutputParams.h b/src/OutputParams.h
index b34567014429999bed12994561c8cd7723e32f39..e5e9ad0813d0b631b871ba18b72df4999564c67f 100644 (file)
--- a/src/OutputParams.h
+++ b/src/OutputParams.h
@@ -38,7 +38,7 @@ public:
                TEXT,
                LYX
        };
-       
+
        enum MathFlavor {
                NotApplicable,
                MathAsMathML,
@@ -70,10 +70,10 @@ public:
        bool isLaTeX() const;
        /// does this flavour support full unicode?
        bool isFullUnicode() const;
-       
+
        /// Same, but for math output, which only matter is XHTML output.
        MathFlavor math_flavor;
-       
+
        /** Are we to write a 'nice' LaTeX file or not.
            This esentially seems to mean whether InsetInclude, InsetGraphics
            and InsetExternal should add the absolute path to any external
@@ -99,13 +99,13 @@ public:
        */
        bool intitle;
 
-       /** inulemcmd == true means that the environment in which the
+       /** inulemcmd > 0 means that the environment in which the
            inset is typeset is part of a ulem command (\uline, \uuline,
            \uwave, or \sout). Insets that output latex commands relying
            on local assignments (such as \cite) should enclose such
            commands in \mbox{} in order to avoid breakage.
        */
-       mutable bool inulemcmd;
+       mutable int inulemcmd;
 
        /** the font at the point where the inset is
         */
@@ -113,9 +113,11 @@ public:
 
        /** Document language babel name
         */
-       mutable std::string document_language;
+       std::string document_language;
 
        /** The master language. Non-null only for child documents.
+           Note that this is not the language of the top level master, but
+           of the direct parent for nested includes.
         */
        mutable Language const * master_language;
 
@@ -161,11 +163,11 @@ public:
 
        /** Customized bibtex_command
        */
-       mutable std::string bibtex_command;
+       std::string bibtex_command;
 
        /** Customized index_command
        */
-       mutable std::string index_command;
+       std::string index_command;
 
        /** Line length to use with plaintext or LaTeX export.
        */
@@ -217,7 +219,7 @@ public:
 
        /** The change information of the outermost logically deleted inset.
         *  changeOfDeletedInset shall only be evaluated if inDeletedInset > 0.
-         */ 
+         */
        Change changeOfDeletedInset;
 
        /** allow output of only part of the top-level paragraphs
@@ -239,31 +241,40 @@ public:
 
        /// is this the last paragraph in the current buffer/inset?
        bool isLastPar;
-       
+
 
        /** whether or not do actual file copying and image conversion
         *  This mode will be used to preview the source code
         */
        bool dryrun;
-       
+
+       /// whether to display output errors or not
+       bool silent;
+
        /// Should we output verbatim or escape LaTeX's special chars?
        bool pass_thru;
-       
+
+       /// Should we output verbatim specific chars?
+       docstring pass_thru_chars;
+
        /// Should we output captions?
        bool html_disable_captions;
-       
+
        /// Are we already in a paragraph?
        bool html_in_par;
-       
+
        /// Does the present context even permit paragraphs?
        bool html_make_pars;
-       
+
        /// Are we generating this material for inclusion in a TOC-like entity?
        bool for_toc;
-       
+
        /// Are we generating this material for inclusion in a tooltip?
        bool for_tooltip;
 
+       /// Are we generating this material for use by advanced search?
+       bool for_search;
+
        /// Include all children notwithstanding the use of \includeonly
        bool includeall;