X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCounters.h;h=360e297070a3bc256bb6f3325ef5d2388b420d63;hb=2de30c62f8d671a8c8d4d52a6a7310e2c5ca84de;hp=511c4902c84230c26e2dddf52fb1814f9878b691;hpb=152aba682f5dd5e7568b1508676374315f66e827;p=lyx.git

diff --git a/src/Counters.h b/src/Counters.h
index 511c4902c8..360e297070 100644
--- a/src/Counters.h
+++ b/src/Counters.h
@@ -76,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
@@ -125,10 +128,14 @@ public:
 	void addto(docstring const & ctr, int val);
 	///
 	int value(docstring const & ctr) const;
-	/// Increment by one counter named by arg, and zeroes slave
+	/// Reset recursively all the counters that are slaves of the one named by \c ctr.
+	void resetSlaves(docstring const & ctr);
+	/// Increment by one master of counter named by \c ctr.
+	/// This also resets the counter named by \c ctr.
+	/// \param utype determines whether we track the counters.
+	void stepMaster(docstring const & ctr, UpdateType utype);
+	/// Increment by one counter named by \c ctr, and zeroes slave
 	/// counter(s) for which it is the master.
-	/// Sub-slaves are not zeroed! That happens at slave's first 
-	/// step 0->1. Seems to be sufficient.
 	/// \param utype determines whether we track the counters.
 	void step(docstring const & ctr, UpdateType utype);
 	/// Reset all counters, and all the internal data structures
@@ -169,6 +176,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	
 	// @{
@@ -222,6 +233,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.