diff options
author | Karl Berry <karl@freefriends.org> | 2010-11-05 21:44:47 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2010-11-05 21:44:47 +0000 |
commit | bd502c7ba3265942e57ac843d4530966b4f45241 (patch) | |
tree | d4402f160f754adde44988b22b3e69888597368b /Master/texmf-dist/tex/luatex | |
parent | 65da87ef9393c8b1d5da8f3c844ff00d24212dd9 (diff) |
luatextra (4nov10)
git-svn-id: svn://tug.org/texlive/trunk@20328 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/luatex')
-rw-r--r-- | Master/texmf-dist/tex/luatex/luatextra/luatextra-latex.tex | 8 | ||||
-rw-r--r-- | Master/texmf-dist/tex/luatex/luatextra/luatextra.lua | 8 | ||||
-rw-r--r-- | Master/texmf-dist/tex/luatex/luatextra/luatextra.sty | 36 |
3 files changed, 15 insertions, 37 deletions
diff --git a/Master/texmf-dist/tex/luatex/luatextra/luatextra-latex.tex b/Master/texmf-dist/tex/luatex/luatextra/luatextra-latex.tex index dc9a1fff5f3..9b53a13c3c2 100644 --- a/Master/texmf-dist/tex/luatex/luatextra/luatextra-latex.tex +++ b/Master/texmf-dist/tex/luatex/luatextra/luatextra-latex.tex @@ -5,15 +5,11 @@ %% The original source files were: %% %% luatextra.dtx (with options: `latex') -%% This is a generated file. %% -%% Copyright (C) 2009 by Elie Roux <elie.roux@telecom-bretagne.eu> +%% Written in 2009, 2010 by Manuel Pegourie-Gonnard and Elie Roux. %% %% This work is under the CC0 license. -%% -%% This work consists of the main source file luainputenc.dtx -%% and the derived files -%% luatextra.sty, luatextra.lua, luatextra-latex.tex, luatextra.pdf +%% See source file 'luatextra.dtx' for details. %% \endinput %% diff --git a/Master/texmf-dist/tex/luatex/luatextra/luatextra.lua b/Master/texmf-dist/tex/luatex/luatextra/luatextra.lua index 4721e5871c2..6a590cd5a0a 100644 --- a/Master/texmf-dist/tex/luatex/luatextra/luatextra.lua +++ b/Master/texmf-dist/tex/luatex/luatextra/luatextra.lua @@ -5,15 +5,11 @@ -- The original source files were: -- -- luatextra.dtx (with options: `lua') --- This is a generated file. -- --- Copyright (C) 2009 by Elie Roux <elie.roux@telecom-bretagne.eu> +-- Written in 2009, 2010 by Manuel Pegourie-Gonnard and Elie Roux. -- -- This work is under the CC0 license. --- --- This work consists of the main source file luainputenc.dtx --- and the derived files --- luatextra.sty, luatextra.lua, luatextra-latex.tex, luatextra.pdf +-- See source file 'luatextra.dtx' for details. -- module("luatextra", package.seeall) luatexbase.provides_module { diff --git a/Master/texmf-dist/tex/luatex/luatextra/luatextra.sty b/Master/texmf-dist/tex/luatex/luatextra/luatextra.sty index 68743355202..f69184acb13 100644 --- a/Master/texmf-dist/tex/luatex/luatextra/luatextra.sty +++ b/Master/texmf-dist/tex/luatex/luatextra/luatextra.sty @@ -5,15 +5,11 @@ %% The original source files were: %% %% luatextra.dtx (with options: `package') -%% This is a generated file. %% -%% Copyright (C) 2009 by Elie Roux <elie.roux@telecom-bretagne.eu> +%% Written in 2009, 2010 by Manuel Pegourie-Gonnard and Elie Roux. %% %% This work is under the CC0 license. -%% -%% This work consists of the main source file luainputenc.dtx -%% and the derived files -%% luatextra.sty, luatextra.lua, luatextra-latex.tex, luatextra.pdf +%% See source file 'luatextra.dtx' for details. %% \csname ifluatextraloaded\endcsname \let\ifluatextraloaded\endinput @@ -31,15 +27,9 @@ [2010/08/02 v0.971 LuaTeX extra low-level macros] \fi - -\def\LuaTeX{Lua\TeX } -\def\LuaLaTeX{Lua\LaTeX } - -\bgroup\expandafter\expandafter\expandafter\egroup -\expandafter\ifx\csname ProvidesPackage\endcsname\relax - \input ifluatex.sty -\else - \RequirePackage{ifluatex} +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname RequirePackage\endcsname\relax \else + \RequirePackage{metalogo} \fi \ifluatex\else \begingroup @@ -50,22 +40,18 @@ \let\x\PackageWarningNoLine \fi \expandafter\endgroup - \x{luatexbase-modutils}{LuaTeX is required for this package.^^J + \x{luatextra}{LuaTeX is required for this package.^^J Aborting package loading.} \expandafter\endinput \fi \bgroup\expandafter\expandafter\expandafter\egroup \expandafter\ifx\csname ProvidesPackage\endcsname\relax + \input luatexbase.sty \input luatexbase-modutils.sty - \input luatexbase-attr.sty - \input luatexbase-cctb.sty - \input luatexbase-regs.sty \input luatexbase-mcb.sty \else + \RequirePackage{luatexbase} \RequirePackage{luatexbase-modutils} - \RequirePackage{luatexbase-attr} - \RequirePackage{luatexbase-cctb} - \RequirePackage{luatexbase-regs} \RequirePackage{luatexbase-mcb} \fi \luatexUseModule{lualibs} @@ -106,9 +92,6 @@ \let\luaclose\luatexcloselua \fi \directlua{dofile(kpse.find_file("luatextra.lua"))} -\def\ltxtra@RegisterFontCallback{ - \directlua{luatextra.register_font_callback()} -} \let\newluaattribute\newluatexattribute \let\luaattribute\luatexattribute \let\unsetluaattribute\unsetluatexattribute @@ -119,6 +102,9 @@ \let\luaModuleError\luatexModuleError \let\luaRequireModule\luatexRequireModule \let\luaUseModule\luatexUseModule +\def\ltxtra@RegisterFontCallback{ + \directlua{luatextra.register_font_callback()} +} \bgroup\expandafter\expandafter\expandafter\egroup \expandafter\ifx\csname ProvidesPackage\endcsname\relax \input luaotfload.sty |