Make document_language non-mutable

[lyx.git] / src / Counters.cpp

diff --git a/src/Counters.cpp b/src/Counters.cpp
index c8e82ca39350832861d6c858be68629d26cdcf1f..5fb4f1b0b398732fd33891238aed0e6c0351d695 100644 (file)
--- a/src/Counters.cpp
+++ b/src/Counters.cpp
@@ -33,6 +33,7 @@ namespace lyx {
 
 
 Counter::Counter()
+       : initial_value_(0)
 {
        reset();
 }
@@ -40,7 +41,7 @@ Counter::Counter()
 
 Counter::Counter(docstring const & mc, docstring const & ls,  
                 docstring const & lsa)
-       : master_(mc), labelstring_(ls), labelstringappendix_(lsa)
+       : initial_value_(0), master_(mc), labelstring_(ls), labelstringappendix_(lsa)
 {
        reset();
 }
@@ -53,11 +54,13 @@ bool Counter::read(Lexer & lex)
                CT_LABELSTRING,
                CT_LABELSTRING_APPENDIX,
                CT_PRETTYFORMAT,
+               CT_INITIALVALUE,
                CT_END
        };
 
        LexerKeyword counterTags[] = {
                { "end", CT_END },
+         { "initialvalue", CT_INITIALVALUE},
                { "labelstring", CT_LABELSTRING },
                { "labelstringappendix", CT_LABELSTRING_APPENDIX },
                { "prettyformat", CT_PRETTYFORMAT },
@@ -83,6 +86,18 @@ bool Counter::read(Lexer & lex)
                                if (master_ == "none")
                                        master_.erase();
                                break;
+                       case CT_INITIALVALUE:
+                               lex.next();
+                               initial_value_ = lex.getInteger();
+                               // getInteger() returns -1 on error, and larger
+                               // negative values do not make much sense.
+                               // In the other case, we subtract one, since the
+                               // counter will be incremented before its first use.
+                               if (initial_value_ <= -1)
+                                       initial_value_ = 0;
+                               else
+                                       initial_value_ -= 1;
+                               break;
                        case CT_PRETTYFORMAT:
                                lex.next();
                                prettyformat_ = lex.getDocString();
@@ -109,6 +124,7 @@ bool Counter::read(Lexer & lex)
        return getout;
 }
 
+
 void Counter::set(int v)
 {
        value_ = v;
@@ -135,7 +151,7 @@ void Counter::step()
 
 void Counter::reset()
 {
-       value_ = 0;
+       value_ = initial_value_;
 }
 
 
@@ -145,6 +161,15 @@ docstring const & Counter::master() const
 }
 
 
+bool Counter::checkAndRemoveMaster(docstring const & cnt)
+{
+       if (master_ != cnt)
+               return false;
+       master_ = docstring();
+       return true;
+}
+
+
 docstring const & Counter::labelString(bool in_appendix) const
 {
        return in_appendix ? labelstringappendix_ : labelstring_;
@@ -157,6 +182,13 @@ Counter::StringMap & Counter::flatLabelStrings(bool in_appendix) const
 }
 
 
+Counters::Counters() : appendix_(false), subfloat_(false), longtable_(false)
+{
+       layout_stack_.push_back(0);
+       counter_stack_.push_back(from_ascii(""));
+}
+
+
 void Counters::newCounter(docstring const & newc,
                          docstring const & masterc, 
                          docstring const & ls,
@@ -244,7 +276,7 @@ void Counters::step(docstring const & ctr, UpdateType utype)
 
        it->second.step();
        if (utype == OutputUpdate) {
-               LASSERT(!counter_stack_.empty(), /* */);
+               LBUFERR(!counter_stack_.empty());
                counter_stack_.pop_back();
                counter_stack_.push_back(ctr);
        }
@@ -269,13 +301,14 @@ void Counters::reset()
                it->second.reset();
        counter_stack_.clear();
        counter_stack_.push_back(from_ascii(""));
+       layout_stack_.clear();
        layout_stack_.push_back(0);
 }
 
 
 void Counters::reset(docstring const & match)
 {
-       LASSERT(!match.empty(), /**/);
+       LASSERT(!match.empty(), return);
 
        CounterList::iterator it = counterList_.begin();
        CounterList::iterator end = counterList_.end();
@@ -286,6 +319,22 @@ void Counters::reset(docstring const & match)
 }
 
 
