X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTextClass.cpp;h=0dd44340dcf2ee861e589b17dcfe1b5f05f73cea;hb=175711046db2b986550318fa78d901628de28cb8;hp=333582db393bcb2bcc0513231575cc137ad2e364;hpb=5db4d712ef660273c1c12f211fdb4adf5a792ec3;p=lyx.git diff --git a/src/TextClass.cpp b/src/TextClass.cpp index 333582db39..0dd44340dc 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 = 66; //spitz: New layout tag AutoNests +int const LAYOUT_FORMAT = 74; // spitz: NewlineCmd // Layout format for the current lyx file format. Controls which format is @@ -151,9 +151,9 @@ 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), + 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) @@ -219,19 +219,22 @@ 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 }; namespace { LexerKeyword textClassTags[] = { + { "addtociteengine", TC_ADDTOCITEENGINE }, { "addtohtmlpreamble", TC_ADDTOHTMLPREAMBLE }, { "addtohtmlstyles", TC_ADDTOHTMLSTYLES }, { "addtopreamble", TC_ADDTOPREAMBLE }, @@ -277,6 +280,7 @@ LexerKeyword textClassTags[] = { { "secnumdepth", TC_SECNUMDEPTH }, { "sides", TC_SIDES }, { "style", TC_STYLE }, + { "tablestyle", TC_TABLESTYLE }, { "titlelatexname", TC_TITLELATEXNAME }, { "titlelatextype", TC_TITLELATEXTYPE }, { "tocdepth", TC_TOCDEPTH } @@ -759,7 +763,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 +776,7 @@ TextClass::ReturnValues TextClass::read(Lexer & lexrc, ReadType rt) break; case TC_CITEFORMAT: - error = !readCiteFormat(lexrc); + error = !readCiteFormat(lexrc, rt); break; case TC_CITEFRAMEWORK: @@ -857,6 +865,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 } @@ -1030,15 +1043,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()) { @@ -1124,18 +1168,69 @@ bool TextClass::readCiteEngine(Lexer & lexrc) 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 +1258,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 +1279,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; @@ -1666,8 +1806,7 @@ Layout TextClass::createBasicLayout(docstring const & name, bool unknown) const DocumentClassPtr getDocumentClass( LayoutFile const & baseClass, LayoutModuleList const & modlist, - LayoutModuleList const & celist, - bool const clone) + string const & cengine, bool const clone) { DocumentClassPtr doc_class = DocumentClassPtr(new DocumentClass(baseClass)); @@ -1706,37 +1845,34 @@ DocumentClassPtr getDocumentClass( } } - LayoutModuleList::const_iterator cit = celist.begin(); - LayoutModuleList::const_iterator cen = celist.end(); - for (; cit != cen; ++cit) { - string const ceName = *cit; - LyXCiteEngine * ce = theCiteEnginesList[ceName]; - if (!ce) { - docstring const msg = - bformat(_("The cite engine %1$s has been requested by\n" - "this document but has not been found in the list of\n" - "available engines. If you recently installed it, you\n" - "probably need to reconfigure LyX.\n"), from_utf8(ceName)); - if (!clone) - frontend::Alert::warning(_("Cite Engine not available"), msg); - continue; - } - if (!ce->isAvailable() && !clone) { - docstring const prereqs = from_utf8(getStringFromVector(ce->prerequisites(), "\n\t")); - docstring const msg = - bformat(_("The cite engine %1$s requires a package that is not\n" - "available in your LaTeX installation, or a converter that\n" - "you have not installed. LaTeX output may not be possible.\n" - "Missing prerequisites:\n" - "\t%2$s\n" - "See section 3.1.2.3 (Modules) of the User's Guide for more information."), - from_utf8(ceName), prereqs); - frontend::Alert::warning(_("Package not available"), msg, true); - } + if (cengine.empty()) + return doc_class; + + LyXCiteEngine * ce = theCiteEnginesList[cengine]; + if (!ce) { + docstring const msg = + bformat(_("The cite engine %1$s has been requested by\n" + "this document but has not been found in the list of\n" + "available engines. If you recently installed it, you\n" + "probably need to reconfigure LyX.\n"), from_utf8(cengine)); + if (!clone) + frontend::Alert::warning(_("Cite Engine not available"), msg); + } else if (!ce->isAvailable() && !clone) { + docstring const prereqs = from_utf8(getStringFromVector(ce->prerequisites(), "\n\t")); + docstring const msg = + bformat(_("The cite engine %1$s requires a package that is not\n" + "available in your LaTeX installation, or a converter that\n" + "you have not installed. LaTeX output may not be possible.\n" + "Missing prerequisites:\n" + "\t%2$s\n" + "See section 3.1.2.3 (Modules) of the User's Guide for more information."), + from_utf8(cengine), prereqs); + frontend::Alert::warning(_("Package not available"), msg, true); + } else { FileName layout_file = libFileSearch("citeengines", ce->getFilename()); if (!doc_class->read(layout_file, TextClass::CITE_ENGINE)) { docstring const msg = - bformat(_("Error reading cite engine %1$s\n"), from_utf8(ceName)); + bformat(_("Error reading cite engine %1$s\n"), from_utf8(cengine)); frontend::Alert::warning(_("Read Error"), msg); } } @@ -1813,7 +1949,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 += ".";