Enable convertDefault.sh to run even if its executable bit is not set.

[lyx.git] / src / lyxtextclass.C

diff --git a/src/lyxtextclass.C b/src/lyxtextclass.C
index 61b2b1f44c8654a39a13acde1061245433e69a3a..fe35702d0ceeb9ccb06a5d77c461cfd35f14c57f 100644 (file)
--- a/src/lyxtextclass.C
+++ b/src/lyxtextclass.C
@@ -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>
@@ -24,6 +27,8 @@
 
 #include <algorithm>
 
+using namespace lyx::support;
+
 using std::endl;
 using std::find_if;
 using std::remove_if;
@@ -50,9 +55,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;
@@ -71,6 +76,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;
@@ -209,6 +220,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 +231,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 +251,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(),
@@ -766,20 +757,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
+{
+       Assert(!name.empty());
 
        LayoutList::const_iterator cit =
                find_if(layoutlist_.begin(),
@@ -790,39 +771,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);
+               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)
 {