Merge from trunk

resources/recipes/20minutos.recipe

@@ -0,0 +1,68 @@
+__license__   = 'GPL v3'
+__copyright__ = '2011, Darko Miletic <darko.miletic at gmail.com>'
+'''
+www.20minutos.es
+'''
+
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class t20Minutos(BasicNewsRecipe):
+    title                 = '20 Minutos'
+    __author__            = 'Darko Miletic'
+    description           = 'Diario de informacion general y local mas leido de Espania, noticias de ultima hora de Espania, el mundo, local, deportes, noticias curiosas y mas'
+    publisher             = '20 Minutos Online SL'
+    category              = 'news, politics, Spain'
+    oldest_article        = 2
+    max_articles_per_feed = 200
+    no_stylesheets        = True
+    encoding              = 'utf8'
+    use_embedded_content  = True
+    language              = 'es'
+    remove_empty_feeds    = True
+    publication_type      = 'newspaper'
+    masthead_url          = 'http://estaticos.20minutos.es/css4/img/ui/logo-301x54.png'
+    extra_css             = """
+                               body{font-family: Arial,Helvetica,sans-serif }
+                               img{margin-bottom: 0.4em; display:block}
+                            """
+
+    conversion_options = {
+                          'comment'   : description
+                        , 'tags'      : category
+                        , 'publisher' : publisher
+                        , 'language'  : language
+                        }
+
+    remove_tags = [dict(attrs={'class':'mf-viral'})]
+    remove_attributes=['border']
+
+    feeds = [
+              (u'Principal'      , u'http://20minutos.feedsportal.com/c/32489/f/478284/index.rss')
+             ,(u'Cine'           , u'http://20minutos.feedsportal.com/c/32489/f/478285/index.rss')
+             ,(u'Internacional'  , u'http://20minutos.feedsportal.com/c/32489/f/492689/index.rss')
+             ,(u'Deportes'       , u'http://20minutos.feedsportal.com/c/32489/f/478286/index.rss')
+             ,(u'Nacional'       , u'http://20minutos.feedsportal.com/c/32489/f/492688/index.rss')
+             ,(u'Economia'       , u'http://20minutos.feedsportal.com/c/32489/f/492690/index.rss')
+             ,(u'Tecnologia'     , u'http://20minutos.feedsportal.com/c/32489/f/478292/index.rss')
+            ]
+
+    def preprocess_html(self, soup):
+        for item in soup.findAll(style=True):
+            del item['style']
+        for item in soup.findAll('a'):
+            limg = item.find('img')
+            if item.string is not None:
+               str = item.string
+               item.replaceWith(str)
+            else:
+               if limg:
+                  item.name = 'div'
+                  item.attrs = []
+               else:
+                   str = self.tag_to_string(item)
+                   item.replaceWith(str)
+        for item in soup.findAll('img'):
+            if not item.has_key('alt'):
+               item['alt'] = 'image'
+        return soup
+

src/calibre/manual/gui.rst

@@ -413,6 +413,18 @@ The Book Details display shows you extra information and the cover for the curre
 
 .. _jobs:
 
+.. _tag_browser:
+
+Tag Browser
+-------------
+.. image:: images/tag_browser.png
+
+The Tag Browser allows you to easily browse your collection by Author/Tags/Series/etc. If you click on any Item in the Tag Browser, for example, the Author name, Isaac Asimov, then the list of books to the right is restricted to books by that author. Clicking once again on Isaac Asimov will restrict the list of books to books not by Isaac Asimov. A third click will remove the restriction. If you hold down the Ctrl or Shift keys and click on multiple items, then restrictions based on multiple items are created. For example you could Hold Ctrl and click on the tags History and Europe for find books on European history. The Tag Browser works by constructing search expressions that are automatically entered into the Search bar. It is a good way to learn how to construct basic search expressions. 
+
+There is a search bar at the top of the Tag Browser that allows you to easily find any item in the Tag Browser. In addition, you can right click on any item and choose to hide it or rename it or open a "Manage x" dialog that allows you to manage items of that kind. For example the "Manage Authors" dialog allows you to rename authors and control how their names are sorted. 
+
+For convenience, you can drag and drop books from the book list to items in the Tag Browser and that item will be automatically applied to the dropped books. For example, dragging a book to Isaac Asimov will set the author of that book to Isaac Asimov or dragging it to the tag History will add the tag History to its tags.
+
 Jobs
 -----
 .. image:: images/jobs.png