Fix command line output of convertDefault.py for ImageMagick

Part of #11186

(cherry picked from commit 1e5acc5656431e124cd404d49274edc272c4eb1e)

diff --git a/lib/scripts/convertDefault.py b/lib/scripts/convertDefault.py
index 9a460b7cf3031e11495f3f68a24e35831ae4dd3d..8678965013a5aa22b0d0d73ab1c3779efebab848 100644 (file)
--- a/lib/scripts/convertDefault.py
+++ b/lib/scripts/convertDefault.py
@@ -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)

diff --git a/status.23x b/status.23x
index 37799e5d37c11622821282755a5b9ebe32a5f3b4..08ba261e68de41d6b27eb87f0598a7051304e891 100644 (file)
--- a/status.23x
+++ b/status.23x
@@ -29,6 +29,8 @@ What's new
 
 - Center longtable explicitly for compatibility with some packages (bug 10690).
 
+- Fix problems with default conversion script for graphics (part of bug 11186).
+
 
 * TEX2LYX IMPROVEMENTS