texlive[61016] trunk: doc,sync

commits+karl at tug.org commits+karl at tug.org
Wed Nov 10 16:35:19 CET 2021


Revision: 61016
          http://tug.org/svn/texlive?view=revision&revision=61016
Author:   karl
Date:     2021-11-10 16:35:19 +0100 (Wed, 10 Nov 2021)
Log Message:
-----------
doc,sync

Modified Paths:
--------------
    trunk/Build/source/build-aux/missing
    trunk/Build/source/build-aux/test-driver
    trunk/Build/source/build-aux/ylwrap
    trunk/Build/source/texk/tests/TeXLive/TLUtils.pm
    trunk/Master/texmf-dist/scripts/texlive/NEWS

Added Paths:
-----------
    trunk/Build/source/texk/web2c/tests/xeteximage.tex

Modified: trunk/Build/source/build-aux/missing
===================================================================
--- trunk/Build/source/build-aux/missing	2021-11-10 00:49:08 UTC (rev 61015)
+++ trunk/Build/source/build-aux/missing	2021-11-10 15:35:19 UTC (rev 61016)
@@ -3,7 +3,7 @@
 
 scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
 # Originally written by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
 
 # This program is free software; you can redistribute it and/or modify

Modified: trunk/Build/source/build-aux/test-driver
===================================================================
--- trunk/Build/source/build-aux/test-driver	2021-11-10 00:49:08 UTC (rev 61015)
+++ trunk/Build/source/build-aux/test-driver	2021-11-10 15:35:19 UTC (rev 61016)
@@ -3,7 +3,7 @@
 
 scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 2011-2020 Free Software Foundation, Inc.
+# Copyright (C) 2011-2021 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -105,8 +105,11 @@
 trap "st=141; $do_exit" 13
 trap "st=143; $do_exit" 15
 
-# Test script is run here.
-"$@" >$log_file 2>&1
+# Test script is run here. We create the file first, then append to it,
+# to ameliorate tests themselves also writing to the log file. Our tests
+# don't, but others can (automake bug#35762).
+: >"$log_file"
+"$@" >>"$log_file" 2>&1
 estatus=$?
 
 if test $enable_hard_errors = no && test $estatus -eq 99; then
@@ -128,7 +131,7 @@
 # know whether the test passed or failed simply by looking at the '.log'
 # file, without the need of also peaking into the corresponding '.trs'
 # file (automake bug#11814).
-echo "$res $test_name (exit status: $estatus)" >>$log_file
+echo "$res $test_name (exit status: $estatus)" >>"$log_file"
 
 # Report outcome to console.
 echo "${col}${res}${std}: $test_name"

Modified: trunk/Build/source/build-aux/ylwrap
===================================================================
--- trunk/Build/source/build-aux/ylwrap	2021-11-10 00:49:08 UTC (rev 61015)
+++ trunk/Build/source/build-aux/ylwrap	2021-11-10 15:35:19 UTC (rev 61016)
@@ -3,7 +3,7 @@
 
 scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 1996-2020 Free Software Foundation, Inc.
+# Copyright (C) 1996-2021 Free Software Foundation, Inc.
 #
 # Written by Tom Tromey <tromey at cygnus.com>.
 #

Modified: trunk/Build/source/texk/tests/TeXLive/TLUtils.pm
===================================================================
--- trunk/Build/source/texk/tests/TeXLive/TLUtils.pm	2021-11-10 00:49:08 UTC (rev 61015)
+++ trunk/Build/source/texk/tests/TeXLive/TLUtils.pm	2021-11-10 15:35:19 UTC (rev 61016)
@@ -1,4 +1,3 @@
-# $Id: TLUtils.pm 59259 2021-05-18 21:39:53Z karl $
 # TeXLive::TLUtils.pm - the inevitable utilities for TeX Live.
 # Copyright 2007-2021 Norbert Preining, Reinhard Kotucha
 # This file is licensed under the GNU General Public License version 2
@@ -6,7 +5,7 @@
 
 package TeXLive::TLUtils;
 
-my $svnrev = '$Revision: 59259 $';
+my $svnrev = '$Revision: 60823 $';
 my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown";
 sub module_revision { return $_modulerevision; }
 
