2020-11-28 13:18:00

11 files changed, 49 insertions, 24 deletions

diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii
index db88cd563..054c99fe5 100644
--- a/tex/context/base/mkii/cont-new.mkii
+++ b/tex/context/base/mkii/cont-new.mkii
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2020.11.27 20:07}
+\newcontextversion{2020.11.28 13:15}
 
 %D This file is loaded at runtime, thereby providing an
 %D excellent place for hacks, patches, extensions and new
diff --git a/tex/context/base/mkii/context.mkii b/tex/context/base/mkii/context.mkii
index 5961be478..ef09b35d7 100644
--- a/tex/context/base/mkii/context.mkii
+++ b/tex/context/base/mkii/context.mkii
@@ -20,7 +20,7 @@
 %D your styles an modules.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2020.11.27 20:07}
+\edef\contextversion{2020.11.28 13:15}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index ae825d74e..972672192 100644
--- a/tex/context/base/mkiv/cont-new.mkiv
+++ b/tex/context/base/mkiv/cont-new.mkiv
@@ -13,7 +13,7 @@
 
 % \normalend % uncomment this to get the real base runtime
 
-\newcontextversion{2020.11.27 20:07}
+\newcontextversion{2020.11.28 13:15}
 
 %D This file is loaded at runtime, thereby providing an excellent place for hacks,
 %D patches, extensions and new features. There can be local overloads in cont-loc
diff --git a/tex/context/base/mkiv/context.mkiv b/tex/context/base/mkiv/context.mkiv
index 69a4cc899..540d6ea74 100644
--- a/tex/context/base/mkiv/context.mkiv
+++ b/tex/context/base/mkiv/context.mkiv
@@ -45,7 +45,7 @@
 %D {YYYY.MM.DD HH:MM} format.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2020.11.27 20:07}
+\edef\contextversion{2020.11.28 13:15}
 
 %D Kind of special:
 
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index 5f7f0b520..5f0d5c4fa 100644
--- a/tex/context/base/mkiv/status-files.pdf
+++ b/tex/context/base/mkiv/status-files.pdf
diff --git a/tex/context/base/mkiv/status-lua.pdf b/tex/context/base/mkiv/status-lua.pdf
index d6aefd1d5..968ce190c 100644
--- a/tex/context/base/mkiv/status-lua.pdf
+++ b/tex/context/base/mkiv/status-lua.pdf
diff --git a/tex/context/base/mkxl/cont-new.mkxl b/tex/context/base/mkxl/cont-new.mkxl
index af62340bd..f89d21f4a 100644
--- a/tex/context/base/mkxl/cont-new.mkxl
+++ b/tex/context/base/mkxl/cont-new.mkxl
@@ -13,7 +13,7 @@
 
 % \normalend % uncomment this to get the real base runtime
 
-\newcontextversion{2020.11.27 20:07}
+\newcontextversion{2020.11.28 13:15}
 
 %D This file is loaded at runtime, thereby providing an excellent place for hacks,
 %D patches, extensions and new features. There can be local overloads in cont-loc
diff --git a/tex/context/base/mkxl/context.mkxl b/tex/context/base/mkxl/context.mkxl
index d427c6c44..3d5b46d49 100644
--- a/tex/context/base/mkxl/context.mkxl
+++ b/tex/context/base/mkxl/context.mkxl
@@ -29,7 +29,7 @@
 %D {YYYY.MM.DD HH:MM} format.
 
 \immutable\edef\contextformat {\jobname}
-\immutable\edef\contextversion{2020.11.27 20:07}
+\immutable\edef\contextversion{2020.11.28 13:15}
 
 %overloadmode 1 % check frozen / warning
 %overloadmode 2 % check frozen / error
diff --git a/tex/context/base/mkxl/node-ref.lmt b/tex/context/base/mkxl/node-ref.lmt
index 583f979b2..98c600aa0 100644
--- a/tex/context/base/mkxl/node-ref.lmt
+++ b/tex/context/base/mkxl/node-ref.lmt
@@ -226,13 +226,13 @@ local inject_areas do
                 end
             else
                 if trace_areas then
-                    report_area("dimensions taken of range starting with %a using parent",nodecodes[id])
+                    report_area("dimensions taken of range starting with %a using parent",nodecodes[getid(start)])
                 end
                 return hlist_dimensions(start,stop,parent)
             end
         else
             if trace_areas then
-                report_area("dimensions taken of range starting with %a",nodecodes[id])
+                report_area("dimensions taken of range starting with %a",nodecodes[getid(start)])
             end
             return hlist_dimensions(start,stop)
         end
@@ -313,17 +313,26 @@ local inject_areas do
                 -- test \goto{\TeX}[page(2)] test \gotobox{\hbox {x} \hbox {x}}[page(2)]
                 if r then
                     if not reference then
