OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-05 18:16:23 +03:00
Code Packages Releases Activity

0031795: Documentation - OCCDoc_ProcessSvg uses syntax incompatible with Inkscape 1.0

Browse Source 
Detect old/new Inkscape version and pass arguments correspondingly.
This commit is contained in:
kgv 2020-09-25 15:23:46 +03:00 committed by bugmaster
parent 68922bccc4
commit 9211c8ffbc
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
adm/occaux.tcl
View File

@ -179,8 +179,10 @@ proc OCCDoc_DetectNecessarySoftware { DOXYGEN_PATH GRAPHVIZ_PATH INKSCAPE_PATH H
} }
if {"$is_win" == "yes"} { if {"$is_win" == "yes"} {
set exe ".exe" set exe ".exe"
set com ".com"
} else { } else {
set exe "" set exe ""
set com ""
} }
set g_flag "no" set g_flag "no"
@ -224,11 +226,11 @@ proc OCCDoc_DetectNecessarySoftware { DOXYGEN_PATH GRAPHVIZ_PATH INKSCAPE_PATH H
} }
} }
if {$i_flag == "no"} { if {$i_flag == "no"} {
if { [file exists $path/inkscape$exe] } { if { [file exists $path/inkscape$com] } {
catch { exec $path/inkscape -V } version catch { exec $path/inkscape -V } version
puts "Info: $version " puts "Info: $version "
puts " found in $path." puts " found in $path."
set inkscape_path "$path/inkscape$exe" set inkscape_path "$path/inkscape$com"
set i_flag "yes" set i_flag "yes"
} }
} }
@ -356,15 +358,29 @@ proc OCCDoc_DetectNecessarySoftware { DOXYGEN_PATH GRAPHVIZ_PATH INKSCAPE_PATH H
# Convert SVG files to PDF format to allow including them to PDF # Convert SVG files to PDF format to allow including them to PDF
# (requires InkScape to be in PATH) # (requires InkScape to be in PATH)
proc OCCDoc_ProcessSvg {latexDir verboseMode} { proc OCCDoc_ProcessSvg {latexDir verboseMode} {
set anSvgList [glob -nocomplain $latexDir/*.svg]
if { $anSvgList == {} } {
return
}
foreach file [glob -nocomplain $latexDir/*.svg] { catch { exec inkscape -V } anInkVer
set isOldSyntax 0
if {[string match "Inkscape 0.*" $anInkVer]} { set isOldSyntax 1 }
foreach file $anSvgList {
if {$verboseMode == "YES"} { if {$verboseMode == "YES"} {
puts "Info: Converting file $file..." puts "Info: Converting file $file..."
} }
set pdffile "[file rootname $file].pdf" set pdffile "[file rootname $file].pdf"
if { [catch {exec inkscape -z -D --file=$file --export-pdf=$pdffile} res] } { if { $isOldSyntax == 1 } {
#puts "Error: $res." if { [catch {exec inkscape -z -D --file=$file --export-pdf=$pdffile} res] } {
return #puts "Error: $res."
return
}
} else {
if { [catch {exec inkscape $file --export-area-drawing --export-type=pdf --export-filename=$pdffile} res] } {
#puts "Error: $res."
return
}
} }
} }
} }