Fix bug #10895.

[lyx.git] / src / OutputParams.h

diff --git a/src/OutputParams.h b/src/OutputParams.h
index 87d8fcd122abebc74581f017b72ac615e37b6199..1631dac9d09d2989994bf44cafe5bfcdfc53e878 100644 (file)
--- a/src/OutputParams.h
+++ b/src/OutputParams.h
@@ -13,9 +13,10 @@
 #define OUTPUTPARAMS_H
 
 
 #define OUTPUTPARAMS_H
 
 

-#include "support/shared_ptr.h"

 #include "Changes.h"
 
 #include "Changes.h"
 

+#include <memory>
+

 
 namespace lyx {
 
 
 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.
            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;
 
        */
        bool nice;
 


@@ -101,7 +104,7 @@ public:
 
        /** inulemcmd > 0 means that the environment in which the
            inset is typeset is part of a ulem command (\uline, \uuline,
 
        /** 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
+           \uwave, \sout  or \xout). Insets that output latex commands relying

            on local assignments (such as \cite) should enclose such
            commands in \mbox{} in order to avoid breakage.
        */
            on local assignments (such as \cite) should enclose such
            commands in \mbox{} in order to avoid breakage.
        */


@@ -113,7 +116,7 @@ public:
 
        /** Document language babel name
         */
 
        /** 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
 
        /** The master language. Non-null only for child documents.
            Note that this is not the language of the top level master, but


@@ -163,11 +166,11 @@ public:
 
        /** Customized bibtex_command
        */
 
        /** Customized bibtex_command
        */

-       mutable std::string bibtex_command;
+       std::string bibtex_command;

 
        /** Customized index_command
        */
 
        /** Customized index_command
        */

-       mutable std::string index_command;
+       std::string index_command;

 
        /** Line length to use with plaintext or LaTeX export.
        */
 
        /** Line length to use with plaintext or LaTeX export.
        */


@@ -182,7 +185,17 @@ public:
            This is a hack: Make it possible to add stuff to constant
            OutputParams instances.
        */
            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
 
        /** Whether we are inside a comment inset. Insets that are including
         *  external files like InsetGraphics, InsetInclude and InsetExternal


@@ -192,6 +205,15 @@ public:
         */
        bool inComment;
 
         */
        bool inComment;
 

+       /** Whether a btUnit (for multiple biblographies) is open.
+        */
+       mutable bool openbtUnit;
+
+       /** Process only the children's aux files with BibTeX.
+        *  This is necessary with chapterbib.
+        */
+       bool only_childbibs;
+

        /** Whether we are in a table cell.
         *  For newline, it matters whether its content is aligned or not.
          */
        /** Whether we are in a table cell.
         *  For newline, it matters whether its content is aligned or not.
          */


@@ -237,13 +259,13 @@ public:
        mutable int lastid;
 
        /// Last position in the last paragraph before an inset
        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;
 
 
 
        /// is this the last paragraph in the current buffer/inset?
        bool isLastPar;
 
 

-       /** whether or not do actual file copying and image conversion
+       /** whether or not to do actual file copying and image conversion

         *  This mode will be used to preview the source code
         */
        bool dryrun;
         *  This mode will be used to preview the source code
         */
        bool dryrun;


@@ -254,6 +276,9 @@ public:
        /// Should we output verbatim or escape LaTeX's special chars?
        bool pass_thru;
 
        /// 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;
 
        /// Should we output captions?
        bool html_disable_captions;
 


@@ -272,6 +297,9 @@ public:
        /// Are we generating this material for use by advanced search?
        bool for_search;
 
        /// 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;
 
        /// Include all children notwithstanding the use of \includeonly
        bool includeall;