Fix some regressions with ct-struckout underlined display math

This commit is contained in:
Juergen Spitzmueller 2019-12-30 13:00:03 +01:00
parent 48c7d9b028
commit adc90a5570

View File

@ -313,13 +313,18 @@ static docstring const changetracking_xcolor_ulem_object_def = from_ascii(
"%% Change tracking with ulem and xcolor: ct markup for complex objects\n" "%% Change tracking with ulem and xcolor: ct markup for complex objects\n"
"\\DeclareRobustCommand{\\lyxobjdeleted}[4][]{\\lyxobjectsout{#4}}\n" "\\DeclareRobustCommand{\\lyxobjdeleted}[4][]{\\lyxobjectsout{#4}}\n"
"\\DeclareRobustCommand{\\lyxdisplayobjdeleted}[4][]{%\n" "\\DeclareRobustCommand{\\lyxdisplayobjdeleted}[4][]{%\n"
" \\ifx#4\\empty\\else%\n"
" \\leavevmode\\\\%\n" " \\leavevmode\\\\%\n"
" \\lyxobjectsout{\\parbox{\\linewidth}{#4}}%\n" " \\lyxobjectsout{\\parbox{\\linewidth}{#4}}%\n"
" \\fi%\n"
"}\n" "}\n"
"\\DeclareRobustCommand{\\lyxudisplayobjdeleted}[4][]{%\n" "\\DeclareRobustCommand{\\lyxudisplayobjdeleted}[4][]{%\n"
" \\ifx#4\\empty\\else%\n"
" \\leavevmode\\\\%\n" " \\leavevmode\\\\%\n"
" \\raisebox{-\\belowdisplayshortskip}{%\n" " \\raisebox{-\\belowdisplayshortskip}{%\n"
" \\lyxobjectsout{\\parbox[b]{\\linewidth}{#4}}}%\n" " \\lyxobjectsout{\\parbox[b]{\\linewidth}{#4}}}%\n"
" \\leavevmode\\\\%\n"
" \\fi%\n"
"}\n"); "}\n");
static docstring const changetracking_xcolor_ulem_cb_object_def = from_ascii( static docstring const changetracking_xcolor_ulem_cb_object_def = from_ascii(
@ -329,28 +334,38 @@ static docstring const changetracking_xcolor_ulem_cb_object_def = from_ascii(
" \\protect\\cbend%\n" " \\protect\\cbend%\n"
"}\n" "}\n"
"\\DeclareRobustCommand{\\lyxdisplayobjdeleted}[4][]{%\n" "\\DeclareRobustCommand{\\lyxdisplayobjdeleted}[4][]{%\n"
" \\ifx#4\\empty\\else%\n"
" \\leavevmode\\\\%\n" " \\leavevmode\\\\%\n"
" \\protect\\cbstart%\n" " \\protect\\cbstart%\n"
" \\lyxobjectsout{\\parbox{\\linewidth}{#4}}%\n" " \\lyxobjectsout{\\parbox{\\linewidth}{#4}}%\n"
" \\protect\\cbend%\n" " \\protect\\cbend%\n"
" \\fi%\n"
"}\n" "}\n"
"\\DeclareRobustCommand{\\lyxudisplayobjdeleted}[4][]{%\n" "\\DeclareRobustCommand{\\lyxudisplayobjdeleted}[4][]{%\n"
" \\ifx#4\\empty\\else%\n"
" \\leavevmode\\\\%\n" " \\leavevmode\\\\%\n"
" \\raisebox{-\\belowdisplayshortskip}{%\n" " \\raisebox{-\\belowdisplayshortskip}{%\n"
" \\protect\\cbstart%\n" " \\protect\\cbstart%\n"
" \\lyxobjectsout{\\parbox[b]{\\linewidth}{#4}}}%\n" " \\lyxobjectsout{\\parbox[b]{\\linewidth}{#4}}}%\n"
" \\protect\\cbend%\n" " \\protect\\cbend%\n"
" \\leavevmode\\\\%\n"
" \\fi%\n"
"}\n"); "}\n");
static docstring const changetracking_xcolor_ulem_hyperref_object_def = from_ascii( static docstring const changetracking_xcolor_ulem_hyperref_object_def = from_ascii(
"%% Change tracking with ulem, xcolor, and hyperref: ct markup for complex objects\n" "%% Change tracking with ulem, xcolor, and hyperref: ct markup for complex objects\n"
"\\DeclareRobustCommand{\\lyxobjdeleted}[4][]{\\texorpdfstring{\\lyxobjectsout{#4}}{}}\n" "\\DeclareRobustCommand{\\lyxobjdeleted}[4][]{\\texorpdfstring{\\lyxobjectsout{#4}}{}}\n"
"\\DeclareRobustCommand{\\lyxdisplayobjdeleted}[4][]{%\n" "\\DeclareRobustCommand{\\lyxdisplayobjdeleted}[4][]{%\n"
" \\ifx#4\\empty\\else%\n"
" \\texorpdfstring{\\leavevmode\\\\\\lyxobjectsout{\\parbox{\\linewidth}{#4}}}{}%\n" " \\texorpdfstring{\\leavevmode\\\\\\lyxobjectsout{\\parbox{\\linewidth}{#4}}}{}%\n"
" \\fi%\n"
"}\n" "}\n"
"\\DeclareRobustCommand{\\lyxudisplayobjdeleted}[4][]{%\n" "\\DeclareRobustCommand{\\lyxudisplayobjdeleted}[4][]{%\n"
" \\ifx#4\\empty\\else%\n"
" \\texorpdfstring{\\leavevmode\\\\\\raisebox{-\\belowdisplayshortskip}{%\n" " \\texorpdfstring{\\leavevmode\\\\\\raisebox{-\\belowdisplayshortskip}{%\n"
" \\lyxobjectsout{\\parbox[b]{\\linewidth}{#4}}}}{}%\n" " \\lyxobjectsout{\\parbox[b]{\\linewidth}{#4}}}}{}%\n"
" \\leavevmode\\\\%\n"
" \\fi%\n"
"}\n"); "}\n");
static docstring const changetracking_xcolor_ulem_hyperref_cb_object_def = from_ascii( static docstring const changetracking_xcolor_ulem_hyperref_cb_object_def = from_ascii(
@ -361,17 +376,22 @@ static docstring const changetracking_xcolor_ulem_hyperref_cb_object_def = from_
" \\protect\\cbend}{}%\n" " \\protect\\cbend}{}%\n"
"}\n" "}\n"
"\\DeclareRobustCommand{\\lyxdisplayobjdeleted}[4][]{%\n" "\\DeclareRobustCommand{\\lyxdisplayobjdeleted}[4][]{%\n"
" \\ifx#4\\empty\\else%\n"
" \\texorpdfstring{\\leavevmode\\\\\\protect\\cbstart%\n" " \\texorpdfstring{\\leavevmode\\\\\\protect\\cbstart%\n"
" \\lyxobjectsout{\\parbox{\\linewidth}{#4}}%\n" " \\lyxobjectsout{\\parbox{\\linewidth}{#4}}%\n"
" \\protect\\cbend%\n" " \\protect\\cbend%\n"
" }{}%\n" " }{}%\n"
" \\fi%\n"
"}\n" "}\n"
"\\DeclareRobustCommand{\\lyxudisplayobjdeleted}[4][]{%\n" "\\DeclareRobustCommand{\\lyxudisplayobjdeleted}[4][]{%\n"
" \\ifx#4\\empty\\else%\n"
" \\texorpdfstring{\\leavevmode\\\\\\protect\\cbstart%\n" " \\texorpdfstring{\\leavevmode\\\\\\protect\\cbstart%\n"
" \\raisebox{-\\belowdisplayshortskip}{%\n" " \\raisebox{-\\belowdisplayshortskip}{%\n"
" \\lyxobjectsout{\\parbox[b]{\\linewidth}{#4}}%\n" " \\lyxobjectsout{\\parbox[b]{\\linewidth}{#4}}%\n"
" }%\n" " }%\n"
" \\leavevmode\\\\%\n"
" }{}%\n" " }{}%\n"
" \\fi%\n"
"}\n"); "}\n");
static docstring const changetracking_none_def = from_ascii( static docstring const changetracking_none_def = from_ascii(