commit 08182ead14d4aebde112c10fc5a8ca25e2bf80cc Author: José Matos <jama...@lyx.org> Date: Sat Apr 28 18:31:31 2018 +0100
Remove spurious spaces at the end of lines --- lib/lyx2lyx/lyx_2_2.py | 4 ++-- lib/lyx2lyx/lyx_2_3.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/lyx2lyx/lyx_2_2.py b/lib/lyx2lyx/lyx_2_2.py index c4df8a8..87b3331 100644 --- a/lib/lyx2lyx/lyx_2_2.py +++ b/lib/lyx2lyx/lyx_2_2.py @@ -667,7 +667,7 @@ def convert_dashes(document): # remove ligature breaks between dashes i = 0 while True: - i = find_substring(document.body, + i = find_substring(document.body, r"-\SpecialChar \textcompwordmark{}", i+1) if i == -1: break @@ -1293,7 +1293,7 @@ def revert_colorbox(document): if framecolor == "black" and backcolor == "none": # default values i += 15 # skip box option lines continue - + # Emulate non-default colours with LaTeX code: einset = find_end_of_inset(document.body, i) if einset == -1: diff --git a/lib/lyx2lyx/lyx_2_3.py b/lib/lyx2lyx/lyx_2_3.py index ff30dd0..eefbec1 100644 --- a/lib/lyx2lyx/lyx_2_3.py +++ b/lib/lyx2lyx/lyx_2_3.py @@ -1798,7 +1798,7 @@ def convert_dashligatures(document): ['% Added by lyx2lyx', r'\renewcommand{\textendash}{--}', r'\renewcommand{\textemdash}{---}']) or None - + if use_dash_ligatures is None: # Look for dashes (Documents by LyX 2.1 or older have "\twohyphens\n" # or "\threehyphens\n" as interim representation for -- an ---.)