summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-09-24 22:27:43 +0000
committerKarl Berry <karl@freefriends.org>2013-09-24 22:27:43 +0000
commit215ff41c3a53359bb44fe80bb5584619026bc802 (patch)
tree3ebce6439576a15deb5dbbdaae31ecae3807bd73 /Master
parent3e37a9553890c5435570fde820cbe73a25914550 (diff)
luamplib (24sep13)
git-svn-id: svn://tug.org/texlive/trunk@31747 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/luatex/luamplib/NEWS3
-rw-r--r--Master/texmf-dist/doc/luatex/luamplib/luamplib.pdfbin120404 -> 100198 bytes
-rw-r--r--Master/texmf-dist/doc/luatex/luamplib/test-luamplib-latex.tex2
-rw-r--r--Master/texmf-dist/source/luatex/luamplib/Makefile4
-rw-r--r--Master/texmf-dist/source/luatex/luamplib/luamplib.dtx13
-rw-r--r--Master/texmf-dist/tex/luatex/luamplib/luamplib.lua5
-rw-r--r--Master/texmf-dist/tex/luatex/luamplib/luamplib.sty2
7 files changed, 17 insertions, 12 deletions
diff --git a/Master/texmf-dist/doc/luatex/luamplib/NEWS b/Master/texmf-dist/doc/luatex/luamplib/NEWS
index 5c3fc9e0a40..276b44d98f0 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
+2013/09/24 2.01
+ * fix bug reported by Stephan Hennig: wrong baseline of tex-text box
+
2013/05/07 2.0
* Update with current ConTeXt code
* Adding the possibility of btex...etex commands (Kim)
diff --git a/Master/texmf-dist/doc/luatex/luamplib/luamplib.pdf b/Master/texmf-dist/doc/luatex/luamplib/luamplib.pdf
index 9e96b9daebb..a4aba43dcff 100644
--- a/Master/texmf-dist/doc/luatex/luamplib/luamplib.pdf
+++ b/Master/texmf-dist/doc/luatex/luamplib/luamplib.pdf
Binary files differ
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 8c2aa557135..a6c696e6262 100644
--- a/Master/texmf-dist/doc/luatex/luamplib/test-luamplib-latex.tex
+++ b/Master/texmf-dist/doc/luatex/luamplib/test-luamplib-latex.tex
@@ -32,5 +32,5 @@ label.lrt(btex $\sqrt x$ etex, (3,sqrt 3)*u);
label.bot(btex $x$ etex, (2u,0));
label.lft(btex $y$ etex, (0,u));
endfig;
-\end{mplibcode}
+\end{mplibcode}%
\end{document}
diff --git a/Master/texmf-dist/source/luatex/luamplib/Makefile b/Master/texmf-dist/source/luatex/luamplib/Makefile
index 0f8224fbaa7..d437acb7405 100644
--- a/Master/texmf-dist/source/luatex/luamplib/Makefile
+++ b/Master/texmf-dist/source/luatex/luamplib/Makefile
@@ -44,8 +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
+ ! 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."
diff --git a/Master/texmf-dist/source/luatex/luamplib/luamplib.dtx b/Master/texmf-dist/source/luatex/luamplib/luamplib.dtx
index 195b2024f49..c16885853e9 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}%
- [2013/05/09 v2.0 Interface for using the mplib library]%
+ [2013/09/24 v2.01 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{2013/05/07 v2.0}
+% \date{2013/09/24 v2.01}
%
% \maketitle
%
@@ -178,7 +178,7 @@ See source file '\inFileName' for licencing and contact information.
%
% The code is from the \texttt{luatex-mplib.lua} and \texttt{luatex-mplib.tex} files
% from \ConTeXt, they have been adapted to \LaTeX\ and Plain by Elie Roux and
-% Philipp Gesang, new functionalities have been added by Kil Dohyun.
+% Philipp Gesang, new functionalities have been added by Kim Dohyun.
% The changes are:
%
% \begin{itemize}
@@ -222,8 +222,8 @@ luamplib.lastlog = ""
local err, warn, info, log = luatexbase.provides_module({
name = "luamplib",
- version = 2.00,
- date = "2013/05/07",
+ version = 2.01,
+ date = "2013/09/24",
description = "Lua package to typeset Metapost with LuaTeX's MPLib.",
})
@@ -567,6 +567,7 @@ vardef textext@#(expr n, w, h, d) =
addto currentpicture doublepath unitsquare
xscaled w
yscaled (h+d)
+ shifted (0,-d)
withprescript "%%textext:"&decimal n&":"&decimal w&":"&decimal(h+d);
)
enddef;
@@ -818,7 +819,7 @@ luamplib.colorconverter = colorconverter
\else
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{luamplib}
- [2013/05/07 v2.0 mplib package for LuaTeX]
+ [2013/09/24 v2.01 mplib package for LuaTeX]
\RequirePackage{luatexbase-modutils}
\RequirePackage{pdftexcmds}
\fi
diff --git a/Master/texmf-dist/tex/luatex/luamplib/luamplib.lua b/Master/texmf-dist/tex/luatex/luamplib/luamplib.lua
index 45e7ceff864..dab385288c0 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.00,
- date = "2013/05/07",
+ version = 2.01,
+ date = "2013/09/24",
description = "Lua package to typeset Metapost with LuaTeX's MPLib.",
})
@@ -316,6 +316,7 @@ vardef textext@#(expr n, w, h, d) =
addto currentpicture doublepath unitsquare
xscaled w
yscaled (h+d)
+ shifted (0,-d)
withprescript "%%textext:"&decimal n&":"&decimal w&":"&decimal(h+d);
)
enddef;
diff --git a/Master/texmf-dist/tex/luatex/luamplib/luamplib.sty b/Master/texmf-dist/tex/luatex/luamplib/luamplib.sty
index 3f435d2b31f..242280e05fd 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}
- [2013/05/07 v2.0 mplib package for LuaTeX]
+ [2013/09/24 v2.01 mplib package for LuaTeX]
\RequirePackage{luatexbase-modutils}
\RequirePackage{pdftexcmds}
\fi