summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-11-05 21:44:23 +0000
committerKarl Berry <karl@freefriends.org>2010-11-05 21:44:23 +0000
commit65da87ef9393c8b1d5da8f3c844ff00d24212dd9 (patch)
treef30a87413a0422e4fe550f8451556827742898df /Master/texmf-dist
parent3141b647e6510357f3d740e770fbf703151c17d2 (diff)
luatexbase (4nov10)
git-svn-id: svn://tug.org/texlive/trunk@20327 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/doc/luatex/luatexbase/Changes3
-rw-r--r--Master/texmf-dist/doc/luatex/luatexbase/TODO6
-rw-r--r--Master/texmf-dist/doc/luatex/luatexbase/luatexbase-attr.pdfbin333439 -> 333424 bytes
-rw-r--r--Master/texmf-dist/doc/luatex/luatexbase/luatexbase-cctb.pdfbin390338 -> 390323 bytes
-rw-r--r--Master/texmf-dist/doc/luatex/luatexbase/luatexbase-compat.pdfbin427424 -> 427408 bytes
-rw-r--r--Master/texmf-dist/doc/luatex/luatexbase/luatexbase-loader.pdfbin398869 -> 398854 bytes
-rw-r--r--Master/texmf-dist/doc/luatex/luatexbase/luatexbase-mcb.pdfbin347918 -> 348362 bytes
-rw-r--r--Master/texmf-dist/doc/luatex/luatexbase/luatexbase-modutils.pdfbin416756 -> 416741 bytes
-rw-r--r--Master/texmf-dist/doc/luatex/luatexbase/luatexbase-regs.pdfbin376902 -> 376886 bytes
-rw-r--r--Master/texmf-dist/doc/luatex/luatexbase/luatexbase.pdfbin318257 -> 320564 bytes
-rw-r--r--Master/texmf-dist/doc/luatex/luatexbase/test-base-latex.tex18
-rw-r--r--Master/texmf-dist/doc/luatex/luatexbase/test-base-plain.tex18
-rw-r--r--Master/texmf-dist/source/luatex/luatexbase/Makefile24
-rw-r--r--Master/texmf-dist/source/luatex/luatexbase/luatexbase-mcb.dtx24
-rw-r--r--Master/texmf-dist/source/luatex/luatexbase/luatexbase.dtx19
-rw-r--r--Master/texmf-dist/tex/luatex/luatexbase/luatexbase.sty26
-rw-r--r--Master/texmf-dist/tex/luatex/luatexbase/mcb.lua2
17 files changed, 102 insertions, 38 deletions
diff --git a/Master/texmf-dist/doc/luatex/luatexbase/Changes b/Master/texmf-dist/doc/luatex/luatexbase/Changes
index ce253fecdde..2db8f802daf 100644
--- a/Master/texmf-dist/doc/luatex/luatexbase/Changes
+++ b/Master/texmf-dist/doc/luatex/luatexbase/Changes
@@ -1,5 +1,8 @@
Changes in the luatexbase package/bundle
+2010/10/04
+ various documentation updates/fixes uploaded to CTAN
+
2010/05/27 v0.2a
attr
- allocate from 1 to avoid problems with some external code
diff --git a/Master/texmf-dist/doc/luatex/luatexbase/TODO b/Master/texmf-dist/doc/luatex/luatexbase/TODO
index a7e62206c71..60329a347ee 100644
--- a/Master/texmf-dist/doc/luatex/luatexbase/TODO
+++ b/Master/texmf-dist/doc/luatex/luatexbase/TODO
@@ -1,5 +1,7 @@
attr: \newluatexattribute -> \newattribute
+all: error if not running luatex!
+
modutils
--------
@@ -8,9 +10,10 @@ modutils
\luatexRequireModule
- syntax of public TeX macros and Lua functions
- create private functions for infwarrerr?
+- use tex.error for error reporting if available
- review logic (see what LaTeX2e does)
- General review of code and comments.
-- Update user documentation.
+- Update user documentation. Include template(s) for Lua modules.
mcb
---
@@ -20,6 +23,7 @@ mcb
- General review of code and comments.
- Update user documentation.
+
afterwards
----------
diff --git a/Master/texmf-dist/doc/luatex/luatexbase/luatexbase-attr.pdf b/Master/texmf-dist/doc/luatex/luatexbase/luatexbase-attr.pdf
index ce5cc04ccf0..0945f79b16d 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 1a6ff2fbea8..57712cc5ed9 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 eea31071cdc..b000cbcbf14 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 12268eac2e8..8c0df231ed3 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 ab8c549c8fe..ed8dba1b40a 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 94c2f8a4f06..bcbdab8cb95 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 9d132c31e05..a1f96554016 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 7e58d051e10..49241e4cbec 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-base-latex.tex b/Master/texmf-dist/doc/luatex/luatexbase/test-base-latex.tex
new file mode 100644
index 00000000000..43eb95863c9
--- /dev/null
+++ b/Master/texmf-dist/doc/luatex/luatexbase/test-base-latex.tex
@@ -0,0 +1,18 @@
+%%
+%% This is file `test-base-latex.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% 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.
+%%
+\RequirePackage{luatexbase}
+\stop
+\endinput
+%%
+%% End of file `test-base-latex.tex'.
diff --git a/Master/texmf-dist/doc/luatex/luatexbase/test-base-plain.tex b/Master/texmf-dist/doc/luatex/luatexbase/test-base-plain.tex
new file mode 100644
index 00000000000..553e671c40c
--- /dev/null
+++ b/Master/texmf-dist/doc/luatex/luatexbase/test-base-plain.tex
@@ -0,0 +1,18 @@
+%%
+%% This is file `test-base-plain.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% 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.
+%%
+\input luatexbase.sty
+\bye
+\endinput
+%%
+%% End of file `test-base-plain.tex'.
diff --git a/Master/texmf-dist/source/luatex/luatexbase/Makefile b/Master/texmf-dist/source/luatex/luatexbase/Makefile
index 8c82909d79f..0b854b07500 100644
--- a/Master/texmf-dist/source/luatex/luatexbase/Makefile
+++ b/Master/texmf-dist/source/luatex/luatexbase/Makefile
@@ -21,10 +21,10 @@ UNPACKED_MODUTILS = luatexbase-modutils.sty modutils.lua test-modutils.lua \
test-modutils-plain.tex test-modutils-latex.tex
UNPACKED_COMPAT = luatexbase-compat.sty \
test-compat-plain.tex test-compat-latex.tex
-UNPACKED_CORE = luatexbase.sty
+UNPACKED_BASE = luatexbase.sty test-base-plain.tex test-base-latex.tex
UNPACKED = $(UNPACKED_MCB) $(UNPACKED_REGS) $(UNPACKED_ATTR) $(UNPACKED_CCTB) \
$(UNPACKED_LOADER) $(UNPACKED_MODUTILS) $(UNPACKED_COMPAT) \
- $(UNPACKED_CORE)
+ $(UNPACKED_BASE)
COMPILED = $(DOC)
GENERATED = $(COMPILED) $(UNPACKED)
SOURCE = $(DTX) $(DTXSTY) README TODO Changes Makefile
@@ -60,13 +60,12 @@ TDS_ZIP = $(NAME).tds.zip
ZIPS = $(CTAN_ZIP) $(TDS_ZIP)
DO_TEX = tex --interaction=batchmode $< >/dev/null
-DO_PDFLATEX = pdflatex --interaction=batchmode $< >/dev/null
-DO_MAKEINDEX = makeindex -s gind.ist $(subst .dtx,,$<) >/dev/null 2>&1
+DO_LATEXMK = latexmk -silent $< >/dev/null
# Main targets definition
all: $(GENERATED)
check: check-regs check-attr check-cctb check-loader check-modutils check-mcb \
- check-compat
+ check-compat check-base
doc: $(COMPILED)
unpack: $(UNPACKED)
ctan: check $(CTAN_ZIP)
@@ -74,10 +73,7 @@ tds: $(TDS_ZIP) Makefile
world: all ctan
%.pdf: %.dtx $(DTXSTY)
- $(DO_PDFLATEX)
- $(DO_MAKEINDEX) || true
- $(DO_PDFLATEX)
- $(DO_PDFLATEX)
+ $(DO_LATEXMK)
luatexbase.%.lua: %.lua
ln -sf $< $@
@@ -103,7 +99,7 @@ $(UNPACKED_MODUTILS): luatexbase-modutils.dtx
$(UNPACKED_COMPAT): luatexbase-compat.dtx
$(DO_TEX)
-$(UNPACKED_CORE): luatexbase.dtx
+$(UNPACKED_BASE): luatexbase.dtx
$(DO_TEX)
check-regs: $(UNPACKED_REGS)
@@ -135,6 +131,10 @@ check-compat: $(UNPACKED_COMPAT)
luatex --interaction=batchmode test-compat-plain.tex >/dev/null
lualatex --interaction=batchmode test-compat-latex.tex >/dev/null
+check-base: $(UNPACKED_BASE)
+ luatex --interaction=batchmode test-base-plain.tex >/dev/null
+ lualatex --interaction=batchmode test-base-latex.tex >/dev/null
+
$(CTAN_ZIP): $(SOURCE) $(COMPILED) $(TDS_ZIP)
@echo "Making $@ for CTAN upload."
@$(RM) -- $@
@@ -169,7 +169,9 @@ manifest:
@for f in $(GENERATED); do echo $$f; done
clean:
- @$(RM) -- *.log *.aux *.toc *.idx *.ind *.ilg *.out test-*.pdf
+ @latexmk -silent -c *.dtx >/dev/null
+ @# for tex-only runs
+ @$(RM) -- *.log
mrproper: clean
@$(RM) -- $(GENERATED) $(ZIPS) $(TMP_LOADER)
diff --git a/Master/texmf-dist/source/luatex/luatexbase/luatexbase-mcb.dtx b/Master/texmf-dist/source/luatex/luatexbase/luatexbase-mcb.dtx
index 86a4788d2be..09c8c1c53dd 100644
--- a/Master/texmf-dist/source/luatex/luatexbase/luatexbase-mcb.dtx
+++ b/Master/texmf-dist/source/luatex/luatexbase/luatexbase-mcb.dtx
@@ -122,12 +122,12 @@ See source file '\inFileName' for details.
% \maketitle
%
% \begin{abstract}
-% This package manages the callback adding and removing, by adding
-% \texttt{callback.add} and \texttt{callback.remove}, and overwriting
-% \texttt{callback.register}. It also allows to create and call new callbacks.
-% For an introduction on this package (among others), please refer to the
-% document \texttt{luatextra-reference.pdf}.
-% \par\textbf{Warning.} Currently assumes that \textsf{luatexbase-modutils}
+% This package manages the callback adding and removing, by providing new
+% functions and overwriting \texttt{callback.register}. It also allows to
+% create and call new callbacks.\par
+% The user part of this documentation is currently very incomplete, and will
+% be expanded later. Sorry for this and thanks for your patience.\par
+% \textbf{Warning.} Currently assumes that \textsf{luatexbase-modutils}
% has been previously loaded. (This is a temporary limitation.)
% \end{abstract}
%
@@ -147,18 +147,22 @@ See source file '\inFileName' for details.
% impossible with them to be compatible with each other.
%
% This package solves this problem by adding mainly one new function
-% \texttt{callback.\\add} that adds a function in a callback. With this
-% function it is possible for packages to register their function in a
-% callback without overwriting the functions of the other packages.
+% \verb+luatexbase.add_to_callback+ that adds a function in a callback. With
+% this function it is possible for packages to register their function in a
+% callback without overwriting the functions of the other packages. There are
+% also functions to remove one or all functions from a callback.
+% See comments in the implementation section for details.
%
% The functions are called in a certain order, and when a package registers a
% callback it can assign a priority to its function. Conflicts can still
% remain even with the priority mechanism, for example in the case where two
% packages want to have the highest priority. In these cases the packages have
% to solve the conflicts themselves.
+% See comments in the implementation section for details.
%
% This package also privides a way to create and call new callbacks, in
% addition to the default Lua\TeX\ callbacks.
+% See comments in the implementation section for details.
%
% \subsubsection*{Limitations}
%
@@ -787,7 +791,7 @@ end
% \begin{macrocode}
callback.register = function ()
err("function callback.register has been deleted by luamcallbacks, "
-.."please use callback.add instead.")
+.."please use luatexbase.add_to_callback instead.")
end
% \end{macrocode}
%
diff --git a/Master/texmf-dist/source/luatex/luatexbase/luatexbase.dtx b/Master/texmf-dist/source/luatex/luatexbase/luatexbase.dtx
index f2859128497..3e14f4cf1f4 100644
--- a/Master/texmf-dist/source/luatex/luatexbase/luatexbase.dtx
+++ b/Master/texmf-dist/source/luatex/luatexbase/luatexbase.dtx
@@ -30,8 +30,6 @@
\keepsilent
\askforoverwritefalse
-\let\MetaPrefix\relax
-
\preamble
Written in 2009, 2010 by Manuel Pegourie-Gonnard and Elie Roux.
@@ -46,6 +44,12 @@ See source file '\inFileName' for details.
\file{luatexbase.sty}{\from{luatexbase.dtx}{texpackage}}%
}
+\generate{%
+ \usedir{doc/luatex/luatexbase}%
+ \file{test-base-plain.tex}{\from{luatexbase.dtx}{testplain}}%
+ \file{test-base-latex.tex}{\from{luatexbase.dtx}{testlatex}}%
+}
+
\obeyspaces
\Msg{************************************************************************}
\Msg{*}
@@ -255,6 +259,17 @@ See source file '\inFileName' for details.
%</texpackage>
% \end{macrocode}
%
+% \section{Test file}
+%
+% Very minimal, just check that the package correctly loads.
+%
+% \begin{macrocode}
+%<testplain>\input luatexbase.sty
+%<testlatex>\RequirePackage{luatexbase}
+%<testplain>\bye
+%<testlatex>\stop
+% \end{macrocode}
+%
%
% \Finale
\endinput
diff --git a/Master/texmf-dist/tex/luatex/luatexbase/luatexbase.sty b/Master/texmf-dist/tex/luatex/luatexbase/luatexbase.sty
index bb66eef832f..734a860310a 100644
--- a/Master/texmf-dist/tex/luatex/luatexbase/luatexbase.sty
+++ b/Master/texmf-dist/tex/luatex/luatexbase/luatexbase.sty
@@ -1,16 +1,16 @@
-\MetaPrefix
-\MetaPrefix This is file `luatexbase.sty',
-\MetaPrefix generated with the docstrip utility.
-\MetaPrefix
-\MetaPrefix The original source files were:
-\MetaPrefix
-\MetaPrefix luatexbase.dtx (with options: `texpackage')
-\MetaPrefix
-\MetaPrefix Written in 2009, 2010 by Manuel Pegourie-Gonnard and Elie Roux.
-\MetaPrefix
-\MetaPrefix This work is under the CC0 license.
-\MetaPrefix See source file 'luatexbase.dtx' for details.
-\MetaPrefix
+%%
+%% This is file `luatexbase.sty',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% 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.
+%%
\csname lltxb@core@loaded\endcsname
\expandafter\let\csname lltxb@core@loaded\endcsname\endinput
\begingroup
diff --git a/Master/texmf-dist/tex/luatex/luatexbase/mcb.lua b/Master/texmf-dist/tex/luatex/luatexbase/mcb.lua
index a71820582e6..ff4605af30d 100644
--- a/Master/texmf-dist/tex/luatex/luatexbase/mcb.lua
+++ b/Master/texmf-dist/tex/luatex/luatexbase/mcb.lua
@@ -343,7 +343,7 @@ function priority_in_callback (name, description)
end
callback.register = function ()
err("function callback.register has been deleted by luamcallbacks, "
-.."please use callback.add instead.")
+.."please use luatexbase.add_to_callback instead.")
end
--
-- End of File `mcb.lua'.