diff options
-rwxr-xr-x | Build/source/texk/texlive/linked_scripts/latexmk/latexmk.pl | 42 | ||||
-rwxr-xr-x | Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl | 10 | ||||
-rw-r--r-- | Master/texmf-dist/doc/man/man1/latexmk.1 | 4 | ||||
-rw-r--r-- | Master/texmf-dist/doc/man/man1/latexmk.man1.pdf | bin | 182837 -> 182287 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/support/latexmk/CHANGES | 4 | ||||
-rw-r--r-- | Master/texmf-dist/doc/support/latexmk/INSTALL | 2 | ||||
-rw-r--r-- | Master/texmf-dist/doc/support/latexmk/README | 6 | ||||
-rw-r--r-- | Master/texmf-dist/doc/support/latexmk/latexmk.pdf | bin | 182806 -> 182408 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/support/latexmk/latexmk.txt | 118 | ||||
-rwxr-xr-x | Master/texmf-dist/scripts/latexmk/latexmk.pl | 42 |
10 files changed, 143 insertions, 85 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/latexmk/latexmk.pl b/Build/source/texk/texlive/linked_scripts/latexmk/latexmk.pl index 343fc01dc6e..9bc55d134b7 100755 --- a/Build/source/texk/texlive/linked_scripts/latexmk/latexmk.pl +++ b/Build/source/texk/texlive/linked_scripts/latexmk/latexmk.pl @@ -1,7 +1,5 @@ #!/usr/bin/env perl -# SEE "POSSIBLE BUG" aournd line 2221 - # ?? Still need to fix bcf error issue. # Don't keep looping after error # pvc: Only re-run on USER FILE CHANGE. @@ -123,13 +121,39 @@ use warnings; $my_name = 'latexmk'; $My_name = 'Latexmk'; -$version_num = '4.54'; -$version_details = "$My_name, John Collins, 20 Nov. 2017"; +$version_num = '4.54c'; +$version_details = "$My_name, John Collins, 12 Dec. 2017"; use Config; use File::Basename; use File::Copy; -use File::Glob ':bsd_glob'; # Better glob. Does not use space as item separator. + +# If possible, use better glob, which does not use space as item separator. +# It's either File::Glob::bsd_glob or File::Glob::glob +# The first does not exist in old versions of Perl, while the second +# is deprecated in more recent versions and will be removed +$have_bsd_glob = 0; +sub my_glob { + if ($have_bsd_glob) { return bsd_glob( $_[0] ); } + else { return glob( $_[0] ); } +} +use File::Glob; +if ( eval{ File::Glob->import('bsd_glob'); 1; } ) { + # Success in importing bsd_glob + $have_bsd_glob = 1; +} +elsif ( eval{ File::Glob->import('glob'); 1; } ) { + warn "$My_name: I could not import File::Glob:bsd_glob, probably because your\n", + " Perl is too old. I have arranged to use the deprecated File::Glob:glob\n", + " instead.\n", + " WARNING: It may malfunction on clean up operation on filenames containing\n", + " spaces.\n"; + $have_bsd_glob = 0; +} +else { + die "Could not import 'File::Glob:bsd_glob' or 'File::Glob:glob'\n"; +} + use File::Path 2.08 qw( make_path ); use FileHandle; use File::Find; @@ -197,6 +221,9 @@ else { ## ## 12 Jan 2012 STILL NEED TO DOCUMENT some items below ## +## 12 Dec 2017 John Collins Further correct bsd_glob fudge (to be in subroutine my_glob) +## 8 Dec 2017 John Collins Correct bsd_glob fudge +## 2 Dec 2017 John Collins Fudge on bsd_glob if it doesn't exist ## 20 Nov 2017 John Collins Ver. 4.54 ## 18 Nov 2017 John Collins Add item to @file_not_found for generic ## package warning about "No file", as produced @@ -3356,7 +3383,7 @@ sub cleanup1 { my $root_fixed = fix_pattern( $root_filename ); foreach (@_) { (my $name = /%R/ ? $_ : "%R.$_") =~ s/%R/${dir}${root_fixed}/; - unlink_or_move( bsd_glob( "$name" ) ); + unlink_or_move( my_glob( "$name" ) ); } } #END cleanup1 @@ -7910,8 +7937,7 @@ sub glob_list1 { push @globbed, $file_spec; } else { - # This glob fails to work as desired, if the pattern contains spaces. - push @globbed, bsd_glob( "$file_spec" ); + push @globbed, my_glob( "$file_spec" ); } } return @globbed; diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl index 431eabca763..63ea4ec37b0 100755 --- a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl +++ b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl @@ -1,13 +1,13 @@ #!/usr/bin/env perl -# $Id: tlmgr.pl 46009 2017-12-07 01:54:36Z preining $ +# $Id: tlmgr.pl 46034 2017-12-11 01:54:21Z preining $ # # Copyright 2008-2017 Norbert Preining # This file is licensed under the GNU General Public License version 2 # or any later version. # -my $svnrev = '$Revision: 46009 $'; -my $datrev = '$Date: 2017-12-07 02:54:36 +0100 (Thu, 07 Dec 2017) $'; +my $svnrev = '$Revision: 46034 $'; +my $datrev = '$Date: 2017-12-11 02:54:21 +0100 (Mon, 11 Dec 2017) $'; my $tlmgrrevision; my $tlmgrversion; my $prg; @@ -1537,6 +1537,8 @@ sub action_info { } # loading of tlpdb is done below } + } elsif (!$what || $what =~ m/^(collections|schemes)$/i) { + $fmt = "list"; } else { $fmt = "detail"; } @@ -9331,7 +9333,7 @@ This script and its documentation were written for the TeX Live distribution (L<http://tug.org/texlive>) and both are licensed under the GNU General Public License Version 2 or later. -$Id: tlmgr.pl 46009 2017-12-07 01:54:36Z preining $ +$Id: tlmgr.pl 46034 2017-12-11 01:54:21Z preining $ =cut # to remake HTML version: pod2html --cachedir=/tmp tlmgr.pl >/tmp/tlmgr.html diff --git a/Master/texmf-dist/doc/man/man1/latexmk.1 b/Master/texmf-dist/doc/man/man1/latexmk.1 index 17d952ea214..33b5fcd2120 100644 --- a/Master/texmf-dist/doc/man/man1/latexmk.1 +++ b/Master/texmf-dist/doc/man/man1/latexmk.1 @@ -1,4 +1,4 @@ -.TH LATEXMK 1 "20 November 2017" "" +.TH LATEXMK 1 "12 December 2017" "" .SH NAME latexmk \- generate LaTeX document .SH SYNOPSIS @@ -3169,7 +3169,7 @@ e-mail addresses are not written in their standard form to avoid being harvested too easily.) .SH AUTHOR Current version, by John Collins (username jcc8 at node psu.edu). -(Version 4.54). +(Version 4.54c). Released version can be obtained from CTAN: <http://www.ctan.org/pkg/latexmk/>, and from the diff --git a/Master/texmf-dist/doc/man/man1/latexmk.man1.pdf b/Master/texmf-dist/doc/man/man1/latexmk.man1.pdf Binary files differindex d3ce7128f26..129af15c0e4 100644 --- a/Master/texmf-dist/doc/man/man1/latexmk.man1.pdf +++ b/Master/texmf-dist/doc/man/man1/latexmk.man1.pdf diff --git a/Master/texmf-dist/doc/support/latexmk/CHANGES b/Master/texmf-dist/doc/support/latexmk/CHANGES index 31e7d53b52d..9ddf73a316a 100644 --- a/Master/texmf-dist/doc/support/latexmk/CHANGES +++ b/Master/texmf-dist/doc/support/latexmk/CHANGES @@ -572,3 +572,7 @@ From v. 4.52c to 4.54 Document $kpsewhich_show variable. Add a sample latexmkrc file for use with bib2gls and glossaries-extra. +From v. 4.54 to 4.54c + Work-around for when bsd_glob is not available on old installations of + Perl. (Note that with these old installations, clean-up operations + may not work when file or directory names contain spaces.) diff --git a/Master/texmf-dist/doc/support/latexmk/INSTALL b/Master/texmf-dist/doc/support/latexmk/INSTALL index 8b0e8a61fc4..590b5d839b8 100644 --- a/Master/texmf-dist/doc/support/latexmk/INSTALL +++ b/Master/texmf-dist/doc/support/latexmk/INSTALL @@ -1,6 +1,6 @@ INSTALLING latexmk ================== - (Version 4.54, 20 November 2017) + (Version 4.54c, 12 December 2017) John Collins Physics Department diff --git a/Master/texmf-dist/doc/support/latexmk/README b/Master/texmf-dist/doc/support/latexmk/README index e65b05fda0a..2026d356a8e 100644 --- a/Master/texmf-dist/doc/support/latexmk/README +++ b/Master/texmf-dist/doc/support/latexmk/README @@ -1,5 +1,5 @@ -Latexmk, version 4.54, 20 November 2017 ---------------------------------------- +Latexmk, version 4.54c, 12 December 2017 +---------------------------------------- Latexmk completely automates the process of generating a LaTeX document. Essentially, it is a highly specialized cousin of the @@ -91,7 +91,7 @@ NOTES:- John Collins ---------------------------- "latexmk -h" ---------------------------- -Latexmk 4.54: Automatic LaTeX document generation routine +Latexmk 4.54c: Automatic LaTeX document generation routine Usage: latexmk [latexmk_options] [filename ...] diff --git a/Master/texmf-dist/doc/support/latexmk/latexmk.pdf b/Master/texmf-dist/doc/support/latexmk/latexmk.pdf Binary files differindex 8d07811f7a2..232ba57b024 100644 --- a/Master/texmf-dist/doc/support/latexmk/latexmk.pdf +++ b/Master/texmf-dist/doc/support/latexmk/latexmk.pdf diff --git a/Master/texmf-dist/doc/support/latexmk/latexmk.txt b/Master/texmf-dist/doc/support/latexmk/latexmk.txt index 8d389e732c0..122f58ad994 100644 --- a/Master/texmf-dist/doc/support/latexmk/latexmk.txt +++ b/Master/texmf-dist/doc/support/latexmk/latexmk.txt @@ -61,7 +61,7 @@ DESCRIPTION - 20 November 2017 1 + 12 December 2017 1 @@ -127,7 +127,7 @@ LATEXMK OPTIONS AND ARGUMENTS ON COMMAND LINE - 20 November 2017 2 + 12 December 2017 2 @@ -193,7 +193,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 20 November 2017 3 + 12 December 2017 3 @@ -259,7 +259,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 20 November 2017 4 + 12 December 2017 4 @@ -325,7 +325,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 20 November 2017 5 + 12 December 2017 5 @@ -391,7 +391,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 20 November 2017 6 + 12 December 2017 6 @@ -457,7 +457,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 20 November 2017 7 + 12 December 2017 7 @@ -523,7 +523,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 20 November 2017 8 + 12 December 2017 8 @@ -589,7 +589,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 20 November 2017 9 + 12 December 2017 9 @@ -655,7 +655,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 20 November 2017 10 + 12 December 2017 10 @@ -721,7 +721,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 20 November 2017 11 + 12 December 2017 11 @@ -787,7 +787,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 20 November 2017 12 + 12 December 2017 12 @@ -853,7 +853,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 20 November 2017 13 + 12 December 2017 13 @@ -919,7 +919,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 20 November 2017 14 + 12 December 2017 14 @@ -985,7 +985,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 20 November 2017 15 + 12 December 2017 15 @@ -1051,7 +1051,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 20 November 2017 16 + 12 December 2017 16 @@ -1117,7 +1117,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 20 November 2017 17 + 12 December 2017 17 @@ -1183,7 +1183,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 20 November 2017 18 + 12 December 2017 18 @@ -1249,7 +1249,7 @@ DEALING WITH ERRORS, PROBLEMS, ETC - 20 November 2017 19 + 12 December 2017 19 @@ -1315,7 +1315,7 @@ CONFIGURATION/INITIALIZATION (RC) FILES - 20 November 2017 20 + 12 December 2017 20 @@ -1381,7 +1381,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 20 November 2017 21 + 12 December 2017 21 @@ -1447,7 +1447,7 @@ FORMAT OF COMMAND SPECIFICATIONS - 20 November 2017 22 + 12 December 2017 22 @@ -1513,7 +1513,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 20 November 2017 23 + 12 December 2017 23 @@ -1579,7 +1579,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 20 November 2017 24 + 12 December 2017 24 @@ -1645,7 +1645,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 20 November 2017 25 + 12 December 2017 25 @@ -1711,7 +1711,7 @@ LIST OF CONFIGURATION VARIABLES USABLE IN INITIALIZATION FILES - 20 November 2017 26 + 12 December 2017 26 @@ -1777,7 +1777,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 20 November 2017 27 + 12 December 2017 27 @@ -1843,7 +1843,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 20 November 2017 28 + 12 December 2017 28 @@ -1909,7 +1909,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 20 November 2017 29 + 12 December 2017 29 @@ -1975,7 +1975,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 20 November 2017 30 + 12 December 2017 30 @@ -2041,7 +2041,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 20 November 2017 31 + 12 December 2017 31 @@ -2107,7 +2107,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 20 November 2017 32 + 12 December 2017 32 @@ -2173,7 +2173,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 20 November 2017 33 + 12 December 2017 33 @@ -2239,7 +2239,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 20 November 2017 34 + 12 December 2017 34 @@ -2305,7 +2305,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 20 November 2017 35 + 12 December 2017 35 @@ -2371,7 +2371,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 20 November 2017 36 + 12 December 2017 36 @@ -2437,7 +2437,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 20 November 2017 37 + 12 December 2017 37 @@ -2503,7 +2503,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 20 November 2017 38 + 12 December 2017 38 @@ -2569,7 +2569,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 20 November 2017 39 + 12 December 2017 39 @@ -2635,7 +2635,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 20 November 2017 40 + 12 December 2017 40 @@ -2701,7 +2701,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 20 November 2017 41 + 12 December 2017 41 @@ -2767,7 +2767,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 20 November 2017 42 + 12 December 2017 42 @@ -2833,7 +2833,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 20 November 2017 43 + 12 December 2017 43 @@ -2899,7 +2899,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 20 November 2017 44 + 12 December 2017 44 @@ -2965,7 +2965,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 20 November 2017 45 + 12 December 2017 45 @@ -3031,7 +3031,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 20 November 2017 46 + 12 December 2017 46 @@ -3097,7 +3097,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 20 November 2017 47 + 12 December 2017 47 @@ -3163,7 +3163,7 @@ CUSTOM DEPENDENCIES - 20 November 2017 48 + 12 December 2017 48 @@ -3229,7 +3229,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 20 November 2017 49 + 12 December 2017 49 @@ -3295,7 +3295,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 20 November 2017 50 + 12 December 2017 50 @@ -3361,7 +3361,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 20 November 2017 51 + 12 December 2017 51 @@ -3427,7 +3427,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 20 November 2017 52 + 12 December 2017 52 @@ -3493,7 +3493,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 20 November 2017 53 + 12 December 2017 53 @@ -3559,7 +3559,7 @@ ADVANCED CONFIGURATION: Some extra resources and advanced tricks - 20 November 2017 54 + 12 December 2017 54 @@ -3625,7 +3625,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 20 November 2017 55 + 12 December 2017 55 @@ -3691,7 +3691,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 20 November 2017 56 + 12 December 2017 56 @@ -3757,7 +3757,7 @@ BUGS - 20 November 2017 57 + 12 December 2017 57 @@ -3787,7 +3787,7 @@ THANKS TO AUTHOR Current version, by John Collins (username jcc8 at node psu.edu). - (Version 4.54). + (Version 4.54c). Released version can be obtained from CTAN: <http://www.ctan.org/pkg/latexmk/>, and from the author's website @@ -3823,6 +3823,6 @@ AUTHOR - 20 November 2017 58 + 12 December 2017 58 diff --git a/Master/texmf-dist/scripts/latexmk/latexmk.pl b/Master/texmf-dist/scripts/latexmk/latexmk.pl index 343fc01dc6e..9bc55d134b7 100755 --- a/Master/texmf-dist/scripts/latexmk/latexmk.pl +++ b/Master/texmf-dist/scripts/latexmk/latexmk.pl @@ -1,7 +1,5 @@ #!/usr/bin/env perl -# SEE "POSSIBLE BUG" aournd line 2221 - # ?? Still need to fix bcf error issue. # Don't keep looping after error # pvc: Only re-run on USER FILE CHANGE. @@ -123,13 +121,39 @@ use warnings; $my_name = 'latexmk'; $My_name = 'Latexmk'; -$version_num = '4.54'; -$version_details = "$My_name, John Collins, 20 Nov. 2017"; +$version_num = '4.54c'; +$version_details = "$My_name, John Collins, 12 Dec. 2017"; use Config; use File::Basename; use File::Copy; -use File::Glob ':bsd_glob'; # Better glob. Does not use space as item separator. + +# If possible, use better glob, which does not use space as item separator. +# It's either File::Glob::bsd_glob or File::Glob::glob +# The first does not exist in old versions of Perl, while the second +# is deprecated in more recent versions and will be removed +$have_bsd_glob = 0; +sub my_glob { + if ($have_bsd_glob) { return bsd_glob( $_[0] ); } + else { return glob( $_[0] ); } +} +use File::Glob; +if ( eval{ File::Glob->import('bsd_glob'); 1; } ) { + # Success in importing bsd_glob + $have_bsd_glob = 1; +} +elsif ( eval{ File::Glob->import('glob'); 1; } ) { + warn "$My_name: I could not import File::Glob:bsd_glob, probably because your\n", + " Perl is too old. I have arranged to use the deprecated File::Glob:glob\n", + " instead.\n", + " WARNING: It may malfunction on clean up operation on filenames containing\n", + " spaces.\n"; + $have_bsd_glob = 0; +} +else { + die "Could not import 'File::Glob:bsd_glob' or 'File::Glob:glob'\n"; +} + use File::Path 2.08 qw( make_path ); use FileHandle; use File::Find; @@ -197,6 +221,9 @@ else { ## ## 12 Jan 2012 STILL NEED TO DOCUMENT some items below ## +## 12 Dec 2017 John Collins Further correct bsd_glob fudge (to be in subroutine my_glob) +## 8 Dec 2017 John Collins Correct bsd_glob fudge +## 2 Dec 2017 John Collins Fudge on bsd_glob if it doesn't exist ## 20 Nov 2017 John Collins Ver. 4.54 ## 18 Nov 2017 John Collins Add item to @file_not_found for generic ## package warning about "No file", as produced @@ -3356,7 +3383,7 @@ sub cleanup1 { my $root_fixed = fix_pattern( $root_filename ); foreach (@_) { (my $name = /%R/ ? $_ : "%R.$_") =~ s/%R/${dir}${root_fixed}/; - unlink_or_move( bsd_glob( "$name" ) ); + unlink_or_move( my_glob( "$name" ) ); } } #END cleanup1 @@ -7910,8 +7937,7 @@ sub glob_list1 { push @globbed, $file_spec; } else { - # This glob fails to work as desired, if the pattern contains spaces. - push @globbed, bsd_glob( "$file_spec" ); + push @globbed, my_glob( "$file_spec" ); } } return @globbed; |