merge with http://bitbucket.org/rolmei/sphinx-epub/

doc/conf.py

@@ -34,9 +34,9 @@ epub_author = 'Georg Brandl'
 epub_publisher = 'http://sphinx.pocoo.org/'
 epub_scheme = 'url'
 epub_identifier = epub_publisher
-epub_pre_files = [('index', 'Welcome')]
+epub_pre_files = [('index.html', 'Welcome')]
 epub_exclude_files = ['_static/opensearch.xml', '_static/doctools.js',
-    '_static/jquery.js', '_static/searchtools.js',
+    '_static/jquery.js', '_static/searchtools.js', '_static/underscore.js',
     '_static/basic.css', 'search.html']
 
 latex_documents = [('contents', 'sphinx.tex', 'Sphinx Documentation',

doc/config.rst

@@ -768,8 +768,8 @@ the `Dublin Core metadata <http://dublincore.org/>`_.
 .. confval:: epub_post_files
 
    Additional files that should be inserted after the text generated by Sphinx.
-   It is a list of tuples containing the file name and the title.  The default
+   It is a list of tuples containing the file name and the title.  This option
-   value is ``[]``.
+   can be used to add an appendix.  The default value is ``[]``.
 
 .. confval:: epub_exclude_files
 

doc/faq.rst

@@ -134,6 +134,16 @@ some notes:
   and Bookworm_.  For bookworm you can download the source from
   http://code.google.com/p/threepress/ and run your own local server.
 
+* Large floating divs are not displayed properly.
+  If they cover more than one page, the div is only shown on the first page.
+  In that case you can copy the :file:`epub.css` from the
+  ``sphinx/themes/epub/static/`` directory to your local ``_static/``
+  directory and remove the float settings.
+
+* Files that are inserted outside of the ``toctree`` directive must be manually
+  included. This sometimes applies to appendixes, e.g. the glossary or
+  the indices.  You can add them with the :confval:`epub_post_files` option.
+
 .. _Epubcheck: http://code.google.com/p/epubcheck/
 .. _Calibre: http://calibre-ebook.com/
 .. _FBreader: http://www.fbreader.org/

sphinx/builders/epub.py

@@ -20,6 +20,7 @@ from docutils.transforms import Transform
 
 from sphinx.builders.html import StandaloneHTMLBuilder
 from sphinx.util.osutil import EEXIST
+from sphinx.util.smartypants import sphinx_smarty_pants as ssp
 
 
 # (Fragment) templates from which the metainfo files content.opf, toc.ncx,
@@ -124,7 +125,7 @@ _media_types = {
 
 class VisibleLinksTransform(Transform):
     """
-    Add the link target of referances to the text, unless it is already
+    Add the link target of references to the text, unless it is already
     present in the description.
     """
 
@@ -170,7 +171,10 @@ class EpubBuilder(StandaloneHTMLBuilder):
         # the output files for epub must be .html only
         self.out_suffix = '.html'
         self.playorder = 0
-        self.app.add_transform(VisibleLinksTransform)
+        # Disable transform until the issue with cached doctrees is solved.
+        # Building the html file after the epub file shows the
+        # visible links also in the HTML output.
+        #self.app.add_transform(VisibleLinksTransform)
 
     def get_theme_config(self):
         return self.config.epub_theme, {}
@@ -194,17 +198,20 @@ class EpubBuilder(StandaloneHTMLBuilder):
         """Collect section titles, their depth in the toc and the refuri."""
         # XXX: is there a better way than checking the attribute
         # toctree-l[1-8] on the parent node?
-        if isinstance(doctree, nodes.reference):
+        if isinstance(doctree, nodes.reference) and hasattr(doctree, 'refuri'):
+            refuri = doctree['refuri']
+            if refuri.startswith('http://') or refuri.startswith('https://') \
+                or refuri.startswith('irc:') or refuri.startswith('mailto:'):
+                return result
             classes = doctree.parent.attributes['classes']
-            level = 1
+            for level in range(8, 0, -1): # or range(1, 8)?
-            for l in range(8, 0, -1): # or range(1, 8)?
+                if (_toctree_template % level) in classes:
-                if (_toctree_template % l) in classes:
+                    result.append({
-                    level = l
+                        'level': level,
-            result.append({
+                        'refuri': self.esc(refuri),
-                'level': level,
+                        'text': ssp(self.esc(doctree.astext()))
-                'refuri': self.esc(doctree['refuri']),
+                    })
-                'text': self.esc(doctree.astext())
+                    break
-            })
         else:
             for elem in doctree.children:
                 result = self.get_refnodes(elem, result)
@@ -220,19 +227,20 @@ class EpubBuilder(StandaloneHTMLBuilder):
         self.refnodes.insert(0, {
             'level': 1,
             'refuri': self.esc(self.config.master_doc + '.html'),
-            'text': self.esc(self.env.titles[self.config.master_doc].astext())
+            'text': ssp(self.esc(
+                    self.env.titles[self.config.master_doc].astext()))
         })
         for file, text in reversed(self.config.epub_pre_files):
             self.refnodes.insert(0, {
                 'level': 1,
-                'refuri': self.esc(file + '.html'),
+                'refuri': self.esc(file),
-                'text': self.esc(text)
+                'text': ssp(self.esc(text))
             })
         for file, text in self.config.epub_post_files:
             self.refnodes.append({
                 'level': 1,
-                'refuri': self.esc(file + '.html'),
+                'refuri': self.esc(file),
-                'text': self.esc(text)
+                'text': ssp(self.esc(text))
             })