#include "LaTeXFonts.h"
#include "LaTeXPackages.h"
#include "Layout.h"
-#include "Lexer.h"
#include "LyXRC.h"
+#include "OutputParams.h"
#include "TextClass.h"
#include "TexRow.h"
#include "texstream.h"
#include "support/debug.h"
#include "support/docstream.h"
-#include "support/FileName.h"
+#include "support/docstring.h"
#include "support/filetools.h"
-#include "support/gettext.h"
#include "support/lstrings.h"
-#include "support/regex.h"
#include <algorithm>
+#include <regex>
using namespace std;
"{\\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:
"%% 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.
"%% A simple dot to overcome graphicx limitations\n"
"\\newcommand{\\lyxdot}{.}\n");
-static docstring const changetracking_dvipost_def = from_ascii(
- "%% Change tracking with dvipost\n"
- "\\dvipostlayout\n"
- "\\dvipost{osstart color push Red}\n"
- "\\dvipost{osend color pop}\n"
- "\\dvipost{cbstart color push Blue}\n"
- "\\dvipost{cbend color pop}\n"
- "\\DeclareRobustCommand{\\lyxadded}[4][]{\\changestart#4\\changeend}\n"
- "\\DeclareRobustCommand{\\lyxdeleted}[4][]{%\n"
- "\\changestart\\overstrikeon#4\\overstrikeoff\\changeend}\n");
+static docstring const changetracking_xcolor_ulem_base_def = from_ascii(
+ "%% Change tracking with ulem and xcolor: base macros\n"
+ "\\DeclareRobustCommand{\\mklyxadded}[1]{\\textcolor{lyxadded}\\bgroup#1\\egroup}\n"
+ "\\DeclareRobustCommand{\\mklyxdeleted}[1]{\\textcolor{lyxdeleted}\\bgroup\\mklyxsout{#1}\\egroup}\n"
+ "\\DeclareRobustCommand{\\mklyxsout}[1]{\\ifx\\\\#1\\else\\sout{#1}\\fi}\n");
static docstring const changetracking_xcolor_ulem_def = from_ascii(
- "%% Change tracking with ulem\n"
- "\\DeclareRobustCommand{\\lyxadded}[4][]{{\\color{lyxadded}{}#4}}\n"
- "\\DeclareRobustCommand{\\lyxdeleted}[4][]{{\\color{lyxdeleted}\\lyxsout{#4}}}\n"
- "\\DeclareRobustCommand{\\lyxsout}[1]{\\ifx\\\\#1\\else\\sout{#1}\\fi}\n");
+ "%% Change tracking with ulem and xcolor: ct markup\n"
+ "\\DeclareRobustCommand{\\lyxadded}[4][]{\\mklyxadded{#4}}\n"
+ "\\DeclareRobustCommand{\\lyxdeleted}[4][]{\\mklyxdeleted{#4}}\n");
+
+static docstring const changetracking_xcolor_ulem_cb_def = from_ascii(
+ "%% Change tracking with ulem, xcolor and changebars: ct markup\n"
+ "\\DeclareRobustCommand{\\lyxadded}[4][]{%\n"
+ " \\protect\\cbstart\\mklyxadded{#4}%\n"
+ " \\protect\\cbend%\n"
+ "}\n"
+ "\\DeclareRobustCommand{\\lyxdeleted}[4][]{%\n"
+ " \\protect\\cbstart\\mklyxdeleted{#4}%\n"
+ " \\protect\\cbend%\n"
+ "}\n");
static docstring const changetracking_xcolor_ulem_hyperref_def = from_ascii(
- "%% Change tracking with ulem\n"
- "\\DeclareRobustCommand{\\lyxadded}[4][]{{\\texorpdfstring{\\color{lyxadded}{}}{}#4}}\n"
- "\\DeclareRobustCommand{\\lyxdeleted}[4][]{{\\texorpdfstring{\\color{lyxdeleted}\\lyxsout{#4}}{}}}\n"
- "\\DeclareRobustCommand{\\lyxsout}[1]{\\ifx\\\\#1\\else\\sout{#1}\\fi}\n");
-
-static docstring const changetracking_tikz_math_sout_def = from_ascii(
- "%% Strike out display math with tikz\n"
- "\\usepackage{tikz}\n"
+ "%% Change tracking with ulem, xcolor, and hyperref: ct markup\n"
+ "\\DeclareRobustCommand{\\lyxadded}[4][]{\\texorpdfstring{\\mklyxadded{#4}}{#4}}\n"
+ "\\DeclareRobustCommand{\\lyxdeleted}[4][]{\\texorpdfstring{\\mklyxdeleted{#4}}{}}\n");
+
+static docstring const changetracking_xcolor_ulem_hyperref_cb_def = from_ascii(
+ "%% Change tracking with ulem, xcolor, hyperref and changebars: ct markup\n"
+ "\\DeclareRobustCommand{\\lyxadded}[4][]{%\n"
+ " \\texorpdfstring{\\protect\\cbstart\\mklyxadded{#4}%\n"
+ " \\protect\\cbend}{#4}%\n"
+ "}\n"
+ "\\DeclareRobustCommand{\\lyxdeleted}[4][]{%\n"
+ " \\texorpdfstring{\\protect\\cbstart\\mklyxdeleted{#4}%\n"
+ " \\protect\\cbend}{}%\n"
+ "}\n");
+
+static docstring const changetracking_tikz_object_sout_def = from_ascii(
+ "%% Strike out display math and text objects with tikz\n"
"\\usetikzlibrary{calc}\n"
- "\\newcommand{\\lyxmathsout}[1]{%\n"
- " \\tikz[baseline=(math.base)]{\n"
- " \\node[inner sep=0pt,outer sep=0pt](math){#1};\n"
- " \\draw($(math.south west)+(2em,.5em)$)--($(math.north east)-(2em,.5em)$);\n"
+ "\\newcommand{\\lyxobjectsout}[1]{%\n"
+ " \\bgroup%\n"
+ " \\color{lyxdeleted}%\n"
+ " \\tikz{\n"
+ " \\node[inner sep=0pt,outer sep=0pt](lyxdelobj){#1};\n"
+ " \\draw($(lyxdelobj.south west)+(2em,.5em)$)--($(lyxdelobj.north east)-(2em,.5em)$);\n"
" }\n"
+ " \\egroup%\n"
+ "}\n");
+
+static docstring const changetracking_xcolor_ulem_object_def = from_ascii(
+ "%% Change tracking with ulem and xcolor: ct markup for complex objects\n"
+ "\\DeclareRobustCommand{\\lyxobjdeleted}[4][]{\\lyxobjectsout{#4}}\n"
+ "\\DeclareRobustCommand{\\lyxdisplayobjdeleted}[4][]{%\n"
+ " \\ifx#4\\empty\\else%\n"
+ " \\leavevmode\\\\%\n"
+ " \\lyxobjectsout{\\parbox{\\linewidth}{#4}}%\n"
+ " \\fi%\n"
+ "}\n"
+ "\\DeclareRobustCommand{\\lyxudisplayobjdeleted}[4][]{%\n"
+ " \\ifx#4\\empty\\else%\n"
+ " \\leavevmode\\\\%\n"
+ " \\raisebox{-\\belowdisplayshortskip}{%\n"
+ " \\lyxobjectsout{\\parbox[b]{\\linewidth}{#4}}}%\n"
+ " \\leavevmode\\\\%\n"
+ " \\fi%\n"
+ "}\n");
+
+static docstring const changetracking_xcolor_ulem_cb_object_def = from_ascii(
+ "%% Change tracking with ulem, xcolor and changebars:ct markup for complex objects\n"
+ "\\DeclareRobustCommand{\\lyxobjdeleted}[4][]{%\n"
+ " \\protect\\cbstart\\lyxobjectsout{#4}%\n"
+ " \\protect\\cbend%\n"
+ "}\n"
+ "\\DeclareRobustCommand{\\lyxdisplayobjdeleted}[4][]{%\n"
+ " \\ifx#4\\empty\\else%\n"
+ " \\leavevmode\\\\%\n"
+ " \\protect\\cbstart%\n"
+ " \\lyxobjectsout{\\parbox{\\linewidth}{#4}}%\n"
+ " \\protect\\cbend%\n"
+ " \\fi%\n"
+ "}\n"
+ "\\DeclareRobustCommand{\\lyxudisplayobjdeleted}[4][]{%\n"
+ " \\ifx#4\\empty\\else%\n"
+ " \\leavevmode\\\\%\n"
+ " \\raisebox{-\\belowdisplayshortskip}{%\n"
+ " \\protect\\cbstart%\n"
+ " \\lyxobjectsout{\\parbox[b]{\\linewidth}{#4}}}%\n"
+ " \\protect\\cbend%\n"
+ " \\leavevmode\\\\%\n"
+ " \\fi%\n"
+ "}\n");
+
+static docstring const changetracking_xcolor_ulem_hyperref_object_def = from_ascii(
+ "%% Change tracking with ulem, xcolor, and hyperref: ct markup for complex objects\n"
+ "\\DeclareRobustCommand{\\lyxobjdeleted}[4][]{\\texorpdfstring{\\lyxobjectsout{#4}}{}}\n"
+ "\\DeclareRobustCommand{\\lyxdisplayobjdeleted}[4][]{%\n"
+ " \\ifx#4\\empty\\else%\n"
+ " \\texorpdfstring{\\leavevmode\\\\\\lyxobjectsout{\\parbox{\\linewidth}{#4}}}{}%\n"
+ " \\fi%\n"
+ "}\n"
+ "\\DeclareRobustCommand{\\lyxudisplayobjdeleted}[4][]{%\n"
+ " \\ifx#4\\empty\\else%\n"
+ " \\texorpdfstring{\\leavevmode\\\\\\raisebox{-\\belowdisplayshortskip}{%\n"
+ " \\lyxobjectsout{\\parbox[b]{\\linewidth}{#4}}}}{}%\n"
+ " \\leavevmode\\\\%\n"
+ " \\fi%\n"
+ "}\n");
+
+static docstring const changetracking_xcolor_ulem_hyperref_cb_object_def = from_ascii(
+ "%% Change tracking with ulem, xcolor, hyperref and changebars:\n"
+ "%% ct markup for complex objects\n"
+ "\\DeclareRobustCommand{\\lyxobjdeleted}[4][]{%\n"
+ " \\texorpdfstring{\\protect\\cbstart\\lyxobjectsout{#4}%\n"
+ " \\protect\\cbend}{}%\n"
+ "}\n"
+ "\\DeclareRobustCommand{\\lyxdisplayobjdeleted}[4][]{%\n"
+ " \\ifx#4\\empty\\else%\n"
+ " \\texorpdfstring{\\leavevmode\\\\\\protect\\cbstart%\n"
+ " \\lyxobjectsout{\\parbox{\\linewidth}{#4}}%\n"
+ " \\protect\\cbend%\n"
+ " }{}%\n"
+ " \\fi%\n"
+ "}\n"
+ "\\DeclareRobustCommand{\\lyxudisplayobjdeleted}[4][]{%\n"
+ " \\ifx#4\\empty\\else%\n"
+ " \\texorpdfstring{\\leavevmode\\\\\\protect\\cbstart%\n"
+ " \\raisebox{-\\belowdisplayshortskip}{%\n"
+ " \\lyxobjectsout{\\parbox[b]{\\linewidth}{#4}}%\n"
+ " }%\n"
+ " \\leavevmode\\\\%\n"
+ " }{}%\n"
+ " \\fi%\n"
"}\n");
static docstring const changetracking_none_def = from_ascii(
+ "%% Change tracking: Disable markup in output\n"
"\\newcommand{\\lyxadded}[3]{#3}\n"
- "\\newcommand{\\lyxdeleted}[3]{}\n");
+ "\\newcommand{\\lyxdeleted}[3]{}\n"
+ "\\newcommand{\\lyxobjdeleted}[3]{}\n"
+ "\\newcommand{\\lyxdisplayobjdeleted}[3]{}\n"
+ "\\newcommand{\\lyxudisplayobjdeleted}[3]{}\n");
static docstring const textgreek_LGR_def = from_ascii(
"\\DeclareFontEncoding{LGR}{}{}\n");
// split-level fractions
static docstring const xfrac_def = from_ascii(
"\\usepackage{xfrac}\n");
+
+// https://tex.stackexchange.com/questions/720579/do-i-need-to-replace-declarecollectioninstance-after-recent-package-change/
static docstring const smallLetterFrac_def = from_ascii(
- "\\DeclareCollectionInstance{smallLetterFrac}{xfrac}{default}{text}\n"
+ "\\EditTemplateDefaults{xfrac}{text}\n"
" {phantom=c, scale-factor=1.0, slash-left-kern=-.05em}\n"
- "\\DeclareCollectionInstance{smallLetterFrac}{xfrac}{lmr}{text}\n"
- " {slash-symbol-font=ptm, phantom=c, scale-factor=1, slash-left-kern=-.05em}\n"
- "\\DeclareCollectionInstance{smallLetterFrac}{xfrac}{lmss}{text}\n"
- " {slash-symbol-font=ptm, phantom=c, scale-factor=1, slash-left-kern=-.05em}\n"
- "\\DeclareCollectionInstance{smallLetterFrac}{xfrac}{cmr}{text}\n"
- " {slash-symbol-font=ptm, phantom=c, scale-factor=1, slash-left-kern=-.05em}\n"
- "\\DeclareCollectionInstance{smallLetterFrac}{xfrac}{cmss}{text}\n"
- " {slash-symbol-font=ptm, phantom=c, scale-factor=1, slash-left-kern=-.05em}\n"
- "\\newcommand{\\smallLetterFrac}[2]{%\n"
- " {\\UseCollection{xfrac}{smallLetterFrac}\\sfrac{#1}{#2}}}\n");
+ "\\NewCommandCopy\\smallLetterFrac\\sfrac\n");
static docstring const lyxref_def = from_ascii(
"\\RS@ifundefined{subsecref}\n"
"}\n");
+docstring const lyxgreyedoutDef(bool const ct)
+{
+ odocstringstream ods;
+
+ ods << "%% The greyedout annotation environment\n"
+ << "\\newenvironment{lyxgreyedout}\n"
+ << "{";
+ if (ct)
+ ods << "\\colorlet{lyxadded}{lyxadded!30}\\colorlet{lyxdeleted}{lyxdeleted!30}%\n ";
+ ods << "\\normalfont\\normalsize\\textcolor{note_fontcolor}\\bgroup\\ignorespaces}\n"
+ << "{\\ignorespacesafterend\\egroup}\n";
+
+ return ods.str();
+}
+
+
+
/////////////////////////////////////////////////////////////////////
//
// LyXHTML strings
return;
Layout const & layout = tclass[layoutname];
- require(layout.requires());
+ require(layout.required());
if (!layout.depends_on().empty()) {
useLayout(layout.depends_on(), level + 1);
!= usedInsetLayouts_.end())
return;
- require(lay.requires());
+ require(lay.required());
usedInsetLayouts_.push_back(lname);
}
if (params_.useNonTeXFonts)
return params_.documentClass().provides(name);
- bool const ot1 = (params_.main_font_encoding() == "default"
- || params_.main_font_encoding() == "OT1");
+ bool const ot1 = (runparams().main_fontenc == "default"
+ || runparams().main_fontenc == "OT1");
bool const complete = (params_.fontsSans() == "default"
&& params_.fontsTypewriter() == "default");
bool const nomath = (params_.fontsMath() == "default");
}
+bool LaTeXFeatures::isAvailableAtLeastFrom(string const & name, int const y, int const m, int const d)
+{
+ return LaTeXPackages::isAvailableAtLeastFrom(name, y, m, d);
+}
+
+
namespace {
void addSnippet(std::list<TexString> & list, TexString ts, bool allow_dupes)
return ts.str == ts2.str;
})
)
- list.push_back(move(ts));
+ list.push_back(std::move(ts));
}
} // namespace
-void LaTeXFeatures::addPreambleSnippet(TexString ts, bool allow_dupes)
+void LaTeXFeatures::addPreambleSnippet(TexString snippet, bool allow_dupes)
{
- addSnippet(preamble_snippets_, move(ts), allow_dupes);
+ addSnippet(preamble_snippets_, std::move(snippet), allow_dupes);
}
-void LaTeXFeatures::addPreambleSnippet(docstring const & str, bool allow_dupes)
+void LaTeXFeatures::addPreambleSnippet(docstring const & snippet, bool allow_dupes)
{
- addSnippet(preamble_snippets_, TexString(str), allow_dupes);
+ addSnippet(preamble_snippets_, TexString(snippet), allow_dupes);
}
if (!fl.floattype().empty()) {
if (fl.usesFloatPkg())
require("float");
- if (!fl.requires().empty()) {
- vector<string> reqs = getVectorFromString(fl.requires());
- for (auto const req : reqs)
+ if (!fl.required().empty()) {
+ vector<string> reqs = getVectorFromString(fl.required());
+ for (auto const & req : reqs)
require(req);
}
}
{
if (!lang->babel().empty() || !lang->polyglossia().empty())
UsedLanguages_.insert(lang);
- if (!lang->requires().empty())
- require(lang->requires());
+ if (!lang->required().empty())
+ require(lang->required());
// currently only supported for Babel
if (!lang->provides().empty() && useBabel())
provide(lang->provides());
if (params_.language->polyglossia().empty())
return false;
// now the secondary languages
- LanguageList::const_iterator const begin = UsedLanguages_.begin();
- for (LanguageList::const_iterator cit = begin;
- cit != UsedLanguages_.end();
- ++cit) {
- if ((*cit)->polyglossia().empty())
+ for (auto const & lang : UsedLanguages_)
+ {
+ if (lang->polyglossia().empty())
return false;
}
return true;
if (params_.language->isPolyglossiaExclusive())
return true;
// now the secondary languages
- LanguageList::const_iterator const begin = UsedLanguages_.begin();
- for (LanguageList::const_iterator cit = begin;
- cit != UsedLanguages_.end();
- ++cit) {
- if ((*cit)->isPolyglossiaExclusive())
+ for (auto const & lang : UsedLanguages_)
+ {
+ if (lang->isPolyglossiaExclusive())
return true;
}
return false;
if (params_.language->isPolyglossiaExclusive())
result.push_back(params_.language->display());
// now the secondary languages
- LanguageList::const_iterator const begin = UsedLanguages_.begin();
- for (LanguageList::const_iterator cit = begin;
- cit != UsedLanguages_.end();
- ++cit) {
- if ((*cit)->isPolyglossiaExclusive())
- result.push_back((*cit)->display());
+ for (auto const & lang : UsedLanguages_)
+ {
+ if (lang->isPolyglossiaExclusive())
+ result.push_back(lang->display());
}
return result;
}
if (params_.language->isBabelExclusive())
result.push_back(params_.language->display());
// now the secondary languages
- LanguageList::const_iterator const begin = UsedLanguages_.begin();
- for (LanguageList::const_iterator cit = begin;
- cit != UsedLanguages_.end();
- ++cit) {
- if ((*cit)->isBabelExclusive())
- result.push_back((*cit)->display());
+ for (auto const & lang : UsedLanguages_)
+ {
+ if (lang->isBabelExclusive())
+ result.push_back(lang->display());
}
return result;
}
string LaTeXFeatures::getBabelLanguages() const
{
- ostringstream langs;
-
- bool first = true;
- LanguageList::const_iterator const begin = UsedLanguages_.begin();
- for (LanguageList::const_iterator cit = begin;
- cit != UsedLanguages_.end();
- ++cit) {
- if ((*cit)->babel().empty())
- continue;
- if (!first)
- langs << ',';
- else
- first = false;
- langs << (*cit)->babel();
+ vector<string> blangs;
+ for (auto const & lang : UsedLanguages_) {
+ if (!lang->babel().empty())
+ blangs.push_back(lang->babel());
}
- return langs.str();
+
+ // Sort alphabetically to assure consistent order
+ // (the order itself does not matter apart from
+ // some exceptions, e.g. hebrew must come after
+ // arabic and farsi)
+ sort(blangs.begin(), blangs.end());
+
+ return getStringFromVector(blangs);
}
{
set<string> langs;
- LanguageList::const_iterator const begin = UsedLanguages_.begin();
- for (LanguageList::const_iterator cit = begin;
- cit != UsedLanguages_.end();
- ++cit) {
+ for (auto const & lang : UsedLanguages_)
// We do not need the variants here
- langs.insert((*cit)->polyglossia());
- }
+ langs.insert(lang->polyglossia());
return langs;
}
// first the main language
res += params_.language->activeChars();
// now the secondary languages
- LanguageList::const_iterator const begin = UsedLanguages_.begin();
- for (LanguageList::const_iterator cit = begin;
- cit != UsedLanguages_.end(); ++cit)
- res += ((*cit)->activeChars());
+ for (auto const & lang : UsedLanguages_)
+ res += (lang->activeChars());
return res;
}
encs.insert(encs.begin(), "T2A");
}
- for (auto const & lang : UsedLanguages_) {
+ for (auto const & lang : UsedLanguages_)
+ {
vector<string> extraencs =
getVectorFromString(lang->fontenc(buffer().masterParams()));
for (auto const & extra : extraencs) {
"float",
"wrapfig",
"booktabs",
- "dvipost",
"fancybox",
"calc",
"units",
"todonotes",
"forest",
"varwidth",
- "tablefootnote",
"afterpage",
"tabularx",
+ "tikz",
"xltabular",
"chessboard",
"xskak",
"pict2e",
"drs",
- "environ"
+ "dsfont",
+ "hepparticles",
+ "hepnames"
};
char const * bibliofeatures[] = {
"named"
};
-int const nb_bibliofeatures = sizeof(bibliofeatures) / sizeof(char const *);
-
-int const nb_simplefeatures = sizeof(simplefeatures) / sizeof(char const *);
-
} // namespace
<< "]{" << package << "}\n";
}
- // pdfcolmk must be loaded after color
- if (mustProvide("pdfcolmk"))
- colors << "\\usepackage{pdfcolmk}\n";
-
// the following 3 color commands must be set after color
// is loaded and before pdfpages, therefore add the command
// here define the set color
{
ostringstream packageopts;
// Output all the package option stuff we have been asked to do.
- map<string, string>::const_iterator it =
- params_.documentClass().packageOptions().begin();
- map<string, string>::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();
}
// also unknown packages can be requested. They are silently
// swallowed now. We should change this eventually.
+ // Simple hooks to add things before or after a given "simple"
+ // feature. Useful if loading order matters.
+ map<string, string> before_simplefeature_;
+ map<string, string> after_simplefeature_;
+
+ // Babel languages with activated colon (such as French) break
+ // with prettyref. Work around that.
+ if (mustProvide("prettyref") && !runparams_.isFullUnicode()
+ && useBabel() && contains(getActiveChars(), ':')) {
+ before_simplefeature_["prettyref"] =
+ "% Make prettyref compatible with babel active colon\n"
+ "% (make ':' active in prettyref definitions)\n"
+ "\\edef\\lyxsavedcolcatcode{\\the\\catcode`\\:}\n"
+ "\\catcode`:=13\n";
+ after_simplefeature_["prettyref"] =
+ "% restore original catcode for :\n"
+ "\\catcode`\\:=\\lyxsavedcolcatcode\\relax\n";
+ }
+
// These are all the 'simple' includes. i.e
// packages which we just \usepackage{package}
- for (int i = 0; i < nb_simplefeatures; ++i) {
- if (mustProvide(simplefeatures[i]))
- packages << "\\usepackage{" << simplefeatures[i] << "}\n";
+ // potentially preceded and followed by the hook code
+ for (char const * feature : simplefeatures) {
+ if (mustProvide(feature)) {
+ if (before_simplefeature_.find(feature) != before_simplefeature_.end())
+ packages << before_simplefeature_[feature];
+ packages << "\\usepackage{" << feature << "}\n";
+ if (after_simplefeature_.find(feature) != after_simplefeature_.end())
+ packages << after_simplefeature_[feature];
+ }
}
// The rest of these packages are somewhat more complicated
// than those above.
+ if (mustProvide("changebar")) {
+ packages << "\\usepackage";
+ if (runparams_.flavor == Flavor::LaTeX
+ || runparams_.flavor == Flavor::DviLuaTeX)
+ packages << "[dvips]";
+ packages << "{changebar}\n";
+ }
+
if (mustProvide("footnote")) {
if (isRequired("hyperref"))
packages << "\\usepackage{footnotehyper}\n";
// [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";
// if fontspec or newtxmath is used, AMS packages have to be loaded
// before fontspec (in BufferParams)
string const amsPackages = loadAMSPackages();
- bool const ot1 = (params_.main_font_encoding() == "default"
- || params_.main_font_encoding() == "OT1");
+ bool const ot1 = (runparams().main_fontenc == "default"
+ || runparams().main_fontenc == "OT1");
bool const use_newtxmath =
theLaTeXFonts().getLaTeXFont(from_ascii(params_.fontsMath())).getUsedPackage(
ot1, false, false) == "newtxmath";
params_.use_package("undertilde") != BufferParams::package_off)
packages << "\\usepackage{undertilde}\n";
- // [x]color and pdfcolmk are handled in getColorOptions() above
+ // [x]color is handled in getColorOptions() above
// makeidx.sty
if (isRequired("makeidx") || isRequired("splitidx")) {
packages << "\\usepackage{rotating}\n";
if (mustProvide("rotfloat"))
packages << "\\usepackage{rotfloat}\n";
+ // and this must be loaded after rotating
+ if (mustProvide("tablefootnote"))
+ packages << "\\usepackage{tablefootnote}\n";
// lyxskak.sty --- newer chess support based on skak.sty
if (mustProvide("chess"))
packages << "\\usepackage{esint}\n";
// Known bibliography packages (simple \usepackage{package})
- for (int i = 0; i < nb_bibliofeatures; ++i) {
- if (mustProvide(bibliofeatures[i]))
- packages << "\\usepackage{"
- << bibliofeatures[i] << "}\n";
+ for (char const * feature : bibliofeatures) {
+ if (mustProvide(feature))
+ packages << "\\usepackage{" << feature << "}\n";
}
// Compatibility between achicago and natbib
"\\usepackage{ulem}\n";
if (mustProvide("nomencl")) {
+ packages << "\\usepackage{nomencl}\n";
// Make it work with the new and old version of the package,
// but don't use the compatibility option since it is
// incompatible to other packages.
- packages << "\\usepackage{nomencl}\n"
- "% the following is useful when we have the old nomencl.sty package\n"
- "\\providecommand{\\printnomenclature}{\\printglossary}\n"
- "\\providecommand{\\makenomenclature}{\\makeglossary}\n"
- "\\makenomenclature\n";
+ if (!LaTeXFeatures::isAvailableAtLeastFrom("nomencl", 2005, 3, 31)) {
+ packages << "% Needed with nomencl < v4.1\n"
+ "\\providecommand{\\printnomenclature}{\\printglossary}\n"
+ "\\providecommand{\\makenomenclature}{\\makeglossary}\n";
+ }
+ packages << "\\makenomenclature\n";
}
// fixltx2e provides subscript
- if (mustProvide("subscript") && !isRequired("fixltx2e"))
+ if (mustProvide("subscript") && !isRequired("fixltx2e")
+ && !isAvailableAtLeastFrom("LaTeX", 2005, 12))
packages << "\\usepackage{subscript}\n";
// footmisc must be loaded after setspace
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';
if (mustProvide("lyxarrow"))
macros << lyxarrow_def << '\n';
+ if (mustProvide("aastex_case"))
+ macros << aastex_case_def << '\n';
+
if (mustProvide("lyxzerowidthspace"))
macros << lyxZWSP_def << '\n';
if (!usePolyglossia() && mustProvide("textgreek")) {
- // ensure LGR font encoding is defined also if fontenc is not loaded by LyX
- if (params_.main_font_encoding() == "default")
+ // ensure LGR font encoding is defined also if fontenc is not loaded by LyX
+ if (runparams().main_fontenc == "default")
macros << textgreek_LGR_def;
macros << textgreek_def << '\n';
}
if (!usePolyglossia() && mustProvide("textcyrillic")) {
// ensure T2A font encoding is set up also if fontenc is not loaded by LyX
- if (params_.main_font_encoding() == "default")
+ if (runparams().main_fontenc == "default")
macros << textcyr_T2A_def;
macros << textcyr_def << '\n';
}
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';
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 with change tracking (#12025)
+ macros << lyxgreyedoutDef(mustProvide("ct-xcolor-ulem"));
if (mustProvide("lyxdot"))
macros << lyxdot_def << '\n';
macros << lyxref_def << '\n';
// change tracking
- if (mustProvide("ct-dvipost"))
- macros << changetracking_dvipost_def;
-
if (mustProvide("ct-xcolor-ulem")) {
streamsize const prec = macros.os().precision(2);
- RGBColor cadd = rgbFromHexName(lcolor.getX11Name(Color_addedtext));
+ RGBColor cadd = rgbFromHexName(lcolor.getX11HexName(Color_addedtext_output));
macros << "\\providecolor{lyxadded}{rgb}{"
<< cadd.r / 255.0 << ',' << cadd.g / 255.0 << ',' << cadd.b / 255.0 << "}\n";
- RGBColor cdel = rgbFromHexName(lcolor.getX11Name(Color_deletedtext));
+ RGBColor cdel = rgbFromHexName(lcolor.getX11HexName(Color_deletedtext_output));
macros << "\\providecolor{lyxdeleted}{rgb}{"
<< cdel.r / 255.0 << ',' << cdel.g / 255.0 << ',' << cdel.b / 255.0 << "}\n";
macros.os().precision(prec);
- if (isRequired("hyperref"))
- macros << changetracking_xcolor_ulem_hyperref_def;
- else
- macros << changetracking_xcolor_ulem_def;
+ macros << changetracking_xcolor_ulem_base_def;
+
+ if (isRequired("changebar")) {
+ if (isRequired("hyperref"))
+ macros << changetracking_xcolor_ulem_hyperref_cb_def;
+ else
+ macros << changetracking_xcolor_ulem_cb_def;
+ } else {
+ if (isRequired("hyperref"))
+ macros << changetracking_xcolor_ulem_hyperref_def;
+ else
+ macros << changetracking_xcolor_ulem_def;
+ }
}
- if (mustProvide("ct-tikz-math-sout"))
- macros << changetracking_tikz_math_sout_def;
+ if (mustProvide("ct-tikz-object-sout")) {
+ if (!mustProvide("ct-xcolor-ulem")) {
+ streamsize const prec = macros.os().precision(2);
+
+ RGBColor cadd = rgbFromHexName(lcolor.getX11HexName(Color_addedtext_output));
+ macros << "\\providecolor{lyxadded}{rgb}{"
+ << cadd.r / 255.0 << ',' << cadd.g / 255.0 << ',' << cadd.b / 255.0 << "}\n";
+
+ RGBColor cdel = rgbFromHexName(lcolor.getX11HexName(Color_deletedtext_output));
+ macros << "\\providecolor{lyxdeleted}{rgb}{"
+ << cdel.r / 255.0 << ',' << cdel.g / 255.0 << ',' << cdel.b / 255.0 << "}\n";
+
+ macros.os().precision(prec);
+ }
+
+ macros << changetracking_tikz_object_sout_def;
+
+ if (isRequired("changebar")) {
+ if (isRequired("hyperref"))
+ macros << changetracking_xcolor_ulem_hyperref_cb_object_def;
+ else
+ macros << changetracking_xcolor_ulem_cb_object_def;
+ } else {
+ if (isRequired("hyperref"))
+ macros << changetracking_xcolor_ulem_hyperref_object_def;
+ else
+ macros << changetracking_xcolor_ulem_object_def;
+ }
+ }
if (mustProvide("ct-none"))
macros << changetracking_none_def;
{
odocstringstream tmp;
- for (Language const * lang : UsedLanguages_)
+ for (auto const & lang : UsedLanguages_)
if (!lang->babel_presettings().empty())
tmp << lang->babel_presettings() << '\n';
if (!params_.language->babel_presettings().empty())
{
odocstringstream tmp;
- for (Language const * lang : UsedLanguages_)
+ for (auto const & lang : UsedLanguages_)
if (!lang->babel_postsettings().empty())
tmp << lang->babel_postsettings() << '\n';
if (!params_.language->babel_postsettings().empty())
tcpreamble << tclass.htmlstyles();
- list<docstring>::const_iterator cit = usedLayouts_.begin();
- list<docstring>::const_iterator end = usedLayouts_.end();
- for (; cit != end; ++cit)
- tcpreamble << tclass[*cit].htmlstyle();
+ for (auto const & c : usedLayouts_)
+ tcpreamble << tclass[c].htmlstyle();
- cit = usedInsetLayouts_.begin();
- end = usedInsetLayouts_.end();
TextClass::InsetLayouts const & ils = tclass.insetLayouts();
- for (; cit != end; ++cit) {
- TextClass::InsetLayouts::const_iterator it = ils.find(*cit);
+ for (auto const & c : usedInsetLayouts_) {
+ TextClass::InsetLayouts::const_iterator it = ils.find(c);
if (it == ils.end())
continue;
tcpreamble << it->second.htmlstyle();
{
// Check whether name can be encoded in the buffer encoding
bool encodable = true;
- for (size_t i = 0; i < name.size(); ++i) {
- if (!enc.encodable(name[i])) {
+ for (char_type c : name) {
+ if (!enc.encodable(c)) {
encodable = false;
break;
}
}
-docstring const LaTeXFeatures::getLyXSGMLEntities() const
-{
- // Definition of entities used in the document that are LyX related.
- odocstringstream entities;
-
- if (mustProvide("lyxarrow")) {
- entities << "<!ENTITY lyxarrow \"->\">" << '\n';
- }
-
- return entities.str();
-}
-
-
-docstring const LaTeXFeatures::getIncludedFiles(string const & fname) const
-{
- odocstringstream sgmlpreamble;
- // FIXME UNICODE
- docstring const basename(from_utf8(onlyPath(fname)));
-
- FileMap::const_iterator end = IncludedFiles_.end();
- for (FileMap::const_iterator fi = IncludedFiles_.begin();
- fi != end; ++fi)
- // FIXME UNICODE
- sgmlpreamble << "\n<!ENTITY " << fi->first
- << (isSGMLFileName(fi->second) ? " SYSTEM \"" : " \"")
- << makeRelPath(from_utf8(fi->second), basename) << "\">";
-
- return sgmlpreamble.str();
-}
-
-
void LaTeXFeatures::showStruct() const
{
lyxerr << "LyX needs the following commands when LaTeXing:"
// \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())
// 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";
}
{
for (Features::iterator it = features_.begin(); it != features_.end();) {
if (contains(*it, ',')) {
- vector<string> const multiples = getVectorFromString(*it, ",");
- vector<string>::const_iterator const end = multiples.end();
- vector<string>::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();