Change algorithm for EpubBuilder.make_id

The new algorithm no longer derives the id from the name (which
may contain illegal characters for ids) but uses a cache to
associate names to ids.

1 files changed, 8 insertions, 3 deletions

diff --git a/sphinx/builders/epub.py b/sphinx/builders/epub.py
index a35a72b5..e8e5f081 100644
--- a/sphinx/builders/epub.py
+++ b/sphinx/builders/epub.py
@@ -194,9 +194,14 @@ class EpubBuilder(StandaloneHTMLBuilder):
         return self.config.epub_theme, self.config.epub_theme_options
 
     # generic support functions
-    def make_id(self, name):
-        """Replace all characters not allowed for (X)HTML ids."""
-        return name.replace('/', '_').replace(' ', '')
+    def make_id(self, name, id_cache={}):
+        # id_cache is intentionally mutable
+        """Return a unique id for name."""
+        id = id_cache.get(name)
+        if not id:
+            id = 'epub-%d' % self.env.new_serialno('epub')
+            id_cache[name] = id
+        return id
 
     def esc(self, name):
         """Replace all characters not allowed in text an attribute values."""