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

Merge from trunk

Browse Source
This commit is contained in:
Charles Haley 2010-12-24 18:02:37 +00:00
commit 38df168f93
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
resources/default_tweaks.py
View File

@ -143,7 +143,7 @@ auto_connect_to_folder = ''
# documentation, 'Darkover' is called the value and 'My Series' is called the # documentation, 'Darkover' is called the value and 'My Series' is called the
# category. If two books have fields that generate the same collection name, # category. If two books have fields that generate the same collection name,
# then both books will be in that collection. # then both books will be in that collection.
# This set of tweaks tweak lets you specify for a standard or custom field how # This set of tweaks lets you specify for a standard or custom field how
# the collections are to be named. You can use it to add a description to a # the collections are to be named. You can use it to add a description to a
# standard field, for example 'Foo (Tag)' instead of the 'Foo'. You can also use # standard field, for example 'Foo (Tag)' instead of the 'Foo'. You can also use
# it to force multiple fields to end up in the same collection. For example, you # it to force multiple fields to end up in the same collection. For example, you
@ -288,4 +288,4 @@ locale_for_sorting = ''
# Set whether to use one or two columns for custom metadata when editing # Set whether to use one or two columns for custom metadata when editing
# metadata one book at a time. If True, then the fields are laid out using two # metadata one book at a time. If True, then the fields are laid out using two
# columns. If False, one column is used. # columns. If False, one column is used.
metadata_single_use_2_cols_for_custom_fields = True metadata_single_use_2_cols_for_custom_fields = True

5
src/calibre/ebooks/mobi/mobiml.py
View File

@ -468,8 +468,9 @@ class MobiMLizer(object):
vtag.append(child) vtag.append(child)
else: else:
break break
for child in vbstate.para: if vbstate.para is not None:
vtag.append(child) for child in vbstate.para:
vtag.append(child)
return return
if text or tag in CONTENT_TAGS or tag in NESTABLE_TAGS: if text or tag in CONTENT_TAGS or tag in NESTABLE_TAGS: