X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FOutputParams.h;h=1abbfe8dc776c29e45a6eb16d4be77f1130ac7af;hb=2098f1d8c20d51e63e670bcdc9da8996068975bf;hp=75e6918089ff10a1d3bae1b23d3bebc0e7a9f905;hpb=7ba2bfb81d5318a010d2f3d34e084d8c68efd42d;p=lyx.git

diff --git a/src/OutputParams.h b/src/OutputParams.h
index 75e6918089..1abbfe8dc7 100644
--- a/src/OutputParams.h
+++ b/src/OutputParams.h
@@ -25,6 +25,7 @@ namespace lyx {
 class Encoding;
 class ExportData;
 class Font;
+class Language;
 
 
 class OutputParams {
@@ -33,7 +34,9 @@ public:
 		LATEX,
 		PDFLATEX,
 		XETEX,
-		XML
+		XML,
+		HTML,
+		TEXT
 	};
 
 	enum TableCell {
@@ -91,6 +94,10 @@ public:
 	 */
 	mutable std::string document_language;
 
+	/** The master language. Non-null only for child documents.
+	 */
+	mutable Language const * master_language;
+
 	/** 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
@@ -135,7 +142,7 @@ public:
 	*/
 	mutable std::string index_command;
 
-	/** Line length to use with plaintext export.
+	/** Line length to use with plaintext or LaTeX export.
 	*/
 	size_type linelen;
 
@@ -168,6 +175,11 @@ public:
 	 */
 	Float inFloat;
 
+	/** Whether we are inside an index inset.
+	 *  ERT needs to know this, due to the active chars.
+	 */
+	bool inIndexEntry;
+
 	/** Whether we are inside an inset that is logically deleted.
 	 *  A value > 0 indicates a deleted inset.
          */
@@ -198,6 +210,12 @@ public:
 	bool dryrun;
 	/// Should we output verbatim or escape LaTeX's special chars?
 	bool verbatim;
+	/// 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;
 };