head 1.8; access; symbols pkgsrc-2020Q1:1.7.0.18 pkgsrc-2020Q1-base:1.7 pkgsrc-2019Q4:1.7.0.40 pkgsrc-2019Q4-base:1.7 pkgsrc-2019Q3:1.7.0.36 pkgsrc-2019Q3-base:1.7 pkgsrc-2019Q2:1.7.0.34 pkgsrc-2019Q2-base:1.7 pkgsrc-2019Q1:1.7.0.32 pkgsrc-2019Q1-base:1.7 pkgsrc-2018Q4:1.7.0.30 pkgsrc-2018Q4-base:1.7 pkgsrc-2018Q3:1.7.0.28 pkgsrc-2018Q3-base:1.7 pkgsrc-2018Q2:1.7.0.26 pkgsrc-2018Q2-base:1.7 pkgsrc-2018Q1:1.7.0.24 pkgsrc-2018Q1-base:1.7 pkgsrc-2017Q4:1.7.0.22 pkgsrc-2017Q4-base:1.7 pkgsrc-2017Q3:1.7.0.20 pkgsrc-2017Q3-base:1.7 pkgsrc-2017Q2:1.7.0.16 pkgsrc-2017Q2-base:1.7 pkgsrc-2017Q1:1.7.0.14 pkgsrc-2017Q1-base:1.7 pkgsrc-2016Q4:1.7.0.12 pkgsrc-2016Q4-base:1.7 pkgsrc-2016Q3:1.7.0.10 pkgsrc-2016Q3-base:1.7 pkgsrc-2016Q2:1.7.0.8 pkgsrc-2016Q2-base:1.7 pkgsrc-2016Q1:1.7.0.6 pkgsrc-2016Q1-base:1.7 pkgsrc-2015Q4:1.7.0.4 pkgsrc-2015Q4-base:1.7 pkgsrc-2015Q3:1.7.0.2 pkgsrc-2015Q3-base:1.7 pkgsrc-2015Q2:1.6.0.2 pkgsrc-2015Q2-base:1.6 pkgsrc-2015Q1:1.4.0.12 pkgsrc-2015Q1-base:1.4 pkgsrc-2014Q4:1.4.0.10 pkgsrc-2014Q4-base:1.4 pkgsrc-2014Q3:1.4.0.8 pkgsrc-2014Q3-base:1.4 pkgsrc-2014Q2:1.4.0.6 pkgsrc-2014Q2-base:1.4 pkgsrc-2014Q1:1.4.0.4 pkgsrc-2014Q1-base:1.4 pkgsrc-2013Q4:1.4.0.2 pkgsrc-2013Q4-base:1.4 pkgsrc-2013Q3:1.3.0.8 pkgsrc-2013Q3-base:1.3 pkgsrc-2013Q2:1.3.0.6 pkgsrc-2013Q2-base:1.3 pkgsrc-2013Q1:1.3.0.4 pkgsrc-2013Q1-base:1.3 pkgsrc-2012Q4:1.3.0.2 pkgsrc-2012Q4-base:1.3 pkgsrc-2012Q3:1.2.0.2 pkgsrc-2012Q3-base:1.2 pkgsrc-2012Q2:1.1.0.6 pkgsrc-2012Q2-base:1.1 pkgsrc-2012Q1:1.1.0.4 pkgsrc-2012Q1-base:1.1 pkgsrc-2011Q4:1.1.0.2 pkgsrc-2011Q4-base:1.1; locks; strict; comment @# @; 1.8 date 2020.05.10.03.56.43; author markd; state dead; branches; next 1.7; commitid 6jxkTXO6lRjCYD7C; 1.7 date 2015.08.09.11.04.54; author markd; state Exp; branches; next 1.6; commitid 3U35GSecvocQhAwy; 1.6 date 2015.06.14.12.50.05; author markd; state Exp; branches; next 1.5; commitid M6UuXWAncmynFopy; 1.5 date 2015.04.25.20.26.37; author markd; state Exp; branches; next 1.4; commitid OsoySUoH7wPZN0jy; 1.4 date 2013.11.17.17.15.43; author minskim; state Exp; branches; next 1.3; commitid AnpAaQ2cSnC0BEdx; 1.3 date 2012.10.13.22.38.20; author minskim; state Exp; branches; next 1.2; 1.2 date 2012.07.22.20.24.42; author minskim; state Exp; branches; next 1.1; 1.1 date 2011.11.06.08.43.28; author minskim; state Exp; branches; next ; desc @@ 1.8 log @texlive: update to 2020 General: * The \input primitive in all TeX engines, including tex, now also accepts a group-delimited filename argument, as a system-dependent extension. The usage with a standard space/token-delimited filename is completely unchanged. The group-delimited argument was previously implemented in LuaTeX; now it is available in all engines. ASCII double quote characters (") are removed from the filename, but it is otherwise left unchanged after tokenization. This does not currently affect LaTeX’s \input command, as that is a macro redefinition of the standard \input primitive. * New option –cnf-line for kpsewhich, tex, mf, and all other engines, to support arbitrary configuration settings on the command line. * The addition of various primitives to various engines in this and previous years is intended to result in a common set of functionality available across all engines. epTeX, eupTeX: New primitives \Uchar, \Ucharcat, \current(x)spacingmode, \ifincsname; revise \fontchar?? and \iffontchar. For eupTeX only: \currentcjktoken. LuaTeX: Integration with HarfBuzz library, available as new engines luahbtex (used for lualatex) and luajithbtex. New primitives: \eTeXgluestretchorder, \eTeXglueshrinkorder. pdfTeX: New primitive \pdfmajorversion; this merely changes the version number in the PDF output; it has no effect on any PDF content. \pdfximage and similar now search for image files in the same way as \openin. pTeX: New primitives \ifjfont, \iftfont. Also in epTeX, upTeX, eupTeX. XeTeX: Fixes for \Umathchardef, \XeTeXinterchartoks, \pdfsavepos. Dvips: Output encodings for bitmap fonts, for better copy/paste capabilities. @ text @$NetBSD: patch-bin_updmap,v 1.7 2015/08/09 11:04:54 markd Exp $ --- bin/updmap.orig 2015-07-17 19:00:04.000000000 +0000 +++ bin/updmap @@@@ -19,7 +19,7 @@@@ my $svnid = '$Id: updmap.pl 37866 2015-0 my $TEXMFROOT; BEGIN { $^W = 1; - $TEXMFROOT = `kpsewhich -var-value=TEXMFROOT`; + $TEXMFROOT = `@@KPSEWHICH@@ -var-value=TEXMFROOT`; if ($?) { die "$0: kpsewhich -var-value=TEXMFROOT failed, aborting early.\n"; } @@@@ -46,12 +46,12 @@@@ use TeXLive::TLUtils qw(mkdirhier mktexu # see more comments at the definition of this function. reset_root_home(); -chomp(my $TEXMFDIST = `kpsewhich --var-value=TEXMFDIST`); -chomp(my $TEXMFVAR = `kpsewhich -var-value=TEXMFVAR`); -chomp(my $TEXMFSYSVAR = `kpsewhich -var-value=TEXMFSYSVAR`); -chomp(my $TEXMFCONFIG = `kpsewhich -var-value=TEXMFCONFIG`); -chomp(my $TEXMFSYSCONFIG = `kpsewhich -var-value=TEXMFSYSCONFIG`); -chomp(my $TEXMFHOME = `kpsewhich -var-value=TEXMFHOME`); +chomp(my $TEXMFDIST = `@@KPSEWHICH@@ --var-value=TEXMFDIST`); +chomp(my $TEXMFVAR = `@@KPSEWHICH@@ -var-value=TEXMFVAR`); +chomp(my $TEXMFSYSVAR = `@@KPSEWHICH@@ -var-value=TEXMFSYSVAR`); +chomp(my $TEXMFCONFIG = `@@KPSEWHICH@@ -var-value=TEXMFCONFIG`); +chomp(my $TEXMFSYSCONFIG = `@@KPSEWHICH@@ -var-value=TEXMFSYSCONFIG`); +chomp(my $TEXMFHOME = `@@KPSEWHICH@@ -var-value=TEXMFHOME`); # make sure that on windows *everything* is in lower case for comparison if (win32()) { @@@@ -244,7 +244,7 @@@@ sub main { # in the list is the one where changes will be written to. ($changes_config_file) = @@{$opts{'cnffile'}}; } else { - my @@all_files = `kpsewhich -all updmap.cfg`; + my @@all_files = `@@KPSEWHICH@@ -all updmap.cfg`; chomp(@@all_files); my @@used_files; for my $f (@@all_files) { @@@@ -254,10 +254,10 @@@@ sub main { my $TEXMFLOCALVAR; my @@TEXMFLOCAL; if (win32()) { - chomp($TEXMFLOCALVAR =`kpsewhich --expand-path=\$TEXMFLOCAL`); + chomp($TEXMFLOCALVAR =`@@KPSEWHICH@@ --expand-path=\$TEXMFLOCAL`); @@TEXMFLOCAL = map { lc } split(/;/ , $TEXMFLOCALVAR); } else { - chomp($TEXMFLOCALVAR =`kpsewhich --expand-path='\$TEXMFLOCAL'`); + chomp($TEXMFLOCALVAR =`@@KPSEWHICH@@ --expand-path='\$TEXMFLOCAL'`); @@TEXMFLOCAL = split /:/ , $TEXMFLOCALVAR; } # @@@@ -1251,7 +1251,7 @@@@ sub mkMaps { sub check_mismatch { my ($mm, $d, $f, $prog) = @@_; - chomp (my $kpsefound = `kpsewhich --progname=$prog $f`); + chomp (my $kpsefound = `@@KPSEWHICH@@ --progname=$prog $f`); if (lc("$d/$f") ne lc($kpsefound)) { $mm->{$f} = $kpsefound; } @@@@ -1360,7 +1360,7 @@@@ listed below). sub locateMap { my $map = shift; - my $ret = `kpsewhich --format=map $map`; + my $ret = `@@KPSEWHICH@@ --format=map $map`; chomp($ret); return $ret; } @@@@ -1998,7 +1998,7 @@@@ sub read_map_files { $alldata->{'maps'}{$m}{'origin'} = 'builtin'; } @@maps = sort_uniq(@@maps); - my @@fullpath = `kpsewhich --format=map @@maps`; + my @@fullpath = `@@KPSEWHICH@@ --format=map @@maps`; chomp @@fullpath; foreach my $map (@@maps) { my ($ff) = grep /\/$map(\.map)?$/, @@fullpath; @ 1.7 log @Update tex-tetex{,-doc} to 3.0.38001 additional options in updmap and fmtutil. @ text @d1 1 a1 1 $NetBSD: patch-bin_updmap,v 1.6 2015/06/14 12:50:05 markd Exp $ @ 1.6 log @Update to texlive 2015. pdfTEX: Support JPEG Exif as well as JFIF; do not even emit a warning if \pdfinclusionerrorlevel is negative; sync with xpdf 3.04. LuaTEX: New library newtokenlib for scanning tokens; bug fixes in the normal random number generator and other places. XeTEX: Image handling fixes; xdvipdfmx binary looked for first as a sibling to xetex; internal XDV opcodes changed. MetaPost: New numbersystem binary; new Japanese-enabled upmpost and updvitomp programs, analogous to up*tex. Infrastructure: The fmtutil script has been reimplemented to read fmtutil.cnf on a per-tree basis, analogous to updmap. Web2C mktex* scripts (including mktexlsr, mktextfm, mktexpk) now prefer programs in their own directory, instead of always using the existing PATH. @ text @d1 1 a1 1 $NetBSD: patch-bin_updmap,v 1.5 2015/04/25 20:26:37 markd Exp $ d3 1 a3 1 --- bin/updmap.orig 2015-04-27 17:08:10.000000000 +0000 d5 1 a5 1 @@@@ -19,7 +19,7 @@@@ my $svnid = '$Id: updmap.pl 37076 2015-0 d14 1 a14 10 @@@@ -37,7 +37,7 @@@@ my $version = "r$svnrev ($lastchdate)"; use Getopt::Long qw(:config no_autoabbrev ignore_case_always); use strict; -use TeXLive::TLUtils qw(mkdirhier mktexupd win32 basename dirname +use TeXLive::TLUtils qw(mkdirhier mktexupd win32 basename dirname sort_uniq member touch); #use Data::Dumper; @@@@ -49,12 +49,12 @@@@ use TeXLive::TLUtils qw(mkdirhier mktexu d33 1 a33 21 @@@@ -77,8 +77,8 @@@@ my $updLSR; my @@cmdline_options = ( "sys", "listfiles", - "cnffile=s@@", - "copy", + "cnffile=s@@", + "copy", "disable=s@@", "dvipdfmoutputdir=s", "dvipdfmxoutputdir=s", @@@@ -207,7 +207,7 @@@@ sub main { save_updmap($opts{'_readsave'}); exit 0; } - + if ($opts{'showoptions'}) { for my $o (@@{$opts{'showoptions'}}) { if (defined($settings{$o})) { @@@@ -247,7 +247,7 @@@@ sub main { d42 1 a42 1 @@@@ -257,10 +257,10 @@@@ sub main { d55 1 a55 88 @@@@ -292,7 +292,7 @@@@ sub main { # TEXMFSYSVAR $TEXLIVE/YYYY/texmf-var/web2c/updmap.cfg # TEXMFLOCAL $TEXLIVE/texmf-local/web2c/updmap.cfg # TEXMFDIST $TEXLIVE/YYYY/texmf-dist/web2c/updmap.cfg - # + # # updmap-sys (root): # ================== # TEXMFSYSCONFIG $TEXLIVE/YYYY/texmf-config/web2c/updmap.cfg @@@@ -427,7 +427,7 @@@@ sub main { if ($cmd && !$opts{'force'} && !$changed) { - print "$changes_config_file unchanged. Map files not recreated.\n" + print "$changes_config_file unchanged. Map files not recreated.\n" if !$opts{'quiet'}; } else { if (!$opts{'nomkmap'}) { @@@@ -921,7 +921,7 @@@@ sub cidx2dvips_old { if ($_ =~ /.*[@@\:\/,]/) {next;} elsif ($_ =~ /^[^ ][^ ]* unicode /) {next;} s/^([^ ][^ ]* [^ ][^ ]* [^ ][^ ]*)\.[Oo][Tt][Ff]/$1/; - s/^([^ ][^ ]* [^ ][^ ]* [^ ][^ ]*)\.[Tt][Tt][FfCc]/$1/; + s/^([^ ][^ ]* [^ ][^ ]* [^ ][^ ]*)\.[Tt][Tt][FfCc]/$1/; s/$/ %/; s/^(([^ ]*).*)/$1$2/; s/^([^ ][^ ]* ([^ ][^ ]*) !*([^ ][^ ]*).*)/$1 $3-$2/; @@@@ -969,11 +969,11 @@@@ sub mkMaps { } my ($mode, $mode_origin) = get_cfg('LW35'); - my ($dvipsPreferOutline, $dvipsPreferOutline_origin) = + my ($dvipsPreferOutline, $dvipsPreferOutline_origin) = get_cfg('dvipsPreferOutline'); - my ($dvipsDownloadBase35, $dvipsDownloadBase35_origin) = + my ($dvipsDownloadBase35, $dvipsDownloadBase35_origin) = get_cfg('dvipsDownloadBase35'); - my ($pdftexDownloadBase14, $pdftexDownloadBase14_origin) = + my ($pdftexDownloadBase14, $pdftexDownloadBase14_origin) = get_cfg('pdftexDownloadBase14'); my ($pxdviUse, $pxdviUse_origin) = get_cfg('pxdviUse'); my ($kanjiEmbed, $kanjiEmbed_origin) = get_cfg('kanjiEmbed'); @@@@ -1128,23 +1128,23 @@@@ sub mkMaps { push @@ps2pk_map, transLW35($mode, @@ps2pk_fonts); push @@ps2pk_map, @@mixedmaps_fonts; push @@ps2pk_map, @@notmixedmaps_fonts; - &writeLines(">$dvipsoutputdir/ps2pk.map", + &writeLines(">$dvipsoutputdir/ps2pk.map", normalizeLines(@@ps2pk_map)); print "Generating output for dvips...\n" if !$opts{'quiet'}; my @@download35_map; push @@download35_map, "% ps2pk35.map"; push @@download35_map, transLW35($mode, @@ps2pk_fonts); - &writeLines(">$dvipsoutputdir/download35.map", + &writeLines(">$dvipsoutputdir/download35.map", normalizeLines(@@download35_map)); my @@builtin35_map; push @@builtin35_map, "% dvips35.map"; push @@builtin35_map, transLW35($mode, @@dvips35_fonts); - &writeLines(">$dvipsoutputdir/builtin35.map", + &writeLines(">$dvipsoutputdir/builtin35.map", normalizeLines(@@builtin35_map)); - my @@dftdvips_fonts = + my @@dftdvips_fonts = (($dvipsDownloadBase35 eq "true") ? @@ps2pk_fonts : @@dvips35_fonts); my @@psfonts_t1_map; @@@@ -1160,14 +1160,14 @@@@ sub mkMaps { push @@psfonts_t1_map, @@mixedmaps_fonts; push @@psfonts_t1_map, @@notmixedmaps_fonts; push @@psfonts_t1_map, @@tmpkanji2; - &writeLines(">$dvipsoutputdir/psfonts_t1.map", + &writeLines(">$dvipsoutputdir/psfonts_t1.map", normalizeLines(@@psfonts_t1_map)); my @@psfonts_pk_map; push @@psfonts_pk_map, transLW35($mode, @@dftdvips_fonts); push @@psfonts_pk_map, @@notmixedmaps_fonts; push @@psfonts_pk_map, @@tmpkanji2; - &writeLines(">$dvipsoutputdir/psfonts_pk.map", + &writeLines(">$dvipsoutputdir/psfonts_pk.map", normalizeLines(@@psfonts_pk_map)); print "Generating output for pdftex...\n" if !$opts{'quiet'}; @@@@ -1231,7 +1231,7 @@@@ sub mkMaps { d64 1 a64 1 @@@@ -1340,7 +1340,7 @@@@ listed below). d73 2 a74 73 @@@@ -1384,7 +1384,7 @@@@ sub processOptions { # now continue with normal option handling - GetOptions(\%opts, @@cmdline_options) or + GetOptions(\%opts, @@cmdline_options) or die "Try \"$prg --help\" for more information.\n"; } @@@@ -1416,14 +1416,14 @@@@ sub setupOutputDir { # we can only have "key=value" since that is the way it was prepared # in process_options # (These were the values provided to --setoption.) -# +# sub setOptions { my (@@options) = @@_; for (my $i = 0; $i < @@options; $i++) { my $o = $options[$i]; my ($key,$val) = split (/=/, $o, 2); - + die "$prg: unexpected empty key or val for options (@@options), goodbye.\n" if !$key || !defined($val); @@@@ -1505,7 +1505,7 @@@@ sub disable_map { my $orig = $alldata->{'maps'}{$map}{'origin'}; # add a new entry to the top level where we disable it # copy over the type from the last entry - $alldata->{'updmap'}{$tc}{'maps'}{$map}{'type'} = + $alldata->{'updmap'}{$tc}{'maps'}{$map}{'type'} = $alldata->{'updmap'}{$orig}{'maps'}{$map}{'type'}; $alldata->{'updmap'}{$tc}{'maps'}{$map}{'status'} = "disabled"; $alldata->{'updmap'}{$tc}{'maps'}{$map}{'line'} = -1; @@@@ -1603,7 +1603,7 @@@@ sub save_updmap { # sub check_option { my ($opt, $val) = @@_; - if ((($settings{$opt}{'type'} eq "binary") && + if ((($settings{$opt}{'type'} eq "binary") && $val ne "true" && $val ne "false") || (($settings{$opt}{'type'} eq "string") && !member($val, @@{$settings{$opt}{'possible'}}))) { @@@@ -1621,12 +1621,12 @@@@ sub setOption { my ($opt, $val) = @@_; die "$prg: Unsupported option $opt." if (!defined($settings{$opt})); - die "$0: Invalid value $val for option $opt." + die "$0: Invalid value $val for option $opt." if (!check_option($opt, $val)); # silently accept this old option name, just in case. return if $opt eq "dvipdfmDownloadBase14"; - + #print "Setting option $opt to $val...\n" if !$opts{'quiet'}; my $tc = $alldata->{'changes_config'}; @@@@ -1774,9 +1774,9 @@@@ sub normalizeLines { # $alldata->{'updmap'}{$full_path_name_of_updmap}{'lines'} = \@@lines # $alldata->{'updmap'}{$full_path_name_of_updmap}{'setting'}{$key}{'val'} = $val # $alldata->{'updmap'}{$full_path_name_of_updmap}{'setting'}{$key}{'line'} = $i -# $alldata->{'updmap'}{$full_path_name_of_updmap}{'maps'}{$mapname}{'type'} +# $alldata->{'updmap'}{$full_path_name_of_updmap}{'maps'}{$mapname}{'type'} # = 'Map'|'MixedMap'|'KanjiMap'|'disabled' -# $alldata->{'updmap'}{$full_path_name_of_updmap}{'maps'}{$mapname}{'status'} +# $alldata->{'updmap'}{$full_path_name_of_updmap}{'maps'}{$mapname}{'status'} # = 'enabled'|'disabled' # $alldata->{'updmap'}{$full_path_name_of_updmap}{'maps'}{$mapname}{'line'} = $i # $alldata->{'maps'}{$m}{'origin'} = $updmap_path_name @@@@ -1976,14 +1976,14 @@@@ sub read_map_files { $alldata->{'maps'}{$m}{'status'} = 'enabled'; a81 52 if ($ff) { $alldata->{'maps'}{$map}{'fullpath'} = $ff; } else { - # if the map file is not found, then push it onto the list of + # if the map file is not found, then push it onto the list of # missing map files, since we know that it is enabled push @@missing, $map; } @@@@ -2085,13 +2085,13 @@@@ sub merge_data { for my $f (keys %{$alldata->{'maps'}{$m}{'fonts'}}) { # use the font definition only for those fonts where the origin matches if ($alldata->{'fonts'}{$f}{'origin'} eq $m) { - $alldata->{'merged'}{'allMaps'}{'fonts'}{$f} = + $alldata->{'merged'}{'allMaps'}{'fonts'}{$f} = $alldata->{'maps'}{$m}{'fonts'}{$f} if ($alldata->{'updmap'}{$origin}{'maps'}{$m}{'type'} ne "KanjiMap"); - $alldata->{'merged'}{'noMixedMaps'}{'fonts'}{$f} = + $alldata->{'merged'}{'noMixedMaps'}{'fonts'}{$f} = $alldata->{'maps'}{$m}{'fonts'}{$f} if ($alldata->{'updmap'}{$origin}{'maps'}{$m}{'type'} eq "Map"); - $alldata->{'merged'}{'KanjiMap'}{'fonts'}{$f} = + $alldata->{'merged'}{'KanjiMap'}{'fonts'}{$f} = $alldata->{'maps'}{$m}{'fonts'}{$f} if ($alldata->{'updmap'}{$origin}{'maps'}{$m}{'type'} eq "KanjiMap"); } @@@@ -2103,7 +2103,7 @@@@ sub merge_data { # # $HOME and sudo and updmap-sys horror # some instances of sudo do not reset $HOME to the home of root -# as an effect of "sudo updmap" creates root owned files in the home +# as an effect of "sudo updmap" creates root owned files in the home # of a normal user, and "sudo updmap-sys" uses map files and updmap.cfg # files from the directory of a normal user, but creating files # in TEXMFSYSCONFIG. This is *all* wrong. @@@@ -2190,7 +2190,7 @@@@ historical reasons. A general overview: Good luck. Options: - --cnffile FILE read FILE for the updmap configuration + --cnffile FILE read FILE for the updmap configuration (can be given multiple times, in which case all the files are used) --dvipdfmxoutputdir DIR specify output directory (dvipdfm(x) syntax) @@@@ -2278,7 +2278,7 @@@@ Explanation of trees and files normally Thus, if updmap.cfg files are present in all trees, and the default layout is used as shipped with TeX Live, the following files are read, in the given order. - + For updmap-sys: TEXMFSYSCONFIG \$TEXLIVE/YYYY/texmf-config/web2c/updmap.cfg TEXMFSYSVAR \$TEXLIVE/YYYY/texmf-var/web2c/updmap.cfg @ 1.5 log @Commit the texlive 2014 versions of the patches. @ text @d1 1 a1 1 $NetBSD: patch-bin_updmap,v 1.4 2013/11/17 17:15:43 minskim Exp $ d3 1 a3 1 --- bin/updmap.orig 2015-01-16 00:02:11.000000000 +0000 d5 1 a5 1 @@@@ -19,7 +19,7 @@@@ my $svnid = '$Id: updmap.pl 36067 2015-0 d12 3 a14 3 warn "updmap.pl: kpsewhich -var-value=TEXMFROOT failed, aborting early.\n"; exit 1; @@@@ -38,7 +38,7 @@@@ my $version = "svn$svnrev ($lastchdate)" d23 1 a23 1 @@@@ -50,12 +50,12 @@@@ use TeXLive::TLUtils qw(mkdirhier mktexu d42 1 a42 1 @@@@ -78,8 +78,8 @@@@ my $updLSR; d53 1 a53 1 @@@@ -208,7 +208,7 @@@@ sub main { d62 1 a62 1 @@@@ -248,7 +248,7 @@@@ sub main { d71 1 a71 1 @@@@ -258,10 +258,10 @@@@ sub main { d84 1 a84 1 @@@@ -293,7 +293,7 @@@@ sub main { d93 1 a93 1 @@@@ -428,7 +428,7 @@@@ sub main { d102 1 a102 1 @@@@ -922,7 +922,7 @@@@ sub cidx2dvips_old { d111 1 a111 1 @@@@ -970,11 +970,11 @@@@ sub mkMaps { d126 1 a126 1 @@@@ -1129,23 +1129,23 @@@@ sub mkMaps { d154 1 a154 1 @@@@ -1161,14 +1161,14 @@@@ sub mkMaps { d171 1 a171 1 @@@@ -1232,7 +1232,7 @@@@ sub mkMaps { d180 1 a180 1 @@@@ -1341,7 +1341,7 @@@@ listed below). d189 1 a189 1 @@@@ -1385,7 +1385,7 @@@@ sub processOptions { d198 1 a198 1 @@@@ -1417,14 +1417,14 @@@@ sub setupOutputDir { d215 1 a215 1 @@@@ -1506,7 +1506,7 @@@@ sub disable_map { d224 1 a224 1 @@@@ -1604,7 +1604,7 @@@@ sub save_updmap { d233 1 a233 1 @@@@ -1622,12 +1622,12 @@@@ sub setOption { d248 1 a248 1 @@@@ -1775,9 +1775,9 @@@@ sub normalizeLines { d260 1 a260 1 @@@@ -1977,14 +1977,14 @@@@ sub read_map_files { d277 1 a277 1 @@@@ -2086,13 +2086,13 @@@@ sub merge_data { d294 1 a294 1 @@@@ -2104,7 +2104,7 @@@@ sub merge_data { d303 1 a303 1 @@@@ -2191,7 +2191,7 @@@@ historical reasons. A general overview: d312 1 a312 1 @@@@ -2279,7 +2279,7 @@@@ Explanation of trees and files normally @ 1.4 log @Update tex-tetex{,-doc} to 3.0.32132 - Files in share/texmf have been moved to share/texmf-dist. - 'updmap --sys' replaces 'updmap-sys'. @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- bin/updmap.orig 2013-10-07 22:58:25.000000000 +0000 d5 2 a6 8 @@@@ -3,5 +3,5 @@@@ # updmap - maintain map files for outline fonts. # (Maintained in TeX Live:Master/texmf-dist/scripts/texlive.) -# +# # Copyright 2011, 2012, 2013 Norbert Preining # This file is licensed under the GNU General Public License version 2 @@@@ -24,5 +24,5 @@@@ my $TEXMFROOT; d8 1 a8 1 $^W=1; d12 4 a15 2 print STDERR "updmap: Cannot find TEXMFROOT, aborting!\n"; @@@@ -38,5 +38,5 @@@@ my $version = '$Id: updmap.pl 31853 2013 d22 3 a24 1 @@@@ -51,10 +51,10 @@@@ use TeXLive::TLUtils qw(mkdirhier mktexu d41 3 a43 1 @@@@ -80,6 +80,6 @@@@ my @@cmdline_options = ( d52 3 a54 1 @@@@ -191,5 +191,5 @@@@ sub main { d61 3 a63 1 @@@@ -231,5 +231,5 @@@@ sub main { d70 3 a72 1 @@@@ -241,8 +241,8 @@@@ sub main { d83 3 a85 1 @@@@ -280,5 +280,5 @@@@ sub main { d92 3 a94 1 @@@@ -415,5 +415,5 @@@@ sub main { d101 3 a103 8 @@@@ -435,5 +435,5 @@@@ sub main { my @@missing = read_map_files(); if (@@missing) { - print STDERR "\nERROR: The following map file(s) couldn't be found:\n"; + print STDERR "\nERROR: The following map file(s) couldn't be found:\n"; for my $m (@@missing) { my $orig = $alldata->{'maps'}{$m}{'origin'}; @@@@ -913,5 +913,5 @@@@ sub cidx2dvips_old { d110 3 a112 1 @@@@ -961,9 +961,9 @@@@ sub mkMaps { d125 3 a127 1 @@@@ -1120,5 +1120,5 @@@@ sub mkMaps { d134 2 a135 1 @@@@ -1127,5 +1127,5 @@@@ sub mkMaps { d142 1 a142 1 @@@@ -1133,8 +1133,8 @@@@ sub mkMaps { d153 3 a155 1 @@@@ -1152,5 +1152,5 @@@@ sub mkMaps { d162 2 a163 1 @@@@ -1159,5 +1159,5 @@@@ sub mkMaps { d170 3 a172 8 @@@@ -1216,5 +1216,5 @@@@ sub mkMaps { } else { print STDERR "$prg: Warning: File $d/$f doesn't exist.\n"; - print LOG "Warning: File $d/$f doesn't exist.\n" + print LOG "Warning: File $d/$f doesn't exist.\n" unless $opts{'dry-run'}; } @@@@ -1223,5 +1223,5 @@@@ sub mkMaps { d179 3 a181 1 @@@@ -1332,5 +1332,5 @@@@ listed below). d188 3 a190 1 @@@@ -1376,5 +1376,5 @@@@ sub processOptions { d197 3 a199 1 @@@@ -1408,5 +1408,5 @@@@ sub setupOutputDir { d206 2 a207 1 @@@@ -1415,5 +1415,5 @@@@ sub setOptions { d214 3 a216 1 @@@@ -1497,5 +1497,5 @@@@ sub disable_map { d223 3 a225 1 @@@@ -1595,5 +1595,5 @@@@ sub save_updmap { d232 3 a234 1 @@@@ -1613,10 +1613,10 @@@@ sub setOption { d247 3 a249 1 @@@@ -1766,7 +1766,7 @@@@ sub normalizeLines { d259 3 a261 1 @@@@ -1978,5 +1978,5 @@@@ sub read_map_files { d268 2 a269 1 @@@@ -1985,5 +1985,5 @@@@ sub read_map_files { d276 3 a278 1 @@@@ -2087,11 +2087,11 @@@@ sub merge_data { d293 3 a295 1 @@@@ -2105,5 +2105,5 @@@@ sub merge_data { d302 3 a304 15 @@@@ -2133,5 +2133,5 @@@@ sub reset_root_home { # envhome and roothome do agree, nothing to do, that is the good case } - } else { + } else { warning("$prg: home of root not defined, strange!\n"); } @@@@ -2158,5 +2158,5 @@@@ Usage: $prg [OPTION] ... [COMMAND] Update the default font map files used by pdftex, dvips, and dvipdfm(x), -and optionally pxdvi, as determined by all configuration files updmap.cfg +and optionally pxdvi, as determined by all configuration files updmap.cfg (the ones returned by running "kpsewhich --all updmap.cfg", but see below). @@@@ -2174,5 +2174,5 @@@@ By default, the TeX filename database (l d311 3 a313 1 @@@@ -2261,5 +2261,5 @@@@ Explanation of trees and files normally d320 1 a320 35 @@@@ -2276,7 +2276,7 @@@@ Explanation of trees and files normally TEXMFLOCAL \$TEXLIVE/texmf-local/web2c/updmap.cfg TEXMFDIST \$TEXLIVE/YYYY/texmf-dist/web2c/updmap.cfg - + (where YYYY is the TeX Live release version). - + There is one exception to keep upgradability from earlier versions of TeX Live: if a file TEXMFLOCAL/web2c/updmap-local.cfg exists @@@@ -2299,8 +2299,8 @@@@ Explanation of trees and files normally kpsewhich --all (equivalently, the one returned by kpsewhich updmap.cfg), is used. - + 2) If neither of the above two are present and changes are made, a new config file is created in \$TEXMFCONFIG/web2c/updmap.cfg. - + In general, the idea is that if a given config file is not writable, a higher-level one can be used. That way, the distribution's settings @@@@ -2321,5 +2321,5 @@@@ Explanation of trees and files normally or \#! MixedMap mapname.map - in the higher-priority updmap.cfg file. + in the higher-priority updmap.cfg file. As an example, suppose you have a copy of MathTime Pro fonts @@@@ -2334,5 +2334,5 @@@@ Explanation of trees and files normally updmap writes the map files for dvips (psfonts.map) and pdftex (pdftex.map) to the TEXMFVAR/fonts/map/updmap/{dvips,pdftex}/ - directories. + directories. The log file is written to TEXMFVAR/web2c/updmap.log. @ 1.3 log @Update tex-tetex{,-doc} to 3.0.27774. In TeX Live 2012, this package replaces print/texlive-tetex. @ text @d3 1 a3 1 --- bin/updmap.orig 2012-09-13 03:38:21.000000000 +0000 d5 8 a12 2 @@@@ -23,7 +23,7 @@@@ my $TEXMFROOT; d19 8 a26 3 exit 1; @@@@ -50,10 +50,10 @@@@ use TeXLive::TLUtils qw(mkdirhier mktexu # this function checks by itself whether it is running on windows or not d29 1 a29 1 -chomp(my $TEXMFMAIN = `kpsewhich --var-value=TEXMFMAIN`); d31 1 d33 1 d35 1 a35 1 +chomp(my $TEXMFMAIN = `@@KPSEWHICH@@ --var-value=TEXMFMAIN`); d37 1 d39 1 d43 17 a59 3 if (win32()) { @@@@ -215,7 +215,7 @@@@ sub main { # in the list is the one where changes will be written to. d66 1 a66 3 for my $f (@@all_files) { @@@@ -225,10 +225,10 @@@@ sub main { my $TEXMFLOCALVAR; d77 47 a123 2 # @@@@ -1139,7 +1139,7 @@@@ sub mkMaps { d125 47 d178 6 d185 52 a236 2 @@@@ -1787,7 +1787,7 @@@@ sub read_map_files { $alldata->{'maps'}{$m}{'status'} = 'enabled'; d243 92 a334 1 my ($ff) = grep /\/$map(\.map)?$/, @@fullpath; @ 1.2 log @Update tex-tetex{,-doc} to 3.0.26894. Changes: - Support multiple updmap.cfg, one in each texmf tree. @ text @d3 1 a3 1 --- bin/updmap.orig 2012-06-10 22:43:00.000000000 +0000 d14 1 a14 1 @@@@ -50,9 +50,9 @@@@ use TeXLive::TLUtils qw(mkdirhier mktexu d21 1 d25 1 d29 1 a29 1 @@@@ -213,15 +213,15 @@@@ sub main { d38 11 a48 1 push @@used_files, (win32() ? lc($f) : $f); d51 1 a51 8 - chomp(my $TEXMFLOCAL =`kpsewhich --var-value=TEXMFLOCAL`); - chomp(my $TEXMFHOME =`kpsewhich --var-value=TEXMFHOME`); + chomp(my $TEXMFLOCAL =`@@KPSEWHICH@@ --var-value=TEXMFLOCAL`); + chomp(my $TEXMFHOME =`@@KPSEWHICH@@ --var-value=TEXMFHOME`); if (win32()) { $TEXMFLOCAL = lc($TEXMFLOCAL); $TEXMFHOME = lc($TEXMFHOME); @@@@ -1140,7 +1140,7 @@@@ sub mkMaps { d60 1 a60 1 @@@@ -1788,7 +1788,7 @@@@ sub read_map_files { @ 1.1 log @Replace the updmap script with the version in TeX Live 2011. Updating font maps is considerably faster with this version. @ text @d3 1 a3 1 --- bin/updmap.orig 2011-06-17 23:45:54.000000000 +0000 d5 1 a5 1 @@@@ -8,7 +8,7 @@@@ d9 45 a53 3 - chomp($TEXMFROOT = `kpsewhich -var-value=TEXMFROOT`); + chomp($TEXMFROOT = `@@KPSEWHICH@@ -var-value=TEXMFROOT`); unshift (@@INC, "$TEXMFROOT/tlpkg"); d55 2 a56 9 @@@@ -453,7 +453,7 @@@@ sub locateWeb2c { my @@files = @@_; return @@files if ($#files < 0); - @@files = split (/\n/, `kpsewhich --format="web2c files" @@files`); + @@files = split (/\n/, `@@KPSEWHICH@@ --format="web2c files" @@files`); if (wantarray) { return @@files; d58 4 a61 8 @@@@ -470,7 +470,7 @@@@ sub locateMap { my @@maps = @@_; return @@maps if ($#maps < 0); - my @@files = `kpsewhich --format=map @@maps`; + my @@files = `@@KPSEWHICH@@ --format=map @@maps`; chomp @@files; d63 1 a63 43 @@@@ -672,7 +672,7 @@@@ sub setupOutputDir { my $tf; # Try TEXMFVAR tree. Use it if variable is set and $rel can # be written. - chomp($tf = `kpsewhich --var-value=TEXMFVAR`); + chomp($tf = `@@KPSEWHICH@@ --var-value=TEXMFVAR`); if ($tf) { &mkdirhier("$tf/$rel"); if (! -w "$tf/$rel") { @@@@ -697,13 +697,13 @@@@ sub setupDestDir { # sub setupCfgFile { if (! $cnfFile) { - my $tf = `kpsewhich --var-value=TEXMFCONFIG`; + my $tf = `@@KPSEWHICH@@ --var-value=TEXMFCONFIG`; chomp($tf); if ($tf && ! -f "$tf/web2c/$cnfFileShort") { &mkdirhier("$tf/web2c") if (! -d "$tf/web2c"); if (-d "$tf/web2c" && -w "$tf/web2c") { unlink "$tf/web2c/$cnfFileShort"; - my $original_cfg=`kpsewhich updmap.cfg`; + my $original_cfg=`@@KPSEWHICH@@ updmap.cfg`; chomp($original_cfg); print("copy $original_cfg => $tf/web2c/$cnfFileShort\n") if !$quiet; $newcnf="$tf/web2c/$cnfFileShort"; @@@@ -839,7 +839,7 @@@@ sub mkMaps { $cache=1; if (! $dry_run) { - my $TEXMFVAR = `kpsewhich --var-value=TEXMFVAR`; + my $TEXMFVAR = `@@KPSEWHICH@@ --var-value=TEXMFVAR`; chomp($TEXMFVAR); $logfile = "$TEXMFVAR/web2c/updmap.log"; mkdirhier "$TEXMFVAR/web2c"; @@@@ -1072,7 +1072,7 @@@@ sub initVars { $cnfFile = ""; $cnfFileShort = "updmap.cfg"; $outputdir = ""; - chomp($TEXMFMAIN =`kpsewhich --var-value=TEXMFMAIN`); + chomp($TEXMFMAIN =`@@KPSEWHICH@@ --var-value=TEXMFMAIN`); @@psADOBE = ( 's/ URWGothicL-Demi / AvantGarde-Demi /', @