diff options
-rwxr-xr-x | Build/source/texk/texlive/linked_scripts/latexmk/latexmk.pl | 42 | ||||
-rw-r--r-- | Master/texmf-dist/doc/man/man1/latexmk.1 | 4 | ||||
-rw-r--r-- | Master/texmf-dist/doc/support/latexmk/CHANGES | 6 | ||||
-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 | 174411 -> 174414 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/support/latexmk/latexmk.txt | 114 | ||||
-rwxr-xr-x | Master/texmf-dist/scripts/latexmk/latexmk.pl | 42 |
8 files changed, 121 insertions, 95 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/latexmk/latexmk.pl b/Build/source/texk/texlive/linked_scripts/latexmk/latexmk.pl index 4a4d623ebdb..578e7bef23e 100755 --- a/Build/source/texk/texlive/linked_scripts/latexmk/latexmk.pl +++ b/Build/source/texk/texlive/linked_scripts/latexmk/latexmk.pl @@ -121,8 +121,8 @@ use warnings; $my_name = 'latexmk'; $My_name = 'Latexmk'; -$version_num = '4.52'; -$version_details = "$My_name, John Collins, 16 Jan. 2017"; +$version_num = '4.52b'; +$version_details = "$My_name, John Collins, 17 Jan. 2017"; use Config; use File::Basename; @@ -157,7 +157,7 @@ else { warn "Something wrong with the perl configuration: No signals?\n"; } -## Copyright John Collins 1998-2016 +## Copyright John Collins 1998-2017 ## (username jcc8 at node psu.edu) ## (and thanks to David Coppit (username david at node coppit.org) ## for suggestions) @@ -195,6 +195,10 @@ else { ## ## 12 Jan 2012 STILL NEED TO DOCUMENT some items below ## +## 17 Jan 2017 John Collins Fix bbl file detection bug. +## Bbl files were previously only identified +## from occurrence as input files in log +## file rather than from fls as well. ## 16 Jan 2017 John Collins Clean up ## Add extra item to @file_not_found for ## xelatex's characteristic message. @@ -3779,10 +3783,12 @@ sub normalize_force_directory { # ------------------------------ sub parse_log { + # Scan log file for: dependent files # reference_changed, bad_reference, bad_citation # Return value: 1 if success, 0 if no log file. -# Set global variables: +# Put results in UPDATES of global variables (which are normally declared +# local in calling routine, to be suitably scoped): # %dependents: maps definite dependents to code: # 0 = from missing-file line # May have no extension @@ -3815,10 +3821,21 @@ sub parse_log { # This variable is only set when the needed subdirectories don't exist, # and the aux_dir is non-trivial, which results in an error message in # the log file -# Also set +# %conversions Internally made conversions from one file to another +# +# These may have earlier found information in them, so they should NOT +# be initialized. +# +# Also SET # $reference_changed, $bad_reference, $bad_citation -# Trivial or default values if log file does not exist/cannot be opened - +# $pwd_latex +# +# Put in trivial or default values if log file does not exist/cannot be opened +# +# Input globals: $primary_out, $fls_file_analyzed +# + + # Give a quick way of looking up custom-dependency extensions my %cusdep_from = (); my %cusdep_to = (); @@ -3830,14 +3847,6 @@ sub parse_log { # print "==== Cusdep from-exts:"; foreach (keys %cusdep_from) {print " '$_'";} print "\n"; # print "==== Cusdep to-exts:"; foreach (keys %cusdep_to) {print " '$_'";} print "\n"; - # Returned info: - %dependents = (); - @bbl_files = (); - %idx_files = (); # Maps idx_file to (ind_file, base) - %generated_log = (); - %conversions = (); - @missing_subdirs = (); - # Filenames given in log file may be preceded by a pathname # denoting current directory. In MiKTeX, this is an absolute @@ -5345,6 +5354,7 @@ sub rdb_set_latex_deps { # used. foreach (keys %source_fls) { $dependents{$_} = 4; + if ( /\.bbl$/ ) { push @bbl_files, $_; } } foreach (keys %generated_fls) { rdb_add_generated( $_ ); @@ -8152,7 +8162,7 @@ sub kpsewhich { open $fh, "$cmd|" or die "Cannot open pipe for \"$cmd\"\n"; while ( <$fh> ) { - s/(\r|\n)$//; + s/[\r\n]*$//; push @found, $_; } close $fh; diff --git a/Master/texmf-dist/doc/man/man1/latexmk.1 b/Master/texmf-dist/doc/man/man1/latexmk.1 index e5b389b1c5b..e62accde5e9 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 "16 January 2017" "" +.TH LATEXMK 1 "17 January 2017" "" .SH NAME latexmk \- generate LaTeX document .SH SYNOPSIS @@ -3035,7 +3035,7 @@ e-mail addresses are not written in their standard form to avoid being harvested by worms and viruses.) .SH AUTHOR Current version, by John Collins (username jcc8 at node psu.edu). -(Version 4.52). +(Version 4.52b). Released version can be obtained from CTAN: <http://www.ctan.org/pkg/latexmk/>, and from the diff --git a/Master/texmf-dist/doc/support/latexmk/CHANGES b/Master/texmf-dist/doc/support/latexmk/CHANGES index 6d4af373faf..662942e7ad5 100644 --- a/Master/texmf-dist/doc/support/latexmk/CHANGES +++ b/Master/texmf-dist/doc/support/latexmk/CHANGES @@ -528,3 +528,9 @@ From v. 4.48 to 4.52 Work around LuaTeX line-wrapping bug. Update documentation. Minor improvements in code and diagnostics. + +From v. 4.52 to 4.52b + + Fix bug introduced in 4.52 that use of bibtex wasn't always detected + when recorder mode is on. + diff --git a/Master/texmf-dist/doc/support/latexmk/INSTALL b/Master/texmf-dist/doc/support/latexmk/INSTALL index f96d4362919..c1d563e46ff 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.52, 16 January 2017) + (Version 4.52b, 17 January 2017) John Collins Physics Department diff --git a/Master/texmf-dist/doc/support/latexmk/README b/Master/texmf-dist/doc/support/latexmk/README index e3287b023d6..ffd7bcd3ed6 100644 --- a/Master/texmf-dist/doc/support/latexmk/README +++ b/Master/texmf-dist/doc/support/latexmk/README @@ -1,5 +1,5 @@ -Latexmk, version 4.52, 16 January 2017 --------------------------------------- +Latexmk, version 4.52b, 17 January 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.52: Automatic LaTeX document generation routine +Latexmk 4.52b: 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 4375ed2c0b9..54d2e5fdadf 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 876807a13a3..f8d7119c618 100644 --- a/Master/texmf-dist/doc/support/latexmk/latexmk.txt +++ b/Master/texmf-dist/doc/support/latexmk/latexmk.txt @@ -61,7 +61,7 @@ DESCRIPTION - 16 January 2017 1 + 17 January 2017 1 @@ -127,7 +127,7 @@ LATEXMK OPTIONS AND ARGUMENTS ON COMMAND LINE - 16 January 2017 2 + 17 January 2017 2 @@ -193,7 +193,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 16 January 2017 3 + 17 January 2017 3 @@ -259,7 +259,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 16 January 2017 4 + 17 January 2017 4 @@ -325,7 +325,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 16 January 2017 5 + 17 January 2017 5 @@ -391,7 +391,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 16 January 2017 6 + 17 January 2017 6 @@ -457,7 +457,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 16 January 2017 7 + 17 January 2017 7 @@ -523,7 +523,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 16 January 2017 8 + 17 January 2017 8 @@ -589,7 +589,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 16 January 2017 9 + 17 January 2017 9 @@ -655,7 +655,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 16 January 2017 10 + 17 January 2017 10 @@ -721,7 +721,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 16 January 2017 11 + 17 January 2017 11 @@ -787,7 +787,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 16 January 2017 12 + 17 January 2017 12 @@ -853,7 +853,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 16 January 2017 13 + 17 January 2017 13 @@ -919,7 +919,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 16 January 2017 14 + 17 January 2017 14 @@ -985,7 +985,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 16 January 2017 15 + 17 January 2017 15 @@ -1051,7 +1051,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 16 January 2017 16 + 17 January 2017 16 @@ -1117,7 +1117,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 16 January 2017 17 + 17 January 2017 17 @@ -1183,7 +1183,7 @@ DEALING WITH ERRORS, PROBLEMS, ETC - 16 January 2017 18 + 17 January 2017 18 @@ -1249,7 +1249,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 16 January 2017 19 + 17 January 2017 19 @@ -1315,7 +1315,7 @@ CONFIGURATION/INITIALIZATION (RC) FILES - 16 January 2017 20 + 17 January 2017 20 @@ -1381,7 +1381,7 @@ FORMAT OF COMMAND SPECIFICATIONS - 16 January 2017 21 + 17 January 2017 21 @@ -1447,7 +1447,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 16 January 2017 22 + 17 January 2017 22 @@ -1513,7 +1513,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 16 January 2017 23 + 17 January 2017 23 @@ -1579,7 +1579,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 16 January 2017 24 + 17 January 2017 24 @@ -1645,7 +1645,7 @@ LIST OF CONFIGURATION VARIABLES USABLE IN INITIALIZATION FILES - 16 January 2017 25 + 17 January 2017 25 @@ -1711,7 +1711,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 16 January 2017 26 + 17 January 2017 26 @@ -1777,7 +1777,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 16 January 2017 27 + 17 January 2017 27 @@ -1843,7 +1843,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 16 January 2017 28 + 17 January 2017 28 @@ -1909,7 +1909,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 16 January 2017 29 + 17 January 2017 29 @@ -1975,7 +1975,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 16 January 2017 30 + 17 January 2017 30 @@ -2041,7 +2041,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 16 January 2017 31 + 17 January 2017 31 @@ -2107,7 +2107,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 16 January 2017 32 + 17 January 2017 32 @@ -2173,7 +2173,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 16 January 2017 33 + 17 January 2017 33 @@ -2239,7 +2239,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 16 January 2017 34 + 17 January 2017 34 @@ -2305,7 +2305,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 16 January 2017 35 + 17 January 2017 35 @@ -2371,7 +2371,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 16 January 2017 36 + 17 January 2017 36 @@ -2437,7 +2437,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 16 January 2017 37 + 17 January 2017 37 @@ -2503,7 +2503,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 16 January 2017 38 + 17 January 2017 38 @@ -2569,7 +2569,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 16 January 2017 39 + 17 January 2017 39 @@ -2635,7 +2635,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 16 January 2017 40 + 17 January 2017 40 @@ -2701,7 +2701,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 16 January 2017 41 + 17 January 2017 41 @@ -2767,7 +2767,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 16 January 2017 42 + 17 January 2017 42 @@ -2833,7 +2833,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 16 January 2017 43 + 17 January 2017 43 @@ -2899,7 +2899,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 16 January 2017 44 + 17 January 2017 44 @@ -2965,7 +2965,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 16 January 2017 45 + 17 January 2017 45 @@ -3031,7 +3031,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 16 January 2017 46 + 17 January 2017 46 @@ -3097,7 +3097,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 16 January 2017 47 + 17 January 2017 47 @@ -3163,7 +3163,7 @@ CUSTOM DEPENDENCIES - 16 January 2017 48 + 17 January 2017 48 @@ -3229,7 +3229,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 16 January 2017 49 + 17 January 2017 49 @@ -3295,7 +3295,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 16 January 2017 50 + 17 January 2017 50 @@ -3361,7 +3361,7 @@ ADVANCED CONFIGURATION: Some extra resources and advanced tricks - 16 January 2017 51 + 17 January 2017 51 @@ -3427,7 +3427,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 16 January 2017 52 + 17 January 2017 52 @@ -3493,7 +3493,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 16 January 2017 53 + 17 January 2017 53 @@ -3559,7 +3559,7 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 16 January 2017 54 + 17 January 2017 54 @@ -3618,14 +3618,14 @@ THANKS TO AUTHOR Current version, by John Collins (username jcc8 at node psu.edu). - (Version 4.52). + (Version 4.52b). Released version can be obtained from CTAN: <http://www.ctan.org/pkg/latexmk/>, and from the author's website - 16 January 2017 55 + 17 January 2017 55 @@ -3691,6 +3691,6 @@ LATEXMK(1) General Commands Manual LATEXMK(1) - 16 January 2017 56 + 17 January 2017 56 diff --git a/Master/texmf-dist/scripts/latexmk/latexmk.pl b/Master/texmf-dist/scripts/latexmk/latexmk.pl index 4a4d623ebdb..578e7bef23e 100755 --- a/Master/texmf-dist/scripts/latexmk/latexmk.pl +++ b/Master/texmf-dist/scripts/latexmk/latexmk.pl @@ -121,8 +121,8 @@ use warnings; $my_name = 'latexmk'; $My_name = 'Latexmk'; -$version_num = '4.52'; -$version_details = "$My_name, John Collins, 16 Jan. 2017"; +$version_num = '4.52b'; +$version_details = "$My_name, John Collins, 17 Jan. 2017"; use Config; use File::Basename; @@ -157,7 +157,7 @@ else { warn "Something wrong with the perl configuration: No signals?\n"; } -## Copyright John Collins 1998-2016 +## Copyright John Collins 1998-2017 ## (username jcc8 at node psu.edu) ## (and thanks to David Coppit (username david at node coppit.org) ## for suggestions) @@ -195,6 +195,10 @@ else { ## ## 12 Jan 2012 STILL NEED TO DOCUMENT some items below ## +## 17 Jan 2017 John Collins Fix bbl file detection bug. +## Bbl files were previously only identified +## from occurrence as input files in log +## file rather than from fls as well. ## 16 Jan 2017 John Collins Clean up ## Add extra item to @file_not_found for ## xelatex's characteristic message. @@ -3779,10 +3783,12 @@ sub normalize_force_directory { # ------------------------------ sub parse_log { + # Scan log file for: dependent files # reference_changed, bad_reference, bad_citation # Return value: 1 if success, 0 if no log file. -# Set global variables: +# Put results in UPDATES of global variables (which are normally declared +# local in calling routine, to be suitably scoped): # %dependents: maps definite dependents to code: # 0 = from missing-file line # May have no extension @@ -3815,10 +3821,21 @@ sub parse_log { # This variable is only set when the needed subdirectories don't exist, # and the aux_dir is non-trivial, which results in an error message in # the log file -# Also set +# %conversions Internally made conversions from one file to another +# +# These may have earlier found information in them, so they should NOT +# be initialized. +# +# Also SET # $reference_changed, $bad_reference, $bad_citation -# Trivial or default values if log file does not exist/cannot be opened - +# $pwd_latex +# +# Put in trivial or default values if log file does not exist/cannot be opened +# +# Input globals: $primary_out, $fls_file_analyzed +# + + # Give a quick way of looking up custom-dependency extensions my %cusdep_from = (); my %cusdep_to = (); @@ -3830,14 +3847,6 @@ sub parse_log { # print "==== Cusdep from-exts:"; foreach (keys %cusdep_from) {print " '$_'";} print "\n"; # print "==== Cusdep to-exts:"; foreach (keys %cusdep_to) {print " '$_'";} print "\n"; - # Returned info: - %dependents = (); - @bbl_files = (); - %idx_files = (); # Maps idx_file to (ind_file, base) - %generated_log = (); - %conversions = (); - @missing_subdirs = (); - # Filenames given in log file may be preceded by a pathname # denoting current directory. In MiKTeX, this is an absolute @@ -5345,6 +5354,7 @@ sub rdb_set_latex_deps { # used. foreach (keys %source_fls) { $dependents{$_} = 4; + if ( /\.bbl$/ ) { push @bbl_files, $_; } } foreach (keys %generated_fls) { rdb_add_generated( $_ ); @@ -8152,7 +8162,7 @@ sub kpsewhich { open $fh, "$cmd|" or die "Cannot open pipe for \"$cmd\"\n"; while ( <$fh> ) { - s/(\r|\n)$//; + s/[\r\n]*$//; push @found, $_; } close $fh; |