partial framebox support

[lyx.git] / src / counters.C

diff --git a/src/counters.C b/src/counters.C
index c54f0c06e5cc5bc16681a8e23733eb5d15827257..27fbc7ae3a556159b01c8e7c5a03691214d46bc7 100644 (file)
--- a/src/counters.C
+++ b/src/counters.C
@@ -18,6 +18,7 @@
 #include "counters.h"
 #include "debug.h"
 #include "support/lstrings.h"
+#include "support/LAssert.h"
 
 using std::endl;
 using std::vector;
@@ -88,7 +89,7 @@ Counters::Counters()
        sects.push_back("subsubsection");
        sects.push_back("paragraph");
        sects.push_back("subparagraph");
-       
+
        // Enumeration counters:
        newCounter("enumi");
        newCounter("enumii", "enumi");
@@ -99,10 +100,10 @@ Counters::Counters()
        enums.push_back("enumii");
        enums.push_back("enumiii");
        enums.push_back("enumiv");
-       
+
        // Biblio:
        newCounter("bibitem");
-       
+
        // Float counters:
        newCounter("Figure");
        newCounter("Table");
@@ -143,7 +144,7 @@ void Counters::newCounter(string const & newc, string const & masterc)
 
        counterList[newc];
        cit = counterList.find(newc);
-    cit->second.setMaster(masterc);
+       cit->second.setMaster(masterc);
 }
 
 
@@ -198,16 +199,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 +230,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 +246,7 @@ char loweralphaCounter(int n)
                return 'a' + n - 1;
 }
 
+
 inline
 char alphaCounter(int n)
 {
@@ -240,6 +256,7 @@ char alphaCounter(int n)
                return 'A' + n - 1;
 }
 
+
 inline
 char hebrewCounter(int n)
 {
@@ -254,6 +271,7 @@ char hebrewCounter(int n)
                return hebrew[n-1];
 }
 
+
 inline
 string const romanCounter(int n)
 {
@@ -271,10 +289,11 @@ 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;
        CounterList::iterator it = counterList.find(ctr);
@@ -300,10 +319,11 @@ string Counters::labelItem(string const & ctr,
        return 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;
        if (numbertype == "sectioning" || numbertype == "appendix") {
@@ -313,16 +333,16 @@ 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") {
                        // figure, table, ...
@@ -330,7 +350,7 @@ string Counters::numberLabel(string const & ctr,
                        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;
@@ -347,14 +367,14 @@ 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();
 }