Correct indentation

[lyx.git] / src / OutputParams.h

diff --git a/src/OutputParams.h b/src/OutputParams.h
index f220b5e654d3cf7fa3f61393ec7ae2ead21f4c31..ccb0783a2a95a9067a7d72c331d2854df55fdb90 100644 (file)
--- a/src/OutputParams.h
+++ b/src/OutputParams.h
@@ -13,9 +13,10 @@
 #define OUTPUTPARAMS_H
 
 
-#include "support/shared_ptr.h"
 #include "Changes.h"
 
+#include <memory>
+
 
 namespace lyx {
 
@@ -99,13 +100,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 +114,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 +164,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.
        */
@@ -180,7 +183,7 @@ public:
            This is a hack: Make it possible to add stuff to constant
            OutputParams instances.
        */
-       shared_ptr<ExportData> exportdata;
+       std::shared_ptr<ExportData> exportdata;
 
        /** Whether we are inside a comment inset. Insets that are including
         *  external files like InsetGraphics, InsetInclude and InsetExternal
@@ -252,6 +255,9 @@ public:
        /// 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;
 
@@ -270,6 +276,9 @@ public:
        /// Are we generating this material for use by advanced search?
        bool for_search;
 
+       /// Are we generating this material for instant preview?
+       bool for_preview;
+
        /// Include all children notwithstanding the use of \includeonly
        bool includeall;