ucharcat (24aug15)

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

3 files changed, 6 insertions, 7 deletions

diff --git a/Master/texmf-dist/doc/latex/ucharcat/ucharcat.pdf b/Master/texmf-dist/doc/latex/ucharcat/ucharcat.pdf
index f34e47dee2a..10cbd506795 100644
--- a/Master/texmf-dist/doc/latex/ucharcat/ucharcat.pdf
+++ b/Master/texmf-dist/doc/latex/ucharcat/ucharcat.pdf
diff --git a/Master/texmf-dist/source/latex/ucharcat/ucharcat.dtx b/Master/texmf-dist/source/latex/ucharcat/ucharcat.dtx
index 90727c6f8d7..1f8dd13c629 100644
--- a/Master/texmf-dist/source/latex/ucharcat/ucharcat.dtx
+++ b/Master/texmf-dist/source/latex/ucharcat/ucharcat.dtx
@@ -13,7 +13,7 @@
 %<driver> \ProvidesFile{ucharcat.drv}
 % \fi
 %         \ProvidesFile{ucharcat.dtx}
-       [2015/05/20 v0.01 ucharcat for luaLaTeX  (DPC)]
+       [2015/08/23 v0.02 ucharcat for luaLaTeX  (DPC)]
 %
 % \iffalse
 %<*driver>
@@ -138,15 +138,13 @@
 %    \begin{macrocode}
 \ifx\newcatcodetable\@undefined
   \chardef\ucharcat@table"7000
+  \directlua{tex.enableprimitives("",{"initcatcodetable"})}
+  \initcatcodetable\ucharcat@table
 \else
   \newcatcodetable\ucharcat@table
 \fi
 %    \end{macrocode}
 %
-% Set up catcode table.
-%    \begin{macrocode}
-\luatexinitcatcodetable\ucharcat@table
-%    \end{macrocode}
 % 
 % lua print function
 %    \begin{macrocode}
diff --git a/Master/texmf-dist/tex/latex/ucharcat/ucharcat.sty b/Master/texmf-dist/tex/latex/ucharcat/ucharcat.sty
index 1bad5082f8f..3a1a67fd5e5 100644
--- a/Master/texmf-dist/tex/latex/ucharcat/ucharcat.sty
+++ b/Master/texmf-dist/tex/latex/ucharcat/ucharcat.sty
@@ -13,7 +13,7 @@
 %% See README for details.
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{ucharcat}
-       [2015/05/20 v0.01 ucharcat for luaLaTeX  (DPC)]
+       [2015/08/23 v0.02 ucharcat for luaLaTeX  (DPC)]
 \ifx\directlua\@undefined
 \ifx\Ucharcat\@undefined
 \ifx\XeTeXinterchartokenstate\@undefined
@@ -30,10 +30,11 @@
 \fi
 \ifx\newcatcodetable\@undefined
   \chardef\ucharcat@table"7000
+  \directlua{tex.enableprimitives("",{"initcatcodetable"})}
+  \initcatcodetable\ucharcat@table
 \else
   \newcatcodetable\ucharcat@table
 \fi
-\luatexinitcatcodetable\ucharcat@table
 \directlua{%
 function UcharcatLua()
   local mych = newtoken.scan_int()