X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FOutputParams.h;h=9a9577f560fc29d2a8af3e9576b0bfdae0097b18;hb=f5669c0a3db80510085ee65df4618d6915317939;hp=52ab2925a5f5fe3cda53673a330eb4b6450b53b5;hpb=70b3d3adccdda2daf9346b995575f9ee658ac5d3;p=lyx.git

diff --git a/src/OutputParams.h b/src/OutputParams.h
index 52ab2925a5..9a9577f560 100644
--- a/src/OutputParams.h
+++ b/src/OutputParams.h
@@ -60,6 +60,14 @@ public:
 		SUBFLOAT
 	};
 
+	enum CtObject {
+		CT_NORMAL,
+		CT_OBJECT,
+		CT_DISPLAYOBJECT,
+		CT_UDISPLAYOBJECT,
+		CT_OMITOBJECT
+	};
+
 	OutputParams(Encoding const *);
 	~OutputParams();
 
@@ -71,6 +79,8 @@ public:
 	bool isLaTeX() const;
 	/// does this flavour support full unicode?
 	bool isFullUnicode() const;
+	/// Do we use the bidi package (which does some reordering and stuff)?
+	bool useBidiPackage() const;
 
 	/// Same, but for math output, which only matter is XHTML output.
 	MathFlavor math_flavor;
@@ -102,6 +112,11 @@ 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 or soul command (e.g., \uline,
 	    \uuline, \uwave, \sout or \xout). Insets that output latex commands
@@ -127,6 +142,9 @@ public:
 	 */
 	mutable Language const * master_language;
 
+	/// Active characters
+	std::string active_chars;
+
 	/** Current stream encoding. Only used for LaTeX.
 	    This must be set to the document encoding (via the constructor)
 	    before output starts. Afterwards it must be kept up to date for
@@ -178,6 +196,9 @@ public:
 	*/
 	std::string index_command;
 
+	/// The Xindy language module
+	std::string xindy_language;
+
 	/** Hyperref driver
 	*/
 	std::string hyperref_driver;
@@ -259,14 +280,19 @@ public:
 
 	/** Whether we are inside an inset that is logically deleted.
 	 *  A value > 0 indicates a deleted inset.
-         */
+	*/
 	int inDeletedInset;
 
 	/** The change information of the outermost logically deleted inset.
 	 *  changeOfDeletedInset shall only be evaluated if inDeletedInset > 0.
-         */
+	*/
 	Change changeOfDeletedInset;
 
+	/** What kind of change tracking object is this?
+	 * Relevant for strikeout method in output
+	 */
+	mutable CtObject ctObject;
+
 	/** allow output of only part of the top-level paragraphs
 	 *  par_begin: beginning paragraph
 	 */
@@ -331,6 +357,15 @@ public:
 
 	/// Explicit output folder, if any is desired
 	std::string export_folder;
+
+	/// Have we already output the title?
+	mutable bool already_title;
+	/// Used to signal we need to output \end{TITLEBLOCK} when title
+	/// environment is used.
+	mutable bool issued_title_cmd;
+	/// Did we already issue the warning about mixing title and
+	/// non-title layouts?
+	mutable bool gave_layout_warning;
 };