Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix #7506 (Hyperlinks get broken converting ODT to EPUB)

Browse Source
This commit is contained in:
Kovid Goyal 2010-11-11 18:09:09 -07:00
parent caf4b2350f
commit 8311870e60
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/odf/odf2xhtml.py
View File

@ -21,15 +21,14 @@
#import pdb #import pdb
#pdb.set_trace() #pdb.set_trace()
import zipfile import zipfile
import xml.sax
from xml.sax import handler, expatreader from xml.sax import handler, expatreader
from xml.sax.xmlreader import InputSource from xml.sax.xmlreader import InputSource
from xml.sax.saxutils import escape, quoteattr from xml.sax.saxutils import escape, quoteattr
from cStringIO import StringIO from cStringIO import StringIO
from namespaces import ANIMNS, CHARTNS, CONFIGNS, DCNS, DR3DNS, DRAWNS, FONS, \ from namespaces import DCNS, DRAWNS, FONS, \
FORMNS, MATHNS, METANS, NUMBERNS, OFFICENS, PRESENTATIONNS, SCRIPTNS, \ METANS, NUMBERNS, OFFICENS, PRESENTATIONNS, \
SMILNS, STYLENS, SVGNS, TABLENS, TEXTNS, XLINKNS STYLENS, SVGNS, TABLENS, TEXTNS, XLINKNS
# Handling of styles # Handling of styles
# #
@ -526,7 +525,8 @@ class ODF2XHTML(handler.ContentHandler):
def get_anchor(self, name): def get_anchor(self, name):
if not self.anchors.has_key(name): if not self.anchors.has_key(name):
self.anchors[name] = "anchor%03d" % (len(self.anchors) + 1) # Changed by Kovid
self.anchors[name] = "anchor%d" % (len(self.anchors) + 1)
return self.anchors.get(name) return self.anchors.get(name)
@ -1025,9 +1025,13 @@ class ODF2XHTML(handler.ContentHandler):
if level < 1: level = 1 if level < 1: level = 1
lev = self.headinglevels[1:level+1] lev = self.headinglevels[1:level+1]
outline = '.'.join(map(str,lev) ) outline = '.'.join(map(str,lev) )
anchor = self.get_anchor("%s.%s" % ( outline, ''.join(self.data))) tail = ''.join(self.data)
anchor = self.get_anchor("%s.%s" % ( outline, tail))
anchor2 = self.get_anchor(tail) # Added by kovid to fix #7506
self.opentag('a', {'id': anchor} ) self.opentag('a', {'id': anchor} )
self.closetag('a', False) self.closetag('a', False)
self.opentag('a', {'id': anchor2} )
self.closetag('a', False)
self.closetag('h%s' % level) self.closetag('h%s' % level)
self.purgedata() self.purgedata()