latexmk 4.13a (18jan10)

git-svn-id: svn://tug.org/texlive/trunk@16776 c570f23f-e606-0410-a88d-b1316a301751

7 files changed, 62 insertions, 134 deletions

diff --git a/Master/texmf-dist/doc/support/latexmk/CHANGES b/Master/texmf-dist/doc/support/latexmk/CHANGES
index 8926fcf0200..a8f4eca829a 100644
--- a/Master/texmf-dist/doc/support/latexmk/CHANGES
+++ b/Master/texmf-dist/doc/support/latexmk/CHANGES
@@ -123,7 +123,10 @@ From v. 4.11 to v. 4.12
     Corrected misprints in documentation.
 
 From v. 4.12 to v. 4.13
-    Correct clean_up so aux file is deleted
+    Corrected clean_up so aux file is deleted.
     Default for running bibtex: Only when .bib file exists.
-    Correction insertion of bbl into list of generated extensions
+    Correction insertion of bbl into list of generated extensions.
 
+From v. 4.13 to v. 4.13a
+    Corrected a problem that clean-up option (-C) failed to delete
+       certain generated files.
diff --git a/Master/texmf-dist/doc/support/latexmk/README b/Master/texmf-dist/doc/support/latexmk/README
index b74f1da56b2..98b0a264248 100644
--- a/Master/texmf-dist/doc/support/latexmk/README
+++ b/Master/texmf-dist/doc/support/latexmk/README
@@ -1,4 +1,4 @@
-Latexmk, version 4.13, 13 January 2010
+Latexmk, version 4.13a, 16 January 2010
 ---------------------------------------
 
 Latexmk completely automates the process of generating a LaTeX document.
@@ -89,7 +89,7 @@ I hope you find this useful.
 
 John Collins
 ---------------------------- "latexmk -h" ----------------------------
-Latexmk 4.13: Automatic LaTeX document generation routine
+Latexmk 4.13a: 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 4ae9600a47f..c36fef5c841 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 152886527ae..7f6651ea67a 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
 
 
 
-                                13 January 2010                              2
+                                16 January 2010                              2
 
 
 
@@ -193,7 +193,7 @@ LATEXMK(1L)                                                        LATEXMK(1L)
 
 
 
-                                13 January 2010                              3
+                                16 January 2010                              3
 
 
 
@@ -259,7 +259,7 @@ LATEXMK(1L)                                                        LATEXMK(1L)
 
 
 
-                                13 January 2010                              4
+                                16 January 2010                              4
 
 
 
@@ -325,7 +325,7 @@ LATEXMK(1L)                                                        LATEXMK(1L)
 
 
 
-                                13 January 2010                              5
+                                16 January 2010                              5
 
 
 
@@ -391,7 +391,7 @@ LATEXMK(1L)                                                        LATEXMK(1L)
 
 
 
-                                13 January 2010                              6
+                                16 January 2010                              6
 
 
 
@@ -457,7 +457,7 @@ LATEXMK(1L)                                                        LATEXMK(1L)
 
 
 
-                                13 January 2010                              7
+                                16 January 2010                              7
 
 
 
@@ -523,7 +523,7 @@ LATEXMK(1L)                                                        LATEXMK(1L)
 
 
 
-                                13 January 2010                              8
+                                16 January 2010                              8
 
 
 
@@ -589,7 +589,7 @@ LATEXMK(1L)                                                        LATEXMK(1L)
 
 
 
-                                13 January 2010                              9
+                                16 January 2010                              9
 
 
 
@@ -655,7 +655,7 @@ CONFIGURATION/INITIALIZATION (RC) FILES
 
 
 
-                                13 January 2010                             10
+                                16 January 2010                             10
 
 
 
@@ -721,7 +721,7 @@ FORMAT OF COMMAND SPECIFICATIONS
 
 
 
-                                13 January 2010                             11
+                                16 January 2010                             11
 
 
 
@@ -787,7 +787,7 @@ LATEXMK(1L)                                                        LATEXMK(1L)
 
 
 
-                                13 January 2010                             12
+                                16 January 2010                             12
 
 
 
