From 0cec5cbf832591f4421be837865f786622569b67 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 23 May 2010 11:57:16 -0600
Subject: [PATCH 1/6] Separate out driver for The Book as it uses a different
 ebook directory than the N516

---
 src/calibre/customize/builtins.py    |  3 ++-
 src/calibre/devices/hanvon/driver.py | 12 +++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py
index 34c2de7515..6bc94d30b0 100644
--- a/src/calibre/customize/builtins.py
+++ b/src/calibre/customize/builtins.py
@@ -450,7 +450,7 @@ from calibre.devices.eslick.driver import ESLICK
 from calibre.devices.nuut2.driver import NUUT2
 from calibre.devices.iriver.driver import IRIVER_STORY
 from calibre.devices.binatone.driver import README
-from calibre.devices.hanvon.driver import N516, EB511, ALEX, AZBOOKA
+from calibre.devices.hanvon.driver import N516, EB511, ALEX, AZBOOKA, THEBOOK
 from calibre.devices.edge.driver import EDGE
 from calibre.devices.teclast.driver import TECLAST_K3, NEWSMY, IPAPYRUS
 from calibre.devices.sne.driver import SNE
@@ -530,6 +530,7 @@ plugins += [
     EB600,
     README,
     N516,
+    THEBOOK,
     EB511,
     ELONEX,
     TECLAST_K3,
diff --git a/src/calibre/devices/hanvon/driver.py b/src/calibre/devices/hanvon/driver.py
index aa384910cd..7a0de3064e 100644
--- a/src/calibre/devices/hanvon/driver.py
+++ b/src/calibre/devices/hanvon/driver.py
@@ -24,7 +24,7 @@ class N516(USBMS):
 
     VENDOR_ID   = [0x0525]
     PRODUCT_ID  = [0xa4a5]
-    BCD         = [0x323, 0x326, 0x399]
+    BCD         = [0x323, 0x326]
 
     VENDOR_NAME      = 'INGENIC'
     WINDOWS_MAIN_MEM = '_FILE-STOR_GADGE'
@@ -34,6 +34,16 @@ class N516(USBMS):
     EBOOK_DIR_MAIN = 'e_book'
     SUPPORTS_SUB_DIRS = True
 
+class THEBOOK(N516):
+    name = 'The Book driver'
+    gui_name = 'The Book'
+    description    = _('Communicate with The Book reader.')
+    author         = 'Kovid Goyal'
+
+    BCD = [0x399]
+    MAIN_MEMORY_VOLUME_LABEL  = 'The Book Main Memory'
+    EBOOK_DIR_MAIN = 'My books'
+
 class ALEX(N516):
 
     name = 'Alex driver'

From c948360dcf0d804d57856699fce3f3e36cf9c37b Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 23 May 2010 19:02:10 -0600
Subject: [PATCH 2/6] Fix #5598 (ePub as a supported type for Palm Pre)

---
 src/calibre/devices/misc.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/devices/misc.py b/src/calibre/devices/misc.py
index b0d5718d7f..9d58bbcae6 100644
--- a/src/calibre/devices/misc.py
+++ b/src/calibre/devices/misc.py
@@ -17,7 +17,7 @@ class PALMPRE(USBMS):
     supported_platforms = ['windows', 'osx', 'linux']
 
     # Ordered list of supported formats
-    FORMATS     = ['mobi', 'prc', 'pdb', 'txt']
+    FORMATS     = ['epub', 'mobi', 'prc', 'pdb', 'txt']
 
     VENDOR_ID   = [0x0830]
     PRODUCT_ID  = [0x8004, 0x8002, 0x0101]

From e0a727002b392c934f01ea799593deef503d467e Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 24 May 2010 09:07:58 -0600
Subject: [PATCH 3/6] Add The Book to the welcome wizard

---
 src/calibre/gui2/wizard/__init__.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/calibre/gui2/wizard/__init__.py b/src/calibre/gui2/wizard/__init__.py
index 0a395e9eb8..b57867331f 100644
--- a/src/calibre/gui2/wizard/__init__.py
+++ b/src/calibre/gui2/wizard/__init__.py
@@ -106,6 +106,13 @@ class Booq(Device):
     output_format = 'EPUB'
     id = 'booq'
 
+class TheBook(Device):
+    name = 'The Book'
+    manufacturer = 'Augen'
+    output_profile = 'prs505'
+    output_format = 'EPUB'
+    id = 'thebook'
+
 class Avant(Booq):
     name = 'Booq Avant'
 

From b65821c073870f2ae8dd9ad1769e03bc56f350fc Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 24 May 2010 09:30:21 -0600
Subject: [PATCH 4/6] American Thinker by Walt Anthony

---
 resources/images/news/american_thinker.png | Bin 0 -> 705 bytes
 resources/recipes/american_thinker.recipe  |  43 +++++++++++++++++++++
 2 files changed, 43 insertions(+)
 create mode 100644 resources/images/news/american_thinker.png
 create mode 100644 resources/recipes/american_thinker.recipe

diff --git a/resources/images/news/american_thinker.png b/resources/images/news/american_thinker.png
new file mode 100644
index 0000000000000000000000000000000000000000..bbfdf08152d1882d4899ddb7b56705b4faba1c1c
GIT binary patch
literal 705
zcmV;y0zUnTP)<h;3K|Lk000e1NJLTq000mG000gM1^@s6CNG?d00004b3#c}2nYxW
zd<bNS0007bNkl<ZD3NWFJ7^S96o$Wh=drW9ldQ?cglvK_D)A9eL<_aGN+F1a7B)75
zm6e5HYhy2ng%)-qX;iR?g@{Cal7P_-iN;kSVzSw=kJ*{IbLU!^Y!v+KbH4MRbADlr
zF>I(=|HbNZ8B0hEl5Ez;@w&jWaWi>5uN!IE{4KEw_%t&`YjuWPHcOf$AoNDDp&f=q
zN~27M-u`j+A3BL`y8y^d()`>z=07e_tu<(b3H2s~u|<?vC~UB{q0%gi^RqmAd>b~5
zcO1lV$gS(=&?;u2G=#K0v~bW`gOS9ELZ&H+s<UJC0261g0nk~<bv*`#53?{k#hPQ0
z3J{i!6atwVLKTtAWsw*LhQ>QL=&S(X7kaQ<L#!0BHW&;@L2Lv#9+vHrq?(bjqyGnJ
z*-d$|LD1G<Qe5Gn;uMvn6g(SCB;<Q`(NipSdj9!IvA@Lg*%~V?hhkqBwiA)_1V+a!
zNT0Q8o%0t?Bjwgy`K3I~(?>T6+YS6KkD<W=XC@A^YiEfMOKs-98$Nw=X|-Z9X-Kiq
z^G^=!ndyg=KfdPG)O~cOmqK43i3|Hiv%Gw(sWvsk{T3&Wl~`Tt<?V|HMD+^W2S?aD
zegaWl`C%sSTw!@>iIx&nYEb#!W_zE{*UCChS2wx5!|nk|6oicJ$z!XCAgFWd?Bzc>
zSg$VgWby`!b8qmR3=JiytZ3>@L!d2`Qn<FH-&YJ4C6<oJ`#zVh-rEXNsuRj{(@am@
zB@U|O@_8&vk{X93Q3OFq7&fV`uH$4pE?&9K@W}oxz@`!vv-0yR-#))5Xw|T7i4X!~
nB&}9NHs8yU;}iJZ+W`0t%HSo0TH~cE00000NkvXXu0mjfg{MHG

literal 0
HcmV?d00001

diff --git a/resources/recipes/american_thinker.recipe b/resources/recipes/american_thinker.recipe
new file mode 100644
index 0000000000..b54e930774
--- /dev/null
+++ b/resources/recipes/american_thinker.recipe
@@ -0,0 +1,43 @@
+__license__   = 'GPL v3'
+__copyright__ = '2010, Walt Anthony <workshop.northpole at gmail.com>'
+'''
+www.americanthinker.com
+'''
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class AmericanThinker(BasicNewsRecipe):
+    title          = u'American Thinker'
+    description    = "American Thinker is a daily internet publication devoted to the thoughtful exploration of issues of importance to Americans."
+    __author__     = 'Walt Anthony'
+    publisher             = 'Thomas Lifson'
+    category              = 'news, politics, USA'
+    oldest_article        = 7 #days
+    max_articles_per_feed = 50
+    summary_length        = 150
+    language              = 'en'
+
+    remove_javascript     = True
+    no_stylesheets        = True
+
+
+    conversion_options = {
+                          'comment'   : description
+                        , 'tags'      : category
+                        , 'publisher' : publisher
+                        , 'language'  : language
+                        , 'linearize_tables' : True
+                        }
+
+    remove_tags  = [
+       dict(name=['table', 'iframe', 'embed', 'object'])
+    ]
+
+    remove_tags_after   = dict(name='div', attrs={'class':'article_body'})
+
+
+    feeds = [(u'http://feeds.feedburner.com/americanthinker'),
+		     (u'http://feeds.feedburner.com/AmericanThinkerBlog')
+            ]
+
+    def print_version(self, url):
+        return 'http://www.americanthinker.com/printpage/?url=' + url

From 9a49304ed426a2070a2bba1a4b74c44f42bce59c Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 24 May 2010 09:44:19 -0600
Subject: [PATCH 5/6] Change text of merge books menu entry so as not to
 confuse people

---
 src/calibre/gui2/main.ui | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/gui2/main.ui b/src/calibre/gui2/main.ui
index f95fb9ec7a..15d1c4910f 100644
--- a/src/calibre/gui2/main.ui
+++ b/src/calibre/gui2/main.ui
@@ -601,7 +601,7 @@
      <normaloff>:/images/merge_books.svg</normaloff>:/images/merge_books.svg</iconset>
    </property>
    <property name="text">
-    <string>Merge books</string>
+    <string>Merge book records</string>
    </property>
    <property name="shortcut">
     <string>M</string>

From 66e7b5c18d888d08d7e98e06c3bfa367a8151451 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 24 May 2010 11:35:09 -0600
Subject: [PATCH 6/6] ...

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

diff --git a/resources/recipes/newsweek.recipe b/resources/recipes/newsweek.recipe
index f6da941361..7a53c23e45 100644
--- a/resources/recipes/newsweek.recipe
+++ b/resources/recipes/newsweek.recipe
@@ -50,6 +50,7 @@ class Newsweek(BasicNewsRecipe):
         'articlecontent','photoBox', 'article columnist first']}, ]
     recursions = 1
     match_regexps = [r'http://www.newsweek.com/id/\S+/page/\d+']
+    preprocess_regexps = [(re.compile(r'<!--.*?-->', re.DOTALL), lambda m: '')]
 
     def find_title(self, section):
         d = {'scope':'Scope', 'thetake':'The Take', 'features':'Features',