From: José Matox <jamatos@lyx.org>
Date: Mon, 12 Feb 2007 00:15:20 +0000 (+0000)
Subject: Color has a different reset (adjusting for it).
X-Git-Tag: 1.6.10~10848
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=60dc3fea2f3279e1dc11a9f54e1d8927cd2f0d83;p=features.git

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 1da4327719..b559850430 100644
--- 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]