Adapt all German and English manuals to new index features

[features.git] / lib / scripts / convertDefault.py

diff --git a/lib/scripts/convertDefault.py b/lib/scripts/convertDefault.py
index 8678965013a5aa22b0d0d73ab1c3779efebab848..d04fa78799ba62f7a7f5a54a0eac8560970d15e2 100644 (file)
--- a/lib/scripts/convertDefault.py
+++ b/lib/scripts/convertDefault.py
@@ -19,23 +19,19 @@
 from __future__ import print_function
 import os, re, sys
 
-PY2 = sys.version_info[0] == 2
-
 # We may need some extra options only supported by recent convert versions
 re_version = re.compile(r'^Version:.*ImageMagick\s*(\d*)\.(\d*)\.(\d*).*$')
 # imagemagick 7
 command = 'magick'
 fout = os.popen('magick -version 2>&1')
 output = fout.readline()
-if fout.close() != None:
+if fout.close() is not None:
     # older versions
     # caution: windows has a convert.exe for converting file systems
     command = 'convert'
     fout = os.popen('convert -version 2>&1')
     output = fout.readline()
     fout.close()
-if not PY2:
-    output = output.decode()
 
 version = re_version.match(output)
 
@@ -43,41 +39,45 @@ version = re_version.match(output)
 im = False
 gm = False
 
-if version != None:
+if version is not None:
     major = int(version.group(1))
     minor = int(version.group(2))
     patch = int(version.group(3))
-    version = hex(major * 65536 + minor * 256 + patch)
+    version = (major, minor, patch)
     im = True
 else:
     # Try GraphicsMagick
     re_version = re.compile(r'^GraphicsMagick.*http:..www.GraphicsMagick.org.*$')
     version = re_version.match(output)
-    if version != None:
+    if version is not None:
         gm = True
+        # we need version to be a valid integer 3-tuple
+        version = (1,0,0)
+    else:
+        version = (0,0,0)
 
 # IM >= 5.5.8 separates options for source and target files
 # See http://www.imagemagick.org/Usage/basics/#why
 if im or gm:
-    sopts = "-depth 8"
+    sopts = ""
     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):
+if sys.argv[1] == 'pdf' and (version >= (6,2,6) or gm):
     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):
+if sys.argv[3] == 'ppm' and (im and version >= (6,3,5) or gm):
     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 "%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)
+    print(sys.argv[0], 'ERROR', file= sys.stderr)
+    print('Execution of "%s" failed.' % command, file= sys.stderr)
     sys.exit(1)
 elif not im and not gm and sys.platform == 'darwin' and os.system(r'%s "%s" "%s"' % (command, sys.argv[2], sys.argv[4])) != 0:
-    print (sys.argv[0], 'ERROR', file= sys.stderr)
-    print ('Execution of "%s" failed.' % command, file= sys.stderr)
+    print(sys.argv[0], 'ERROR', file= sys.stderr)
+    print('Execution of "%s" failed.' % command, file=sys.stderr)
     sys.exit(1)