diff --git a/session.vim b/session.vim index f2adf71de9..fa14a92fba 100644 --- a/session.vim +++ b/session.vim @@ -18,6 +18,6 @@ def recipe_title_callback(raw): return eval(raw.decode('utf-8')) vipy.session.add_content_browser('.r', ',r', 'Recipe', - vipy.session.glob_based_iterator(os.path.join(project_dir, 'resources', 'recipes', '*.recipe')), + vipy.session.glob_based_iterator(os.path.join(project_dir, 'recipes', '*.recipe')), vipy.session.regexp_based_matcher(r'title\s*=\s*(?P.+)', 'title', recipe_title_callback)) EOFPY diff --git a/src/calibre/ebooks/rtf/input.py b/src/calibre/ebooks/rtf/input.py index 52f6feb071..1594b2fbce 100644 --- a/src/calibre/ebooks/rtf/input.py +++ b/src/calibre/ebooks/rtf/input.py @@ -22,6 +22,7 @@ border_style_map = { 'dot-dot-dash': 'dotted', 'outset': 'outset', 'tripple': 'double', + 'triple': 'double', 'thick-thin-small': 'solid', 'thin-thick-small': 'solid', 'thin-thick-thin-small': 'solid', diff --git a/src/calibre/utils/wmf/parse.py b/src/calibre/utils/wmf/parse.py index c618884e33..9dc035d3e1 100644 --- a/src/calibre/utils/wmf/parse.py +++ b/src/calibre/utils/wmf/parse.py @@ -251,12 +251,12 @@ class WMF(object): img.load(bmp) return img.export('png') -def wmf_unwrap(wmf_data): +def wmf_unwrap(wmf_data, verbose=0): ''' Return the largest embedded raster image in the WMF. The returned data is in PNG format. ''' - w = WMF() + w = WMF(verbose=verbose) w(wmf_data) if not w.has_raster_image: raise ValueError('No raster image found in the WMF') @@ -266,4 +266,5 @@ if __name__ == '__main__': wmf = WMF(verbose=4) wmf(open(sys.argv[-1], 'rb')) open('/t/test.bmp', 'wb').write(wmf.bitmaps[0]) + open('/t/test.png', 'wb').write(wmf.to_png())