Remove hardcoded values

[lyx.git] / src / OutputParams.h

diff --git a/src/OutputParams.h b/src/OutputParams.h
index 598b5753b8d4e2ae2a0fb032d26a583d77a24614..b3359d417ae18340a63a0c4e4234e4349ddb45fe 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 {
 
@@ -78,6 +79,8 @@ public:
            This esentially seems to mean whether InsetInclude, InsetGraphics
            and InsetExternal should add the absolute path to any external
            files or not.
+           Non-nice LaTeX also includes additional safe line breaks in order to
+           increase the precision of forward/reverse search and error reporting.
        */
        bool nice;
 
@@ -113,9 +116,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 +166,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 +185,17 @@ 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 entering a display math inset.
+        *  Needed to correctly strike out deleted math in change tracking.
+        */
+       mutable bool inDisplayMath;
+
+       /** Whether we are leaving a display math inset.
+        *  Needed to correctly track nested ulem commands in change tracking.
+        */
+       mutable bool wasDisplayMath;
 
        /** Whether we are inside a comment inset. Insets that are including
         *  external files like InsetGraphics, InsetInclude and InsetExternal
@@ -235,7 +250,7 @@ public:
        mutable int lastid;
 
        /// Last position in the last paragraph before an inset
-       mutable int lastpos;
+       mutable pos_type lastpos;
 
        /// is this the last paragraph in the current buffer/inset?
        bool isLastPar;
@@ -252,6 +267,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 +288,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;