+bool Counters::remove(docstring const & cnt)
+{
+       bool retval = counterList_.erase(cnt);
+       if (!retval)
+               return false;
+       CounterList::iterator it = counterList_.begin();
+       CounterList::iterator end = counterList_.end();
+       for (; it != end; ++it) {
+               if (it->second.checkAndRemoveMaster(cnt))
+                       LYXERR(Debug::TCLASS, "Removed master counter `" +
+                                       to_utf8(cnt) + "' from counter: " + to_utf8(it->first));
+       }
+       return retval;
+}
+
+
 void Counters::copy(Counters & from, Counters & to, docstring const & match)
 {
        CounterList::iterator it = counterList_.begin();
@@ -330,7 +379,6 @@ char hebrewCounter(int const n)
 }
 
 
-
 // On the special cases, see http://mathworld.wolfram.com/RomanNumerals.html
 // and for a list of roman numerals up to and including 3999, see 
 // http://www.research.att.com/~njas/sequences/a006968.txt. (Thanks to Joost
@@ -436,7 +484,7 @@ docstring Counters::theCounter(docstring const & counter,
 {
        CounterList::const_iterator it = counterList_.find(counter); 
        if (it == counterList_.end())
-               return from_ascii("??");
+               return from_ascii("#");
        Counter const & ctr = it->second;
        Counter::StringMap & sm = ctr.flatLabelStrings(appendix());
        Counter::StringMap::iterator smit = sm.find(lang);
@@ -468,7 +516,7 @@ docstring Counters::flattenLabelString(docstring const & counter,
                
        CounterList::const_iterator it = counterList_.find(counter); 
        if (it == counterList_.end())
-               return from_ascii("??");
+               return from_ascii("#");
        Counter const & c = it->second;
 
        docstring ls = translateIfPossible(c.labelString(in_appendix), lang);
@@ -545,27 +593,26 @@ docstring Counters::counterLabel(docstring const & format,
 }
 
 
-docstring Counters::prettyCounter(docstring const & counter,
+docstring Counters::prettyCounter(docstring const & name,
                               string const & lang) const
 {
-       CounterList::const_iterator it = counterList_.find(counter); 
+       CounterList::const_iterator it = counterList_.find(name); 
        if (it == counterList_.end())
-               return from_ascii("??");
+               return from_ascii("#");
        Counter const & ctr = it->second;
-       docstring const & format = ctr.prettyFormat();
-       // FIXME We need to "flatten" the format to get proper output, 
-       // but doing so will take a bit of work.
-       if (true || format.empty()) {
-               docstring cntrname = translateIfPossible(counter, lang);
-               return  cntrname + " " + theCounter(counter, lang);
-       }
-       return counterLabel(format, lang);
+
+       docstring const value = theCounter(name, lang);
+       docstring const & format =
+           translateIfPossible(ctr.prettyFormat(), lang);
+       if (format.empty())
+               return value;
+       return subst(format, from_ascii("##"), value);
 }
 
 
 docstring Counters::currentCounter() const
 { 
-       LASSERT(!counter_stack_.empty(), /* */);
+       LBUFERR(!counter_stack_.empty());
        return counter_stack_.back(); 
 }
 
@@ -600,14 +647,7 @@ void Counters::setActiveLayout(Layout const & lay)
 
 void Counters::beginEnvironment()
 {
-       docstring cnt = counter_stack_.back();
-       counter_stack_.push_back(cnt);
-       deque<docstring>::const_iterator it = counter_stack_.begin();
-       deque<docstring>::const_iterator en = counter_stack_.end();
-//     docstring d;
-//     for (; it != en; ++it)
-//             d += " --> " + *it;
-//     LYXERR0(counter_stack_.size() << ": " << d);
+       counter_stack_.push_back(counter_stack_.back());
 }
 
 
@@ -615,12 +655,6 @@ void Counters::endEnvironment()
 {
        LASSERT(!counter_stack_.empty(), return);
        counter_stack_.pop_back();
-       deque<docstring>::const_iterator it = counter_stack_.begin();
-       deque<docstring>::const_iterator en = counter_stack_.end();
-//     docstring d;
-//     for (; it != en; ++it)
-//             d += " --> " + *it;
-//     LYXERR0(counter_stack_.size() << ": " << d);
 }