summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-01-26 23:18:24 +0000
committerKarl Berry <karl@freefriends.org>2011-01-26 23:18:24 +0000
commit0d1a26d0ff0d103cfb7cd990a964a95db1b54292 (patch)
tree2badb4803985bd03902e9d2ab95f96ec78249965
parentbdfa3979f6c54a1f27df35260739300e9d143163 (diff)
latexmk 4.22c (26jan11)
git-svn-id: svn://tug.org/texlive/trunk@21179 c570f23f-e606-0410-a88d-b1316a301751
Diffstat
-rw-r--r--Master/texmf-dist/doc/support/latexmk/CHANGES7
-rw-r--r--Master/texmf-dist/doc/support/latexmk/INSTALL2
-rw-r--r--Master/texmf-dist/doc/support/latexmk/README2
-rw-r--r--Master/texmf-dist/doc/support/latexmk/latexmk.pdfbin86057 -> 85906 bytes
-rw-r--r--Master/texmf-dist/doc/support/latexmk/latexmk.txt68
-rwxr-xr-xMaster/texmf-dist/scripts/latexmk/latexmk.pl28
-rw-r--r--Master/texmf/doc/man/man1/latexmk.14
-rw-r--r--Master/texmf/doc/man/man1/latexmk.man1.pdfbin94058 -> 93862 bytes
8 files changed, 68 insertions, 43 deletions
diff --git a/Master/texmf-dist/doc/support/latexmk/CHANGES b/Master/texmf-dist/doc/support/latexmk/CHANGES
index d233a529cbc..b1450e7c850 100644
--- a/Master/texmf-dist/doc/support/latexmk/CHANGES
+++ b/Master/texmf-dist/doc/support/latexmk/CHANGES
@@ -221,4 +221,9 @@ From v. 4.21 to v. 4.22
bibliographies, with automatic selection of bibtex or biber.
From v. 4.22 to v. 4.22b
- Compatibility with biber 0.7.2
+ Compatibility with biber 0.7.2. (Latexmk failed to detect .bib
+ files used by biber 0.7.2.)
+
+From v. 4.22b to v. 4.22c
+ Biber support is now compatible with MikTeX.
+
diff --git a/Master/texmf-dist/doc/support/latexmk/INSTALL b/Master/texmf-dist/doc/support/latexmk/INSTALL
index c5ac8fa473d..76bda9ad95a 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.22, 1 January 2011)
+ (Version 4.22b, 23 January 2011)
John Collins
Physics Department
diff --git a/Master/texmf-dist/doc/support/latexmk/README b/Master/texmf-dist/doc/support/latexmk/README
index 8f0f3a7fdb8..6bb21a8acf6 100644
--- a/Master/texmf-dist/doc/support/latexmk/README
+++ b/Master/texmf-dist/doc/support/latexmk/README
@@ -92,7 +92,7 @@ NOTES:-
John Collins
---------------------------- "latexmk -h" ----------------------------
-Latexmk 4.22b: Automatic LaTeX document generation routine
+Latexmk 4.22c: 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
index bbffdf7b0cf..b9524e08bf0 100644
--- a/Master/texmf-dist/doc/support/latexmk/latexmk.pdf
+++ b/Master/texmf-dist/doc/support/latexmk/latexmk.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/support/latexmk/latexmk.txt b/Master/texmf-dist/doc/support/latexmk/latexmk.txt
index 7a3f1b53802..2fa5f96837c 100644
--- a/Master/texmf-dist/doc/support/latexmk/latexmk.txt
+++ b/Master/texmf-dist/doc/support/latexmk/latexmk.txt
@@ -61,7 +61,7 @@ DESCRIPTION
- 9 January 2011 1
+ 23 January 2011 1
@@ -127,7 +127,7 @@ LATEXMK OPTIONS AND ARGUMENTS ON COMMAND LINE
- 9 January 2011 2
+ 23 January 2011 2
@@ -193,7 +193,7 @@ LATEXMK(1L) LATEXMK(1L)
- 9 January 2011 3
+ 23 January 2011 3
@@ -259,7 +259,7 @@ LATEXMK(1L) LATEXMK(1L)
- 9 January 2011 4
+ 23 January 2011 4
@@ -325,7 +325,7 @@ LATEXMK(1L) LATEXMK(1L)
- 9 January 2011 5
+ 23 January 2011 5
@@ -391,7 +391,7 @@ LATEXMK(1L) LATEXMK(1L)
- 9 January 2011 6
+ 23 January 2011 6
@@ -457,7 +457,7 @@ LATEXMK(1L) LATEXMK(1L)
- 9 January 2011 7
+ 23 January 2011 7
@@ -523,7 +523,7 @@ LATEXMK(1L) LATEXMK(1L)
- 9 January 2011 8
+ 23 January 2011 8
@@ -589,7 +589,7 @@ LATEXMK(1L) LATEXMK(1L)
- 9 January 2011 9
+ 23 January 2011 9
@@ -655,7 +655,7 @@ CONFIGURATION/INITIALIZATION (RC) FILES
- 9 January 2011 10
+ 23 January 2011 10
@@ -721,7 +721,7 @@ HOW TO SET VARIABLES IN INITIALIZATION FILES
- 9 January 2011 11
+ 23 January 2011 11
@@ -787,7 +787,7 @@ FORMAT OF COMMAND SPECIFICATIONS
- 9 January 2011 12
+ 23 January 2011 12
@@ -853,7 +853,7 @@ LATEXMK(1L) LATEXMK(1L)
- 9 January 2011 13
+ 23 January 2011 13
@@ -919,7 +919,7 @@ LATEXMK(1L) LATEXMK(1L)
- 9 January 2011 14
+ 23 January 2011 14
@@ -985,7 +985,7 @@ LIST OF CONFIGURATION VARIABLES USABLE IN INITIALIZATION FILES
- 9 January 2011 15
+ 23 January 2011 15
@@ -1051,7 +1051,7 @@ LATEXMK(1L) LATEXMK(1L)
- 9 January 2011 16
+ 23 January 2011 16
@@ -1117,7 +1117,7 @@ LATEXMK(1L) LATEXMK(1L)
- 9 January 2011 17
+ 23 January 2011 17
@@ -1183,7 +1183,7 @@ LATEXMK(1L) LATEXMK(1L)
- 9 January 2011 18
+ 23 January 2011 18
@@ -1249,7 +1249,7 @@ LATEXMK(1L) LATEXMK(1L)
- 9 January 2011 19
+ 23 January 2011 19
@@ -1315,7 +1315,7 @@ LATEXMK(1L) LATEXMK(1L)
- 9 January 2011 20
+ 23 January 2011 20
@@ -1381,7 +1381,7 @@ LATEXMK(1L) LATEXMK(1L)
- 9 January 2011 21
+ 23 January 2011 21
@@ -1447,7 +1447,7 @@ LATEXMK(1L) LATEXMK(1L)
- 9 January 2011 22
+ 23 January 2011 22
@@ -1513,7 +1513,7 @@ LATEXMK(1L) LATEXMK(1L)
- 9 January 2011 23
+ 23 January 2011 23
@@ -1579,7 +1579,7 @@ LATEXMK(1L) LATEXMK(1L)
- 9 January 2011 24
+ 23 January 2011 24
@@ -1645,7 +1645,7 @@ LATEXMK(1L) LATEXMK(1L)
- 9 January 2011 25
+ 23 January 2011 25
@@ -1711,7 +1711,7 @@ LATEXMK(1L) LATEXMK(1L)
- 9 January 2011 26
+ 23 January 2011 26
@@ -1777,7 +1777,7 @@ LATEXMK(1L) LATEXMK(1L)
- 9 January 2011 27
+ 23 January 2011 27
@@ -1843,7 +1843,7 @@ LATEXMK(1L) LATEXMK(1L)
- 9 January 2011 28
+ 23 January 2011 28
@@ -1909,7 +1909,7 @@ CUSTOM DEPENDENCIES
- 9 January 2011 29
+ 23 January 2011 29
@@ -1975,7 +1975,7 @@ LATEXMK(1L) LATEXMK(1L)
- 9 January 2011 30
+ 23 January 2011 30
@@ -2041,7 +2041,7 @@ LATEXMK(1L) LATEXMK(1L)
- 9 January 2011 31
+ 23 January 2011 31
@@ -2107,7 +2107,7 @@ BUGS
- 9 January 2011 32
+ 23 January 2011 32
@@ -2135,7 +2135,7 @@ THANKS TO
AUTHOR
Current version, by John Collins (username collins at node
- phys.psu.edu). (Version 4.22b).
+ phys.psu.edu). (Version 4.22c).
Released version can be obtained from CTAN: <http://www.tug.org/tex-ar-
chive/support/latexmk/>, and from the author's website
@@ -2173,6 +2173,6 @@ AUTHOR
- 9 January 2011 33
+ 23 January 2011 33
diff --git a/Master/texmf-dist/scripts/latexmk/latexmk.pl b/Master/texmf-dist/scripts/latexmk/latexmk.pl
index 4353be4b11c..6f6caacc161 100755
--- a/Master/texmf-dist/scripts/latexmk/latexmk.pl
+++ b/Master/texmf-dist/scripts/latexmk/latexmk.pl
@@ -107,8 +107,8 @@ use warnings;
$my_name = 'latexmk';
$My_name = 'Latexmk';
-$version_num = '4.22b';
-$version_details = "$My_name, John Collins, 9 January 2011";
+$version_num = '4.22c';
+$version_details = "$My_name, John Collins, 23 January 2011";
use Config;
@@ -177,6 +177,8 @@ else {
##
## Modification log from 23 Jun 2010 onwards in detail
##
+## 23 Jan 2011, John Collins Fix detection of biber use with MikTeX (which doesn't put
+## openout lines in log file).
## 9 Jan 2011, John Collins Correct parsing of blg file for biber 0.7.2
## 3 Jan 2011, John Collins Small correction on reading .fdb_file
## 1 Jan 2011, John Collins Biber implementation
@@ -4202,8 +4204,8 @@ sub rdb_set_from_logB {
my @new_bst_files = ();
my @biber_source = ( "$bbl_base.bcf" );
my $bib_program = 'bibtex';
- if ( exists $generated_log{"$bbl_base.bcf"} ) {
- $bib_program = 'biber';
+ if ( test_gen_file( "$bbl_base.bcf" ) ) {
+ $bib_program = 'biber';
}
my $from_rule = "$bib_program $bbl_base";
print "======= Dealing with '$from_rule'\n" if ($diagnostics);
@@ -4325,6 +4327,24 @@ NEW_SOURCE:
#************************************************************
+sub test_gen_file {
+ # Usage: test_gen_file( filename )
+ # Tests whether the file was generated during a run of (pdf)latex.
+ # Used by rdb_set_from_logB.
+ # Assumes context for primary rule, and that %generated_log is set.
+ # The generated_log test works with TeXLive's tex, because it puts
+ # \openout lines in log file.
+ # But it doesn't work with MikTeX, which does NOT put \openout lines
+ # in log file.
+ # So we have a back up test: bcf file exists and is at least as new as
+ # the run time (so it should have been generated on the current run).
+ my $file = shift;
+ return exists $generated_log{$file}
+ || ( -e $file && ( get_mtime( $file ) >= $$Prun_time ));
+}
+
+#************************************************************
+
sub rdb_find_new_filesB {
# Call: rdb_find_new_filesB
# Assumes rule context for primary rule.
diff --git a/Master/texmf/doc/man/man1/latexmk.1 b/Master/texmf/doc/man/man1/latexmk.1
index 8b87e672467..70333248db0 100644
--- a/Master/texmf/doc/man/man1/latexmk.1
+++ b/Master/texmf/doc/man/man1/latexmk.1
@@ -1,4 +1,4 @@
-.TH LATEXMK 1L "9 January 2011" ""
+.TH LATEXMK 1L "23 January 2011" ""
.SH NAME
latexmk \- generate LaTeX document
.SH SYNOPSIS
@@ -1768,7 +1768,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.22b).
+(Version 4.22c).
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
index 40af01556d7..b86a4c1d9af 100644
--- a/Master/texmf/doc/man/man1/latexmk.man1.pdf
+++ b/Master/texmf/doc/man/man1/latexmk.man1.pdf
Binary files differ
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-10 16:22:17 +0000