From 1037fff11fc0701eeac77a134e6a537ee5de3eff Mon Sep 17 00:00:00 2001 From: Jim Miller Date: Mon, 25 Nov 2013 12:25:11 -0600 Subject: [PATCH] Disable nook_img_fix if replace_br_with_p. --- defaults.ini | 3 ++- fanficdownloader/adapters/base_adapter.py | 2 +- plugin-defaults.ini | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/defaults.ini b/defaults.ini index 2a86b71..d8d29f5 100644 --- a/defaults.ini +++ b/defaults.ini @@ -473,7 +473,8 @@ remove_transparency: true ## confused and displays it on every page after that under the text ## for the rest of the chapter. I doubt adding a div around the img ## will break any other readers, but in case it does, the fix can be -## turned off. +## turned off. This setting is not used if replace_br_with_p is +## true--replace_br_with_p also fixes the problem. nook_img_fix:true [mobi] diff --git a/fanficdownloader/adapters/base_adapter.py b/fanficdownloader/adapters/base_adapter.py index 46d0e52..63cd4c4 100644 --- a/fanficdownloader/adapters/base_adapter.py +++ b/fanficdownloader/adapters/base_adapter.py @@ -358,7 +358,7 @@ class BaseSiteAdapter(Configurable): retval = soup.__str__('utf8').decode('utf-8') - if self.getConfig('nook_img_fix'): + if self.getConfig('nook_img_fix') and not self.getConfig('replace_br_with_p'): # if the tag doesn't have a div or a p around it, # nook gets confused and displays it on every page after # that under the text for the rest of the chapter. diff --git a/plugin-defaults.ini b/plugin-defaults.ini index 69898d6..4ae1d5a 100644 --- a/plugin-defaults.ini +++ b/plugin-defaults.ini @@ -442,7 +442,8 @@ image_max_size: 580, 725 ## confused and displays it on every page after that under the text ## for the rest of the chapter. I doubt adding a div around the img ## will break any other readers, but in case it does, the fix can be -## turned off. +## turned off. This setting is not used if replace_br_with_p is +## true--replace_br_with_p also fixes the problem. nook_img_fix:true [mobi]