summaryrefslogtreecommitdiff
path: root/tex/generic/context
diff options
context:
space:
mode:
Diffstat (limited to 'tex/generic/context')
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
-rw-r--r--tex/generic/context/luatex/luatex-gadgets.lua17
2 files changed, 8 insertions, 11 deletions
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index f274c4319..b741295b6 100644
--- a/tex/generic/context/luatex/luatex-fonts-merged.lua
+++ b/tex/generic/context/luatex/luatex-fonts-merged.lua
@@ -1,6 +1,6 @@
-- merged file : c:/data/develop/context/sources/luatex-fonts-merged.lua
-- parent file : c:/data/develop/context/sources/luatex-fonts.lua
--- merge date : 02/23/18 22:11:13
+-- merge date : 02/25/18 19:48:01
do -- begin closure to overcome local limits and interference
diff --git a/tex/generic/context/luatex/luatex-gadgets.lua b/tex/generic/context/luatex/luatex-gadgets.lua
index 8c835babb..60c21427d 100644
--- a/tex/generic/context/luatex/luatex-gadgets.lua
+++ b/tex/generic/context/luatex/luatex-gadgets.lua
@@ -16,14 +16,13 @@ gadgets = gadgets or { } -- global namespace
-- marking content for optional removal
-local marking = { }
-gadgets.marking = marking
+local marking = { }
+gadgets.marking = marking
-local marksignal = 5001 -- will be set in the tex module
-local lastmarked = 0
-local marked = { }
-local local_par = 6
-local whatsit_node = 8
+local marksignal = 5001 -- will be set in the tex module
+local lastmarked = 0
+local marked = { }
+local local_par_code = 9
function marking.setsignal(n)
marksignal = tonumber(n) or marksignal
@@ -53,9 +52,7 @@ function marking.remove(str)
local first = last
while true do
local prev = first.prev
- if not prev
- or prev[marksignal] ~= attr
- or (prev.id == whatsit_node and prev.subtype == local_par) then
+ if not prev or prev[marksignal] ~= attr or prev.id == local_par_code then
break
else
first = prev