X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeXFeatures.cpp;h=cec1078a5658da44322eebdb2782f33f963fa962;hb=1cbac6fcb40d6e0803198624c047769adec2fe09;hp=fb8a8181cd1c16226c2ca4f443b226e9293dc5ac;hpb=43b16548b473d93b26489d8c4bbd9bf1e903a35f;p=lyx.git diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp index fb8a8181cd..cec1078a56 100644 --- a/src/LaTeXFeatures.cpp +++ b/src/LaTeXFeatures.cpp @@ -40,9 +40,9 @@ #include "support/docstring.h" #include "support/filetools.h" #include "support/lstrings.h" -#include "support/regex.h" #include +#include using namespace std; @@ -73,6 +73,11 @@ static docstring const lyxarrow_def = from_ascii( "{\\leavevmode\\,$\\triangleleft$\\,\\allowbreak}\n" "{\\leavevmode\\,$\\triangleright$\\,\\allowbreak}}"); +static docstring const aastex_case_def = from_ascii( + "\\providecommand\\case[2]{\\mbox{$\\frac{#1}{#2}$}}%"); +// Copied from https://github.com/AASJournals/AASTeX60/blob/master/cls/aastex63.cls#L1645 +// Adapted to providecommand for compatibility reasons. + // ZERO WIDTH SPACE (ZWSP) is actually not a space character // but marks a line break opportunity. Several commands provide a // line break opportunity. They differ in side-effects: @@ -188,44 +193,11 @@ static docstring const tabularnewline_def = from_ascii( "%% Because html converters don't know tabularnewline\n" "\\providecommand{\\tabularnewline}{\\\\}\n"); -static docstring const lyxgreyedout_def = from_ascii( - "%% The greyedout annotation environment\n" - "\\newenvironment{lyxgreyedout}\n" - " {\\textcolor{note_fontcolor}\\bgroup\\ignorespaces}\n" - " {\\ignorespacesafterend\\egroup}\n"); - -static docstring const lyxgreyedout_rtl_def = from_ascii( - "%% The greyedout annotation environment (with RTL support)\n" - "\\NewEnviron{lyxgreyedout}{%\n" - "\\if@rl%\n" - "\\everypar{\\textcolor{note_fontcolor}\\beginL\\ignorespaces}%\n" - "\\BODY\\everypar{\\ignorespacesafterend\\endL}\n" - "\\else%\n" - "\\textcolor{note_fontcolor}\\bgroup\\ignorespaces%\n" - "\\BODY\\ignorespacesafterend\\egroup\n" - "\\fi}\n"); - -static docstring const lyxgreyedout_luartl_def = from_ascii( - "%% The greyedout annotation environment (with RTL support)\n" - "\\NewEnviron{lyxgreyedout}{%\n" - "\\if@RTL%\n" - "\\everypar{\\color{note_fontcolor}\\pardir TRT \\textdir TRT\\ignorespaces}%\n" - "\\BODY\\everypar{\\ignorespacesafterend}\n" - "\\else%\n" - "\\textcolor{note_fontcolor}\\bgroup\\ignorespaces%\n" - "\\BODY\\ignorespacesafterend\\egroup\n" - "\\fi}\n"); - -static docstring const lyxgreyedout_luartl_babel_def = from_ascii( - "%% The greyedout annotation environment (with RTL support)\n" - "\\NewEnviron{lyxgreyedout}{%\n" - "\\if@rl%\n" - "\\everypar{\\color{note_fontcolor}\\pardir TRT \\textdir TRT\\ignorespaces}%\n" - "\\BODY\\everypar{\\ignorespacesafterend}\n" - "\\else%\n" - "\\textcolor{note_fontcolor}\\bgroup\\ignorespaces%\n" - "\\BODY\\ignorespacesafterend\\egroup\n" - "\\fi}\n"); +static docstring const cellvarwidth_def = from_ascii( + "%% Variable width box for table cells\n" + "\\newenvironment{cellvarwidth}[1][t]\n" + " {\\begin{varwidth}[#1]{\\linewidth}}\n" + " {\\@finalstrut\\@arstrutbox\\end{varwidth}}\n"); // We want to omit the file extension for includegraphics, but this does not // work when the filename contains other dots. @@ -498,6 +470,7 @@ static docstring const textschwa_def = from_ascii( // split-level fractions static docstring const xfrac_def = from_ascii( "\\usepackage{xfrac}\n"); + static docstring const smallLetterFrac_def = from_ascii( "\\DeclareCollectionInstance{smallLetterFrac}{xfrac}{default}{text}\n" " {phantom=c, scale-factor=1.0, slash-left-kern=-.05em}\n" @@ -573,6 +546,52 @@ static docstring const lyxmintcaption_def = from_ascii( "}\n"); +docstring const lyxgreyedoutDef(bool const rtl, bool const ct, bool const lua, bool const babel) +{ + odocstringstream ods; + + if (rtl) { + ods << "%% The greyedout annotation environment (with RTL support)\n" + << "\\NewEnviron{lyxgreyedout}{%\n"; + if (lua && !babel) + // luabidi uses this switch + ods << " \\if@RTL%\n"; + else + ods << " \\if@rl%\n"; + ods << " \\everypar{%\n"; + if (lua) + ods << " \\pardir TRT \\textdir TRT\\textcolor{note_fontcolor}\\ignorespaces%\n"; + else + ods << " \\textcolor{note_fontcolor}\\beginL\\ignorespaces%\n"; + ods << " }%\n"; + if (ct) + ods << " \\colorlet{lyxadded}{lyxadded!30}\\colorlet{lyxdeleted}{lyxdeleted!30}%\n"; + if (lua) + ods << " \\BODY\\everypar{\\ignorespacesafterend}%\n"; + else + ods << " \\BODY\\everypar{\\ignorespacesafterend\\endL}%\n"; + ods << " \\else%\n"; + if (ct) + ods << " \\colorlet{lyxadded}{lyxadded!30}\\colorlet{lyxdeleted}{lyxdeleted!30}%\n"; + ods << " \\textcolor{note_fontcolor}\\bgroup\\ignorespaces%\n" + << " \\BODY\\ignorespacesafterend\\egroup%\n" + << " \\fi%\n" + << "}\n"; + } else { + ods << "%% The greyedout annotation environment\n" + << "\\newenvironment{lyxgreyedout}\n" + << "{"; + if (ct) + ods << "\\colorlet{lyxadded}{lyxadded!30}\\colorlet{lyxdeleted}{lyxdeleted!30}%\n "; + ods << "\\textcolor{note_fontcolor}\\bgroup\\ignorespaces}\n" + << "{\\ignorespacesafterend\\egroup}\n"; + } + + return ods.str(); +} + + + ///////////////////////////////////////////////////////////////////// // // LyXHTML strings @@ -1229,14 +1248,10 @@ string const LaTeXFeatures::getPackageOptions() const { ostringstream packageopts; // Output all the package option stuff we have been asked to do. - map::const_iterator it = - params_.documentClass().packageOptions().begin(); - map::const_iterator en = - params_.documentClass().packageOptions().end(); - for (; it != en; ++it) - if (mustProvide(it->first)) - packageopts << "\\PassOptionsToPackage{" << it->second << "}" - << "{" << it->first << "}\n"; + for (auto const & p : params_.documentClass().packageOptions()) + if (mustProvide(p.first)) + packageopts << "\\PassOptionsToPackage{" << p.second << "}" + << "{" << p.first << "}\n"; return packageopts.str(); } @@ -1263,8 +1278,8 @@ string const LaTeXFeatures::getPackages() const if (mustProvide("changebar")) { packages << "\\usepackage"; - if (runparams_.flavor == OutputParams::LATEX - || runparams_.flavor == OutputParams::DVILUATEX) + if (runparams_.flavor == Flavor::LaTeX + || runparams_.flavor == Flavor::DviLuaTeX) packages << "[dvips]"; packages << "{changebar}\n"; } @@ -1278,8 +1293,8 @@ string const LaTeXFeatures::getPackages() const // [pdf]lscape is used to rotate longtables if (mustProvide("lscape")) { - if (runparams_.flavor == OutputParams::LATEX - || runparams_.flavor == OutputParams::DVILUATEX) + if (runparams_.flavor == Flavor::LaTeX + || runparams_.flavor == Flavor::DviLuaTeX) packages << "\\usepackage{lscape}\n"; else packages << "\\usepackage{pdflscape}\n"; @@ -1526,10 +1541,10 @@ TexString LaTeXFeatures::getMacros() const macros << "\\XeTeXdashbreakstate 0" << '\n'; if (mustProvide("papersize")) { - if (runparams_.flavor == OutputParams::LATEX - || runparams_.flavor == OutputParams::DVILUATEX) + if (runparams_.flavor == Flavor::LaTeX + || runparams_.flavor == Flavor::DviLuaTeX) macros << papersizedvi_def << '\n'; - else if (runparams_.flavor == OutputParams::LUATEX) + else if (runparams_.flavor == Flavor::LuaTeX) macros << papersizepdflua_def << '\n'; else macros << papersizepdf_def << '\n'; @@ -1562,6 +1577,9 @@ TexString LaTeXFeatures::getMacros() const if (mustProvide("lyxarrow")) macros << lyxarrow_def << '\n'; + if (mustProvide("aastex_case")) + macros << aastex_case_def << '\n'; + if (mustProvide("lyxzerowidthspace")) macros << lyxZWSP_def << '\n'; @@ -1655,13 +1673,13 @@ TexString LaTeXFeatures::getMacros() const if (mustProvide("textquotedbl")) macros << textquotedbl_def << '\n'; if (mustProvide("textquotesinglep")) { - if (runparams_.flavor == OutputParams::XETEX) + if (runparams_.flavor == Flavor::XeTeX) macros << textquotesinglep_xetex_def << '\n'; else macros << textquotesinglep_luatex_def << '\n'; } if (mustProvide("textquotedblp")) { - if (runparams_.flavor == OutputParams::XETEX) + if (runparams_.flavor == Flavor::XeTeX) macros << textquotedblp_xetex_def << '\n'; else macros << textquotedblp_luatex_def << '\n'; @@ -1683,22 +1701,17 @@ TexString LaTeXFeatures::getMacros() const if (mustProvide("NeedTabularnewline")) macros << tabularnewline_def; + if (mustProvide("cellvarwidth")) + macros << cellvarwidth_def; + // greyed-out environment (note inset) // the color is specified in the routine // getColorOptions() to avoid LaTeX-package clashes - if (mustProvide("lyxgreyedout")) { - // We need different version for RTL (#8647) - if (hasRTLLanguage()) { - if (runparams_.flavor == OutputParams::LUATEX) - if (useBabel()) - macros << lyxgreyedout_luartl_babel_def; - else - macros << lyxgreyedout_luartl_def; - else - macros << lyxgreyedout_rtl_def; - } else - macros << lyxgreyedout_def; - } + if (mustProvide("lyxgreyedout")) + // We need different version for RTL (#8647), with change tracking (#12025) + // and for some specific engine/language package combinations + macros << lyxgreyedoutDef(hasRTLLanguage(), mustProvide("ct-xcolor-ulem"), + (runparams_.flavor == Flavor::LuaTeX), useBabel()); if (mustProvide("lyxdot")) macros << lyxdot_def << '\n'; @@ -2215,10 +2228,8 @@ void LaTeXFeatures::getFloatDefinitions(otexstream & os) const // \newfloat{algorithm}{htbp}{loa} // \providecommand{\algorithmname}{Algorithm} // \floatname{algorithm}{\protect\algorithmname} - UsedFloats::const_iterator cit = usedFloats_.begin(); - UsedFloats::const_iterator end = usedFloats_.end(); - for (; cit != end; ++cit) { - Floating const & fl = floats.getType(cit->first); + for (auto const & cit : usedFloats_) { + Floating const & fl = floats.getType(cit.first); // For builtin floats we do nothing. if (fl.isPredefined()) @@ -2267,7 +2278,7 @@ void LaTeXFeatures::getFloatDefinitions(otexstream & os) const // used several times, when the same style is still in // effect. (Lgb) } - if (cit->second) + if (cit.second) // The subfig package is loaded later os << "\n\\AtBeginDocument{\\newsubfloat{" << from_ascii(fl.floattype()) << "}}\n"; } @@ -2312,13 +2323,10 @@ void LaTeXFeatures::expandMultiples() { for (Features::iterator it = features_.begin(); it != features_.end();) { if (contains(*it, ',')) { - vector const multiples = getVectorFromString(*it, ","); - vector::const_iterator const end = multiples.end(); - vector::const_iterator itm = multiples.begin(); // Do nothing if any multiple is already required - for (; itm != end; ++itm) { - if (!isRequired(*itm)) - require(*itm); + for (string const & pkg : getVectorFromString(*it, ",")) { + if (!isRequired(pkg)) + require(pkg); } features_.erase(it); it = features_.begin();