diff options
-rwxr-xr-x | Build/source/texk/texlive/linked_scripts/latexmk/latexmk.pl | 35 | ||||
-rwxr-xr-x | Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl | 8 | ||||
-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 | 4 | ||||
-rw-r--r-- | Master/texmf-dist/doc/support/latexmk/latexmk.pdf | bin | 123867 -> 123878 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/support/latexmk/latexmk.txt | 94 | ||||
-rwxr-xr-x | Master/texmf-dist/scripts/latexmk/latexmk.pl | 35 | ||||
-rw-r--r-- | Master/texmf/doc/man/man1/latexmk.1 | 4 | ||||
-rw-r--r-- | Master/texmf/doc/man/man1/latexmk.man1.pdf | bin | 134537 -> 134539 bytes |
10 files changed, 110 insertions, 76 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/latexmk/latexmk.pl b/Build/source/texk/texlive/linked_scripts/latexmk/latexmk.pl index 0455c015067..f15a73516e2 100755 --- a/Build/source/texk/texlive/linked_scripts/latexmk/latexmk.pl +++ b/Build/source/texk/texlive/linked_scripts/latexmk/latexmk.pl @@ -111,8 +111,8 @@ use warnings; $my_name = 'latexmk'; $My_name = 'Latexmk'; -$version_num = '4.33b'; -$version_details = "$My_name, John Collins, 12 Aug. 2012"; +$version_num = '4.33c'; +$version_details = "$My_name, John Collins, 19 Aug. 2012"; use Config; use File::Copy; @@ -182,6 +182,10 @@ else { ## Modification log from 9 Dec 2011 onwards in detail ## ## 12 Jan 2012 STILL NEED TO DOCUMENT some items below +## 19 Aug 2012 John Collins V. 4.33c +## Correct infinite loop when maximum passes +## exceeded. +## Improve error messages ## 12 Aug 2012 John Collins V. 4.33b ## Improve text displayed by -showextraoptions ## 8 Aug 2012 John Collins V. 4.33a @@ -2271,7 +2275,8 @@ continue { if ( $failure_msg ) { #Remove trailing space $failure_msg =~ s/\s*$//; - warn "$My_name: Did not finish processing file:\n $failure_msg\n"; + warn "$My_name: Did not finish processing file '$filename':\n", + " $failure_msg\n"; $failure = 1; } } @@ -2309,7 +2314,8 @@ if ($failure_count > 0) { @failed_primaries); } if ( !$force_mode ) { - warn "$My_name: Use the -f option to force complete processing.\n"; + warn "$My_name: Use the -f option to force complete processing,\n", + " unless error was exceeding maximum runs of latex/pdflatex.\n"; } exit 12; } @@ -5555,6 +5561,7 @@ sub rdb_make { } PASS: while (1==1) { + # Exit condition at end of body of loop. $runs = 0; my $previous_failure = $failure; $failure = 0; @@ -5565,6 +5572,12 @@ sub rdb_make { if ($diagnostics) { print "MakeB: doing pre_primary and primary...\n"; } + # Do the primary run if it is needed. On return $runs == 0 + # signals that nothing was run (and hence no output + # files changed), either because no input files + # changed and no run was needed, or because the + # number of passes through the rule exceeded the + # limit. In the second case $too_many_runs is set. rdb_for_some( [@pre_primary, $primary], \&rdb_make1 ); if ( ($runs > 0) && ! $too_many_passes ) { next PASS; @@ -5584,7 +5597,10 @@ sub rdb_make { print "MakeB: doing post_primary...\n"; } rdb_for_some( [@post_primary], \&rdb_make1 ); - if ($runs == 0) { + if ( ($runs == 0) || $too_many_passes ) { + # If $too_many_passes is set, it should also be that + # $runs == 0; but for safety, I also checked + # $too_many_passes. last PASS; } } @@ -5758,9 +5774,6 @@ sub rdb_make1 { &rdb_diagnose_changes( "Rule '$rule': " ); } - $rules_applied{$rule} = 1; - $runs++; - # We are applying the rule, so its source file state for when it # was last made is as of now: # ??IS IT CORRECT TO DO NOTHING IN CURRENT VERSION? @@ -5774,8 +5787,6 @@ sub rdb_make1 { # Getting here represents some kind of weird error. warn "$My_name: Maximum runs of $rule reached ", "without getting stable files\n"; - warn " Use the -f option to force complete processing.\n" - if (! $force_mode); $too_many_passes = 1; # Treat rule as completed, else in -pvc mode get infinite reruns: $$Pout_of_date = 0; @@ -5783,6 +5794,10 @@ sub rdb_make1 { $failure_msg = "'$rule' needed too many passes"; return; } + + $rules_applied{$rule} = 1; + $runs++; + $pass{$rule}++; if ($bibtex_not_run > 0) { if ($bibtex_not_run == 1 ) { diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl index bdf314f2d2e..ea05a4c7abc 100755 --- a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl +++ b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl @@ -1,12 +1,12 @@ #!/usr/bin/env perl -# $Id: tlmgr.pl 27356 2012-08-09 23:46:20Z karl $ +# $Id: tlmgr.pl 27413 2012-08-15 22:26:59Z karl $ # # Copyright 2008, 2009, 2010, 2011, 2012 Norbert Preining # This file is licensed under the GNU General Public License version 2 # or any later version. -my $svnrev = '$Revision: 27356 $'; -my $datrev = '$Date: 2012-08-10 01:46:20 +0200 (Fri, 10 Aug 2012) $'; +my $svnrev = '$Revision: 27413 $'; +my $datrev = '$Date: 2012-08-16 00:26:59 +0200 (Thu, 16 Aug 2012) $'; my $tlmgrrevision; my $prg; if ($svnrev =~ m/: ([0-9]+) /) { @@ -5730,7 +5730,7 @@ debugging. =item B<--debug-translation> In GUI mode, this switch makes C<tlmgr> report any missing, or more -likely untranslated, messages to standard error. Helpful for +likely untranslated, messages to standard error. This can help translators to see what remains to be done. =back diff --git a/Master/texmf-dist/doc/support/latexmk/CHANGES b/Master/texmf-dist/doc/support/latexmk/CHANGES index 1ed417667a9..81bdfa85bd8 100644 --- a/Master/texmf-dist/doc/support/latexmk/CHANGES +++ b/Master/texmf-dist/doc/support/latexmk/CHANGES @@ -377,3 +377,7 @@ From v. 4.33a to 4.33b Documentation improvements. Improve text displayed by using -showextraoptions option. +From v. 4.33b to 4.33c + Correct infinite loop when maximum passes through latex/pdflatex + are exceeded + diff --git a/Master/texmf-dist/doc/support/latexmk/INSTALL b/Master/texmf-dist/doc/support/latexmk/INSTALL index 5dbd3f37d4d..026edcbc4e9 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.33b, 12 August 2012) + (Version 4.33c, 19 August 2012) John Collins Physics Department diff --git a/Master/texmf-dist/doc/support/latexmk/README b/Master/texmf-dist/doc/support/latexmk/README index 86efd99d724..b9699a8cbe3 100644 --- a/Master/texmf-dist/doc/support/latexmk/README +++ b/Master/texmf-dist/doc/support/latexmk/README @@ -1,4 +1,4 @@ -Latexmk, version 4.33b, 12 August 2012 +Latexmk, version 4.33c, 19 August 2012 -------------------------------------- Latexmk completely automates the process of generating a LaTeX @@ -92,7 +92,7 @@ NOTES:- John Collins ---------------------------- "latexmk -h" ---------------------------- -Latexmk 4.33b: Automatic LaTeX document generation routine +Latexmk 4.33c: 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 eb3c014fe72..c731ddd5310 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 d863416b651..698ab117471 100644 --- a/Master/texmf-dist/doc/support/latexmk/latexmk.txt +++ b/Master/texmf-dist/doc/support/latexmk/latexmk.txt @@ -61,7 +61,7 @@ DESCRIPTION - 12 August 2012 1 + 19 August 2012 1 @@ -127,7 +127,7 @@ LATEXMK OPTIONS AND ARGUMENTS ON COMMAND LINE - 12 August 2012 2 + 19 August 2012 2 @@ -193,7 +193,7 @@ LATEXMK(1L) LATEXMK(1L) - 12 August 2012 3 + 19 August 2012 3 @@ -259,7 +259,7 @@ LATEXMK(1L) LATEXMK(1L) - 12 August 2012 4 + 19 August 2012 4 @@ -325,7 +325,7 @@ LATEXMK(1L) LATEXMK(1L) - 12 August 2012 5 + 19 August 2012 5 @@ -391,7 +391,7 @@ LATEXMK(1L) LATEXMK(1L) - 12 August 2012 6 + 19 August 2012 6 @@ -457,7 +457,7 @@ LATEXMK(1L) LATEXMK(1L) - 12 August 2012 7 + 19 August 2012 7 @@ -523,7 +523,7 @@ LATEXMK(1L) LATEXMK(1L) - 12 August 2012 8 + 19 August 2012 8 @@ -589,7 +589,7 @@ LATEXMK(1L) LATEXMK(1L) - 12 August 2012 9 + 19 August 2012 9 @@ -655,7 +655,7 @@ LATEXMK(1L) LATEXMK(1L) - 12 August 2012 10 + 19 August 2012 10 @@ -721,7 +721,7 @@ LATEXMK(1L) LATEXMK(1L) - 12 August 2012 11 + 19 August 2012 11 @@ -787,7 +787,7 @@ LATEXMK(1L) LATEXMK(1L) - 12 August 2012 12 + 19 August 2012 12 @@ -853,7 +853,7 @@ LATEXMK(1L) LATEXMK(1L) - 12 August 2012 13 + 19 August 2012 13 @@ -919,7 +919,7 @@ EXAMPLES - 12 August 2012 14 + 19 August 2012 14 @@ -985,7 +985,7 @@ CONFIGURATION/INITIALIZATION (RC) FILES - 12 August 2012 15 + 19 August 2012 15 @@ -1051,7 +1051,7 @@ FORMAT OF COMMAND SPECIFICATIONS - 12 August 2012 16 + 19 August 2012 16 @@ -1117,7 +1117,7 @@ LATEXMK(1L) LATEXMK(1L) - 12 August 2012 17 + 19 August 2012 17 @@ -1183,7 +1183,7 @@ LATEXMK(1L) LATEXMK(1L) - 12 August 2012 18 + 19 August 2012 18 @@ -1249,7 +1249,7 @@ LATEXMK(1L) LATEXMK(1L) - 12 August 2012 19 + 19 August 2012 19 @@ -1315,7 +1315,7 @@ LIST OF CONFIGURATION VARIABLES USABLE IN INITIALIZATION FILES - 12 August 2012 20 + 19 August 2012 20 @@ -1381,7 +1381,7 @@ LATEXMK(1L) LATEXMK(1L) - 12 August 2012 21 + 19 August 2012 21 @@ -1447,7 +1447,7 @@ LATEXMK(1L) LATEXMK(1L) - 12 August 2012 22 + 19 August 2012 22 @@ -1513,7 +1513,7 @@ LATEXMK(1L) LATEXMK(1L) - 12 August 2012 23 + 19 August 2012 23 @@ -1579,7 +1579,7 @@ LATEXMK(1L) LATEXMK(1L) - 12 August 2012 24 + 19 August 2012 24 @@ -1645,7 +1645,7 @@ LATEXMK(1L) LATEXMK(1L) - 12 August 2012 25 + 19 August 2012 25 @@ -1711,7 +1711,7 @@ LATEXMK(1L) LATEXMK(1L) - 12 August 2012 26 + 19 August 2012 26 @@ -1777,7 +1777,7 @@ LATEXMK(1L) LATEXMK(1L) - 12 August 2012 27 + 19 August 2012 27 @@ -1843,7 +1843,7 @@ LATEXMK(1L) LATEXMK(1L) - 12 August 2012 28 + 19 August 2012 28 @@ -1909,7 +1909,7 @@ LATEXMK(1L) LATEXMK(1L) - 12 August 2012 29 + 19 August 2012 29 @@ -1975,7 +1975,7 @@ LATEXMK(1L) LATEXMK(1L) - 12 August 2012 30 + 19 August 2012 30 @@ -2041,7 +2041,7 @@ LATEXMK(1L) LATEXMK(1L) - 12 August 2012 31 + 19 August 2012 31 @@ -2107,7 +2107,7 @@ LATEXMK(1L) LATEXMK(1L) - 12 August 2012 32 + 19 August 2012 32 @@ -2173,7 +2173,7 @@ LATEXMK(1L) LATEXMK(1L) - 12 August 2012 33 + 19 August 2012 33 @@ -2239,7 +2239,7 @@ LATEXMK(1L) LATEXMK(1L) - 12 August 2012 34 + 19 August 2012 34 @@ -2305,7 +2305,7 @@ LATEXMK(1L) LATEXMK(1L) - 12 August 2012 35 + 19 August 2012 35 @@ -2371,7 +2371,7 @@ LATEXMK(1L) LATEXMK(1L) - 12 August 2012 36 + 19 August 2012 36 @@ -2437,7 +2437,7 @@ LATEXMK(1L) LATEXMK(1L) - 12 August 2012 37 + 19 August 2012 37 @@ -2503,7 +2503,7 @@ LATEXMK(1L) LATEXMK(1L) - 12 August 2012 38 + 19 August 2012 38 @@ -2569,7 +2569,7 @@ LATEXMK(1L) LATEXMK(1L) - 12 August 2012 39 + 19 August 2012 39 @@ -2635,7 +2635,7 @@ CUSTOM DEPENDENCIES - 12 August 2012 40 + 19 August 2012 40 @@ -2701,7 +2701,7 @@ LATEXMK(1L) LATEXMK(1L) - 12 August 2012 41 + 19 August 2012 41 @@ -2767,7 +2767,7 @@ LATEXMK(1L) LATEXMK(1L) - 12 August 2012 42 + 19 August 2012 42 @@ -2833,7 +2833,7 @@ USING latexmk WITH make - 12 August 2012 43 + 19 August 2012 43 @@ -2899,7 +2899,7 @@ LATEXMK(1L) LATEXMK(1L) - 12 August 2012 44 + 19 August 2012 44 @@ -2965,7 +2965,7 @@ BUGS - 12 August 2012 45 + 19 August 2012 45 @@ -2995,7 +2995,7 @@ THANKS TO AUTHOR Current version, by John Collins (username collins at node - phys.psu.edu). (Version 4.33b). + phys.psu.edu). (Version 4.33c). Released version can be obtained from CTAN: <http://www.tug.org/tex-ar- chive/support/latexmk/>, and from the author's website @@ -3031,6 +3031,6 @@ AUTHOR - 12 August 2012 46 + 19 August 2012 46 diff --git a/Master/texmf-dist/scripts/latexmk/latexmk.pl b/Master/texmf-dist/scripts/latexmk/latexmk.pl index 0455c015067..f15a73516e2 100755 --- a/Master/texmf-dist/scripts/latexmk/latexmk.pl +++ b/Master/texmf-dist/scripts/latexmk/latexmk.pl @@ -111,8 +111,8 @@ use warnings; $my_name = 'latexmk'; $My_name = 'Latexmk'; -$version_num = '4.33b'; -$version_details = "$My_name, John Collins, 12 Aug. 2012"; +$version_num = '4.33c'; +$version_details = "$My_name, John Collins, 19 Aug. 2012"; use Config; use File::Copy; @@ -182,6 +182,10 @@ else { ## Modification log from 9 Dec 2011 onwards in detail ## ## 12 Jan 2012 STILL NEED TO DOCUMENT some items below +## 19 Aug 2012 John Collins V. 4.33c +## Correct infinite loop when maximum passes +## exceeded. +## Improve error messages ## 12 Aug 2012 John Collins V. 4.33b ## Improve text displayed by -showextraoptions ## 8 Aug 2012 John Collins V. 4.33a @@ -2271,7 +2275,8 @@ continue { if ( $failure_msg ) { #Remove trailing space $failure_msg =~ s/\s*$//; - warn "$My_name: Did not finish processing file:\n $failure_msg\n"; + warn "$My_name: Did not finish processing file '$filename':\n", + " $failure_msg\n"; $failure = 1; } } @@ -2309,7 +2314,8 @@ if ($failure_count > 0) { @failed_primaries); } if ( !$force_mode ) { - warn "$My_name: Use the -f option to force complete processing.\n"; + warn "$My_name: Use the -f option to force complete processing,\n", + " unless error was exceeding maximum runs of latex/pdflatex.\n"; } exit 12; } @@ -5555,6 +5561,7 @@ sub rdb_make { } PASS: while (1==1) { + # Exit condition at end of body of loop. $runs = 0; my $previous_failure = $failure; $failure = 0; @@ -5565,6 +5572,12 @@ sub rdb_make { if ($diagnostics) { print "MakeB: doing pre_primary and primary...\n"; } + # Do the primary run if it is needed. On return $runs == 0 + # signals that nothing was run (and hence no output + # files changed), either because no input files + # changed and no run was needed, or because the + # number of passes through the rule exceeded the + # limit. In the second case $too_many_runs is set. rdb_for_some( [@pre_primary, $primary], \&rdb_make1 ); if ( ($runs > 0) && ! $too_many_passes ) { next PASS; @@ -5584,7 +5597,10 @@ sub rdb_make { print "MakeB: doing post_primary...\n"; } rdb_for_some( [@post_primary], \&rdb_make1 ); - if ($runs == 0) { + if ( ($runs == 0) || $too_many_passes ) { + # If $too_many_passes is set, it should also be that + # $runs == 0; but for safety, I also checked + # $too_many_passes. last PASS; } } @@ -5758,9 +5774,6 @@ sub rdb_make1 { &rdb_diagnose_changes( "Rule '$rule': " ); } - $rules_applied{$rule} = 1; - $runs++; - # We are applying the rule, so its source file state for when it # was last made is as of now: # ??IS IT CORRECT TO DO NOTHING IN CURRENT VERSION? @@ -5774,8 +5787,6 @@ sub rdb_make1 { # Getting here represents some kind of weird error. warn "$My_name: Maximum runs of $rule reached ", "without getting stable files\n"; - warn " Use the -f option to force complete processing.\n" - if (! $force_mode); $too_many_passes = 1; # Treat rule as completed, else in -pvc mode get infinite reruns: $$Pout_of_date = 0; @@ -5783,6 +5794,10 @@ sub rdb_make1 { $failure_msg = "'$rule' needed too many passes"; return; } + + $rules_applied{$rule} = 1; + $runs++; + $pass{$rule}++; if ($bibtex_not_run > 0) { if ($bibtex_not_run == 1 ) { diff --git a/Master/texmf/doc/man/man1/latexmk.1 b/Master/texmf/doc/man/man1/latexmk.1 index d6df6565e50..4e17db532a5 100644 --- a/Master/texmf/doc/man/man1/latexmk.1 +++ b/Master/texmf/doc/man/man1/latexmk.1 @@ -1,4 +1,4 @@ -.TH LATEXMK 1L "12 August 2012" "" +.TH LATEXMK 1L "19 August 2012" "" .SH NAME latexmk \- generate LaTeX document .SH SYNOPSIS @@ -2491,7 +2491,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 collins at node phys.psu.edu). -(Version 4.33b). +(Version 4.33c). Released version can be obtained from CTAN: <http://www.tug.org/tex-archive/support/latexmk/>, and from the diff --git a/Master/texmf/doc/man/man1/latexmk.man1.pdf b/Master/texmf/doc/man/man1/latexmk.man1.pdf Binary files differindex 46ddae74617..c902b34eb39 100644 --- a/Master/texmf/doc/man/man1/latexmk.man1.pdf +++ b/Master/texmf/doc/man/man1/latexmk.man1.pdf |