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

diff --git a/src/Counters.h b/src/Counters.h
index a83c5226e2..3a04d0313b 100644
--- a/src/Counters.h
+++ b/src/Counters.h
@@ -49,19 +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 \c in_appendix bool tells whether
-	 *  we want the version shown in an appendix.
+	 *  "\the<counter>". The \c in_appendix bool tells whether we
+	 *  want the version shown in an appendix.
 	 */
 	docstring const & labelString(bool in_appendix) const;
-	/// 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 want the version shown in an appendix. This version does 
-	 * not contain any \\the<counter> expression.
+	/// 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 & flatLabelString(bool in_appendix) const;
-	/// set the \c flatLabelString values.
-	void setFlatLabelStrings(docstring const & fls, docstring const & flsa);
+	typedef std::map<std::string, docstring> StringMap;
+	StringMap & flatLabelStrings(bool in_appendix) const;
 private:
 	///
 	int value_;
@@ -75,10 +75,12 @@ private:
 	docstring labelstring_;
 	/// The same as labelstring_, but in appendices.
 	docstring labelstringappendix_;
-	/// A version of the labelstring with \\the<counter> expressions expanded
-	docstring flatlabelstring_;
-	/// A version of the appendix labelstring with \\the<counter> expressions expanded
-	docstring flatlabelstringappendix_;
+	/// 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_;
 };
 
 
@@ -97,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);
 	///
@@ -119,15 +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) const;
-	/// Replace in \c format all the LaTeX-like macros that depend on
-	/// counters.
-	docstring counterLabel(docstring const & format) const;
+	/** 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_; };
+	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.
@@ -135,11 +145,14 @@ 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:
-	/// expands recusrsively any \\the<counter> macro in the
-	/// labelstring of \c counter.
-	docstring flattenLabelString(docstring const & counter, bool in_appendix, 
+	/** 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.