Fix part of bug #6127: Roundtrip Lyx->Latex->Lyx fails.

[lyx.git] / src / Counters.h

diff --git a/src/Counters.h b/src/Counters.h
index b9ed95c7a1e3a850fec655cf0402e30f5c7eaf78..fdae212a262ee9947b82abfea786f09ea85abf1c 100644 (file)
--- a/src/Counters.h
+++ b/src/Counters.h
@@ -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_;
 };
 
 
@@ -110,13 +121,18 @@ 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, 
-                              std::set<docstring> * callers = 0) const;
-       /// Are we in apendix?
+       /** 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; };
@@ -129,10 +145,13 @@ public:
        /// Set the state variable indicating whether we are in a subfloat.
        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) const;
+       /** 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