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

Split inkscape_cl (command line) from inkscape_gui (GUI program)

Browse Source 
On Windows, these are two different binaries, and one fails to do the
tasks of the other. On all other OSes, the two are the same.

Fixes: #10805
(cherry picked from commit 65b44311f3)
This commit is contained in:
Juergen Spitzmueller 2017-11-27 18:59:51 +01:00
parent 19768421d3
commit c3b59bd67b
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
lib/configure.py
View File

@ -513,12 +513,12 @@ def checkInkscape():
try: try:
aKey = winreg.OpenKey(aReg, r"inkscape.svg\DefaultIcon") aKey = winreg.OpenKey(aReg, r"inkscape.svg\DefaultIcon")
val = winreg.QueryValueEx(aKey, "") val = winreg.QueryValueEx(aKey, "")
return str(val[0]).split('"')[1].replace('.exe', '') return str(val[0]).split('"')[1]
except EnvironmentError: except EnvironmentError:
try: try:
aKey = winreg.OpenKey(aReg, r"Applications\inkscape.exe\shell\open\command") aKey = winreg.OpenKey(aReg, r"Applications\inkscape.exe\shell\open\command")
val = winreg.QueryValueEx(aKey, "") val = winreg.QueryValueEx(aKey, "")
return str(val[0]).split('"')[1].replace('.exe', '') return str(val[0]).split('"')[1]
except EnvironmentError: except EnvironmentError:
return 'inkscape' return 'inkscape'
@ -612,7 +612,7 @@ def checkFormatEntries(dtl_tools):
checkViewerEditor('a FEN viewer and editor', ['xboard -lpf $$i -mode EditPosition'], checkViewerEditor('a FEN viewer and editor', ['xboard -lpf $$i -mode EditPosition'],
rc_entry = [r'\Format fen fen FEN "" "%%" "%%" "" ""']) rc_entry = [r'\Format fen fen FEN "" "%%" "%%" "" ""'])
# #
checkViewerEditor('a SVG viewer and editor', [inkscape_name], checkViewerEditor('a SVG viewer and editor', [inkscape_gui],
rc_entry = [r'''\Format svg "svg" SVG "" "%%" "%%" "vector" "image/svg+xml" rc_entry = [r'''\Format svg "svg" SVG "" "%%" "%%" "vector" "image/svg+xml"
\Format svgz "svgz" "SVG (compressed)" "" "%%" "%%" "vector,zipped=native" ""'''], \Format svgz "svgz" "SVG (compressed)" "" "%%" "%%" "vector,zipped=native" ""'''],
path = [inkscape_path]) path = [inkscape_path])
@ -993,11 +993,11 @@ def checkConverterEntries():
\converter fig pdftex "python -tt $$s/scripts/fig2pdftex.py $$i $$o" "" \converter fig pdftex "python -tt $$s/scripts/fig2pdftex.py $$i $$o" ""
\converter fig pstex "python -tt $$s/scripts/fig2pstex.py $$i $$o" ""''') \converter fig pstex "python -tt $$s/scripts/fig2pstex.py $$i $$o" ""''')
# #
checkProg('a SVG -> PDFTeX converter', [inkscape_name], checkProg('a SVG -> PDFTeX converter', [inkscape_cl],
rc_entry = [ r'\converter svg pdftex "python -tt $$s/scripts/svg2pdftex.py %% $$p$$i $$p$$o" ""'], rc_entry = [ r'\converter svg pdftex "python -tt $$s/scripts/svg2pdftex.py %% $$p$$i $$p$$o" ""'],
path = [inkscape_path]) path = [inkscape_path])
# #
checkProg('a SVG -> PSTeX converter', [inkscape_name], checkProg('a SVG -> PSTeX converter', [inkscape_cl],
rc_entry = [ r'\converter svg pstex "python -tt $$s/scripts/svg2pstex.py %% $$p$$i $$p$$o" ""'], rc_entry = [ r'\converter svg pstex "python -tt $$s/scripts/svg2pstex.py %% $$p$$i $$p$$o" ""'],
path = [inkscape_path]) path = [inkscape_path])
# #
@ -1010,18 +1010,18 @@ def checkConverterEntries():
\converter tgif png "tgif -print -color -png -o $$d $$i" "" \converter tgif png "tgif -print -color -png -o $$d $$i" ""
\converter tgif pdf6 "tgif -print -color -pdf -stdout $$i > $$o" ""''']) \converter tgif pdf6 "tgif -print -color -pdf -stdout $$i > $$o" ""'''])
# #
checkProg('a WMF -> EPS converter', ['metafile2eps $$i $$o', 'wmf2eps -o $$o $$i', inkscape_name + ' --file=%s$$i --export-area-drawing --without-gui --export-eps=%s$$o' checkProg('a WMF -> EPS converter', ['metafile2eps $$i $$o', 'wmf2eps -o $$o $$i', inkscape_cl + ' --file=%s$$i --export-area-drawing --without-gui --export-eps=%s$$o'
% (inkscape_fileprefix, inkscape_fileprefix)], % (inkscape_fileprefix, inkscape_fileprefix)],
rc_entry = [ r'\converter wmf eps "%%" ""']) rc_entry = [ r'\converter wmf eps "%%" ""'])
# #
checkProg('an EMF -> EPS converter', ['metafile2eps $$i $$o', inkscape_name + ' --file=%s$$i --export-area-drawing --without-gui --export-eps=%s$$o' checkProg('an EMF -> EPS converter', ['metafile2eps $$i $$o', inkscape_cl + ' --file=%s$$i --export-area-drawing --without-gui --export-eps=%s$$o'
% (inkscape_fileprefix, inkscape_fileprefix)], % (inkscape_fileprefix, inkscape_fileprefix)],
rc_entry = [ r'\converter emf eps "%%" ""']) rc_entry = [ r'\converter emf eps "%%" ""'])
# #
checkProg('a WMF -> PDF converter', [inkscape_name + ' --file=%s$$i --export-area-drawing --without-gui --export-pdf=%s$$o' % (inkscape_fileprefix, inkscape_fileprefix)], checkProg('a WMF -> PDF converter', [inkscape_cl + ' --file=%s$$i --export-area-drawing --without-gui --export-pdf=%s$$o' % (inkscape_fileprefix, inkscape_fileprefix)],
rc_entry = [ r'\converter wmf pdf6 "%%" ""']) rc_entry = [ r'\converter wmf pdf6 "%%" ""'])
# #
checkProg('an EMF -> PDF converter', [inkscape_name + ' --file=%s$$i --export-area-drawing --without-gui --export-pdf=%s$$o' % (inkscape_fileprefix, inkscape_fileprefix)], checkProg('an EMF -> PDF converter', [inkscape_cl + ' --file=%s$$i --export-area-drawing --without-gui --export-pdf=%s$$o' % (inkscape_fileprefix, inkscape_fileprefix)],
rc_entry = [ r'\converter emf pdf6 "%%" ""']) rc_entry = [ r'\converter emf pdf6 "%%" ""'])
# Only define a converter to pdf6 for graphics # Only define a converter to pdf6 for graphics
checkProg('an EPS -> PDF converter', ['epstopdf'], checkProg('an EPS -> PDF converter', ['epstopdf'],
@ -1067,19 +1067,19 @@ def checkConverterEntries():
rc_entry = [ r'\converter svg svgz "%%" ""']) rc_entry = [ r'\converter svg svgz "%%" ""'])
# Only define a converter to pdf6 for graphics # Only define a converter to pdf6 for graphics
# Prefer rsvg-convert over inkscape since it is faster (see http://www.lyx.org/trac/ticket/9891) # Prefer rsvg-convert over inkscape since it is faster (see http://www.lyx.org/trac/ticket/9891)
checkProg('a SVG -> PDF converter', ['rsvg-convert -f pdf -o $$o $$i', inkscape_name + ' --file=%s$$i --export-area-drawing --without-gui --export-pdf=%s$$o' checkProg('a SVG -> PDF converter', ['rsvg-convert -f pdf -o $$o $$i', inkscape_cl + ' --file=%s$$i --export-area-drawing --without-gui --export-pdf=%s$$o'
% (inkscape_fileprefix, inkscape_fileprefix)], % (inkscape_fileprefix, inkscape_fileprefix)],
rc_entry = [ r'''\converter svg pdf6 "%%" "" rc_entry = [ r'''\converter svg pdf6 "%%" ""
\converter svgz pdf6 "%%" ""'''], \converter svgz pdf6 "%%" ""'''],
path = ['', inkscape_path]) path = ['', inkscape_path])
# #
checkProg('a SVG -> EPS converter', ['rsvg-convert -f ps -o $$o $$i', inkscape_name + ' --file=%s$$i --export-area-drawing --without-gui --export-eps=%s$$o' checkProg('a SVG -> EPS converter', ['rsvg-convert -f ps -o $$o $$i', inkscape_cl + ' --file=%s$$i --export-area-drawing --without-gui --export-eps=%s$$o'
% (inkscape_fileprefix, inkscape_fileprefix)], % (inkscape_fileprefix, inkscape_fileprefix)],
rc_entry = [ r'''\converter svg eps "%%" "" rc_entry = [ r'''\converter svg eps "%%" ""
\converter svgz eps "%%" ""'''], \converter svgz eps "%%" ""'''],
path = ['', inkscape_path]) path = ['', inkscape_path])
# #
checkProg('a SVG -> PNG converter', ['rsvg-convert -f png -o $$o $$i', inkscape_name + ' --without-gui --file=%s$$i --export-png=%s$$o' checkProg('a SVG -> PNG converter', ['rsvg-convert -f png -o $$o $$i', inkscape_cl + ' --without-gui --file=%s$$i --export-png=%s$$o'
% (inkscape_fileprefix, inkscape_fileprefix)], % (inkscape_fileprefix, inkscape_fileprefix)],
rc_entry = [ r'''\converter svg png "%%" "", rc_entry = [ r'''\converter svg png "%%" "",
\converter svgz png "%%" ""'''], \converter svgz png "%%" ""'''],
@ -1850,7 +1850,12 @@ Format %i
# check java and perl before any checkProg that may require them # check java and perl before any checkProg that may require them
java = checkProg('a java interpreter', ['java'])[1] java = checkProg('a java interpreter', ['java'])[1]
perl = checkProg('a perl interpreter', ['perl'])[1] perl = checkProg('a perl interpreter', ['perl'])[1]
(inkscape_path, inkscape_name) = os.path.split(checkInkscape()) (inkscape_path, inkscape_gui) = os.path.split(checkInkscape())
# On Windows, we need to call the "inkscape.com" wrapper
# for command line purposes. Other OSes do not differentiate.
inkscape_cl = inkscape_gui
if os.name == 'nt':
inkscape_cl = inkscape_gui.replace('.exe', '.com')
# On MacOSX, Inkscape requires full path file arguments. This # On MacOSX, Inkscape requires full path file arguments. This
# is not needed on Linux and Win and even breaks the latter. # is not needed on Linux and Win and even breaks the latter.
inkscape_fileprefix = "" inkscape_fileprefix = ""