summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/luatex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-06-19 20:24:05 +0000
committerKarl Berry <karl@freefriends.org>2014-06-19 20:24:05 +0000
commitc46f74d4c2a102cc794be871c46f42519bf6da8a (patch)
tree30d13742844bdc1b9d493897cb29f17bfdc9ed1e /Master/texmf-dist/tex/luatex
parent645977d2a193cba365984822764a2d97c2951249 (diff)
luamplib (19jun14)
git-svn-id: svn://tug.org/texlive/trunk@34319 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/luatex')
-rw-r--r--Master/texmf-dist/tex/luatex/luamplib/luamplib.lua53
-rw-r--r--Master/texmf-dist/tex/luatex/luamplib/luamplib.sty21
2 files changed, 58 insertions, 16 deletions
diff --git a/Master/texmf-dist/tex/luatex/luamplib/luamplib.lua b/Master/texmf-dist/tex/luatex/luamplib/luamplib.lua
index fa176c813b9..4dd1b5e946c 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.7.0",
- date = "2014/04/25",
+ version = "2.8.0",
+ date = "2014/06/17",
description = "Lua package to typeset Metapost with LuaTeX's MPLib.",
})
@@ -161,6 +161,7 @@ local noneedtoreplace = {
["mp-step.mpiv"] = true,
["mp-text.mpiv"] = true,
["mp-tool.mpiv"] = true,
+ ["mp-luas.mpiv"] = true,
}
luamplib.noneedtoreplace = noneedtoreplace
@@ -633,6 +634,14 @@ local function protecttextext(data)
str = stringgsub(str,"#", "!!!!!SHARPE!!!!!")
return format("\\detokenize{%s}",str)
end)
+ luamplib.mpxcolors = {}
+ data = stringgsub(data, "\\mpcolor%s*{(.-)}",
+ function(str)
+ local cnt = #luamplib.mpxcolors + 1
+ luamplib.mpxcolors[cnt] = format(
+ "\\expandafter\\mplibcolor\\csname mpxcolor%i\\endcsname{%s}",cnt,str)
+ return format("\\csname mpxcolor%i\\endcsname",cnt)
+ end)
texsprint(data)
end
@@ -870,6 +879,8 @@ local function color_normalize(ca,cb)
end
end
+local prev_override_color
+
local function do_preobj_color(object,prescript)
-- transparency
local opaq = prescript and prescript.tr_transparency
@@ -881,9 +892,26 @@ local function do_preobj_color(object,prescript)
pdf_literalcode("/MPlibTr%i gs",tron_no)
end
-- color
- local cs = object.color
- if cs and #cs > 0 then
- pdf_literalcode(luamplib.colorconverter(cs))
+ local override = prescript and prescript.MPlibOverrideColor
+ if override then
+ if pdfmode then
+ pdf_literalcode(override)
+ override = nil
+ else
+ texsprint(format("\\special{color push %s}",override))
+ prev_override_color = override
+ end
+ else
+ local cs = object.color
+ if cs and #cs > 0 then
+ pdf_literalcode(luamplib.colorconverter(cs))
+ prev_override_color = nil
+ elseif not pdfmode then
+ override = prev_override_color
+ if override then
+ texsprint(format("\\special{color push %s}",override))
+ end
+ end
end
-- shading
local sh_type = prescript and prescript.sh_type
@@ -914,7 +942,7 @@ local function do_preobj_color(object,prescript)
if #colorb == 1 then colorspace = "DeviceGray"
elseif #colorb == 3 then colorspace = "DeviceRGB"
elseif #colorb == 4 then colorspace = "DeviceCMYK"
- else return troff_no
+ else return troff_no,override
end
colora = tableconcat(colora, " ")
colorb = tableconcat(colorb, " ")
@@ -929,15 +957,18 @@ local function do_preobj_color(object,prescript)
shade_no = sh_pdfpageresources(3,domain,colorspace,colora,colorb,coordinates)
end
pdf_literalcode("q /Pattern cs")
- return troff_no,shade_no
+ return troff_no,override,shade_no
end
- return troff_no
+ return troff_no,override
end
-local function do_postobj_color(tr,sh)
+local function do_postobj_color(tr,over,sh)
if sh then
pdf_literalcode("W n /MPlibSh%s sh Q",sh)
end
+ if over then
+ texsprint("\\special{color pop}")
+ end
if tr then
pdf_literalcode("/MPlibTr%i gs",tr)
end
@@ -972,7 +1003,7 @@ local function flush(result,flusher)
local objecttype = object.type
local prescript = object.prescript
prescript = prescript and script2table(prescript) -- prescript is now a table
- local tr_opaq,shade_no = do_preobj_color(object,prescript)
+ local tr_opaq,cr_over,shade_no = do_preobj_color(object,prescript)
if prescript and prescript.MPlibTEXboxID then
putTEXboxes(object,prescript)
elseif objecttype == "start_bounds" or objecttype == "stop_bounds" then
@@ -1084,7 +1115,7 @@ local function flush(result,flusher)
-- pdf_literalcode(cr)
-- end
end
- do_postobj_color(tr_opaq,shade_no)
+ do_postobj_color(tr_opaq,cr_over,shade_no)
end
end
stop_pdf_code()
diff --git a/Master/texmf-dist/tex/luatex/luamplib/luamplib.sty b/Master/texmf-dist/tex/luatex/luamplib/luamplib.sty
index ef35c1fc42c..21e321e6a91 100644
--- a/Master/texmf-dist/tex/luatex/luamplib/luamplib.sty
+++ b/Master/texmf-dist/tex/luatex/luamplib/luamplib.sty
@@ -14,9 +14,8 @@
\else
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{luamplib}
- [2014/04/25 v2.7.0 mplib package for LuaTeX]
+ [2014/06/17 v2.8.0 mplib package for LuaTeX]
\RequirePackage{luatexbase-modutils}
- \RequirePackage{pdftexcmds}
\fi
\RequireLuaModule{luamplib}
\def\mplibsetformat#1{%
@@ -77,12 +76,14 @@
\mplibsetupcatcodes
\ltxdomplibcodeindeed
}
+\def\mplib@mplibcode{mplibcode}
\long\def\ltxdomplibcodeindeed#1\end#2{%
\endgroup
\toks@\expandafter{\the\toks@#1}%
- \ifnum\pdf@strcmp{#2}{mplibcode}=\z@
- \def\reserved@a{\directlua{luamplib.protecttextext([===[\the\toks@]===])}}%
- \directlua{luamplib.tempdata=luamplib.makeTEXboxes([===[\reserved@a]===])}%
+ \def\mplibtemp@a{#2}\ifx\mplib@mplibcode\mplibtemp@a
+ \edef\mplibtemp{\directlua{luamplib.protecttextext([===[\the\toks@]===])}}%
+ \directlua{ tex.sprint(table.concat(luamplib.mpxcolors)) }%
+ \directlua{luamplib.tempdata=luamplib.makeTEXboxes([===[\mplibtemp]===])}%
\directlua{luamplib.processwithTEXboxes(luamplib.tempdata)}%
\end{mplibcode}%
\ifnum\mplibstartlineno<\inputlineno
@@ -92,6 +93,16 @@
\toks@\expandafter{\the\toks@\end{#2}}\expandafter\ltxdomplibcode
\fi
}
+\def\mplibcolor#1#2{%
+ \ifcsname\string\color @#2\endcsname
+ \edef#1{1 withprescript
+ "MPlibOverrideColor=\csname\string\color @#2\endcsname"}%
+ \else
+ \extractcolorspecs{#2}\mplibtemp@a\mplibtemp@b
+ \convertcolorspec\mplibtemp@a\mplibtemp@b{cmyk}\mplibtemp@c
+ \edef#1{(\mplibtemp@c)}%
+ \fi
+}
\fi
\newtoks\everymplibtoks
\newtoks\everyendmplibtoks