Fix for another unknown Topaz token.

DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/__init__.py

@@ -51,6 +51,8 @@ __docformat__ = 'restructuredtext en'
 #   6.4.2 - Fix for more new tags in Topaz ebooks and very small Topaz ebooks
 #   6.4.3 - Fix for error that only appears when not in debug mode
 #           Also includes fix for Macs with bonded ethernet ports
+#   6.4.4 - Fix for some more 'new' tags in Topaz ebooks.
+#           Also fix an error in wineutils.py
 
 
 """
@@ -58,7 +60,7 @@ Decrypt DRMed ebooks.
 """
 
 PLUGIN_NAME = u"DeDRM"
-PLUGIN_VERSION_TUPLE = (6, 4, 3)
+PLUGIN_VERSION_TUPLE = (6, 4, 4)
 PLUGIN_VERSION = u".".join([unicode(str(x)) for x in PLUGIN_VERSION_TUPLE])
 # Include an html helpfile in the plugin's zipfile with the following name.
 RESOURCE_NAME = PLUGIN_NAME + '_Help.htm'

DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/convert2xml.py

@@ -391,6 +391,18 @@ class PageParser(object):
         'startID'      : (0, 'number', 1, 1),
         'startID.page' : (1, 'number', 0, 0),
         'startID.id'   : (1, 'number', 0, 0),
+    
+        'median_d'          : (1, 'number', 0, 0),
+        'median_h'          : (1, 'number', 0, 0),
+        'median_firsty'     : (1, 'number', 0, 0),
+        'median_lasty'      : (1, 'number', 0, 0),
+
+        'num_footers_maybe' : (1, 'number', 0, 0),
+        'num_footers_yes'   : (1, 'number', 0, 0),
+        'num_headers_maybe' : (1, 'number', 0, 0),
+        'num_headers_yes'   : (1, 'number', 0, 0),
+
+        'tracking'          : (1, 'number', 0, 0),
 
      }
 

DeDRM_Macintosh_Application/DeDRM.app/Contents/Resources/wineutils.py

@@ -31,7 +31,7 @@ def WineGetKeys(scriptpath, extension, wineprefix=""):
          cmdline = u"WINEPREFIX=\"{2}\" wine python.exe \"{0}\" \"{1}\"".format(scriptpath,outdirpath,wineprefix)
     else:
         cmdline = u"wine python.exe \"{0}\" \"{1}\"".format(scriptpath,outdirpath)
-    print u"{0} v{1}: Command line: “{2}”".format(PLUGIN_NAME, PLUGIN_VERSION, cmdline)
+    print u"{0} v{1}: Command line: '{2}'".format(PLUGIN_NAME, PLUGIN_VERSION, cmdline)
 
     try:
         cmdline = cmdline.encode(sys.getfilesystemencoding())

DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/DeDRM_App.pyw

@@ -25,8 +25,9 @@
 #   6.4.1 - Fix for new tags in Topaz ebooks
 #   6.4.2 - Fix for new tags in Topaz ebooks, and very small Topaz ebooks
 #   6.4.3 - Version bump to match plugin & Mac app
+#   6.4.4 - Fix for some new tags in Topaz ebooks
 
-__version__ = '6.4.3'
+__version__ = '6.4.4'
 
 import sys
 import os, os.path

DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/__init__.py

@@ -51,6 +51,8 @@ __docformat__ = 'restructuredtext en'
 #   6.4.2 - Fix for more new tags in Topaz ebooks and very small Topaz ebooks
 #   6.4.3 - Fix for error that only appears when not in debug mode
 #           Also includes fix for Macs with bonded ethernet ports
+#   6.4.4 - Fix for some more 'new' tags in Topaz ebooks.
+#           Also fix an error in wineutils.py
 
 
 """
@@ -58,7 +60,7 @@ Decrypt DRMed ebooks.
 """
 
 PLUGIN_NAME = u"DeDRM"
-PLUGIN_VERSION_TUPLE = (6, 4, 3)
+PLUGIN_VERSION_TUPLE = (6, 4, 4)
 PLUGIN_VERSION = u".".join([unicode(str(x)) for x in PLUGIN_VERSION_TUPLE])
 # Include an html helpfile in the plugin's zipfile with the following name.
 RESOURCE_NAME = PLUGIN_NAME + '_Help.htm'

DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/convert2xml.py

@@ -391,6 +391,18 @@ class PageParser(object):
         'startID'      : (0, 'number', 1, 1),
         'startID.page' : (1, 'number', 0, 0),
         'startID.id'   : (1, 'number', 0, 0),
