From 101cc665e7dd9d52b2ead13278ec5fafd5d67345 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 8 Feb 2010 21:59:58 -0700
Subject: [PATCH] version 0.6.38

---
 Changelog.yaml                         | 69 ++++++++++++++++++++++++++
 src/calibre/constants.py               |  2 +-
 src/calibre/ebooks/rtf2xml/tokenize.py |  2 +-
 3 files changed, 71 insertions(+), 2 deletions(-)

diff --git a/Changelog.yaml b/Changelog.yaml
index 1ec61fa0b5..9aca2ff597 100644
--- a/Changelog.yaml
+++ b/Changelog.yaml
@@ -4,6 +4,75 @@
 # for important features/bug fixes.
 # Also, each release can have new and improved recipes.
 
+- version: 0.6.38
+  date: 2010-02-09
+
+  new features:
+    - title: "Driver for the Irex DR 800"
+
+    - title: "Driver for the Booq e-book reader"
+    
+    - title: "Allow automatic series increment algorithm to be tweaked by editing the config file tweaks.py"
+
+    - title: "Various improvements to the catlog generation. Larger thumbnails in EPUB output and better series sorting. Better handling of html markup in the comments."
+
+    - title: "MOBI Output: Make font used for generated masthead images user customizable."
+
+  bug fixes:
+    - title: "E-book viewer: Make bookmarking (and remebering last open position more robust). For linuxsource installs, you must have Qt 4.6"
+      tickets: [4812]
+
+    - title: "Fix conversion/import of HTML files with very long href links on windows"
+      tickets: [4783]
+
+    - title: "Don't read metadata from filenames for download news, even if the user has the read metadata from filename option set"
+      tickets: [4758]
+
+    - title: "Don't allow leading or trailing space in tags and series. Also normalize all internal spaces to a single space"
+      tickets: [4809]
+
+    - title: "E-book viewer: Toolbars remember their position"
+      tickets: [4811]
+
+    - title: "Fix year being repeated when editing date in main library screen on windows"
+      tickets: [4829]
+
+    - title: "New download: Fix downloading of images from URLs with an ampersand in them"
+
+    - title: "Linux source install: unbundle cssutils, it is now an external dependancy"
+
+    - title: "MOBI metadata: Fix regression that broke setting of titles in some MOBI files"
+
+    - title: "EPUB metadata: Extract the cover image from the html it is embededd in if possible, instead of rendering the html. Removes the white margins on covers and speeds up cover extraction"
+
+    - title: "Fix regression in PDB output"
+
+    - title: "News download: Remove <base> tags automatically"
+
+    - title: "Searching on device: Ignore unicode errors"
+
+
+  new recipes:
+    - title: Courier Press
+      author: Krittika Goyal
+
+    - title: zive.sk and iliterature.cz
+      author: Abelturd
+
+    - title: El Comerico, Digital Spy UK, Gizmodo, News Straits Times, Read It Later, TidBits
+      author: Darko Miletic
+
+  improved recipes:
+    - Jerusalem Post
+    - Clarin
+    - La Nacion
+    - Harvard Business Review
+    - People US Mashup
+    - The New Republic
+    - "Pagina 12"
+    - Discover Magazine
+    - Metro Montreal
+
 - version: 0.6.37
   date: 2010-02-01
 
diff --git a/src/calibre/constants.py b/src/calibre/constants.py
index c06876f692..36c46ae2a0 100644
--- a/src/calibre/constants.py
+++ b/src/calibre/constants.py
@@ -2,7 +2,7 @@ __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
 __docformat__ = 'restructuredtext en'
 __appname__   = 'calibre'
-__version__   = '0.6.37'
+__version__   = '0.6.38'
 __author__    = "Kovid Goyal <kovid@kovidgoyal.net>"
 
 import re
diff --git a/src/calibre/ebooks/rtf2xml/tokenize.py b/src/calibre/ebooks/rtf2xml/tokenize.py
index ad12daa211..45887f33e7 100755
--- a/src/calibre/ebooks/rtf2xml/tokenize.py
+++ b/src/calibre/ebooks/rtf2xml/tokenize.py
@@ -72,7 +72,7 @@ class Tokenize:
         return line
     def __compile_expressions(self):
         self.__ms_hex_exp = re.compile(r"\\\'(..)")
-        self.__utf_exp = re.compile(r"\\u(-?\d{3,6})")
+        self.__utf_exp = re.compile(r"\\u(-?\d{3,6}) {0,1}")
         self.__splitexp = re.compile(r"(\\[\\{}]|{|}|\\[^\s\\{}&]+(?:\s)?)")
         self.__par_exp = re.compile(r'\\$')
         self.__mixed_exp = re.compile(r"(\\[a-zA-Z]+\d+)(\D+)")