From 50df54efa63f27ff41559d7d47ff0dce0790564f Mon Sep 17 00:00:00 2001
From: Sengian <sengian1@gmail.com>
Date: Wed, 11 May 2011 23:44:22 +0200
Subject: [PATCH] Color None mistingly translated to true instead of 0

---
 src/calibre/ebooks/rtf/input.py              | 2 +-
 src/calibre/ebooks/rtf2xml/process_tokens.py | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/calibre/ebooks/rtf/input.py b/src/calibre/ebooks/rtf/input.py
index 2f8c11fd50..be032f0598 100644
--- a/src/calibre/ebooks/rtf/input.py
+++ b/src/calibre/ebooks/rtf/input.py
@@ -87,7 +87,7 @@ class RTFInput(InputFormatPlugin):
                 indent_out = 1
                 self.log('Running RTFParser in debug mode')
             except:
-                pass
+                self.log.warn('Impossible to run RTFParser in debug mode')
         parser = ParseRtf(
             in_file    = stream,
             out_file   = ofile,
diff --git a/src/calibre/ebooks/rtf2xml/process_tokens.py b/src/calibre/ebooks/rtf2xml/process_tokens.py
index 010d374cbc..7dc88e7f2b 100755
--- a/src/calibre/ebooks/rtf2xml/process_tokens.py
+++ b/src/calibre/ebooks/rtf2xml/process_tokens.py
@@ -197,8 +197,8 @@ class ProcessTokens:
         # character info => ci
         'b'                  :	('ci', 'bold______', self.bool_st_func),
         'blue'               :	('ci', 'blue______', self.color_func),
-        'caps'               :  ('ci', 'caps______', self.bool_st_func),
-        'cf'                 :	('ci', 'font-color', self.default_func),
+        'caps'               :	('ci', 'caps______', self.bool_st_func),
+        'cf'                 :	('ci', 'font-color', self.colorz_func),
         'chftn'              :	('ci', 'footnot-mk', self.bool_st_func),
         'dn'                 :	('ci', 'font-down_', self.divide_by_2),
         'embo'               :	('ci', 'emboss____', self.bool_st_func),
@@ -624,6 +624,11 @@ class ProcessTokens:
             num = 'true'
         return 'cw<%s<%s<nu<%s\n' % (pre, token, num)
 
+    def colorz_func(self, pre, token, num):
+        if num is None:
+            num = '0'
+        return 'cw<%s<%s<nu<%s\n' % (pre, token, num)
+
     def __list_type_func(self, pre, token, num):
         type = 'arabic'
         if num is None: