From 08887c9a2713a08f6ea4e9b539d1f89d4211a19f Mon Sep 17 00:00:00 2001
From: Tom Scholl <thomasscholl@gmail.com>
Date: Mon, 28 Mar 2011 21:17:32 +0000
Subject: [PATCH 1/5] Minor fixes to news recipes idnes and smith

---
 recipes/idnes.recipe | 2 +-
 recipes/smith.recipe | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/recipes/idnes.recipe b/recipes/idnes.recipe
index 0bd4de2327..238c90694c 100644
--- a/recipes/idnes.recipe
+++ b/recipes/idnes.recipe
@@ -34,7 +34,7 @@ class iHeuteRecipe(BasicNewsRecipe):
                    dict(name='table', attrs={'class':['video-16ku9']})]
     remove_tags_after  = [dict(name='div',attrs={'id':['related','related2']})]
 
-    keep_only_tags = [dict(name='div', attrs={'class':['art-full adwords-text','dil-day']})
+    keep_only_tags = [dict(name='div', attrs={'class':['art-full adwords-text','dil-day','art-full']})
                       ,dict(name='table',attrs={'class':['kemel-box']})]
 
     def print_version(self, url):
diff --git a/recipes/smith.recipe b/recipes/smith.recipe
index 98f7d98517..06075b8d1b 100644
--- a/recipes/smith.recipe
+++ b/recipes/smith.recipe
@@ -7,6 +7,7 @@ class SmithsonianMagazine(BasicNewsRecipe):
     __author__     = 'Krittika Goyal'
     oldest_article = 31#days
     max_articles_per_feed = 50
+    use_embedded_content = False
     #encoding = 'latin1'
     recursions = 1
     match_regexps = ['&page=[2-9]$']

From f3a522ff5594ba9d04bf103dd838f9651868caba Mon Sep 17 00:00:00 2001
From: Tom Scholl <thomasscholl@gmail.com>
Date: Fri, 1 Apr 2011 21:51:59 +0000
Subject: [PATCH 2/5] Removed spammy ticket adverts from guardian recipe

---
 recipes/guardian.recipe | 1 +
 1 file changed, 1 insertion(+)

diff --git a/recipes/guardian.recipe b/recipes/guardian.recipe
index a4329d279e..6211997b06 100644
--- a/recipes/guardian.recipe
+++ b/recipes/guardian.recipe
@@ -36,6 +36,7 @@ class Guardian(BasicNewsRecipe):
     remove_tags = [
                         dict(name='div', attrs={'class':["video-content","videos-third-column"]}),
                         dict(name='div', attrs={'id':["article-toolbox","subscribe-feeds",]}),
+                        dict(name='div', attrs={'class':["guardian-tickets promo-component",]}),
                         dict(name='ul', attrs={'class':["pagination"]}),
                         dict(name='ul', attrs={'id':["content-actions"]}),
                         #dict(name='img'),

From 778ed36afaca1a687e7918ab2293988dc0047860 Mon Sep 17 00:00:00 2001
From: Tom Scholl <thomasscholl@gmail.com>
Date: Sat, 2 Apr 2011 16:23:40 +0000
Subject: [PATCH 3/5] Fixes for International Herald Tribune recipe

---
 recipes/iht.recipe | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/recipes/iht.recipe b/recipes/iht.recipe
index 040ff83927..85a87ccba4 100644
--- a/recipes/iht.recipe
+++ b/recipes/iht.recipe
@@ -15,10 +15,10 @@ class InternationalHeraldTribune(BasicNewsRecipe):
     language = 'en'
 
     oldest_article = 1
-    max_articles_per_feed = 10
+    max_articles_per_feed = 30
     no_stylesheets = True
 
-    remove_tags    = [dict(name='div', attrs={'class':'footer'}),
+    remove_tags    = [dict(name='div', attrs={'class':['footer','header']}),
                       dict(name=['form'])]
     preprocess_regexps = [
             (re.compile(r'<!-- webtrends.*', re.DOTALL),
@@ -26,6 +26,8 @@ class InternationalHeraldTribune(BasicNewsRecipe):
                           ]
     extra_css      = '.headline {font-size: x-large;} \n .fact { padding-top: 10pt  }'
 
+    remove_empty_feeds = True
+    
     feeds          = [
                       (u'Frontpage', u'http://www.iht.com/rss/frontpage.xml'),
                       (u'Business', u'http://www.iht.com/rss/business.xml'),
@@ -46,13 +48,15 @@ class InternationalHeraldTribune(BasicNewsRecipe):
                     ]
     temp_files = []
     articles_are_obfuscated = True
-
-    def get_obfuscated_article(self, url, logger):
+    
+    masthead_url = 'http://graphics8.nytimes.com/images/misc/iht-masthead-logo.gif'
+    
+    def get_obfuscated_article(self, url):
         br = self.get_browser()
         br.open(url)
-        br.select_form(name='printFriendly')
-        res = br.submit()
-        html = res.read()
+        response1 = br.follow_link(url_regex=re.compile(r'.*pagewanted=print.*'))
+        html = response1.read()
+        
         self.temp_files.append(PersistentTemporaryFile('_iht.html'))
         self.temp_files[-1].write(html)
         self.temp_files[-1].close()

From d367ee3fe5e019534aba95437306dfdab04ccfec Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 2 Apr 2011 23:00:14 -0600
Subject: [PATCH 4/5] Adjust screen size in Kobo profile

---
 src/calibre/customize/profiles.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/calibre/customize/profiles.py b/src/calibre/customize/profiles.py
index bebaebced6..346adf4737 100644
--- a/src/calibre/customize/profiles.py
+++ b/src/calibre/customize/profiles.py
@@ -470,8 +470,8 @@ class KoboReaderOutput(OutputProfile):
 
     description = _('This profile is intended for the Kobo Reader.')
 
-    screen_size               = (540, 718)
-    comic_screen_size         = (540, 718)
+    screen_size               = (536, 710)
+    comic_screen_size         = (536, 710)
     dpi                       = 168.451
     fbase                     = 12
     fsizes                    = [7.5, 9, 10, 12, 15.5, 20, 22, 24]

From d872bc58582da52da38468974d656ea345c8ff94 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 2 Apr 2011 23:05:53 -0600
Subject: [PATCH 5/5] ...

---
 recipes/hawaii.recipe | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/recipes/hawaii.recipe b/recipes/hawaii.recipe
index ae98e46009..64ee69a0db 100644
--- a/recipes/hawaii.recipe
+++ b/recipes/hawaii.recipe
@@ -2,7 +2,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
 
 class AdvancedUserRecipe1282101454(BasicNewsRecipe):
     title = 'West Hawaii Today'
-    __author__ = 'Tony Stegall'
+    __author__ = 'Tony Stegall, fixed by HK'
     language = 'en'
     description = 'Westhawaiitoday.com'
     publisher = 'West Hawaii '
@@ -15,7 +15,14 @@ class AdvancedUserRecipe1282101454(BasicNewsRecipe):
 
     masthead_url = 'http://images.townnews.com/westhawaiitoday.com/art/whttoplogo.gif'
 
-
-    feeds          = [ 'http://www.westhawaiitoday.com/rss.xml']
-
+    feeds          = [
+                       ('http://www.westhawaiitoday.com/taxonomy/term/2/feed'),  #Local News
+                       ('http://www.westhawaiitoday.com/taxonomy/term/15/feed'), #Local Sports
+                       ('http://www.westhawaiitoday.com/taxonomy/term/4/feed'),   #Local Features
+                       ('http://www.westhawaiitoday.com/taxonomy/term/12/feed'), #Obituaries
+                       ('http://www.westhawaiitoday.com/taxonomy/term/18/feed'), #Letters
+                       ('http://www.westhawaiitoday.com/taxonomy/term/19/feed'), #Editorial
+                       ('http://www.westhawaiitoday.com/taxonomy/term/20/feed'), #columns
+                       ('http://www.westhawaiitoday.com/taxonomy/term/13/feed') #Volcano Update (Sundays)
+                    ]