From f2dd86faecc7296caa982479f2459de9709147b7 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 12 Jul 2010 07:56:13 -0600
Subject: [PATCH 1/3] Fix #6152 ("Edit meta information" should be "Edit
 metadata")

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

diff --git a/src/calibre/gui2/layout.py b/src/calibre/gui2/layout.py
index c44efa2354..1c853cbdff 100644
--- a/src/calibre/gui2/layout.py
+++ b/src/calibre/gui2/layout.py
@@ -403,7 +403,7 @@ class MainWindowMixin(object):
 
         ac('add', _('Add books'), 'add_book.svg', _('A'))
         ac('del', _('Remove books'), 'trash.svg', _('Del'))
-        ac('edit', _('Edit meta info'), 'edit_input.svg', _('E'))
+        ac('edit', _('Edit metadata'), 'edit_input.svg', _('E'))
         ac('merge', _('Merge book records'), 'merge_books.svg', _('M'))
         ac('sync', _('Send to device'), 'sync.svg')
         ac('save', _('Save to disk'), 'save.svg', _('S'))

From e16310c70a3ef7548c5dc9aa8ff37af50090bfa5 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 12 Jul 2010 08:08:12 -0600
Subject: [PATCH 2/3] El PAin Impresso by DM

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

diff --git a/resources/images/news/elpais_impreso.png b/resources/images/news/elpais_impreso.png
new file mode 100644
index 0000000000000000000000000000000000000000..35dcaf2d44455f3e97f3985c9df6483463370f5b
GIT binary patch
literal 717
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b
zK-vS0-A-oPfdtD69Mgd`SU*F|v9*U87#P2Kx;TbdoL)M4zyIYxk)!tO!&q2VS{L4!
z)X=07)$*(RXk&tjmx<r8ixXY{Gl~CWGc7bT%u`c4_bTCtyrEM-h|)5Z-i;ByE2iA~
zRr@`zJwG~1*5`w-{?7OFs?Y6wzO&QY_*nfMjRO(CUQC<y{CQj}!>YDoH;<#Op{wKG
z`Zryz`dTXL!1(ysR__0Ec1<~1{Q2GHG|oj#7VGX;o~qC~_v410+*!R(HUENZ)3Pj1
z{+!&-*<{qZ)#k0NA%hZwQdh@@9dnd-@8WZK7v0D|)5bdLw&$D9;{Ok;<Mh@fuxT}|
z$YZL|uMj-Kea>~o&qZPnZ!E0qTk?yesUhbb`wkAJrVbO22?0#!0(j3_mMR^6(OBp9
zO}%3Cmzkf=^UB%Oxi5`zx$+@SN|i%N?)}m%jVGV7YtGaxj99hc)yG9g%C;MsOjxjV
zt#Bp_#~vXMjm5_j-o548{@yn6+gGEs2S<$yYbJE3yZsDZ_h7c_k5}g$byF5Bd$4Fv
z#0jC-clx>}O1(<m8?h)v>%z9xt1G$hX|uCeOL~+s3%q}slw#4@vGG@Jv-WiV&D+;Y
zhq~@jSaeoRs&D4%^w*3tXZaYL&itqCk=C^0!PdYgtr?H+e9`S{UB4r$$6PpiI>!dx
zTTN!h1~OcHWo2Iyo)w%sAoFa^!t1RMF7O2CJ=^|8nz4>qey*ru;cO3mU~*6`ag8WR
zNi0dVN-jzTQVd20h6cI@=DLPPAqEy!24+?!Cb~e<z~D(X|1uN}x%nxXX_W{Kh9QRL
cRwhPPCT0)~8aiLAfEpM)UHx3vIVCg!07L#OdH?_b

literal 0
HcmV?d00001

diff --git a/resources/recipes/elpais_impreso.recipe b/resources/recipes/elpais_impreso.recipe
new file mode 100644
index 0000000000..b30db0707a
--- /dev/null
+++ b/resources/recipes/elpais_impreso.recipe
@@ -0,0 +1,86 @@
+# -*- coding: utf-8 -*-
+__license__   = 'GPL v3'
+__copyright__ = '2010, Darko Miletic <darko.miletic at gmail.com>'
+'''
+www.elpais.com/diario/
+'''
+
+from calibre import strftime
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class ElPaisImpresa(BasicNewsRecipe):
+    title                 = 'El País - edicion impresa'
+    __author__            = 'Darko Miletic'
+    description           = 'el periodico global en Español'
+    publisher             = 'EDICIONES EL PAIS, S.L.'
+    category              = 'news, politics,Spain,actualidad,noticias,informacion,videos,fotografias,audios,graficos,nacional,internacional,deportes,economia,tecnologia,cultura,gente,television,sociedad,opinion,blogs,foros,chats,encuestas,entrevistas,participacion'
+    no_stylesheets        = True
+    encoding              = 'latin1'
+    use_embedded_content  = False
+    language              = 'es'
+    publication_type      = 'newspaper'
+    masthead_url          = 'http://www.elpais.com/im/tit_logo_global.gif'
+    index                 = 'http://www.elpais.com/diario/'
+    extra_css             = ' p{text-align: justify} body{ text-align: left; font-family: Georgia,"Times New Roman",Times,serif } h2{font-family: Arial,Helvetica,sans-serif} img{margin-bottom: 0.4em} '
+
+    conversion_options = {
+                          'comment'      : description
+                        , 'tags'         : category
+                        , 'publisher'    : publisher
+                        , 'language'     : language
+                        }
+
+    feeds          = [
+                        (u'Internacional'     , index + u'internacional/'     )
+                       ,(u'España'            , index + u'espana/'            )
+                       ,(u'Economia'          , index + u'economia/'          )
+                       ,(u'Opinion'           , index + u'opinion/'           )
+                       ,(u'Viñetas'           , index + u'vineta/'            )
+                       ,(u'Sociedad'          , index + u'sociedad/'          )
+                       ,(u'Cultura'           , index + u'cultura/'           )
+                       ,(u'Tendencias'        , index + u'tendencias/'        )
+                       ,(u'Gente'             , index + u'gente/'             )
+                       ,(u'Obituarios'        , index + u'obituarios/'        )
+                       ,(u'Deportes'          , index + u'deportes/'          )
+                       ,(u'Pantallas'         , index + u'radioytv/'          )
+                       ,(u'Ultima'            , index + u'ultima/'            )
+                       ,(u'Educacion'         , index + u'educacion/'         )
+                       ,(u'Saludo'            , index + u'salud/'             )
+                       ,(u'Ciberpais'         , index + u'ciberpais/'         )
+                       ,(u'EP3'               , index + u'ep3/'               )
+                       ,(u'Cine'              , index + u'cine/'              )
+                       ,(u'Babelia'           , index + u'babelia/'           )
+                       ,(u'El viajero'        , index + u'viajero/'           )
+                       ,(u'Negocios'          , index + u'negocios/'          )
+                       ,(u'Domingo'           , index + u'domingo/'           )
+                       ,(u'El Pais semanal'   , index + u'eps/'               )
+                       ,(u'Quadern Catalunya' , index + u'quadern-catalunya/' )
+                     ]
+
+    keep_only_tags=[dict(attrs={'class':['cabecera_noticia','contenido_noticia']})]
+    remove_attributes=['width','height']
+    remove_tags=[dict(name='link')]
+
+    def parse_index(self):
+        totalfeeds = []
+        lfeeds = self.get_feeds()
+        for feedobj in lfeeds:
+            feedtitle, feedurl = feedobj
+            self.report_progress(0, _('Fetching feed')+' %s...'%(feedtitle if feedtitle else feedurl))
+            articles = []
+            soup = self.index_to_soup(feedurl)
+            for item in soup.findAll('a',attrs={'class':['g19r003','g19i003','g17r003','g17i003']}):
+                url   = 'http://www.elpais.com' + item['href'].rpartition('/')[0]
+                title = self.tag_to_string(item)
+                date  = strftime(self.timefmt)
+                articles.append({
+                                      'title'      :title
+                                     ,'date'       :date
+                                     ,'url'        :url
+                                     ,'description':''
+                                    })
+            totalfeeds.append((feedtitle, articles))
+        return totalfeeds
+
+    def print_version(self, url):
+        return url + '?print=1'

From abdb1f3910d89b81457ea7a8c4abf859b4ba9d41 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 12 Jul 2010 08:15:20 -0600
Subject: [PATCH 3/3] ...

---
 resources/recipes/ap.recipe | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/resources/recipes/ap.recipe b/resources/recipes/ap.recipe
index 572c0aa392..0118cf0726 100644
--- a/resources/recipes/ap.recipe
+++ b/resources/recipes/ap.recipe
@@ -12,9 +12,9 @@ class AssociatedPress(BasicNewsRecipe):
 
     max_articles_per_feed = 15
     html2lrf_options = ['--force-page-break-before-tag="chapter"']
-    
-    
-    preprocess_regexps = [ (re.compile(i[0], re.IGNORECASE | re.DOTALL), i[1]) for i in 
+
+
+    preprocess_regexps = [ (re.compile(i[0], re.IGNORECASE | re.DOTALL), i[1]) for i in
 [
         (r'<HEAD>.*?</HEAD>' , lambda match : '<HEAD></HEAD>'),
         (r'<body class="apple-rss-no-unread-mode" onLoad="setup(null)">.*?<!-- start Entries -->', lambda match : '<body>'),
@@ -25,10 +25,10 @@ class AssociatedPress(BasicNewsRecipe):
         (r'<p class="ap-story-p">', lambda match : '<p>'),
         (r'Learn more about our <a href="http://apdigitalnews.com/privacy.html">Privacy Policy</a>.*?</body>', lambda match : '</body>'),
     ]
-    ]   
-     
+    ]
+
+
 
-  
     feeds = [ ('AP Headlines', 'http://hosted.ap.org/lineups/TOPHEADS-rss_2.0.xml?SITE=ORAST&SECTION=HOME'),
                   ('AP US News', 'http://hosted.ap.org/lineups/USHEADS-rss_2.0.xml?SITE=CAVIC&SECTION=HOME'),
                    ('AP World News', 'http://hosted.ap.org/lineups/WORLDHEADS-rss_2.0.xml?SITE=SCAND&SECTION=HOME'),
@@ -38,4 +38,4 @@ class AssociatedPress(BasicNewsRecipe):
                    ('AP Health News', 'http://hosted.ap.org/lineups/HEALTHHEADS-rss_2.0.xml?SITE=FLDAY&SECTION=HOME'),
                    ('AP Science News', 'http://hosted.ap.org/lineups/SCIENCEHEADS-rss_2.0.xml?SITE=OHCIN&SECTION=HOME'),
                    ('AP Strange News', 'http://hosted.ap.org/lineups/STRANGEHEADS-rss_2.0.xml?SITE=WCNC&SECTION=HOME'),
-        ]
\ No newline at end of file
+        ]