"%% 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"
static docstring const changetracking_tikz_object_sout_def = from_ascii(
"%% Strike out display math and text objects with tikz\n"
- "\\usepackage{tikz}\n"
"\\usetikzlibrary{calc}\n"
"\\newcommand{\\lyxobjectsout}[1]{%\n"
" \\bgroup%\n"
" \\color{lyxdeleted}%\n"
- " \\tikz[baseline=(obj.base)]{\n"
- " \\node[inner sep=0pt,outer sep=0pt](obj){#1};\n"
- " \\draw($(obj.south west)+(2em,.5em)$)--($(obj.north east)-(2em,.5em)$);\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");
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());
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"
+ "environ",
+ "dsfont"
};
char const * bibliofeatures[] = {
// The rest of these packages are somewhat more complicated
// than those above.
- if (mustProvide("changebar") && !mustProvide("ct-dvipost")) {
- packages << "\\usepackage{changebar}\n";
+ if (mustProvide("changebar")) {
+ packages << "\\usepackage";
+ if (runparams_.flavor == OutputParams::LATEX
+ || runparams_.flavor == OutputParams::DVILUATEX)
+ packages << "[dvips]";
+ packages << "{changebar}\n";
}
if (mustProvide("footnote")) {
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);
- RGBColor cadd = rgbFromHexName(lcolor.getX11Name(Color_addedtext));
+ RGBColor cadd = rgbFromHexName(lcolor.getX11HexName(Color_addedtext));
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));
macros << "\\providecolor{lyxdeleted}{rgb}{"
<< cdel.r / 255.0 << ',' << cdel.g / 255.0 << ',' << cdel.b / 255.0 << "}\n";
}
}
- if (mustProvide("ct-tikz-object-sout"))
+ 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));
+ macros << "\\providecolor{lyxadded}{rgb}{"
+ << cadd.r / 255.0 << ',' << cadd.g / 255.0 << ',' << cadd.b / 255.0 << "}\n";
+
+ RGBColor cdel = rgbFromHexName(lcolor.getX11HexName(Color_deletedtext));
+ 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())
projects / lyx.git / blobdiff