X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FOutputParams.h;h=3ec4eddf226afe2e198561e4ca620ce7abb132ee;hb=1e519d1115f41f71c253cb9e2fbb7803e9a583a9;hp=ddb3482b02c07e0c388b292f96ef849afd1fb394;hpb=e575e7eebd32d687f3e23be0eeca185adb3b341b;p=lyx.git

diff --git a/src/OutputParams.h b/src/OutputParams.h
index ddb3482b02..3ec4eddf22 100644
--- a/src/OutputParams.h
+++ b/src/OutputParams.h
@@ -102,10 +102,15 @@ public:
 	*/
 	bool intitle;
 
+	/** inbranch == true means that the environment being typeset
+	    is inside an active branch inset.
+	*/
+	bool inbranch;
+
 	/** inulemcmd > 0 means that the environment in which the
-	    inset is typeset is part of a ulem command (\uline, \uuline,
-	    \uwave, \sout  or \xout). Insets that output latex commands relying
-	    on local assignments (such as \cite) should enclose such
+	    inset is typeset is part of a ulem or soul command (e.g., \uline,
+	    \uuline, \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.
 	*/
 	mutable int inulemcmd;
@@ -118,6 +123,9 @@ public:
 	 */
 	std::string document_language;
 
+	/// main font encoding of the document
+	std::string main_fontenc;
+
 	/** 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.
@@ -156,6 +164,9 @@ public:
 	*/
 	bool use_polyglossia;
 
+	/// Do we use the CJK package?
+	bool use_CJK;
+
 	/** Are we generating multiple indices?
 	*/
 	bool use_indices;
@@ -172,6 +183,10 @@ public:
 	*/
 	std::string index_command;
 
+	/** Hyperref driver
+	*/
+	std::string hyperref_driver;
+
 	/** Line length to use with plaintext or LaTeX export.
 	*/
 	size_type linelen;
@@ -187,6 +202,19 @@ public:
 	*/
 	std::shared_ptr<ExportData> exportdata;
 
+	/** Store labels, index entries (etc.) (in \ref post_macro)
+	 *  and output them later. This is used in particular to get
+	 *  labels and index entries (and potentially other fragile commands)
+	 *  outside of moving arguments (bug 2154)
+	 */
+	bool postpone_fragile_stuff;
+
+	/** Stuff to be postponed and output after the current macro
+	 *  (if \ref postpone_fragile_stuff is true). Used for labels and index
+	 *  entries in commands with moving arguments (\\section, \\caption etc.)
+	 */
+	mutable docstring post_macro;
+
 	/** Whether we are entering a display math inset.
 	 *  Needed to correctly strike out deleted math in change tracking.
 	 */
@@ -265,7 +293,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;
@@ -279,6 +307,9 @@ public:
 	/// Should we output verbatim specific chars?
 	docstring pass_thru_chars;
 
+	/// A specific newline macro
+	std::string newlinecmd;
+
 	/// Should we output captions?
 	bool html_disable_captions;