summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-09-28 22:31:10 +0000
committerKarl Berry <karl@freefriends.org>2018-09-28 22:31:10 +0000
commitb4b1b991d6f3647039f9d4ca96daadd9781dfdf2 (patch)
tree5e19a9d4f3c30156cf12f93bae5ac6d4caa6a87d /Master
parent719906183e64e3f4f73907d3c82507d607f3c140 (diff)
luamplib (27sep18)
git-svn-id: svn://tug.org/texlive/trunk@48780 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/luatex/luamplib/NEWS4
-rw-r--r--Master/texmf-dist/doc/luatex/luamplib/luamplib.pdfbin154122 -> 154238 bytes
-rw-r--r--Master/texmf-dist/source/luatex/luamplib/luamplib.dtx16
-rw-r--r--Master/texmf-dist/tex/luatex/luamplib/luamplib.lua10
-rw-r--r--Master/texmf-dist/tex/luatex/luamplib/luamplib.sty2
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds1
-rw-r--r--Master/tlpkg/tlpsrc/collection-pstricks.tlpsrc1
7 files changed, 18 insertions, 16 deletions
diff --git a/Master/texmf-dist/doc/luatex/luamplib/NEWS b/Master/texmf-dist/doc/luatex/luamplib/NEWS
index 47deffcbca5..7eaf2ba8636 100644
--- a/Master/texmf-dist/doc/luatex/luamplib/NEWS
+++ b/Master/texmf-dist/doc/luatex/luamplib/NEWS
@@ -1,5 +1,9 @@
History of the luamplib package
+2018/09/27 2.12.5
+ * change dash.offset pattern from "%i" to "%f" (PR #77)
+ * remove unnecessary variables that go back to context (issue #76)
+
2018/04/16 2.12.4
* workaround issue #74 relating to PATH limitation
* substitute InconsolataN font for Liberation Mono in the manual
diff --git a/Master/texmf-dist/doc/luatex/luamplib/luamplib.pdf b/Master/texmf-dist/doc/luatex/luamplib/luamplib.pdf
index f7f0ab43d63..8cff394e46a 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/source/luatex/luamplib/luamplib.dtx b/Master/texmf-dist/source/luatex/luamplib/luamplib.dtx
index 375fc24769c..1de69bafd8e 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}%
- [2018/04/16 v2.12.4 Interface for using the mplib library]%
+ [2018/09/27 v2.12.5 Interface for using the mplib library]%
\documentclass{ltxdoc}
\usepackage{metalogo,multicol,mdwlist,fancyvrb,xspace}
\usepackage[x11names]{xcolor}
@@ -153,7 +153,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{2018/04/16 v2.12.4}
+% \date{2018/09/27 v2.12.5}
%
% \maketitle
%
@@ -373,8 +373,8 @@ luamplib.lastlog = ""
luatexbase.provides_module {
name = "luamplib",
- version = "2.12.4",
- date = "2018/04/16",
+ version = "2.12.5",
+ date = "2018/09/27",
description = "Lua package to typeset Metapost with LuaTeX's MPLib.",
}
@@ -938,7 +938,6 @@ local function flushnormalpath(path,open)
local one = path[1]
pdf_literalcode("%f %f l",one.x_coord,one.y_coord)
end
- return t
end
local function flushconcatpath(path,open)
@@ -971,7 +970,6 @@ local function flushconcatpath(path,open)
local one = path[1]
pdf_literalcode("%f %f l",concat(one.x_coord,one.y_coord))
end
- return t
end
% \end{macrocode}
@@ -1562,7 +1560,7 @@ local function flush(result,flusher)
elseif objecttype == "start_clip" then
local evenodd = not object.istext and object.postscript == "evenodd"
start_pdf_code()
- flushnormalpath(object.path,t,false)
+ flushnormalpath(object.path,false)
pdf_literalcode(evenodd and "W* n" or "W n")
elseif objecttype == "stop_clip" then
stop_pdf_code()
@@ -1622,7 +1620,7 @@ local function flush(result,flusher)
end
local dl = object.dash
if dl then
- local d = format("[%s] %i d",tableconcat(dl.dashes or {}," "),dl.offset)
+ local d = format("[%s] %f d",tableconcat(dl.dashes or {}," "),dl.offset)
if d ~= dashed then
dashed = d
pdf_literalcode(dashed)
@@ -1779,7 +1777,7 @@ luamplib.colorconverter = colorconverter
\else
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{luamplib}
- [2018/04/16 v2.12.4 mplib package for LuaTeX]
+ [2018/09/27 v2.12.5 mplib package for LuaTeX]
\ifx\newluafunction\@undefined
\input ltluatex
\fi
diff --git a/Master/texmf-dist/tex/luatex/luamplib/luamplib.lua b/Master/texmf-dist/tex/luatex/luamplib/luamplib.lua
index 4cc61116c0e..73449b7be97 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 = ""
luatexbase.provides_module {
name = "luamplib",
- version = "2.12.4",
- date = "2018/04/16",
+ version = "2.12.5",
+ date = "2018/09/27",
description = "Lua package to typeset Metapost with LuaTeX's MPLib.",
}
@@ -515,7 +515,6 @@ local function flushnormalpath(path,open)
local one = path[1]
pdf_literalcode("%f %f l",one.x_coord,one.y_coord)
end
- return t
end
local function flushconcatpath(path,open)
@@ -548,7 +547,6 @@ local function flushconcatpath(path,open)
local one = path[1]
pdf_literalcode("%f %f l",concat(one.x_coord,one.y_coord))
end
- return t
end
local further_split_keys = {
@@ -1099,7 +1097,7 @@ local function flush(result,flusher)
elseif objecttype == "start_clip" then
local evenodd = not object.istext and object.postscript == "evenodd"
start_pdf_code()
- flushnormalpath(object.path,t,false)
+ flushnormalpath(object.path,false)
pdf_literalcode(evenodd and "W* n" or "W n")
elseif objecttype == "stop_clip" then
stop_pdf_code()
@@ -1156,7 +1154,7 @@ local function flush(result,flusher)
end
local dl = object.dash
if dl then
- local d = format("[%s] %i d",tableconcat(dl.dashes or {}," "),dl.offset)
+ local d = format("[%s] %f d",tableconcat(dl.dashes or {}," "),dl.offset)
if d ~= dashed then
dashed = d
pdf_literalcode(dashed)
diff --git a/Master/texmf-dist/tex/luatex/luamplib/luamplib.sty b/Master/texmf-dist/tex/luatex/luamplib/luamplib.sty
index 186150ed8b4..fa85ecc852a 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}
- [2018/04/16 v2.12.4 mplib package for LuaTeX]
+ [2018/09/27 v2.12.5 mplib package for LuaTeX]
\ifx\newluafunction\@undefined
\input ltluatex
\fi
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 9382284e052..372db9559d0 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -941,6 +941,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
'pst-eps', "&MAKEpst",
'pst-eucl', "&MAKEpst",
'pst-exa', "&MAKEflatten",
+ 'pst-feyn', "&MAKEpst",
'pst-fill', "&MAKEpst",
'pst-fit', "&MAKEpst",
'pst-fr3d', "&MAKEpst",
diff --git a/Master/tlpkg/tlpsrc/collection-pstricks.tlpsrc b/Master/tlpkg/tlpsrc/collection-pstricks.tlpsrc
index b654327addb..49ffc9c51e3 100644
--- a/Master/tlpkg/tlpsrc/collection-pstricks.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-pstricks.tlpsrc
@@ -40,6 +40,7 @@ depend pst-electricfield
depend pst-eps
depend pst-eucl
depend pst-exa
+depend pst-feyn
depend pst-fill
depend pst-fit
depend pst-fr3d