How about if we write a script to do some of this and stop doing it

[lyx.git] / src / OutputParams.h

diff --git a/src/OutputParams.h b/src/OutputParams.h
index 4d4cae6cae242f92c2561917fb690828da2f5694..1abbfe8dc776c29e45a6eb16d4be77f1130ac7af 100644 (file)
--- 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
@@ -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,8 +210,12 @@ public:
        bool dryrun;
        /// Should we output verbatim or escape LaTeX's special chars?
        bool verbatim;
-       /// Should we output captions? (Used in HTML output.)
-       bool disable_captions;
+       /// 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;
 };