summaryrefslogtreecommitdiff
path: root/Build/source
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2023-11-23 21:15:08 +0000
committerKarl Berry <karl@freefriends.org>2023-11-23 21:15:08 +0000
commit423224b7cf529771a8f49b2e193b764f4922f27c (patch)
treeb91b0ada00da82b96067c397ce39eaf5c34a751d /Build/source
parent2f8c4419211d8862a6c9a6289595528c46489b70 (diff)
pfarrei (23nov23)
git-svn-id: svn://tug.org/texlive/trunk@68947 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/pfarrei/a5toa4.tlu7
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/pfarrei/pfarrei.tlu13
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/texlive/tlmgr.pl35
3 files changed, 34 insertions, 21 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/pfarrei/a5toa4.tlu b/Build/source/texk/texlive/linked_scripts/pfarrei/a5toa4.tlu
index 900a3b6fc25..5631d845496 100755
--- a/Build/source/texk/texlive/linked_scripts/pfarrei/a5toa4.tlu
+++ b/Build/source/texk/texlive/linked_scripts/pfarrei/a5toa4.tlu
@@ -21,14 +21,15 @@
-- <http://www.latex-project.org/lppl.txt> for additional
-- information.
--
--- This work has the LPPL maintenance status `maintained'.
+-- This work has the LPPL maintenance status `unmaintained'.
--
--- The Current Maintainer of this work is Markus Kohm.
+--
+-- This package is currently unmaintained.
--
-- The list of files belonging to the work `pfarrei' is given in
-- the file `pfarrei.dtx'.
--
--- $Id: pfarrei.dtx 36 2013-10-16 18:54:26Z mjk $
+-- $Id: pfarrei.dtx 37 2023-11-22 18:54:26Z ps $
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 d0310cd72d0..6330b55e740 100755
--- a/Build/source/texk/texlive/linked_scripts/pfarrei/pfarrei.tlu
+++ b/Build/source/texk/texlive/linked_scripts/pfarrei/pfarrei.tlu
@@ -21,14 +21,15 @@
-- <http://www.latex-project.org/lppl.txt> for additional
-- information.
--
--- This work has the LPPL maintenance status `maintained'.
+-- This work has the LPPL maintenance status `unmaintained'.
--
--- The Current Maintainer of this work is Markus Kohm.
+--
+-- This package is currently unmaintained.
--
-- The list of files belonging to the work `pfarrei' is given in
-- the file `pfarrei.dtx'.
--
-local version_number = string.sub( '$Revision: 36 $', 12, -2 )
+local version_number = string.sub( '$Revision: 37 $', 12, -2 )
local action_version = ' r' .. version_number .. '\n' .. [[
Copyright (c) 2013 Markus Kohm.
@@ -100,11 +101,15 @@ while arg[i] do
-- build the temporary tex file
local tmpdir = os.tmpdir("pfarrei.XXXXXX" )
local tmpfile = string.match( arg[i], '.*/(.*)$') or arg[i]
+ -- pdflatex's -output-directory search for source pdf works with path specification but fails
+ -- when simple file name in the current working directory is provided, we need to provide '../' then
+ local local_source=''
+ if tmpfile == arg[i] then local_source = '../' end
local basename = string.match( tmpfile,'(.*)%.[^.]*$') or tmpfile
tmpfile = tmpdir..'/'..basename..'.tex'
local file = assert( io.open( tmpfile, 'w' ) )
if booklet then assert( file:write("\\PassOptionsToPackage{booklet}{pfarrei}\n") ) end
- assert( file:write("\\def\\OriginalFile{",arg[i],"}\n") )
+ assert( file:write("\\def\\OriginalFile{"..local_source,arg[i],"}\n") )
assert( file:write("\\input{a5toa4.tex}\n") )
assert( file:flush() )
file:close()
diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
index 37dfcfccd1c..3fcf84bb117 100755
--- a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
+++ b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
@@ -1,5 +1,5 @@
#!/usr/bin/env perl
-# $Id: tlmgr.pl 68818 2023-11-12 00:30:53Z preining $
+# $Id: tlmgr.pl 68903 2023-11-19 18:53:19Z karl $
# Copyright 2008-2023 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
@@ -8,8 +8,8 @@
use strict; use warnings;
-my $svnrev = '$Revision: 68818 $';
-my $datrev = '$Date: 2023-11-12 01:30:53 +0100 (Sun, 12 Nov 2023) $';
+my $svnrev = '$Revision: 68903 $';
+my $datrev = '$Date: 2023-11-19 19:53:19 +0100 (Sun, 19 Nov 2023) $';
my $tlmgrrevision;
my $tlmgrversion;
my $prg;
@@ -37,7 +37,7 @@ our $allowed_verify_args_regex = qr/^(none|main|all)$/i;
END {
if ($opts{"pause"}) {
- print "Press Enter to exit the program.\n";
+ print "\n$prg: Pausing at end of run as requested; press Enter to exit.\n";
<STDIN>;
}
}
@@ -2334,7 +2334,9 @@ sub write_w32_updater {
my $root = $localtlpdb->root;
my $temp = "$root/temp";
TeXLive::TLUtils::mkdirhier($temp);
- tlwarn("$prg: Backup option not implemented for infrastructure update.\n") if ($opts{"backup"});
+ tlwarn("$prg: warning: backup option not implemented for infrastructure "
+ . " update on Windows; continuing anyway.\n")
+ if ($opts{"backup"});
if ($media eq 'local_uncompressed') {
tlwarn("$prg: Creating updater from local_uncompressed currently not implemented!\n");
tlwarn("$prg: But it should not be necessary!\n");
@@ -4924,7 +4926,7 @@ sub action_option {
}
}
if (!$found) {
- tlwarn("$prg: option $what not supported!\n");
+ tlwarn("$prg: Option not supported: $what\n");
return ($F_ERROR);
}
}
@@ -7344,25 +7346,30 @@ and the repository are not compatible:
# The check we employ is heuristic: texlive-scripts is updated practically
# every day. We compare the locally installed texlive-scripts with the
# remove revision, and if that does not line up, we error out.
- # Alternative approaches
- # - loop over all installed packages and take the maximum of the found revisions
- # - on every update, save the last seen remote main revision into 00texlive.installation
+ # Alternative approaches:
+ # - loop over all installed packages and take the maximum of revisions found
+ # - on every update, save the last seen remote main revision into
+ # 00texlive.installation
#
if ($is_main) {
my $remote_revision = $remotetlpdb->config_revision;
my $tlp = $localtlpdb->get_package("texlive-scripts");
my $local_revision;
if (!defined($tlp)) {
- info("texlive-scripts not found, not doing revision consistency check\n");
+ info("texlive-scripts package not found (?!), "
+ . "skipping revision consistency check\n");
$local_revision = 0;
} else {
$local_revision = $tlp->revision;
}
+ debug("Remote database revision $remote_revision, "
+ . "texlive-scripts local revision $local_revision\n");
if ($local_revision > $remote_revision) {
info("fail load $location\n") if ($::machinereadable);
- return(undef, "Remote database (rev $remote_revision) seems to be older than local (rev $local_revision), please use different mirror or wait a bit.")
- } else {
- debug("Remote database revision $remote_revision, texlive-scripts local revision $local_revision\n");
+ return(undef, "Remote database (rev $remote_revision) seems to be "
+ . "older than local (rev $local_revision of "
+ . "texlive-scripts); please use different mirror or "
+ . " wait a day or so.")
}
}
@@ -10272,7 +10279,7 @@ This script and its documentation were written for the TeX Live
distribution (L<https://tug.org/texlive>) and both are licensed under the
GNU General Public License Version 2 or later.
-$Id: tlmgr.pl 68818 2023-11-12 00:30:53Z preining $
+$Id: tlmgr.pl 68903 2023-11-19 18:53:19Z karl $
=cut
# test HTML version: pod2html --cachedir=/tmp tlmgr.pl >/tmp/tlmgr.html