summaryrefslogtreecommitdiff
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
parentbe7e56a1469601d92ef4a30a8b9caf3335b05393 (diff)
luatexbase (21may11)
git-svn-id: svn://tug.org/texlive/trunk@22560 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/luatex/luatexbase/Changes4
-rw-r--r--Master/texmf-dist/doc/luatex/luatexbase/TODO38
-rw-r--r--Master/texmf-dist/doc/luatex/luatexbase/luatexbase-attr.pdfbin333430 -> 333770 bytes
-rw-r--r--Master/texmf-dist/doc/luatex/luatexbase/luatexbase-cctb.pdfbin371582 -> 371644 bytes
-rw-r--r--Master/texmf-dist/doc/luatex/luatexbase/luatexbase-compat.pdfbin426509 -> 426564 bytes
-rw-r--r--Master/texmf-dist/doc/luatex/luatexbase/luatexbase-loader.pdfbin379396 -> 379444 bytes
-rw-r--r--Master/texmf-dist/doc/luatex/luatexbase/luatexbase-mcb.pdfbin419935 -> 420027 bytes
-rw-r--r--Master/texmf-dist/doc/luatex/luatexbase/luatexbase-modutils.pdfbin430199 -> 430256 bytes
-rw-r--r--Master/texmf-dist/doc/luatex/luatexbase/luatexbase-regs.pdfbin376442 -> 376490 bytes
-rw-r--r--Master/texmf-dist/doc/luatex/luatexbase/luatexbase.pdfbin321844 -> 321874 bytes
-rw-r--r--Master/texmf-dist/doc/luatex/luatexbase/test-attr-latex.tex2
-rw-r--r--Master/texmf-dist/doc/luatex/luatexbase/test-attr-plain.tex2
-rw-r--r--Master/texmf-dist/doc/luatex/luatexbase/test-base-latex.tex5
-rw-r--r--Master/texmf-dist/doc/luatex/luatexbase/test-base-plain.tex5
-rw-r--r--Master/texmf-dist/source/luatex/luatexbase/luatexbase-attr.dtx22
-rw-r--r--Master/texmf-dist/source/luatex/luatexbase/luatexbase-cctb.dtx21
-rw-r--r--Master/texmf-dist/source/luatex/luatexbase/luatexbase-compat.dtx2
-rw-r--r--Master/texmf-dist/source/luatex/luatexbase/luatexbase.dtx5
-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
22 files changed, 64 insertions, 69 deletions
diff --git a/Master/texmf-dist/doc/luatex/luatexbase/Changes b/Master/texmf-dist/doc/luatex/luatexbase/Changes
index d41f72290b6..d9e2a0ee286 100644
--- a/Master/texmf-dist/doc/luatex/luatexbase/Changes
+++ b/Master/texmf-dist/doc/luatex/luatexbase/Changes
@@ -4,6 +4,10 @@ The [BI] tag signals backward-incompatible changes.
Starting with v0.3, the only possible source of such changes is the upcoming
merge with luatex.sty. Afterwards, no other BI change is to be expected.
+2011/05/21 v0.31
+ attr
+ - Bugfix: \unsetluatexattribute didn't work (reported by Dohyun Kim)
+
2010/10/10 v0.3
all not using LuaTeX results in an error (formerly a warning)
modutils
diff --git a/Master/texmf-dist/doc/luatex/luatexbase/TODO b/Master/texmf-dist/doc/luatex/luatexbase/TODO
index ae89fbfc3c4..40cded71548 100644
--- a/Master/texmf-dist/doc/luatex/luatexbase/TODO
+++ b/Master/texmf-dist/doc/luatex/luatexbase/TODO
@@ -1,23 +1,29 @@
-Version 0.3
-===========
+Next actions
+------------
-general
--------
+1. Do the catcode table stack à la luatex.sty.
+2. Merge with luatex.sty (inc test suite).
+3. Coordinate release with Heiko.
-- `make check` for luaotfload & fontspec (lltxb branch)
-- synchronize release
+test suite
+----------
+- regression checks on the results of the tests (sed+diff the log)
+- add debug messages to be used in the test suite?
+- import test files from luatex.sty
-Later
-=====
+luatex.sty
+----------
-all
----
+- do it (depends on cctb update)
+- provide \newcatcodetable & all for now, used in l3luatex.sty (to be
+ investigated), with a depcracation warning
-- discuss merge with Heiko...
+compat
+------
-- regression checks on the results of the tests (sed+diff the log)
-- add debug messages to be used in the test suite?
+- clarify doc/comments about relying on etex/pdf primitives
+- import some error checking from Heiko's \LuT@MakeLuatexPrimitive
modutils
--------
@@ -27,8 +33,14 @@ modutils
cctb
----
+- stack à la luatex.sty
- support for unicode-letters?
+mcb
+---
+
+- add an analogue of `callback.find()`, see #4
+
bytecode registers
------------------
diff --git a/Master/texmf-dist/doc/luatex/luatexbase/luatexbase-attr.pdf b/Master/texmf-dist/doc/luatex/luatexbase/luatexbase-attr.pdf
index 7ae3916a8a2..8a3708bba1a 100644
--- a/Master/texmf-dist/doc/luatex/luatexbase/luatexbase-attr.pdf
+++ b/Master/texmf-dist/doc/luatex/luatexbase/luatexbase-attr.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/luatex/luatexbase/luatexbase-cctb.pdf b/Master/texmf-dist/doc/luatex/luatexbase/luatexbase-cctb.pdf
index e02e405c46a..74fc6322f67 100644
--- a/Master/texmf-dist/doc/luatex/luatexbase/luatexbase-cctb.pdf
+++ b/Master/texmf-dist/doc/luatex/luatexbase/luatexbase-cctb.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/luatex/luatexbase/luatexbase-compat.pdf b/Master/texmf-dist/doc/luatex/luatexbase/luatexbase-compat.pdf
index 230ab1bacb4..d309c959af2 100644
--- a/Master/texmf-dist/doc/luatex/luatexbase/luatexbase-compat.pdf
+++ b/Master/texmf-dist/doc/luatex/luatexbase/luatexbase-compat.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/luatex/luatexbase/luatexbase-loader.pdf b/Master/texmf-dist/doc/luatex/luatexbase/luatexbase-loader.pdf
index 85c997aae47..bdcba9f045b 100644
--- a/Master/texmf-dist/doc/luatex/luatexbase/luatexbase-loader.pdf
+++ b/Master/texmf-dist/doc/luatex/luatexbase/luatexbase-loader.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/luatex/luatexbase/luatexbase-mcb.pdf b/Master/texmf-dist/doc/luatex/luatexbase/luatexbase-mcb.pdf
index 8d7983fce53..5cf9dd7fb3d 100644
--- a/Master/texmf-dist/doc/luatex/luatexbase/luatexbase-mcb.pdf
+++ b/Master/texmf-dist/doc/luatex/luatexbase/luatexbase-mcb.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/luatex/luatexbase/luatexbase-modutils.pdf b/Master/texmf-dist/doc/luatex/luatexbase/luatexbase-modutils.pdf
index dd5bd91e799..f2d07b1edbf 100644
--- a/Master/texmf-dist/doc/luatex/luatexbase/luatexbase-modutils.pdf
+++ b/Master/texmf-dist/doc/luatex/luatexbase/luatexbase-modutils.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/luatex/luatexbase/luatexbase-regs.pdf b/Master/texmf-dist/doc/luatex/luatexbase/luatexbase-regs.pdf
index ef1eb3b40f1..66b78007591 100644
--- a/Master/texmf-dist/doc/luatex/luatexbase/luatexbase-regs.pdf
+++ b/Master/texmf-dist/doc/luatex/luatexbase/luatexbase-regs.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/luatex/luatexbase/luatexbase.pdf b/Master/texmf-dist/doc/luatex/luatexbase/luatexbase.pdf
index f425c7d478c..60242a46280 100644
--- a/Master/texmf-dist/doc/luatex/luatexbase/luatexbase.pdf
+++ b/Master/texmf-dist/doc/luatex/luatexbase/luatexbase.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/luatex/luatexbase/test-attr-latex.tex b/Master/texmf-dist/doc/luatex/luatexbase/test-attr-latex.tex
index 0885e7a2122..701a922f45d 100644
--- a/Master/texmf-dist/doc/luatex/luatexbase/test-attr-latex.tex
+++ b/Master/texmf-dist/doc/luatex/luatexbase/test-attr-latex.tex
@@ -14,7 +14,9 @@
\RequirePackage{luatexbase-attr}
\newluatexattribute\testattr
\setluatexattribute\testattr{1}
+\ifnum\testattr=1 \else \ERROR \fi
\unsetluatexattribute\testattr
+\ifnum\testattr<0 \else \ERROR \fi
\catcode64 11
\luatexbase@directlua{assert(luatexbase.attributes.testattr)}
\luatexbase@directlua{luatexbase.new_attribute('luatestattr')}
diff --git a/Master/texmf-dist/doc/luatex/luatexbase/test-attr-plain.tex b/Master/texmf-dist/doc/luatex/luatexbase/test-attr-plain.tex
index 050d53dfa1a..ae136ccaae8 100644
--- a/Master/texmf-dist/doc/luatex/luatexbase/test-attr-plain.tex
+++ b/Master/texmf-dist/doc/luatex/luatexbase/test-attr-plain.tex
@@ -14,7 +14,9 @@
\input luatexbase-attr.sty
\newluatexattribute\testattr
\setluatexattribute\testattr{1}
+\ifnum\testattr=1 \else \ERROR \fi
\unsetluatexattribute\testattr
+\ifnum\testattr<0 \else \ERROR \fi
\catcode64 11
\luatexbase@directlua{assert(luatexbase.attributes.testattr)}
\luatexbase@directlua{luatexbase.new_attribute('luatestattr')}
diff --git a/Master/texmf-dist/doc/luatex/luatexbase/test-base-latex.tex b/Master/texmf-dist/doc/luatex/luatexbase/test-base-latex.tex
index 43eb95863c9..867eb32dfdc 100644
--- a/Master/texmf-dist/doc/luatex/luatexbase/test-base-latex.tex
+++ b/Master/texmf-dist/doc/luatex/luatexbase/test-base-latex.tex
@@ -6,10 +6,7 @@
%%
%% luatexbase.dtx (with options: `testlatex')
%%
-%% 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.
%%
\RequirePackage{luatexbase}
\stop
diff --git a/Master/texmf-dist/doc/luatex/luatexbase/test-base-plain.tex b/Master/texmf-dist/doc/luatex/luatexbase/test-base-plain.tex
index 553e671c40c..2af3f60e23d 100644
--- a/Master/texmf-dist/doc/luatex/luatexbase/test-base-plain.tex
+++ b/Master/texmf-dist/doc/luatex/luatexbase/test-base-plain.tex
@@ -6,10 +6,7 @@
%%
%% luatexbase.dtx (with options: `testplain')
%%
-%% 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.
%%
\input luatexbase.sty
\bye
diff --git a/Master/texmf-dist/source/luatex/luatexbase/luatexbase-attr.dtx b/Master/texmf-dist/source/luatex/luatexbase/luatexbase-attr.dtx
index d377f7c619f..78602d36e26 100644
--- a/Master/texmf-dist/source/luatex/luatexbase/luatexbase-attr.dtx
+++ b/Master/texmf-dist/source/luatex/luatexbase/luatexbase-attr.dtx
@@ -113,7 +113,7 @@ See source file '\inFileName' for details.
% Grave accent \` Left brace \{ Vertical bar \|
% Right brace \} Tilde \~}
%
-% \pkdate{luatexbase-attr}{v0.3 2010-05-27}
+% \pkdate{luatexbase-attr}{v0.31 2011-05-21}
%
% \maketitle
%
@@ -152,12 +152,12 @@ See source file '\inFileName' for details.
% as |tex.atrribute.fooattr|, but not the attribute number).
%
% There are several ways to work around this. For example, it is possible to
-% extract the number at any time from the |\meaning| of |\foobar|.
+% extract the number at any time from the |\meaning| of |\fooattr|.
% Alternatively, one could look at |\the\allocationnumber| just after the
% definition of |\fooattr| and remember it in a Lua variable. For your
% convenience, this is automatically done by |\newluatexattribute|: the number
% is remembered in a dedicated Lua table so that you can get it as
-% |luatexbase.attributes.foobar| (mind the absence of backslash here) at any
+% |luatexbase.attributes.fooattr| (mind the absence of backslash here) at any
% time.
%
% Also, two Lua functions are provided that are analogous to the above \tex
@@ -234,7 +234,7 @@ See source file '\inFileName' for details.
\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]
% \end{macrocode}
%
% Make sure \luatex is used.
@@ -324,10 +324,10 @@ See source file '\inFileName' for details.
%
% \begin{macrocode}
\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}
% \end{macrocode}
%
% And now the trivial helper macro.
@@ -399,8 +399,8 @@ end
% \section{Test files}
%
% The tests done are very basic: we just make sure that the package loads
-% correctly and the macros don't generate any error, under both LaTeX en
-% Plain TeX. We also check that the attribute's number is remembered well,
+% correctly and the macros don't generate any error, under both \latex and
+% Plain \tex. We also check that the attribute's number is remembered well,
% independently of the current value of |\escapechar|.
%
% \begin{macrocode}
@@ -409,7 +409,9 @@ end
%<*testplain,testlatex>
\newluatexattribute\testattr
\setluatexattribute\testattr{1}
+\ifnum\testattr=1 \else \ERROR \fi
\unsetluatexattribute\testattr
+\ifnum\testattr<0 \else \ERROR \fi
\catcode64 11
\luatexbase@directlua{assert(luatexbase.attributes.testattr)}
\luatexbase@directlua{luatexbase.new_attribute('luatestattr')}
diff --git a/Master/texmf-dist/source/luatex/luatexbase/luatexbase-cctb.dtx b/Master/texmf-dist/source/luatex/luatexbase/luatexbase-cctb.dtx
index c60cdc0c709..b3172c06e24 100644
--- a/Master/texmf-dist/source/luatex/luatexbase/luatexbase-cctb.dtx
+++ b/Master/texmf-dist/source/luatex/luatexbase/luatexbase-cctb.dtx
@@ -289,18 +289,8 @@ See source file '\inFileName' for details.
%
% \subsubsection{Primitives needed}
%
-% Load \pk{luatexbase-compat}.
-%
-% \begin{macrocode}
-\begingroup\expandafter\expandafter\expandafter\endgroup
-\expandafter\ifx\csname RequirePackage\endcsname\relax
- \input luatexbase-compat.sty
-\else
- \RequirePackage{luatexbase-compat}
-\fi
-% \end{macrocode}
-%
-% Make sure the primitives we need are available.
+% \pk{luatexbase-compat} is already loaded; just make sure the primitives
+% we need are available.
%
% \begin{macrocode}
\luatexbase@ensure@primitive{luaescapestring}
@@ -312,14 +302,15 @@ See source file '\inFileName' for details.
% \subsubsection{User macros}
%
% The allocation macro. Allocate tables starting with 1, since table 0 is
-% reserved for IniTeX catcodes by LuaTeX.
+% the default table. Allocate only odd numbers to allow using even numbers
+% as a stack.
%
% \begin{macrocode}
\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/source/luatex/luatexbase/luatexbase-compat.dtx b/Master/texmf-dist/source/luatex/luatexbase/luatexbase-compat.dtx
index e7d29b2b107..e518e0d6695 100644
--- a/Master/texmf-dist/source/luatex/luatexbase/luatexbase-compat.dtx
+++ b/Master/texmf-dist/source/luatex/luatexbase/luatexbase-compat.dtx
@@ -369,7 +369,7 @@ See source file '\inFileName' for details.
%
% \begin{macrocode}
\x{%
- \luatexbase@directlua{tex.enableprimitives('luatex', '#1')}}
+ \luatexbase@directlua{tex.enableprimitives('luatex', {'#1'})}}
\fi
\x{%
\fi}
diff --git a/Master/texmf-dist/source/luatex/luatexbase/luatexbase.dtx b/Master/texmf-dist/source/luatex/luatexbase/luatexbase.dtx
index 405e72007de..9014b2ac84a 100644
--- a/Master/texmf-dist/source/luatex/luatexbase/luatexbase.dtx
+++ b/Master/texmf-dist/source/luatex/luatexbase/luatexbase.dtx
@@ -32,10 +32,7 @@
\preamble
-Written in 2009, 2010 by Manuel Pegourie-Gonnard and Elie Roux.
-
-This work is under the CC0 license.
-See source file '\inFileName' for details.
+See source file '\inFileName' for licence and contact information.
\endpreamble
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