X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxtextclass.C;h=376f20975a3a8c714c03ce6974be2adcafc6994f;hb=c0eb43a927a49e054afbdf37e50387065c3d99a4;hp=75d31c62320d98ddf4ec7b60fd5368e58875c2f8;hpb=44cf1d0e18b659d234bcdd29060262e78c4548dd;p=lyx.git diff --git a/src/lyxtextclass.C b/src/lyxtextclass.C index 75d31c6232..376f20975a 100644 --- a/src/lyxtextclass.C +++ b/src/lyxtextclass.C @@ -18,6 +18,8 @@ #include "lyxtextclass.h" #include "debug.h" #include "lyxlex.h" +#include "counters.h" +#include "FloatList.h" #include "support/lstrings.h" #include "support/LAssert.h" @@ -31,12 +33,25 @@ using std::find_if; using std::remove_if; using std::ostream; +namespace { // anon + +struct compare_name { + compare_name(string const & name) + : name_(name) {} + template + bool operator()(C & c) { + return c->name() == name_; + } + string name_; +}; + +} // anon -/* ******************************************************************* */ LyXTextClass::LyXTextClass(string const & fn, string const & cln, string const & desc) - : name_(fn), latexname_(cln), description_(desc) + : name_(fn), latexname_(cln), description_(desc), + floatlist_(new FloatList), ctrs_(new Counters) { outputType_ = LATEX; columns_ = 1; @@ -59,15 +74,9 @@ bool LyXTextClass::do_readStyle(LyXLex & lexrc, LyXLayout & lay) if (!lay.Read(lexrc, *this)) { // Resolve fonts lay.resfont = lay.font; -#ifndef INHERIT_LANGUAGE lay.resfont.realize(defaultfont()); lay.reslabelfont = lay.labelfont; lay.reslabelfont.realize(defaultfont()); -#else - lay.resfont.realize(defaultfont(), default_language); - lay.reslabelfont = lay.labelfont; - lay.reslabelfont.realize(defaultfont(), default_language); -#endif return false; // no errors } lyxerr << "Error parsing style `" << lay.name() << "'" << endl; @@ -91,10 +100,14 @@ enum TextClassTags { TC_CLASSOPTIONS, TC_PREAMBLE, TC_PROVIDESAMSMATH, + TC_PROVIDESNATBIB, TC_PROVIDESMAKEIDX, TC_PROVIDESURL, TC_LEFTMARGIN, - TC_RIGHTMARGIN + TC_RIGHTMARGIN, + TC_FLOAT, + TC_COUNTER, + TC_NOFLOAT }; @@ -104,17 +117,21 @@ bool LyXTextClass::Read(string const & filename, bool merge) keyword_item textClassTags[] = { { "classoptions", TC_CLASSOPTIONS }, { "columns", TC_COLUMNS }, + { "counter", TC_COUNTER }, { "defaultfont", TC_DEFAULTFONT }, { "defaultstyle", TC_DEFAULTSTYLE }, + { "float", TC_FLOAT }, { "input", TC_INPUT }, { "leftmargin", TC_LEFTMARGIN }, { "maxcounter", TC_MAXCOUNTER }, + { "nofloat", TC_NOFLOAT }, { "nostyle", TC_NOSTYLE }, { "outputtype", TC_OUTPUTTYPE }, { "pagestyle", TC_PAGESTYLE }, { "preamble", TC_PREAMBLE }, { "providesamsmath", TC_PROVIDESAMSMATH }, { "providesmakeidx", TC_PROVIDESMAKEIDX }, + { "providesnatbib", TC_PROVIDESNATBIB }, { "providesurl", TC_PROVIDESURL }, { "rightmargin", TC_RIGHTMARGIN }, { "secnumdepth", TC_SECNUMDEPTH }, @@ -132,7 +149,7 @@ bool LyXTextClass::Read(string const & filename, bool merge) << MakeDisplayPath(filename) << endl; - LyXLex lexrc(textClassTags, TC_RIGHTMARGIN); + LyXLex lexrc(textClassTags, TC_NOFLOAT); bool error = false; lexrc.setFile(filename); @@ -183,14 +200,14 @@ bool LyXTextClass::Read(string const & filename, bool merge) string const name = subst(lexrc.getString(), '_', ' '); if (hasLayout(name)) { - LyXLayout & lay = - const_cast(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(new LyXLayout(lay))); if (defaultlayout_.empty()) { // We do not have a default // layout yet, so we choose @@ -239,7 +256,7 @@ bool LyXTextClass::Read(string const & filename, bool merge) case TC_PAGESTYLE: lexrc.next(); - pagestyle_ = strip(lexrc.getString()); + pagestyle_ = rtrim(lexrc.getString()); break; case TC_DEFAULTFONT: @@ -247,12 +264,7 @@ bool LyXTextClass::Read(string const & filename, bool merge) if (!defaultfont_.resolved()) { lexrc.printError("Warning: defaultfont should " "be fully instantiated!"); -#ifndef INHERIT_LANGUAGE defaultfont_.realize(LyXFont(LyXFont::ALL_SANE)); -#else - defaultfont_.realize(LyXFont(LyXFont::ALL_SANE), - default_language); -#endif } break; @@ -284,6 +296,11 @@ bool LyXTextClass::Read(string const & filename, bool merge) provides_ |= amsmath; break; + case TC_PROVIDESNATBIB: + if (lexrc.next() && lexrc.getInteger()) + provides_ |= natbib; + break; + case TC_PROVIDESMAKEIDX: if (lexrc.next() && lexrc.getInteger()) provides_ |= makeidx; @@ -303,6 +320,19 @@ bool LyXTextClass::Read(string const & filename, bool merge) if (lexrc.next()) rightmargin_ = lexrc.getString(); break; + case TC_FLOAT: + readFloat(lexrc); + break; + case TC_COUNTER: + readCounter(lexrc); + break; + case TC_NOFLOAT: + if (lexrc.next()) { + string const nofloat = lexrc.getString(); + floatlist_->erase(nofloat); + } + break; + } } @@ -457,11 +487,11 @@ void LyXTextClass::readClassOptions(LyXLex & lexrc) switch (static_cast(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(); @@ -476,6 +506,164 @@ void LyXTextClass::readClassOptions(LyXLex & lexrc) } +enum FloatTags { + FT_TYPE = 1, + FT_NAME, + FT_PLACEMENT, + FT_EXT, + FT_WITHIN, + FT_STYLE, + FT_LISTNAME, + FT_BUILTIN, + FT_END +}; + +void LyXTextClass::readFloat(LyXLex & lexrc) +{ + keyword_item floatTags[] = { + { "end", FT_END }, + { "extension", FT_EXT }, + { "guiname", FT_NAME }, + { "latexbuiltin", FT_BUILTIN }, + { "listname", FT_LISTNAME }, + { "numberwithin", FT_WITHIN }, + { "placement", FT_PLACEMENT }, + { "style", FT_STYLE }, + { "type", FT_TYPE } + }; + + lexrc.pushTable(floatTags, FT_END); + + string type; + string placement; + string ext; + string within; + string style; + string name; + string listname; + bool builtin = false; + + bool getout = false; + while (!getout && lexrc.isOK()) { + int le = lexrc.lex(); + switch (le) { + case LyXLex::LEX_UNDEF: + lexrc.printError("Unknown ClassOption tag `$$Token'"); + continue; + default: break; + } + switch (static_cast(le)) { + case FT_TYPE: + lexrc.next(); + type = lexrc.getString(); + // Here we could check if this type is already defined + // and modify it with the rest of the vars instead. + break; + case FT_NAME: + lexrc.next(); + name = lexrc.getString(); + break; + case FT_PLACEMENT: + lexrc.next(); + placement = lexrc.getString(); + break; + case FT_EXT: + lexrc.next(); + ext = lexrc.getString(); + break; + case FT_WITHIN: + lexrc.next(); + within = lexrc.getString(); + if (within == "none") + within.erase(); + break; + case FT_STYLE: + lexrc.next(); + style = lexrc.getString(); + break; + case FT_LISTNAME: + lexrc.next(); + listname = lexrc.getString(); + break; + case FT_BUILTIN: + lexrc.next(); + builtin = lexrc.getBool(); + break; + case FT_END: + getout = true; + break; + } + } + + // Here if have a full float if getout == true + if (getout) { + Floating newfloat(type, placement, ext, within, + style, name, listname, builtin); + floatlist_->newFloat(newfloat); + } + + lexrc.popTable(); +} + + +enum CounterTags { + CT_NAME = 1, + CT_WITHIN, + CT_END +}; + +void LyXTextClass::readCounter(LyXLex & lexrc) +{ + keyword_item counterTags[] = { + { "end", CT_END }, + { "name", CT_NAME }, + { "within", CT_WITHIN } + }; + + lexrc.pushTable(counterTags, CT_END); + + string name; + string within; + + bool getout = false; + while (!getout && lexrc.isOK()) { + int le = lexrc.lex(); + switch (le) { + case LyXLex::LEX_UNDEF: + lexrc.printError("Unknown ClassOption tag `$$Token'"); + continue; + default: break; + } + switch (static_cast(le)) { + case CT_NAME: + lexrc.next(); + name = lexrc.getString(); + break; + case CT_WITHIN: + lexrc.next(); + within = lexrc.getString(); + if (within == "none") + within.erase(); + break; + case CT_END: + getout = true; + break; + } + } + + // Here if have a full float if getout == true + if (getout) { + if (within.empty()) { + ctrs_->newCounter(name); + } else { + ctrs_->newCounter(name, within); + } + } + + lexrc.popTable(); +} + + LyXFont const & LyXTextClass::defaultfont() const { return defaultfont_; @@ -498,13 +686,13 @@ bool LyXTextClass::hasLayout(string const & n) const { 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()); @@ -517,15 +705,14 @@ LyXLayout const & LyXTextClass::operator[](string const & n) const 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; @@ -535,9 +722,9 @@ LyXLayout const & LyXTextClass::operator[](string const & n) const } lastLayoutName = name; - lastLayoutIndex = std::distance(layoutlist.begin(), cit); + lastLayoutIndex = std::distance(layoutlist_.begin(), cit); - return *cit; + return (*cit); } @@ -547,11 +734,12 @@ bool LyXTextClass::delete_layout(string const & name) 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; } @@ -575,18 +763,35 @@ bool LyXTextClass::load() const } loaded = true; return loaded; +} + + +FloatList & LyXTextClass::floats() +{ + return *floatlist_.get(); +} + +FloatList const & LyXTextClass::floats() const +{ + return *floatlist_.get(); +} + + +Counters & LyXTextClass::counters() const +{ + return *ctrs_.get(); } -string const LyXTextClass::defaultLayoutName() const +string const & LyXTextClass::defaultLayoutName() const { // This really should come from the actual layout... (Lgb) return defaultlayout_; } -LyXLayout const & LyXTextClass::defaultLayout() const +LyXLayout_ptr const & LyXTextClass::defaultLayout() const { return operator[](defaultLayoutName()); } @@ -685,7 +890,7 @@ int LyXTextClass::maxcounter() const int LyXTextClass::size() const { - return layoutlist.size(); + return layoutlist_.size(); }