texlive[56736] trunk: pdfxup (22oct20)

commits+karl at tug.org commits+karl at tug.org
Thu Oct 22 22:52:35 CEST 2020


Revision: 56736
          http://tug.org/svn/texlive?view=revision&revision=56736
Author:   karl
Date:     2020-10-22 22:52:35 +0200 (Thu, 22 Oct 2020)
Log Message:
-----------
pdfxup (22oct20)

Modified Paths:
--------------
    trunk/Build/source/texk/texlive/linked_scripts/pdfxup/pdfxup
    trunk/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl
    trunk/Master/texmf-dist/doc/man/man1/pdfxup.1
    trunk/Master/texmf-dist/doc/man/man1/pdfxup.man1.pdf
    trunk/Master/texmf-dist/doc/support/pdfxup/README
    trunk/Master/texmf-dist/doc/support/pdfxup/RELEASES
    trunk/Master/texmf-dist/doc/support/pdfxup/pdfxup.pdf
    trunk/Master/texmf-dist/scripts/pdfxup/pdfxup

Modified: trunk/Build/source/texk/texlive/linked_scripts/pdfxup/pdfxup
===================================================================
(Binary files differ)

Modified: trunk/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl
===================================================================
--- trunk/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl	2020-10-22 20:52:12 UTC (rev 56735)
+++ trunk/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl	2020-10-22 20:52:35 UTC (rev 56736)
@@ -1,5 +1,5 @@
 #!/usr/bin/env perl
-# $Id: fmtutil.pl 55294 2020-05-27 02:43:58Z preining $
+# $Id: fmtutil.pl 56682 2020-10-17 06:08:28Z preining $
 # fmtutil - utility to maintain format files.
 # (Maintained in TeX Live:Master/texmf-dist/scripts/texlive.)
 # 
@@ -24,11 +24,11 @@
   TeX::Update->import();
 }
 
