summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-01-13 21:30:36 +0000
committerKarl Berry <karl@freefriends.org>2020-01-13 21:30:36 +0000
commitce9eb3564e7376e4452732aef5229a8461f52a09 (patch)
tree421c616b3d0f26ddc6e20e28345c9bd680028708 /Build
parenta61c6cf82707ad0e3aab14106179ce8d199284ce (diff)
l3 (13jan20)
git-svn-id: svn://tug.org/texlive/trunk@53394 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/epspdf/epspdf.tlu17
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/epspdf/epspdftk.tcl65
2 files changed, 50 insertions, 32 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/epspdf/epspdf.tlu b/Build/source/texk/texlive/linked_scripts/epspdf/epspdf.tlu
index 0007ade0742..1dba171bf18 100755
--- a/Build/source/texk/texlive/linked_scripts/epspdf/epspdf.tlu
+++ b/Build/source/texk/texlive/linked_scripts/epspdf/epspdf.tlu
@@ -11,8 +11,10 @@ epspdf conversion utility
0.6.3: compatibility fixes for luatex 0.9x
0.6.4: adaptations for newer versions of LuaTeX and ghostscript;
some refactoring; better handling of some corner cases
+0.6.5: eliminate .setpdfwrite from ghostscript commandlines,
+ since this is now considered obsolete
-Copyright (C) 2006-2019 Siep Kroonenberg
+Copyright (C) 2006-2020 Siep Kroonenberg
siepo at bitmuis nl
@@ -1895,17 +1897,13 @@ function any_to_any()
-- `distiller' settings
-- these depend on whether final output is pdf
- -- '.setpdfwrite' is just some optimization option for ghostscript
if options.type=='pdf' then
if settings.pdf_target and (settings.pdf_target~='default') then
table.insert(pdf_options, '-dPDFSETTINGS#/'..settings.pdf_target)
end
- if settings.pdf_target=='screen' or settings.pdf_target=='ebook' then
- pdf_tail_options = {'-c', '.setpdfwrite', '-f'}
- -- -f ensures that the input filename is not added to the -c string
- else
+ if settings.pdf_target~='screen' and settings.pdf_target~='ebook' then
pdf_tail_options = {
- '-c', '.setpdfwrite <</NeverEmbed [ ] >> setdistillerparams', '-f'}
+ '-c', '<</NeverEmbed [ ] >> setdistillerparams', '-f'}
end
end
@@ -2228,7 +2226,7 @@ descriptions.use_pdftops = 'Use pdftops if available'
settings.ps_viewer = false
descriptions.ps_viewer =
- 'Epspdftk: viewer for PostScript files; not used on Windows or OS X'
+ 'Epspdftk: viewer for PostScript files; not used on Windows or Mac OS'
settings.pdf_viewer = false
descriptions.pdf_viewer =
@@ -2271,7 +2269,8 @@ gs_options = {'-q', '-dNOPAUSE', '-dBATCH', '-P-', '-dSAFER'}
pdf_options = {'-sDEVICE#pdfwrite'} -- '-dUseCIEColor' causes serious slowdown
-- options for final conversion to pdf;
-- will be completed after reading settings and options
-pdf_tail_options = {'-c', '.setpdfwrite', '-f'}
+-- -f ensures that the input filename is not added to a -c string
+pdf_tail_options = {'-f'}
gray_options = {'-dProcessColorModel#/DeviceGray',
'-sColorConversionStrategy#Gray'}
diff --git a/Build/source/texk/texlive/linked_scripts/epspdf/epspdftk.tcl b/Build/source/texk/texlive/linked_scripts/epspdf/epspdftk.tcl
index 26ed17efcfd..5ea94b6f037 100755
--- a/Build/source/texk/texlive/linked_scripts/epspdf/epspdftk.tcl
+++ b/Build/source/texk/texlive/linked_scripts/epspdf/epspdftk.tcl
@@ -3,7 +3,7 @@
# epspdf conversion utility, GUI frontend
#####
-# Copyright (C) 2006-2019 Siep Kroonenberg
+# Copyright (C) 2006-2020 Siep Kroonenberg
# siepo at bitmuis dot nl
#
# This program is free software, licensed under the GNU GPL, >=2.0.
@@ -130,34 +130,38 @@ proc getsettings {} {
}
# unix: viewer settings
+ # It may depend on installed plugins whether a pdf viewer
+ # can render postscript.
+ # AFAIK, no such plugins exist for xpdf or mupdf.
+ # chrome and firefox also only render pdf and not postscript.
# configured viewer, if valid, heads the list
if {$::classic_unix} {
- set ::ps_viewers {}
- if {$::settings(ps_viewer) ne "" && [is_prog $::settings(ps_viewer)]} {
- lappend ::ps_viewers $::settings(ps_viewer)
- }
- foreach v {evince okular gv qpdfview} {
- if {$v ne $::settings(ps_viewer) && [is_prog $v]} {
- lappend ::ps_viewers $v
- }
- }
- # puts [join $::ps_viewers " "]
-
set ::pdf_viewers {}
if {$::settings(pdf_viewer) ne "" && [is_prog $::settings(pdf_viewer)]} {
lappend ::pdf_viewers $::settings(pdf_viewer)
}
- foreach v {evince okular mupdf qpdfview texworks xpdf zathura} {
+ foreach v {
+ atril evince okular qpdfview mupdf xpdf zathura gv firefox chrome \
+ chromium chromium-browser} {
if {$v ne $::settings(pdf_viewer) && [is_prog $v]} {
lappend ::pdf_viewers $v
}
}
# puts [join $::pdf_viewers " "]
- if {[llength ::pdf_viewers] == 0 && [llength ::ps_viewers] != 0} {
- lappend ::pdf_viewers [lindex $::ps_viewers 0]
+ set ::ps_viewers {}
+ if {$::settings(ps_viewer) ne "" && [is_prog $::settings(ps_viewer)]} {
+ lappend ::ps_viewers $::settings(ps_viewer)
+ }
+ foreach v $::pdf_viewers {
+ if {$v ne $::settings(ps_viewer) && \
+ $v ni {xpdf mupdf firefox chrome chromium chromium-browser}} {
+ lappend ::ps_viewers $v
+ }
}
+ # puts [join $::ps_viewers " "]
+
if {[llength ::pdf_viewers] == 0} {
tk_messageBox -message "No viewers found"
} elseif {[llength ::ps_viewers] == 0} {
@@ -227,19 +231,30 @@ proc ppack {b args} {pack $b {*}$args -padx 3 -pady 3}
font create bfont {*}[font configure TkDefaultFont]
font configure bfont -weight bold
-proc update_combo {w vls} {
- upvar $vls vs
+proc update_combo w {
+ # check that a manually supplied entry is actually a program
+ # proc used for postscript- and pdf viewers
+ set vls [$w cget -values]
set new [$w get]
- if {$new ni $vs} {
+ if {$new ni $vls} {
if {[is_prog $new]} {
- set vs [linsert $vs 0 $new]
- $w configure -values $vs
+ set vls [linsert $vls 0 $new]
+ $w configure -values $vls
} else {
- tk_messageBox -title Error -icon error -message "$vl Not a program"
+ tk_messageBox -title Error -icon error -message "$new not a program"
+ raise .config_t
+ focus $w
}
}
}
+proc revert_combo w {
+ # aborts entry of new value
+ if {[$w current] < 0} {
+ $w current 0
+ }
+}
+
### and now the actual GUI ###################################
wm title . "PostScript- and pdf conversions"
@@ -319,11 +334,15 @@ if {$::classic_unix} {
grid [ttk::combobox .config_t.viewf.pdf] -row 1 -column 1 -sticky e
.config_t.viewf.pdf configure -values $::pdf_viewers
.config_t.viewf.pdf configure -textvariable ::settings(pdf_viewer)
- bind .config_t.viewf.pdf <Return> {update_combo %W $::pdf_viewers}
+ bind .config_t.viewf.pdf <Escape> {revert_combo %W}
+ bind .config_t.viewf.pdf <Return> {update_combo %W}
+ bind .config_t.viewf.pdf <FocusOut> {update_combo %W}
grid [ttk::combobox .config_t.viewf.ps] -row 2 -column 1 -sticky e
.config_t.viewf.ps configure -values $::ps_viewers
.config_t.viewf.ps configure -textvariable ::settings(ps_viewer)
- bind .config_t.viewf.ps <Return> {update_combo %W $::ps_viewers}
+ bind .config_t.viewf.ps <Escape> {revert_combo %W}
+ bind .config_t.viewf.ps <Return> {update_combo %W}
+ bind .config_t.viewf.ps <FocusOut> {update_combo %W}
grid columnconfigure .config_t.viewf 1 -weight 1 -pad 2
}