simplify setInsetFont, removing a potential bug (an invalid DocIterator was built...

[lyx.git] / src / OutputParams.h

diff --git a/src/OutputParams.h b/src/OutputParams.h
index fd2894fa2e37bd167b70947324669ede22a47384..c45c1092299c3b605290d84f014bc57159e54680 100644 (file)
--- a/src/OutputParams.h
+++ b/src/OutputParams.h
@@ -16,6 +16,7 @@
 
 #include "support/types.h"
 #include <boost/shared_ptr.hpp>
+#include "Changes.h"
 
 
 namespace lyx {
@@ -23,7 +24,7 @@ namespace lyx {
 
 class Encoding;
 class ExportData;
-class LyXFont;
+class Font;
 
 
 class OutputParams {
@@ -63,7 +64,7 @@ public:
 
        /** the font at the point where the inset is
         */
-       LyXFont const * local_font;
+       Font const * local_font;
 
        /** Document language babel name
         */
@@ -77,7 +78,7 @@ public:
            copy (e.g. in insets): \code
            int InsetFoo::latex(..., OutputParams const & runparams_in) const
            {
-               OutputParams runparams(runparams_in);
+               OutputParams runparams(runparams_in);
                runparams.inComment = true;
                ...
                InsetBla::latex(..., runparams);
@@ -120,18 +121,28 @@ public:
         */
        bool inComment;
 
-       /** allow output of only part of the top-level paragraphs 
+       /** Whether we are inside an inset that is logically deleted.
+        *  A value > 0 indicates a deleted inset.
+         */
+       int inDeletedInset;
+
+       /** The change information of the outermost logically deleted inset.
+        *  changeOfDeletedInset shall only be evaluated if inDeletedInset > 0.
+         */ 
+       Change changeOfDeletedInset;
+
+       /** allow output of only part of the top-level paragraphs
         *  par_begin: beginning paragraph
         */
        pit_type par_begin;
 
-       /** allow output of only part of the top-level paragraphs 
+       /** allow output of only part of the top-level paragraphs
         *  par_end: par_end-1 is the ending paragraph
         *  if par_begin=par_end, output all paragraphs
         */
        pit_type par_end;
 
-       /** whether or not do actual file copying and image conversion 
+       /** whether or not do actual file copying and image conversion
         *  This mode will be used to preview the source code
         */
        bool dryrun;