diff options
author | Norbert Preining <preining@logic.at> | 2019-02-24 15:12:57 +0000 |
---|---|---|
committer | Norbert Preining <preining@logic.at> | 2019-02-24 15:12:57 +0000 |
commit | 1314fbe93790c501dc436a5cf99f106b9e5c0f63 (patch) | |
tree | 04dc7734c8be8ffe385d41f4388826ef5857b6f9 /Master/texmf-dist/tex/context/base/mkiv/page-ini.lua | |
parent | eb80ce7b34f59896a1dfee5ca422495394d6677f (diff) |
Revert "ConTeXt version 2019.02.22 19:35"
This reverts commit 5c6357cdb820b4f628d036ba7b2248f221d50c0b.
git-svn-id: svn://tug.org/texlive/trunk@50112 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/context/base/mkiv/page-ini.lua')
-rw-r--r-- | Master/texmf-dist/tex/context/base/mkiv/page-ini.lua | 43 |
1 files changed, 14 insertions, 29 deletions
diff --git a/Master/texmf-dist/tex/context/base/mkiv/page-ini.lua b/Master/texmf-dist/tex/context/base/mkiv/page-ini.lua index 3d553412815..5b73c972903 100644 --- a/Master/texmf-dist/tex/context/base/mkiv/page-ini.lua +++ b/Master/texmf-dist/tex/context/base/mkiv/page-ini.lua @@ -41,39 +41,23 @@ function pages.mark(name,list) local page = list[i] local sign = false if type(page) == "string" then - local f, t = match(page,"(%d+)[:%-](%d+)") - if f and t then - f, t = tonumber(f), tonumber(t) - if f and t and f <= t then - if trace then - report("marking page %i upto %i as %a",f,t,name) - end - for page=f,t do - data[page][name] = true - end - end - page = false - else - local s, p = match(page,"([%+%-])(%d+)") - if s then - sign, page = s, p - end + local s, p = match(page,"([%+%-])(%d+)") + if s then + sign, page = s, p end end + page = tonumber(page) if page then - page = tonumber(page) - if page then - if sign == "+" then - page = realpage + page - end - if sign == "-" then - report("negative page numbers are not supported") - else - if trace then - report("marking page %i as %a",page,name) - end - data[page][name] = true + if sign == "+" then + page = realpage + page + end + if sign == "-" then + report("negative page numbers are not supported") + else + if trace then + report("marking page %i as %a",page,name) end + data[page][name] = true end end end @@ -91,6 +75,7 @@ local function marked(name) rawset(data,i,nil) end local pagedata = rawget(data,realpage) + print(pagedata and pagedata[name] and true or false) return pagedata and pagedata[name] and true or false end |