Complete the removal of the embedding stuff. Maybe. It's hard to be sure we got every...

[lyx.git] / src / Counters.cpp

diff --git a/src/Counters.cpp b/src/Counters.cpp
index a3db807959d5a15403d444465707aea47e256dfa..305cb17a2c344456a85c8561d561ade27a935127 100644 (file)
--- a/src/Counters.cpp
+++ b/src/Counters.cpp
@@ -14,19 +14,17 @@
 #include <config.h>
 
 #include "Counters.h"
-#include "debug.h"
 
-#include "support/lstrings.h"
 #include "support/convert.h"
+#include "support/debug.h"
+#include "support/lstrings.h"
 
-#include <boost/assert.hpp>
+#include "support/assert.h"
 
 #include <sstream>
 
-using std::endl;
-using std::ostringstream;
-using std::string;
-
+using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
@@ -37,6 +35,14 @@ Counter::Counter()
 }
 
 
+Counter::Counter(docstring const & mc, docstring const & ls, 
+                docstring const & lsa)
+       : master_(mc), labelstring_(ls), labelstringappendix_(lsa)
+{
+       reset();
+}
+
+
 void Counter::set(int v)
 {
        value_ = v;
@@ -73,50 +79,36 @@ docstring const & Counter::master() const
 }
 
 
-void Counter::setMaster(docstring const & m)
+docstring const & Counter::labelString() const
 {
-       master_ = m;
+       return labelstring_;
 }
 
 
-void Counters::newCounter(docstring const & newc)
+docstring const & Counter::labelStringAppendix() const
 {
-       // First check if newc already exist
-       CounterList::iterator const cit = counterList.find(newc);
-       // if already exist give warning and return
-       if (cit != counterList.end()) {
-               lyxerr << "New counter already exists: "
-                      << to_utf8(newc)
-                      << endl;
-               return;
-       }
-       counterList[newc];
+       return labelstringappendix_;
 }
 
 
 void Counters::newCounter(docstring const & newc,
-                         docstring const & masterc)
+                         docstring const & masterc, 
+                         docstring const & ls,
+                         docstring const & lsa)
 {
-       // First check if newc already exists
-       CounterList::iterator const cit = counterList.find(newc);
-       // if already existant give warning and return
-       if (cit != counterList.end()) {
-               lyxerr << "New counter already exists: "
-                      << to_utf8(newc)
-                      << endl;
-               return;
-       }
-       // then check if masterc exists
-       CounterList::iterator const it = counterList.find(masterc);
-       // if not give warning and return
-       if (it == counterList.end()) {
+       if (!masterc.empty() && !hasCounter(masterc)) {
                lyxerr << "Master counter does not exist: "
                       << to_utf8(masterc)
                       << endl;
                return;
        }
+       counterList[newc] = Counter(masterc, ls, lsa);
+}
+
 
-       counterList[newc].setMaster(masterc);
+bool Counters::hasCounter(docstring const & c) const
+{
+       return counterList.find(c) != counterList.end();
 }
 
 
@@ -179,6 +171,8 @@ void Counters::step(docstring const & ctr)
 void Counters::reset()
 {
        appendix_ = false;
+       subfloat_ = false;
+       current_float_.erase();
        CounterList::iterator it = counterList.begin();
        CounterList::iterator const end = counterList.end();
        for (; it != end; ++it) {
@@ -189,7 +183,7 @@ void Counters::reset()
 
 void Counters::reset(docstring const & match)
 {
-       BOOST_ASSERT(!match.empty());
+       LASSERT(!match.empty(), /**/);
 
        CounterList::iterator it = counterList.begin();
        CounterList::iterator end = counterList.end();
@@ -307,7 +301,7 @@ docstring const romanCounter(int const n)
 
 docstring const lowerromanCounter(int const n)
 {
-       return support::lowercase(romanCounter(n));
+       return lowercase(romanCounter(n));
 }
 
 } // namespace anon
@@ -345,13 +339,73 @@ docstring Counters::labelItem(docstring const & ctr,
 }
 
 
-docstring Counters::counterLabel(docstring const & format)
+docstring Counters::theCounter(docstring const & counter)
+{
+       std::set<docstring> callers;
+       return theCounter(counter, callers);
+}
+
+docstring Counters::theCounter(docstring const & counter,
+                               std::set<docstring> & callers)
+{
+       if (!hasCounter(counter))
+               return from_ascii("??");
+
+       docstring label;
+
+       if (callers.find(counter) == callers.end()) {
+               
+               pair<std::set<docstring>::iterator, bool> result = callers.insert(counter);
+
+               Counter const & c = counterList[counter];
+               docstring ls = appendix() ? c.labelStringAppendix() : c.labelString();
+
+               if (ls.empty()) {
+                       if (!c.master().empty())
+                               ls = from_ascii("\\the") + c.master() + from_ascii(".");
+                       ls += from_ascii("\\arabic{") + counter + "}";
+               }
+
+               label = counterLabel(ls, &callers);
+
+               callers.erase(result.first);
+       } else {
+               // recursion detected
+               lyxerr << "Warning: Recursion in label for counter `"
+                          << counter << "' detected"
+                          << endl;
+       }
+
+       return label;
+}
+
+
+docstring Counters::counterLabel(docstring const & format,
+                                 std::set<docstring> * callers)
 {
        docstring label = format;
+
+       // FIXME: Using regexps would be better, but we compile boost without
+       // wide regexps currently.
+
+       while (true) {
+               //lyxerr << "label=" << to_utf8(label) << endl;
+               size_t const i = label.find(from_ascii("\\the"), 0);
+               if (i == docstring::npos)
+                       break;
+               size_t j = i + 4;
+               size_t k = j;
+               while (k < label.size() && lowercase(label[k]) >= 'a' 
+                      && lowercase(label[k]) <= 'z')
+                       ++k;
+               docstring counter = label.substr(j, k - j);
+               docstring repl = callers? theCounter(counter, *callers): 
+                                             theCounter(counter);
+               label.replace(i, k - j + 4, repl);
+       }
+
        while (true) {
-#ifdef WITH_WARNINGS
-#warning Using boost::regex or boost::spirit would make this code a lot simpler... (Lgb)
-#endif
+               //lyxerr << "label=" << to_utf8(label) << endl;
 
                size_t const i = label.find('\\', 0);
                if (i == docstring::npos)
@@ -367,10 +421,8 @@ docstring Counters::counterLabel(docstring const & format)
                docstring const rep = labelItem(counter, numbertype);
                label = docstring(label, 0, i) + rep
                        + docstring(label, k + 1, docstring::npos);
-               //lyxerr << "  : " << " (" << counter  << ","
-               //      << numbertype << ") -> " << label << endl;
        }
-       //lyxerr << "counterLabel: " << format  << " -> "       << label << endl;
+       //lyxerr << "DONE! label=" << to_utf8(label) << endl;
        return label;
 }