anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 10:00:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix command line output of convertDefault.py for ImageMagick

Browse Source 
Part of #11186
This commit is contained in:
Juergen Spitzmueller 2018-07-13 10:20:26 +02:00
parent 0148ef7e6c
commit 1e5acc5656
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/scripts/convertDefault.py
View File

@ -56,21 +56,24 @@ else:
if version != None:
gm = True
# IM >= 5.5.8 separates options for source and target files
# See http://www.imagemagick.org/Usage/basics/#why
if im or gm:
opts = "-depth 8"
sopts = "-depth 8"
topts = ""
elif sys.platform == 'darwin':
command = 'lyxconvert'
# If supported, add the -define option for pdf source formats
if sys.argv[1] == 'pdf' and (version >= 0x060206 or gm):
opts = '-define pdf:use-cropbox=true ' + opts
sopts = '-define pdf:use-cropbox=true ' + sopts
# If supported, add the -flatten option for ppm target formats (see bug 4749)
if sys.argv[3] == 'ppm' and (im and version >= 0x060305 or gm):
opts = opts + ' -flatten'
topts = '-flatten'
# print (command, sys.argv[2], sys.argv[4], file= sys.stdout)
if (im or gm) and os.system(r'%s %s "%s" "%s"' % (command, opts, sys.argv[2], sys.argv[3] + ':' + sys.argv[4])) != 0:
if (im or gm) and os.system(r'%s %s "%s" %s "%s"' % (command, sopts, sys.argv[2], topts, sys.argv[3] + ':' + sys.argv[4])) != 0:
print (sys.argv[0], 'ERROR', file= sys.stderr)
print ('Execution of "%s" failed.' % command, file= sys.stderr)
sys.exit(1)