1 files changed, 32 insertions, 30 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-attr.sty b/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-attr.sty
index 28e7ef3d983..fb0ab68989c 100644
--- a/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-attr.sty
+++ b/Master/texmf-dist/tex/luatex/luatexbase/luatexbase-attr.sty
@@ -6,53 +6,57 @@
 %%
 %% luatexbase-attr.dtx  (with options: `texpackage')
 %% 
-%% Written in 2009, 2010 by Manuel Pegourie-Gonnard and Elie Roux.
+%% See the aforementioned source file(s) for copyright and licensing information.
 %% 
-%% This work is under the CC0 license.
-%% See source file 'luatexbase-attr.dtx' for details.
-%% 
-                \csname lltxb@attr@loaded\endcsname
-\expandafter\let\csname lltxb@attr@loaded\endcsname\endinput
-\begingroup
+\begingroup\catcode61\catcode48\catcode32=10\relax% = and space
   \catcode123 1 % {
   \catcode125 2 % }
   \catcode 35 6 % #
-  \toks0{}%
-  \def\x{}%
+  \toks0\expandafter{\expandafter\endlinechar\the\endlinechar}%
+  \edef\x{\endlinechar13}%
   \def\y#1 #2 {%
     \toks0\expandafter{\the\toks0 \catcode#1 \the\catcode#1}%
     \edef\x{\x \catcode#1 #2}}%
-  \y 123 1  % {
-  \y 125 2  % }
-  \y  35 6  % #
-  \y  10 12 % ^^J
+  \y  13  5 % carriage return
+  \y  61 12 % =
+  \y  32 10 % space
+  \y 123  1 % {
+  \y 125  2 % }
+  \y  35  6 % #
+  \y  64 11 % @ (letter)
+  \y  10 12 % new line ^^J
   \y  34 12 % "
-  \y  36 3  % $ $
   \y  39 12 % '
   \y  40 12 % (
   \y  41 12 % )
-  \y  42 12 % *
-  \y  43 12 % +
   \y  44 12 % ,
   \y  45 12 % -
   \y  46 12 % .
   \y  47 12 % /
+  \y  58 12 % :
   \y  60 12 % <
-  \y  61 12 % =
-  \y  64 11 % @ (letter)
   \y  62 12 % >
-  \y  95 12 % _ (other)
+  \y  91 12 % [
+  \y  93 12 % ]
+  \y  94  7 % ^
+  \y  95  8 % _
   \y  96 12 % `
-  \edef\y#1{\endgroup\edef#1{\the\toks0\relax}\x}%
-\expandafter\y\csname lltxb@attr@AtEnd\endcsname
+  \toks0\expandafter{\the\toks0 \relax\noexpand\endinput}%
+  \edef\y#1{\noexpand\expandafter\endgroup%
+    \noexpand\ifx#1\relax \edef#1{\the\toks0}\x\relax%
+    \noexpand\else \noexpand\expandafter\noexpand\endinput%
+    \noexpand\fi}%
+\expandafter\y\csname luatexbase@attr@sty@endinput\endcsname%
 \begingroup
   \expandafter\ifx\csname ProvidesPackage\endcsname\relax
-    \def\x#1[#2]{\immediate\write16{Package: #1 #2}}
+    \def\x#1[#2]{%
+    %\immediate\write16{Package: #1 #2}}
+    }
   \else
     \let\x\ProvidesPackage
   \fi
 \expandafter\endgroup
-\x{luatexbase-attr}[2011/05/21 v0.31 Attributes allocation for LuaTeX]
+\x{luatexbase-attr}[2011/05/24 v0.4 Attributes allocation for LuaTeX]
 \begingroup\expandafter\expandafter\expandafter\endgroup
 \expandafter\ifx\csname RequirePackage\endcsname\relax
   \input ifluatex.sty
@@ -72,8 +76,7 @@
     This package can only be used with the LuaTeX engine^^J%
     (command `lualatex' or `luatex').^^J%
     Package loading has been stopped to prevent additional errors.}
-  \lltxb@attr@AtEnd
-  \expandafter\endinput
+  \expandafter\luatexbase@attr@sty@endinput%
 \fi
 \begingroup\expandafter\expandafter\expandafter\endgroup
 \expandafter\ifx\csname RequirePackage\endcsname\relax
@@ -102,14 +105,13 @@
   \else
     \errmessage{No room for a new \string\attribute}%
   \fi}
+\newcount\lltxb@attr@unsetvalue
+\lltxb@attr@unsetvalue=\ifnum\luatexversion<37 -1\else -2147483647\fi\relax
 \def\unsetluatexattribute#1{%
-  \begingroup\escapechar\m@ne \edef\x{\endgroup
-    \noexpand\luatexbase@directlua{%
-      luatexbase.unset_attribute("\luatexluaescapestring{\string#1}")}%
-  }\x}
+  #1\lltxb@attr@unsetvalue}
 \def\setluatexattribute#1#2{%
   #1=\numexpr#2\relax}
-\lltxb@attr@AtEnd
+\luatexbase@attr@sty@endinput%
 \endinput
 %%
 %% End of file `luatexbase-attr.sty'.