oops again! hopefully this works now. Time to go to bed

[lyx.git] / src / counters.C

diff --git a/src/counters.C b/src/counters.C
index c54f0c06e5cc5bc16681a8e23733eb5d15827257..328a279efe5525c11fcc66383df34974f2069128 100644 (file)
--- a/src/counters.C
+++ b/src/counters.C
@@ -9,15 +9,13 @@
  *
  * ====================================================== */
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include <config.h>
 
 #include "counters.h"
 #include "debug.h"
+
 #include "support/lstrings.h"
+#include "support/LAssert.h"
 
 using std::endl;
 using std::vector;
@@ -58,56 +56,19 @@ void Counter::reset()
        value_ = 0;
 }
 
+
 string Counter::master() const
 {
        return master_;
 }
 
+
 void Counter::setMaster(string const & m)
 {
        master_ = m;
 }
 
 
-Counters::Counters()
-{
-       // Ehh, should this take a textclass arg?
-
-       // Sectioning counters:
-       newCounter("part");
-       newCounter("chapter");
-       newCounter("section", "chapter");
-       newCounter("subsection", "section");
-       newCounter("subsubsection", "subsection");
-       newCounter("paragraph", "subsubsection");
-       newCounter("subparagraph", "paragraph");
-
-       sects.push_back("chapter");
-       sects.push_back("section");
-       sects.push_back("subsection");
-       sects.push_back("subsubsection");
-       sects.push_back("paragraph");
-       sects.push_back("subparagraph");
-       
-       // Enumeration counters:
-       newCounter("enumi");
-       newCounter("enumii", "enumi");
-       newCounter("enumiii", "enumii");
-       newCounter("enumiv", "enumiii");
-
-       enums.push_back("enumi");
-       enums.push_back("enumii");
-       enums.push_back("enumiii");
-       enums.push_back("enumiv");
-       
-       // Biblio:
-       newCounter("bibitem");
-       
-       // Float counters:
-       newCounter("Figure");
-       newCounter("Table");
-}
-
 
 void Counters::newCounter(string const & newc)
 {
@@ -119,8 +80,6 @@ void Counters::newCounter(string const & newc)
                return;
        }
        counterList[newc];
-       cit = counterList.find(newc);
-       cit->second.setMaster("");
 }
 
 
@@ -141,9 +100,7 @@ void Counters::newCounter(string const & newc, string const & masterc)
                return;
        }
 
-       counterList[newc];
-       cit = counterList.find(newc);
-    cit->second.setMaster(masterc);
+       counterList[newc].setMaster(masterc);
 }
 
 
@@ -198,16 +155,30 @@ void Counters::step(string const & ctr)
        }
 }
 
+
+void Counters::reset()
+{
+       CounterList::iterator it = counterList.begin();
+       CounterList::iterator end = counterList.end();
+       for (; it != end; ++it) {
+               it->second.reset();
+       }
+}
+
+
 void Counters::reset(string const & match)
 {
+       lyx::Assert(!match.empty());
+
        CounterList::iterator it = counterList.begin();
        CounterList::iterator end = counterList.end();
        for (; it != end; ++it) {
-               if (it->first.find(match) != string::npos || match == "")
+               if (it->first.find(match) != string::npos)
                        it->second.reset();
-       }       
+       }
 }
 
