X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FOutputParams.h;h=ccb0783a2a95a9067a7d72c331d2854df55fdb90;hb=6ecb05e6eacf823b6d0e1ebfc42a3ddf96d50bed;hp=1a7326ddd8b52bb1a2d893e92456db816bbbc661;hpb=cc5cc067a037d201f162e7ea71a184cf9bed7758;p=lyx.git

diff --git a/src/OutputParams.h b/src/OutputParams.h
index 1a7326ddd8..ccb0783a2a 100644
--- 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 {
 
@@ -35,9 +36,10 @@ public:
 		XETEX,
 		XML,
 		HTML,
-		TEXT
+		TEXT,
+		LYX
 	};
-	
+
 	enum MathFlavor {
 		NotApplicable,
 		MathAsMathML,
@@ -69,10 +71,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
@@ -80,6 +82,12 @@ public:
 	*/
 	bool nice;
 
+	/** Is this a real child (i.e., compiled as a child)?
+	    This depends on wherefrom we export the buffer. Even children
+	    that have a master can be compiled standalone.
+	*/
+	mutable bool is_child;
+
 	/** moving_arg == true means that the environment in which the inset
 	    is typeset is a moving argument. The inset should take care about
 	    fragile commands by preceding the latex with \\protect.
@@ -92,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
 	 */
@@ -106,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;
 
@@ -154,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.
 	*/
@@ -173,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
@@ -198,6 +208,11 @@ public:
 	 */
 	bool inIndexEntry;
 
+	/** Whether we are inside an IPA inset.
+	 *  Needed for proper IPA output.
+	 */
+	bool inIPA;
+
 	/** Whether we are inside an inset that is logically deleted.
 	 *  A value > 0 indicates a deleted inset.
          */
@@ -205,7 +220,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
@@ -227,30 +242,48 @@ 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;
+
+	/// Explicit output folder, if any is desired
+	std::string export_folder;
 };