svg2*tex.py: final fixes for Windows

Fixes: #10679
This commit is contained in:
Juergen Spitzmueller 2017-09-12 07:57:29 +02:00
parent cec1a005f5
commit 5de0bf55a7
2 changed files with 8 additions and 6 deletions

View File

@ -33,8 +33,9 @@ def runCommand(cmd):
''' Utility function: ''' Utility function:
run a command, quit if fails run a command, quit if fails
''' '''
if subprocess.call(cmd) != 0: res = subprocess.check_call(cmd)
print "Command '%s' fails." % cmd if res != 0:
print "Command '%s' fails (exit code: %i)." % (res.cmd, res.returncode)
sys.exit(1) sys.exit(1)
InkscapeCmd = "inkscape" InkscapeCmd = "inkscape"
@ -65,7 +66,7 @@ OutBase = os.path.splitext(OutputFile)[0]
# while outsourcing the text to a LaTeX file ${OutBase}.pdf_tex which includes and overlays # while outsourcing the text to a LaTeX file ${OutBase}.pdf_tex which includes and overlays
# the PDF image and can be \input to LaTeX files. We rename the latter file to ${OutputFile} # the PDF image and can be \input to LaTeX files. We rename the latter file to ${OutputFile}
# (although this is probably the name it already has). # (although this is probably the name it already has).
runCommand([InkscapeCmd, '--file=%s' % (InputFile), '--export-pdf=%s.pdf' % (OutBase), '--export-latex']) runCommand([r'%s' % InkscapeCmd, '--file=%s' % InputFile, '--export-pdf=%s.pdf' % OutBase, '--export-latex'])
os.rename('%s.pdf_tex' % OutBase, OutputFile) os.rename('%s.pdf_tex' % OutBase, OutputFile)

View File

@ -36,8 +36,9 @@ def runCommand(cmd):
''' Utility function: ''' Utility function:
run a command, quit if fails run a command, quit if fails
''' '''
if subprocess.call(cmd) != 0: res = subprocess.check_call(cmd)
print "Command '%s' fails." % cmd if res != 0:
print "Command '%s' fails (exit code: %i)." % (res.cmd, res.returncode)
sys.exit(1) sys.exit(1)
InkscapeCmd = "inkscape" InkscapeCmd = "inkscape"
@ -68,7 +69,7 @@ OutBase = os.path.splitext(OutputFile)[0]
# while outsourcing the text to a LaTeX file ${OutBase}.eps_tex which includes and overlays # while outsourcing the text to a LaTeX file ${OutBase}.eps_tex which includes and overlays
# the EPS image and can be \input to LaTeX files. We rename the latter file to ${OutputFile} # the EPS image and can be \input to LaTeX files. We rename the latter file to ${OutputFile}
# (although this is probably the name it already has). # (although this is probably the name it already has).
runCommand([InkscapeCmd, '--file=%s' % (InputFile), '--export-eps=%s.eps' % (OutBase), '--export-latex']) runCommand([r'%s' % InkscapeCmd, '--file=%s' % InputFile, '--export-eps=%s.eps' % OutBase, '--export-latex'])
os.rename('%s.eps_tex' % OutBase, OutputFile) os.rename('%s.eps_tex' % OutBase, OutputFile)