"%% 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{cbrule 0pt}\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_dvipost_cb_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]{\\bgroup\\color{lyxadded}{}#1\\egroup}\n"
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 (!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());
"float",
"wrapfig",
"booktabs",
- "dvipost",
"fancybox",
"calc",
"units",
"todonotes",
"forest",
"varwidth",
- "tablefootnote",
"afterpage",
"tabularx",
"tikz",
// The rest of these packages are somewhat more complicated
// than those above.
- if (mustProvide("changebar") && !mustProvide("ct-dvipost")) {
+ if (mustProvide("changebar")) {
packages << "\\usepackage";
if (runparams_.flavor == OutputParams::LATEX
|| runparams_.flavor == OutputParams::DVILUATEX)
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"))
macros << lyxref_def << '\n';
// change tracking
- if (mustProvide("ct-dvipost")) {
- if (isRequired("changebar"))
- macros << changetracking_dvipost_cb_def;
- else
- macros << changetracking_dvipost_def;
- }
-
if (mustProvide("ct-xcolor-ulem")) {
streamsize const prec = macros.os().precision(2);