X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTextClass.cpp;h=4058815d599e25fb1f4f46e757094380726c012d;hb=38c2cde0d8695ac5287bae218c4a33a2acf18ef8;hp=22141bcf0fccc94c15096d4602221123bdbc8538;hpb=0aeeb78f3cd9b93da1b81c911a8d2f3915533336;p=lyx.git diff --git a/src/TextClass.cpp b/src/TextClass.cpp index 22141bcf0f..4058815d59 100644 --- a/src/TextClass.cpp +++ b/src/TextClass.cpp @@ -62,7 +62,7 @@ namespace lyx { // You should also run the development/tools/updatelayouts.py script, // to update the format of all of our layout files. // -int const LAYOUT_FORMAT = 67; //spitz: New layout tag NeedsCProtect +int const LAYOUT_FORMAT = 80; // spitz: Requires for floats // Layout format for the current lyx file format. Controls which format is @@ -150,13 +150,14 @@ docstring const TextClass::plain_layout_ = from_ascii(N_("Plain Layout")); TextClass::TextClass() : loaded_(false), tex_class_avail_(false), opt_enginetype_("authoryear|numerical"), opt_fontsize_("10|11|12"), - opt_pagestyle_("empty|plain|headings|fancy"), pagestyle_("default"), - columns_(1), sides_(OneSide), secnumdepth_(3), tocdepth_(3), - outputType_(LATEX), outputFormat_("latex"), has_output_format_(false), - defaultfont_(sane_font), + opt_pagesize_("default|a4|a5|b5|letter|legal|executive"), + opt_pagestyle_("empty|plain|headings|fancy"), fontsize_format_("$$spt"), pagesize_("default"), + pagesize_format_("$$spaper"), pagestyle_("default"), tablestyle_("default"), + columns_(1), sides_(OneSide), secnumdepth_(3), tocdepth_(3), outputType_(LATEX), + outputFormat_("latex"), has_output_format_(false), defaultfont_(sane_font), titletype_(TITLE_COMMAND_AFTER), titlename_("maketitle"), min_toclevel_(0), max_toclevel_(0), maxcitenames_(2), - cite_full_author_list_(true) + cite_full_author_list_(true), bibintoc_(false) { } @@ -191,6 +192,7 @@ enum TextClassTags { TC_COLUMNS, TC_SIDES, TC_PAGESTYLE, + TC_PAGESIZE, TC_DEFAULTFONT, TC_SECNUMDEPTH, TC_TOCDEPTH, @@ -219,22 +221,27 @@ enum TextClassTags { TC_EXCLUDESMODULE, TC_HTMLTOCSECTION, TC_CITEENGINE, + TC_ADDTOCITEENGINE, TC_CITEENGINETYPE, TC_CITEFORMAT, TC_CITEFRAMEWORK, TC_MAXCITENAMES, TC_DEFAULTBIBLIO, TC_FULLAUTHORLIST, - TC_OUTLINERNAME + TC_OUTLINERNAME, + TC_TABLESTYLE, + TC_BIBINTOC }; namespace { LexerKeyword textClassTags[] = { + { "addtociteengine", TC_ADDTOCITEENGINE }, { "addtohtmlpreamble", TC_ADDTOHTMLPREAMBLE }, { "addtohtmlstyles", TC_ADDTOHTMLSTYLES }, { "addtopreamble", TC_ADDTOPREAMBLE }, + { "bibintoc", TC_BIBINTOC }, { "citeengine", TC_CITEENGINE }, { "citeenginetype", TC_CITEENGINETYPE }, { "citeformat", TC_CITEFORMAT }, @@ -267,6 +274,7 @@ LexerKeyword textClassTags[] = { { "outputformat", TC_OUTPUTFORMAT }, { "outputtype", TC_OUTPUTTYPE }, { "packageoptions", TC_PKGOPTS }, + { "pagesize", TC_PAGESIZE }, { "pagestyle", TC_PAGESTYLE }, { "preamble", TC_PREAMBLE }, { "provides", TC_PROVIDES }, @@ -277,6 +285,7 @@ LexerKeyword textClassTags[] = { { "secnumdepth", TC_SECNUMDEPTH }, { "sides", TC_SIDES }, { "style", TC_STYLE }, + { "tablestyle", TC_TABLESTYLE }, { "titlelatexname", TC_TITLELATEXNAME }, { "titlelatextype", TC_TITLELATEXTYPE }, { "tocdepth", TC_TOCDEPTH } @@ -600,6 +609,11 @@ TextClass::ReturnValues TextClass::read(Lexer & lexrc, ReadType rt) } break; + case TC_PAGESIZE: + lexrc.next(); + pagesize_ = rtrim(lexrc.getString()); + break; + case TC_PAGESTYLE: lexrc.next(); pagestyle_ = rtrim(lexrc.getString()); @@ -731,6 +745,7 @@ TextClass::ReturnValues TextClass::read(Lexer & lexrc, ReadType rt) break; } docstring const name = subst(lexrc.getDocString(), '_', ' '); + bool const validating = (rt == VALIDATION); if (name.empty()) { string s = "Could not read name for InsetLayout: `$$Token' " + lexrc.getString() + " is probably not valid UTF-8!"; @@ -739,15 +754,17 @@ TextClass::ReturnValues TextClass::read(Lexer & lexrc, ReadType rt) // Since we couldn't read the name, we just scan the rest // of the style and discard it. il.read(lexrc, *this); - // Let's try to continue rather than abort. - // error = true; + // Let's try to continue rather than abort, unless we're validating + // in which case we want to report the error + if (validating) + error = true; } else if (hasInsetLayout(name)) { InsetLayout & il = insetlayoutlist_[name]; - error = !il.read(lexrc, *this); + error = !il.read(lexrc, *this, validating); } else { InsetLayout il; il.setName(name); - error = !il.read(lexrc, *this); + error = !il.read(lexrc, *this, validating); if (!error) insetlayoutlist_[name] = il; } @@ -759,7 +776,11 @@ TextClass::ReturnValues TextClass::read(Lexer & lexrc, ReadType rt) break; case TC_CITEENGINE: - error = !readCiteEngine(lexrc); + error = !readCiteEngine(lexrc, rt); + break; + + case TC_ADDTOCITEENGINE: + error = !readCiteEngine(lexrc, rt, true); break; case TC_CITEENGINETYPE: @@ -768,7 +789,7 @@ TextClass::ReturnValues TextClass::read(Lexer & lexrc, ReadType rt) break; case TC_CITEFORMAT: - error = !readCiteFormat(lexrc); + error = !readCiteFormat(lexrc, rt); break; case TC_CITEFRAMEWORK: @@ -785,23 +806,26 @@ TextClass::ReturnValues TextClass::read(Lexer & lexrc, ReadType rt) if (lexrc.next()) { vector const dbs = getVectorFromString(rtrim(lexrc.getString()), "|"); - vector::const_iterator it = dbs.begin(); - vector::const_iterator end = dbs.end(); - for (; it != end; ++it) { - if (!contains(*it, ':')) { + for (auto const & dbase : dbs) { + if (!contains(dbase, ':')) { vector const enginetypes = getVectorFromString(opt_enginetype_, "|"); - for (string const &s: enginetypes) - cite_default_biblio_style_[s] = *it; + for (string const & s: enginetypes) + cite_default_biblio_style_[s] = dbase; } else { string eng; - string const db = split(*it, eng, ':'); + string const db = split(dbase, eng, ':'); cite_default_biblio_style_[eng] = db; } } } break; + case TC_BIBINTOC: + if (lexrc.next()) + bibintoc_ = lexrc.getBool(); + break; + case TC_FULLAUTHORLIST: if (lexrc.next()) cite_full_author_list_ &= lexrc.getBool(); @@ -857,6 +881,11 @@ TextClass::ReturnValues TextClass::read(Lexer & lexrc, ReadType rt) case TC_OUTLINERNAME: error = !readOutlinerName(lexrc); break; + + case TC_TABLESTYLE: + lexrc.next(); + tablestyle_ = rtrim(lexrc.getString()); + break; } // end of switch } @@ -901,10 +930,8 @@ TextClass::ReturnValues TextClass::read(Lexer & lexrc, ReadType rt) min_toclevel_ = Layout::NOT_IN_TOC; max_toclevel_ = Layout::NOT_IN_TOC; - const_iterator lit = begin(); - const_iterator len = end(); - for (; lit != len; ++lit) { - int const toclevel = lit->toclevel; + for (auto const & lay : *this) { + int const toclevel = lay.toclevel; if (toclevel != Layout::NOT_IN_TOC) { if (min_toclevel_ == Layout::NOT_IN_TOC) min_toclevel_ = toclevel; @@ -976,6 +1003,9 @@ void TextClass::readClassOptions(Lexer & lexrc) { enum { CO_FONTSIZE = 1, + CO_FONTSIZE_FORMAT, + CO_PAGESIZE, + CO_PAGESIZE_FORMAT, CO_PAGESTYLE, CO_OTHER, CO_HEADER, @@ -985,8 +1015,11 @@ void TextClass::readClassOptions(Lexer & lexrc) LexerKeyword classOptionsTags[] = { {"end", CO_END }, {"fontsize", CO_FONTSIZE }, + {"fontsizeformat", CO_FONTSIZE_FORMAT }, {"header", CO_HEADER }, {"other", CO_OTHER }, + {"pagesize", CO_PAGESIZE }, + {"pagesizeformat", CO_PAGESIZE_FORMAT }, {"pagestyle", CO_PAGESTYLE } }; @@ -1006,6 +1039,18 @@ void TextClass::readClassOptions(Lexer & lexrc) lexrc.next(); opt_fontsize_ = rtrim(lexrc.getString()); break; + case CO_FONTSIZE_FORMAT: + lexrc.next(); + fontsize_format_ = rtrim(lexrc.getString()); + break; + case CO_PAGESIZE: + lexrc.next(); + opt_pagesize_ = rtrim(lexrc.getString()); + break; + case CO_PAGESIZE_FORMAT: + lexrc.next(); + pagesize_format_ = rtrim(lexrc.getString()); + break; case CO_PAGESTYLE: lexrc.next(); opt_pagestyle_ = rtrim(lexrc.getString()); @@ -1030,15 +1075,46 @@ void TextClass::readClassOptions(Lexer & lexrc) } -bool TextClass::readCiteEngine(Lexer & lexrc) +vector const & TextClass::getCiteStyles( + CiteEngineType const & type) const +{ + static vector empty; + map >::const_iterator it = cite_styles_.find(type); + if (it == cite_styles_.end()) + return empty; + return it->second; +} + + +bool TextClass::readCiteEngine(Lexer & lexrc, ReadType rt, bool const add) { int const type = readCiteEngineType(lexrc); - if (type & ENGINE_TYPE_AUTHORYEAR) - cite_styles_[ENGINE_TYPE_AUTHORYEAR].clear(); - if (type & ENGINE_TYPE_NUMERICAL) - cite_styles_[ENGINE_TYPE_NUMERICAL].clear(); - if (type & ENGINE_TYPE_DEFAULT) - cite_styles_[ENGINE_TYPE_DEFAULT].clear(); + bool authoryear = (type & ENGINE_TYPE_AUTHORYEAR); + bool numerical = (type & ENGINE_TYPE_NUMERICAL); + bool defce = (type & ENGINE_TYPE_DEFAULT); + + if (rt == CITE_ENGINE) { + // The cite engines are not supposed to overwrite + // CiteStyle defined by the class or a module. + if (authoryear) + authoryear = getCiteStyles(ENGINE_TYPE_AUTHORYEAR).empty(); + if (numerical) + numerical = getCiteStyles(ENGINE_TYPE_NUMERICAL).empty(); + if (defce) + defce = getCiteStyles(ENGINE_TYPE_DEFAULT).empty(); + } + + if (rt != CITE_ENGINE && !add) { + // Reset if we defined CiteStyle + // from the class or a module + if (authoryear) + cite_styles_[ENGINE_TYPE_AUTHORYEAR].clear(); + if (numerical) + cite_styles_[ENGINE_TYPE_NUMERICAL].clear(); + if (defce) + cite_styles_[ENGINE_TYPE_DEFAULT].clear(); + } + string def; bool getout = false; while (!getout && lexrc.isOK()) { @@ -1120,22 +1196,73 @@ bool TextClass::readCiteEngine(Lexer & lexrc) cs.cmd = latex_cmd.empty() ? lyx_cmd : latex_cmd; if (!alias.empty()) { vector const aliases = getVectorFromString(alias); - for (string const &s: aliases) + for (string const & s: aliases) cite_command_aliases_[s] = lyx_cmd; } vector const stardescs = getVectorFromString(stardesc, "!"); - int size = stardesc.size(); + int size = int(stardesc.size()); if (size > 0) cs.stardesc = stardescs[0]; if (size > 1) cs.startooltip = stardescs[1]; + if (add) { + if (authoryear) + class_cite_styles_[ENGINE_TYPE_AUTHORYEAR].push_back(cs); + if (numerical) + class_cite_styles_[ENGINE_TYPE_NUMERICAL].push_back(cs); + if (defce) + class_cite_styles_[ENGINE_TYPE_DEFAULT].push_back(cs); + } else { + if (authoryear) + cite_styles_[ENGINE_TYPE_AUTHORYEAR].push_back(cs); + if (numerical) + cite_styles_[ENGINE_TYPE_NUMERICAL].push_back(cs); + if (defce) + cite_styles_[ENGINE_TYPE_DEFAULT].push_back(cs); + } + } + // If we do AddToCiteEngine, do not apply yet, + // except if we have already a style to add something to + bool apply_ay = !add; + bool apply_num = !add; + bool apply_def = !add; + if (add) { if (type & ENGINE_TYPE_AUTHORYEAR) - cite_styles_[ENGINE_TYPE_AUTHORYEAR].push_back(cs); + apply_ay = !getCiteStyles(ENGINE_TYPE_AUTHORYEAR).empty(); if (type & ENGINE_TYPE_NUMERICAL) - cite_styles_[ENGINE_TYPE_NUMERICAL].push_back(cs); + apply_num = !getCiteStyles(ENGINE_TYPE_NUMERICAL).empty(); if (type & ENGINE_TYPE_DEFAULT) - cite_styles_[ENGINE_TYPE_DEFAULT].push_back(cs); + apply_def = !getCiteStyles(ENGINE_TYPE_DEFAULT).empty(); } + + // Add the styles from AddToCiteEngine to the class' styles + // (but only if they are not yet defined) + for (auto const & cis : class_cite_styles_) { + // Only consider the current CiteEngineType + if (!(type & cis.first)) + continue; + for (auto const & ciss : cis.second) { + bool defined = false; + // Check if the style "name" is already def'ed + for (auto const & av : getCiteStyles(cis.first)) + if (av.name == ciss.name) + defined = true; + if (!defined) { + if (cis.first == ENGINE_TYPE_AUTHORYEAR && apply_ay) + cite_styles_[ENGINE_TYPE_AUTHORYEAR].push_back(ciss); + else if (cis.first == ENGINE_TYPE_NUMERICAL && apply_num) + cite_styles_[ENGINE_TYPE_NUMERICAL].push_back(ciss); + else if (cis.first == ENGINE_TYPE_DEFAULT && apply_def) + cite_styles_[ENGINE_TYPE_DEFAULT].push_back(ciss); + } + } + } + if (type & ENGINE_TYPE_AUTHORYEAR && apply_ay) + class_cite_styles_[ENGINE_TYPE_AUTHORYEAR].clear(); + if (type & ENGINE_TYPE_NUMERICAL && apply_num) + class_cite_styles_[ENGINE_TYPE_NUMERICAL].clear(); + if (type & ENGINE_TYPE_DEFAULT && apply_def) + class_cite_styles_[ENGINE_TYPE_DEFAULT].clear(); return getout; } @@ -1163,11 +1290,14 @@ int TextClass::readCiteEngineType(Lexer & lexrc) const } -bool TextClass::readCiteFormat(Lexer & lexrc) +bool TextClass::readCiteFormat(Lexer & lexrc, ReadType rt) { int const type = readCiteEngineType(lexrc); string etype; string definition; + // Cite engine definitions do not overwrite existing + // definitions from the class or a module + bool const overwrite = rt != CITE_ENGINE; while (lexrc.isOK()) { lexrc.next(); etype = lexrc.getString(); @@ -1181,19 +1311,61 @@ bool TextClass::readCiteFormat(Lexer & lexrc) if (initchar == '#') continue; if (initchar == '!' || initchar == '_' || prefixIs(etype, "B_")) { - if (type & ENGINE_TYPE_AUTHORYEAR) - cite_macros_[ENGINE_TYPE_AUTHORYEAR][etype] = definition; - if (type & ENGINE_TYPE_NUMERICAL) - cite_macros_[ENGINE_TYPE_NUMERICAL][etype] = definition; - if (type & ENGINE_TYPE_DEFAULT) - cite_macros_[ENGINE_TYPE_DEFAULT][etype] = definition; + bool defined = false; + bool aydefined = false; + bool numdefined = false; + // Check if the macro is already def'ed + for (auto const & cm : cite_macros_) { + if (!(type & cm.first)) + continue; + if (cm.second.find(etype) != cm.second.end()) { + if (type == cm.first) + // defined as default or specific type + defined = true; + if (cm.first == ENGINE_TYPE_AUTHORYEAR) + // defined for author-year + aydefined = true; + else if (cm.first == ENGINE_TYPE_NUMERICAL) + // defined for numerical + numdefined = true; + } + } + if (!defined || overwrite) { + if (type & ENGINE_TYPE_AUTHORYEAR && (type != ENGINE_TYPE_DEFAULT || !aydefined)) + cite_macros_[ENGINE_TYPE_AUTHORYEAR][etype] = definition; + if (type & ENGINE_TYPE_NUMERICAL && (type != ENGINE_TYPE_DEFAULT || !numdefined)) + cite_macros_[ENGINE_TYPE_NUMERICAL][etype] = definition; + if (type == ENGINE_TYPE_DEFAULT) + cite_macros_[ENGINE_TYPE_DEFAULT][etype] = definition; + } } else { - if (type & ENGINE_TYPE_AUTHORYEAR) - cite_formats_[ENGINE_TYPE_AUTHORYEAR][etype] = definition; - if (type & ENGINE_TYPE_NUMERICAL) - cite_formats_[ENGINE_TYPE_NUMERICAL][etype] = definition; - if (type & ENGINE_TYPE_DEFAULT) - cite_formats_[ENGINE_TYPE_DEFAULT][etype] = definition; + bool defined = false; + bool aydefined = false; + bool numdefined = false; + // Check if the format is already def'ed + for (auto const & cm : cite_formats_) { + if (!(type & cm.first)) + continue; + if (cm.second.find(etype) != cm.second.end()) { + if (type == cm.first) + // defined as default or specific type + defined = true; + if (cm.first == ENGINE_TYPE_AUTHORYEAR) + // defined for author-year + aydefined = true; + else if (cm.first == ENGINE_TYPE_NUMERICAL) + // defined for numerical + numdefined = true; + } + } + if (!defined || overwrite){ + if (type & ENGINE_TYPE_AUTHORYEAR && (type != ENGINE_TYPE_DEFAULT || !aydefined)) + cite_formats_[ENGINE_TYPE_AUTHORYEAR][etype] = definition; + if (type & ENGINE_TYPE_NUMERICAL && (type != ENGINE_TYPE_DEFAULT || !numdefined)) + cite_formats_[ENGINE_TYPE_NUMERICAL][etype] = definition; + if (type == ENGINE_TYPE_DEFAULT) + cite_formats_[ENGINE_TYPE_DEFAULT][etype] = definition; + } } } return true; @@ -1219,7 +1391,8 @@ bool TextClass::readFloat(Lexer & lexrc) FT_REFPREFIX, FT_ALLOWED_PLACEMENT, FT_ALLOWS_SIDEWAYS, - FT_ALLOWS_WIDE, + FT_ALLOWS_WIDE, + FT_REQUIRES, FT_END }; @@ -1239,6 +1412,7 @@ bool TextClass::readFloat(Lexer & lexrc) { "numberwithin", FT_WITHIN }, { "placement", FT_PLACEMENT }, { "refprefix", FT_REFPREFIX }, + { "requires", FT_REQUIRES }, { "style", FT_STYLE }, { "type", FT_TYPE }, { "usesfloatpkg", FT_USESFLOAT } @@ -1259,6 +1433,7 @@ bool TextClass::readFloat(Lexer & lexrc) string style; string type; string within; + string required; bool usesfloat = true; bool ispredefined = false; bool allowswide = true; @@ -1334,6 +1509,10 @@ bool TextClass::readFloat(Lexer & lexrc) lexrc.next(); usesfloat = lexrc.getBool(); break; + case FT_REQUIRES: + lexrc.next(); + required = lexrc.getString(); + break; case FT_PREDEFINED: lexrc.next(); ispredefined = lexrc.getBool(); @@ -1371,11 +1550,9 @@ bool TextClass::readFloat(Lexer & lexrc) if (!usesfloat && listcommand.empty()) { // if this float uses the same auxfile as an existing one, // there is no need for it to provide a list command. - FloatList::const_iterator it = floatlist_.begin(); - FloatList::const_iterator en = floatlist_.end(); bool found_ext = false; - for (; it != en; ++it) { - if (it->second.ext() == ext) { + for (auto const & f : floatlist_) { + if (f.second.ext() == ext) { found_ext = true; break; } @@ -1386,9 +1563,9 @@ bool TextClass::readFloat(Lexer & lexrc) "not be able to produce a float list."); } Floating fl(type, placement, ext, within, style, name, - listname, listcommand, refprefix, allowed_placement, - htmltag, htmlattr, htmlstyle, usesfloat, ispredefined, - allowswide, allowssideways); + listname, listcommand, refprefix, allowed_placement, + htmltag, htmlattr, htmlstyle, required, usesfloat, + ispredefined, allowswide, allowssideways); floatlist_.newFloat(fl); // each float has its own counter counters_.newCounter(from_ascii(type), from_ascii(within), @@ -1462,8 +1639,8 @@ Layout const & TextClass::operator[](docstring const & name) const if (it == end()) { LYXERR0("We failed to find the layout '" << name << "' in the layout list. You MUST investigate!"); - for (const_iterator cit = begin(); cit != end(); ++cit) - lyxerr << " " << to_utf8(cit->name()) << endl; + for (auto const & lay : *this) + lyxerr << " " << to_utf8(lay.name()) << endl; // We require the name to exist static const Layout dummy; @@ -1484,8 +1661,8 @@ Layout & TextClass::operator[](docstring const & name) if (it == end()) { LYXERR0("We failed to find the layout '" << to_utf8(name) << "' in the layout list. You MUST investigate!"); - for (const_iterator cit = begin(); cit != end(); ++cit) - LYXERR0(" " << to_utf8(cit->name())); + for (auto const & lay : *this) + LYXERR0(" " << to_utf8(lay.name())); // we require the name to exist LATTEST(false); @@ -1562,14 +1739,13 @@ string DocumentClass::forcedLayouts() const { ostringstream os; bool first = true; - const_iterator const e = end(); - for (const_iterator i = begin(); i != e; ++i) { - if (i->forcelocal > 0) { + for (auto const & lay : *this) { + if (lay.forcelocal > 0) { if (first) { os << "Format " << LAYOUT_FORMAT << '\n'; first = false; } - i->write(os); + lay.write(os); } } return os.str(); @@ -1634,7 +1810,7 @@ bool TextClass::isPlainLayout(Layout const & layout) const Layout TextClass::createBasicLayout(docstring const & name, bool unknown) const { - static Layout * defaultLayout = NULL; + static Layout * defaultLayout = nullptr; if (defaultLayout) { defaultLayout->setUnknown(unknown); @@ -1670,17 +1846,14 @@ DocumentClassPtr getDocumentClass( { DocumentClassPtr doc_class = DocumentClassPtr(new DocumentClass(baseClass)); - LayoutModuleList::const_iterator it = modlist.begin(); - LayoutModuleList::const_iterator en = modlist.end(); - for (; it != en; ++it) { - string const modName = *it; - LyXModule * lm = theModuleList[modName]; + for (auto const & mod : modlist) { + LyXModule * lm = theModuleList[mod]; if (!lm) { docstring const msg = bformat(_("The module %1$s has been requested by\n" "this document but has not been found in the list of\n" "available modules. If you recently installed it, you\n" - "probably need to reconfigure LyX.\n"), from_utf8(modName)); + "probably need to reconfigure LyX.\n"), from_utf8(mod)); if (!clone) frontend::Alert::warning(_("Module not available"), msg); continue; @@ -1694,17 +1867,20 @@ DocumentClassPtr getDocumentClass( "Missing prerequisites:\n" "\t%2$s\n" "See section 3.1.2.3 (Modules) of the User's Guide for more information."), - from_utf8(modName), prereqs); + from_utf8(mod), prereqs); frontend::Alert::warning(_("Package not available"), msg, true); } FileName layout_file = libFileSearch("layouts", lm->getFilename()); if (!doc_class->read(layout_file, TextClass::MODULE)) { docstring const msg = - bformat(_("Error reading module %1$s\n"), from_utf8(modName)); + bformat(_("Error reading module %1$s\n"), from_utf8(mod)); frontend::Alert::warning(_("Read Error"), msg); } } + if (cengine.empty()) + return doc_class; + LyXCiteEngine * ce = theCiteEnginesList[cengine]; if (!ce) { docstring const msg = @@ -1751,10 +1927,8 @@ DocumentClass::DocumentClass(LayoutFile const & tc) bool DocumentClass::hasLaTeXLayout(std::string const & lay) const { - LayoutList::const_iterator it = layoutlist_.begin(); - LayoutList::const_iterator end = layoutlist_.end(); - for (; it != end; ++it) - if (it->latexname() == lay) + for (auto const & l : layoutlist_) + if (l.latexname() == lay) return true; return false; } @@ -1775,17 +1949,15 @@ bool DocumentClass::hasTocLevels() const Layout const & DocumentClass::getTOCLayout() const { // we're going to look for the layout with the minimum toclevel - TextClass::LayoutList::const_iterator lit = begin(); - TextClass::LayoutList::const_iterator const len = end(); int minlevel = 1000; - Layout const * lay = NULL; - for (; lit != len; ++lit) { - int const level = lit->toclevel; + Layout const * lay = nullptr; + for (auto const & l : *this) { + int const level = l.toclevel; // we don't want Part or unnumbered sections if (level == Layout::NOT_IN_TOC || level < 0 - || level >= minlevel || lit->counter.empty()) + || level >= minlevel || l.counter.empty()) continue; - lay = &*lit; + lay = &l; minlevel = level; } if (lay) @@ -1806,7 +1978,9 @@ Layout const & DocumentClass::htmlTOCLayout() const string const DocumentClass::getCiteFormat(CiteEngineType const & type, string const & entry, bool const punct, string const & fallback) const { - string default_format = "{%fullnames:author%[[%fullnames:author%, ]][[{%fullnames:editor%[[%fullnames:editor%, ed., ]]}]]}\"%title%\"{%journal%[[, {!!}%journal%{!!}]][[{%publisher%[[, %publisher%]][[{%institution%[[, %institution%]]}]]}]]}{%year%[[ (%year%)]]}{%pages%[[, %pages%]]}"; + string default_format = "{%fullnames:author%[[%fullnames:author%, ]][[{%fullnames:editor%[[%fullnames:editor%, ed., ]]}]]}" + "\"%title%\"{%journal%[[, {!!}%journal%{!!}]][[{%publisher%[[, %publisher%]]" + "[[{%institution%[[, %institution%]]}]]}]]}{%year%[[ (%year%)]]}{%pages%[[, %pages%]]}"; if (punct) default_format += "."; @@ -1842,13 +2016,10 @@ vector const DocumentClass::citeCommands( CiteEngineType const & type) const { vector const styles = citeStyles(type); - vector::const_iterator it = styles.begin(); - vector::const_iterator end = styles.end(); vector cmds; - for (; it != end; ++it) { - CitationStyle const cite = *it; - cmds.push_back(cite.name); - } + for (auto const & cs : styles) + cmds.push_back(cs.name); + return cmds; }