updmap uses dvipdfmx path for kanjix.map

- accept --dvipdfmxoutputdir and --dvipdfmoutputdir
- both given and disagree -> die
- only --dvipdfmoutputdir given, warn and set dvipdfmxoutputdir from it


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

1 files changed, 18 insertions, 7 deletions

diff --git a/Master/texmf/scripts/texlive/updmap.pl b/Master/texmf/scripts/texlive/updmap.pl
index 5f81184dd85..dc665fbc81e 100755
--- a/Master/texmf/scripts/texlive/updmap.pl
+++ b/Master/texmf/scripts/texlive/updmap.pl
@@ -68,6 +68,7 @@ my @cmdline_options = (
   "copy", 
   "disable=s@",
   "dvipdfmoutputdir=s",
+  "dvipdfmxoutputdir=s",
   "dvipsoutputdir=s",
   # the following does not work, Getopt::Long looses the first
   # entry in a multi setting, treat it separately in processOptions
@@ -149,6 +150,17 @@ sub main {
     exit (0);
   }
 
+  if ($opts{'dvipdfmoutputdir'} && !defined($opts{'dvipdfmxoutputdir'})) {
+    $opts{'dvipdfmxoutputdir'} = $opts{'dvipdfmoutputdir'};
+    printf STDERR "Using --dvipdfmoutputdir options for dvipdfmx, but please use --dvipdfmxoutputdir\n";
+  }
+
+  if ($opts{'dvipdfmoutputdir'} && $opts{'dvipdfmxoutputdir'} &&
+      $opts{'dvipdfmoutputdir'} ne $opts{'dvipdfmxoutputdir'}) {
+    printf STDERR "Options for --dvipdfmoutputdir and --dvipdfmxoutputdir do not agree\nplease use only --dvipdfmxoutputdir. Exiting.\n";
+    exit(1);
+  }
+
   if ($opts{'_readsave'}) {
     read_updmap_files($opts{'_readsave'});
     print "READING DONE ============================\n";
@@ -405,7 +417,6 @@ sub main {
       setupOutputDir("dvips");
       setupOutputDir("pdftex");
       setupOutputDir("dvipdfmx");
-      setupOutputDir("dvipdfm");
       setupOutputDir("pxdvi");
       my @missing = read_map_files();
       if (@missing) {
@@ -901,7 +912,7 @@ sub mkMaps {
   # Create psfonts_t1.map, psfonts_pk.map, ps2pk.map and pdftex.map:
   my $dvipsoutputdir = $opts{'dvipsoutputdir'};
   my $pdftexoutputdir = $opts{'pdftexoutputdir'};
-  my $dvipdfmoutputdir = $opts{'dvipdfmoutputdir'};
+  my $dvipdfmxoutputdir = $opts{'dvipdfmxoutputdir'};
   my $pxdvioutputdir = $opts{'pxdvioutputdir'};
   if (!$opts{'dry-run'}) {
     my @managed_files =  ("$dvipsoutputdir/download35.map",
@@ -910,7 +921,7 @@ sub mkMaps {
       "$dvipsoutputdir/psfonts_pk.map",
       "$pdftexoutputdir/pdftex_dl14.map",
       "$pdftexoutputdir/pdftex_ndl14.map",
-      "$dvipdfmoutputdir/kanjix.map",
+      "$dvipdfmxoutputdir/kanjix.map",
       "$dvipsoutputdir/ps2pk.map");
     push @managed_files, "$pxdvioutputdir/xdvi-ptex.map"
       if ($pxdviUse eq "true");
@@ -935,8 +946,8 @@ sub mkMaps {
   my @mixedmaps_fonts = getFonts(@mixedmaps);
   my @notmixedmaps_fonts = getFonts(@notmixedmaps);
 
-  print "Generating output for dvipdfm...\n" if !$opts{'quiet'};
-  &writeLines(">$dvipdfmoutputdir/kanjix.map", @kanjimaps_fonts);
+  print "Generating output for dvipdfmx...\n" if !$opts{'quiet'};
+  &writeLines(">$dvipdfmxoutputdir/kanjix.map", @kanjimaps_fonts);
 
   if ($pxdviUse eq "true") {
     # we use the very same data as for kanjix.map, but generate
@@ -1066,7 +1077,7 @@ sub mkMaps {
     dir ($d, $f, 'pdftex.map');
     $updLSR->{add}("$d/$f") unless $opts{'dry-run'};
   }
-  $d="$dvipdfmoutputdir";
+  $d="$dvipdfmxoutputdir";
   print_and_log("  $d:\n");
   foreach my $f ('kanjix.map') {
     dir ($d, $f, '');
@@ -1885,7 +1896,7 @@ Options:
   --cnffile FILE            read FILE for the updmap configuration 
                             (can be given multiple times, in which case
                             all the files are used)
-  --dvipdfmoutputdir DIR    specify output directory (dvipdfm syntax)
+  --dvipdfmxoutputdir DIR   specify output directory (dvipdfm syntax)
   --dvipsoutputdir DIR      specify output directory (dvips syntax)
   --pdftexoutputdir DIR     specify output directory (pdftex syntax)
   --pxdvioutputdir DIR      specify output directory (pxdvi syntax)