+
 void Counters::copy(Counters & from, Counters & to, string const & match)
 {
        CounterList::iterator it = counterList.begin();
@@ -215,13 +186,13 @@ void Counters::copy(Counters & from, Counters & to, string const & match)
        for (; it != end; ++it) {
                if (it->first.find(match) != string::npos || match == "") {
                        to.set(it->first, from.value(it->first));
-               } 
-       }       
+               }
+       }
 }
 
 
 namespace {
-               
+
 inline
 char loweralphaCounter(int n)
 {
@@ -231,6 +202,7 @@ char loweralphaCounter(int n)
                return 'a' + n - 1;
 }
 
+
 inline
 char alphaCounter(int n)
 {
@@ -240,6 +212,7 @@ char alphaCounter(int n)
                return 'A' + n - 1;
 }
 
+
 inline
 char hebrewCounter(int n)
 {
@@ -254,6 +227,7 @@ char hebrewCounter(int n)
                return hebrew[n-1];
 }
 
+
 inline
 string const romanCounter(int n)
 {
@@ -271,20 +245,23 @@ string const romanCounter(int n)
 
 } // namespace anon
 
+
 string Counters::labelItem(string const & ctr,
-               string const & numbertype, 
-               string const & langtype,
-               bool first)
+                          string const & numbertype,
+                          string const & langtype,
+                          bool first)
 {
-       ostringstream s, o;
+       ostringstream s;
+       ostringstream o;
+
        CounterList::iterator it = counterList.find(ctr);
        if (it == counterList.end()) {
                lyxerr << "Counter does not exist." << endl;
-               return "";
+               return string();
        }
-       string mstr = it->second.master();
+
        if (!first) {
-               s << "." << value(ctr);
+               s << '.' << value(ctr);
        } else {
                if (numbertype == "sectioning" || numbertype == "appendix") {
                        if (numbertype == "appendix") {
@@ -297,15 +274,18 @@ string Counters::labelItem(string const & ctr,
                }
                s << o.str();
        }
-       return s.str();
+
+       return STRCONV(s.str());
 }
 
+
 string Counters::numberLabel(string const & ctr,
-               string const & numbertype, 
-               string const & langtype,
-               int head)
+                            string const & numbertype,
+                            string const & langtype,
+                            int head)
 {
-       ostringstream s, o;
+       ostringstream s;
+
        if (numbertype == "sectioning" || numbertype == "appendix") {
                if (ctr == "chapter" && head == 0) {
                        s << labelItem("chapter", numbertype, langtype, true);
@@ -313,28 +293,30 @@ string Counters::numberLabel(string const & ctr,
                        s << numberLabel("chapter", numbertype, langtype, head)
                          << labelItem("section", numbertype, langtype, head == 1);
                } else if (ctr == "subsection" && head <= 2) {
-                       s << numberLabel("section", numbertype, langtype, head) 
+                       s << numberLabel("section", numbertype, langtype, head)
                          << labelItem("subsection", numbertype, langtype, head == 2);
                } else if (ctr == "subsubsection" && head <= 3) {
-                       s << numberLabel("subsection", numbertype, langtype, head) 
+                       s << numberLabel("subsection", numbertype, langtype, head)
                          << labelItem("subsubsection", numbertype, langtype, head == 3);
                } else if (ctr == "paragraph" && head <= 4) {
-                       s << numberLabel("subsubsection", numbertype, langtype, head) 
+                       s << numberLabel("subsubsection", numbertype, langtype, head)
                          << labelItem("paragraph", numbertype, langtype, head == 4);
                } else if (ctr == "subparagraph" && head <= 5) {
-                       s << numberLabel("paragraph", numbertype, langtype, head) 
+                       s << numberLabel("paragraph", numbertype, langtype, head)
                          << labelItem("subparagraph", numbertype, langtype, head == 5);
-               } else if (ctr == "Figure" || ctr == "Table") {
+               } else if (ctr == "figure" || ctr == "table") {
                        // figure, table, ...
                        lyxerr << "Counter:" << ctr << endl;
                        s << numberLabel("chapter", numbertype, langtype, head)
                          << labelItem(ctr, numbertype, langtype, head == 1);
                }
-       
+
        } else if (numbertype == "enumeration") {
-               ostringstream ei, eii, eiii, eiv;
-               //string ei, eiii, eiv;
-               //char eii;
+               ostringstream ei;
+               ostringstream eii;
+               ostringstream eiii;
+               ostringstream eiv;
+
                if (langtype == "hebrew") {
                        ei << '.' << value("enumi");
                        eii << '(' << hebrewCounter(value("enumii")) << ')';
@@ -347,14 +329,15 @@ string Counters::numberLabel(string const & ctr,
                        eiv << alphaCounter(value("enumiv")) << '.';
                }
                if (ctr == "enumii") {
-                       s << eii.str(); 
+                       s << eii.str();
                } else if (ctr == "enumi") {
-                       s << ei.str();  
+                       s << ei.str();
                } else if (ctr == "enumiii") {
                        s << eiii.str();
                } else if (ctr == "enumiv") {
                        s << eiv.str();
                }
-       } 
-       return s.str();
+       }
+
+       return STRCONV(s.str());
 }