CALS tables: base implementation of row separators on the new code from XHTML.

[features.git] / src / OutputParams.h

diff --git a/src/OutputParams.h b/src/OutputParams.h
index 2191a83fde7e04ecc37cddd3787dcb5199820685..d00ec02d88a5d2cee665ddbb41dbec82546bd4b5 100644 (file)
--- a/src/OutputParams.h
+++ b/src/OutputParams.h
@@ -139,7 +139,26 @@ public:
        mutable int inulemcmd = 0;
 
        /** the font at the point where the inset is
-        */
+        *
+        * Note from lasgouttes: I have doubts on the semantics of this
+        * variable. Until this is sorted out, here are some notes on the
+        * history of local_font.
+        *
+        * A research that excludes test and assignment [*] shows that
+        * this is only used to remember language, which is a different
+        * story (and not changed by this patch). The only exception being
+        * in InsetMathHull::getCtObject and InsetMathNest::latex to
+        * support change tracking in insets, but I am not 100% sure that
+        * this is required. And historically [**] local_font used to be
+        * local_lang; it may be good to return to this simpler variable
+        * later.
+        *
+        *  [*] git grep local_font src|grep -v 'local_font [!=]*='
+        *
+        * [**] before afed118a, which improved support for InsetLine;
+        * however, since 0e7ab29f, InsetLine does not depend on the
+        * current font anymore.
+       */
        Font const * local_font = nullptr;
 
        /** Document language lyx name
@@ -283,7 +302,7 @@ public:
 
        /** Whether we are in a table cell.
         *  For newline, it matters whether its content is aligned or not.
-         */
+       */
        TableCell inTableCell = NO;
 
        /** Whether we are inside a float or subfloat.
@@ -407,12 +426,13 @@ public:
 
        /// Are we generating this material for use by advanced search?
        enum Search {
-               NoSearch,
-               SearchWithDeleted,
-               SearchWithoutDeleted
+               NoSearch = 0,
+               SearchWithDeleted = 1,
+               SearchWithoutDeleted = 2,
+               SearchNonOutput = 8
        };
                
-       enum Search for_searchAdv = NoSearch;
+       int for_searchAdv = NoSearch;
 
        /// Are we generating this material for instant preview?
        bool for_preview = false;
@@ -422,6 +442,9 @@ public:
 
        /// Explicit output folder, if any is desired
        std::string export_folder;
+
+       /// A postponed \\noindent (after VSpace)
+       mutable bool need_noindent = false;
 };