From: Juergen Spitzmueller <spitz@lyx.org>
Date: Mon, 30 Dec 2019 12:00:03 +0000 (+0100)
Subject: Fix some regressions with ct-struckout underlined display math
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=5c3a0da91bd99381e8dc8effa76acca12a4f2501;p=features.git

Fix some regressions with ct-struckout underlined display math
---

diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index 9f65ed40ea..8ef793cd87 100644
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -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"
 	"\\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(
@@ -329,28 +334,38 @@ static docstring const changetracking_xcolor_ulem_cb_object_def = from_ascii(
 	"    \\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(
@@ -361,17 +376,22 @@ static docstring const changetracking_xcolor_ulem_hyperref_cb_object_def = from_
 	"    \\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(