" {\\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");
+
// We want to omit the file extension for includegraphics, but this does not
// work when the filename contains other dots.
// Idea from http://www.tex.ac.uk/cgi-bin/texfaq2html?label=unkgrfextn
"\\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}[3]{\\changestart#3\\changeend}\n"
- "\\DeclareRobustCommand{\\lyxdeleted}[3]{%\n"
- "\\changestart\\overstrikeon#3\\overstrikeoff\\changeend}\n");
+ "\\DeclareRobustCommand{\\lyxadded}[4][]{\\changestart#4\\changeend}\n"
+ "\\DeclareRobustCommand{\\lyxdeleted}[4][]{%\n"
+ "\\changestart\\overstrikeon#4\\overstrikeoff\\changeend}\n");
static docstring const changetracking_xcolor_ulem_def = from_ascii(
"%% Change tracking with ulem\n"
- "\\DeclareRobustCommand{\\lyxadded}[3]{{\\color{lyxadded}{}#3}}\n"
- "\\DeclareRobustCommand{\\lyxdeleted}[3]{{\\color{lyxdeleted}\\lyxsout{#3}}}\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");
+
+static docstring const changetracking_xcolor_ulem_cb_def = from_ascii(
+ "%% Change tracking with ulem and changebars\n"
+ "\\DeclareRobustCommand{\\lyxadded}[4][]{{%\n"
+ " \\protect\\cbstart\\color{lyxadded}{}#4%\n"
+ " \\protect\\cbend%\n"
+ "}}\n"
+ "\\DeclareRobustCommand{\\lyxdeleted}[4][]{{%\n"
+ " \\protect\\cbstart\\color{lyxdeleted}\\lyxsout{#4}%\n"
+ " \\protect\\cbend%\n"
+ "}}\n"
"\\DeclareRobustCommand{\\lyxsout}[1]{\\ifx\\\\#1\\else\\sout{#1}\\fi}\n");
static docstring const changetracking_xcolor_ulem_hyperref_def = from_ascii(
- "%% Change tracking with ulem\n"
- "\\DeclareRobustCommand{\\lyxadded}[3]{{\\texorpdfstring{\\color{lyxadded}{}}{}#3}}\n"
- "\\DeclareRobustCommand{\\lyxdeleted}[3]{{\\texorpdfstring{\\color{lyxdeleted}\\lyxsout{#3}}{}}}\n"
+ "%% Change tracking with ulem and hyperref\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_xcolor_ulem_hyperref_cb_def = from_ascii(
+ "%% Change tracking with ulem, hyperref and changebars\n"
+ "\\DeclareRobustCommand{\\lyxadded}[4][]{{%\n"
+ " \\texorpdfstring{\\protect\\cbstart\\color{lyxadded}{}}{}#4%\n"
+ " \\texorpdfstring{\\protect\\cbend}{}%/n"
+ "}}\n"
+ "\\DeclareRobustCommand{\\lyxdeleted}[4][]{{%\n"
+ " \\texorpdfstring{\\protect\\cbstart\\color{lyxdeleted}\\lyxsout{#4}%\n"
+ " \\protect\\cbend}{}%\n"
+ "}}\n"
"\\DeclareRobustCommand{\\lyxsout}[1]{\\ifx\\\\#1\\else\\sout{#1}\\fi}\n");
static docstring const changetracking_tikz_math_sout_def = from_ascii(
"chessboard",
"xskak",
"pict2e",
- "drs"
+ "drs",
+ "environ"
};
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("footnote")) {
if (isRequired("hyperref"))
packages << "\\usepackage{footnotehyper}\n";
// greyed-out environment (note inset)
// the color is specified in the routine
// getColorOptions() to avoid LaTeX-package clashes
- if (mustProvide("lyxgreyedout"))
- macros << lyxgreyedout_def;
+ 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("lyxdot"))
macros << lyxdot_def << '\n';
macros << lyxref_def << '\n';
// change tracking
- if (mustProvide("ct-dvipost"))
- macros << changetracking_dvipost_def;
+ 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);
macros.os().precision(prec);
- if (isRequired("hyperref"))
- macros << changetracking_xcolor_ulem_hyperref_def;
- else
- macros << changetracking_xcolor_ulem_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;
+ macros << changetracking_tikz_math_sout_def;
if (mustProvide("ct-none"))
macros << changetracking_none_def;