summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-10-28 20:57:55 +0000
committerKarl Berry <karl@freefriends.org>2016-10-28 20:57:55 +0000
commit2a6a7fba1491d434954a174b8a7fe2e07d6c104a (patch)
tree360d2fa677d067df23f7f46507427aa25e93a6a6
parent8289077694867928d89669029eb58b0f27fed253 (diff)
nameauth (28oct16)
git-svn-id: svn://tug.org/texlive/trunk@42373 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/nameauth/nameauth.pdfbin874877 -> 875007 bytes
-rw-r--r--Master/texmf-dist/source/latex/nameauth/nameauth.dtx26
-rw-r--r--Master/texmf-dist/tex/latex/nameauth/nameauth.sty22
3 files changed, 23 insertions, 25 deletions
diff --git a/Master/texmf-dist/doc/latex/nameauth/nameauth.pdf b/Master/texmf-dist/doc/latex/nameauth/nameauth.pdf
index e7741d41c8b..5adee70ceee 100644
--- a/Master/texmf-dist/doc/latex/nameauth/nameauth.pdf
+++ b/Master/texmf-dist/doc/latex/nameauth/nameauth.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/nameauth/nameauth.dtx b/Master/texmf-dist/source/latex/nameauth/nameauth.dtx
index 7fb789ddda2..e5b7c97ac09 100644
--- a/Master/texmf-dist/source/latex/nameauth/nameauth.dtx
+++ b/Master/texmf-dist/source/latex/nameauth/nameauth.dtx
@@ -180,7 +180,7 @@ Running "make install" installs the files in the local TeX tree.
%<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
%<package>\ProvidesPackage{nameauth}
%<*package>
- [2016/10/26 v3.0 Name authority management for consistency in text and index]
+ [2016/10/27 v3.01 Name authority management for consistency in text and index]
%</package>
%<*driver>
\documentclass[11pt]{ltxdoc}
@@ -407,7 +407,7 @@ Running "make install" installs the files in the local TeX tree.
%</driver>
% \fi
%
-% \CheckSum{3101}
+% \CheckSum{3085}
%
% \CharacterTable
% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -3654,21 +3654,20 @@ Running "make install" installs the files in the local TeX tree.
% \noindent{\large\bfseries Error Detection}
% \begin{macro}{\@nameauth@Error}
% \changes{v3.0}{2016/10/26}{Added}
+% \changes{v3.01}{2016/10/27}{Fixed}
% One can cause \textsf{nameauth} to halt with an error by leaving a required name argument empty, providing an argument that expands to empty, or creating a name root that is empty within a root/suffix pair.
% \begin{macrocode}
\newcommand*\@nameauth@Error[2]
{%
- \edef\msg{#2}%
- \edef\pkg{nameauth}%
- \let\ex\expandafter%
- \protected@edef\argb{\trim@spaces{#1}}%
- \protected@edef\rootb{\@nameauth@Root{#1}}%
- \ifx\argb\@empty
- \ex\PackageError\ex{\ex\pkg\ex}\ex{\msg SNN field empty}%
- \else
- \ifx\rootb\@empty
- \ex\PackageError\ex{\ex\pkg\ex}\ex{\msg SNN field malformed}%
- \fi
+ \edef\msga{#2 SNN field empty}%
+ \edef\msgb{#2 SNN field malformed}%
+ \protected@edef\testname{\trim@spaces{#1}}%
+ \protected@edef\testroot{\@nameauth@Root{#1}}%
+ \ifx\testname\@empty
+ \PackageError{nameauth}{\msga}%
+ \fi
+ \ifx\testroot\@empty
+ \PackageError{nameauth}{\msgb}%
\fi
}
% \end{macrocode}
@@ -3738,6 +3737,7 @@ Running "make install" installs the files in the local TeX tree.
}
% \end{macrocode}
% \end{macro}
+% \clearpage
%
% \begin{macro}{\@nameauth@Parse}
% \changes{v3.0}{2016/10/26}{Added}
diff --git a/Master/texmf-dist/tex/latex/nameauth/nameauth.sty b/Master/texmf-dist/tex/latex/nameauth/nameauth.sty
index 1af86456999..3b721a34931 100644
--- a/Master/texmf-dist/tex/latex/nameauth/nameauth.sty
+++ b/Master/texmf-dist/tex/latex/nameauth/nameauth.sty
@@ -15,7 +15,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{nameauth}
- [2016/10/26 v3.0 Name authority management for consistency in text and index]
+ [2016/10/27 v3.01 Name authority management for consistency in text and index]
\newif\if@nameauth@InAKA
\newif\if@nameauth@InName
\newif\if@nameauth@Xref
@@ -158,17 +158,15 @@
}
\newcommand*\@nameauth@Error[2]
{%
- \edef\msg{#2}%
- \edef\pkg{nameauth}%
- \let\ex\expandafter%
- \protected@edef\argb{\trim@spaces{#1}}%
- \protected@edef\rootb{\@nameauth@Root{#1}}%
- \ifx\argb\@empty
- \ex\PackageError\ex{\ex\pkg\ex}\ex{\msg SNN field empty}%
- \else
- \ifx\rootb\@empty
- \ex\PackageError\ex{\ex\pkg\ex}\ex{\msg SNN field malformed}%
- \fi
+ \edef\msga{#2 SNN field empty}%
+ \edef\msgb{#2 SNN field malformed}%
+ \protected@edef\testname{\trim@spaces{#1}}%
+ \protected@edef\testroot{\@nameauth@Root{#1}}%
+ \ifx\testname\@empty
+ \PackageError{nameauth}{\msga}%
+ \fi
+ \ifx\testroot\@empty
+ \PackageError{nameauth}{\msgb}%
\fi
}
\newcommandx*\@nameauth@Name[3][1=\@empty, 3=\@empty]