Commits

Brian Mearns committed 92aa68d

Think I managed to restore the 1.x interface.

Comments (0)

Files changed (1)

src/tome/writeEpub.py

     def __init__(
         self, tome, ofile, templateDirectory=None,
         tdFilter=None, tmplFilter=None, chapterTemplatePath=None,
-        bookTitleTemplatePath=None, partTitleTemplatePath=None,
-        uid=None, lang=None
+        uid=None, lang=None,
+        bookTitleTemplatePath=None, partTitleTemplatePath=None
     ):
         """
         :param tome: The Tome object for which to generate an EPUB document.
             If not given or `None`, the default filename :file:`chapter.xhtml.tmpl` will be appended to
             the path of the template directory and used. 
 
-        :param str bookTitleTemplatePath:
-            Simmilar to `chapterTemplatePath`, but for the title page at the start of explicit books sections
-
-        :param str partTitleTemplatePath:
-            Simmilar to `chapterTemplatePath`, but for the title page at the start of explicit part sections.
-
         :param str uid:
             A unique identifier for the book, which will be used for the 
             `dc:identifier <http://idpf.org/epub/30/spec/epub30-publications.html#elemdef-opf-dcidentifier>`_
             from the "lang" :meth:`meta item <Tome.Tome.getMeta>` in the |Tome|. If no such meta item is
             found, an Exception is raised.
 
+        :param str bookTitleTemplatePath:
+            Simmilar to `chapterTemplatePath`, but for the title page at the start of explicit books sections
+
+        :param str partTitleTemplatePath:
+            Simmilar to `chapterTemplatePath`, but for the title page at the start of explicit part sections.
         """
         self.__tome = tome
         self.__ofile = ofile
 
 
 
+    def generate_CHAP_TITLE(self, chapter):
+        """
+        .. deprecated:: 1.1.0.0
+        Use <generate_any_TITLE> instead.
+        """
+        return generate_any_TITLE(chapter)
+
     def generate_any_TITLE(self, titled):
         title = titled.title()
         if title is None:
         else:
             return authors[0]
 
+    def generate_CHAP_SHORTMARK(self, chapter):
+        """
+        .. deprecated:: 1.1.0.0
+        Use <generate_any_SHORTMARK> instead.
+        """
+        return generate_any_SHORTMARK(chapter)
+
     def generate_any_SHORTMARK(self, titled):
         """
         Returns a short title for the given titled section. If the section has a short mark, then it is the shortmark.
         else:
             return smark
 
+    def hasChapShortMark(self, chapter):
+        """
+        .. deprecated:: 1.1.0.0
+        Use <hasShortMark> instead.
+        """
+        return hasShortMark(chapter)
+
     def hasShortMark(self, titled):
         """
         Determines whether or not the given section has a short mark, as specified by <generate_any_SHORTMARK>, which
         else:
             return False
 
+    def generate_CHAP_HAS_SHORTMARK(self, chapter):
+        """
+        .. deprecated:: 1.1.0.0
+        Use <generate_any_HAS_SHORTMARK> instead.
+        """
+        return generate_any_HAS_SHORTMARK(chapter)
+
     def generate_any_HAS_SHORTMARK(self, titled):
         if self.hasShortMark(titled):
             return "1"
         else:
             return "0"
 
+    def generate_CHAP_SHORTMARK_SEP_HTML(self, chapter):
+        """
+        .. deprecated:: 1.1.0.0
+        Use <generate_any_SHORTMARK_SEP_HTML> instead.
+        """
+        return generate_any_SHORTMARK_SEP_HTML(chapter)
+
     def generate_any_SHORTMARK_SEP_HTML(self, titled):
         """
         Returns an HTML string which can be used to separate the section's shortmark from other text, for instance the section number.
         else:
             return ""
 
+    def generate_CHAP_TITLE_SEP_HTML(self, chapter):
+        """
+        .. deprecated:: 1.1.0.0
+        Use <generate_any_TITLE_SEP_HTML> instead.
+        """
+        return generate_any_TITLE_SEP_HTML(chapter)
+
     def generate_any_TITLE_SEP_HTML(self, titled):
         if len(titled.allTitles()) == 0:
             return ""
         else:
             return " &#8211; "
 
+    def generate_CHAP_TITLES_HTML(self, chapter):
+        """
+        .. deprecated:: 1.1.0.0
+        Use <generate_any_TITLES_HTML> instead.
+        """
+        return generate_any_TITLES_HTML(chapter)
+
     def generate_any_TITLES_HTML(self, titled):
         #Build the HTML for the chatper titles.
         titleLevel = 2
 
             
     def generate_SUBTITLES_HTML(self):
+        """
+        .. deprecated:: 1.1.0.0
+        Use `generate_any_SUBTITLES_HTML`, passing in `__tome`.
+        """
         return self.generate_any_SUBTITLES_HTML(self.__tome)
 
 
 
         
 
-    def generate_MANIFEST_XML(self):
+    def generate_MANIFEST_XML(self, chapterFiles=None):
+        """
+        :param chapterFiles: **deprecated** No longer used.
+        """
         manifestXml = ""
         chNum = 0
         bkNum = 0