summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-04-20 01:04:31 +0000
committerKarl Berry <karl@freefriends.org>2011-04-20 01:04:31 +0000
commit6562410aa7be0e58aec2b49117209f37b95e1f70 (patch)
tree24703f542fbd823ad7ea3c51f7b56e0671bf1b9c
parent251fba88ba88c1933446fe148caa2329687c5b17 (diff)
latexmk (19apr11)
git-svn-id: svn://tug.org/texlive/trunk@22132 c570f23f-e606-0410-a88d-b1316a301751
Diffstat
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/latexmk/latexmk.pl23
-rw-r--r--Master/texmf-dist/doc/support/latexmk/CHANGES3
-rw-r--r--Master/texmf-dist/doc/support/latexmk/INSTALL2
-rw-r--r--Master/texmf-dist/doc/support/latexmk/README6
-rw-r--r--Master/texmf-dist/doc/support/latexmk/latexmk.pdfbin95808 -> 95803 bytes
-rw-r--r--Master/texmf-dist/doc/support/latexmk/latexmk.txt72
-rwxr-xr-xMaster/texmf-dist/scripts/latexmk/latexmk.pl23
-rw-r--r--Master/texmf/doc/man/man1/latexmk.14
-rw-r--r--Master/texmf/doc/man/man1/latexmk.man1.pdfbin108188 -> 108193 bytes
9 files changed, 79 insertions, 54 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/latexmk/latexmk.pl b/Build/source/texk/texlive/linked_scripts/latexmk/latexmk.pl
index 074b496eea1..c5deb79cfac 100755
--- a/Build/source/texk/texlive/linked_scripts/latexmk/latexmk.pl
+++ b/Build/source/texk/texlive/linked_scripts/latexmk/latexmk.pl
@@ -107,8 +107,8 @@ use warnings;
$my_name = 'latexmk';
$My_name = 'Latexmk';
-$version_num = '4.23';
-$version_details = "$My_name, John Collins, 21 March 2011";
+$version_num = '4.23a';
+$version_details = "$My_name, John Collins, 24 March 2011";
use Config;
@@ -177,6 +177,8 @@ else {
##
## Modification log from 1 Jan 2011 onwards in detail
##
+## 24 Mar 2011, John Collins Correct bug in detection of source files
+## listed in .fls
## 21 Mar 2011, John Collins Add 'bcf' to list of generated extensions
## Deal with case that fls files are latex.fls and pdflatex.fls
## 19--21 Mar 2011, John Collins -deps and -rules options
@@ -4140,11 +4142,14 @@ sub rdb_set_latex_deps {
my $fls_file = "$root_filename.fls";
if ($recorder && test_gen_file($fls_file) ) {
parse_fls( $fls_file, \%source_fls, \%generated_fls );
- foreach (keys %source_fls) {
- rdb_ensure_file( $rule, $_ );
+ foreach (keys %source_fls) {
+ $dependents{$_} = 4;
}
foreach (keys %generated_fls) {
rdb_add_generated( $_ );
+ if ( exists($dependents{$_}) ) {
+ $dependents{$_} = 6;
+ }
}
}
# ?? !! Should also deal with .run.xml file
@@ -4262,7 +4267,8 @@ NEW_SOURCE:
print " ===Source file for rule '$rule': '$new_source'\n"
if ($diagnostics);
if ( ($dependents{$new_source} == 5)
- || ($dependents{$new_source} == 6) ) {
+ || ($dependents{$new_source} == 6)
+ ) {
# (a) File was detected in "No file..." line in log file.
# Typically file was searched for early in run of
# latex/pdflatex, was not found, and then was written
@@ -4294,6 +4300,11 @@ NEW_SOURCE:
# (or for files that are generated outside of latex/pdflatex).
rdb_ensure_file( $rule, $new_source );
}
+ if ( ($dependents{$new_source} == 6)
+ || ($dependents{$new_source} == 7)
+ ) {
+ rdb_add_generated($new_source);
+ }
}
my @more_sources = &rdb_set_dependentsA( $rule );
@@ -6067,7 +6078,7 @@ sub rdb_add_generated {
foreach (@_) {
$$PHdest{$_} = 1;
}
-} #END rdb_initialize_generated
+} #END rdb_add_generated
#************************************************************
diff --git a/Master/texmf-dist/doc/support/latexmk/CHANGES b/Master/texmf-dist/doc/support/latexmk/CHANGES
index c046c2857a7..9a5e3776db5 100644
--- a/Master/texmf-dist/doc/support/latexmk/CHANGES
+++ b/Master/texmf-dist/doc/support/latexmk/CHANGES
@@ -249,3 +249,6 @@ From v. 4.22e to v. 4.23
-deps, -deps-out, -use-make)
-recorder option for improved detection of input and output files.
+From v. 4.23 to v. 4.23a
+ Correct bug in detection of source files listed in .fls file
+
diff --git a/Master/texmf-dist/doc/support/latexmk/INSTALL b/Master/texmf-dist/doc/support/latexmk/INSTALL
index b6b1966e736..0835c9d19c5 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.23, 19 March 2011)
+ (Version 4.23a, 24 March 2011)
John Collins
Physics Department
diff --git a/Master/texmf-dist/doc/support/latexmk/README b/Master/texmf-dist/doc/support/latexmk/README
index 196f0e6a392..11c987b4ac7 100644
--- a/Master/texmf-dist/doc/support/latexmk/README
+++ b/Master/texmf-dist/doc/support/latexmk/README
@@ -1,5 +1,5 @@
-Latexmk, version 4.23, 19 Mar. 2011
------------------------------------
+Latexmk, version 4.23a, 24 Mar. 2011
+------------------------------------
Latexmk completely automates the process of generating a LaTeX
document. Essentially, it is a highly specialized cousin of the
@@ -92,7 +92,7 @@ NOTES:-
John Collins
---------------------------- "latexmk -h" ----------------------------
-Latexmk 4.23: Automatic LaTeX document generation routine
+Latexmk 4.23a: 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 0cd8f9ef2ae..a852b80a29c 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 8ccb793ca4b..f0205d3f8e0 100644
--- a/Master/texmf-dist/doc/support/latexmk/latexmk.txt
+++ b/Master/texmf-dist/doc/support/latexmk/latexmk.txt
@@ -128,7 +128,7 @@ LATEXMK OPTIONS AND ARGUMENTS ON COMMAND LINE
- 21 March 2011 2
+ 24 March 2011 2
@@ -195,7 +195,7 @@ LATEXMK(1L) LATEXMK(1L)
- 21 March 2011 3
+ 24 March 2011 3
@@ -262,7 +262,7 @@ LATEXMK(1L) LATEXMK(1L)
- 21 March 2011 4
+ 24 March 2011 4
@@ -329,7 +329,7 @@ LATEXMK(1L) LATEXMK(1L)
- 21 March 2011 5
+ 24 March 2011 5
@@ -397,7 +397,7 @@ LATEXMK(1L) LATEXMK(1L)
- 21 March 2011 6
+ 24 March 2011 6
@@ -465,7 +465,7 @@ LATEXMK(1L) LATEXMK(1L)
- 21 March 2011 7
+ 24 March 2011 7
@@ -533,7 +533,7 @@ LATEXMK(1L) LATEXMK(1L)
- 21 March 2011 8
+ 24 March 2011 8
@@ -601,7 +601,7 @@ LATEXMK(1L) LATEXMK(1L)
- 21 March 2011 9
+ 24 March 2011 9
@@ -669,7 +669,7 @@ LATEXMK(1L) LATEXMK(1L)
- 21 March 2011 10
+ 24 March 2011 10
@@ -737,7 +737,7 @@ CONFIGURATION/INITIALIZATION (RC) FILES
- 21 March 2011 11
+ 24 March 2011 11
@@ -805,7 +805,7 @@ HOW TO SET VARIABLES IN INITIALIZATION FILES
- 21 March 2011 12
+ 24 March 2011 12
@@ -873,7 +873,7 @@ FORMAT OF COMMAND SPECIFICATIONS
- 21 March 2011 13
+ 24 March 2011 13
@@ -941,7 +941,7 @@ LATEXMK(1L) LATEXMK(1L)
- 21 March 2011 14
+ 24 March 2011 14
@@ -1009,7 +1009,7 @@ LATEXMK(1L) LATEXMK(1L)
- 21 March 2011 15
+ 24 March 2011 15
@@ -1077,7 +1077,7 @@ LIST OF CONFIGURATION VARIABLES USABLE IN INITIALIZATION FILES
- 21 March 2011 16
+ 24 March 2011 16
@@ -1145,7 +1145,7 @@ LATEXMK(1L) LATEXMK(1L)
- 21 March 2011 17
+ 24 March 2011 17
@@ -1213,7 +1213,7 @@ LATEXMK(1L) LATEXMK(1L)
- 21 March 2011 18
+ 24 March 2011 18
@@ -1282,7 +1282,7 @@ LATEXMK(1L) LATEXMK(1L)
- 21 March 2011 19
+ 24 March 2011 19
@@ -1351,7 +1351,7 @@ LATEXMK(1L) LATEXMK(1L)
- 21 March 2011 20
+ 24 March 2011 20
@@ -1420,7 +1420,7 @@ LATEXMK(1L) LATEXMK(1L)
- 21 March 2011 21
+ 24 March 2011 21
@@ -1490,7 +1490,7 @@ LATEXMK(1L) LATEXMK(1L)
- 21 March 2011 22
+ 24 March 2011 22
@@ -1560,7 +1560,7 @@ LATEXMK(1L) LATEXMK(1L)
- 21 March 2011 23
+ 24 March 2011 23
@@ -1630,7 +1630,7 @@ LATEXMK(1L) LATEXMK(1L)
- 21 March 2011 24
+ 24 March 2011 24
@@ -1702,7 +1702,7 @@ LATEXMK(1L) LATEXMK(1L)
- 21 March 2011 25
+ 24 March 2011 25
@@ -1774,7 +1774,7 @@ LATEXMK(1L) LATEXMK(1L)
- 21 March 2011 26
+ 24 March 2011 26
@@ -1846,7 +1846,7 @@ LATEXMK(1L) LATEXMK(1L)
- 21 March 2011 27
+ 24 March 2011 27
@@ -1918,7 +1918,7 @@ LATEXMK(1L) LATEXMK(1L)
- 21 March 2011 28
+ 24 March 2011 28
@@ -1990,7 +1990,7 @@ LATEXMK(1L) LATEXMK(1L)
- 21 March 2011 29
+ 24 March 2011 29
@@ -2062,7 +2062,7 @@ CUSTOM DEPENDENCIES
- 21 March 2011 30
+ 24 March 2011 30
@@ -2134,7 +2134,7 @@ LATEXMK(1L) LATEXMK(1L)
- 21 March 2011 31
+ 24 March 2011 31
@@ -2206,7 +2206,7 @@ OLD METHOD OF DEFINING CUSTOM DEPENDENCIES
- 21 March 2011 32
+ 24 March 2011 32
@@ -2278,7 +2278,7 @@ USING latexmk WITH make
- 21 March 2011 33
+ 24 March 2011 33
@@ -2350,7 +2350,7 @@ LATEXMK(1L) LATEXMK(1L)
- 21 March 2011 34
+ 24 March 2011 34
@@ -2405,7 +2405,7 @@ THANKS TO
AUTHOR
Current version, by John Collins (username collins at node
- phys.psu.edu). (Version 4.23).
+ phys.psu.edu). (Version 4.23a).
Released version can be obtained from CTAN: <http://www.tug.org/tex-
archive/support/latexmk/>, and from the author's website
@@ -2422,7 +2422,7 @@ AUTHOR
- 21 March 2011 35
+ 24 March 2011 35
@@ -2494,6 +2494,6 @@ LATEXMK(1L) LATEXMK(1L)
- 21 March 2011 36
+ 24 March 2011 36
diff --git a/Master/texmf-dist/scripts/latexmk/latexmk.pl b/Master/texmf-dist/scripts/latexmk/latexmk.pl
index 074b496eea1..c5deb79cfac 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.23';
-$version_details = "$My_name, John Collins, 21 March 2011";
+$version_num = '4.23a';
+$version_details = "$My_name, John Collins, 24 March 2011";
use Config;
@@ -177,6 +177,8 @@ else {
##
## Modification log from 1 Jan 2011 onwards in detail
##
+## 24 Mar 2011, John Collins Correct bug in detection of source files
+## listed in .fls
## 21 Mar 2011, John Collins Add 'bcf' to list of generated extensions
## Deal with case that fls files are latex.fls and pdflatex.fls
## 19--21 Mar 2011, John Collins -deps and -rules options
@@ -4140,11 +4142,14 @@ sub rdb_set_latex_deps {
my $fls_file = "$root_filename.fls";
if ($recorder && test_gen_file($fls_file) ) {
parse_fls( $fls_file, \%source_fls, \%generated_fls );
- foreach (keys %source_fls) {
- rdb_ensure_file( $rule, $_ );
+ foreach (keys %source_fls) {
+ $dependents{$_} = 4;
}
foreach (keys %generated_fls) {
rdb_add_generated( $_ );
+ if ( exists($dependents{$_}) ) {
+ $dependents{$_} = 6;
+ }
}
}
# ?? !! Should also deal with .run.xml file
@@ -4262,7 +4267,8 @@ NEW_SOURCE:
print " ===Source file for rule '$rule': '$new_source'\n"
if ($diagnostics);
if ( ($dependents{$new_source} == 5)
- || ($dependents{$new_source} == 6) ) {
+ || ($dependents{$new_source} == 6)
+ ) {
# (a) File was detected in "No file..." line in log file.
# Typically file was searched for early in run of
# latex/pdflatex, was not found, and then was written
@@ -4294,6 +4300,11 @@ NEW_SOURCE:
# (or for files that are generated outside of latex/pdflatex).
rdb_ensure_file( $rule, $new_source );
}
+ if ( ($dependents{$new_source} == 6)
+ || ($dependents{$new_source} == 7)
+ ) {
+ rdb_add_generated($new_source);
+ }
}
my @more_sources = &rdb_set_dependentsA( $rule );
@@ -6067,7 +6078,7 @@ sub rdb_add_generated {
foreach (@_) {
$$PHdest{$_} = 1;
}
-} #END rdb_initialize_generated
+} #END rdb_add_generated
#************************************************************
diff --git a/Master/texmf/doc/man/man1/latexmk.1 b/Master/texmf/doc/man/man1/latexmk.1
index a36817826f4..7bbcb62d7ff 100644
--- a/Master/texmf/doc/man/man1/latexmk.1
+++ b/Master/texmf/doc/man/man1/latexmk.1
@@ -1,4 +1,4 @@
-.TH LATEXMK 1L "21 March 2011" ""
+.TH LATEXMK 1L "24 March 2011" ""
.SH NAME
latexmk \- generate LaTeX document
.SH SYNOPSIS
@@ -2027,7 +2027,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.23).
+(Version 4.23a).
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 d14a4071a41..0c5ee2018eb 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-05 22:42:36 +0000