From 64f6ef59da37e7dfcaedbc874997dd5cc56ed813 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 17 Jun 2016 22:15:40 +0000 Subject: luaotfload (17jun16) git-svn-id: svn://tug.org/texlive/trunk@41471 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/texlive/linked_scripts/epstopdf/epstopdf.pl | 11 ++++++++--- .../texlive/linked_scripts/luaotfload/luaotfload-tool.lua | 7 ++++--- 2 files changed, 12 insertions(+), 6 deletions(-) (limited to 'Build') diff --git a/Build/source/texk/texlive/linked_scripts/epstopdf/epstopdf.pl b/Build/source/texk/texlive/linked_scripts/epstopdf/epstopdf.pl index 697127cdff5..f1cc7fba400 100755 --- a/Build/source/texk/texlive/linked_scripts/epstopdf/epstopdf.pl +++ b/Build/source/texk/texlive/linked_scripts/epstopdf/epstopdf.pl @@ -34,9 +34,11 @@ # "%%BoundingBox: (atend)" when input is not seekable (e.g., from a pipe), # # emacs-page -my $ver = "2.24"; +my $ver = "2.25"; # History +# 2016/06/16 v2.25 (Norbert Preining) +# * fix device handling # 2016/05/28 v2.24 (Karl Berry) # * new option --gray; patch from William Bader, # tex-k mail 9 Feb 2016 19:37:08. @@ -205,7 +207,7 @@ my $default_device = 'pdfwrite'; $::opt_autorotate = "None"; $::opt_compress = 1; $::opt_debug = 0; -$::opt_device = $default_device; +$::opt_device = ""; $::opt_embed = 1; $::opt_exact = 0; $::opt_filter = 0; @@ -360,7 +362,7 @@ Options for Ghostscript: recognized VAL choices: None, All, PageByPage; for EPS files, PageByPage is equivalent to All. --(no)compress use compression (default: $bool[$::opt_compress]) - --device=DEV use -sDEVICE=DEV (default: $::opt_device) + --device=DEV use -sDEVICE=DEV (default: $default_device) --(no)embed embed fonts (default: $bool[$::opt_embed]) --(no)gray grayscale output (default: $bool[$::opt_gray]) --pdfsettings=VAL use -dPDFSETTINGS=/VAL (default is prepress if --embed, @@ -527,7 +529,10 @@ if ($::opt_device) { } else { debug "Switching from $default_device to $::opt_device"; } +} else { + $::opt_device = $default_device; } + push @GS, "-sDEVICE=$::opt_device"; ### option outfile diff --git a/Build/source/texk/texlive/linked_scripts/luaotfload/luaotfload-tool.lua b/Build/source/texk/texlive/linked_scripts/luaotfload/luaotfload-tool.lua index 35dc9b3d143..bc9e425cb5d 100755 --- a/Build/source/texk/texlive/linked_scripts/luaotfload/luaotfload-tool.lua +++ b/Build/source/texk/texlive/linked_scripts/luaotfload/luaotfload-tool.lua @@ -145,8 +145,6 @@ require "fontloader-fonts-enc" require "fontloader-font-cid" require "fontloader-font-map" require "fontloader-font-tfm" -require "fontloader-font-afm" -require "fontloader-font-afk" require "fontloader-font-oti" require "fontloader-font-otr" require "fontloader-font-cff" @@ -159,6 +157,9 @@ require "fontloader-font-oto" ------- "fontloader-font-ota" ------- "fontloader-font-ots" ------- "fontloader-font-osd" +require "fontloader-font-onr" +require "fontloader-font-one" +require "fontloader-font-afk" require "fontloader-font-lua" require "fontloader-font-def" require "fontloader-fonts-ext" @@ -797,7 +798,7 @@ actions.blacklist = function (job) end actions.generate = function (job) - local _ = fonts.names.update (fontnames, job.force_reload, job.dry_run) + local _ = fonts.names.update ({ }, job.force_reload, job.dry_run) local namedata = fonts.names.data () if namedata then logreport ("info", 2, "db", -- cgit v1.2.3