luamplib (24jun11)

git-svn-id: svn://tug.org/texlive/trunk@23137 c570f23f-e606-0410-a88d-b1316a301751

7 files changed, 42 insertions, 11 deletions

diff --git a/Master/texmf-dist/doc/luatex/luamplib/NEWS b/Master/texmf-dist/doc/luatex/luamplib/NEWS
index d1214c0e98d..3e532ab17e3 100644
--- a/Master/texmf-dist/doc/luatex/luamplib/NEWS
+++ b/Master/texmf-dist/doc/luatex/luamplib/NEWS
@@ -1,6 +1,10 @@
                        History of the luamplib package
 
-2010/12/28
+2011/06/23 1.08
+    * Fix bug reported by Rolf Dieterich: <, >, TAB anywhere in a luacode
+      environment caused errors. The character ` was affected too.
+
+2010/12/28 1.07
     * fix two bugs reported by Arno Trautmann that made the package crash with
       luatex 0.65 (mp 1.5+).
     * remove support for using .mem files (to fix the second bug)
diff --git a/Master/texmf-dist/doc/luatex/luamplib/luamplib.pdf b/Master/texmf-dist/doc/luatex/luamplib/luamplib.pdf
index db0da7647a4..4e450c54cd7 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 fc1b189169e..8438348d862 100644
--- a/Master/texmf-dist/doc/luatex/luamplib/test-luamplib-latex.tex
+++ b/Master/texmf-dist/doc/luatex/luamplib/test-luamplib-latex.tex
@@ -2,8 +2,19 @@
 \usepackage{luamplib}
 \begin{document}
 \begin{mplibcode}
+%% 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; 
+	fill fullcircle scaled 20; %% actual <tab> to make sure it works
 endfig; 
 \end{mplibcode}
 \end{document}
diff --git a/Master/texmf-dist/source/luatex/luamplib/Makefile b/Master/texmf-dist/source/luatex/luamplib/Makefile
index 8089ad6ff73..998b0ffacb0 100644
--- a/Master/texmf-dist/source/luatex/luamplib/Makefile
+++ b/Master/texmf-dist/source/luatex/luamplib/Makefile
@@ -27,7 +27,7 @@ TDS_ZIP   = $(NAME).tds.zip
 ZIPS      = $(CTAN_ZIP) $(TDS_ZIP)
 
 all: $(GENERATED)
-doc: $(COMPILED)
+doc: $(DOC)
 unpack: $(UNPACKED)
 ctan: check $(CTAN_ZIP)
 tds: $(TDS_ZIP)
@@ -45,7 +45,7 @@ check: $(UNPACKED)
 	luatex   -interaction=batchmode test-$(NAME)-plain.tex  >/dev/null
 	lualatex -interaction=batchmode test-$(NAME)-latex.tex  >/dev/null
 
-$(CTAN_ZIP): $(SOURCES) $(COMPILED) $(TDS_ZIP)
+$(CTAN_ZIP): $(SOURCES) $(DOC) $(TDS_ZIP)
 	@echo "Making $@ for CTAN upload."
 	@$(RM) -- $@
 	@zip -9 $@ $^ >/dev/null
diff --git a/Master/texmf-dist/source/luatex/luamplib/luamplib.dtx b/Master/texmf-dist/source/luatex/luamplib/luamplib.dtx
index d6aa0c705d2..1e26424895c 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{2010/12/28 v1.07}
+% \date{2011/06/23 v1.08}
 %
 % \maketitle
 %
@@ -189,8 +189,8 @@ module('luamplib', package.seeall)
 %    \begin{macrocode}
 local err, warn, info, log = luatexbase.provides_module({
     name          = "luamplib",
-    version       =  1.07,
-    date          = "2010/12/28",
+    version       =  1.08,
+    date          = "2011/06/23",
     description   = "Lua package to typeset Metapost with LuaTeX's MPLib.",
 })
 
@@ -626,7 +626,7 @@ end
 \else
   \NeedsTeXFormat{LaTeX2e}
   \ProvidesPackage{luamplib}
-    [2010/12/28 v1.07 mplib package for LuaTeX]
+    [2011/06/23 v1.08 mplib package for LuaTeX]
   \RequirePackage{luatexbase-modutils}
   \RequirePackage{fancyvrb}
 \fi
@@ -694,9 +694,17 @@ end
 \begingroup
 \catcode`\,=13
 \catcode`\-=13
+\catcode`\<=13
+\catcode`\>=13
+\catcode`\^^I=13
+\catcode`\`=13 % must be last...
 \gdef\FV@hack{%
   \def,{\string,}%
   \def-{\string-}%
+  \def<{\string<}%
+  \def>{\string>}%
+  \def`{\string`}%
+  \def^^I{\string^^I}%
 }
 \endgroup
 %    \end{macrocode}
diff --git a/Master/texmf-dist/tex/luatex/luamplib/luamplib.lua b/Master/texmf-dist/tex/luatex/luamplib/luamplib.lua
index f5c7ef12141..4defec61b1c 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.07,
-    date          = "2010/12/28",
+    version       =  1.08,
+    date          = "2011/06/23",
     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 6f6d90e0e9d..fdfabcd5efb 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}
-    [2010/12/28 v1.07 mplib package for LuaTeX]
+    [2011/06/23 v1.08 mplib package for LuaTeX]
   \RequirePackage{luatexbase-modutils}
   \RequirePackage{fancyvrb}
 \fi
@@ -56,9 +56,17 @@
 \begingroup
 \catcode`\,=13
 \catcode`\-=13
+\catcode`\<=13
+\catcode`\>=13
+\catcode`\^^I=13
+\catcode`\`=13 % must be last...
 \gdef\FV@hack{%
   \def,{\string,}%
   \def-{\string-}%
+  \def<{\string<}%
+  \def>{\string>}%
+  \def`{\string`}%
+  \def^^I{\string^^I}%
 }
 \endgroup
 \newcommand\mplibaddlines[1]{%