Fix the placement of the cursor when right-clicking on an inset inside a branch inset.

[lyx.git] / src / Counters.h

diff --git a/src/Counters.h b/src/Counters.h
index b9ed95c7a1e3a850fec655cf0402e30f5c7eaf78..a83c5226e211027e9d11c266aaa5edaf7fb7afe4 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.
+       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>" in an appendix.
+        *  "\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;
+       docstring const & flatLabelString(bool in_appendix) const;
+       /// set the \c flatLabelString values.
+       void setFlatLabelStrings(docstring const & fls, docstring const & flsa);
 private:
        ///
        int value_;
@@ -70,6 +75,10 @@ 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_;
 };
 
 
@@ -114,9 +123,8 @@ public:
        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?
+       docstring counterLabel(docstring const & format) 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 +137,10 @@ 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.
+       docstring flattenLabelString(docstring const & counter, bool in_appendix, 
+                                    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