diff --git a/recipes/wsj_free.recipe b/recipes/wsj_free.recipe index deea63aa64..5f3cf476c7 100644 --- a/recipes/wsj_free.recipe +++ b/recipes/wsj_free.recipe @@ -35,12 +35,17 @@ class WallStreetJournal(BasicNewsRecipe): remove_tags_before = dict(name='h1') remove_tags = [ - dict(id=["articleTabs_tab_article", "articleTabs_tab_comments", "articleTabs_tab_interactive","articleTabs_tab_video","articleTabs_tab_map","articleTabs_tab_slideshow"]), + dict(id=["articleTabs_tab_article", + "articleTabs_tab_comments", + "articleTabs_tab_interactive","articleTabs_tab_video","articleTabs_tab_map","articleTabs_tab_slideshow", + "articleTabs_tab_quotes"]), {'class':['footer_columns','network','insetCol3wide','interactive','video','slideshow','map','insettip','insetClose','more_in', "insetContent", 'articleTools_bottom', 'aTools', "tooltip", "adSummary", "nav-inline"]}, dict(name='div', attrs={'data-flash-settings':True}), {'class':['insetContent embedType-interactive insetCol3wide','insetCol6wide','insettipUnit']}, dict(rel='shortcut icon'), {'class':lambda x: x and 'sTools' in x}, + {'class':lambda x: x and 'printSummary' in x}, + {'class':lambda x: x and 'mostPopular' in x}, ] remove_tags_after = [dict(id="article_story_body"), {'class':"article story"},] diff --git a/src/calibre/gui2/viewer/documentview.py b/src/calibre/gui2/viewer/documentview.py index a711442ba2..ed36bf125c 100644 --- a/src/calibre/gui2/viewer/documentview.py +++ b/src/calibre/gui2/viewer/documentview.py @@ -575,7 +575,10 @@ class DocumentView(QWebView): # {{{ # at the left edge and *after* the right edge of the viewport d = self.document if d.in_paged_mode: - l, r = d.column_boundaries + try: + l, r = d.column_boundaries + except ValueError: + l, r = (0, 1) else: l, r = d.xpos, d.xpos + d.window_width return (l, d.ypos, r, d.ypos + d.window_height)