forms16be (30aug17)

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

1 files changed, 13 insertions, 10 deletions

diff --git a/Master/texmf-dist/tex/latex/forms16be/forms16be.sty b/Master/texmf-dist/tex/latex/forms16be/forms16be.sty
index ca569bc7da1..11ac2e0d3b3 100644
--- a/Master/texmf-dist/tex/latex/forms16be/forms16be.sty
+++ b/Master/texmf-dist/tex/latex/forms16be/forms16be.sty
@@ -20,31 +20,34 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{forms16be}
- [2017/08/11 v1.0 Provides UTF-16BE encoding for text strings (dps)]
+ [2017/08/28 v1.2 Provides UTF-16BE encoding for text strings (dps)]
 \def\U@csarg#1#2{\expandafter#1\csname#2\endcsname}
-\let\U@Zero=0 \let\U@One=1
 \providecommand\aeb@exiii{\expandafter\expandafter\expandafter}
+\def\fbe@sanitize{\@makeother\"\@makeother\#\@makeother\$%
+  \@makeother\%\@makeother~%
+  \@for\x:=ABCDEFabcdef()\do{\@makeother\x}}
 \providecommand\convertChriiUnicode[2]{\U@csarg\gdef{uni@#1}{#2}}%
 \def\aref(#1){\csname aeb@aDescript@#1\endcsname}
 \providecommand{\displayUnicode}[1]{\csname uni@#1\endcsname}
 \providecommand{\stringiiUnicode}{FEFF\expandafter\@stringiiUnicode}
 \providecommand{\@stringiiUnicode}[1]{\ifx#1\relax\else
-  \ifx#1\u\aeb@exiii\getRawUnicode\else
+  \ifx#1\u\aeb@exiii\getRawUnicode@tp\else
   \displayUnicode{#1}\aeb@exiii\@stringiiUnicode\fi\fi}
-\providecommand{\getRawUnicode}{\expandafter\@getRawUnicode}
+\def\getRawUnicode@tp#1{\ifx#1(\aeb@exiii\getRawUnicode@p\else
+  \aeb@exiii\@getRawUnicode\fi#1}
+\def\getRawUnicode@p(#1){\expandafter\@getRawUnicode#1}
 \providecommand{\@getRawUnicode}[4]{#1#2#3#4\@stringiiUnicode}
 \def\unicodeStr(#1){\expandafter
     \ifx\csname aeb@aDescript@#1\endcsname\relax
   FEFF#1\else\aeb@exiii\stringiiUnicode\aref(#1)\relax\fi}
-\def\defUniStr#1{\bgroup\@for\x:=ABCDEFabcdef\do{\@makeother\x}%
-  \def\U@uniStrName{#1}\@ifnextchar\bgroup{\defUniStr@i}{}}
-\def\defUniStr@i{\obeyspaces\getUniDescript}%
-\def\U@NameUniStr{\global\U@csarg\let
-  {aeb@aDescript@\U@uniStrName}\U@description\egroup}
+\def\defUniStr#1{\def\U@uniStrName{#1}\bgroup\fbe@sanitize
+  \obeyspaces\getUniDescript}
 {\obeyspaces\gdef\getUniDescript#1{\gdef\U@description{#1}%
 \U@NameUniStr}}
+\def\U@NameUniStr{\global\U@csarg\let
+  {aeb@aDescript@\U@uniStrName}\U@description\egroup}
 \InputIfFileExists{uni4basic-latin.def}{\PackageInfo{forms16be}
-  {inputting uni4basic-latin.def\MessageBreak definitions}}
+  {Inputting uni4basic-latin.def\MessageBreak definitions}}
   {\PackageError{forms16be}
     {Cannot find the file uni4basic-latin.def}{}}
 \endinput