X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCounters.h;h=d992bbb3c646f64b003eca3928d7d2372642d388;hb=f345feecede25b164502abdacf893a36de9ef4ae;hp=5117ae80b6c79aa1db0c98c6696d3156ba2388a3;hpb=63644744fd6a0decf0fc745814125e1ddeb60220;p=lyx.git diff --git a/src/Counters.h b/src/Counters.h index 5117ae80b6..d992bbb3c6 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 @@ -15,14 +15,20 @@ #ifndef COUNTERS_H #define COUNTERS_H +#include "OutputEnums.h" + #include "support/docstring.h" #include -#include +#include +#include namespace lyx { +class Layout; +class Lexer; + /// This represents a single counter. class Counter { public: @@ -31,6 +37,8 @@ public: /// Counter(docstring const & mc, docstring const & ls, docstring const & lsa); + /// \return true on success + bool read(Lexer & lex); /// void set(int v); /// @@ -45,14 +53,23 @@ 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". + * "\the". 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" in an appendix. + docstring const & labelString(bool in_appendix) const; + /// Similar, but used for formatted references in XHTML output. + /// E.g., for a section counter it might be "section \thesection" + docstring const & prettyFormat() const { return prettyformat_; } + + /// 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". The \c in_appendix + * bool tells whether we want the version shown in an + * appendix. This version does not contain any \\the + * expression. */ - docstring const & labelStringAppendix() const; + typedef std::map StringMap; + StringMap & flatLabelStrings(bool in_appendix) const; private: /// int value_; @@ -66,6 +83,14 @@ private: docstring labelstring_; /// The same as labelstring_, but in appendices. docstring labelstringappendix_; + /// Similar, but used for formatted references in XHTML output + docstring prettyformat_; + /// Cache of the labelstring with \\the expressions expanded, + /// indexed by language + mutable StringMap flatlabelstring_; + /// Cache of the appendix labelstring with \\the expressions expanded, + /// indexed by language + mutable StringMap flatlabelstringappendix_; }; @@ -75,15 +100,19 @@ 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. + /// Add new counter newc having masterc as its master, + /// ls as its label, and lsa as its appendix label. void newCounter(docstring const & newc, docstring const & masterc, docstring const & ls, docstring const & lsa); /// 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 makenew); /// void set(docstring const & ctr, int val); /// @@ -92,10 +121,10 @@ public: int value(docstring const & ctr) const; /// 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); + /// Sub-slaves are not zeroed! That happens at slave's first + /// step 0->1. Seems to be sufficient. + /// \param utype determines whether we track the counters. + void step(docstring const & ctr, UpdateType utype); /// Reset all counters. void reset(); /// Reset counters matched by match string. @@ -104,16 +133,25 @@ 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 * 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; + /// returns a formatted version of the counter, using the + /// format given by Counter::prettyFormat(). + docstring prettyCounter(docstring const & cntr, + 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. @@ -121,12 +159,37 @@ 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; } + + /// \name refstepcounter + // @{ + /// The currently active counter, so far as references go. + /// We're trying to track \refstepcounter in LaTeX, more or less. + /// Note that this may be empty. + docstring currentCounter() const; + /// Called during update labels as we go through various paragraphs, + /// to track the layouts as we go through. + void setActiveLayout(Layout const & lay); + /// Also for updateLabels(). + /// Call this when entering things like footnotes, where there is now + /// no "last layout" and we want to restore the "last layout" on exit. + void clearLastLayout() { layout_stack_.push_back(0); } + /// Call then when existing things like footnotes. + void restoreLastLayout() { layout_stack_.pop_back(); } + /// + void saveLastCounter() + { counter_stack_.push_back(counter_stack_.back()); } + /// + void restoreLastCounter() { counter_stack_.pop_back(); } + // @} private: - /// returns the expanded string representation of the counter - /// with recursion protection through callers. - docstring theCounter(docstring const & c, - std::set & callers); + /** expands recursively any \\the 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 & callers) const; /// Returns the value of the counter according to the /// numbering scheme numbertype. /** Available numbering schemes are arabic (1, 2,...), roman @@ -134,20 +197,28 @@ private: * B,...) and hebrew. */ docstring labelItem(docstring const & ctr, - docstring const & numbertype); + docstring const & numbertype) const; + /// Used for managing the counter_stack_. + // @{ + void beginEnvironment(); + void endEnvironment(); + // @} /// Maps counter (layout) names to actual counters. typedef std::map CounterList; /// Instantiate. - CounterList counterList; + CounterList counterList_; /// Are we in an appendix? bool appendix_; /// The current enclosing float. std::string current_float_; /// Are we in a subfloat? bool subfloat_; + /// Used to keep track of active counters. + std::deque counter_stack_; + /// Same, but for last layout. + std::deque layout_stack_; }; - } // namespace lyx #endif