From 8020a70ff1a441041bd876d6926ffe5bd9d6f7d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20Fabian=20Kr=C3=BCger?= Date: Thu, 2 Jul 2020 14:18:12 +0200 Subject: [PATCH] Fixes --- luametalatex-font-resolve.lua | 4 +--- luametalatex-pdf-pagetree.lua | 8 ++++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/luametalatex-font-resolve.lua b/luametalatex-font-resolve.lua index 67e9159..8c6c91f 100644 --- a/luametalatex-font-resolve.lua +++ b/luametalatex-font-resolve.lua @@ -27,7 +27,7 @@ local special_parser do local l = lpeg or require'lpeg' local space = l.S' '^0 local name = (1-l.P' ')^1 - local reencode = name * space * 'ReEncodeFont'/0 + local reencode = name * space * 'ReEncodeFont' local digit = l.R'09' local number = digit^1 * ('.' * digit^0) + '.' * digit^1/tonumber local milli_stmt = number * space * ('SlantFont' * l.Cc'slant' + 'ExtendFont' * l.Cc'extend') / function(n, k) @@ -67,7 +67,6 @@ function font.define(f) f.encoding = kpse.find_file(encoding, 'enc files') end if entry[5] then - print(entry[5]) assert(special_parser:match(entry[5], 1, f)) end else @@ -82,7 +81,6 @@ function font.define(f) f.encoding = kpse.find_file(encoding, 'enc files') end if entry[5] then - print(entry[5]) assert(special_parser:match(entry[5], 1, f)) end done = true diff --git a/luametalatex-pdf-pagetree.lua b/luametalatex-pdf-pagetree.lua index 8a06381..6e45e84 100644 --- a/luametalatex-pdf-pagetree.lua +++ b/luametalatex-pdf-pagetree.lua @@ -37,8 +37,12 @@ end local function newpage(pdf) local pages = pdf.pages local pagenumber = #pages+1 - local pageid = pages.reserved and pages.reserved[pagenumber] or pdf:getobj() - pages.reserved[pagenumber] = nil + local pageid = pages.reserved and pages.reserved[pagenumber] + if pageid then + pages.reserved[pagenumber] = nil + else + pageid = pdf:getobj() + end pages[pagenumber] = pageid if 1 == pagenumber % 6 then pages[-((pagenumber-1)//6)] = pdf:getobj()