From 2772639ac90d4515f30be0f63e347c110fb568a8 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Wed, 13 Jan 2021 22:15:03 +0000 Subject: albatross (13jan21) git-svn-id: svn://tug.org/texlive/trunk@57416 c570f23f-e606-0410-a88d-b1316a301751 --- Master/bin/win32/albatross.exe | Bin 1536 -> 0 bytes Master/texmf-dist/doc/man/man1/albatross.1 | 4 ++- Master/texmf-dist/doc/man/man1/albatross.man1.pdf | Bin 18964 -> 18986 bytes Master/texmf-dist/doc/support/albatross/README.md | 16 +++++++++ .../doc/support/albatross/albatross-manual.pdf | Bin 78095 -> 79705 bytes .../doc/support/albatross/albatross-manual.tex | 39 ++++++++++++++++++--- .../texmf-dist/doc/support/albatross/version.tex | 2 +- Master/texmf-dist/scripts/albatross/albatross.jar | Bin 3088376 -> 3131862 bytes .../support/albatross/albatross-0.2.0-src.zip | Bin 5846 -> 0 bytes .../support/albatross/albatross-0.3.0-src.zip | Bin 0 -> 6074 bytes 10 files changed, 55 insertions(+), 6 deletions(-) delete mode 100755 Master/bin/win32/albatross.exe delete mode 100644 Master/texmf-dist/source/support/albatross/albatross-0.2.0-src.zip create mode 100644 Master/texmf-dist/source/support/albatross/albatross-0.3.0-src.zip diff --git a/Master/bin/win32/albatross.exe b/Master/bin/win32/albatross.exe deleted file mode 100755 index 5777d90a17a..00000000000 Binary files a/Master/bin/win32/albatross.exe and /dev/null differ diff --git a/Master/texmf-dist/doc/man/man1/albatross.1 b/Master/texmf-dist/doc/man/man1/albatross.1 index 41b5e86f9a0..1f50608e900 100644 --- a/Master/texmf-dist/doc/man/man1/albatross.1 +++ b/Master/texmf-dist/doc/man/man1/albatross.1 @@ -1,4 +1,4 @@ -.TH ALBATROSS 1 "09 December 2020" "v0.2.0" +.TH ALBATROSS 1 "13 January 2021" "v0.3.0" .SH NAME albatross \- a tool for finding fonts that contain a given (Unicode) glyph. .SH SYNOPSIS @@ -28,6 +28,8 @@ Show a detailed font list Set the default ANSI level .IP \fB--border-style\fP [1|2|3|4|5|6] Set the border style +.IP \fB--or\fP +Look for each glyph separately .IP \fB--version\fP Show the version and exit .IP \fB--help\fP diff --git a/Master/texmf-dist/doc/man/man1/albatross.man1.pdf b/Master/texmf-dist/doc/man/man1/albatross.man1.pdf index a1e75960642..1868a61ee12 100644 Binary files a/Master/texmf-dist/doc/man/man1/albatross.man1.pdf and b/Master/texmf-dist/doc/man/man1/albatross.man1.pdf differ diff --git a/Master/texmf-dist/doc/support/albatross/README.md b/Master/texmf-dist/doc/support/albatross/README.md index 9f411eb1d82..45c6bd543d2 100644 --- a/Master/texmf-dist/doc/support/albatross/README.md +++ b/Master/texmf-dist/doc/support/albatross/README.md @@ -29,6 +29,7 @@ Options: Set the default ANSI level -b, --border-style [1|2|3|4|5|6] Set the border style + -o, --or Look for each glyph separately -V, --version Show the version and exit -h, --help Show this message and exit ``` @@ -48,6 +49,21 @@ Albatross takes a list of glyphs as input. Two formats are supported: The `0x` prefix is mandatory. Note that the tool takes the value as case insensitive, e.g, `0xDF` is equal to `0xdf` (or any case combination thereof). +When a list of glyphs is provided, the tool will take a conjunctive approach and +look for fonts that contain all elements in such list (default behaviour). Use +the `-o` flag (or `--or` for the long flag) to look for each glyph separately. +For instance: + +- Look for fonts that contain both `a` and `b`: + ```bash + $ albatross a b + ``` + +- Look for fonts that contain `a` and fonts that contain `b`, separately: + ```bash + $ albatross --or a b + ``` + ### Output Albatross prints the results as a table. The default behaviour is to just diff --git a/Master/texmf-dist/doc/support/albatross/albatross-manual.pdf b/Master/texmf-dist/doc/support/albatross/albatross-manual.pdf index ec731e1f771..5953976a421 100644 Binary files a/Master/texmf-dist/doc/support/albatross/albatross-manual.pdf and b/Master/texmf-dist/doc/support/albatross/albatross-manual.pdf differ diff --git a/Master/texmf-dist/doc/support/albatross/albatross-manual.tex b/Master/texmf-dist/doc/support/albatross/albatross-manual.tex index 65f6000a31e..ea0a689908b 100644 --- a/Master/texmf-dist/doc/support/albatross/albatross-manual.tex +++ b/Master/texmf-dist/doc/support/albatross/albatross-manual.tex @@ -87,8 +87,9 @@ Options: -d, --detailed Show a detailed font list -a, --ansi-level [n|a16|a256|tc] Set the default ANSI level - -b, --border-style [1|2|2|3|4|5] + -b, --border-style [1|2|3|4|5|6] Set the border style + -o, --or Look for each glyph separately -V, --version Show the version and exit -h, --help Show this message and exit \end{Verbatim} @@ -128,6 +129,26 @@ to \hex{df} (or any case combination thereof). Formats can be used interchangeably. +When a list of glyphs is provided, the tool will take a conjunctive approach and +look for fonts that contain all elements in such list (default behaviour). Use +the \shortopt{o} flag (or \longopt{or} for the long flag) to look for each glyph +separately. For instance: + +\begin{itemize}[label={--}] +\item Look for fonts that contain both \glyph{a} and \glyph{b}: + +\begin{Verbatim}[frame=single, fontsize=\small, framesep=3.5mm] +$ albatross a b +\end{Verbatim} + +\item Look for fonts that contain \glyph{a} and fonts that contain \glyph{b}, +separately: + +\begin{Verbatim}[frame=single, fontsize=\small, framesep=3.5mm] +$ albatross --or a b +\end{Verbatim} +\end{itemize} + \section{Output} \label{sec:output} @@ -299,8 +320,6 @@ results to a terminal pager, e.g, the \command{less} utility: $ albatross ß | less \end{Verbatim} -\newpage - \section{Coloured output} \label{sec:colouredoutput} @@ -441,7 +460,19 @@ Source Initiative. \epigraph{How much is it?}{\textsc{Monty Python}} -\section*{0.2.0 (current)} +\section*{0.3.0 (current)} + +\subsection*{Changed} + +\begin{itemize}[label={--}] +\item Conjunctive behavior is now default. Previously, \command{albatross a b} +would have looked for fonts for \glyph{a} and separately for fonts for \glyph{b}. +As we see more use cases for looking for fonts that contain \glyph{a} as well as +\glyph{b}, we changed the default and left the previous behavior as +\command{albatross --or a b}. +\end{itemize} + +\section*{0.2.0 (2020-12-09)} \subsection*{Added} diff --git a/Master/texmf-dist/doc/support/albatross/version.tex b/Master/texmf-dist/doc/support/albatross/version.tex index 341cf11faf9..9325c3ccda9 100644 --- a/Master/texmf-dist/doc/support/albatross/version.tex +++ b/Master/texmf-dist/doc/support/albatross/version.tex @@ -1 +1 @@ -0.2.0 \ No newline at end of file +0.3.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 19d94f121b9..3ffc544977c 100755 Binary files a/Master/texmf-dist/scripts/albatross/albatross.jar and b/Master/texmf-dist/scripts/albatross/albatross.jar differ diff --git a/Master/texmf-dist/source/support/albatross/albatross-0.2.0-src.zip b/Master/texmf-dist/source/support/albatross/albatross-0.2.0-src.zip deleted file mode 100644 index bc82b68ca20..00000000000 Binary files a/Master/texmf-dist/source/support/albatross/albatross-0.2.0-src.zip and /dev/null differ diff --git a/Master/texmf-dist/source/support/albatross/albatross-0.3.0-src.zip b/Master/texmf-dist/source/support/albatross/albatross-0.3.0-src.zip new file mode 100644 index 00000000000..05756e28b3c Binary files /dev/null and b/Master/texmf-dist/source/support/albatross/albatross-0.3.0-src.zip differ -- cgit v1.2.3