From f2a2a9643f957c0829aeac775bbe1d5bfa415824 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Mon, 28 Jan 2013 10:14:41 +0530 Subject: [PATCH 1/3] ... --- src/calibre/db/backend.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/calibre/db/backend.py b/src/calibre/db/backend.py index f99a04adce..36f3df81c4 100644 --- a/src/calibre/db/backend.py +++ b/src/calibre/db/backend.py @@ -400,6 +400,7 @@ class DB(object): defs['gui_restriction'] = defs['cs_restriction'] = '' defs['categories_using_hierarchy'] = [] defs['column_color_rules'] = [] + defs['column_icon_rules'] = [] defs['grouped_search_make_user_categories'] = [] defs['similar_authors_search_key'] = 'authors' defs['similar_authors_match_kind'] = 'match_any' From fc086ce4378527e4f487734c0863203e3a826da8 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Mon, 28 Jan 2013 10:34:13 +0530 Subject: [PATCH 2/3] Conversion: Handle input documents that use multiple prefixes referring to the XHTML namespace correctly. Fixes #1107220 (conversion of AZW3 failed) --- src/calibre/ebooks/oeb/parse_utils.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/calibre/ebooks/oeb/parse_utils.py b/src/calibre/ebooks/oeb/parse_utils.py index 88dbb2ae56..f053b5f515 100644 --- a/src/calibre/ebooks/oeb/parse_utils.py +++ b/src/calibre/ebooks/oeb/parse_utils.py @@ -340,6 +340,11 @@ def parse_html(data, log=None, decoder=None, preprocessor=None, nroot.append(elem) data = nroot + fnsmap = {k:v for k, v in data.nsmap.iteritems() if v != XHTML_NS} + fnsmap[None] = XHTML_NS + if fnsmap != dict(data.nsmap): + # Remove non default prefixes referring to the XHTML namespace + data = clone_element(data, nsmap=fnsmap, in_context=False) data = merge_multiple_html_heads_and_bodies(data, log) # Ensure has a From 7160b48839d011c54f41cab0f8d3b1a043010231 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Mon, 28 Jan 2013 10:43:42 +0530 Subject: [PATCH 3/3] ... --- manual/faq.rst | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/manual/faq.rst b/manual/faq.rst index 215b71e860..b6c88acbb4 100644 --- a/manual/faq.rst +++ b/manual/faq.rst @@ -158,13 +158,23 @@ My device is not being detected by |app|? Follow these steps to find the problem: - * Make sure that you are connecting only a single device to your computer at a time. Do not have another |app| supported device like an iPhone/iPad etc. at the same time. - * If you are connecting an Apple iDevice (iPad, iPod Touch, iPhone), use the 'Connect to iTunes' method in the 'Getting started' instructions in `Calibre + Apple iDevices: Start here `_. - * Make sure you are running the latest version of |app|. The latest version can always be downloaded from `the calibre website `_. - * Ensure your operating system is seeing the device. That is, the device should show up in Windows Explorer (in Windows) or Finder (in OS X). + * Make sure that you are connecting only a single device to your computer + at a time. Do not have another |app| supported device like an iPhone/iPad + etc. at the same time. + * If you are connecting an Apple iDevice (iPad, iPod Touch, iPhone), use + the 'Connect to iTunes' method in the 'Getting started' instructions in + `Calibre + Apple iDevices: Start here `_. + * Make sure you are running the latest version of |app|. The latest version + can always be downloaded from `the calibre website `_. + You can tell what version of |app| you are currently running by looking + at the bottom line of the main |app| window. + * Ensure your operating system is seeing the device. That is, the device + should show up in Windows Explorer (in Windows) or Finder (in OS X). * In |app|, go to Preferences->Ignored Devices and check that your device is not being ignored - * If all the above steps fail, go to Preferences->Miscellaneous and click debug device detection with your device attached and post the output as a ticket on `the calibre bug tracker `_. + * If all the above steps fail, go to Preferences->Miscellaneous and click + debug device detection with your device attached and post the output as a + ticket on `the calibre bug tracker `_. My device is non-standard or unusual. What can I do to connect to it? ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~