pfarrei (17oct13)

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

4 files changed, 16 insertions, 15 deletions

diff --git a/Build/source/texk/texlive/linked_scripts/pfarrei/a5toa4.tlu b/Build/source/texk/texlive/linked_scripts/pfarrei/a5toa4.tlu
index 436941eda58..900a3b6fc25 100755
--- a/Build/source/texk/texlive/linked_scripts/pfarrei/a5toa4.tlu
+++ b/Build/source/texk/texlive/linked_scripts/pfarrei/a5toa4.tlu
@@ -28,7 +28,7 @@
 -- The list of files belonging to the work `pfarrei' is given in
 -- the file `pfarrei.dtx'.
 -- 
--- $Id: pfarrei.dtx 33 2013-04-08 07:22:56Z mjk $
+-- $Id: pfarrei.dtx 36 2013-10-16 18:54:26Z mjk $
 
 kpse.set_program_name(arg[-1], 'a5toa4')
 require('pfarrei.pfarrei')
diff --git a/Build/source/texk/texlive/linked_scripts/pfarrei/pfarrei.tlu b/Build/source/texk/texlive/linked_scripts/pfarrei/pfarrei.tlu
index f2756f6f907..d0310cd72d0 100755
--- a/Build/source/texk/texlive/linked_scripts/pfarrei/pfarrei.tlu
+++ b/Build/source/texk/texlive/linked_scripts/pfarrei/pfarrei.tlu
@@ -28,7 +28,7 @@
 -- The list of files belonging to the work `pfarrei' is given in
 -- the file `pfarrei.dtx'.
 -- 
-local version_number = string.sub( '$Revision: 33 $', 12, -2 )
+local version_number = string.sub( '$Revision: 36 $', 12, -2 )
 local action_version = ' r' .. version_number .. '\n' .. [[
 
 Copyright (c) 2013 Markus Kohm.
diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
index 5e17eac8fa0..72ba8bf3ff9 100755
--- a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
+++ b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
@@ -1,12 +1,12 @@
 #!/usr/bin/env perl
-# $Id: tlmgr.pl 31688 2013-09-18 01:18:34Z preining $
+# $Id: tlmgr.pl 31870 2013-10-09 23:03:59Z karl $
 #
 # Copyright 2008-2013 Norbert Preining
 # This file is licensed under the GNU General Public License version 2
 # or any later version.
 
-my $svnrev = '$Revision: 31688 $';
-my $datrev = '$Date: 2013-09-18 03:18:34 +0200 (Wed, 18 Sep 2013) $';
+my $svnrev = '$Revision: 31870 $';
+my $datrev = '$Date: 2013-10-10 01:03:59 +0200 (Thu, 10 Oct 2013) $';
 my $tlmgrrevision;
 my $prg;
 if ($svnrev =~ m/: ([0-9]+) /) {
@@ -4761,8 +4761,8 @@ sub check_files {
 # 
 sub check_runfiles {
   my $Master = $localtlpdb->root;
+
   # build a list of all runtime files associated to 'normal' packages
-  #
   (my $non_normal = `ls "$Master/bin"`) =~ s/\n/\$|/g; # binaries
   $non_normal .= '^0+texlive|^bin-|^collection-|^scheme-|^texlive-|^texworks';
   my @runtime_files = ();
@@ -4785,8 +4785,7 @@ sub check_runfiles {
     push @runtime_files, @files;
   }
 
-  # build the duplicates list
-  #
+  # build the duplicates list.
   my @duplicates = (""); # just to use $duplicates[-1] freely
   my $prev = "";
   foreach my $f (sort map { TeXLive::TLUtils::basename($_) } @runtime_files) {
@@ -4797,8 +4796,7 @@ sub check_runfiles {
 
   # @duplicates = ('8r-base.map', 'aer.sty', 'lm-ec.map'); # for debugging
 
-  # check if duplicates are different files
-  #
+  # check if duplicates are different files.
   foreach my $f (@duplicates) {
     # assume tex4ht, xdy, afm stuff is ok, and don't worry about
     # Changes, README et al.  Other per-format versions.
@@ -4806,13 +4804,13 @@ sub check_runfiles {
     next if $f
       =~ /^((czech|slovak)\.sty
             |Changes
+            |Makefile
             |README
             |cid2code\.txt
             |etex\.src
             |kinsoku\.tex
             |language\.dat
             |language\.def
-            |libertine\.sty
             |m-tex4ht\.tex
             |metatex\.tex
             |.*-noEmbed\.map
diff --git a/Build/source/texk/texlive/linked_scripts/texlive/updmap.pl b/Build/source/texk/texlive/linked_scripts/texlive/updmap.pl
index 81e6e9132df..ecf0d9318d6 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 31772 2013-09-25 23:17:02Z karl $
+# $Id: updmap.pl 31853 2013-10-07 22:58:25Z karl $
 # updmap - maintain map files for outline fonts.
 # (Maintained in TeX Live:Master/texmf-dist/scripts/texlive.)
 # 
@@ -18,7 +18,6 @@
 # TODO
 # - check all other invocations
 # - after TL2012? Maybe remove support for reading updmap-local.cfg
-#
 
 my $TEXMFROOT;
 
@@ -34,7 +33,7 @@ BEGIN {
 }
 
 
-my $version = '$Id: updmap.pl 31772 2013-09-25 23:17:02Z karl $';
+my $version = '$Id: updmap.pl 31853 2013-10-07 22:58:25Z karl $';
 
 use Getopt::Long qw(:config no_autoabbrev ignore_case_always);
 use strict;
@@ -431,7 +430,7 @@ sub main {
       setupOutputDir("dvips");
       setupOutputDir("pdftex");
       setupOutputDir("dvipdfmx");
-      setupOutputDir("pxdvi");
+      # do pxdvi below, in mkmaps.
       merge_settings_replace_kanji();
       my @missing = read_map_files();
       if (@missing) {
@@ -971,6 +970,10 @@ sub mkMaps {
   my ($kanjiEmbed, $kanjiEmbed_origin) = get_cfg('kanjiEmbed');
   my ($kanjiVariant, $kanjiVariant_origin) = get_cfg('kanjiVariant');
 
+  # pxdvi is optional, and off by default.  Don't create the output
+  # directory unless we are going to put something there.
+  setupOutputDir("pxdvi") if $pxdviUse eq "true";
+
   print_and_log ("\n$prg is creating new map files"
          . "\nusing the following configuration:"
          . "\n  LW35 font names                  : "