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

IGN:Make OPF generation compliant with epubcheck

Browse Source
This commit is contained in:
Kovid Goyal 2008-08-02 22:51:37 -07:00
commit c4f3e1c8d8
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/calibre/ebooks/metadata/opf.xml
View File

@ -1,14 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<package version="2.0" <package version="2.0"
xmlns:opf="http://www.idpf.org/2007/opf" xmlns="http://www.idpf.org/2007/opf"
xmlns:py="http://genshi.edgewall.org/" xmlns:py="http://genshi.edgewall.org/"
unique-identifier="${__appname__}_id" unique-identifier="${__appname__}_id"
> >
<metadata xmlns:dc="http://purl.org/dc/elements/1.1/"> <metadata xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:opf="http://www.idpf.org/2007/opf">
<dc:title py:with="attrs={'files-as':mi.title_sort}" py:attrs="attrs">${mi.title}</dc:title> <dc:title py:with="attrs={'opf:files-as':mi.title_sort}" py:attrs="attrs">${mi.title}</dc:title>
<dc:creator opf:role="aut" py:for="i, author in enumerate(mi.authors)" py:with="attrs={'file-as':mi.author_sort if i==0 else None}" py:attrs="attrs">${author}</dc:creator> <dc:creator opf:role="aut" py:for="i, author in enumerate(mi.authors)" py:with="attrs={'opf:file-as':mi.author_sort if i==0 else None}" py:attrs="attrs">${author}</dc:creator>
<dc:identifier scheme="${__appname__}" id="${__appname__}_id">${mi.application_id}</dc:identifier> <dc:identifier opf:scheme="${__appname__}" id="${__appname__}_id">${mi.application_id}</dc:identifier>
<dc:language>${mi.language if mi.language else 'Unknown'}</dc:language> <dc:language>${mi.language if mi.language else 'Unknown'}</dc:language>
<dc:type py:if="mi.category">${mi.category}</dc:type> <dc:type py:if="mi.category">${mi.category}</dc:type>

18
src/calibre/utils/genshi/output.py
View File

@ -573,6 +573,7 @@ class NamespaceFlattener(object):
def __call__(self, stream): def __call__(self, stream):
prefixes = dict([(v, [k]) for k, v in self.prefixes.items()]) prefixes = dict([(v, [k]) for k, v in self.prefixes.items()])
namespaces = {XML_NAMESPACE.uri: ['xml']} namespaces = {XML_NAMESPACE.uri: ['xml']}
default = prefixes.get('', [''])
def _push_ns(prefix, uri): def _push_ns(prefix, uri):
namespaces.setdefault(uri, []).append(prefix) namespaces.setdefault(uri, []).append(prefix)
prefixes.setdefault(prefix, []).append(uri) prefixes.setdefault(prefix, []).append(uri)
@ -596,14 +597,14 @@ class NamespaceFlattener(object):
tagname = tag.localname tagname = tag.localname
tagns = tag.namespace tagns = tag.namespace
if tagns: if tagns and tagns != default[-1]:
if tagns in namespaces: if tagns in namespaces:
prefix = namespaces[tagns][-1] prefix = namespaces[tagns][-1]
if prefix: if prefix:
tagname = u'%s:%s' % (prefix, tagname) tagname = u'%s:%s' % (prefix, tagname)
else: else:
_push_ns_attr((u'xmlns', tagns)) _push_ns_attr((u'xmlns', tagns))
_push_ns('', tagns) default.push(tagns)
new_attrs = [] new_attrs = []
for attr, value in attrs: for attr, value in attrs:
@ -626,7 +627,7 @@ class NamespaceFlattener(object):
elif kind is END: elif kind is END:
tagname = data.localname tagname = data.localname
tagns = data.namespace tagns = data.namespace
if tagns: if tagns and tagns != default[-1]:
prefix = namespaces[tagns][-1] prefix = namespaces[tagns][-1]
if prefix: if prefix:
tagname = u'%s:%s' % (prefix, tagname) tagname = u'%s:%s' % (prefix, tagname)
@ -634,12 +635,19 @@ class NamespaceFlattener(object):
elif kind is START_NS: elif kind is START_NS:
prefix, uri = data prefix, uri = data
if uri not in namespaces: push_attr = False
prefix = prefixes.get(uri, [prefix])[-1] if prefix is '' and default[-1] != uri:
default.append(uri)
_push_ns_attr(_make_ns_attr(prefix, uri)) _push_ns_attr(_make_ns_attr(prefix, uri))
elif uri not in namespaces:
prefix = namespaces.get(uri, [prefix])[-1]
_push_ns_attr(_make_ns_attr(prefix, uri))
if prefix is not '':
_push_ns(prefix, uri) _push_ns(prefix, uri)
elif kind is END_NS: elif kind is END_NS:
if data is '':
default.pop()
if data in prefixes: if data in prefixes:
uris = prefixes.get(data) uris = prefixes.get(data)
uri = uris.pop() uri = uris.pop()