fix two crashes related to dEPM. Some crashes remain

[lyx.git] / src / outputparams.h

diff --git a/src/outputparams.h b/src/outputparams.h
index 54029f58d94f8e0546ac6ccc53cb1bc738b7a176..c5307ff75eff4374f75af6ba8badc5c9368a939f 100644 (file)
--- a/src/outputparams.h
+++ b/src/outputparams.h
@@ -19,9 +19,11 @@
 
 
 class ExportData;
+class LyXFont;
 
 
-struct OutputParams {
+class OutputParams {
+public:
        //
        enum FLAVOR {
                LATEX,
@@ -46,19 +48,23 @@ struct OutputParams {
 
        /** moving_arg == true means that the environment in which the inset
            is typeset is a moving argument. The inset should take care about
-           fragile commands by preceding the latex with \protect.
+           fragile commands by preceding the latex with \\protect.
        */
        bool moving_arg;
 
        /** intitle == true means that the environment in which the
-           inset is typeset is part of a title (before a \maketitle).
+           inset is typeset is part of a title (before a \\maketitle).
            Footnotes in such environments have moving arguments.
        */
        bool intitle;
 
-       /** the babel name of the language at the point where the inset is
+       /** the font at the point where the inset is
         */
-       std::string lang;
+       LyXFont const * local_font;
+
+       /** Document language babel name
+        */
+       mutable std::string document_language;
 
        /** free_spacing == true means that the inset is in a free-spacing
            paragraph.
@@ -69,16 +75,15 @@ struct OutputParams {
        */
        bool use_babel;
 
-       /** Used for docbook to see if inside a region of mixed content.
-           In that case all the white spaces are significant and cannot appear
-           at the begin or end.
-       */
-       bool mixed_content;
-
-       /** Line length to use with ascii export.
+       /** Line length to use with plaintext export.
        */
        lyx::size_type linelen;
 
+       /** The depth of the current paragraph, set for plaintext
+        *  export and used by InsetTabular
+        */
+       int depth;
+
        /** Export data filled in by the latex(), docbook() etc methods.
            This is a hack: Make it possible to add stuff to constant
            OutputParams instances.