X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FOutputParams.h;h=1631dac9d09d2989994bf44cafe5bfcdfc53e878;hb=28be7d552f62cc02fa86d7f79201d089bfb2d7b5;hp=49270857ee85c00933898a600890d66eea478783;hpb=8c14d9e0413978aa11f581e9c6f2d0587bb0b189;p=lyx.git

diff --git a/src/OutputParams.h b/src/OutputParams.h
index 49270857ee..1631dac9d0 100644
--- a/src/OutputParams.h
+++ b/src/OutputParams.h
@@ -79,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;
 
@@ -102,7 +104,7 @@ public:
 
 	/** 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.
 	*/
@@ -141,16 +143,6 @@ public:
 	 */
 	mutable Encoding const * encoding;
 
-	/** Pointer to a function for registering a language switch
-	    when using polyglossia.
-	*/
-	mutable void (* pushPolyglossiaLang)(std::string const & lang_name);
-
-	/** Pointer to a function for unregistering  the last language
-	    switch when using polyglossia.
-	*/
-	mutable void (* popPolyglossiaLang)();
-
 	/** free_spacing == true means that the inset is in a free-spacing
 	    paragraph.
 	*/
@@ -195,6 +187,16 @@ public:
 	*/
 	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
 	 *  may only write the usual output and must not attempt to do
@@ -203,6 +205,15 @@ public:
 	 */
 	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.
          */
@@ -254,7 +265,7 @@ public:
 	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;