+    
+        'median_d'          : (1, 'number', 0, 0),
+        'median_h'          : (1, 'number', 0, 0),
+        'median_firsty'     : (1, 'number', 0, 0),
+        'median_lasty'      : (1, 'number', 0, 0),
+
+        'num_footers_maybe' : (1, 'number', 0, 0),
+        'num_footers_yes'   : (1, 'number', 0, 0),
+        'num_headers_maybe' : (1, 'number', 0, 0),
+        'num_headers_yes'   : (1, 'number', 0, 0),
+
+        'tracking'          : (1, 'number', 0, 0),
 
      }
 

DeDRM_Windows_Application/DeDRM_App/DeDRM_lib/lib/wineutils.py

@@ -31,7 +31,7 @@ def WineGetKeys(scriptpath, extension, wineprefix=""):
          cmdline = u"WINEPREFIX=\"{2}\" wine python.exe \"{0}\" \"{1}\"".format(scriptpath,outdirpath,wineprefix)
     else:
         cmdline = u"wine python.exe \"{0}\" \"{1}\"".format(scriptpath,outdirpath)
-    print u"{0} v{1}: Command line: “{2}”".format(PLUGIN_NAME, PLUGIN_VERSION, cmdline)
+    print u"{0} v{1}: Command line: '{2}'".format(PLUGIN_NAME, PLUGIN_VERSION, cmdline)
 
     try:
         cmdline = cmdline.encode(sys.getfilesystemencoding())

DeDRM_calibre_plugin/DeDRM_plugin/__init__.py

@@ -51,6 +51,8 @@ __docformat__ = 'restructuredtext en'
 #   6.4.2 - Fix for more new tags in Topaz ebooks and very small Topaz ebooks
 #   6.4.3 - Fix for error that only appears when not in debug mode
 #           Also includes fix for Macs with bonded ethernet ports
+#   6.4.4 - Fix for some more 'new' tags in Topaz ebooks.
+#           Also fix an error in wineutils.py
 
 
 """
@@ -58,7 +60,7 @@ Decrypt DRMed ebooks.
 """
 
 PLUGIN_NAME = u"DeDRM"
-PLUGIN_VERSION_TUPLE = (6, 4, 3)
+PLUGIN_VERSION_TUPLE = (6, 4, 4)
 PLUGIN_VERSION = u".".join([unicode(str(x)) for x in PLUGIN_VERSION_TUPLE])
 # Include an html helpfile in the plugin's zipfile with the following name.
 RESOURCE_NAME = PLUGIN_NAME + '_Help.htm'

DeDRM_calibre_plugin/DeDRM_plugin/convert2xml.py

@@ -391,6 +391,18 @@ class PageParser(object):
         'startID'      : (0, 'number', 1, 1),
         'startID.page' : (1, 'number', 0, 0),
         'startID.id'   : (1, 'number', 0, 0),
+    
+        'median_d'          : (1, 'number', 0, 0),
+        'median_h'          : (1, 'number', 0, 0),
+        'median_firsty'     : (1, 'number', 0, 0),
+        'median_lasty'      : (1, 'number', 0, 0),
+
+        'num_footers_maybe' : (1, 'number', 0, 0),
+        'num_footers_yes'   : (1, 'number', 0, 0),
+        'num_headers_maybe' : (1, 'number', 0, 0),
+        'num_headers_yes'   : (1, 'number', 0, 0),
+
+        'tracking'          : (1, 'number', 0, 0),
 
      }
 

DeDRM_calibre_plugin/DeDRM_plugin/wineutils.py

@@ -31,7 +31,7 @@ def WineGetKeys(scriptpath, extension, wineprefix=""):
          cmdline = u"WINEPREFIX=\"{2}\" wine python.exe \"{0}\" \"{1}\"".format(scriptpath,outdirpath,wineprefix)
     else:
         cmdline = u"wine python.exe \"{0}\" \"{1}\"".format(scriptpath,outdirpath)
-    print u"{0} v{1}: Command line: “{2}”".format(PLUGIN_NAME, PLUGIN_VERSION, cmdline)
+    print u"{0} v{1}: Command line: '{2}'".format(PLUGIN_NAME, PLUGIN_VERSION, cmdline)
 
     try:
         cmdline = cmdline.encode(sys.getfilesystemencoding())

FAQs.md

@@ -11,7 +11,7 @@ When your ebooks have DRM you are unable to convert the ebook from one format to
 ## So how can I remove DRM from my ebooks?
 Just download and use these tools, that's all! Uh, almost. There are a few, uh, provisos, a, a couple of quid pro quos. 
 * The tools don't work on all ebooks. For example, they don't work on any ebooks from Apple's iBooks store.
