#include <algorithm>
+using namespace lyx::support;
+
using std::endl;
using std::find_if;
using std::remove_if;
}
break;
+ case TC_ENVIRONMENT:
case TC_STYLE:
if (lexrc.next()) {
string const name = subst(lexrc.getString(),
} 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)));
}
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(),
}
-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(),
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)
{