From 1792fad11c143fe29a866d9d6c35d502bc59def8 Mon Sep 17 00:00:00 2001
From: GRiker <griker@hotmail.com>
Date: Tue, 7 Aug 2012 04:27:34 -0600
Subject: [PATCH] Added AZW3 as output format, fixed missing prefix in 'By
 Month' section.

---
 src/calibre/gui2/catalog/catalog_epub_mobi.py     | 3 +--
 src/calibre/library/catalogs/epub_mobi.py         | 2 +-
 src/calibre/library/catalogs/epub_mobi_builder.py | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/calibre/gui2/catalog/catalog_epub_mobi.py b/src/calibre/gui2/catalog/catalog_epub_mobi.py
index 485f84a642..7468ed6f27 100644
--- a/src/calibre/gui2/catalog/catalog_epub_mobi.py
+++ b/src/calibre/gui2/catalog/catalog_epub_mobi.py
@@ -31,7 +31,7 @@ class PluginWidget(QWidget,Ui_Form):
     sync_enabled = True
 
     # Formats supported by this plugin
-    formats = set(['epub','mobi'])
+    formats = set(['azw3','epub','mobi'])
 
     def __init__(self, parent=None):
         QWidget.__init__(self, parent)
@@ -872,7 +872,6 @@ class PrefixRules(GenericRulesTable):
             ('Math plus circled',u'\u2295'),
             ('Math times circled',u'\u2297'),
             ('Math times',u'\u00d7'),
-            ('O slash',u'\u00d8'),
             ('Paragraph',u'\u00b6'),
             ('Percent',u'%'),
             ('Plus-or-minus',u'\u00b1'),
diff --git a/src/calibre/library/catalogs/epub_mobi.py b/src/calibre/library/catalogs/epub_mobi.py
index 385a699c7b..1007c6d762 100644
--- a/src/calibre/library/catalogs/epub_mobi.py
+++ b/src/calibre/library/catalogs/epub_mobi.py
@@ -25,7 +25,7 @@ class EPUB_MOBI(CatalogPlugin):
     minimum_calibre_version = (0, 7, 40)
     author = 'Greg Riker'
     version = (1, 0, 0)
-    file_types = set(['epub','mobi'])
+    file_types = set(['azw3','epub','mobi'])
 
     THUMB_SMALLEST = "1.0"
     THUMB_LARGEST = "2.0"
diff --git a/src/calibre/library/catalogs/epub_mobi_builder.py b/src/calibre/library/catalogs/epub_mobi_builder.py
index 825778f0d5..91856600d8 100644
--- a/src/calibre/library/catalogs/epub_mobi_builder.py
+++ b/src/calibre/library/catalogs/epub_mobi_builder.py
@@ -1337,7 +1337,7 @@ Author '{0}':
                     pBookTag['class'] = "line_item"
                     ptc = 0
 
-                    pBookTag.insert(ptc, self.formatPrefix(book['prefix'],soup))
+                    pBookTag.insert(ptc, self.formatPrefix(new_entry['prefix'],soup))
                     ptc += 1
 
                     spanTag = Tag(soup, "span")