ws changes only

[lyx.git] / src / lyxtextclass.C

diff --git a/src/lyxtextclass.C b/src/lyxtextclass.C
index b2a604bbbc4731065a06f4296332f81ae7a77d32..e713642d50dd6e9b3d061b2b0d9fc64997930708 100644 (file)
--- a/src/lyxtextclass.C
+++ b/src/lyxtextclass.C
@@ -22,19 +22,20 @@
 #include "FloatList.h"
 
 #include "support/lstrings.h"
-#include "support/LAssert.h"
-#include "support/lyxfunctional.h"
 #include "support/filetools.h"
 
-#include <algorithm>
-
-using namespace lyx::support;
+using lyx::support::LibFileSearch;
+using lyx::support::MakeDisplayPath;
+using lyx::support::rtrim;
+using lyx::support::subst;
 
 using std::endl;
 using std::find_if;
 using std::remove_if;
+using std::string;
 using std::ostream;
 
+
 namespace { // anon
 
 struct compare_name {
@@ -66,7 +67,6 @@ LyXTextClass::LyXTextClass(string const & fn, string const & cln,
        secnumdepth_ = 3;
        tocdepth_ = 3;
        pagestyle_ = "default";
-       maxcounter_ = LABEL_COUNTER_CHAPTER;
        defaultfont_ = LyXFont(LyXFont::ALL_SANE);
        opt_fontsize_ = "10|11|12";
        opt_pagestyle_ = "empty|plain|headings|fancy";
@@ -110,7 +110,6 @@ enum TextClassTags {
        TC_SIDES,
        TC_PAGESTYLE,
        TC_DEFAULTFONT,
-       TC_MAXCOUNTER,
        TC_SECNUMDEPTH,
        TC_TOCDEPTH,
        TC_CLASSOPTIONS,
@@ -141,7 +140,6 @@ bool LyXTextClass::Read(string const & filename, bool merge)
                { "float",           TC_FLOAT },
                { "input",           TC_INPUT },
                { "leftmargin",      TC_LEFTMARGIN },
-               { "maxcounter",      TC_MAXCOUNTER },
                { "nofloat",         TC_NOFLOAT },
                { "nostyle",         TC_NOSTYLE },
                { "outputtype",      TC_OUTPUTTYPE },
@@ -298,10 +296,6 @@ bool LyXTextClass::Read(string const & filename, bool merge)
                        }
                        break;
 
-               case TC_MAXCOUNTER:
-                       readMaxCounter(lexrc);
-                       break;
-
                case TC_SECNUMDEPTH:
                        lexrc.next();
                        secnumdepth_ = lexrc.getInteger();
@@ -462,67 +456,6 @@ enum MaxCounterTags {
 };
 
 
-void LyXTextClass::readMaxCounter(LyXLex & lexrc)
-{
-       keyword_item maxCounterTags[] = {
-               {"counter_chapter", MC_COUNTER_CHAPTER },
-               {"counter_enumi", MC_COUNTER_ENUMI },
-               {"counter_enumii", MC_COUNTER_ENUMII },
-               {"counter_enumiii", MC_COUNTER_ENUMIII },
-               {"counter_enumiv", MC_COUNTER_ENUMIV },
-               {"counter_paragraph", MC_COUNTER_PARAGRAPH },
-               {"counter_section", MC_COUNTER_SECTION },
-               {"counter_subparagraph", MC_COUNTER_SUBPARAGRAPH },
-               {"counter_subsection", MC_COUNTER_SUBSECTION },
-               {"counter_subsubsection", MC_COUNTER_SUBSUBSECTION }
-       };
-
-       pushpophelper pph(lexrc, maxCounterTags, MC_COUNTER_ENUMIV);
-
-       int le = lexrc.lex();
-       switch (le) {
-       case LyXLex::LEX_UNDEF:
-               lexrc.printError("Unknown MaxCounter tag `$$Token'");
-               return;
-       default:
-               break;
-       }
-
-       switch (static_cast<MaxCounterTags>(le)) {
-       case MC_COUNTER_CHAPTER:
-               maxcounter_ = LABEL_COUNTER_CHAPTER;
-               break;
-       case MC_COUNTER_SECTION:
-               maxcounter_ = LABEL_COUNTER_SECTION;
-               break;
-       case MC_COUNTER_SUBSECTION:
-               maxcounter_ = LABEL_COUNTER_SUBSECTION;
-               break;
-       case MC_COUNTER_SUBSUBSECTION:
-               maxcounter_ = LABEL_COUNTER_SUBSUBSECTION;
-               break;
-       case MC_COUNTER_PARAGRAPH:
-               maxcounter_ = LABEL_COUNTER_PARAGRAPH;
-               break;
-       case MC_COUNTER_SUBPARAGRAPH:
-               maxcounter_ = LABEL_COUNTER_SUBPARAGRAPH;
-               break;
-       case MC_COUNTER_ENUMI:
-               maxcounter_ = LABEL_COUNTER_ENUMI;
-               break;
-       case MC_COUNTER_ENUMII:
-               maxcounter_ = LABEL_COUNTER_ENUMII;
-               break;
-       case MC_COUNTER_ENUMIII:
-               maxcounter_ = LABEL_COUNTER_ENUMIII;
-               break;
-       case MC_COUNTER_ENUMIV:
-               maxcounter_ = LABEL_COUNTER_ENUMIV;
-               break;
-       }
-}
-
-
 enum ClassOptionsTags {
        CO_FONTSIZE = 1,
        CO_PAGESTYLE,
@@ -717,7 +650,7 @@ void LyXTextClass::readCounter(LyXLex & lexrc)
                }
        }
 
-       // Here if have a full float if getout == true
+       // Here if have a full counter if getout == true
        if (getout) {
                if (within.empty()) {
                        ctrs_->newCounter(name);
@@ -761,7 +694,7 @@ bool LyXTextClass::hasLayout(string const & n) const
 
 LyXLayout_ptr const & LyXTextClass::operator[](string const & name) const
 {
-       Assert(!name.empty());
+       BOOST_ASSERT(!name.empty());
 
        LayoutList::const_iterator cit =
                find_if(layoutlist_.begin(),
@@ -777,7 +710,7 @@ LyXLayout_ptr const & LyXTextClass::operator[](string const & name) const
                        lyxerr  << " " << it->get()->name() << endl;
 
                // we require the name to exist
-               Assert(false);
+               BOOST_ASSERT(false);
        }
 
        return (*cit);
@@ -939,12 +872,6 @@ unsigned int LyXTextClass::columns() const
 }
 
 
-int LyXTextClass::maxcounter() const
-{
-       return maxcounter_;
-}
-
-
 LYX_TITLE_LATEX_TYPES LyXTextClass::titletype() const
 {
        return titletype_;
@@ -957,9 +884,6 @@ string const & LyXTextClass::titlename() const
 }
 
 
-
-
-
 int LyXTextClass::size() const
 {
        return layoutlist_.size();