]> git.lyx.org Git - lyx.git/blobdiff - src/lyxtextclass.C
ws changes only
[lyx.git] / src / lyxtextclass.C
index 61b2b1f44c8654a39a13acde1061245433e69a3a..e713642d50dd6e9b3d061b2b0d9fc64997930708 100644 (file)
@@ -1,12 +1,15 @@
-/* This file is part of
- * ======================================================
+/**
+ * \file lyxtextclass.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *           LyX, The Document Processor
+ * \author Lars Gullik Bjønnes
+ * \author Jean-Marc Lasgouttes
+ * \author Angus Leeming
+ * \author John Levon
+ * \author André Pönitz
  *
- *          Copyright 1995 Matthias Ettrich
- *          Copyright 1995-2001 The LyX Team.
- *
- * ======================================================
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
 #include "debug.h"
 #include "lyxlex.h"
 #include "counters.h"
+#include "Floating.h"
 #include "FloatList.h"
 
 #include "support/lstrings.h"
-#include "support/LAssert.h"
-#include "support/lyxfunctional.h"
 #include "support/filetools.h"
 
-#include <algorithm>
+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 {
@@ -50,9 +57,9 @@ struct compare_name {
 
 
 LyXTextClass::LyXTextClass(string const & fn, string const & cln,
-                          string const & desc)
+                          string const & desc, bool texClassAvail )
        : name_(fn), latexname_(cln), description_(desc),
-         floatlist_(new FloatList), ctrs_(new Counters)
+         floatlist_(new FloatList), ctrs_(new Counters), texClassAvail_(texClassAvail)
 {
        outputType_ = LATEX;
        columns_ = 1;
@@ -60,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";
@@ -71,6 +77,12 @@ LyXTextClass::LyXTextClass(string const & fn, string const & cln,
 }
 
 
+bool LyXTextClass::isTeXClassAvailable() const
+{
+       return texClassAvail_;
+}
+
+
 bool LyXTextClass::do_readStyle(LyXLex & lexrc, LyXLayout & lay)
 {
        lyxerr[Debug::TCLASS] << "Reading style " << lay.name() << endl;
@@ -98,7 +110,6 @@ enum TextClassTags {
        TC_SIDES,
        TC_PAGESTYLE,
        TC_DEFAULTFONT,
-       TC_MAXCOUNTER,
        TC_SECNUMDEPTH,
        TC_TOCDEPTH,
        TC_CLASSOPTIONS,
@@ -129,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 },
@@ -209,6 +219,7 @@ bool LyXTextClass::Read(string const & filename, bool merge)
                        }
                        break;
 
+               case TC_ENVIRONMENT:
                case TC_STYLE:
                        if (lexrc.next()) {
                                string const name = subst(lexrc.getString(),
@@ -219,6 +230,8 @@ bool LyXTextClass::Read(string const & filename, bool merge)
                                } else {
                                        LyXLayout lay;
                                        lay.setName(name);
+                                       if (le == TC_ENVIRONMENT)
+                                               lay.is_environment = true;
                                        if (!(error = do_readStyle(lexrc, lay)))
                                                layoutlist_.push_back
                                                        (boost::shared_ptr<LyXLayout>(new LyXLayout(lay)));
@@ -237,29 +250,6 @@ bool LyXTextClass::Read(string const & filename, bool merge)
                        }
                        break;
 
-               case TC_ENVIRONMENT:
-                       if (lexrc.next()) {
-                               string const name = subst(lexrc.getString(),
-                                                   '_', ' ');
-                               if (hasLayout(name)) {
-                                       LyXLayout * lay = operator[](name).get();
-                                       error = do_readStyle(lexrc, *lay);
-                               } else {
-                                       LyXLayout lay;
-                                       lay.setName(name);
-                                       if (!(error = do_readStyle(lexrc, lay)))
-                                               envlist_.push_back
-                                                       (boost::shared_ptr<LyXLayout>(new LyXLayout(lay)));
-                                       else
-                                               lexrc.printError("Problems reading environment: `$$Token'.");
-                               }
-                       }
-                       else {
-                               lexrc.printError("No name given for style: `$$Token'.");
-                               error = true;
-                       }
-                       break;
-
                case TC_NOSTYLE:
                        if (lexrc.next()) {
                                string const style = subst(lexrc.getString(),
@@ -306,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();
@@ -470,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,
@@ -725,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);
@@ -766,20 +691,10 @@ bool LyXTextClass::hasLayout(string const & n) const
 }
 
 
-LyXLayout_ptr const & LyXTextClass::operator[](string const & n) const
-{
-       lyx::Assert(!n.empty());
-
-       if (n.empty())
-               lyxerr << "LyXTextClass::operator[] called with empty n" << endl;
-
-       string const name = (n.empty() ? defaultLayoutName() : n);
 
-       static string lastLayoutName;
-       static LayoutList::difference_type lastLayoutIndex;
-
-       if (name == lastLayoutName)
-               return layoutlist_[lastLayoutIndex];
+LyXLayout_ptr const & LyXTextClass::operator[](string const & name) const
+{
+       BOOST_ASSERT(!name.empty());
 
        LayoutList::const_iterator cit =
                find_if(layoutlist_.begin(),
@@ -790,39 +705,18 @@ LyXLayout_ptr const & LyXTextClass::operator[](string const & n) const
                lyxerr << "We failed to find the layout '" << name
                       << "' in the layout list. You MUST investigate!"
                       << endl;
+               for (LayoutList::const_iterator it = layoutlist_.begin();
+                        it != layoutlist_.end(); ++it)
+                       lyxerr  << " " << it->get()->name() << endl;
 
                // we require the name to exist
-               lyx::Assert(false);
+               BOOST_ASSERT(false);
        }
 
-       lastLayoutName = name;
-       lastLayoutIndex = std::distance(layoutlist_.begin(), cit);
-
        return (*cit);
 }
 
 
-LyXLayout_ptr const & LyXTextClass::getEnv(string const & name) const
-{
-       lyx::Assert(!name.empty());
-
-       if (name.empty())
-               lyxerr << "LyXTextClass::getEnv() called with empty n" << endl;
-
-       LayoutList::const_iterator cit =
-               find_if(envlist_.begin(), envlist_.end(), compare_name(name));
-
-       if (cit == envlist_.end()) {
-               lyxerr << "We failed to find the environment '" << name
-                      << "' in the layout list. You MUST investigate!"
-                      << endl;
-               // we require the name to exist
-               lyx::Assert(false);
-       }
-
-       return *cit;
-}
-
 
 bool LyXTextClass::delete_layout(string const & name)
 {
@@ -978,12 +872,6 @@ unsigned int LyXTextClass::columns() const
 }
 
 
-int LyXTextClass::maxcounter() const
-{
-       return maxcounter_;
-}
-
-
 LYX_TITLE_LATEX_TYPES LyXTextClass::titletype() const
 {
        return titletype_;
@@ -996,9 +884,6 @@ string const & LyXTextClass::titlename() const
 }
 
 
-
-
-
 int LyXTextClass::size() const
 {
        return layoutlist_.size();