Color has a different reset (adjusting for it).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17145 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/lyx2lyx/lyx_1_5.py b/lib/lyx2lyx/lyx_1_5.py
index 1da432771906f99393b0b719e4ac09cb70576305..b559850430b87988237a0cb4af77c5e157f8862d 100644 (file)
--- a/lib/lyx2lyx/lyx_1_5.py
+++ b/lib/lyx2lyx/lyx_1_5.py
@@ -1096,13 +1096,18 @@ def normalize_font_whitespace(document):
 
     lines = document.body
 
-    char_properties = ("\\series", "\\emph", "\\color", "\\shape", "\\family")
+    char_properties = {"\\series": "default",
+                       "\\emph": "default",
+                       "\\color": "none",
+                       "\\shape": "default",
+                       "\\family": "default"}
 
     for i in range(len(lines)):
         words = lines[i].split()
 
-        if len(words) > 1 and words[0] in char_properties \
-               and words[1] == "default" and lines[i-1][-1] == " ":
+        if len(words) > 1 and words[0] in char_properties.keys() \
+               and words[1] == char_properties[words[0]] \
+               and lines[i-1][-1] == " ":
             lines[i-1] = lines[i-1][:-1]
             lines[i+1] = " " + lines[i+1]