diff options
author | Karl Berry <karl@freefriends.org> | 2011-12-11 22:32:20 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2011-12-11 22:32:20 +0000 |
commit | 2107db0ff048b6acf8de6170f07299202442b4ce (patch) | |
tree | 4a32b2ffa2fb8cac648ba0089fc8672be89ce4d9 /Master/texmf-dist | |
parent | 3cc0c51eddc31f37b82f651016191bf3575f3aac (diff) |
luamplib 1.09 (11dec11)
git-svn-id: svn://tug.org/texlive/trunk@24823 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r-- | Master/texmf-dist/doc/luatex/luamplib/NEWS | 3 | ||||
-rw-r--r-- | Master/texmf-dist/doc/luatex/luamplib/luamplib.pdf | bin | 303820 -> 303193 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/luatex/luamplib/test-luamplib-latex.tex | 7 | ||||
-rw-r--r-- | Master/texmf-dist/doc/luatex/luamplib/test-luamplib-plain.tex | 20 | ||||
-rw-r--r-- | Master/texmf-dist/source/luatex/luamplib/Makefile | 6 | ||||
-rw-r--r-- | Master/texmf-dist/source/luatex/luamplib/luamplib.dtx | 12 | ||||
-rw-r--r-- | Master/texmf-dist/tex/luatex/luamplib/luamplib.lua | 4 | ||||
-rw-r--r-- | Master/texmf-dist/tex/luatex/luamplib/luamplib.sty | 6 |
8 files changed, 40 insertions, 18 deletions
diff --git a/Master/texmf-dist/doc/luatex/luamplib/NEWS b/Master/texmf-dist/doc/luatex/luamplib/NEWS index 3e532ab17e3..e8909848e7b 100644 --- a/Master/texmf-dist/doc/luatex/luamplib/NEWS +++ b/Master/texmf-dist/doc/luatex/luamplib/NEWS @@ -1,5 +1,8 @@ History of the luamplib package +2011/12/09 1.09 + * Fix bug reported by Paul Vojta: spurious spaces. + 2011/06/23 1.08 * Fix bug reported by Rolf Dieterich: <, >, TAB anywhere in a luacode environment caused errors. The character ` was affected too. diff --git a/Master/texmf-dist/doc/luatex/luamplib/luamplib.pdf b/Master/texmf-dist/doc/luatex/luamplib/luamplib.pdf Binary files differindex 4e450c54cd7..24a36479bf0 100644 --- a/Master/texmf-dist/doc/luatex/luamplib/luamplib.pdf +++ b/Master/texmf-dist/doc/luatex/luamplib/luamplib.pdf diff --git a/Master/texmf-dist/doc/luatex/luamplib/test-luamplib-latex.tex b/Master/texmf-dist/doc/luatex/luamplib/test-luamplib-latex.tex index 8438348d862..7ae0e97c0f8 100644 --- a/Master/texmf-dist/doc/luatex/luamplib/test-luamplib-latex.tex +++ b/Master/texmf-dist/doc/luatex/luamplib/test-luamplib-latex.tex @@ -1,6 +1,8 @@ \documentclass{article} \usepackage{luamplib} \begin{document} +\tracingcommands1 +A% \begin{mplibcode} %% test all printable ascii chars in comments %% ( 2 < F P Z d n x @@ -13,8 +15,9 @@ %% % / 9 C M W a k u DEL %% & 0 : D N X b l v %% ´ 1 ; E O Y c m w -beginfig(1); +beginfig(1); fill fullcircle scaled 20; %% actual <tab> to make sure it works -endfig; +endfig; \end{mplibcode} +B\par \end{document} diff --git a/Master/texmf-dist/doc/luatex/luamplib/test-luamplib-plain.tex b/Master/texmf-dist/doc/luatex/luamplib/test-luamplib-plain.tex index fb45fb058f0..08a4f8c16b6 100644 --- a/Master/texmf-dist/doc/luatex/luamplib/test-luamplib-plain.tex +++ b/Master/texmf-dist/doc/luatex/luamplib/test-luamplib-plain.tex @@ -1,7 +1,21 @@ \input luamplib.sty +\tracingcommands1 +A% \mplibcode -beginfig(1); - fill fullcircle scaled 20; -endfig; +%% test all printable ascii chars in comments +%% ( 2 < F P Z d n x +%% ) 3 = G Q [ e o y +%% * 4 > H R \ f p z +%% ! + 5 ? I S ] g q { +%% " , 6 @ J T ^ h r | +%% # - 7 A K U _ i s } +%% $ . 8 B L V ` j t ~ +%% % / 9 C M W a k u DEL +%% & 0 : D N X b l v +%% ´ 1 ; E O Y c m w +beginfig(1); + fill fullcircle scaled 20; +endfig; \endmplibcode +B\par \bye diff --git a/Master/texmf-dist/source/luatex/luamplib/Makefile b/Master/texmf-dist/source/luatex/luamplib/Makefile index 998b0ffacb0..d1729897fb0 100644 --- a/Master/texmf-dist/source/luatex/luamplib/Makefile +++ b/Master/texmf-dist/source/luatex/luamplib/Makefile @@ -44,6 +44,8 @@ $(UNPACKED): $(DTX) check: $(UNPACKED) luatex -interaction=batchmode test-$(NAME)-plain.tex >/dev/null lualatex -interaction=batchmode test-$(NAME)-latex.tex >/dev/null + ! grep "blank space" test-$(NAME)-plain.log + ! grep "blank space" test-$(NAME)-latex.log $(CTAN_ZIP): $(SOURCES) $(DOC) $(TDS_ZIP) @echo "Making $@ for CTAN upload." @@ -72,8 +74,8 @@ install: check $(ALL) $(run-install) clean: - @latexmk -silent -c $(DTX) >/dev/null - @rm -f -- *.log + @latexmk -silent -c $(DTX) *.tex >/dev/null + @rm -f -- *.log test*.pdf mrproper: clean @rm -f -- $(GENERATED) $(ZIPS) diff --git a/Master/texmf-dist/source/luatex/luamplib/luamplib.dtx b/Master/texmf-dist/source/luatex/luamplib/luamplib.dtx index 1e26424895c..569d847037a 100644 --- a/Master/texmf-dist/source/luatex/luamplib/luamplib.dtx +++ b/Master/texmf-dist/source/luatex/luamplib/luamplib.dtx @@ -127,7 +127,7 @@ See source file '\inFileName' for licencing and contact information. % \author{Hans Hagen, Taco Hoekwater and Elie Roux \\ % Maintainer: Manuel Pégourié-Gonnard --- % Support: \email{lualatex-dev@tug.org}} -% \date{2011/06/23 v1.08} +% \date{2011/12/09 v1.09} % % \maketitle % @@ -189,8 +189,8 @@ module('luamplib', package.seeall) % \begin{macrocode} local err, warn, info, log = luatexbase.provides_module({ name = "luamplib", - version = 1.08, - date = "2011/06/23", + version = 1.09, + date = "2011/11/09", description = "Lua package to typeset Metapost with LuaTeX's MPLib.", }) @@ -626,7 +626,7 @@ end \else \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{luamplib} - [2011/06/23 v1.08 mplib package for LuaTeX] + [2011/12/09 v1.09 mplib package for LuaTeX] \RequirePackage{luatexbase-modutils} \RequirePackage{fancyvrb} \fi @@ -669,7 +669,7 @@ end % \begin{macrocode} \bgroup\expandafter\expandafter\expandafter\egroup \expandafter\ifx\csname ProvidesPackage\endcsname\relax -\def\mplibsetupcatcodes{ +\def\mplibsetupcatcodes{% \catcode`\{=12 \catcode`\}=12 \catcode`\#=12 \catcode`\^=12 \catcode`\~=12 \catcode`\_=12 \catcode`\%=12 \catcode`\&=12 \catcode`\$=12 } @@ -748,7 +748,7 @@ end % We encapsulate the litterals. % % \begin{macrocode} -\def\mplibstarttoPDF#1#2#3#4{ +\def\mplibstarttoPDF#1#2#3#4{% \hbox\bgroup \xdef\MPllx{#1}\xdef\MPlly{#2}% \xdef\MPurx{#3}\xdef\MPury{#4}% diff --git a/Master/texmf-dist/tex/luatex/luamplib/luamplib.lua b/Master/texmf-dist/tex/luatex/luamplib/luamplib.lua index 4defec61b1c..71c45d440d7 100644 --- a/Master/texmf-dist/tex/luatex/luamplib/luamplib.lua +++ b/Master/texmf-dist/tex/luatex/luamplib/luamplib.lua @@ -11,8 +11,8 @@ module('luamplib', package.seeall) local err, warn, info, log = luatexbase.provides_module({ name = "luamplib", - version = 1.08, - date = "2011/06/23", + version = 1.09, + date = "2011/11/09", description = "Lua package to typeset Metapost with LuaTeX's MPLib.", }) diff --git a/Master/texmf-dist/tex/luatex/luamplib/luamplib.sty b/Master/texmf-dist/tex/luatex/luamplib/luamplib.sty index fdfabcd5efb..e71631ad539 100644 --- a/Master/texmf-dist/tex/luatex/luamplib/luamplib.sty +++ b/Master/texmf-dist/tex/luatex/luamplib/luamplib.sty @@ -14,7 +14,7 @@ \else \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{luamplib} - [2011/06/23 v1.08 mplib package for LuaTeX] + [2011/12/09 v1.09 mplib package for LuaTeX] \RequirePackage{luatexbase-modutils} \RequirePackage{fancyvrb} \fi @@ -36,7 +36,7 @@ \fi \bgroup\expandafter\expandafter\expandafter\egroup \expandafter\ifx\csname ProvidesPackage\endcsname\relax -\def\mplibsetupcatcodes{ +\def\mplibsetupcatcodes{% \catcode`\{=12 \catcode`\}=12 \catcode`\#=12 \catcode`\^=12 \catcode`\~=12 \catcode`\_=12 \catcode`\%=12 \catcode`\&=12 \catcode`\$=12 } @@ -89,7 +89,7 @@ \fi \ifx\mplibscratchbox\undefined \newbox\mplibscratchbox \fi -\def\mplibstarttoPDF#1#2#3#4{ +\def\mplibstarttoPDF#1#2#3#4{% \hbox\bgroup \xdef\MPllx{#1}\xdef\MPlly{#2}% \xdef\MPurx{#3}\xdef\MPury{#4}% |