@@ -112,7 +111,7 @@
   TeXLive::TLUtils::report_tlpdb_differences(\%ret);
   TeXLive::TLUtils::tlnet_disabled_packages($root);
   TeXLive::TLUtils::mktexupd();
-  TeXLive::TLUtils::setup_sys_user_mode($optsref,$tmfc, $tmfsc, $tmfv, $tmfsv);
+  TeXLive::TLUtils::setup_sys_user_mode($prg,$optsref,$tmfc,$tmfsc,$tmfv,$tmfsv);
   TeXLive::TLUtils::prepend_own_path();
   TeXLive::TLUtils::repository_to_array($str);
 
@@ -1184,14 +1183,14 @@
 Windows, C<(-l $file)> will never return 'C<true>' and so symlinks will
 be (uselessly) copied as regular files.
 
-If the argument is C<"-L"> and C<$file> is a symlink, the link is
+If the first argument is C<"-L"> and C<$file> is a symlink, the link is
 dereferenced before the copying is done. (If both C<"-f"> and C<"-L">
-are desired, they must be given in that order, although the current code
-has no need to do this.)
+are desired, they must be given in that order, although the codebase
+currently has no need to do this.)
 
-C<copy> invokes C<mkdirhier> if target directories do not exist.  Files
-have mode C<0777> if they are executable and C<0666> otherwise, with
-the set bits in I<umask> cleared in each case.
+C<copy> invokes C<mkdirhier> if target directories do not exist. Files
+start with mode C<0777> if they are executable and C<0666> otherwise,
+with the set bits in I<umask> cleared in each case.
 
 C<$file> can begin with a C<file:/> prefix.
 
@@ -1753,7 +1752,7 @@
   }
   my $cmd = $keyval{'cmd'};
 
