X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCounters.h;h=3a04d0313b9d159dc9cb2a38f2335d1550da016c;hb=0a7705a6736a85c3c751f7b4e9998833cdb71fc9;hp=538dcd479215a89a5b885e16f3d303aab9094cc7;hpb=d841355b7e95ae6971edee7dca18f6ab05f20938;p=lyx.git

diff --git a/src/Counters.h b/src/Counters.h
index 538dcd4792..3a04d0313b 100644
--- a/src/Counters.h
+++ b/src/Counters.h
@@ -4,7 +4,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  * \author Jean-Marc Lasgouttes
  * \author John Levon
  * \author Martin Vermeer
@@ -18,7 +18,7 @@
 #include "support/docstring.h"
 
 #include <map>
-#include <set>
+#include <vector>
 
 
 namespace lyx {
@@ -49,14 +49,19 @@ public:
 	docstring const & master() const;
 	/// Returns a LaTeX-like string to format the counter. 
 	/** This is similar to what one gets in LaTeX when using
-	 *  "\the<counter>".
+	 *  "\the<counter>". The \c in_appendix bool tells whether we
+	 *  want the version shown in an appendix.
 	 */
-	docstring const & labelString() const;
-	/// 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 & labelString(bool in_appendix) const;
+	/// Returns a map of LaTeX-like strings to format the counter. 
+	/** For each language, the string is similar to what one gets
+	 *  in LaTeX when using "\the<counter>". The \c in_appendix
+	 *  bool tells whether we want the version shown in an
+	 *  appendix. This version does not contain any \\the<counter>
+	 *  expression.
 	 */
-	docstring const & labelStringAppendix() const;
+	typedef std::map<std::string, docstring> StringMap;
+	StringMap & flatLabelStrings(bool in_appendix) const;
 private:
 	///
 	int value_;
@@ -70,6 +75,12 @@ private:
 	docstring labelstring_;
 	/// The same as labelstring_, but in appendices.
 	docstring labelstringappendix_;
+	/// Cache of the labelstring with \\the<counter> expressions expanded, 
+	/// indexed by language
+	mutable StringMap flatlabelstring_;
+	/// Cache of the appendix labelstring with \\the<counter> expressions expanded, 
+	/// indexed by language
+	mutable StringMap flatlabelstringappendix_;
 };
 
 
@@ -88,8 +99,10 @@ public:
 	/// Checks whether the given counter exists.
 	bool hasCounter(docstring const & c) const;
 	/// reads the counter name
+	/// \param makeNew whether to make a new counter if one 
+	///        doesn't already exist
 	/// \return true on success
-	bool read(Lexer & lex, docstring const & name);
+	bool read(Lexer & lex, docstring const & name, bool makenew);
 	///
 	void set(docstring const & ctr, int val);
 	///
@@ -110,16 +123,21 @@ public:
 	/// the &to array of counters. Empty string matches all.
 	void copy(Counters & from, Counters & to,
 		  docstring const & match = docstring());
-	/// returns the expanded string representation of the counter.
-	docstring theCounter(docstring const & c);
-	/// 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_; };
+	/** returns the expanded string representation of counter \c
+	 *  c. The \c lang code is used to translate the string.
+	 */
+	docstring theCounter(docstring const & c,
+			     std::string const & lang) const;
+	/** Replace in \c format all the LaTeX-like macros that depend
+	 * on counters. The \c lang code is used to translate the
+	 * string.
+	 */
+	docstring counterLabel(docstring const & format,
+			       std::string const & lang) const;
+	/// Are we in appendix?
+	bool appendix() const { return appendix_; }
 	/// Set the state variable indicating whether we are in appendix.
-	void appendix(bool a) { appendix_ = a; };
+	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.
@@ -127,12 +145,15 @@ public:
 	/// 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; };
+	void isSubfloat(bool s) { subfloat_ = s; }
 private:
-	/// returns the expanded string representation of the counter
-	/// with recursion protection through callers.
-	docstring theCounter(docstring const & c, 
-	                     std::set<docstring> & callers);
+	/** expands recusrsively any \\the<counter> macro in the
+	 *  labelstring of \c counter.  The \c lang code is used to
+	 *  translate the string.
+	 */
+	docstring flattenLabelString(docstring const & counter, bool in_appendix,
+				     std::string const &lang,
+				     std::vector<docstring> & callers) const;
 	/// Returns the value of the counter according to the
 	/// numbering scheme numbertype.
 	/** Available numbering schemes are arabic (1, 2,...), roman
@@ -140,11 +161,11 @@ private:
 	 *  B,...) and hebrew.
 	 */
 	docstring labelItem(docstring const & ctr,
-			    docstring const & numbertype);
+			    docstring const & numbertype) const;
 	/// Maps counter (layout) names to actual counters.
 	typedef std::map<docstring, Counter> CounterList;
 	/// Instantiate.
-	CounterList counterList;
+	CounterList counterList_;
 	/// Are we in an appendix?
 	bool appendix_;
 	/// The current enclosing float.