@@ -853,7 +853,7 @@ LATEXMK(1L)                                                        LATEXMK(1L)
 
 
 
-                                13 January 2010                             13
+                                16 January 2010                             13
 
 
 
@@ -920,7 +920,7 @@ LIST OF CONFIGURATION VARIABLES USABLE IN INITIALIZATION FILES
 
 
 
-                                13 January 2010                             14
+                                16 January 2010                             14
 
 
 
@@ -987,7 +987,7 @@ LATEXMK(1L)                                                        LATEXMK(1L)
 
 
 
-                                13 January 2010                             15
+                                16 January 2010                             15
 
 
 
@@ -1054,7 +1054,7 @@ LATEXMK(1L)                                                        LATEXMK(1L)
 
 
 
-                                13 January 2010                             16
+                                16 January 2010                             16
 
 
 
@@ -1121,7 +1121,7 @@ LATEXMK(1L)                                                        LATEXMK(1L)
 
 
 
-                                13 January 2010                             17
+                                16 January 2010                             17
 
 
 
@@ -1188,7 +1188,7 @@ LATEXMK(1L)                                                        LATEXMK(1L)
 
 
 
-                                13 January 2010                             18
+                                16 January 2010                             18
 
 
 
@@ -1256,7 +1256,7 @@ LATEXMK(1L)                                                        LATEXMK(1L)
 
 
 
-                                13 January 2010                             19
+                                16 January 2010                             19
 
 
 
@@ -1326,7 +1326,7 @@ LATEXMK(1L)                                                        LATEXMK(1L)
 
 
 
-                                13 January 2010                             20
+                                16 January 2010                             20
 
 
 
@@ -1396,7 +1396,7 @@ LATEXMK(1L)                                                        LATEXMK(1L)
 
 
 
-                                13 January 2010                             21
+                                16 January 2010                             21
 
 
 
@@ -1466,7 +1466,7 @@ LATEXMK(1L)                                                        LATEXMK(1L)
 
 
 
-                                13 January 2010                             22
+                                16 January 2010                             22
 
 
 
@@ -1536,7 +1536,7 @@ LATEXMK(1L)                                                        LATEXMK(1L)
 
 
 
-                                13 January 2010                             23
+                                16 January 2010                             23
 
 
 
@@ -1606,7 +1606,7 @@ LATEXMK(1L)                                                        LATEXMK(1L)
 
 
 
-                                13 January 2010                             24
+                                16 January 2010                             24
 
 
 
@@ -1676,7 +1676,7 @@ LATEXMK(1L)                                                        LATEXMK(1L)
 
 
 
-                                13 January 2010                             25
+                                16 January 2010                             25
 
 
 
@@ -1746,7 +1746,7 @@ CUSTOM DEPENDENCIES
 
 
 
-                                13 January 2010                             26
+                                16 January 2010                             26
 
 
 
@@ -1816,7 +1816,7 @@ LATEXMK(1L)                                                        LATEXMK(1L)
 
 
 
-                                13 January 2010                             27
+                                16 January 2010                             27
 
 
 
@@ -1886,7 +1886,7 @@ LATEXMK(1L)                                                        LATEXMK(1L)
 
 
 
-                                13 January 2010                             28
+                                16 January 2010                             28
 
 
 
@@ -1956,7 +1956,7 @@ BUGS
 
 
 
-                                13 January 2010                             29
+                                16 January 2010                             29
 
 
 
@@ -1978,7 +1978,7 @@ THANKS TO
 
 AUTHOR
        Current   version,   by   John   Collins   (username  collins  at  node
-       phys.psu.edu).  (Version 4.13).
+       phys.psu.edu).  (Version 4.13a).
 
        Released version can be obtained  from  CTAN:  <http://www.tug.org/tex-
        archive/support/latexmk/>,    and    from    the    author's    website
@@ -2026,6 +2026,6 @@ AUTHOR
 
 
 
