X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FOutputParams.h;h=31a705982e1b5962d1ca6a5d0547c78a28bea2fa;hb=21c92c8a129b5f3ff56de33bf2941a25967cffbb;hp=7e578c3b0c07293f7162952ba1f78278de1f1a28;hpb=b536759c0769dab641993347baeb62400455be04;p=lyx.git

diff --git a/src/OutputParams.h b/src/OutputParams.h
index 7e578c3b0c..31a705982e 100644
--- a/src/OutputParams.h
+++ b/src/OutputParams.h
@@ -16,6 +16,7 @@
 #include "Changes.h"
 
 #include <memory>
+#include <set>
 
 
 namespace lyx {
@@ -34,7 +35,7 @@ public:
 		LUATEX,
 		PDFLATEX,
 		XETEX,
-		XML,
+		DOCBOOK5,
 		HTML,
 		TEXT,
 		LYX
@@ -86,7 +87,7 @@ public:
 	MathFlavor math_flavor;
 
 	/** Are we to write a 'nice' LaTeX file or not.
-	    This esentially seems to mean whether InsetInclude, InsetGraphics
+	    This essentially 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
@@ -112,6 +113,15 @@ public:
 	*/
 	bool intitle;
 
+	/** need_maketitle == true means that the last layout was a title layout
+	 * this is to track when \maketitle needs to be output.
+	*/
+	mutable bool need_maketitle;
+
+	/** have_maketitle == true means that \maketitle already hase been output.
+	*/
+	mutable bool have_maketitle;
+
 	/** inbranch == true means that the environment being typeset
 	    is inside an active branch inset.
 	*/
@@ -129,7 +139,7 @@ public:
 	 */
 	Font const * local_font;
 
-	/** Document language babel name
+	/** Document language lyx name
 	 */
 	std::string document_language;
 
@@ -177,6 +187,10 @@ public:
 	*/
 	bool use_polyglossia;
 
+	/** Do we use hyperref?
+	*/
+	bool use_hyperref;
+
 	/// Do we use the CJK package?
 	bool use_CJK;
 
@@ -196,9 +210,6 @@ public:
 	*/
 	std::string index_command;
 
-	/// The Xindy language module
-	std::string xindy_language;
-
 	/** Hyperref driver
 	*/
 	std::string hyperref_driver;
@@ -212,13 +223,13 @@ public:
 	 */
 	int depth;
 
-	/** Export data filled in by the latex(), docbook() etc methods.
+	/** Export data filled in by the latex(), docbook(), etc. methods.
 	    This is a hack: Make it possible to add stuff to constant
 	    OutputParams instances.
 	*/
 	std::shared_ptr<ExportData> exportdata;
 
-	/** Store labels, index entries (etc.) (in \ref post_macro)
+	/** 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)
@@ -340,6 +351,27 @@ public:
 	/// Does the present context even permit paragraphs?
 	bool html_make_pars;
 
+	/// Are we already in a paragraph?
+	bool docbook_in_par;
+
+	/// Does the present context even permit paragraphs?
+	bool docbook_make_pars;
+
+	/// Are paragraphs mandatory in this context?
+	bool docbook_force_pars;
+
+	/// Anchors that should not be output (LyX-side identifier, not DocBook-side).
+	std::set<docstring> docbook_anchors_to_ignore;
+
+	/// Is the current context a float (such as a table or a figure)?
+	bool docbook_in_float;
+
+	/// Is the current context a listing?
+	bool docbook_in_listing;
+
+	/// Is the current context a table?
+	bool docbook_in_table;
+
 	/// Are we generating this material for inclusion in a TOC-like entity?
 	bool for_toc;
 
@@ -357,12 +389,6 @@ 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;
 };