diff options
| author | Hans Hagen <pragma@wxs.nl> | 2010-11-17 13:27:00 +0100 |
|---|---|---|
| committer | Hans Hagen <pragma@wxs.nl> | 2010-11-17 13:27:00 +0100 |
| commit | 96bea07ac35ee9463fe89985c4b887a55579a4c9 (patch) | |
| tree | 746b4509a8ef9049f311e331285434089e4a1a8a /tex/generic | |
| parent | 953cd0a613be25ad37baaa745758862262e46395 (diff) | |
| download | context-96bea07ac35ee9463fe89985c4b887a55579a4c9.tar.gz | |
beta 2010.11.17 13:27
Diffstat (limited to 'tex/generic')
| -rw-r--r-- | tex/generic/context/luatex-fonts-merged.lua | 2 | ||||
| -rw-r--r-- | tex/generic/context/luatex-mplib.lua | 15 |
2 files changed, 6 insertions, 11 deletions
diff --git a/tex/generic/context/luatex-fonts-merged.lua b/tex/generic/context/luatex-fonts-merged.lua index 795ddb515..7f68a8d8d 100644 --- a/tex/generic/context/luatex-fonts-merged.lua +++ b/tex/generic/context/luatex-fonts-merged.lua @@ -1,6 +1,6 @@ -- merged file : luatex-fonts-merged.lua -- parent file : luatex-fonts.lua --- merge date : 11/12/10 18:22:36 +-- merge date : 11/17/10 13:27:36 do -- begin closure to overcome local limits and interference diff --git a/tex/generic/context/luatex-mplib.lua b/tex/generic/context/luatex-mplib.lua index b3ab97b2c..c6628acb3 100644 --- a/tex/generic/context/luatex-mplib.lua +++ b/tex/generic/context/luatex-mplib.lua @@ -1,4 +1,4 @@ -if not modules then modules = { } end modules ['supp-mpl'] = { +if not modules then modules = { } end modules ['luatex-mplib'] = { version = 1.001, comment = "companion to luatex-mplib.tex", author = "Hans Hagen & Taco Hoekwater", @@ -248,15 +248,10 @@ else local rx, sx, sy, ry, tx, ty, divider = 1, 0, 0, 1, 0, 0, 1 local function pen_characteristics(object) - if mplib.pen_info then - local t = mplib.pen_info(object) - rx, ry, sx, sy, tx, ty = t.rx, t.ry, t.sx, t.sy, t.tx, t.ty - divider = sx*sy - rx*ry - return not (sx==1 and rx==0 and ry==0 and sy==1 and tx==0 and ty==0), t.width - else - rx, sx, sy, ry, tx, ty, divider = 1, 0, 0, 1, 0, 0, 1 - return false, 1 - end + local t = mplib.pen_info(object) + rx, ry, sx, sy, tx, ty = t.rx, t.ry, t.sx, t.sy, t.tx, t.ty + divider = sx*sy - rx*ry + return not (sx==1 and rx==0 and ry==0 and sy==1 and tx==0 and ty==0), t.width end local function concat(px, py) -- no tx, ty here |