-* You must own the ebook - the tools won't work on library ebooks or rented ebooks.
+* You must own the ebook - the tools won't work on library ebooks or rented ebooks or books from a friend.
 * You must not use these tools to give your ebooks to a hundred of your closest friends. Or to a million strangers. Authors need to sell books to be able to write more books. Don't be mean to the authors.
 * Do NOT use Adobe Digital Editions 3.0 or later to download your ePubs. ADE 3.0 and later can use a new encryption scheme that the tools can't handle. While major ebook stores aren't using the new scheme yet, using ADE 2.0.1 will ensure that your ebooks are downloaded using the old scheme. Once a book has been downloaded with the new scheme, it's IMPOSSIBLE to re-download using the old scheme (without buying it again).
 
@@ -32,7 +32,7 @@ Install calibre. Install the DeDRM\_plugin in calibre. Install the Obok\_plugin
 You are trying to add the tools archive (e.g. DeDRM\_tools\_6.4.3.zip) instead of the plugin. The tools archive is not the plugin. It is a collection of DRM removal tools which includes the plugin. You must unzip the archive, and install the calibre plugin (DeDRM\_plugin.zip) from a folder called “DeDRM\_calibre_plugin” in the unzipped archive.
 
 ### I’ve unzipped the tools archive, but I can’t find the calibre plugin when I try to add them to calibre. I use Windows.
-You should select the zip file that is in the “DeDRM\_calibre\_plugin” folder, not any files inside the plugin’s zip archive. Make sure you are selecting from the folder that you created when you right unzipped the tools archive and not selecting a file inside the still-zipped tools archive.
+You should select the zip file that is in the “DeDRM\_calibre\_plugin” folder, not any files inside the plugin’s zip archive. Make sure you are selecting from the folder that you created when you unzipped the tools archive and not selecting a file inside the still-zipped tools archive.
 
 (The problem is that Windows will allow apps to browse inside zip archives without needing to unzip them first. If there are zip archives inside the main zip archives, Windows will show them as unzipped as well. So what happens is people will unzip the DeDRM\_tools\_X.X.X.zip to a folder, but when using calibre they will actually navigate to the still zipped file by mistake and cannot tell they have done so because they do not have file extensions showing. So to the unwary Windows user, it appears that the zip archive was unzipped and that everything inside it was unzipped as well so there is no way to install the plugins.
 
@@ -42,6 +42,10 @@ We strongly recommend renaming the DeDRM\_tools\_X.X.X.zip archive (after extrac
 ### I've installed ActiveState Python and PyCrypto, but the Windows application won't run. What have I done wrong?
 Nothing. There's a bug in the current ActiveState Python Windows installer that puts the Tcl code in the wrong place. See [this comment of mine at ActiveState community](https://community.activestate.com/node/19090). Just move the Tcl code and the Windows app should run.
 
+## The Macintosh Application
+### I can't open the Macintosh Application. Some message about it not being signed or something.
+Try right-clicking and select open. That might give you the option to open it anyway. Otherwise you'll need to change your security settings to allow unsigned applications to run. You can probably change these back after running it for the first time.
+
 # Using the Tools
 ## I can’t get the tools to work on my rented or library ebooks.
 Support for removing DRM from rented or library ebooks is not provided.
@@ -77,6 +81,8 @@ If you cannot read the ebook on your current device or installed software, the t
 ## I have installed the calibre plugin, and the book is not already in calibre, but the DRM does not get removed. It is a Kindle book.
 If you are on Windows 8 and using the Windows 8 AppStore Kindle app, you must download and install the Kindle for PC application directly from the Amazon website. The tools do not work with the Windows 8 AppStore Kindle app.
 
+If you are on Windows, using the Kindle for PC application, and your windows user name has accented or other non-ASCII characters in it, this might cause the plugin to fail. Create a new user account with an ASCII-only username. Install and register Kindle for PC there, and see if things work running calibre and the plugin in that user account.
+
 If this book is from an eInk Kindle, you must enter the serial number into the configuration dialog. The serial number is sixteen characters long, and is case-sensitive.
 
 If this book is from Kindle for Mac or Kindle for PC, you must have the Kindle Software installed on the same computer as your copy of calibre.
@@ -92,9 +98,6 @@ If the book is from Kindle for PC or Kindle for Mac and you think you are doing
 1. Re-register Kindle for PC(Mac) with your Amazon account
 1. Download the ebook again. Do not use the files you have downloaded previously.
 
-## I use the Macintosh application, but the DRM does not get removed. It is a Kindle book it used to work before I reinstalled Kindle for Mac.
-You need to delete the Kindle for Mac key that the Macintosh app has stored, so that it will generate the new key from your new installation of Kindle for Mac. You can do this in the application settings, or just delete the file ~/Library/Preferences/com.apprenticealf.dedrm/Local Kindle Key.k4i (where ~ is your home folder).
-
 ## Some of my books had their DRM removed, but some still say that they have DRM and will not convert.
 There are several possible reasons why only some books get their DRM removed.
 * You still don’t have the DRM removal tools working correctly, but some of your books didn’t have DRM in the first place.