#include "TextClass.h"
+#include "BaseClassList.h"
#include "Color.h"
#include "Counters.h"
#include "Floating.h"
} // namespace anon
-TextClass::TextClass(string const & fn, string const & cln,
- string const & desc, bool texClassAvail )
- : name_(fn), latexname_(cln), description_(desc),
- floatlist_(new FloatList), counters_(new Counters),
- texClassAvail_(texClassAvail)
+docstring const TextClass::emptylayout_ = from_ascii("PlainLayout");
+
+
+InsetLayout DocumentClass::empty_insetlayout_;
+
+
+TextClass::TextClass()
{
- modular_ = false;
+ floatlist_ = boost::shared_ptr<FloatList>(new FloatList);
+ counters_ = boost::shared_ptr<Counters>(new Counters);
outputType_ = LATEX;
columns_ = 1;
sides_ = OneSide;
}
-docstring const TextClass::emptylayout_ = from_ascii("PlainLayout");
-
-
-InsetLayout TextClass::empty_insetlayout_;
-
-
-bool TextClass::isTeXClassAvailable() const
-{
- return texClassAvail_;
-}
-
-
bool TextClass::readStyle(Lexer & lexrc, Layout & lay)
{
LYXERR(Debug::TCLASS, "Reading style " << to_utf8(lay.name()));
}
// Resolve fonts
lay.resfont = lay.font;
- lay.resfont.realize(defaultfont());
+ lay.resfont.realize(defaultfont_);
lay.reslabelfont = lay.labelfont;
- lay.reslabelfont.realize(defaultfont());
+ lay.reslabelfont.realize(defaultfont_);
return true; // no errors
}
LYXERR(Debug::TCLASS, "Converting layout file from format "
<< format << " to " << FORMAT);
FileName const tempfile = FileName::tempName();
- error = !layout2layout(filename, tempfile);
- if (!error)
- error = read(tempfile, rt);
+ bool success = layout2layout(filename, tempfile);
+ if (success)
+ read(tempfile, rt);
tempfile.removeFile();
- return !error;
+ return success;
}
LYXERR(Debug::TCLASS, "Finished reading " + translateRT(rt) + ": " +
min_toclevel_ = Layout::NOT_IN_TOC;
max_toclevel_ = Layout::NOT_IN_TOC;
- const_iterator cit = begin();
- const_iterator the_end = end();
- for ( ; cit != the_end ; ++cit) {
- int const toclevel = (*cit)->toclevel;
+ for (size_t i = 0; i != layoutCount(); ++i) {
+ int const toclevel = layout(i)->toclevel;
if (toclevel != Layout::NOT_IN_TOC) {
if (min_toclevel_ == Layout::NOT_IN_TOC)
min_toclevel_ = toclevel;
else
- min_toclevel_ = min(min_toclevel_,
- toclevel);
- max_toclevel_ = max(max_toclevel_,
- toclevel);
+ min_toclevel_ = min(min_toclevel_, toclevel);
+ max_toclevel_ = max(max_toclevel_, toclevel);
}
}
LYXERR(Debug::TCLASS, "Minimum TocLevel is " << min_toclevel_
style, name, listName, builtin);
floatlist_->newFloat(fl);
// each float has its own counter
- counters_->newCounter(from_ascii(type), from_ascii(within),
+ counters_->newCounter(from_ascii(type), from_ascii(within),
docstring(), docstring());
+ // also define sub-float counters
+ docstring const subtype = "sub-" + from_ascii(type);
+ counters_->newCounter(subtype, from_ascii(type),
+ "\\alph{" + subtype + "}", docstring());
}
lexrc.popTable();
}
-FontInfo const & TextClass::defaultfont() const
-{
- return defaultfont_;
-}
-
-
-docstring const & TextClass::leftmargin() const
-{
- return leftmargin_;
-}
-
-
-docstring const & TextClass::rightmargin() const
-{
- return rightmargin_;
-}
-
-
bool TextClass::hasLayout(docstring const & n) const
{
docstring const name = n.empty() ? defaultLayoutName() : n;
}
-FloatList & TextClass::floats()
-{
- return *floatlist_.get();
-}
-
-
-FloatList const & TextClass::floats() const
-{
- return *floatlist_.get();
-}
-
-
-Counters & TextClass::counters() const
-{
- return *counters_.get();
-}
-
-
-// Return the layout object of an inset given by name. If the name
-// is not found as such, the part after the ':' is stripped off, and
-// searched again. In this way, an error fallback can be provided:
-// An erroneous 'CharStyle:badname' (e.g., after a documentclass switch)
-// will invoke the layout object defined by name = 'CharStyle'.
-// If that doesn't work either, an empty object returns (shouldn't
-// happen). -- Idea JMarc, comment MV
-InsetLayout const & TextClass::insetlayout(docstring const & name) const
+InsetLayout const & DocumentClass::insetLayout(docstring const & name) const
{
docstring n = name;
while (!n.empty()) {
if (insetlayoutlist_.count(n) > 0)
return insetlayoutlist_[n];
- docstring::size_type i = n.find(':');
+ size_t i = n.find(':');
if (i == string::npos)
break;
n = n.substr(0,i);
}
-string const & TextClass::name() const
+DocumentClass & DocumentClassBundle::newClass(LayoutFile const & baseClass)
{
- return name_;
+ DocumentClass dc(baseClass);
+ tc_list_.push_back(dc);
+ return tc_list_.back();
}
-string const & TextClass::latexname() const
+DocumentClassBundle & DocumentClassBundle::get()
{
- const_cast<TextClass*>(this)->load();
- return latexname_;
+ static DocumentClassBundle singleton;
+ return singleton;
}
-string const & TextClass::description() const
-{
- return description_;
-}
-
-
-string const & TextClass::opt_fontsize() const
-{
- return opt_fontsize_;
-}
+DocumentClass::DocumentClass(LayoutFile const & tc)
+ : TextClass(tc)
+{}
-string const & TextClass::opt_pagestyle() const
+bool DocumentClass::hasLaTeXLayout(std::string const & lay) const
{
- return opt_pagestyle_;
+ LayoutList::const_iterator it = layoutlist_.begin();
+ LayoutList::const_iterator end = layoutlist_.end();
+ for (; it != end; ++it)
+ if (it->get()->latexname() == lay)
+ return true;
+ return false;
}
-string const & TextClass::options() const
-{
- return options_;
-}
-
-
-string const & TextClass::class_header() const
-{
- return class_header_;
-}
-
-
-string const & TextClass::pagestyle() const
-{
- return pagestyle_;
-}
-
-
-docstring const & TextClass::preamble() const
-{
- return preamble_;
-}
-
-
-PageSides TextClass::sides() const
-{
- return sides_;
-}
-
-
-int TextClass::secnumdepth() const
-{
- return secnumdepth_;
-}
-
-
-int TextClass::tocdepth() const
-{
- return tocdepth_;
-}
-
-
-OutputType TextClass::outputType() const
-{
- return outputType_;
-}
-
-
-bool TextClass::provides(string const & p) const
+bool DocumentClass::provides(string const & p) const
{
return provides_.find(p) != provides_.end();
}
-unsigned int TextClass::columns() const
-{
- return columns_;
-}
-
-
-TitleLatexType TextClass::titletype() const
-{
- return titletype_;
-}
-
-
-string const & TextClass::titlename() const
-{
- return titlename_;
-}
-
-
-int TextClass::size() const
-{
- return layoutlist_.size();
-}
-
-
-int TextClass::min_toclevel() const
-{
- return min_toclevel_;
-}
-
-
-int TextClass::max_toclevel() const
-{
- return max_toclevel_;
-}
-
-
-bool TextClass::hasTocLevels() const
+bool DocumentClass::hasTocLevels() const
{
return min_toclevel_ != Layout::NOT_IN_TOC;
}