X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTextClass.cpp;h=13adf04675cdf0a43e6673bded0843fd5f566558;hb=b7406da7f0326fbd895c700ad5ded4cc5112094f;hp=2dbd10b6f364d82d679f1fbb29f47afc33c5241a;hpb=a8317afc4ba90c421208933d68b93e56ff25a0e4;p=lyx.git diff --git a/src/TextClass.cpp b/src/TextClass.cpp index 2dbd10b6f3..13adf04675 100644 --- a/src/TextClass.cpp +++ b/src/TextClass.cpp @@ -16,6 +16,7 @@ #include "TextClass.h" +#include "LayoutFile.h" #include "Color.h" #include "Counters.h" #include "Floating.h" @@ -34,8 +35,11 @@ #include "support/lstrings.h" #include "support/os.h" +#include #include +#include "boost/assert.hpp" + using namespace std; using namespace lyx::support; @@ -43,14 +47,14 @@ namespace lyx { namespace { -class LayoutNamesEqual : public unary_function { +class LayoutNamesEqual : public unary_function { public: LayoutNamesEqual(docstring const & name) : name_(name) {} - bool operator()(LayoutPtr const & c) const + bool operator()(Layout const & c) const { - return c->name() == name_; + return c.name() == name_; } private: docstring name_; @@ -105,13 +109,14 @@ std::string translateRT(TextClass::ReadType rt) } // 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; outputType_ = LATEX; columns_ = 1; sides_ = OneSide; @@ -130,18 +135,6 @@ TextClass::TextClass(string const & fn, string const & cln, } -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())); @@ -151,9 +144,9 @@ bool TextClass::readStyle(Lexer & lexrc, Layout & lay) } // 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 } @@ -247,8 +240,8 @@ bool TextClass::read(FileName const & filename, ReadType rt) // The only way this happens is because the hardcoded layout above // is wrong. BOOST_ASSERT(false); - } - layoutlist_.push_back(boost::shared_ptr(new Layout(lay))); + }; + layoutlist_.push_back(lay); } Lexer lexrc(textClassTags, @@ -328,8 +321,8 @@ bool TextClass::read(FileName const & filename, ReadType rt) //error to true, since we couldn't even read the name? error = !readStyle(lexrc, lay); } else if (hasLayout(name)) { - Layout * lay = operator[](name).get(); - error = !readStyle(lexrc, *lay); + Layout & lay = operator[](name); + error = !readStyle(lexrc, lay); } else { Layout lay; lay.setName(name); @@ -337,7 +330,7 @@ bool TextClass::read(FileName const & filename, ReadType rt) lay.is_environment = true; error = !readStyle(lexrc, lay); if (!error) - layoutlist_.push_back(boost::shared_ptr(new Layout(lay))); + layoutlist_.push_back(lay); if (defaultlayout_.empty()) { // We do not have a default layout yet, so we choose @@ -450,8 +443,11 @@ bool TextClass::read(FileName const & filename, ReadType rt) case TC_INSETLAYOUT: if (lexrc.next()) { - docstring const name = subst(lexrc.getDocString(), '_', ' '); - readInsetLayout(lexrc, name); + InsetLayout il; + if (il.read(lexrc)) { + insetlayoutlist_[il.name()] = il; + } + // else there was an error, so forget it } break; @@ -475,7 +471,7 @@ bool TextClass::read(FileName const & filename, ReadType rt) case TC_NOFLOAT: if (lexrc.next()) { string const nofloat = lexrc.getString(); - floatlist_->erase(nofloat); + floatlist_.erase(nofloat); } break; } @@ -490,11 +486,11 @@ bool TextClass::read(FileName const & filename, ReadType rt) 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) + ": " + @@ -536,18 +532,16 @@ bool TextClass::read(FileName const & filename, ReadType 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; + const_iterator lit = begin(); + const_iterator len = end(); + for (; lit != len; ++lit) { + int const toclevel = lit->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_ @@ -668,191 +662,6 @@ void TextClass::readClassOptions(Lexer & lexrc) } -enum InsetLayoutTags { - IL_FONT = 1, - IL_BGCOLOR, - IL_DECORATION, - IL_FREESPACING, - IL_FORCELTR, - IL_LABELFONT, - IL_LABELSTRING, - IL_LATEXNAME, - IL_LATEXPARAM, - IL_LATEXTYPE, - IL_LYXTYPE, - IL_KEEPEMPTY, - IL_MULTIPAR, - IL_NEEDPROTECT, - IL_PASSTHRU, - IL_PREAMBLE, - IL_REQUIRES, - IL_END -}; - - -void TextClass::readInsetLayout(Lexer & lexrc, docstring const & name) -{ - keyword_item elementTags[] = { - { "bgcolor", IL_BGCOLOR }, - { "decoration", IL_DECORATION }, - { "end", IL_END }, - { "font", IL_FONT }, - { "forceltr", IL_FORCELTR }, - { "freespacing", IL_FREESPACING }, - { "keepempty", IL_KEEPEMPTY }, - { "labelfont", IL_LABELFONT }, - { "labelstring", IL_LABELSTRING }, - { "latexname", IL_LATEXNAME }, - { "latexparam", IL_LATEXPARAM }, - { "latextype", IL_LATEXTYPE }, - { "lyxtype", IL_LYXTYPE }, - { "multipar", IL_MULTIPAR }, - { "needprotect", IL_NEEDPROTECT }, - { "passthru", IL_PASSTHRU }, - { "preamble", IL_PREAMBLE }, - { "requires", IL_REQUIRES } - }; - - lexrc.pushTable(elementTags, IL_END); - - string lyxtype; - docstring labelstring; - string latextype; - string decoration; - string latexname; - string latexparam; - FontInfo font = inherit_font; - FontInfo labelfont = inherit_font; - ColorCode bgcolor(Color_background); - string preamble; - set requires; - bool multipar = false; - bool passthru = false; - bool needprotect = false; - bool keepempty = false; - bool freespacing = false; - bool forceltr = false; - - bool getout = false; - while (!getout && lexrc.isOK()) { - int le = lexrc.lex(); - switch (le) { - case Lexer::LEX_UNDEF: - lexrc.printError("Unknown InsetLayout tag `$$Token'"); - continue; - default: break; - } - switch (static_cast(le)) { - case IL_LYXTYPE: - lexrc.next(); - lyxtype = lexrc.getString(); - break; - case IL_LATEXTYPE: - lexrc.next(); - latextype = lexrc.getString(); - break; - case IL_LABELSTRING: - lexrc.next(); - labelstring = lexrc.getDocString(); - break; - case IL_DECORATION: - lexrc.next(); - decoration = lexrc.getString(); - break; - case IL_LATEXNAME: - lexrc.next(); - latexname = lexrc.getString(); - break; - case IL_LATEXPARAM: - lexrc.next(); - latexparam = subst(lexrc.getString(), """, "\""); - break; - case IL_LABELFONT: - labelfont = lyxRead(lexrc, inherit_font); - break; - case IL_FORCELTR: - lexrc.next(); - forceltr = lexrc.getBool(); - break; - case IL_MULTIPAR: - lexrc.next(); - multipar = lexrc.getBool(); - break; - case IL_PASSTHRU: - lexrc.next(); - passthru = lexrc.getBool(); - break; - case IL_KEEPEMPTY: - lexrc.next(); - keepempty = lexrc.getBool(); - break; - case IL_FREESPACING: - lexrc.next(); - freespacing = lexrc.getBool(); - break; - case IL_NEEDPROTECT: - lexrc.next(); - needprotect = lexrc.getBool(); - break; - case IL_FONT: - font = lyxRead(lexrc, inherit_font); - // So: define font before labelfont - labelfont = font; - break; - case IL_BGCOLOR: { - lexrc.next(); - string const token = lexrc.getString(); - bgcolor = lcolor.getFromLyXName(token); - break; - } - case IL_PREAMBLE: - preamble = lexrc.getLongString("EndPreamble"); - break; - case IL_REQUIRES: { - lexrc.eatLine(); - vector const req - = getVectorFromString(lexrc.getString()); - requires.insert(req.begin(), req.end()); - break; - } - case IL_END: - getout = true; - break; - } - } - - // Here add element to list if getout == true - if (getout) { - InsetLayout il; - il.name_ = to_ascii(name); - il.lyxtype_ = lyxtype; - il.labelstring_ = labelstring; - il.decoration_ = decoration; - il.latextype_ = latextype; - il.latexname_ = latexname; - il.latexparam_ = latexparam; - il.multipar_ = multipar; - il.passthru_ = passthru; - il.needprotect_ = needprotect; - il.freespacing_ = freespacing; - il.forceltr_ = forceltr; - il.keepempty_ = keepempty; - il.font_ = font; - // The label font is generally used as-is without - // any realization against a given context. - labelfont.realize(sane_font); - il.labelfont_ = labelfont; - il.bgcolor_ = bgcolor; - il.preamble_ = preamble; - il.requires_ = requires; - insetlayoutlist_[name] = il; - } - - lexrc.popTable(); -} - - - enum FloatTags { FT_TYPE = 1, FT_NAME, @@ -904,8 +713,8 @@ void TextClass::readFloat(Lexer & lexrc) case FT_TYPE: lexrc.next(); type = lexrc.getString(); - if (floatlist_->typeExist(type)) { - Floating const & fl = floatlist_->getType(type); + if (floatlist_.typeExist(type)) { + Floating const & fl = floatlist_.getType(type); placement = fl.placement(); ext = fl.ext(); within = fl.within(); @@ -955,10 +764,14 @@ void TextClass::readFloat(Lexer & lexrc) if (getout) { Floating fl(type, placement, ext, within, style, name, listName, builtin); - floatlist_->newFloat(fl); + 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(); @@ -1004,7 +817,7 @@ void TextClass::readCounter(Lexer & lexrc) case CT_NAME: lexrc.next(); name = lexrc.getDocString(); - if (counters_->hasCounter(name)) + if (counters_.hasCounter(name)) LYXERR(Debug::TCLASS, "Reading existing counter " << to_utf8(name)); else LYXERR(Debug::TCLASS, "Reading new counter " << to_utf8(name)); @@ -1032,64 +845,64 @@ void TextClass::readCounter(Lexer & lexrc) // Here if have a full counter if getout == true if (getout) - counters_->newCounter(name, within, + counters_.newCounter(name, within, labelstring, labelstring_appendix); lexrc.popTable(); } -FontInfo const & TextClass::defaultfont() const +bool TextClass::hasLayout(docstring const & n) const { - return defaultfont_; -} - + docstring const name = n.empty() ? defaultLayoutName() : n; -docstring const & TextClass::leftmargin() const -{ - return leftmargin_; + return find_if(layoutlist_.begin(), layoutlist_.end(), + LayoutNamesEqual(name)) + != layoutlist_.end(); } -docstring const & TextClass::rightmargin() const + +Layout const & TextClass::operator[](docstring const & name) const { - return rightmargin_; -} + BOOST_ASSERT(!name.empty()); + const_iterator it = + find_if(begin(), end(), LayoutNamesEqual(name)); -bool TextClass::hasLayout(docstring const & n) const -{ - docstring const name = n.empty() ? defaultLayoutName() : n; + if (it == end()) { + lyxerr << "We failed to find the layout '" << to_utf8(name) + << "' in the layout list. You MUST investigate!" + << endl; + for (const_iterator cit = begin(); cit != end(); ++cit) + lyxerr << " " << to_utf8(cit->name()) << endl; - return find_if(layoutlist_.begin(), layoutlist_.end(), - LayoutNamesEqual(name)) - != layoutlist_.end(); -} + // we require the name to exist + BOOST_ASSERT(false); + } + return *it; +} -LayoutPtr const & TextClass::operator[](docstring const & name) const +Layout & TextClass::operator[](docstring const & name) { BOOST_ASSERT(!name.empty()); - LayoutList::const_iterator cit = - find_if(layoutlist_.begin(), - layoutlist_.end(), - LayoutNamesEqual(name)); + iterator it = find_if(begin(), end(), LayoutNamesEqual(name)); - if (cit == layoutlist_.end()) { + if (it == end()) { lyxerr << "We failed to find the layout '" << to_utf8(name) << "' in the layout list. You MUST investigate!" << endl; - for (LayoutList::const_iterator it = layoutlist_.begin(); - it != layoutlist_.end(); ++it) - lyxerr << " " << to_utf8(it->get()->name()) << endl; + for (const_iterator cit = begin(); cit != end(); ++cit) + lyxerr << " " << to_utf8(cit->name()) << endl; // we require the name to exist BOOST_ASSERT(false); } - return *cit; + return *it; } @@ -1135,38 +948,15 @@ bool TextClass::load(string const & path) const } -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; + InsetLayouts::const_iterator cen = insetlayoutlist_.end(); while (!n.empty()) { - if (insetlayoutlist_.count(n) > 0) - return insetlayoutlist_[n]; - docstring::size_type i = n.find(':'); + InsetLayouts::const_iterator cit = insetlayoutlist_.lower_bound(n); + if (cit != cen && cit->first == n) + return cit->second; + size_t i = n.find(':'); if (i == string::npos) break; n = n.substr(0,i); @@ -1182,134 +972,62 @@ docstring const & TextClass::defaultLayoutName() const } -LayoutPtr const & TextClass::defaultLayout() const +Layout const & TextClass::defaultLayout() const { return operator[](defaultLayoutName()); } -string const & TextClass::name() const -{ - return name_; -} - - -string const & TextClass::latexname() const -{ - const_cast(this)->load(); - return latexname_; -} - - -string const & TextClass::description() const -{ - return description_; -} - - -string const & TextClass::opt_fontsize() const -{ - return opt_fontsize_; -} - - -string const & TextClass::opt_pagestyle() const -{ - return opt_pagestyle_; -} - - -string const & TextClass::options() const -{ - return options_; -} - - -string const & TextClass::class_header() const +bool TextClass::isDefaultLayout(Layout const & lay) const { - return class_header_; + return lay.name() == defaultLayoutName(); } -string const & TextClass::pagestyle() const +bool TextClass::isEmptyLayout(Layout const & lay) const { - return pagestyle_; + return lay.name() == emptyLayoutName(); } -docstring const & TextClass::preamble() const +DocumentClass & DocumentClassBundle::newClass(LayoutFile const & baseClass) { - return preamble_; + DocumentClass * dc = new DocumentClass(baseClass); + tc_list_.push_back(dc); + return *tc_list_.back(); } -PageSides TextClass::sides() const +DocumentClassBundle & DocumentClassBundle::get() { - return sides_; + static DocumentClassBundle singleton; + return singleton; } -int TextClass::secnumdepth() const -{ - return secnumdepth_; -} +DocumentClass::DocumentClass(LayoutFile const & tc) + : TextClass(tc) +{} -int TextClass::tocdepth() const +bool DocumentClass::hasLaTeXLayout(std::string const & lay) const { - return tocdepth_; + LayoutList::const_iterator it = layoutlist_.begin(); + LayoutList::const_iterator end = layoutlist_.end(); + for (; it != end; ++it) + if (it->latexname() == lay) + return true; + return false; } -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; }