diff options
Diffstat (limited to 'Master')
-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 | 177800 -> 177663 bytes | |||
-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 | 139873 -> 139835 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/support/latexmk/latexmk.txt | 92 | ||||
-rwxr-xr-x | Master/texmf-dist/scripts/latexmk/latexmk.pl | 65 |
8 files changed, 113 insertions, 62 deletions
diff --git a/Master/texmf-dist/doc/man/man1/latexmk.1 b/Master/texmf-dist/doc/man/man1/latexmk.1 index 6d74915dfb1..30f027fa75c 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 1L "24 February 2016" "" +.TH LATEXMK 1L "22 April 2016" "" .SH NAME latexmk \- generate LaTeX document .SH SYNOPSIS @@ -2828,7 +2828,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.44). +(Version 4.45). Released version can be obtained from CTAN: <http://www.ctan.org/tex-archive/support/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 5426082977b..b137535f4f3 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 6c8893896b4..d75786bbb1a 100644 --- a/Master/texmf-dist/doc/support/latexmk/CHANGES +++ b/Master/texmf-dist/doc/support/latexmk/CHANGES @@ -485,3 +485,9 @@ From v. 4.43c to 4.44 file hadn't changed in size.) Correct error handling when biber finds a malformed .bcf file. +From v. 4.44 to 4.45 + Fix problem of -C not always working correctly when compilation was + with -pdf and clear was default. + Fix bug in limiting number of passes when $max_repeat >= 10 + Fix bug in finding id of viewer process id under OS-X + diff --git a/Master/texmf-dist/doc/support/latexmk/INSTALL b/Master/texmf-dist/doc/support/latexmk/INSTALL index c32df3f1d5d..e41cc5004fb 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.44, 24 February 2016) + (Version 4.45, 22 April 2016) John Collins Physics Department diff --git a/Master/texmf-dist/doc/support/latexmk/README b/Master/texmf-dist/doc/support/latexmk/README index b70b5e5384c..93e625a38ae 100644 --- a/Master/texmf-dist/doc/support/latexmk/README +++ b/Master/texmf-dist/doc/support/latexmk/README @@ -1,5 +1,5 @@ -Latexmk, version 4.44, 24 February 2016 ---------------------------------------- +Latexmk, version 4.45, 22 April 2016 +------------------------------------ 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.44: Automatic LaTeX document generation routine +Latexmk 4.45: 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 799292c53d9..f42e2ed8a4a 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 121011730c6..7520751c137 100644 --- a/Master/texmf-dist/doc/support/latexmk/latexmk.txt +++ b/Master/texmf-dist/doc/support/latexmk/latexmk.txt @@ -127,7 +127,7 @@ LATEXMK OPTIONS AND ARGUMENTS ON COMMAND LINE - 24 February 2016 2 + 22 April 2016 2 @@ -195,7 +195,7 @@ LATEXMK(1L) LATEXMK(1L) - 24 February 2016 3 + 22 April 2016 3 @@ -263,7 +263,7 @@ LATEXMK(1L) LATEXMK(1L) - 24 February 2016 4 + 22 April 2016 4 @@ -332,7 +332,7 @@ LATEXMK(1L) LATEXMK(1L) - 24 February 2016 5 + 22 April 2016 5 @@ -403,7 +403,7 @@ LATEXMK(1L) LATEXMK(1L) - 24 February 2016 6 + 22 April 2016 6 @@ -474,7 +474,7 @@ LATEXMK(1L) LATEXMK(1L) - 24 February 2016 7 + 22 April 2016 7 @@ -545,7 +545,7 @@ LATEXMK(1L) LATEXMK(1L) - 24 February 2016 8 + 22 April 2016 8 @@ -616,7 +616,7 @@ LATEXMK(1L) LATEXMK(1L) - 24 February 2016 9 + 22 April 2016 9 @@ -687,7 +687,7 @@ LATEXMK(1L) LATEXMK(1L) - 24 February 2016 10 + 22 April 2016 10 @@ -758,7 +758,7 @@ LATEXMK(1L) LATEXMK(1L) - 24 February 2016 11 + 22 April 2016 11 @@ -829,7 +829,7 @@ LATEXMK(1L) LATEXMK(1L) - 24 February 2016 12 + 22 April 2016 12 @@ -900,7 +900,7 @@ LATEXMK(1L) LATEXMK(1L) - 24 February 2016 13 + 22 April 2016 13 @@ -971,7 +971,7 @@ LATEXMK(1L) LATEXMK(1L) - 24 February 2016 14 + 22 April 2016 14 @@ -1043,7 +1043,7 @@ DEALING WITH ERRORS, PROBLEMS, ETC - 24 February 2016 15 + 22 April 2016 15 @@ -1115,7 +1115,7 @@ LATEXMK(1L) LATEXMK(1L) - 24 February 2016 16 + 22 April 2016 16 @@ -1187,7 +1187,7 @@ HOW TO SET VARIABLES IN INITIALIZATION FILES - 24 February 2016 17 + 22 April 2016 17 @@ -1259,7 +1259,7 @@ FORMAT OF COMMAND SPECIFICATIONS - 24 February 2016 18 + 22 April 2016 18 @@ -1331,7 +1331,7 @@ LATEXMK(1L) LATEXMK(1L) - 24 February 2016 19 + 22 April 2016 19 @@ -1403,7 +1403,7 @@ LATEXMK(1L) LATEXMK(1L) - 24 February 2016 20 + 22 April 2016 20 @@ -1475,7 +1475,7 @@ LATEXMK(1L) LATEXMK(1L) - 24 February 2016 21 + 22 April 2016 21 @@ -1547,7 +1547,7 @@ LIST OF CONFIGURATION VARIABLES USABLE IN INITIALIZATION FILES - 24 February 2016 22 + 22 April 2016 22 @@ -1619,7 +1619,7 @@ LATEXMK(1L) LATEXMK(1L) - 24 February 2016 23 + 22 April 2016 23 @@ -1693,7 +1693,7 @@ LATEXMK(1L) LATEXMK(1L) - 24 February 2016 24 + 22 April 2016 24 @@ -1767,7 +1767,7 @@ LATEXMK(1L) LATEXMK(1L) - 24 February 2016 25 + 22 April 2016 25 @@ -1841,7 +1841,7 @@ LATEXMK(1L) LATEXMK(1L) - 24 February 2016 26 + 22 April 2016 26 @@ -1916,7 +1916,7 @@ LATEXMK(1L) LATEXMK(1L) - 24 February 2016 27 + 22 April 2016 27 @@ -1991,7 +1991,7 @@ LATEXMK(1L) LATEXMK(1L) - 24 February 2016 28 + 22 April 2016 28 @@ -2066,7 +2066,7 @@ LATEXMK(1L) LATEXMK(1L) - 24 February 2016 29 + 22 April 2016 29 @@ -2141,7 +2141,7 @@ LATEXMK(1L) LATEXMK(1L) - 24 February 2016 30 + 22 April 2016 30 @@ -2216,7 +2216,7 @@ LATEXMK(1L) LATEXMK(1L) - 24 February 2016 31 + 22 April 2016 31 @@ -2291,7 +2291,7 @@ LATEXMK(1L) LATEXMK(1L) - 24 February 2016 32 + 22 April 2016 32 @@ -2366,7 +2366,7 @@ LATEXMK(1L) LATEXMK(1L) - 24 February 2016 33 + 22 April 2016 33 @@ -2441,7 +2441,7 @@ LATEXMK(1L) LATEXMK(1L) - 24 February 2016 34 + 22 April 2016 34 @@ -2516,7 +2516,7 @@ LATEXMK(1L) LATEXMK(1L) - 24 February 2016 35 + 22 April 2016 35 @@ -2591,7 +2591,7 @@ LATEXMK(1L) LATEXMK(1L) - 24 February 2016 36 + 22 April 2016 36 @@ -2666,7 +2666,7 @@ LATEXMK(1L) LATEXMK(1L) - 24 February 2016 37 + 22 April 2016 37 @@ -2741,7 +2741,7 @@ LATEXMK(1L) LATEXMK(1L) - 24 February 2016 38 + 22 April 2016 38 @@ -2817,7 +2817,7 @@ CUSTOM DEPENDENCIES - 24 February 2016 39 + 22 April 2016 39 @@ -2893,7 +2893,7 @@ LATEXMK(1L) LATEXMK(1L) - 24 February 2016 40 + 22 April 2016 40 @@ -2969,7 +2969,7 @@ LATEXMK(1L) LATEXMK(1L) - 24 February 2016 41 + 22 April 2016 41 @@ -3045,7 +3045,7 @@ OLD METHOD OF DEFINING CUSTOM DEPENDENCIES - 24 February 2016 42 + 22 April 2016 42 @@ -3121,7 +3121,7 @@ ADVANCED CONFIGURATION: Some extra resources and advanced tricks - 24 February 2016 43 + 22 April 2016 43 @@ -3197,7 +3197,7 @@ LATEXMK(1L) LATEXMK(1L) - 24 February 2016 44 + 22 April 2016 44 @@ -3274,7 +3274,7 @@ BUGS - 24 February 2016 45 + 22 April 2016 45 @@ -3307,7 +3307,7 @@ THANKS TO AUTHOR Current version, by John Collins (username jcc8 at node psu.edu). - (Version 4.44). + (Version 4.45). Released version can be obtained from CTAN: <http://www.ctan.org/tex- archive/support/latexmk/>, and from the author's website @@ -3351,6 +3351,6 @@ AUTHOR - 24 February 2016 46 + 22 April 2016 46 diff --git a/Master/texmf-dist/scripts/latexmk/latexmk.pl b/Master/texmf-dist/scripts/latexmk/latexmk.pl index d04ccebe853..5a9dcea8f4c 100755 --- a/Master/texmf-dist/scripts/latexmk/latexmk.pl +++ b/Master/texmf-dist/scripts/latexmk/latexmk.pl @@ -1,5 +1,11 @@ #!/usr/bin/env perl +# ?? Still need to fix bcf error issue. +# Don't keep looping after error +# pvc: Only re-run on USER FILE CHANGE. +# See # ??????? BCF + + # !!!!!!!!!! Don't forget to document $silence_logfile_warnings.!!! # N.B. !!!!!!!!!!! See 17 July 2012 comments !!!!!!!!!!!!!!!!!! @@ -112,8 +118,8 @@ use warnings; $my_name = 'latexmk'; $My_name = 'Latexmk'; -$version_num = '4.44'; -$version_details = "$My_name, John Collins, 24 February 2016"; +$version_num = '4.45'; +$version_details = "$My_name, John Collins, 22 April 2016"; use Config; use File::Basename; @@ -186,6 +192,16 @@ else { ## ## 12 Jan 2012 STILL NEED TO DOCUMENT some items below ## +## 22 Apr 2016 John Collins Fix problem of -C not always working correctly +## when compilation was with -pdf and clear was default. +## (Correctly default set of rules in rdb_make_rule_list.) +## Ver. 4.45 +## 8 Apr 2016 John Collins Commented out delegated-source diagnostic +## 6 Apr 2016 John Collins Correct " ge " to " >= " +## 27 Mar 2016 John Collins Extra diagnostics in find_process_id +## Fix bug in find_process_id due to extra +## leading space in output of ps under OS-X +## 27 Feb 2016 John Collins Attempt at yet another fix for malformed bcf issue ## 24 Feb 2016 John Collins Further fix for malformed bcf issue ## Locate error, and create dummy bbl file. ## 18 Feb 2016 John Collins Correct use of %hash_calc_ignore_pattern @@ -2213,7 +2229,7 @@ foreach $filename ( @file_list ) # ?? Should I also initialize file database? %rule_list = (); &rdb_make_rule_list; - &rdb_set_rules(\%rule_list, \%extra_rule_spec ); + &rdb_set_rules( \%rule_list, \%extra_rule_spec ); if ( $cleanup_mode > 0 ) { # ?? MAY NEED TO FIX THE FOLLOWING IF $aux_dir or $out_dir IS SET. @@ -2612,9 +2628,11 @@ sub rdb_make_rule_list { ); # Ensure we only have one way to make pdf file, and that it is appropriate: - if ($pdf_mode == 1) { delete $rule_list{'dvipdf'}; delete $rule_list{'ps2pdf'}; } - elsif ($pdf_mode == 2) { delete $rule_list{'dvipdf'}; delete $rule_list{'pdflatex'}; } - else { delete $rule_list{'pdflatex'}; delete $rule_list{'ps2pdf'}; } + if ($pdf_mode == 2) { delete $rule_list{'dvipdf'}; delete $rule_list{'pdflatex'}; } + elsif ($pdf_mode == 3) { delete $rule_list{'pdflatex'}; delete $rule_list{'ps2pdf'}; } + else { # Default is to leave pdflatex + delete $rule_list{'dvipdf'}; delete $rule_list{'ps2pdf'}; + } } # END rdb_make_rule_list @@ -2831,7 +2849,8 @@ sub do_update_view { if $diagnostics ; } elsif ( defined $viewer_update_signal) { - print "$My_name: signalling viewer, process ID $$Pviewer_process\n" + print "$My_name: signalling viewer, process ID $$Pviewer_process ", + "with signal $viewer_update_signal\n" if $diagnostics ; kill $viewer_update_signal, $$Pviewer_process; } @@ -3998,7 +4017,7 @@ LINE: } # Block has ended. if ($block_type eq 'conversion') { -print "=== $delegated_source -> $delegated_output\n"; +#print "=== $delegated_source -> $delegated_output\n"; $new_conversions{$delegated_source} = $delegated_output; } $current_pkg = $block_type @@ -6325,7 +6344,7 @@ sub rdb_make1 { my $return = 0; # Return code from called routine # Rule may have been created since last run: if ( ! defined $pass{$rule} ) {$pass{$rule} = 0; } - if ( $pass{$rule} ge $max_repeat ) { + if ( $pass{$rule} >= $max_repeat ) { # Avoid infinite loop by having a maximum repeat count # Getting here represents some kind of weird error. warn "$My_name: Maximum runs of $rule reached ", @@ -6648,6 +6667,16 @@ sub rdb_run1 { unlink $$Pdest; # The missing bbl file is now not an error: $return = -2; +# ??????? BCF +# Following is intended to work, but creates infinite loop +# in malformed bcf file situation under -pvc. +# since on each check for change in ANY file, pvc finds changed file +# Need to restrict pvc reruns to case of changed USER files +# # To give good properties for (pdf)latex rule, it is best +# # to have a valid bbl file that exists: +# create_empty_file( $$Pdest ); +# $return = 0; + } } if ( $rule =~ /^bibtex/ ) { @@ -6995,6 +7024,7 @@ sub rdb_file_change1 { && ($new_size != $$Psize) ) ) { +#print "========= CHANGED: '$file' from '$$Pfrom_rule'\n"; push @changed, $file; $$Pout_of_date = 1; if ( ! exists $generated_exts_all{$ext_no_period} ) { @@ -7885,6 +7915,17 @@ sub get_checksum_md5 { #************************************************************ #************************************************************ +sub create_empty_file { + my $name = shift; + my $h = new FileHandle ">$name" + or return 1; + close ($h); + return 0; +} + +#************************************************************ +#************************************************************ + sub find_file1 { #?? Need to use kpsewhich, if possible @@ -8506,6 +8547,7 @@ sub find_process_id { my $looking_for = $_[0]; my @ps_output = `$pscmd`; + my @ps_lines = (); # There may be multiple processes. Find only latest, # almost surely the one with the highest process number @@ -8517,9 +8559,10 @@ sub find_process_id { shift(@ps_output); # Discard the header line from ps foreach (@ps_output) { next unless ( /$looking_for/ ) ; + s/^\s*//; my @ps_line = split ('\s+'); -# OLD return($ps_line[$pid_position]); push @found, $ps_line[$pid_position]; + push @ps_lines, $_; } if ($#found < 0) { @@ -8531,6 +8574,8 @@ sub find_process_id { print "Found the following processes concerning '$looking_for'\n", " @found\n", " I will use $found[0]\n"; + print " The relevant lines from '$pscmd' were:\n"; + foreach (@ps_lines) { print " $_"; } } return $found[0]; } |