7 files changed, 40 insertions, 8 deletions
diff --git a/Master/texmf-dist/doc/luatex/luamplib/NEWS b/Master/texmf-dist/doc/luatex/luamplib/NEWS
index 91afec63d95..42ae5d1da71 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
 
+2015/03/26 2.10.1
+    * fix bug #55 regarding hash token
+
 2015/03/20 2.10.0
     * TeX code in `VerbatimTeX()' between `beginfig();' and `endfig;'
       will be inserted after flushing out the mplib figure.
diff --git a/Master/texmf-dist/doc/luatex/luamplib/luamplib.pdf b/Master/texmf-dist/doc/luatex/luamplib/luamplib.pdf
index d6123a59e52..d11d93844da 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 eeb6bade559..016ac80c846 100644
--- a/Master/texmf-dist/doc/luatex/luamplib/test-luamplib-latex.tex
+++ b/Master/texmf-dist/doc/luatex/luamplib/test-luamplib-latex.tex
@@ -137,4 +137,13 @@ endfig;
    endfig;
 \end{mplibcode}%
 diameter:\Dia bp.%
+\begin{mplibcode}
+  vardef rotatedlabel@#(expr str, loc, angl) =
+    draw thelabel@#(str, loc) rotatedaround(loc, angl)
+  enddef;
+
+  beginfig(1);
+    rotatedlabel.top(textext("Rotated!"), origin, 45);
+  endfig;
+\end{mplibcode}%
 \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 f6c7db74e83..1a76f1e857f 100644
--- a/Master/texmf-dist/doc/luatex/luamplib/test-luamplib-plain.tex
+++ b/Master/texmf-dist/doc/luatex/luamplib/test-luamplib-plain.tex
@@ -135,4 +135,13 @@ endfig;
    endfig;
 \endmplibcode
 diameter:\Dia bp.%
+\mplibcode
+  vardef rotatedlabel@#(expr str, loc, angl) =
+    draw thelabel@#(str, loc) rotatedaround(loc, angl)
+  enddef;
+
+  beginfig(1);
+    rotatedlabel.top(textext("Rotated!"), origin, 45);
+  endfig;
+\endmplibcode
 \bye
diff --git a/Master/texmf-dist/source/luatex/luamplib/luamplib.dtx b/Master/texmf-dist/source/luatex/luamplib/luamplib.dtx
index 33424548e4a..8d4613526e7 100644
--- a/Master/texmf-dist/source/luatex/luamplib/luamplib.dtx
+++ b/Master/texmf-dist/source/luatex/luamplib/luamplib.dtx
@@ -85,7 +85,7 @@ See source file '\inFileName' for licencing and contact information.
 %<*driver>
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesFile{luamplib.drv}%
-  [2015/03/20 v2.10.0 Interface for using the mplib library]%
+  [2015/03/26 v2.10.1 Interface for using the mplib library]%
 \documentclass{ltxdoc}
 \usepackage{metalogo,multicol,mdwlist,fancyvrb,xspace}
 \usepackage[x11names]{xcolor}
@@ -154,7 +154,7 @@ See source file '\inFileName' for licencing and contact information.
 % \author{Hans Hagen, Taco Hoekwater, Elie Roux, Philipp Gesang and Kim Dohyun\\
 % Maintainer: LuaLaTeX Maintainers ---
 % Support: \email{lualatex-dev@tug.org}}
-% \date{2015/03/20 v2.10.0}
+% \date{2015/03/26 v2.10.1}
 %
 % \maketitle
 %
@@ -365,8 +365,8 @@ luamplib.lastlog  = ""
 
 local err, warn, info, log = luatexbase.provides_module({
   name          = "luamplib",
-  version       = "2.10.0",
-  date          = "2015/03/20",
+  version       = "2.10.1",
+  date          = "2015/03/26",
   description   = "Lua package to typeset Metapost with LuaTeX's MPLib.",
 })
 
@@ -553,6 +553,7 @@ local esclbr = "!!!!!LEFTBRCE!!!!!"
 local escrbr = "!!!!!RGHTBRCE!!!!!"
 local escshar = "!!!!!SHARPE!!!!!"
 local escpcnt = "!!!!!PERCENT!!!!!"
+local eschash = "!!!!!HASH!!!!!"
 local begname = "%f[A-Z_a-z]"
 local endname = "%f[^A-Z_a-z]"
 
@@ -1091,6 +1092,12 @@ local function protecttextext(data)
         cnt,opt,str)
       return format("\\csname mpxcolor%i\\endcsname",cnt)
     end)
+%    \end{macrocode}
+%    Next three lines to address bug \#55
+%    \begin{macrocode}
+  data = stringgsub(data, "([`\\])#", "%1"..eschash)
+  data = stringgsub(data, "#", "##")
+  data = stringgsub(data, eschash, "#")
   texsprint(data)
 end
 
@@ -1651,7 +1658,7 @@ luamplib.colorconverter = colorconverter
 \else
   \NeedsTeXFormat{LaTeX2e}
   \ProvidesPackage{luamplib}
-    [2015/03/20 v2.10.0 mplib package for LuaTeX]
+    [2015/03/26 v2.10.1 mplib package for LuaTeX]
   \RequirePackage{luatexbase-modutils}
 \fi
 %    \end{macrocode}
diff --git a/Master/texmf-dist/tex/luatex/luamplib/luamplib.lua b/Master/texmf-dist/tex/luatex/luamplib/luamplib.lua
index 9a8e1aad02f..98abf0866d1 100644
--- a/Master/texmf-dist/tex/luatex/luamplib/luamplib.lua
+++ b/Master/texmf-dist/tex/luatex/luamplib/luamplib.lua
@@ -18,8 +18,8 @@ luamplib.lastlog  = ""
 
 local err, warn, info, log = luatexbase.provides_module({
   name          = "luamplib",
-  version       = "2.10.0",
-  date          = "2015/03/20",
+  version       = "2.10.1",
+  date          = "2015/03/26",
   description   = "Lua package to typeset Metapost with LuaTeX's MPLib.",
 })
 
@@ -189,6 +189,7 @@ local esclbr = "!!!!!LEFTBRCE!!!!!"
 local escrbr = "!!!!!RGHTBRCE!!!!!"
 local escshar = "!!!!!SHARPE!!!!!"
 local escpcnt = "!!!!!PERCENT!!!!!"
+local eschash = "!!!!!HASH!!!!!"
 local begname = "%f[A-Z_a-z]"
 local endname = "%f[^A-Z_a-z]"
 
@@ -670,6 +671,9 @@ local function protecttextext(data)
         cnt,opt,str)
       return format("\\csname mpxcolor%i\\endcsname",cnt)
     end)
+  data = stringgsub(data, "([`\\])#", "%1"..eschash)
+  data = stringgsub(data, "#", "##")
+  data = stringgsub(data, eschash, "#")
   texsprint(data)
 end
 
diff --git a/Master/texmf-dist/tex/luatex/luamplib/luamplib.sty b/Master/texmf-dist/tex/luatex/luamplib/luamplib.sty
index 1fdda30df69..3df40753ad1 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}
-    [2015/03/20 v2.10.0 mplib package for LuaTeX]
+    [2015/03/26 v2.10.1 mplib package for LuaTeX]
   \RequirePackage{luatexbase-modutils}
 \fi
 \RequireLuaModule{luamplib}