X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCounters.h;h=3a04d0313b9d159dc9cb2a38f2335d1550da016c;hb=0a7705a6736a85c3c751f7b4e9998833cdb71fc9;hp=f11cfefa0c4b8af93a0147859e1f602fb65efd3b;hpb=f630be890494c849981e4fb52ea4740506e92bed;p=lyx.git diff --git a/src/Counters.h b/src/Counters.h index f11cfefa0c..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,16 +18,24 @@ #include "support/docstring.h" #include +#include namespace lyx { +class Lexer; + /// This represents a single counter. class Counter { public: /// Counter(); /// + Counter(docstring const & mc, docstring const & ls, + docstring const & lsa); + /// \return true on success + bool read(Lexer & lex); + /// void set(int v); /// void addto(int v); @@ -37,17 +45,42 @@ public: void step(); /// void reset(); - /// Returns the master counter of this counter - lyx::docstring const & master() const; - /// sets the master counter for this counter - void setMaster(lyx::docstring const & m); + /// Returns the master counter of this counter. + 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 \c in_appendix bool tells whether we + * want the version shown 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". The \c in_appendix + * bool tells whether we want the version shown in an + * appendix. This version does not contain any \\the + * expression. + */ + typedef std::map StringMap; + StringMap & flatLabelStrings(bool in_appendix) const; private: /// int value_; - /// contains master counter name; master counter is the counter - /// that, if stepped (incremented) zeroes this counter. E.g. - /// "subparagraph"'s master is "paragraph". - lyx::docstring master_; + /// contains master counter name. + /** The master counter is the counter that, if stepped + * (incremented) zeroes this counter. E.g. "subsection"'s + * master is "section". + */ + docstring master_; + /// Contains a LaTeX-like string to format the counter. + docstring labelstring_; + /// The same as labelstring_, but in appendices. + docstring labelstringappendix_; + /// 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_; }; @@ -55,43 +88,90 @@ private: /// Every instantiation is an array of counters of type Counter. class Counters { public: - /// Add a new counter to array. - void newCounter(lyx::docstring const & newc); - /// Add new counter having oldc as its master. - void newCounter(lyx::docstring const & newc, - lyx::docstring const & oldc); /// - void set(lyx::docstring const & ctr, int val); + Counters() : appendix_(false), subfloat_(false) {} + /// 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 addto(lyx::docstring const & ctr, int val); + void set(docstring const & ctr, int val); /// - int value(lyx::docstring const & ctr) const; - /// Step (increment by one) counter named by arg, and - /// zeroes slave counter(s) for which it is the master. - /// NOTE sub-slaves not zeroed! That happens at slave's - /// first step 0->1. Seems to be sufficient. - void step(lyx::docstring const & ctr); + void addto(docstring const & ctr, int val); + /// + 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); /// Reset all counters. void reset(); /// Reset counters matched by match string. - void reset(lyx::docstring const & match); + void reset(docstring const & match); /// Copy counters whose name matches match from the &from to /// the &to array of counters. Empty string matches all. void copy(Counters & from, Counters & to, - lyx::docstring const & match = lyx::docstring()); - /// A complete expanded label, like 2.1.4 for a subsubsection - /// according to the given format - lyx::docstring counterLabel(lyx::docstring const & format); + docstring const & match = docstring()); + /** 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; } + /// Returns the current enclosing float. + std::string const & current_float() const { return current_float_; } + /// Sets the current enclosing float. + void current_float(std::string const & f) { current_float_ = f; } + /// 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; } private: - /// A counter label's single item, 1 for subsection number in - /// the 2.1.4 subsubsection number label. - lyx::docstring labelItem(lyx::docstring const & ctr, - lyx::docstring const & numbertype); + /** expands recusrsively 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 + * (i, ii,...), Roman (I, II,...), alph (a, b,...), Alpha (A, + * B,...) and hebrew. + */ + docstring labelItem(docstring const & ctr, + docstring const & numbertype) const; /// Maps counter (layout) names to actual counters. - typedef std::map CounterList; + 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_; };