From 216c27bb3c8d45d9d72ff3f5d0d72eb0557a3abe Mon Sep 17 00:00:00 2001 From: John Schember Date: Sat, 5 Dec 2009 15:45:23 -0500 Subject: [PATCH] PML Input: Don't use id as title for footnotes and sidebars. --- src/calibre/ebooks/pml/pmlconverter.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/calibre/ebooks/pml/pmlconverter.py b/src/calibre/ebooks/pml/pmlconverter.py index 2d85a6b251..3484be5927 100644 --- a/src/calibre/ebooks/pml/pmlconverter.py +++ b/src/calibre/ebooks/pml/pmlconverter.py @@ -45,12 +45,12 @@ class PML_HTMLizer(object): STATES_VALUE_REQ = [ 'a', 'T', + 'FN', + 'SB', ] STATES_VALUE_REQ_2 = [ 'ra', - 'FN', - 'SB', ] STATES_CLOSE_VALUE_REQ = [ @@ -79,8 +79,8 @@ class PML_HTMLizer(object): 'b': ('', ''), 'l': ('', ''), 'k': ('', ''), - 'FN': ('

%s

', '

return
'), - 'SB': ('

%s

', '

return
'), + 'FN': ('

', '

<return
'), + 'SB': ('

', '

return
'), } CODE_STATES = { @@ -561,7 +561,7 @@ def pml_to_html(pml): def footnote_sidebar_to_html(pre_id, id, pml): id = id.strip('\x01') - html = '

%s

%s

return
' % (pre_id, id, id, pml_to_html(pml), pre_id, id) + html = '

%s

return
' % (pre_id, id, pml_to_html(pml), pre_id, id) return html def footnote_to_html(id, pml):