-                        reference, first, last, firstdir = r, current, current, txtdir
+                        reference = r
+                        first     = current
+                        last      = current
+                        firstdir  = txtdir
                     elseif r == reference then
                         -- same link
                         last = current
                     elseif (done[reference] or 0) == 0 then
                         if not skip or r > skip then -- maybe no > test
                             head, current = inject_range(head,first,last,reference,parent,pardir,firstdir)
-                            reference, first, last, firstdir = nil, nil, nil, nil
+                            reference = nil
+                            first     = nil
+                            last      = nil
+                            firstdir  = nil
                         end
                     else
-                        reference, first, last, firstdir = r, current, current, txtdir
+                        reference = r
+                        first     = current
+                        last      = current
+                        firstdir  = txtdir
                     end
                     done[r] = (done[r] or 0) + 1
                 end
@@ -355,7 +364,10 @@ local inject_areas do
                 elseif subtype == rightskip_code or subtype == parfillskip_code then
                     if reference and (done[reference] or 0) == 0 then
                         head, current = inject_range(head,first,last,reference,parent,pardir,firstdir)
-                        reference, first, last, firstdir = nil, nil, nil, nil
+                        reference = nil
+                        first     = nil
+                        last      = nil
+                        firstdir  = nil
                     end
                     goto NEXT
                 end
@@ -365,16 +377,29 @@ local inject_areas do
                 if not r then
                     -- just go on, can be kerns
                 elseif not reference then
-                    reference, first, last, firstdir = r, current, current, txtdir
+                    reference = r
+                    first     = current
+                    last      = current
+                    firstdir  = txtdir
                 elseif r == reference then
                     last = current
                 elseif (done[reference] or 0) == 0 then -- or (id == glue_code and getsubtype(current) == right_skip_code) then
                     if not skip or r > skip then -- maybe no > test
                         head, current = inject_range(head,first,last,reference,parent,pardir,firstdir)
-                        reference, first, last, firstdir = nil, nil, nil, nil
+                        reference = nil
+                        first     = nil
+                        last      = nil
+                        firstdir  = nil
+                    else
+--                         print("!!!!!!!!")
                     end
                 else
-                    reference, first, last, firstdir = r, current, current, txtdir
+                    -- todo: safeguard when we have a glyph or dics or ... so we might as well
+                    -- then scan for all possibel content nodes
+                    reference = r
+                    first     = current
+                    last      = current
+                    firstdir  = txtdir
                 end
             end
           ::NEXT::
diff --git a/tex/context/base/mkxl/spac-hor.mkxl b/tex/context/base/mkxl/spac-hor.mkxl
index 687e7c370..4c009c552 100644
--- a/tex/context/base/mkxl/spac-hor.mkxl
+++ b/tex/context/base/mkxl/spac-hor.mkxl
@@ -635,8 +635,8 @@
    \c!default=\v!middle]
 
 \appendtoks
-   \frozen\instance\protected\defcsname\e!start\currentnarrower\endcsname{\spac_narrower_start[\currentnarrower]}%
-   \frozen\instance\protected\defcsname\e!stop \currentnarrower\endcsname{\spac_narrower_stop}%
+   \frozen\instance\protected\edefcsname\e!start\currentnarrower\endcsname{\spac_narrower_start[\currentnarrower]}%
+   \frozen\instance\protected\edefcsname\e!stop \currentnarrower\endcsname{\spac_narrower_stop}%
 \to \everydefinenarrower
 
 \permanent\protected\def\installnarrowermethod#1#2%
@@ -685,18 +685,18 @@
    \edef\askednarrower{#1}%
    \ifx\askednarrower\v!reverse
      \ifconditional\s_spac_narrower_last_swap
-       \permanent\leftskip \s_spac_narrower_right_last
-       \permanent\rightskip\s_spac_narrower_left_last
+       \leftskip \s_spac_narrower_right_last
+       \rightskip\s_spac_narrower_left_last
        \setfalse\s_spac_narrower_last_swap
      \else
-       \permanent\leftskip \s_spac_narrower_left_last
-       \permanent\rightskip\s_spac_narrower_right_last
+       \leftskip \s_spac_narrower_left_last
+       \rightskip\s_spac_narrower_right_last
        \settrue\s_spac_narrower_last_swap
      \fi
    \else
      \normalexpanded{\processcommalistwithparameters[\askednarrower]}\spac_narrower_initialize
-     \permanent\advance\leftskip \dimexpr\s_spac_narrower_left +\s_spac_narrower_middle\relax
-     \permanent\advance\rightskip\dimexpr\s_spac_narrower_right+\s_spac_narrower_middle\relax
+     \advance\leftskip \dimexpr\s_spac_narrower_left +\s_spac_narrower_middle\relax
+     \advance\rightskip\dimexpr\s_spac_narrower_right+\s_spac_narrower_middle\relax
    \fi
    \seteffectivehsize}
 
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 2bb9d71cb..f4e9fbcca 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  : 2020-11-27 20:07
+-- merge date  : 2020-11-28 13:15
 
 do -- begin closure to overcome local limits and interference