summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/luatex/luatexbase
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-05-21 22:12:49 +0000
committerKarl Berry <karl@freefriends.org>2011-05-21 22:12:49 +0000
commitc77ea47d64e7856e33d80fe8e6c63fbe955261e1 (patch)
tree0d9e240e4c72916ab362f33fe73537c7a4945dd4 /Master/texmf-dist/tex/luatex/luatexbase
parentbe7e56a1469601d92ef4a30a8b9caf3335b05393 (diff)
luatexbase (21may11)
git-svn-id: svn://tug.org/texlive/trunk@22560 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/luatex/luatexbase')
-rw-r--r--Master/texmf-dist/tex/luatex/luatexbase/luatexbase-attr.sty10
-rw-r--r--Master/texmf-dist/tex/luatex/luatexbase/luatexbase-cctb.sty10
-rw-r--r--Master/texmf-dist/tex/luatex/luatexbase/luatexbase-compat.sty2
-rw-r--r--Master/texmf-dist/tex/luatex/luatexbase/luatexbase.sty5
4 files changed, 9 insertions, 18 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-attr.sty b/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-attr.sty
index cea0e56aaac..28e7ef3d983 100644
--- a/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-attr.sty
+++ b/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-attr.sty
@@ -52,7 +52,7 @@
\let\x\ProvidesPackage
\fi
\expandafter\endgroup
-\x{luatexbase-attr}[2010/10/10 v0.3 Attributes allocation for LuaTeX]
+\x{luatexbase-attr}[2011/05/21 v0.31 Attributes allocation for LuaTeX]
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname RequirePackage\endcsname\relax
\input ifluatex.sty
@@ -103,10 +103,10 @@
\errmessage{No room for a new \string\attribute}%
\fi}
\def\unsetluatexattribute#1{%
- \begingroup\escapechar\m@ne
- \luatexbase@directlua{%
- luatexbase.unset_attribute("\luatexluaescapestring{\string#1}")}%
- \endgroup}
+ \begingroup\escapechar\m@ne \edef\x{\endgroup
+ \noexpand\luatexbase@directlua{%
+ luatexbase.unset_attribute("\luatexluaescapestring{\string#1}")}%
+ }\x}
\def\setluatexattribute#1#2{%
#1=\numexpr#2\relax}
\lltxb@attr@AtEnd
diff --git a/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-cctb.sty b/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-cctb.sty
index 76321642650..091cc315e14 100644
--- a/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-cctb.sty
+++ b/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-cctb.sty
@@ -82,21 +82,15 @@
\RequirePackage{luatexbase-loader}
\fi
\luatexbase@directlua{require('luatexbase.cctb')}
-\begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname RequirePackage\endcsname\relax
- \input luatexbase-compat.sty
-\else
- \RequirePackage{luatexbase-compat}
-\fi
\luatexbase@ensure@primitive{luaescapestring}
\luatexbase@ensure@primitive{catcodetable}
\luatexbase@ensure@primitive{initcatcodetable}
\luatexbase@ensure@primitive{savecatcodetable}
\newcount\lltxb@catcodetable@alloc
-\lltxb@catcodetable@alloc\z@
+\lltxb@catcodetable@alloc\m@ne
\def\newluatexcatcodetable#1{%
\ifnum\lltxb@catcodetable@alloc<65535\relax
- \global\advance\lltxb@catcodetable@alloc\@ne
+ \global\advance\lltxb@catcodetable@alloc\tw@
\allocationnumber\lltxb@catcodetable@alloc
\global\chardef#1\allocationnumber
\luatexinitcatcodetable\allocationnumber
diff --git a/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-compat.sty b/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-compat.sty
index 4dd53855cc6..88a58875fd7 100644
--- a/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-compat.sty
+++ b/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-compat.sty
@@ -123,7 +123,7 @@
\fi}
\else
\x{%
- \luatexbase@directlua{tex.enableprimitives('luatex', '#1')}}
+ \luatexbase@directlua{tex.enableprimitives('luatex', {'#1'})}}
\fi
\x{%
\fi}
diff --git a/Master/texmf-dist/tex/luatex/luatexbase/luatexbase.sty b/Master/texmf-dist/tex/luatex/luatexbase/luatexbase.sty
index 1f2c8ba0541..a2aa1091aa9 100644
--- a/Master/texmf-dist/tex/luatex/luatexbase/luatexbase.sty
+++ b/Master/texmf-dist/tex/luatex/luatexbase/luatexbase.sty
@@ -6,10 +6,7 @@
%%
%% luatexbase.dtx (with options: `texpackage')
%%
-%% Written in 2009, 2010 by Manuel Pegourie-Gonnard and Elie Roux.
-%%
-%% This work is under the CC0 license.
-%% See source file 'luatexbase.dtx' for details.
+%% See source file 'luatexbase.dtx' for licence and contact information.
%%
\csname lltxb@core@loaded\endcsname
\expandafter\let\csname lltxb@core@loaded\endcsname\endinput