From 4e61767e787662a8c4893a2d892d265d65dda897 Mon Sep 17 00:00:00 2001 From: Juergen Spitzmueller Date: Sun, 29 Dec 2019 10:10:14 +0100 Subject: [PATCH] Assure deleted display objects start on new line --- src/LaTeXFeatures.cpp | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp index e80fcbf333..9f65ed40ea 100644 --- a/src/LaTeXFeatures.cpp +++ b/src/LaTeXFeatures.cpp @@ -312,8 +312,12 @@ static docstring const changetracking_tikz_object_sout_def = from_ascii( 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][]{\\lyxobjectsout{\\parbox{\\linewidth}{#4}}}\n" + "\\DeclareRobustCommand{\\lyxdisplayobjdeleted}[4][]{%\n" + " \\leavevmode\\\\%\n" + " \\lyxobjectsout{\\parbox{\\linewidth}{#4}}%\n" + "}\n" "\\DeclareRobustCommand{\\lyxudisplayobjdeleted}[4][]{%\n" + " \\leavevmode\\\\%\n" " \\raisebox{-\\belowdisplayshortskip}{%\n" " \\lyxobjectsout{\\parbox[b]{\\linewidth}{#4}}}%\n" "}\n"); @@ -325,11 +329,13 @@ static docstring const changetracking_xcolor_ulem_cb_object_def = from_ascii( " \\protect\\cbend%\n" "}\n" "\\DeclareRobustCommand{\\lyxdisplayobjdeleted}[4][]{%\n" + " \\leavevmode\\\\%\n" " \\protect\\cbstart%\n" " \\lyxobjectsout{\\parbox{\\linewidth}{#4}}%\n" " \\protect\\cbend%\n" "}\n" "\\DeclareRobustCommand{\\lyxudisplayobjdeleted}[4][]{%\n" + " \\leavevmode\\\\%\n" " \\raisebox{-\\belowdisplayshortskip}{%\n" " \\protect\\cbstart%\n" " \\lyxobjectsout{\\parbox[b]{\\linewidth}{#4}}}%\n" @@ -340,10 +346,10 @@ static docstring const changetracking_xcolor_ulem_hyperref_object_def = from_asc "%% Change tracking with ulem, xcolor, and hyperref: ct markup for complex objects\n" "\\DeclareRobustCommand{\\lyxobjdeleted}[4][]{\\texorpdfstring{\\lyxobjectsout{#4}}{}}\n" "\\DeclareRobustCommand{\\lyxdisplayobjdeleted}[4][]{%\n" - " \\texorpdfstring{\\lyxobjectsout{\\parbox{\\linewidth}{#4}}}{}%\n" + " \\texorpdfstring{\\leavevmode\\\\\\lyxobjectsout{\\parbox{\\linewidth}{#4}}}{}%\n" "}\n" "\\DeclareRobustCommand{\\lyxudisplayobjdeleted}[4][]{%\n" - " \\texorpdfstring{\\raisebox{-\\belowdisplayshortskip}{%\n" + " \\texorpdfstring{\\leavevmode\\\\\\raisebox{-\\belowdisplayshortskip}{%\n" " \\lyxobjectsout{\\parbox[b]{\\linewidth}{#4}}}}{}%\n" "}\n"); @@ -355,13 +361,13 @@ static docstring const changetracking_xcolor_ulem_hyperref_cb_object_def = from_ " \\protect\\cbend}{}%\n" "}\n" "\\DeclareRobustCommand{\\lyxdisplayobjdeleted}[4][]{%\n" - " \\texorpdfstring{\\protect\\cbstart%\n" + " \\texorpdfstring{\\leavevmode\\\\\\protect\\cbstart%\n" " \\lyxobjectsout{\\parbox{\\linewidth}{#4}}%\n" " \\protect\\cbend%\n" " }{}%\n" "}\n" "\\DeclareRobustCommand{\\lyxudisplayobjdeleted}[4][]{%\n" - " \\texorpdfstring{\\protect\\cbstart%\n" + " \\texorpdfstring{\\leavevmode\\\\\\protect\\cbstart%\n" " \\raisebox{-\\belowdisplayshortskip}{%\n" " \\lyxobjectsout{\\parbox[b]{\\linewidth}{#4}}%\n" " }%\n" -- 2.39.5