unicode-alphabets (23jul19)

git-svn-id: svn://tug.org/texlive/trunk@51712 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 14 insertions, 17 deletions

diff --git a/Master/texmf-dist/doc/latex/unicode-alphabets/README.md b/Master/texmf-dist/doc/latex/unicode-alphabets/README.md
index abe2fb58608..998681de05f 100644
--- a/Master/texmf-dist/doc/latex/unicode-alphabets/README.md
+++ b/Master/texmf-dist/doc/latex/unicode-alphabets/README.md
@@ -7,7 +7,7 @@ See [unicode-alphabets.pdf](docs/unicode-alphabets.pdf) for the documentation.
 
 See [specimen.pdf](docs/specimen.pdf) for examples.
 
-Contents last updated 2017-07-19.
+Contents last updated 2019-07-23.
 
 Package available via CTAN at https://www.ctan.org/pkg/unicode-alphabets
 
diff --git a/Master/texmf-dist/doc/latex/unicode-alphabets/specimen.pdf b/Master/texmf-dist/doc/latex/unicode-alphabets/specimen.pdf
index 8d336593c29..94386650f80 100644
--- a/Master/texmf-dist/doc/latex/unicode-alphabets/specimen.pdf
+++ b/Master/texmf-dist/doc/latex/unicode-alphabets/specimen.pdf
diff --git a/Master/texmf-dist/doc/latex/unicode-alphabets/specimen.tex b/Master/texmf-dist/doc/latex/unicode-alphabets/specimen.tex
index 4912283f5c9..9962b8a81b1 100644
--- a/Master/texmf-dist/doc/latex/unicode-alphabets/specimen.tex
+++ b/Master/texmf-dist/doc/latex/unicode-alphabets/specimen.tex
@@ -52,37 +52,34 @@
 	}%
 }
 
-\newif\ifspec@has@entity
 \specset{
 	character set/.code={
 		\csedef{spec@charset}{#1}%
 		\caselower[q]{\spec@charset}%
 		\csedef{spec@code}{\thestring}%
 		\csedef{spec@csvfile}{unicode-alphabets.\spec@code.csv}%
-		\csedef{spec@font}{\csname\spec@code font\endcsname}%
 	},
 	font url/.store in=\spec@font@url,
-	has entity/.is if=spec@has@entity,
 }
 
 \newcommand\specimen[1]{%
-	\specset{has entity=false,#1}%
+	\specset{#1}%
 	\chapter*{\spec@charset}
 	\addcontentsline{toc}{chapter}{\spec@charset}
 
-	Using the font \spec@showfont{\spec@font} from \url{\spec@font@url}.
+	Using the font \spec@showfont{\csuse{alph@font@\spec@code}} from \url{\spec@font@url}.
 
 	\begingroup
-	\def\mytablerow{\texttt{\csvcoli} & \csuse{\csuse{spec@code}}{\csvcoli} & \ifspec@has@entity\csvcolii &\fi \csvcoliii}
-	\ifspec@has@entity
-		\def\spec@columns{r @{ } c @{ } l @{ } X}
-	\else
-		\def\spec@columns{r @{ } c @{ } X}
-	\fi
+	\def\mytablerow{\texttt{\csvcoli} & \csuse{\csuse{spec@code}}{\csvcoli} & \ifbool{alph@\spec@code @has@entities}{\csvcolii & \csvcoliii}{\csvcolii}}
+	\ifbool{alph@\spec@code @has@entities}{%
+		\def\spec@columns{r @{ } c @{ } l @{ } X}%
+	}{%
+		\def\spec@columns{r @{ } c @{ } X}%
+	}%
 	\expanded{\unexpanded{\begin{xltabular}{\linewidth}}{\spec@columns}}
 	\toprule
-	& Code & \ifspec@has@entity&\fi \hfill \spec@charset\\
-	Glyph & Point & \ifspec@has@entity Entity Name &\fi Unicode Name\\
+	Code & & \ifbool{alph@\spec@code @has@entities}{&}{} \hfill \spec@charset\\
+	Point & Glyph & \ifbool{alph@\spec@code @has@entities}{ Entity Name &}{} Unicode Name\\
 	\midrule
 	\endhead
 	\bottomrule
@@ -107,7 +104,6 @@
 \specimen{
 	character set=MUFI,
 	font url=http://mufi.info/,
-	has entity=true,
 }
 
 \specimen{
@@ -125,7 +121,6 @@
 \specimen{
 	character set=UNZ,
 	font url=http://www.ligafaktur.de/,
-	has entity=true,
 }
 \catcode`\_=8
 \endgroup
diff --git a/Master/texmf-dist/doc/latex/unicode-alphabets/unicode-alphabets.pdf b/Master/texmf-dist/doc/latex/unicode-alphabets/unicode-alphabets.pdf
index 0c4bd25ad56..cd9afaaa8a9 100644
--- a/Master/texmf-dist/doc/latex/unicode-alphabets/unicode-alphabets.pdf
+++ b/Master/texmf-dist/doc/latex/unicode-alphabets/unicode-alphabets.pdf
diff --git a/Master/texmf-dist/tex/latex/unicode-alphabets/unicode-alphabets.sty b/Master/texmf-dist/tex/latex/unicode-alphabets/unicode-alphabets.sty
index c6551761a30..9195bab402b 100644
--- a/Master/texmf-dist/tex/latex/unicode-alphabets/unicode-alphabets.sty
+++ b/Master/texmf-dist/tex/latex/unicode-alphabets/unicode-alphabets.sty
@@ -1,4 +1,4 @@
-\ProvidesPackage{unicode-alphabets}[2019/07/22 Unicode alphabets in the Private Use Area]
+\ProvidesPackage{unicode-alphabets}[2019/07/23 Unicode alphabets in the Private Use Area]
 
 % License: CC-BY-SA 4.0
 % Author: Mikkel Eide Eriksen <mikkel.eriksen@gmail.com>
@@ -54,6 +54,7 @@
 \newcommand\alph@make@set[2]{%
 	% #1 = character set
 	% #2 = macro name
+	\newbool{alph@#1@has@entities}%
 	\alph@make@main{#1}{#2}%
 	\csvloop{
 		file={unicode-alphabets.#1.csv},
@@ -67,6 +68,7 @@
 			}{}%
 			\ifcsdef{alph@entity}{%
 				\ifcsempty{alph@entity}{}{%
+					\booltrue{alph@#1@has@entities}%
 					\csxdef{alph@#1@\alph@entity}{\alph@codepoint}%
 					\ifalph@noentitymacros\relax\else%
 						\expanded{\unexpanded{\alph@make@character}{#1}{#2}{\alph@entity}{\alph@codepoint}}%