From b14f992ef5f4e868c9959b174278c86516d60dbc Mon Sep 17 00:00:00 2001
From: Hans Hagen <pragma@wxs.nl>
Date: Fri, 17 Feb 2017 10:31:56 +0100
Subject: 2017-02-17 10:23:00

---
 tex/context/base/mkiv/pack-rul.lua | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

(limited to 'tex/context/base/mkiv/pack-rul.lua')

diff --git a/tex/context/base/mkiv/pack-rul.lua b/tex/context/base/mkiv/pack-rul.lua
index 3279dca51..30eda7dd2 100644
--- a/tex/context/base/mkiv/pack-rul.lua
+++ b/tex/context/base/mkiv/pack-rul.lua
@@ -11,8 +11,6 @@ if not modules then modules = { } end modules ['pack-rul'] = {
 --ldx]]--
 
 -- we need to be careful with display math as it uses shifts
--- challenge: adapt glue_set
--- setfield(h,"glue_set", getfield(h,"glue_set") * getfield(h,"width")/maxwidth -- interesting ... doesn't matter much
 
 -- \framed[align={lohi,middle}]{$x$}
 -- \framed[align={lohi,middle}]{$ $}
@@ -45,6 +43,10 @@ local getwhd          = nuts.getwhd
 local getid           = nuts.getid
 local getsubtype      = nuts.getsubtype
 local getbox          = nuts.getbox
+local getdir          = nuts.getdir
+local setshift        = nuts.setshift
+local setwidth        = nuts.setwidth
+local getwidth        = nuts.getwidth
 
 local hpack           = nuts.hpack
 local traverse_id     = nuts.traverse_id
@@ -68,7 +70,7 @@ local function doreshapeframedbox(n)
     local maxwidth       = 0
     local totalwidth     = 0
     local averagewidth   = 0
-    local boxwidth       = getfield(box,"width")
+    local boxwidth       = getwidth(box)
     if boxwidth ~= 0 then -- and h.subtype == vlist_code
         local list = getlist(box)
         if list then
@@ -84,7 +86,7 @@ local function doreshapeframedbox(n)
                     if repack then
                         local subtype = getsubtype(n)
                         if subtype == box_code or subtype == line_code then
-                            lastlinelength = list_dimensions(l,getfield(n,"dir"))
+                            lastlinelength = list_dimensions(l,getdir(n))
                         else
                             lastlinelength = width
                         end
@@ -122,7 +124,7 @@ local function doreshapeframedbox(n)
                         if l then
                             local subtype = getsubtype(h)
                             if subtype == box_code or subtype == line_code then
-                                local p = hpack(l,maxwidth,'exactly',getfield(h,"dir")) -- multiple return value
+                                local p = hpack(l,maxwidth,'exactly',getdir(h)) -- multiple return value
                                 setfield(h,"glue_set",getfield(p,"glue_set"))
                                 setfield(h,"glue_order",getfield(p,"glue_order"))
                                 setfield(h,"glue_sign",getfield(p,"glue_sign"))
@@ -131,25 +133,25 @@ local function doreshapeframedbox(n)
                             elseif checkformath and subtype == equation_code then
                              -- display formulas use a shift
                                 if nofnonzero == 1 then
-                                    setfield(h,"shift",0)
+                                    setshift(h,0)
                                 end
                             end
-                            setfield(h,"width",maxwidth)
+                            setwidth(h,maxwidth)
                         end
                     end
                 end
              -- if vdone then
              --     for v in traverse_id(vlist_code,list) do
-             --         local width = getfield(n,"width")
+             --         local width = getwidth(n)
              --         if width > maxwidth then
-             --             setfield(v,"width",maxwidth)
+             --             setwidth(v,maxwidth)
              --         end
              --     end
              -- end
-                setfield(box,"width",maxwidth)
+                setwidth(box,maxwidth)
                 averagewidth = noflines > 0 and totalwidth/noflines or 0
             else -- e.g. empty math {$ $} or \hbox{} or ...
-                setfield(box,"width",0)
+                setwidth(box,0)
             end
         end
     end
@@ -166,7 +168,7 @@ local function doanalyzeframedbox(n)
     local noflines    = 0
     local firstheight = nil
     local lastdepth   = nil
-    if getfield(box,"width") ~= 0 then
+    if getwidth(box) ~= 0 then
         local list = getlist(box)
         if list then
             local function check(n)
@@ -194,7 +196,7 @@ implement { name = "doreshapeframedbox", actions = doreshapeframedbox, arguments
 implement { name = "doanalyzeframedbox", actions = doanalyzeframedbox, arguments = "integer" }
 
 local function maxboxwidth(box)
-    local boxwidth = getfield(box,"width")
+    local boxwidth = getwidth(box)
     if boxwidth == 0 then
         return 0
     end
@@ -213,12 +215,12 @@ local function maxboxwidth(box)
             if repack then
                 local subtype = getsubtype(n)
                 if subtype == box_code or subtype == line_code then
-                    lastlinelength = list_dimensions(l,getfield(n,"dir"))
+                    lastlinelength = list_dimensions(l,getdir(n))
                 else
-                    lastlinelength = getfield(n,"width")
+                    lastlinelength = getwidth(n)
                 end
             else
-                lastlinelength = getfield(n,"width")
+                lastlinelength = getwidth(n)
             end
             if lastlinelength > maxwidth then
                 maxwidth = lastlinelength
@@ -238,6 +240,6 @@ nodes.maxboxwidth = maxboxwidth
 
 implement {
     name      = "themaxboxwidth",
-    actions   = function(n) context("%isp",maxboxwidth(getbox(n))) end,
+    actions   = function(n) context("%rsp",maxboxwidth(getbox(n))) end, -- r = rounded
     arguments = "integer"
 }
-- 
cgit v1.2.3