merge

recipes/good_to_know.recipe

@@ -0,0 +1,32 @@
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class AdvancedUserRecipe1305547242(BasicNewsRecipe):
+    title          = u'Good to Know (uk)'
+    oldest_article = 14
+    max_articles_per_feed = 100
+    no_stylesheets         = True
+    use_embedded_content   = False
+    remove_javascript      = True
+    __author__  = 'Anonymous'
+    language = 'en_GB'
+    remove_tags = [dict(name='div', attrs={'class':'articles_footer', 'class':'printoptions'})]
+
+    def print_version(self, url):
+        return url + '/print/1'
+
+    def preprocess_html(self, soup):
+        for alink in soup.findAll('a'):
+            if alink.string is not None:
+               tstr = alink.string
+               alink.replaceWith(tstr)
+        return soup
+
+    feeds  = [	(u'Family Conception Advice', u'http://www.goodtoknow.co.uk/feeds/family.rss'),
+	(u'Family Health Advice', u'http://www.goodtoknow.co.uk/feeds/health.rss'),
+	(u'Diet Advice', u'http://www.goodtoknow.co.uk/feeds/diet.rss'),
+                    (u'Food Advice', u'http://www.goodtoknow.co.uk/feeds/food.rss'),
+                    (u'Sex Advice', u'http://www.goodtoknow.co.uk/feeds/sex.rss'),
+                    (u'Easy Exercise', u'http://www.goodtoknow.co.uk/feeds/easyexercise.rss'),
+                    (u'Recipes', u'http://www.goodtoknow.co.uk/feeds/recipes.rss'),
+                    (u'Food Quick-tips', u'http://www.goodtoknow.co.uk/feeds/foodquicktips.rss'),
+                    ]

recipes/mens_health.recipe

@@ -0,0 +1,10 @@
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class AdvancedUserRecipe1305636254(BasicNewsRecipe):
+    title          = u'Mens Health (US)'
+    language = 'en'
+    __author__ = 'Anonymous'
+    oldest_article = 14
+    max_articles_per_feed = 100
+
+    feeds          = [(u'News', u'http://blogs.menshealth.com/health-headlines/feed')]

recipes/united_daily.recipe

@@ -14,6 +14,7 @@ class UnitedDaily(BasicNewsRecipe):
              (u'生活', u'http://udn.com/udnrss/life.xml'),
              (u'綜合', u'http://udn.com/udnrss/education.xml'),
              (u'意見評論', u'http://udn.com/udnrss/opinion.xml'),
+             (u'校園博覽會', u'http://mag.udn.com/udnrss/campus_rss.xml'),
              (u'大台北', u'http://udn.com/udnrss/local_taipei.xml'),
              (u'桃竹苗', u'http://udn.com/udnrss/local_tyhcml.xml'),
              (u'中彰投', u'http://udn.com/udnrss/local_tcchnt.xml'),
@@ -21,15 +22,21 @@ class UnitedDaily(BasicNewsRecipe):
              (u'高屏離島', u'http://udn.com/udnrss/local_ksptisland.xml'),
              (u'基宜花東', u'http://udn.com/udnrss/local_klilhltt.xml'),
              (u'台灣百寶鄉', u'http://udn.com/udnrss/local_oddlyenough.xml'),
+             (u'台灣人物', u'http://mag.udn.com/udnrss/people_rss.xml'),
              (u'兩岸要聞', u'http://udn.com/udnrss/mainland.xml'),
              (u'國際焦點', u'http://udn.com/udnrss/international.xml'),
              (u'台商經貿', u'http://udn.com/udnrss/financechina.xml'),
              (u'國際財經', u'http://udn.com/udnrss/financeworld.xml'),
+             (u'全球觀察', u'http://mag.udn.com/udnrss/world_rss.xml'),
              (u'財經焦點', u'http://udn.com/udnrss/financesfocus.xml'),
              (u'股市要聞', u'http://udn.com/udnrss/stock.xml'),
              (u'股市快訊', u'http://udn.com/udnrss/stklatest.xml'),
              (u'稅務法務', u'http://udn.com/udnrss/tax.xml'),
              (u'房市情報', u'http://udn.com/udnrss/houses.xml'),
+             (u'個人理財', u'http://mag.udn.com/udnrss/wealth_rss.xml'),
+             (u'研究報告', u'http://mag.udn.com/udnrss/report_rss.xml'),
+             (u'基金', u'http://mag.udn.com/udnrss/fund_rss.xml'),
+             (u'理財會客室', u'http://mag.udn.com/udnrss/m_forum_rss.xml'),
              (u'棒球', u'http://udn.com/udnrss/baseball.xml'),
              (u'籃球', u'http://udn.com/udnrss/basketball.xml'),
              (u'體壇動態', u'http://udn.com/udnrss/sportsfocus.xml'),
@@ -40,19 +47,24 @@ class UnitedDaily(BasicNewsRecipe):
              (u'電影世界', u'http://udn.com/udnrss/movie.xml'),
              (u'流行音樂', u'http://udn.com/udnrss/music.xml'),
              (u'觀點專題', u'http://udn.com/udnrss/starssubject.xml'),
+             (u'消費流行', u'http://mag.udn.com/udnrss/happylife_rss.xml'),
              (u'食樂指南', u'http://udn.com/udnrss/food.xml'),
+             (u'數位資訊', u'http://mag.udn.com/udnrss/digital_rss.xml'),
              (u'折扣好康', u'http://udn.com/udnrss/shopping.xml'),
+             (u'發燒車訊', u'http://mag.udn.com/udnrss/car_rss.xml'),
              (u'醫藥新聞', u'http://udn.com/udnrss/health.xml'),
              (u'家婦繽紛', u'http://udn.com/udnrss/benfen.xml'),
              (u'談星論命', u'http://udn.com/udnrss/astrology.xml'),
              (u'文化副刊', u'http://udn.com/udnrss/reading.xml'),
+             (u'旅遊休閒', u'http://travel.udn.com/udnrss/travel_rss.xml'),
+             (u'健康醫藥', u'http://mag.udn.com/udnrss/life_rss.xml'),
              ]
 
-    extra_css = '''div[id='story_title'] {font-size:200%; font-weight:bold;}'''
+    extra_css = '''div[id='story_title'] {font-size:200%; font-weight:bold;} td[class='story_title'] {font-size:200%; font-weight:bold;} td[class='story_title'] td[class='story_title']>div {font-size:200%; font-weight:bold;}'''
 
     __author__ = 'Eddie Lau'
-    __version__ = '1.0'
+    __version__ = '1.1'
-    language = 'zh'
+    language = 'zh-TW'
     publisher = 'United Daily News Group'
     description = 'United Daily (Taiwan)'
     category = 'News, Chinese, Taiwan'
@@ -63,5 +75,12 @@ class UnitedDaily(BasicNewsRecipe):
     conversion_options = {'linearize_tables':True}
     masthead_url = 'http://udn.com/NEWS/2004/images/logo_udn.gif'
     cover_url = 'http://udn.com/NEWS/2004/images/logo_udn.gif'
-    keep_only_tags = [dict(name='div', attrs={'id':['story_title','story_author', 'story']})]
+    keep_only_tags = [dict(name='td', attrs={'class':['story_title']}),
+                      dict(name='div', attrs={'id':['story_title']}),
+                      dict(name='td', attrs={'class':['story_author']}),
+                      dict(name='div', attrs={'id':['story_author']}),
+                      dict(name='td', attrs={'class':['story']}),
+                      dict(name='div', attrs={'id':['story']}),
+                      ]
     remove_tags = [dict(name='div', attrs={'id':['mvouter']})]
+

src/calibre/manual/faq.rst

@@ -22,7 +22,7 @@ It can convert every input format in the following list, to every output format.
 
 *Input Formats:* CBZ, CBR, CBC, CHM, EPUB, FB2, HTML, HTMLZ, LIT, LRF, MOBI, ODT, PDF, PRC, PDB, PML, RB, RTF, SNB, TCR, TXT, TXTZ
 
-*Output Formats:* EPUB, FB2, OEB, LIT, LRF, MOBI, HTMLZ, PDB, PML, RB, PDF, SNB, TCR, TXT, TXTZ
+*Output Formats:* EPUB, FB2, OEB, LIT, LRF, MOBI, HTMLZ, PDB, PML, RB, PDF, RTF, SNB, TCR, TXT, TXTZ
 
 .. note ::