using std::remove_if;
using std::ostream;
+namespace { // anon
+
+struct compare_name {
+ compare_name(string const & name)
+ : name_(name) {}
+ template <class C>
+ bool operator()(C & c) {
+ return c->name() == name_;
+ }
+ string name_;
+};
+
+} // anon
-/* ******************************************************************* */
LyXTextClass::LyXTextClass(string const & fn, string const & cln,
string const & desc)
string const name = subst(lexrc.getString(),
'_', ' ');
if (hasLayout(name)) {
- LyXLayout & lay =
- const_cast<LyXLayout &>(operator[](name));
- error = do_readStyle(lexrc, lay);
+ LyXLayout * lay =
+ operator[](name).get();
+ error = do_readStyle(lexrc, *lay);
} else {
LyXLayout lay;
lay.setName(name);
if (!(error = do_readStyle(lexrc, lay)))
- layoutlist.push_back(lay);
+ layoutlist_.push_back(boost::shared_ptr<LyXLayout>(new LyXLayout(lay)));
if (defaultlayout_.empty()) {
// We do not have a default
// layout yet, so we choose
case TC_PAGESTYLE:
lexrc.next();
- pagestyle_ = strip(lexrc.getString());
+ pagestyle_ = rtrim(lexrc.getString());
break;
case TC_DEFAULTFONT:
switch (static_cast<ClassOptionsTags>(le)) {
case CO_FONTSIZE:
lexrc.next();
- opt_fontsize_ = strip(lexrc.getString());
+ opt_fontsize_ = rtrim(lexrc.getString());
break;
case CO_PAGESTYLE:
lexrc.next();
- opt_pagestyle_ = strip(lexrc.getString());
+ opt_pagestyle_ = rtrim(lexrc.getString());
break;
case CO_OTHER:
lexrc.next();
{
string const name = (n.empty() ? defaultLayoutName() : n);
- return find_if(layoutlist.begin(), layoutlist.end(),
- lyx::compare_memfun(&LyXLayout::name, name))
- != layoutlist.end();
+ return find_if(layoutlist_.begin(), layoutlist_.end(),
+ compare_name(name))
+ != layoutlist_.end();
}
-LyXLayout const & LyXTextClass::operator[](string const & n) const
+LyXLayout_ptr const & LyXTextClass::operator[](string const & n) const
{
lyx::Assert(!n.empty());
static LayoutList::difference_type lastLayoutIndex;
if (name == lastLayoutName)
- return layoutlist[lastLayoutIndex];
-
+ return layoutlist_[lastLayoutIndex];
LayoutList::const_iterator cit =
- find_if(layoutlist.begin(),
- layoutlist.end(),
- lyx::compare_memfun(&LyXLayout::name, name));
+ find_if(layoutlist_.begin(),
+ layoutlist_.end(),
+ compare_name(name));
- if (cit == layoutlist.end()) {
+ if (cit == layoutlist_.end()) {
lyxerr << "We failed to find the layout '" << name
<< "' in the layout list. You MUST investigate!"
<< endl;
}
lastLayoutName = name;
- lastLayoutIndex = std::distance(layoutlist.begin(), cit);
+ lastLayoutIndex = std::distance(layoutlist_.begin(), cit);
- return *cit;
+ return (*cit);
}
return false;
LayoutList::iterator it =
- remove_if(layoutlist.begin(), layoutlist.end(),
- lyx::compare_memfun(&LyXLayout::name, name));
- LayoutList::iterator end = layoutlist.end();
+ remove_if(layoutlist_.begin(), layoutlist_.end(),
+ compare_name(name));
+
+ LayoutList::iterator end = layoutlist_.end();
bool const ret = (it != end);
- layoutlist.erase(it, end);
+ layoutlist_.erase(it, end);
return ret;
}
}
loaded = true;
return loaded;
+}
+
+FloatList & LyXTextClass::floats()
+{
+ return floatlist_;
+}
+
+
+FloatList const & LyXTextClass::floats() const
+{
+ return floatlist_;
}
}
-LyXLayout const & LyXTextClass::defaultLayout() const
+LyXLayout_ptr const & LyXTextClass::defaultLayout() const
{
return operator[](defaultLayoutName());
}
int LyXTextClass::size() const
{
- return layoutlist.size();
+ return layoutlist_.size();
}