From ab10ac42ba3dddbcd97ffd15653686e49d58c80a Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 22 Jan 2010 15:57:24 -0700
Subject: [PATCH] Fix tags markup in catalog

---
 resources/catalog/stylesheet.css        | 2 ++
 src/calibre/gui2/viewer/documentview.py | 2 +-
 src/calibre/library/catalog.py          | 4 ++++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/resources/catalog/stylesheet.css b/resources/catalog/stylesheet.css
index 056c2f5ee8..458d1a9bf0 100644
--- a/resources/catalog/stylesheet.css
+++ b/resources/catalog/stylesheet.css
@@ -1,3 +1,5 @@
+body { background-color: white; }
+
 p.title  {
 	margin-top:0em;
 	margin-bottom:1em;
diff --git a/src/calibre/gui2/viewer/documentview.py b/src/calibre/gui2/viewer/documentview.py
index 124651bdf3..f6fce62eac 100644
--- a/src/calibre/gui2/viewer/documentview.py
+++ b/src/calibre/gui2/viewer/documentview.py
@@ -178,7 +178,7 @@ class Document(QWebPage):
 
     def set_user_stylesheet(self):
         raw = config().parse().user_css
-        raw = '::selection {background:#ffff00; color:#000;}\n'+raw
+        raw = '::selection {background:#ffff00; color:#000;}\nbody {background-color: white;}\n'+raw
         data = 'data:text/css;charset=utf-8;base64,'
         data += b64encode(raw.encode('utf-8'))
         self.settings().setUserStyleSheetUrl(QUrl(data))
diff --git a/src/calibre/library/catalog.py b/src/calibre/library/catalog.py
index f60ca4a106..c20e0c761e 100644
--- a/src/calibre/library/catalog.py
+++ b/src/calibre/library/catalog.py
@@ -938,6 +938,8 @@ class EPUB_MOBI(CatalogPlugin):
                     # Insert a spacer to match the author indent
                     fontTag = Tag(soup,"font")
                     fontTag['style'] = 'color:white;font-size:large'
+                    if self.opts.fmt == 'epub':
+                        fontTag['style'] += ';opacity: 0.0'
                     fontTag.insert(0, NavigableString("by "))
                     tagsTag.insert(ttc, fontTag)
                     ttc += 1
@@ -948,6 +950,8 @@ class EPUB_MOBI(CatalogPlugin):
                         aTag.insert(0,escape(NavigableString(tag)))
                         emTag = Tag(soup, "em")
                         emTag.insert(0, aTag)
+                        if ttc < len(title['tags']):
+                            emTag.insert(1, NavigableString(', '))
                         tagsTag.insert(ttc, emTag)
                         ttc += 1