X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FOutputParams.h;h=16fe7c4a765a03d75c64401aceda0c90d5f179a3;hb=7c3fd636469b0a7f50f3515d100d9e957cda16b9;hp=40857d5aa8ec46317244c87f5f5d3e786f9fa3c4;hpb=02c73cd7213a22d290dd18c127bf2350fd5a8dae;p=lyx.git

diff --git a/src/OutputParams.h b/src/OutputParams.h
index 40857d5aa8..16fe7c4a76 100644
--- 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,28 +241,43 @@ 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;
+
+	/// Are we generating this material for instant preview?
+	bool for_preview;
+
 	/// Include all children notwithstanding the use of \includeonly
 	bool includeall;