Avoid endless loop when the window is too narrow

[lyx.git] / src / Counters.h

diff --git a/src/Counters.h b/src/Counters.h
index 41b80e6076fbbdcbd60f93ba2f9cc9da1de9506b..ce122c4140ebbf71216cee445dfecc20457b3d58 100644 (file)
--- a/src/Counters.h
+++ b/src/Counters.h
@@ -50,6 +50,10 @@ public:
        void reset();
        /// Returns the master counter of this counter.
        docstring const & master() const;
+       /// Checks if the master counter is cnt, and if so removes
+       /// it. This is used when a counter is deleted.
+       /// \return whether we removed the master.
+       bool checkAndRemoveMaster(docstring const & cnt);
        /// Returns a LaTeX-like string to format the counter. 
        /** This is similar to what one gets in LaTeX when using
         *  "\the<counter>". The \c in_appendix bool tells whether we
@@ -72,6 +76,9 @@ public:
 private:
        ///
        int value_;
+       /// This is actually one less than the initial value, since the
+       /// counter is always stepped before being used.
+       int initial_value_;
        /// contains master counter name.
        /** The master counter is the counter that, if stepped
         *  (incremented) zeroes this counter. E.g. "subsection"'s
@@ -165,6 +172,10 @@ public:
        bool isSubfloat() const { return subfloat_; }
        /// Set the state variable indicating whether we are in a subfloat.
        void isSubfloat(bool s) { subfloat_ = s; }
+       /// Are we in a longtable?
+       bool isLongtable() const { return longtable_; }
+       /// Set the state variable indicating whether we are in a longtable.
+       void isLongtable(bool s) { longtable_ = s; }
        
        /// \name refstepcounter        
        // @{
@@ -218,6 +229,8 @@ private:
        std::string current_float_;
        /// Are we in a subfloat?
        bool subfloat_;
+       /// Are we in a longtable?
+       bool longtable_;
        /// Used to keep track of active counters.
        std::vector<docstring> counter_stack_;
        /// Same, but for last layout.