-  my $texdir = `kpsewhich -var-value=SELFAUTOPARENT`;
+  my $texdir = `kpsewhich -var-value=TEXMFROOT`;
   chomp($texdir);
   my $texdir_bsl = conv_to_w32_path($texdir);
   $cmd =~ s!^("?)TEXDIR/!$1$texdir/!g;
@@ -1828,7 +1827,7 @@
   if (win32() && defined($keyval{'filew32'})) {
     $file = $keyval{'filew32'};
   }
-  my $texdir = `kpsewhich -var-value=SELFAUTOPARENT`;
+  my $texdir = `kpsewhich -var-value=TEXMFROOT`;
   chomp($texdir);
   my @syscmd;
   if ($file =~ m/\.pl$/i) {
@@ -1903,7 +1902,7 @@
 
   &log("postaction $how shortcut for " . $tlpobj->name . "\n");
   if ($how eq "install") {
-    my $texdir = `kpsewhich -var-value=SELFAUTOPARENT`;
+    my $texdir = `kpsewhich -var-value=TEXMFROOT`;
     chomp($texdir);
     my $texdir_bsl = conv_to_w32_path($texdir);
     $icon =~ s!^TEXDIR/!$texdir/!;
@@ -4677,10 +4676,15 @@
 

 =item C<setup_sys_user_mode($prg, $optsref, $tmfc, $tmfsc, $tmfv, $tmfsv)>
 
-Return two-element list C<($texmfconfig,$texmfvar)> of which directories
-to use, either user or sys. If C<$prg> is C<mktexfmt>, and the system
-dirs are writable, use them even if we are in user mode.
+Return two-element list C<($texmfconfig,$texmfvar)> specifying which
+directories to use, either user or sys.  If C<$optsref->{'sys'}>  is
+true, we are in sys mode; else if C<$optsref->{'user'}> is set, we are
+in user mode; else a fatal error.
 
+If C<$prg> eq C<"mktexfmt">, and C<$TEXMFSYSVAR/web2c> is writable, use
+it instead of C<$TEXMFVAR>, even if we are in user mode. C<$TEXMFCONFIG>
+is not switched, however.
+
 =cut
 
 sub setup_sys_user_mode {

Added: trunk/Build/source/texk/web2c/tests/xeteximage.tex
===================================================================
--- trunk/Build/source/texk/web2c/tests/xeteximage.tex	                        (rev 0)
+++ trunk/Build/source/texk/web2c/tests/xeteximage.tex	2021-11-10 15:35:19 UTC (rev 61016)
@@ -0,0 +1,76 @@
+% $Id$
+% Copyright 2020 Bruno Voisin <tex-live at tug.org>
+% You may freely use, modify and/or distribute this file.
+%
+\ifx\fmtname\undefined
+  \input basic
+  \def\fmtname{basic}
+  \expandafter\dump
+\fi
+%==================
+\special{pdf:minorversion 7}
+
+\topskip0pt
+
+\hbox{\XeTeXpicfile "1-4.jpg" width \hsize height \vsize}
+\vfill\eject
+
+\hbox{\XeTeXpdffile "B.pdf" width \hsize height \vsize}
+\vfill\eject
+
+\hbox{\XeTeXpicfile "lily-ledger-broken.png" width \hsize height \vsize}
+\vfill\eject
+
+\vbox to\vsize{\vfill%
+  \special{pdf:image
+    width \the\hsize
+%    height \the\vsize
+  (1-4.jpg)}}
+\eject
+
+\vbox to\vsize{\vfill%
+  \special{pdf:epdf
+    width \the\hsize
+%    height \the\vsize
+   (B.pdf)}}
+\eject
+
+\vbox to\vsize{\vfill%
+  \special{pdf:image
+    width \the\hsize
+%    height \the\vsize
+  (lily-ledger-broken.png)}}
+\eject
+
+\bye
+
+Date: Sat, 16 May 2020 01:33:51 +0200
+From: Bruno Voisin via tex-live <tex-live at tug.org>
+To: tex-live at tug.org
+Subject: Re: xetex test creation for reading pdf images?
+
+Here's a (very quickly) hacked adaptation of luaimage.tex to xetex. I commented out the format creation section at the beginning to test on my setup, after downloading
+
+Build/source/texk/web2c/luatexdir/tests/luaimage.tex
+
+Build/source/texk/web2c/tests/1-4.jpg
+Build/source/texk/web2c/tests/B.pdf
+Build/source/texk/web2c/tests/lily-ledger-broken.png
+
+Two forms of image inclusion commands are used:
+
+- \XeTeXpicfile and \XeTeXpdffile which are the original XeTeX commands,
+
+- \special{pdf:image and \special{pdf:epdf which are the (x)dvipdfm(x) specials,
+
+based on XeTeX-notes.pdf, xetex-reference.pdf, dvipdfm.pdf and dvipdfmx.pdf.
+
+There are some subtle differences between the two forms, not just their syntax but also the way they work. With the latter, specifying both the width and height in a way that alters the aspect ratio of the image does not seem to work: in this case, the image is nowhere to be seen.
+
+That's odd, because I looked at the associated xetex.def and dvipdfmx.def from the graphics package for double-checking and inspiration, and there seems to be no trick to deal with this, it seems to be business as usual with \Gin at req@width and \Gin at req@height.
+
+I won't be able to pursue the matter or maintain this file, it's just to get this thing started. (And I didn't attempt to modify the copyright at the beginning.)
+
+Bruno Voisin
+
+untyped binary data, xeteximage.tex [Press RETURN to save to a file]


Property changes on: trunk/Build/source/texk/web2c/tests/xeteximage.tex
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Date Author Id Revision
\ No newline at end of property
Modified: trunk/Master/texmf-dist/scripts/texlive/NEWS
===================================================================
--- trunk/Master/texmf-dist/scripts/texlive/NEWS	2021-11-10 00:49:08 UTC (rev 61015)
+++ trunk/Master/texmf-dist/scripts/texlive/NEWS	2021-11-10 15:35:19 UTC (rev 61016)
@@ -1,7 +1,7 @@
 (This file public domain.  Originally written by Norbert Preining and
 Karl Berry, 2010.)
 
-<p><b>tlmgr 605693 (released 12oct21):</b>
+<p><b>tlmgr 60693 (released 12oct21):</b>
 <li>use TEXMFROOT instead of SELFAUTOPARENT to allow easier relocating
     (<a href="/pipermail/tex-live/2021-September/047394.html">thread</a>).
 



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