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

diff --git a/src/OutputParams.h b/src/OutputParams.h
index ccb0783a2a..3ec4eddf22 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;
 
@@ -100,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, or \sout). 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;
@@ -116,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.
@@ -154,6 +164,9 @@ public:
 	*/
 	bool use_polyglossia;
 
+	/// Do we use the CJK package?
+	bool use_CJK;
+
 	/** Are we generating multiple indices?
 	*/
 	bool use_indices;
@@ -170,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;
@@ -185,6 +202,29 @@ 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.
+	 */
+	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
@@ -193,6 +233,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.
          */
@@ -238,13 +287,13 @@ public:
 	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;
 
 
-	/** 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;
@@ -258,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;