-my $svnid = '$Id: fmtutil.pl 55294 2020-05-27 02:43:58Z preining $';
-my $lastchdate = '$Date: 2020-05-27 04:43:58 +0200 (Wed, 27 May 2020) $';
+my $svnid = '$Id: fmtutil.pl 56682 2020-10-17 06:08:28Z preining $';
+my $lastchdate = '$Date: 2020-10-17 08:08:28 +0200 (Sat, 17 Oct 2020) $';
 $lastchdate =~ s/^\$Date:\s*//;
 $lastchdate =~ s/ \(.*$//;
-my $svnrev = '$Revision: 55294 $';
+my $svnrev = '$Revision: 56682 $';
 $svnrev =~ s/^\$Revision:\s*//;
 $svnrev =~ s/\s*\$$//;
 my $version = "r$svnrev ($lastchdate)";
@@ -407,34 +407,23 @@
   my $nobuild = 0;
   my $notavail = 0;
   my $total = 0;
-  for my $fmt (keys %{$alldata->{'merged'}}) {
-    for my $eng (keys %{$alldata->{'merged'}{$fmt}}) {
-      next if ($fmt ne $eng);
-      $total++;
-      my $val = select_and_rebuild_format($fmt, $eng, $what, $whatarg);
-      if ($val == $FMT_DISABLED)    { $disabled++; }
-      elsif ($val == $FMT_NOTSELECTED) { $nobuild++; }
-      elsif ($val == $FMT_FAILURE)  { $err++; push (@err, "$eng/$fmt"); }
-      elsif ($val == $FMT_SUCCESS)  { $suc++; }
-      elsif ($val == $FMT_NOTAVAIL) { $notavail++; }
-      else { print_error("callback_build_format (round 1): unknown return "
-             . "from select_and_rebuild.\n"); }
+  for my $swi (qw/format=engine format!=engine/) {
+    for my $fmt (keys %{$alldata->{'merged'}}) {
+      for my $eng (keys %{$alldata->{'merged'}{$fmt}}) {
+        next if ($swi eq "format=engine" && $fmt ne $eng);
+        next if ($swi eq "format!=engine" && $fmt eq $eng);
+        $total++;
+        my $val = select_and_rebuild_format($fmt, $eng, $what, $whatarg);
+        if ($val == $FMT_DISABLED)    { $disabled++; }
+        elsif ($val == $FMT_NOTSELECTED) { $nobuild++; }
+        elsif ($val == $FMT_FAILURE)  { $err++; push (@err, "$eng/$fmt"); }
+        elsif ($val == $FMT_SUCCESS)  { $suc++; }
+        elsif ($val == $FMT_NOTAVAIL) { $notavail++; }
+        else { print_error("callback_build_format (round 1): unknown return "
+               . "from select_and_rebuild.\n"); }
+      }
     }
   }
-  for my $fmt (keys %{$alldata->{'merged'}}) {
-    for my $eng (keys %{$alldata->{'merged'}{$fmt}}) {
-      next if ($fmt eq $eng);
-      $total++;
-      my $val = select_and_rebuild_format($fmt, $eng, $what, $whatarg);
-      if ($val == $FMT_DISABLED)    { $disabled++; }
-      elsif ($val == $FMT_NOTSELECTED) { $nobuild++; }
-      elsif ($val == $FMT_FAILURE)  { $err++; push (@err, "$eng/$fmt"); }
-      elsif ($val == $FMT_SUCCESS)  { $suc++; }
-      elsif ($val == $FMT_NOTAVAIL) { $notavail++; }
-      else { print_error("callback_build_format (round 2): unknown return "
-             . "from select_and_rebuild.\n"); }
-    }
-  }
 
   # if the user asked to rebuild something, but we did nothing, report
   # unless we tried to rebuild only missing formats.

Modified: trunk/Master/texmf-dist/doc/man/man1/pdfxup.1
===================================================================
--- trunk/Master/texmf-dist/doc/man/man1/pdfxup.1	2020-10-22 20:52:12 UTC (rev 56735)
+++ trunk/Master/texmf-dist/doc/man/man1/pdfxup.1	2020-10-22 20:52:35 UTC (rev 56736)
@@ -1,6 +1,6 @@
 .\" Manpage for pdfxup.
 .\" Contact pdfxup at markey.fr to correct errors or typos.
-.TH man 1 "24 june 2020" "1.60" "pdfxup man page"
+.TH man 1 "21 october 2020" "1.61" "pdfxup man page"
 .SH NAME
 pdfxup \- n-up tool with reduced margins
 .SH SYNOPSIS

Modified: trunk/Master/texmf-dist/doc/man/man1/pdfxup.man1.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/support/pdfxup/README
===================================================================
--- trunk/Master/texmf-dist/doc/support/pdfxup/README	2020-10-22 20:52:12 UTC (rev 56735)
+++ trunk/Master/texmf-dist/doc/support/pdfxup/README	2020-10-22 20:52:35 UTC (rev 56736)
@@ -1,4 +1,4 @@
-PDFXUP -- v1.60 (2020/06/24)
+PDFXUP -- v1.61 (2020/10/21)
 N. Markey <pdfxup at markey.fr>
 
 
@@ -18,7 +18,7 @@
 
 
 
-%% (c) 2020/06/24 Nicolas Markey <pdfxup at markey dot fr>
+%% (c) 2020/10/21 Nicolas Markey <pdfxup at markey dot fr>
 %%
 %% This work may  be distributed and/or modified under  the conditions of
 %% the LaTeX Project  Public License, either version 1.3  of this license

Modified: trunk/Master/texmf-dist/doc/support/pdfxup/RELEASES
===================================================================
--- trunk/Master/texmf-dist/doc/support/pdfxup/RELEASES	2020-10-22 20:52:12 UTC (rev 56735)
+++ trunk/Master/texmf-dist/doc/support/pdfxup/RELEASES	2020-10-22 20:52:35 UTC (rev 56736)
@@ -31,8 +31,10 @@
 v1.51 (2020/01/06)
  - corrected bug in dimtopt() (conversion mm to pt)
 
-v1.60 (2020/06/24)
- - added --allow-file-read=... option for ghostscript >= 9.28
-   (thanks to Janis Kalofolias for pointing out the problem)
- - allow file names containing spaces 
- - better inclusion of watermarks
+v1.60 (2020/06/27)
+ - allow file names containing spaces
+ - added --allow-file-read=... option to ghostscript >= 9.50
+
+v1.61 (2020/10/21)
+ - minor bug corrected (would not clean-up with option -g)
+   (thanks to Oliver Redner for pointing out the bug)
\ No newline at end of file

Modified: trunk/Master/texmf-dist/doc/support/pdfxup/pdfxup.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/scripts/pdfxup/pdfxup
===================================================================
(Binary files differ)



More information about the tex-live-commits mailing list.