dtxgen (22apr13)

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

5 files changed, 25 insertions, 67 deletions

diff --git a/Build/source/texk/texlive/linked_scripts/dtxgen/dtxgen b/Build/source/texk/texlive/linked_scripts/dtxgen/dtxgen
index e6b9c58b1d8..b5fa8a8275c 100755
--- a/Build/source/texk/texlive/linked_scripts/dtxgen/dtxgen
+++ b/Build/source/texk/texlive/linked_scripts/dtxgen/dtxgen
@@ -81,7 +81,7 @@ zip       & produce a zip file ready for upload to CTAN
 
 LATEX
 
-VERSION=1.01
+VERSION=1.03
 MYNAME=`basename $0`
 
 function help {
@@ -119,8 +119,10 @@ function createfile {
 
 test ${BASH_VERSINFO[0]} -ge 4 ||
   die Your bash has version $BASH_VERSION, but it should be at least version 4
-type sed >&/dev/null ||
-  die dtxgen needs sed, but sed is not in your PATH
+for i in sed getopt; do
+  type $i >&/dev/null ||
+    die dtxgen needs sed and getopt, but $i is not in your PATH
+done
 
 if ! options=$(getopt -o s:n:m:c:d:hvqI \
                       -l help,short:,name:,mail:,class:,date:,version,quiet -- "$@"); then exit 1; fi
@@ -208,10 +210,11 @@ $(NAME).pdf: $(NAME).dtx
 	if [ -f $(NAME).glo ]; then makeindex -q -s gglo.ist -o $(NAME).gls $(NAME).glo; fi
 	if [ -f $(NAME).idx ]; then makeindex -q -s gind.ist -o $(NAME).ind $(NAME).idx; fi
 	pdflatex --recorder --interaction=nonstopmode $(NAME).dtx > /dev/null
+	pdflatex --recorder --interaction=nonstopmode $(NAME).dtx > /dev/null
 clean:
 	rm -f $(NAME).{aux,fls,glo,gls,hd,idx,ilg,ind,ins,log,out}
 distclean: clean
-	rm -f $(NAME).{pdf,%ext%} README Makefile
+	rm -f $(NAME).{pdf,%ext%} README
 inst: all
 	mkdir -p $(UTREE)/{tex,source,doc}/latex/$(NAME)
 	cp $(NAME).dtx $(UTREE)/source/latex/$(NAME)
@@ -439,4 +442,4 @@ Major changes of release %VERSION% relative to 1.00:
 - presence of sed executable is tested
 README
 
-# $Id: dtxgen,v 1.6 2013/04/15 21:13:10 wybo Exp $
+# $Id: dtxgen,v 1.8 2013/04/22 15:33:25 wybo Exp $
diff --git a/Build/source/texk/texlive/linked_scripts/texlive/updmap.pl b/Build/source/texk/texlive/linked_scripts/texlive/updmap.pl
index da64dfebf53..abf4e4b085a 100755
--- a/Build/source/texk/texlive/linked_scripts/texlive/updmap.pl
+++ b/Build/source/texk/texlive/linked_scripts/texlive/updmap.pl
@@ -1,5 +1,5 @@
 #!/usr/bin/env perl
-# $Id: updmap.pl 30018 2013-04-18 23:02:43Z karl $
+# $Id: updmap.pl 30043 2013-04-19 19:47:12Z preining $
 # updmap - maintain map files for outline fonts.
 # (Maintained in TeX Live:Master/texmf-dist/scripts/texlive.)
 # 
@@ -34,12 +34,12 @@ BEGIN {
 }
 
 
-my $version = '$Id: updmap.pl 30018 2013-04-18 23:02:43Z karl $';
+my $version = '$Id: updmap.pl 30043 2013-04-19 19:47:12Z preining $';
 
 use Getopt::Long qw(:config no_autoabbrev ignore_case_always);
 use strict;
 use TeXLive::TLUtils qw(mkdirhier mktexupd win32 basename dirname 
-  sort_uniq member);
+  sort_uniq member touch);
 
 #use Data::Dumper;
 #$Data::Dumper::Indent = 1;
@@ -51,14 +51,14 @@ use TeXLive::TLUtils qw(mkdirhier mktexupd win32 basename dirname
 # this function checks by itself whether it is running on windows or not
 reset_root_home();
 
-chomp(my $TEXMFMAIN = `kpsewhich --var-value=TEXMFMAIN`);
+chomp(my $TEXMFDIST = `kpsewhich --var-value=TEXMFDIST`);
 chomp(my $TEXMFVAR = `kpsewhich -var-value=TEXMFVAR`);
 chomp(my $TEXMFCONFIG = `kpsewhich -var-value=TEXMFCONFIG`);
 chomp(my $TEXMFHOME = `kpsewhich -var-value=TEXMFHOME`);
 
 # make sure that on windows *everything* is in lower case for comparison
 if (win32()) {
-  $TEXMFMAIN = lc($TEXMFMAIN);
+  $TEXMFDIST = lc($TEXMFDIST);
   $TEXMFVAR = lc($TEXMFVAR);
   $TEXMFCONFIG = lc($TEXMFCONFIG);
   $TEXMFROOT = lc($TEXMFROOT);
@@ -257,66 +257,23 @@ sub main {
         if ($oldfound);
     }
     #
-    # reorder used files: we move TEXMFLOCAL (if used) just above TEXMFMAIN
-    # as sysadmins will probably adjust values there
-    #
     # updmap (user):
     # ==============
-    # as found:
-    # TEXMFCONFIG    $HOME/.texliveYYYY/texmf-config/web2c/updmap.cfg
-    # TEXMFVAR       $HOME/.texliveYYYY/texmf-var/web2c/updmap.cfg
-    # TEXMFHOME      $HOME/texmf/web2c/updmap.cfg
-    # TEXMFSYSCONFIG $TEXLIVE/YYYY/texmf-config/web2c/updmap.cfg
-    # TEXMFSYSVAR    $TEXLIVE/YYYY/texmf-var/web2c/updmap.cfg
-    # TEXMFMAIN      $TEXLIVE/YYYY/texmf/web2c/updmap.cfg
-    # TEXMFLOCAL     $TEXLIVE/texmf-local/web2c/updmap.cfg
-    # TEXMFDIST      $TEXLIVE/YYYY/texmf-dist/web2c/updmap.cfg
-    # 
-    # as used:
     # TEXMFCONFIG    $HOME/.texliveYYYY/texmf-config/web2c/updmap.cfg
     # TEXMFVAR       $HOME/.texliveYYYY/texmf-var/web2c/updmap.cfg
     # TEXMFHOME      $HOME/texmf/web2c/updmap.cfg
     # TEXMFSYSCONFIG $TEXLIVE/YYYY/texmf-config/web2c/updmap.cfg
     # TEXMFSYSVAR    $TEXLIVE/YYYY/texmf-var/web2c/updmap.cfg
     # TEXMFLOCAL     $TEXLIVE/texmf-local/web2c/updmap.cfg
-    # TEXMFMAIN      $TEXLIVE/YYYY/texmf/web2c/updmap.cfg
     # TEXMFDIST      $TEXLIVE/YYYY/texmf-dist/web2c/updmap.cfg
     # 
     # updmap-sys (root):
     # ==================
-    # as found:
-    # TEXMFSYSCONFIG $TEXLIVE/YYYY/texmf-config/web2c/updmap.cfg
-    # TEXMFSYSVAR    $TEXLIVE/YYYY/texmf-var/web2c/updmap.cfg
-    # TEXMFMAIN      $TEXLIVE/YYYY/texmf/web2c/updmap.cfg
-    # TEXMFLOCAL     $TEXLIVE/texmf-local/web2c/updmap.cfg
-    # TEXMFDIST      $TEXLIVE/YYYY/texmf-dist/web2c/updmap.cfg
-    # 
-    # as used:
     # TEXMFSYSCONFIG $TEXLIVE/YYYY/texmf-config/web2c/updmap.cfg
     # TEXMFSYSVAR    $TEXLIVE/YYYY/texmf-var/web2c/updmap.cfg
     # TEXMFLOCAL     $TEXLIVE/texmf-local/web2c/updmap.cfg
-    # TEXMFMAIN      $TEXLIVE/YYYY/texmf/web2c/updmap.cfg
     # TEXMFDIST      $TEXLIVE/YYYY/texmf-dist/web2c/updmap.cfg
     #
-    if (@tmlused) {
-      my @tmp;
-      for my $f (@used_files) {
-        if ($f =~ m!\Q$TEXMFMAIN/\E!) {
-          push @tmp, @tmlused;
-          push @tmp, $f;
-        } else {
-          my $pushit = 1;
-          for my $tml (@TEXMFLOCAL) {
-            if ($f =~ m!\Q$tml\E!) {
-              $pushit = 0;
-              last;
-            }
-          }
-          push @tmp, $f if ($pushit);
-        }
-      }
-      @used_files = @tmp;
-    }
     @{$opts{'cnffile'}}  = @used_files;
     #
     # determine the config file that we will use for changes
@@ -2193,10 +2150,7 @@ Explanation of trees and files normally used:
   If --cnffile is specified on the command line (possibly multiple
   times), its value(s) are used.  Otherwise, updmap reads all the
   updmap.cfg files found by running \`kpsewhich -all updmap.cfg', in the
-  order returned by kpsewhich, with one exception: an updmap.cfg found
-  in TEXMFLOCAL is given higher priority than the updmap.cfg in
-  TEXMFMAIN, to ensure that local adjustments by administrators take
-  precedence over what is shipped in TeX Live.
+  order returned by kpsewhich.
 
   In any case, if multiple updmap.cfg files are found, all the maps
   mentioned in all the updmap.cfg files are merged.
@@ -2209,7 +2163,6 @@ Explanation of trees and files normally used:
   TEXMFSYSCONFIG \$TEXLIVE/YYYY/texmf-config/web2c/updmap.cfg
   TEXMFSYSVAR    \$TEXLIVE/YYYY/texmf-var/web2c/updmap.cfg
   TEXMFLOCAL     \$TEXLIVE/texmf-local/web2c/updmap.cfg
-  TEXMFMAIN      \$TEXLIVE/YYYY/texmf/web2c/updmap.cfg
   TEXMFDIST      \$TEXLIVE/YYYY/texmf-dist/web2c/updmap.cfg
 
   For updmap:
@@ -2219,12 +2172,11 @@ Explanation of trees and files normally used:
   TEXMFSYSCONFIG \$TEXLIVE/YYYY/texmf-config/web2c/updmap.cfg
   TEXMFSYSVAR    \$TEXLIVE/YYYY/texmf-var/web2c/updmap.cfg
   TEXMFLOCAL     \$TEXLIVE/texmf-local/web2c/updmap.cfg
-  TEXMFMAIN      \$TEXLIVE/YYYY/texmf/web2c/updmap.cfg
   TEXMFDIST      \$TEXLIVE/YYYY/texmf-dist/web2c/updmap.cfg
   
   (where YYYY is the TeX Live release version).
   
-  There is another exception to keep upgradability from earlier versions
+  There is one exception to keep upgradability from earlier versions
   of TeX Live: if a file TEXMFLOCAL/web2c/updmap-local.cfg exists
   (formerly used by tlmgr to merge local fonts), then the file
   TEXMFLOCAL/web2c/updmap.cfg is ignored (if it exists) and that
diff --git a/Master/texmf-dist/doc/support/dtxgen/README b/Master/texmf-dist/doc/support/dtxgen/README
index 379b62b2198..0d8f68551ac 100644
--- a/Master/texmf-dist/doc/support/dtxgen/README
+++ b/Master/texmf-dist/doc/support/dtxgen/README
@@ -1,6 +1,6 @@
 ----------------------------------------------------------------
 dtxgen --- generate template for LaTeX self-extracting .dtx file
-Version: 1.01
+Version: 1.03
 Author:  Wybo Dekker
 E-mail:  wybo@xs4all.nl
 License: Released under the GNU General Public License
@@ -19,6 +19,6 @@ from environment variables, or from command line options and generates a
 template for the .dtx file with some minimal examples. Of course, the user
 will have to replace those examples with the real work.
 
-Major changes of release 1.01 relative to 1.00:
+Major changes of release 1.03 relative to 1.00:
 - dtx files contain only one version number
 - presence of sed executable is tested
diff --git a/Master/texmf-dist/doc/support/dtxgen/dtxgen.pdf b/Master/texmf-dist/doc/support/dtxgen/dtxgen.pdf
index 8cb379b167e..6f823e61d9f 100644
--- a/Master/texmf-dist/doc/support/dtxgen/dtxgen.pdf
+++ b/Master/texmf-dist/doc/support/dtxgen/dtxgen.pdf
diff --git a/Master/texmf-dist/scripts/dtxgen/dtxgen b/Master/texmf-dist/scripts/dtxgen/dtxgen
index e6b9c58b1d8..b5fa8a8275c 100755
--- a/Master/texmf-dist/scripts/dtxgen/dtxgen
+++ b/Master/texmf-dist/scripts/dtxgen/dtxgen
@@ -81,7 +81,7 @@ zip       & produce a zip file ready for upload to CTAN
 
 LATEX
 
-VERSION=1.01
+VERSION=1.03
 MYNAME=`basename $0`
 
 function help {
@@ -119,8 +119,10 @@ function createfile {
 
 test ${BASH_VERSINFO[0]} -ge 4 ||
   die Your bash has version $BASH_VERSION, but it should be at least version 4
-type sed >&/dev/null ||
-  die dtxgen needs sed, but sed is not in your PATH
+for i in sed getopt; do
+  type $i >&/dev/null ||
+    die dtxgen needs sed and getopt, but $i is not in your PATH
+done
 
 if ! options=$(getopt -o s:n:m:c:d:hvqI \
                       -l help,short:,name:,mail:,class:,date:,version,quiet -- "$@"); then exit 1; fi
@@ -208,10 +210,11 @@ $(NAME).pdf: $(NAME).dtx
 	if [ -f $(NAME).glo ]; then makeindex -q -s gglo.ist -o $(NAME).gls $(NAME).glo; fi
 	if [ -f $(NAME).idx ]; then makeindex -q -s gind.ist -o $(NAME).ind $(NAME).idx; fi
 	pdflatex --recorder --interaction=nonstopmode $(NAME).dtx > /dev/null
+	pdflatex --recorder --interaction=nonstopmode $(NAME).dtx > /dev/null
 clean:
 	rm -f $(NAME).{aux,fls,glo,gls,hd,idx,ilg,ind,ins,log,out}
 distclean: clean
-	rm -f $(NAME).{pdf,%ext%} README Makefile
+	rm -f $(NAME).{pdf,%ext%} README
 inst: all
 	mkdir -p $(UTREE)/{tex,source,doc}/latex/$(NAME)
 	cp $(NAME).dtx $(UTREE)/source/latex/$(NAME)
@@ -439,4 +442,4 @@ Major changes of release %VERSION% relative to 1.00:
 - presence of sed executable is tested
 README
 
-# $Id: dtxgen,v 1.6 2013/04/15 21:13:10 wybo Exp $
+# $Id: dtxgen,v 1.8 2013/04/22 15:33:25 wybo Exp $