X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCounters.h;h=28e7b686322791d3236f7b056c50a0893965d744;hb=2455bc258f3b62c29ec4a41cb88070ff8518e842;hp=44ef598cfe67969d8985e314bb6cdbf3a0049b85;hpb=88177a89cb15a528f462dc1645397f76deda44f5;p=lyx.git

diff --git a/src/Counters.h b/src/Counters.h
index 44ef598cfe..28e7b68632 100644
--- a/src/Counters.h
+++ b/src/Counters.h
@@ -18,6 +18,7 @@
 #include "support/docstring.h"
 
 #include <map>
+#include <set>
 
 
 namespace lyx {
@@ -40,23 +41,28 @@ public:
 	void step();
 	///
 	void reset();
-	/// Returns the master counter of this counter
+	/// Returns the master counter of this counter.
 	docstring const & master() const;
-	/// Returns a LaTeX-like string to format the counter, similar
-	/// to LaTeX' \c \thesubsection.
+	/// Returns a LaTeX-like string to format the counter. 
+	/* This is similar to what one gets in LaTeX when using
+	 * "\the<counter>".
+	 */
 	docstring const & labelString() const;
-	/// Returns a LaTeX-like string to format the counter in
-	/// appendix, similar to LaTeX' \c \thesubsection.
+	/// Returns a LaTeX-like string to format the counter in appendix.
+	/* This is similar to what one gets in LaTeX when using
+	 * "\the<counter>" in an appendix.
+	 */
 	docstring const & labelStringAppendix() const;
 private:
 	///
 	int value_;
-	/// contains master counter name; master counter is the counter
-	/// that, if stepped (incremented) zeroes this counter. E.g.
-	/// "subsection"'s master is "section".
+	/// contains master counter name.
+	/* The master counter is the counter that, if stepped
+	 * (incremented) zeroes this counter. E.g. "subsection"'s
+	 * master is "section".
+	 */
 	docstring master_;
-	// Contains a LaTeX-like string to format the counter, similar
-	// to LaTeX' \c \thesubsection.
+	// Contains a LaTeX-like string to format the counter.
 	docstring labelstring_;
 	// The same as labelstring_, but in appendices.
 	docstring labelstringappendix_;
@@ -67,6 +73,8 @@ private:
 /// Every instantiation is an array of counters of type Counter.
 class Counters {
 public:
+	///
+	Counters() : appendix_(false), subfloat_(false) {}
 	/// Add a new counter to array.
 	void newCounter(docstring const & newc);
 	/// Add new counter having oldc as its master and ls as its label.
@@ -74,7 +82,7 @@ public:
 			docstring const & masterc,
 			docstring const & ls,
 			docstring const & lsa);
-	///
+	/// Checks whether the given counter exists.
 	bool hasCounter(docstring const & c) const;
 	///
 	void set(docstring const & ctr, int val);
@@ -82,10 +90,11 @@ public:
 	void addto(docstring const & ctr, int val);
 	///
 	int value(docstring const & ctr) const;
-	/// Step (increment by one) counter named by arg, and
-	/// zeroes slave counter(s) for which it is the master.
-	/// NOTE sub-slaves not zeroed! That happens at slave's
-	/// first step 0->1. Seems to be sufficient.
+	/// Increment by one counter named by arg, and zeroes slave
+	/// counter(s) for which it is the master.
+	/* Sub-slaves not zeroed! That happens at slave's first step
+	 * 0->1. Seems to be sufficient.
+	 */
 	void step(docstring const & ctr);
 	/// Reset all counters.
 	void reset();
@@ -95,32 +104,47 @@ public:
 	/// the &to array of counters. Empty string matches all.
 	void copy(Counters & from, Counters & to,
 		  docstring const & match = docstring());
-	/// returns the string representation of the counter.
+	/// returns the expanded string representation of the counter.
 	docstring theCounter(docstring const & c);
-	/// A complete expanded label, like 2.1.4 for a subsubsection
-	/// according to the given format
-	docstring counterLabel(docstring const & format);
-	///
+	/// Replace om format all the LaTeX-like macros that depend on
+	/// counters.
+	docstring counterLabel(docstring const & format, 
+	                       std::set<docstring> * callers = 0);
+	/// Are we in apendix?
 	bool appendix() const { return appendix_; };
-	///
+	/// Set the state variable indicating whether we are in appendix.
 	void appendix(bool a) { appendix_ = a; };
-	///
+	/// Returns the current enclosing float.
 	std::string const & current_float() const { return current_float_; }
-	///
+	/// Sets the current enclosing float.
 	void current_float(std::string const & f) { current_float_ = f; }
+	/// Are we in a subfloat?
+	bool isSubfloat() const { return subfloat_; }
+	/// Set the state variable indicating whether we are in a subfloat.
+	void isSubfloat(bool s) { subfloat_ = s; };
 private:
-	/// A counter label's single item, 1 for subsection number in
-	/// the 2.1.4 subsubsection number label.
+	/// returns the expanded string representation of the counter
+	/// with recursion protection through callers.
+	docstring theCounter(docstring const & c, 
+	                     std::set<docstring> & callers);
+	/// Returns the value of the counter according to the
+	/// numbering scheme numbertype.
+	/* Available numbering schemes are arabic (1, 2,...), roman
+	 * (i, ii,...), Roman (I, II,...), alph (a, b,...), Alpha (A,
+	 * B,...) and hebrew.
+	 */
 	docstring labelItem(docstring const & ctr,
 			    docstring const & numbertype);
 	/// Maps counter (layout) names to actual counters.
 	typedef std::map<docstring, Counter> CounterList;
 	/// Instantiate.
 	CounterList counterList;
-	///
+	/// Are we in an appendix?
 	bool appendix_;
-	///
+	/// The current enclosing float.
 	std::string current_float_;
+	/// Are we in a subfloat?
+	bool subfloat_;
 };