summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-12-09 21:48:41 +0000
committerKarl Berry <karl@freefriends.org>2020-12-09 21:48:41 +0000
commit9092cffddfb59c73ba495475611aa90a43467d45 (patch)
tree7d5a6af1834f9d88e741143a560a62358b3cf6a3
parent27dca08d81a019745d464a67bae5b00f01211615 (diff)
albatross (9dec20)
git-svn-id: svn://tug.org/texlive/trunk@57103 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/albatross/albatross.sh2
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/texlive/tlmgr.pl24
-rw-r--r--Master/texmf-dist/doc/man/man1/albatross.138
-rw-r--r--Master/texmf-dist/doc/man/man1/albatross.man1.pdfbin0 -> 18964 bytes
-rw-r--r--Master/texmf-dist/doc/support/albatross/albatross-manual.pdfbin76990 -> 78095 bytes
-rw-r--r--Master/texmf-dist/doc/support/albatross/albatross-manual.tex17
-rw-r--r--Master/texmf-dist/doc/support/albatross/version.tex2
-rwxr-xr-xMaster/texmf-dist/scripts/albatross/albatross.jarbin3088115 -> 3088376 bytes
-rwxr-xr-xMaster/texmf-dist/scripts/albatross/albatross.sh2
-rw-r--r--Master/texmf-dist/source/support/albatross/albatross-0.2.0-src.zip (renamed from Master/texmf-dist/doc/support/albatross/albatross-0.1.0-src.zip)bin5795 -> 5846 bytes
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds2
11 files changed, 76 insertions, 11 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/albatross/albatross.sh b/Build/source/texk/texlive/linked_scripts/albatross/albatross.sh
index 323713ca4b8..4c636c6a03e 100755
--- a/Build/source/texk/texlive/linked_scripts/albatross/albatross.sh
+++ b/Build/source/texk/texlive/linked_scripts/albatross/albatross.sh
@@ -14,4 +14,4 @@ if echo "$kernel" | grep CYGWIN >/dev/null; then
jarpath=`cygpath -w "$jarpath"`
fi
-exec java -jar "$jarpath" "$@" \ No newline at end of file
+exec java -jar "$jarpath" "$@"
diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
index 3f60d52a75e..b8dfbf38852 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 56993 2020-11-24 18:35:36Z karl $
+# $Id: tlmgr.pl 57093 2020-12-08 14:41:33Z preining $
#
# Copyright 2008-2020 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
-my $svnrev = '$Revision: 56993 $';
-my $datrev = '$Date: 2020-11-24 19:35:36 +0100 (Tue, 24 Nov 2020) $';
+my $svnrev = '$Revision: 57093 $';
+my $datrev = '$Date: 2020-12-08 15:41:33 +0100 (Tue, 08 Dec 2020) $';
my $tlmgrrevision;
my $tlmgrversion;
my $prg;
@@ -7065,7 +7065,9 @@ sub setup_one_remotetlpdb {
# first check that the saved tlpdb is present at all
my $loc_digest = TeXLive::TLCrypto::tl_short_digest($location);
my $loc_copy_of_remote_tlpdb =
- "$Master/$InfraLocation/texlive.tlpdb.$loc_digest";
+ ($is_main ?
+ "$Master/$InfraLocation/texlive.tlpdb.main.$loc_digest" :
+ "$Master/$InfraLocation/texlive.tlpdb.$loc_digest");
ddebug("loc_digest = $loc_digest\n");
ddebug("loc_copy = $loc_copy_of_remote_tlpdb\n");
if (-r $loc_copy_of_remote_tlpdb) {
@@ -7229,7 +7231,9 @@ FROZEN
if (!$local_copy_tlpdb_used && $location =~ m;^(https?|ftp)://;) {
my $loc_digest = TeXLive::TLCrypto::tl_short_digest($location);
my $loc_copy_of_remote_tlpdb =
- "$Master/$InfraLocation/texlive.tlpdb.$loc_digest";
+ ($is_main ?
+ "$Master/$InfraLocation/texlive.tlpdb.main.$loc_digest" :
+ "$Master/$InfraLocation/texlive.tlpdb.$loc_digest");
my $tlfh;
if (!open($tlfh, ">:unix", $loc_copy_of_remote_tlpdb)) {
# that should be only a debug statement, since a user without
@@ -7240,6 +7244,14 @@ FROZEN
&debug("writing out tlpdb to $loc_copy_of_remote_tlpdb\n");
$remotetlpdb->writeout($tlfh);
close($tlfh);
+ # Remove all other copies of main databases in case different mirrors
+ # are used $Master/$InfraLocation/texlive.tlpdb.main.$loc_digest
+ if ($is_main) {
+ for my $fn (<"$Master/$InfraLocation/texlive.tlpdb.main.*">) {
+ next if ($fn eq $loc_copy_of_remote_tlpdb);
+ unlink($fn);
+ }
+ }
}
}
@@ -10101,7 +10113,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 56993 2020-11-24 18:35:36Z karl $
+$Id: tlmgr.pl 57093 2020-12-08 14:41:33Z preining $
=cut
# test HTML version: pod2html --cachedir=/tmp tlmgr.pl >/tmp/tlmgr.html
diff --git a/Master/texmf-dist/doc/man/man1/albatross.1 b/Master/texmf-dist/doc/man/man1/albatross.1
new file mode 100644
index 00000000000..41b5e86f9a0
--- /dev/null
+++ b/Master/texmf-dist/doc/man/man1/albatross.1
@@ -0,0 +1,38 @@
+.TH ALBATROSS 1 "09 December 2020" "v0.2.0"
+.SH NAME
+albatross \- a tool for finding fonts that contain a given (Unicode) glyph.
+.SH SYNOPSIS
+.B albatross
+.RI [ options ]
+.IR glyphs ...
+.SH DESCRIPTION
+\fBalbatross\fP is a command line tool for finding fonts that contain a given
+(Unicode) glyph. It relies on Fontconfig, a library for configuring and
+customizing font access.
+.PP
+Albatross takes a list of glyphs as input. Two formats are supported:
+.IP #1
+The glyph itself, e.g, ß (Eszett).
+Internally, the tool will convert it to the corresponding Unicode code point.
+.IP #2
+The glyph as a Unicode code point in the hexadecimal notation, e.g, \fC0xDF\fP.
+The \fC0x\fP prefix is mandatory. Note that the tool takes the value as case
+insensitive, e.g, \fC0xDF\fP is equal to \fC0xdf\fP (or any case combination
+thereof).
+.SH OPTIONS
+.IP \fB--show-styles\fP
+Show available font styles
+.IP \fB--detailed\fP
+Show a detailed font list
+.IP \fB--ansi-level\fP [n|a16|a256|tc]
+Set the default ANSI level
+.IP \fB--border-style\fP [1|2|3|4|5|6]
+Set the border style
+.IP \fB--version\fP
+Show the version and exit
+.IP \fB--help\fP
+Show a help message and exit.
+.SH BUGS
+Issue tracker at
+.UR https://gitlab.com/islandoftex/albatross/-/issues
+.UE .
diff --git a/Master/texmf-dist/doc/man/man1/albatross.man1.pdf b/Master/texmf-dist/doc/man/man1/albatross.man1.pdf
new file mode 100644
index 00000000000..a1e75960642
--- /dev/null
+++ b/Master/texmf-dist/doc/man/man1/albatross.man1.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/support/albatross/albatross-manual.pdf b/Master/texmf-dist/doc/support/albatross/albatross-manual.pdf
index e03ff5d2f6a..ec731e1f771 100644
--- a/Master/texmf-dist/doc/support/albatross/albatross-manual.pdf
+++ b/Master/texmf-dist/doc/support/albatross/albatross-manual.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/support/albatross/albatross-manual.tex b/Master/texmf-dist/doc/support/albatross/albatross-manual.tex
index 6c23400735d..65f6000a31e 100644
--- a/Master/texmf-dist/doc/support/albatross/albatross-manual.tex
+++ b/Master/texmf-dist/doc/support/albatross/albatross-manual.tex
@@ -441,7 +441,22 @@ Source Initiative.
\epigraph{How much is it?}{\textsc{Monty Python}}
-\section*{1.0.0 (current)}
+\section*{0.2.0 (current)}
+
+\subsection*{Added}
+
+\begin{itemize}[label={--}]
+\item Inclusion of a man page.
+\end{itemize}
+
+\subsection*{Fixed}
+
+\begin{itemize}[label={--}]
+\item Windows paths were incorrectly parsed, causing font names and styles to be
+displayed incorrectly.
+\end{itemize}
+
+\section*{0.1.0 (2020-12-07)}
\begin{itemize}[label={--}]
\item Initial release.
diff --git a/Master/texmf-dist/doc/support/albatross/version.tex b/Master/texmf-dist/doc/support/albatross/version.tex
index 6c6aa7cb091..341cf11faf9 100644
--- a/Master/texmf-dist/doc/support/albatross/version.tex
+++ b/Master/texmf-dist/doc/support/albatross/version.tex
@@ -1 +1 @@
-0.1.0 \ No newline at end of file
+0.2.0 \ No newline at end of file
diff --git a/Master/texmf-dist/scripts/albatross/albatross.jar b/Master/texmf-dist/scripts/albatross/albatross.jar
index 5f0b31c428b..19d94f121b9 100755
--- a/Master/texmf-dist/scripts/albatross/albatross.jar
+++ b/Master/texmf-dist/scripts/albatross/albatross.jar
Binary files differ
diff --git a/Master/texmf-dist/scripts/albatross/albatross.sh b/Master/texmf-dist/scripts/albatross/albatross.sh
index 323713ca4b8..4c636c6a03e 100755
--- a/Master/texmf-dist/scripts/albatross/albatross.sh
+++ b/Master/texmf-dist/scripts/albatross/albatross.sh
@@ -14,4 +14,4 @@ if echo "$kernel" | grep CYGWIN >/dev/null; then
jarpath=`cygpath -w "$jarpath"`
fi
-exec java -jar "$jarpath" "$@" \ No newline at end of file
+exec java -jar "$jarpath" "$@"
diff --git a/Master/texmf-dist/doc/support/albatross/albatross-0.1.0-src.zip b/Master/texmf-dist/source/support/albatross/albatross-0.2.0-src.zip
index 639c48906bf..bc82b68ca20 100644
--- a/Master/texmf-dist/doc/support/albatross/albatross-0.1.0-src.zip
+++ b/Master/texmf-dist/source/support/albatross/albatross-0.2.0-src.zip
Binary files differ
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 0091f8bbd78..1929942b2a7 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -89,7 +89,6 @@ chomp (my $ctan_root = `tlpkginfo --ctan-root`);
'aecc', "die 'skipping, obsolete on CTAN'",
'akktex', "&MAKEflatten",
'alatex', "die 'skipping, 1995 LaTeX generalization'",
- 'albatross', "&MAKEflatten",
'algolrevived',"&MAKEflatten",
'algorithm2e', "&MAKEflatten",
'algorithmicx',"&MAKEnosymlinks",
@@ -1511,6 +1510,7 @@ chomp (my $ctan_root = `tlpkginfo --ctan-root`);
%posthook = (
+ 'albatross' => '&POST_do_man',
'amscls-doc' => '&POST_rmsymlink',
'acmart' => '&POSTacmart',
'amsrefs' => '&POSTamsrefs',