-                                13 January 2010                             30
+                                16 January 2010                             30
 
 
diff --git a/Master/texmf-dist/scripts/latexmk/latexmk.pl b/Master/texmf-dist/scripts/latexmk/latexmk.pl
index 2ea0e023e8f..e721d8f2e05 100755
--- a/Master/texmf-dist/scripts/latexmk/latexmk.pl
+++ b/Master/texmf-dist/scripts/latexmk/latexmk.pl
@@ -108,8 +108,8 @@ use warnings;
 
 $my_name = 'latexmk';
 $My_name = 'Latexmk';
-$version_num = '4.13';
-$version_details = "$My_name, John Collins, 13 January 2010";
+$version_num = '4.13a';
+$version_details = "$My_name, John Collins, 16 January 2010";
 
 
 use Config;
@@ -178,6 +178,10 @@ else {
 ##
 ##   Modification log from 25 Nov 2009 onwards in detail
 ##
+##     16 Jan 2010, John Collins  V. 4.13a. 
+##                                Correct bug in deleting extra files (I wasn't 
+##                                  consistent about periods in file extensions)
+##                                Delete unused subroutines
 ##     13 Jan 2010, John Collins  V. 4.13 
 ##     27 Dec 2009, John Collins  Correct position of inserting bbl into list 
 ##                                   of generated extensions.
@@ -1562,13 +1566,11 @@ if ( $pdf_mode == 2 ) {
 # Make convenient forms for lookup.
 # Extensions always have period.
 
-# Convert @generated_exts to a hash for ease of look up, with exts
-#    preceeded by a '.' 
-# %generated_exts_all is used in analyzing file changes, to
-#    distinguish changes in user files from changes in generated files.
+# Convert @generated_exts to a hash for ease of look up and deletion
+# Keep extension without period!
 %generated_exts_all = ();
 foreach (@generated_exts ) {
-    $generated_exts_all{".$_"} = 1;
+    $generated_exts_all{$_} = 1;
 }
 
 $quell_uptodate_msgs = $silent; 
@@ -5165,7 +5167,7 @@ sub rdb_file_change1 {
 #??    print "FC1 '$rule':$file $$Pout_of_date TK=$$Ptest_kind\n"; 
 #??    print "    OLD $$Ptime, $$Psize, $$Pmd5\n",
 #??          "    New $new_time, $new_size, $new_md5\n";
-    my $ext = ext( $file );
+    my $ext_no_period = ext_no_period( $file );
     if ( ($new_size < 0) && ($$Psize >= 0) ) {
 	# print "Disappeared '$file' in '$rule'\n";
         push @disappeared, $file;
@@ -5189,7 +5191,7 @@ sub rdb_file_change1 {
 #??        print "FC1: changed $file: ($new_size != $$Psize) $new_md5 ne $$Pmd5)\n";
 	push @changed, $file;
 	$$Pout_of_date = 1;
-        if ( ! exists $generated_exts_all{$ext} ) {
+        if ( ! exists $generated_exts_all{$ext_no_period} ) {
             $$Pout_of_date_user = 1;
 	}
     }
@@ -5198,7 +5200,7 @@ sub rdb_file_change1 {
 	$$Ptime = $new_time;
     }
     if ( ( ($$Ptest_kind == 2) || ($$Ptest_kind == 3) )
-         && (! exists $generated_exts_all{$ext} )
+         && (! exists $generated_exts_all{$ext_no_period} )
          && ( $new_time > $dest_mtime )
         ) {
 #??        print "FC1: changed $file: ($new_time > $dest_mtime)\n";
@@ -5669,7 +5671,7 @@ sub rdb_update_gen_files {
     # Assumes rule context.  Update source files of rule to current state.
     rdb_do_files( 
         sub{
-	    if ( exists $generated_exts_all{ ext($file) } ) {&rdb_update1;} 
+	    if ( exists $generated_exts_all{ ext_no_period($file) } ) {&rdb_update1;} 
         }
     );
 } #END rdb_update_gen_files
@@ -5986,93 +5988,6 @@ sub get_checksum_md5 {
 }
 
 #************************************************************
-
-#?? OBSOLETE
-# Find file with default extension
-# Usage: find_file_ext( name, default_ext, ref_to_array_search_path)
-sub find_file_ext
-#?? Need to use kpsewhich, if possible.  Leave to find_file?
-{
-    my $full_filename = shift;
-    my $ext = shift;
-    my $ref_search_path = shift;
-    my $full_filename1 = &find_file($full_filename, $ref_search_path, '1');
-#print "Finding \"$full_filename\" with ext \"$ext\" ... ";
-    if (( $full_filename1 eq '' ) || ( ! -e $full_filename1 ))
-    {
-      my $full_filename2 = 
-          &find_file("$full_filename.$ext",$ref_search_path,'1');
-      if (( $full_filename2 ne '' ) && ( -e $full_filename2 ))
-      {
-        $full_filename = $full_filename2;
-      }
-      else
-      {
-        $full_filename = $full_filename1;
-      }
-    }
-    else
-    {
-      $full_filename = $full_filename1;
-    }
-#print "Found \"$full_filename\".\n";
-    return $full_filename;
-}
-
-#************************************************************
-#?? OBSOLETE
-# given filename and path, return full name of file, or die if none found.
-# when force_include_mode=1, only warn if an include file was not
-# found, and return 0 (PvdS).
-# Usage: find_file(name, ref_to_array_search_path, warn_on_continue)
-sub find_file
-#?? Need to use kpsewhich, if possible
-{
-  my $name = $_[0];
-  my $ref_path = $_[1];
-  my $dir;
-  if ( $name =~ /^\// )
-  {
-    #Aboslute pathname (by UNIX standards)
-    if ( (!-e $name) && ( $_[2] eq '' ) ) {
-        if ($force_include_mode) {
-           warn "$My_name: Could not find file [$name]\n";
-        }
-        else {
-           die "$My_name: Could not find file [$name]\n";
-        }
-    }
-    return $name;
-  }
-  # Relative pathname
-  foreach $dir ( @{$ref_path} )
-  {
-#warn "\"$dir\", \"$name\"\n";
-    if (-e "$dir/$name")
-    {
-      return("$dir/$name");
-    }
-  }
-  if ($force_include_mode)
-  {
-	if ( $_[2] eq '' )
-	{
-	  warn "$My_name: Could not find file [$name] in path [@{$ref_path}]\n";
-	  warn "         assuming in current directory (./$name)\n";
-	}
-	return("./$name");
-  }
-  else
-  {
-	if ( $_[2] ne '' )
-	{
-	  return('');
-	}
-# warn "\"$name\", \"$ref_path\", \"$dir\"\n";
-  	die "$My_name: Could not find file [$name] in path [@{$ref_path}]\n";
-  }
-}
-
 #************************************************************
 
 sub find_file1 {
@@ -6373,6 +6288,16 @@ sub ext {
 
 #************************************************************
 
+sub ext_no_period {
+    # Return extension of filename.  Extension excludes the period
+    my $file_name = $_[0];
+    my ($base_name, $path, $ext) = fileparseA( $file_name );
+    $ext =~ s/^\.//;
+    return $ext;
+ }
+
+#************************************************************
+
 sub fileparseA {
     # Like fileparse but replace $path for current dir ('./' or '.\') by ''
     # Also default second argument to get normal extension.
diff --git a/Master/texmf/doc/man/man1/latexmk.1 b/Master/texmf/doc/man/man1/latexmk.1
index f2b49a75b9b..8b310cd87e2 100644
--- a/Master/texmf/doc/man/man1/latexmk.1
+++ b/Master/texmf/doc/man/man1/latexmk.1
@@ -1,4 +1,4 @@
-.TH LATEXMK 1L "13 January 2010" ""
+.TH LATEXMK 1L "16 January 2010" ""
 .SH NAME
 latexmk \- generate LaTeX document
 .SH SYNOPSIS
@@ -1656,7 +1656,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.13).
+(Version 4.13a).
 
 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
deleted file mode 100644
index 962a0105291..00000000000
--- a/Master/texmf/doc/man/man1/latexmk.man1.pdf
+++ /dev/null