marcel/luametalatex
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Actually working variant of previous commit

Browse Source 
You know, there are some days where you are reflecting on why you even
write this stuff. This is one of these days and today I realized that a
theoretical long term goal might be that this becomes actually usable.
Based on that I decided that committing actually correct code might be a
pretty good idea.
This commit is contained in:
Marcel Krüger 2020-06-05 00:26:41 +02:00
parent 9a3e7e7772
commit 9265fc3463
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
luametalatex-back-pdf.lua
View File

@ -119,17 +119,19 @@ local function projected(m, x, y, w)
return x*m[1] + y*m[3] + w*m[5], x*m[2] + y*m[4] + w*m[6] return x*m[1] + y*m[3] + w*m[5], x*m[2] + y*m[4] + w*m[6]
end end
local do_setmatrix do local do_setmatrix do
local numberpattern = (lpeg.R'09'^0 * ('.' * lpeg.R'09'^0)^-1)/tonumber local numberpattern = (lpeg.P'-'^-1 * lpeg.R'09'^0 * ('.' * lpeg.R'09'^0)^-1)/tonumber
local matrixpattern = numberpattern * ' ' * numberpattern * ' ' * numberpattern * ' ' * numberpattern local matrixpattern = numberpattern * ' ' * numberpattern * ' ' * numberpattern * ' ' * numberpattern
function whatsithandler.pdf_setmatrix(p, n, x, y, outer) function do_setmatrix(prop, p, n, x, y, outer)
write_matrix(p, a, b, c, d, e, f)
end
local function do_setmatrix(prop, p, n, x, y, outer)
local m = p.matrix local m = p.matrix
local a, b, c, d = matrixpattern:match(prop.data) local a, b, c, d = matrixpattern:match(prop.data)
if not a then
print(prop.data)
error[[No valid matrix found]]
end
local e, f = (1-a)*x-c*y, (1-d)*y-b*x -- Emulate that the origin is at x, y for this transformation local e, f = (1-a)*x-c*y, (1-d)*y-b*x -- Emulate that the origin is at x, y for this transformation
-- (We could also first translate by (-x, -y), then apply the matrix -- (We could also first translate by (-x, -y), then apply the matrix
-- and translate back, but this is more direct) -- and translate back, but this is more direct)
pdf.write_matrix(a, b, c, d, e, f, p)
a, b = projected(m, a, b, 0) a, b = projected(m, a, b, 0)
c, d = projected(m, c, d, 0) c, d = projected(m, c, d, 0)
e, f = projected(m, e, f, 1) e, f = projected(m, e, f, 1)
@ -278,10 +280,10 @@ token.luacmd("pdfextension", function(_, imm)
data = literal, data = literal,
}) })
node.write(whatsit) node.write(whatsit)
elseif token.scan_keyword"push" then elseif token.scan_keyword"save" then
local whatsit = node.new(whatsit_id, whatsits.pdf_push) local whatsit = node.new(whatsit_id, whatsits.pdf_save)
node.setproperty(whatsit, { node.setproperty(whatsit, {
handle = do_push, handle = do_save,
}) })
node.write(whatsit) node.write(whatsit)
elseif token.scan_keyword"setmatrix" then elseif token.scan_keyword"setmatrix" then
@ -292,10 +294,10 @@ token.luacmd("pdfextension", function(_, imm)
data = matrix, data = matrix,
}) })
node.write(whatsit) node.write(whatsit)
elseif token.scan_keyword"pop" then elseif token.scan_keyword"restore" then
local whatsit = node.new(whatsit_id, whatsits.pdf_pop) local whatsit = node.new(whatsit_id, whatsits.pdf_restore)
node.setproperty(whatsit, { node.setproperty(whatsit, {
handle = do_pop, handle = do_restore,
}) })
node.write(whatsit) node.write(whatsit)
elseif token.scan_keyword"info" then elseif token.scan_keyword"info" then