diff --git a/src/libprs500/__init__.py b/src/libprs500/__init__.py index 2de5e73d78..14e097cfb5 100644 --- a/src/libprs500/__init__.py +++ b/src/libprs500/__init__.py @@ -13,7 +13,7 @@ ## with this program; if not, write to the Free Software Foundation, Inc., ## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ''' E-book management software''' -__version__ = "0.3.58" +__version__ = "0.3.59" __docformat__ = "epytext" __author__ = "Kovid Goyal " __appname__ = 'libprs500' diff --git a/src/libprs500/ebooks/lrf/html/convert_from.py b/src/libprs500/ebooks/lrf/html/convert_from.py index 143bf760b0..7d356712ed 100644 --- a/src/libprs500/ebooks/lrf/html/convert_from.py +++ b/src/libprs500/ebooks/lrf/html/convert_from.py @@ -1149,7 +1149,7 @@ def process_file(path, options): cim.save(cf.name) cpath = cf.name th = PRS500.THUMBNAIL_HEIGHT - tim = im.resize((int(0.75*th), th), PILImage.ANTIALIAS) + tim = im.resize((int(0.75*th), th), PILImage.ANTIALIAS).convert('RGB') tf = PersistentTemporaryFile(prefix="html2lrf_", suffix=".jpg") tf.close() tim.save(tf.name) diff --git a/upload.py b/upload.py index 665af7d6ff..68276ccce9 100644 --- a/upload.py +++ b/upload.py @@ -68,7 +68,11 @@ def upload_demo(): f.write(open(os.path.join(HTML2LRF, 'demo.html')).read()) f.write('\n') f.close() - check_call('''html2lrf --title='Demonstration of html2lrf' --author='Kovid Goyal' --header --output=/tmp/html2lrf.lrf %s/demo.html'''%(HTML2LRF,)) + check_call('''html2lrf --title='Demonstration of html2lrf' --author='Kovid Goyal' ''' + '''--header --output=/tmp/html2lrf.lrf %s/demo.html ''' + '''--serif-family "/usr/share/fonts/corefonts, Times New Roman" ''' + '''--mono-family "/usr/share/fonts/corefonts, Andale Mono" ''' + ''''''%(HTML2LRF,)) check_call('''scp /tmp/html2lrf.lrf castalia:%s/'''%(DOWNLOADS,)) check_call('''txt2lrf -t 'Demonstration of txt2lrf' -a 'Kovid Goyal' --header -o /tmp/txt2lrf.lrf %s/demo.txt'''%(TXT2LRF,) ) check_call('''scp /tmp/txt2lrf.lrf castalia:%s/'''%(DOWNLOADS,))