diff options
author | Karl Berry <karl@freefriends.org> | 2019-10-02 21:17:45 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2019-10-02 21:17:45 +0000 |
commit | cef9a194c05e1e055145f052ca24508842c4fbc9 (patch) | |
tree | 8ee7e1f71fb1771810d36aad52b961c805e5d23f | |
parent | 232a9e8c131c4a36b549eace3512642e409a233a (diff) |
l3build (2oct19)
git-svn-id: svn://tug.org/texlive/trunk@52258 c570f23f-e606-0410-a88d-b1316a301751
20 files changed, 183 insertions, 111 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/context/perl/mptopdf.pl b/Build/source/texk/texlive/linked_scripts/context/perl/mptopdf.pl index 42db9001ec4..165d4d2179f 100755 --- a/Build/source/texk/texlive/linked_scripts/context/perl/mptopdf.pl +++ b/Build/source/texk/texlive/linked_scripts/context/perl/mptopdf.pl @@ -118,9 +118,14 @@ if (($pattern eq '')||($Help)) { @files = glob "$pattern" ; } +# this patch was send via debian but is not tested by me + foreach my $file (@files) { $_ = $file ; - if (s/\.(\d+|mps)$// && -e $file) { + # if (s/\.(\d+|mps)$// && -e $file) { + if (s/\.(\d+|mps|ps)$// && -e $file) { + my $suffix = $1 ; + my $pdf = basename($_).".pdf" ; if ($miktex) { $command = "pdftex -undump=mptopdf" ; } else { @@ -136,15 +141,22 @@ foreach my $file (@files) { print "\n$program : error while processing tex file\n" ; exit 1 ; } - my $pdfsrc = basename($_).".pdf"; - rename ($pdfsrc, "$_-$1.pdf") ; - if (-e $pdfsrc) { - CopyFile ($pdfsrc, "$_-$1.pdf") ; + # my $pdfsrc = basename($_).".pdf"; + # rename ($pdfsrc, "$_-$1.pdf") ; + # if (-e $pdfsrc) { + # CopyFile ($pdfsrc, "$_-$1.pdf") ; + if ($suffix =~ m/\.\d+$/) { + rename ($pdf, "$_-$suffix.pdf") ; + if (-e $pdf) { + CopyFile ($pdf, "$_-$suffix.pdf") ; + } + $pdf = "$_-$suffix.pdf" ; } if ($done) { $report .= " +" ; } - $report .= " $_-$1.pdf" ; + # $report .= " $_-$1.pdf" ; + $report .= " $pdf" ; ++$done ; } } diff --git a/Build/source/texk/texlive/linked_scripts/fontools/afm2afm b/Build/source/texk/texlive/linked_scripts/fontools/afm2afm index 8f5eec2ed36..6b745936263 100755 --- a/Build/source/texk/texlive/linked_scripts/fontools/afm2afm +++ b/Build/source/texk/texlive/linked_scripts/fontools/afm2afm @@ -37,7 +37,7 @@ use File::Basename; use Getopt::Long; use Pod::Usage; -my $VERSION = "20190712"; +my $VERSION = "20191001"; parse_commandline(); @@ -421,7 +421,7 @@ See the GNU General Public License for more details. =head1 VERSION -This document describes B<afm2afm> version 20190712. +This document describes B<afm2afm> version 20191001. =head1 RECENT CHANGES diff --git a/Build/source/texk/texlive/linked_scripts/fontools/autoinst b/Build/source/texk/texlive/linked_scripts/fontools/autoinst index fb295700f9c..b265e43e319 100755 --- a/Build/source/texk/texlive/linked_scripts/fontools/autoinst +++ b/Build/source/texk/texlive/linked_scripts/fontools/autoinst @@ -37,10 +37,11 @@ use Cwd (); use File::Path (); use File::Spec (); use Getopt::Long (); +use IPC::Open3 (); use Pod::Usage (); use POSIX (); -my $VERSION = '20190712'; +my $VERSION = '20191001'; my ($d, $m, $y) = (localtime time)[3 .. 5]; my $TODAY = sprintf "%04d/%02d/%02d", $y + 1900, $m + 1, $d; @@ -516,6 +517,8 @@ sub main { make_commands(@worklist); } + close $ARGV{logfile}; + return; } @@ -741,8 +744,8 @@ sub create_logfile { my @fonts = @_; if (-e $ARGV{logfile}) { - print "[INFO] file '$ARGV{logfile}' already exists;\n" . - " appending new log data to end\n\n"; + print "[WARNING] File '$ARGV{logfile}' already exists;\n" . + " appending new log data to end.\n"; } open my $LOG, '>>', $ARGV{logfile} or die "$0: cannot create $ARGV{logfile}: $!"; @@ -801,17 +804,16 @@ END_ARGUMENTS my @fontfamilies = keys %fontfamilies; if (scalar @fontfamilies > 1) { warn <<"END_WARNING_MULTIPLE_FAMILIES"; -[WARNING] Your fonts seem to belong to multiple families: - - @{[ join( "\n" . q{ } x 10, sort @fontfamilies ) ]} +[WARNING] Your fonts seem to belong to multiple families: - "autoinst" performs best when installing one family at a time. - If you think your fonts should all be in the same family, - you might have found a bug in autoinst's font info parsing. + @{[ join( "\n" . q{ } x 12, sort @fontfamilies ) ]} - Please see the log file $ARGV{logfile} for details on how - the fonts' families, weights, widths and shapes were parsed. + "autoinst" performs best when installing one family at a time. + If you think your fonts should all be in the same family, + you might have found a bug in autoinst's font info parsing. + Please see the log file $ARGV{logfile} for details on how + the fonts' families, weights, widths and shapes were parsed. END_WARNING_MULTIPLE_FAMILIES # increase verbosity if necessary, to log all relevant info @@ -903,7 +905,6 @@ END_FONTINFO return if $ARGV{verbose} < 2; print {$LOG} join "\n\n", @cmds; print {$LOG} "\n"; - close $LOG; } #----------------------------------------------------------------------- @@ -919,19 +920,36 @@ sub make_commands { if ($ARGV{manual}) { open my $BAT, '>', 'autoinst.bat' - or die "[ERROR] Can't create 'autoinst.bat': $!"; + or die "[ERROR] Can't create 'autoinst.bat': $!"; print {$BAT} "$_\n" for @commands; close $BAT; } else { - if (grep { system $_ } @commands) { + my $oops = 0; + $| = 1; # turn on autoflush, to make a poor man's progress bar + print "[INFO] Generating fonts "; + for my $command (@commands) { + print '.'; + my ($child_in, $child_out, $child_err); + my $pid = IPC::Open3::open3( + $child_in, $child_out, $child_err, $command + ); + close $child_in; + waitpid($pid, 0); + + if ($?) { + my $msg = "$command\n" . do { local $/; <$child_err> } . "\n"; + warn $msg; + print {$ARGV{logfile}} $msg; + $oops = 1; + } + } + print "\n"; + $| = 0; + if ($oops) { warn <<"END_OTFTOTFM_WARNING"; -[WARNING] one or more calls to 'otftotfm' failed; - please see the messages above. - - Note that you can safely ignore any warnings - "bad UNICODING (‘germandbls’ has no encoding)" - or "bad ligature (‘ff’ has no encoding)" +[ERROR] One or more calls to 'otftotfm' failed; + please see the error messages in the log file. END_OTFTOTFM_WARNING } } @@ -1012,9 +1030,10 @@ sub set_targetdirs { File::Path::make_path(values %dir) unless $ARGV{dryrun}; - my $result = join ' ', map { "--${_}-directory=$dir{$_}" } @FILETYPES; - $result .= " --encoding-directory=$dir{enc} --map-file=" - . File::Spec->catfile($dir{map}, "${family}.map"); + my $result = join ' ', map { qq(--${_}-directory="$dir{$_}") } @FILETYPES; + $result .= qq( --encoding-directory="$dir{enc}" --map-file=") + . File::Spec->catfile($dir{map}, "${family}.map") + . '"'; return $result; } @@ -1246,7 +1265,7 @@ sub parse_options { : 'rm' ; } - } or warn "[WARNING] $@"; + } or warn "[WARNING] $@"; # If the user didn't explicitly say anything about ligatures, # activate them unless the font is a typewriter font. @@ -1264,7 +1283,7 @@ sub parse_options { my $localtarget = File::Spec->catdir( Cwd->getcwd(), 'autoinst_output' ); if ($ARGV{manual}) { - warn "[WARNING] option '-target' overridden by '-manual'!\n" + warn "[WARNING] Option '-target' overridden by '-manual'!\n" if $ARGV{target}; $ARGV{target} = $localtarget; $ARGV{updmap} = 0; @@ -1275,12 +1294,11 @@ sub parse_options { }; if (!$kpsepath) { warn <<"END_WARNING_KPSEWHICH"; -[WARNING] Call to "kpsewhich" failed. - Maybe your TeX system doesn't use the kpathsea library? - - Consider using the "-target" command line option - to specify a TEXMF tree where autoinst should install all files. +[WARNING] Call to "kpsewhich" failed. + Maybe your TeX system doesn't use the kpathsea library? + Consider using the "-target" command line option + to specify a TEXMF tree where autoinst should install all files. END_WARNING_KPSEWHICH } else { @@ -1297,16 +1315,27 @@ END_WARNING_KPSEWHICH $ARGV{target} = $localtarget; $ARGV{updmap} = 0; warn <<"END_WARNING_DUMPING_FILES"; -[WARNING] No user-writable TEXMF-tree found! +[WARNING] No user-writable TEXMF-tree found! - I'm putting all generated files in "$ARGV{target}". + I'm putting all generated files in "$ARGV{target}". - Please install these files into a suitable TEXMF directory, - update the filename database and run 'updmap' (or similar); - see your TeX installation's documentation. + Please install these files into a suitable TEXMF directory, + update the filename database and run 'updmap' (or similar); + see your TeX installation's documentation. END_WARNING_DUMPING_FILES } + if ($ARGV{target} =~ m/[ ]/xms) { + warn <<"END_WARNING_SPACES_IN_PATHS"; +[WARNING] The pathname of your target directory contains spaces: + "$ARGV{target}" + + I'll do my best to work around this. Fingers crossed! + If you do experience any problems, try to re-run autoinst + with a target directory without spaces in its name. +END_WARNING_SPACES_IN_PATHS + } + if (!$ARGV{figurekern}) { my @digits = qw(zero one two three four five six seven eight nine); my $tkern @@ -1362,7 +1391,7 @@ sub parse_basicinfo { my $cmd = qq(otfinfo --info "$info->{filename}"); open my $otfinfo, '-|', $cmd - or die "[ERROR] could not fork(): $!"; + or die "[ERROR] Could not fork(): $!"; my %data = map { my ($k,$v) = m/\A\s* ([^:]+?) \s*:\s* ([^\r\n]+)/xms; $k =~ s/\s+//xmsg; $v =~ s/\s+//xmsg; @@ -1370,7 +1399,7 @@ sub parse_basicinfo { } grep { m/\A\s* [^:]+? \s*:\s* [^\r\n]+/xms } <$otfinfo>; close $otfinfo - or die "[ERROR] '$cmd' failed"; + or die "[ERROR] '$cmd' failed."; $data{family} = $data{preferredfamily} || $data{family}; $data{subfamily} = $data{preferredsubfamily} || $data{subfamily}; @@ -1521,7 +1550,7 @@ sub parse_basicinfo { close $otfinfo or die "'$cmd' failed"; @{$info}{qw(weight_class width_class)} = unpack '@4n @6n', $os2_table; - } or warn "[WARNING] $@"; + } or warn "[WARNING] $@"; return; } @@ -1547,17 +1576,17 @@ sub parse_features { my $cmd = qq(otfinfo --features "$info->{filename}"); open my $otfinfo, '-|', $cmd - or die "[ERROR] could not fork(): $!"; + or die "[ERROR] Could not fork(): $!"; %{$info->{feature}} = map { (substr($_, 0, 4) => 1) } <$otfinfo>; close $otfinfo - or die "[ERROR] '$cmd' failed"; + or die "[ERROR] '$cmd' failed."; $cmd = qq(otfinfo --tables "$info->{filename}"); open $otfinfo, '-|', $cmd - or die "[ERROR] could not fork(): $!"; + or die "[ERROR] Could not fork(): $!"; $info->{feature}{kern} = 1 if grep { m/\d+ \s+ kern/xms } <$otfinfo>; close $otfinfo - or die "[ERROR] '$cmd' failed"; + or die "[ERROR] '$cmd' failed."; return; } @@ -1571,7 +1600,7 @@ sub parse_sizeinfo { my $cmd = qq(otfinfo --optical-size "$info->{filename}"); open my $otfinfo, '-|', $cmd - or die "[ERROR] could not fork(): $!"; + or die "[ERROR] Could not fork(): $!"; if (my ($minsize, $maxsize) = <$otfinfo> =~ m/[(] ([\d.]+) \s* pt, \s* @@ -1605,7 +1634,7 @@ sub parse_sizeinfo { @{$info}{qw(minsize maxsize)} = ($minsize, $maxsize); } close $otfinfo - or die "[ERROR] '$cmd' failed"; + or die "[ERROR] '$cmd' failed."; return; } @@ -1613,30 +1642,29 @@ sub parse_sizeinfo { # Error messages, used in assert_unique() my $ERR_DETAIL =<<'END_ERR_DETAIL'; -[ERROR] I've parsed both %s - and %s as +[ERROR] I've parsed both %s + and %s as - Family: %s - Weight: %s - Width: %s - Shape: %s - Size: %s-%s + Family: %s + Weight: %s + Width: %s + Shape: %s + Size: %s-%s END_ERR_DETAIL my $ERR_PARSE =<<'END_ERR_PARSE'; -[ERROR] I failed to parse all fonts in a unique way; - presumably some fonts have unusual widths, weights or shapes. +[ERROR] I failed to parse all fonts in a unique way; + presumably some fonts have unusual widths, weights or shapes. - Try one of the following: - - Run 'autoinst' on a smaller set of fonts, - omitting the ones that weren't parsed correctly; - - Add the missing widths, weights or shapes to the tables - 'NFSS_WIDTH', 'NFSS_WEIGHT' or 'NFSS_SHAPE' near the top - of the source code; - - Please also send a bug report to the author. + Try one of the following: + - Run 'autoinst' on a smaller set of fonts, + omitting the ones that weren't parsed correctly; + - Add the missing widths, weights or shapes to the tables + 'NFSS_WIDTH', 'NFSS_WEIGHT' or 'NFSS_SHAPE' near the top + of the source code; + Please also send a bug report to the author. END_ERR_PARSE #----------------------------------------------------------------------- @@ -1666,6 +1694,7 @@ sub assert_unique { # Die with detailed error message if the font infos aren't unique if ($err_details) { + print {$ARGV{logfile}} $err_details, $ERR_PARSE; die $err_details, $ERR_PARSE; } @@ -1687,10 +1716,10 @@ sub get_orn { my $cmd = qq(otfinfo --glyphs "$font->{filename}"); open my $otfinfo, '-|', $cmd - or die "[ERROR] could not fork(): $!"; + or die "[ERROR] Could not fork(): $!"; chop(my @glyphnames = <$otfinfo>); close $otfinfo - or die "[ERROR] '$cmd' failed"; + or die "[ERROR] '$cmd' failed."; # Test for some known alternative names (probably not exhaustive) my @ornaments @@ -1702,7 +1731,7 @@ sub get_orn { @encoding[0 .. $#ornaments] = @ornaments; open my $ORN, '>', "$enc_name.enc" - or die "[ERROR] Can't create '$enc_name.enc': $!"; + or die "[ERROR] Can't create '$enc_name.enc': $!"; print {$ORN} "/$font->{family}OrnamentEncoding [\n"; map { print {$ORN} " /$_\n" } @encoding[0 .. 255]; @@ -1753,7 +1782,7 @@ sub write_stylefile { File::Path::make_path($dir); $fn = File::Spec->catfile($dir, $fn); open my $STY, '>', $fn - or die "[ERROR] Can't create '$fn': $!"; + or die "[ERROR] Can't create '$fn': $!"; print {$STY} <<"END_STY_HEADER"; %% Generated by autoinst on $TODAY @@ -1894,7 +1923,7 @@ END_STY_MAINFONT : $seen{TOsF} ? 'oldstyle,tabular' : $seen{LF} ? 'lining,proportional' : $seen{TLF} ? 'lining,tabular' - : die "[ERROR] Internal bug, please report!"; + : die "[ERROR] Internal bug, please report!"; my $default_bold; for my $series (qw(heavy black extrabold demibold semibold bold)) { @@ -1961,7 +1990,7 @@ sub write_fdfile { File::Path::make_path($dir); $fn = File::Spec->catfile($dir, $fn); open my $FD, '>', $fn - or die "[ERROR] Can't create '$fn': $!"; + or die "[ERROR] Can't create '$fn': $!"; print {$FD} <<"END_FD_HEADER"; %% Generated by autoinst on $TODAY @@ -2605,7 +2634,7 @@ but don't provide a "liga" feature to access these. This option tells B<autoinst> to add extra C<LIGKERN> rules to the generated fonts to enable the use of these ligatures. The default is B<-ligatures>, -unless the user specified the I<ligatures> option. +unless the user specified the I<-typewriter> option. Specify B<-noligatures> to disable the generation of ligatures even for fonts that do contain a "liga" feature. @@ -2782,7 +2811,7 @@ GNU General Public License for more details. =head1 VERSION -This document describes B<autoinst> version 20190712. +This document describes B<autoinst> version 20191001. =head1 RECENT CHANGES @@ -2791,6 +2820,11 @@ This document describes B<autoinst> version 20190712. =over 12 +=item I<2019-10-01> + +Handle I<-target> directories with spaces in their path names. +Tweaked messages and logs to make them more useful to the user. + =item I<2019-07-12> Replaced single quotes in calls to F<otfinfo> with double quotes, diff --git a/Build/source/texk/texlive/linked_scripts/fontools/ot2kpx b/Build/source/texk/texlive/linked_scripts/fontools/ot2kpx index 2073d6b6d32..f45c0110780 100755 --- a/Build/source/texk/texlive/linked_scripts/fontools/ot2kpx +++ b/Build/source/texk/texlive/linked_scripts/fontools/ot2kpx @@ -38,7 +38,7 @@ use Getopt::Long (); use List::Util @List::Util::EXPORT_OK; use Pod::Usage; -my $VERSION = "20190712"; +my $VERSION = "20191001"; our ($NUM_GLYPHS, $UNITS_PER_EM, %kern); @@ -858,7 +858,7 @@ See the GNU General Public License for more details. =head1 VERSION -This document describes B<ot2kpx> version 20190712. +This document describes B<ot2kpx> version 20191001. =head1 RECENT CHANGES diff --git a/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua b/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua index 7f0f9dced92..d9f4fe23f8e 100644 --- a/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua +++ b/Build/source/texk/texlive/linked_scripts/l3build/l3build.lua @@ -25,7 +25,7 @@ for those people who are interested. --]] -- Version information -release_date = "2019-09-30" +release_date = "2019-10-02" -- File operations are aided by the LuaFileSystem module local lfs = require("lfs") diff --git a/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md b/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md index 330e7b73ef3..ec89a3f58ae 100644 --- a/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md +++ b/Master/texmf-dist/doc/latex/l3build/CHANGELOG.md @@ -7,6 +7,16 @@ this project uses date-based 'snapshot' version identifiers. ## [Unreleased] +## [2019-10-02] + +### Added + +- `docinit_hook()` + +### Changed + +- Normalise out file paths in all cases + ## [2019-09-30] ### Added @@ -360,7 +370,8 @@ this project uses date-based 'snapshot' version identifiers. - Rationalise short option names: removed `-d`, `-E`, `-r` - Target `cmdcheck`: specific to LaTeX3 kernel work -[Unreleased]: https://github.com/latex3/l3build/compare/2019-09-30...HEAD +[Unreleased]: https://github.com/latex3/l3build/compare/2019-10-02...HEAD +[2019-10-02]: https://github.com/latex3/l3build/compare/2019-09-30...2019-10-02 [2019-09-30]: https://github.com/latex3/l3build/compare/2019-09-29...2019-09-30 [2019-09-29]: https://github.com/latex3/l3build/compare/2019-09-28...2019-09-29 [2019-09-28]: https://github.com/latex3/l3build/compare/2019-09-25...2019-09-28 diff --git a/Master/texmf-dist/doc/latex/l3build/README.md b/Master/texmf-dist/doc/latex/l3build/README.md index 66cc0e28ec5..04fb613e321 100644 --- a/Master/texmf-dist/doc/latex/l3build/README.md +++ b/Master/texmf-dist/doc/latex/l3build/README.md @@ -1,7 +1,7 @@ l3build: a testing and building system for LaTeX3 ================================================= -Release 2019-09-30 +Release 2019-10-02 Overview -------- diff --git a/Master/texmf-dist/doc/latex/l3build/l3build.pdf b/Master/texmf-dist/doc/latex/l3build/l3build.pdf Binary files differindex 41594c4ebba..8a7d3fc1de3 100644 --- a/Master/texmf-dist/doc/latex/l3build/l3build.pdf +++ b/Master/texmf-dist/doc/latex/l3build/l3build.pdf diff --git a/Master/texmf-dist/doc/man/man1/afm2afm.1 b/Master/texmf-dist/doc/man/man1/afm2afm.1 index 259108fa409..f1a41a1f8ff 100644 --- a/Master/texmf-dist/doc/man/man1/afm2afm.1 +++ b/Master/texmf-dist/doc/man/man1/afm2afm.1 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "AFM2AFM 1" -.TH AFM2AFM 1 "2019-07-12" "fontools" "Marc Penninga" +.TH AFM2AFM 1 "2019-10-01" "fontools" "Marc Penninga" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -223,7 +223,7 @@ but \s-1WITHOUT ANY WARRANTY\s0; without even the implied warranty of See the \s-1GNU\s0 General Public License for more details. .SH "VERSION" .IX Header "VERSION" -This document describes \fBafm2afm\fR version 20190712. +This document describes \fBafm2afm\fR version 20191001. .SH "RECENT CHANGES" .IX Header "RECENT CHANGES" (See the source code for the rest of the story.) diff --git a/Master/texmf-dist/doc/man/man1/afm2afm.man1.pdf b/Master/texmf-dist/doc/man/man1/afm2afm.man1.pdf Binary files differindex 86a18f97238..c265469156a 100644 --- a/Master/texmf-dist/doc/man/man1/afm2afm.man1.pdf +++ b/Master/texmf-dist/doc/man/man1/afm2afm.man1.pdf diff --git a/Master/texmf-dist/doc/man/man1/autoinst.1 b/Master/texmf-dist/doc/man/man1/autoinst.1 index f56d519c0d4..7b2e3821f4e 100644 --- a/Master/texmf-dist/doc/man/man1/autoinst.1 +++ b/Master/texmf-dist/doc/man/man1/autoinst.1 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "AUTOINST 1" -.TH AUTOINST 1 "2019-07-12" "fontools" "Marc Penninga" +.TH AUTOINST 1 "2019-10-01" "fontools" "Marc Penninga" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -581,7 +581,7 @@ but don't provide a \*(L"liga\*(R" feature to access these. This option tells \fBautoinst\fR to add extra \f(CW\*(C`LIGKERN\*(C'\fR rules to the generated fonts to enable the use of these ligatures. The default is \fB\-ligatures\fR, -unless the user specified the \fIligatures\fR option. +unless the user specified the \fI\-typewriter\fR option. .Sp Specify \fB\-noligatures\fR to disable the generation of ligatures even for fonts that do contain a \*(L"liga\*(R" feature. @@ -737,10 +737,14 @@ but \s-1WITHOUT ANY WARRANTY\s0; without even the implied warranty of \&\s-1GNU\s0 General Public License for more details. .SH "VERSION" .IX Header "VERSION" -This document describes \fBautoinst\fR version 20190712. +This document describes \fBautoinst\fR version 20191001. .SH "RECENT CHANGES" .IX Header "RECENT CHANGES" (See the source for the full story, all the way back to 2005.) +.IP "\fI2019\-10\-01\fR" 12 +.IX Item "2019-10-01" +Handle \fI\-target\fR directories with spaces in their path names. +Tweaked messages and logs to make them more useful to the user. .IP "\fI2019\-07\-12\fR" 12 .IX Item "2019-07-12" Replaced single quotes in calls to \fIotfinfo\fR with double quotes, diff --git a/Master/texmf-dist/doc/man/man1/autoinst.man1.pdf b/Master/texmf-dist/doc/man/man1/autoinst.man1.pdf Binary files differindex 676795ca618..300cccb4b0a 100644 --- a/Master/texmf-dist/doc/man/man1/autoinst.man1.pdf +++ b/Master/texmf-dist/doc/man/man1/autoinst.man1.pdf diff --git a/Master/texmf-dist/doc/man/man1/l3build.1 b/Master/texmf-dist/doc/man/man1/l3build.1 index 3317114e5b5..91374cd0fab 100644 --- a/Master/texmf-dist/doc/man/man1/l3build.1 +++ b/Master/texmf-dist/doc/man/man1/l3build.1 @@ -1,4 +1,4 @@ -.TH l3build 1 "2019-09-30" +.TH l3build 1 "2019-10-02" .SH NAME l3build \- Checking and building packages .SH SYNOPSIS diff --git a/Master/texmf-dist/doc/man/man1/l3build.man1.pdf b/Master/texmf-dist/doc/man/man1/l3build.man1.pdf Binary files differindex 6eb22ce027f..5971c1d08d3 100644 --- a/Master/texmf-dist/doc/man/man1/l3build.man1.pdf +++ b/Master/texmf-dist/doc/man/man1/l3build.man1.pdf diff --git a/Master/texmf-dist/doc/man/man1/ot2kpx.1 b/Master/texmf-dist/doc/man/man1/ot2kpx.1 index 79b2ebf9c96..a69223b3bfa 100644 --- a/Master/texmf-dist/doc/man/man1/ot2kpx.1 +++ b/Master/texmf-dist/doc/man/man1/ot2kpx.1 @@ -133,7 +133,7 @@ .\" ======================================================================== .\" .IX Title "OT2KPX 1" -.TH OT2KPX 1 "2019-07-12" "fontools" "Marc Penninga" +.TH OT2KPX 1 "2019-10-01" "fontools" "Marc Penninga" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -228,7 +228,7 @@ but \s-1WITHOUT ANY WARRANTY\s0; without even the implied warranty of See the \s-1GNU\s0 General Public License for more details. .SH "VERSION" .IX Header "VERSION" -This document describes \fBot2kpx\fR version 20190712. +This document describes \fBot2kpx\fR version 20191001. .SH "RECENT CHANGES" .IX Header "RECENT CHANGES" (See the source code for the rest of the story.) diff --git a/Master/texmf-dist/doc/man/man1/ot2kpx.man1.pdf b/Master/texmf-dist/doc/man/man1/ot2kpx.man1.pdf Binary files differindex 95915bb54a3..0affd5d46b3 100644 --- a/Master/texmf-dist/doc/man/man1/ot2kpx.man1.pdf +++ b/Master/texmf-dist/doc/man/man1/ot2kpx.man1.pdf diff --git a/Master/texmf-dist/scripts/l3build/l3build-check.lua b/Master/texmf-dist/scripts/l3build/l3build-check.lua index aad03281034..e2cdd655bf8 100644 --- a/Master/texmf-dist/scripts/l3build/l3build-check.lua +++ b/Master/texmf-dist/scripts/l3build/l3build-check.lua @@ -137,22 +137,20 @@ local function normalize_log(content,engine,errlevels) lastline = "" -- Zap ./ at begin of filename line = gsub(line, "%(%.%/", "(") - -- Zap paths if places other than 'here' are accessible - if checksearch then - -- The pattern excludes < and > as the image part can have - -- several entries on one line - local pattern = "%w?:?/[^ %<%>]*/([^/%(%)]*%.%w*)" - -- Files loaded from TeX: all start ( -- ) - line = gsub(line, "%(" .. pattern, "(../%1") - -- Images - line = gsub(line, "<" .. pattern .. ">", "<../%1>") - -- luaotfload files start with keywords - line = gsub(line, "from " .. pattern .. "%(", "from. ./%1(") - line = gsub(line, ": " .. pattern .. "%)", ": ../%1)") - -- Deal with XeTeX specials - if match(line, "^%.+\\XeTeX.?.?.?file") then - line = gsub(line, pattern, "../%1") - end + -- Zap paths + -- The pattern excludes < and > as the image part can have + -- several entries on one line + local pattern = "%w?:?/[^ %<%>]*/([^/%(%)]*%.%w*)" + -- Files loaded from TeX: all start ( -- ) + line = gsub(line, "%(" .. pattern, "(../%1") + -- Images + line = gsub(line, "<" .. pattern .. ">", "<../%1>") + -- luaotfload files start with keywords + line = gsub(line, "from " .. pattern .. "%(", "from. ./%1(") + line = gsub(line, ": " .. pattern .. "%)", ": ../%1)") + -- Deal with XeTeX specials + if match(line, "^%.+\\XeTeX.?.?.?file") then + line = gsub(line, pattern, "../%1") end -- Deal with dates if match(line, "[^<]%d%d%d%d[/%-]%d%d[/%-]%d%d") then diff --git a/Master/texmf-dist/scripts/l3build/l3build-typesetting.lua b/Master/texmf-dist/scripts/l3build/l3build-typesetting.lua index 7f588a7c239..fe6a6a58dcc 100644 --- a/Master/texmf-dist/scripts/l3build/l3build-typesetting.lua +++ b/Master/texmf-dist/scripts/l3build/l3build-typesetting.lua @@ -174,9 +174,7 @@ typeset_demo_tasks = typeset_demo_tasks or function() return 0 end --- Typeset all required documents --- Uses a set of dedicated auxiliaries that need to be available to others -function doc(files) +local function docinit() -- Set up cleandir(typesetdir) for _,filetype in pairs( @@ -199,6 +197,16 @@ function doc(files) if errorlevel ~= 0 then return errorlevel end + return docinit_hook() +end + +docinit_hook = docinit_hook or function() return 0 end + +-- Typeset all required documents +-- Uses a set of dedicated auxiliaries that need to be available to others +function doc(files) + local errorlevel = docinit() + if errorlevel ~= 0 then return errorlevel end local done = {} for _,typesetfiles in ipairs({typesetdemofiles,typesetfiles}) do for _,glob in pairs(typesetfiles) do diff --git a/Master/texmf-dist/scripts/l3build/l3build.lua b/Master/texmf-dist/scripts/l3build/l3build.lua index 7f0f9dced92..d9f4fe23f8e 100755 --- a/Master/texmf-dist/scripts/l3build/l3build.lua +++ b/Master/texmf-dist/scripts/l3build/l3build.lua @@ -25,7 +25,7 @@ for those people who are interested. --]] -- Version information -release_date = "2019-09-30" +release_date = "2019-10-02" -- File operations are aided by the LuaFileSystem module local lfs = require("lfs") diff --git a/Master/texmf-dist/source/latex/l3build/l3build.dtx b/Master/texmf-dist/source/latex/l3build/l3build.dtx index 5c1f0db5ed3..e48fd8b1956 100644 --- a/Master/texmf-dist/source/latex/l3build/l3build.dtx +++ b/Master/texmf-dist/source/latex/l3build/l3build.dtx @@ -231,7 +231,7 @@ % }^^A % } % -% \date{Released 2019-09-30} +% \date{Released 2019-10-02} % % \maketitle % \tableofcontents @@ -1382,6 +1382,11 @@ % \label{fig:PDF} % \end{figure} % +% \subsection{Pre-typesetting hook} +% +% To allow complex set up for typesetting, a hook |docinit_hook()| is available +% to be executed once all standard set up is complete but before any typesetting +% is run. % % \subsection{Automated upload to CTAN} % \label{sec:upload} |