diff options
| author | Hans Hagen <pragma@wxs.nl> | 2011-05-16 11:00:00 +0200 |
|---|---|---|
| committer | Hans Hagen <pragma@wxs.nl> | 2011-05-16 11:00:00 +0200 |
| commit | 5eca07d318d43832522e3482a000ab933c25a420 (patch) | |
| tree | 68f87db4e87702a1e7c554d1491c20eb691395e1 /tex/context/base/spac-ver.lua | |
| parent | b3be5baa491b69cc40ffd20267a5bae48fea65c3 (diff) | |
| download | context-5eca07d318d43832522e3482a000ab933c25a420.tar.gz | |
beta 2011.05.16 11:00
Diffstat (limited to 'tex/context/base/spac-ver.lua')
| -rw-r--r-- | tex/context/base/spac-ver.lua | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/tex/context/base/spac-ver.lua b/tex/context/base/spac-ver.lua index 842dfe64a..83ee6e492 100644 --- a/tex/context/base/spac-ver.lua +++ b/tex/context/base/spac-ver.lua @@ -80,6 +80,7 @@ local nodepool = nodes.pool local new_penalty = nodepool.penalty local new_kern = nodepool.kern local new_rule = nodepool.rule +local new_gluespec = nodepool.gluespec local nodecodes = nodes.nodecodes local skipcodes = nodes.skipcodes @@ -914,7 +915,7 @@ local function collapser(head,where,what,trace,snap,a_snapmethod) -- maybe also elseif id ~= glue_code then flush("something else") current = current.next - elseif subtype == userskip_code then -- todo, other subtypes, like math + elseif subtype == userskip_code then local sc = has_attribute(current,a_skipcategory) -- has no default, no unset (yet) local so = has_attribute(current,a_skiporder ) or 1 -- has 1 default, no unset (yet) local sp = has_attribute(current,a_skippenalty ) -- has no default, no unset (yet) @@ -931,7 +932,7 @@ local function collapser(head,where,what,trace,snap,a_snapmethod) -- maybe also elseif not sc then -- if not sc then if glue_data then if trace then trace_done("flush",glue_data) end - head, current = nodes.before(head,current,glue_data) + head = insert_node_before(head,current,glue_data) if trace then trace_natural("natural",current) end current = current.next else @@ -944,8 +945,9 @@ local function collapser(head,where,what,trace,snap,a_snapmethod) -- maybe also if cs.writable and ps.stretch_order == 0 and ps.shrink_order == 0 and cs.stretch_order == 0 and cs.shrink_order == 0 then local pw, pp, pm = ps.width, ps.stretch, ps.shrink local cw, cp, cm = cs.width, cs.stretch, cs.shrink - ps = writable_spec(previous) -- no writable needed here - ps.width, ps.stretch, ps.shrink = pw + cw, pp + cp, pm + cm +--~ ps = writable_spec(previous) -- no writable needed here +--~ ps.width, ps.stretch, ps.shrink = pw + cw, pp + cp, pm + cm +previous.spec = new_gluespec(pw + cw, pp + cp, pm + cm) -- else topskip can disappear if trace then trace_natural("removed",current) end head, current = remove_node(head, current, true) -- current = previous |