beta 2014.04.03 16:20

26 files changed, 557 insertions, 322 deletions

diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 6697689df..52c8ff998 100644
--- a/tex/context/base/cont-new.mkiv
+++ b/tex/context/base/cont-new.mkiv
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2014.03.28 15:04}
+\newcontextversion{2014.04.03 16:20}
 
 %D This file is loaded at runtime, thereby providing an excellent place for
 %D hacks, patches, extensions and new features.
diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf
index 0223243a2..8e1997c1f 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 34578857b..03cb4131e 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -28,7 +28,7 @@
 %D up and the dependencies are more consistent.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2014.03.28 15:04}
+\edef\contextversion{2014.04.03 16:20}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
@@ -298,7 +298,7 @@
 
 \loadmarkfile{strc-reg} % uses mixed columns
 
-\loadmarkfile{page-lin}
+\loadmkvifile{page-lin}
 \loadmarkfile{page-par}
 \loadmarkfile{typo-pag}
 \loadmarkfile{typo-mar}
diff --git a/tex/context/base/data-sch.lua b/tex/context/base/data-sch.lua
index 41b941c5a..adc774489 100644
--- a/tex/context/base/data-sch.lua
+++ b/tex/context/base/data-sch.lua
@@ -54,7 +54,7 @@ end
 local cached, loaded, reused, thresholds, handlers = { }, { }, { }, { }, { }
 
 local function runcurl(name,cachename) -- we use sockets instead or the curl library when possible
-    local command = "curl --silent --create-dirs --output " .. cachename .. " " .. name
+    local command = "curl --silent --insecure --create-dirs --output " .. cachename .. " " .. name
     os.spawn(command)
 end
 
diff --git a/tex/context/base/font-afm.lua b/tex/context/base/font-afm.lua
index adb4281b2..46ea8a423 100644
--- a/tex/context/base/font-afm.lua
+++ b/tex/context/base/font-afm.lua
@@ -15,6 +15,14 @@ n='otf'/>.</p>
 <p>The following code still has traces of intermediate font support
 where we handles font encodings. Eventually font encoding goes
 away.</p>
+
+<p>The embedding of a font involves creating temporary files and
+depending on your system setup that can fail. It took more than a
+day to figure out why sometimes embedding failed in mingw luatex
+where running on a real path like c:\... failed while running on
+say e:\... being a link worked well. The native windows binaries
+don't have this issue.</p>
+
 --ldx]]--
 
 local fonts, logs, trackers, containers, resolvers = fonts, logs, trackers, containers, resolvers
@@ -221,6 +229,7 @@ local function get_indexes(data,pfbname)
                     report_afm("getting index data from %a",pfbname)
                 end
                 for index, glyph in next, glyphs do
+            --  for index, glyph in table.sortedhash(glyphs) do
                     local name = glyph.name
                     if name then
                         local char = characters[name]
@@ -336,6 +345,7 @@ function afm.load(filename)
                     get_indexes(data,pfbname)
                 elseif trace_loading then
                     report_afm("no pfb file for %a",filename)
+                 -- data.resources.filename = "unset" -- better than loading the afm file
                 end
                 report_afm("unifying %a",filename)
                 unify(data,filename)
@@ -410,7 +420,7 @@ unify = function(data, filename)
                 if unicode then
                     krn[unicode] = kern
                 else
-                    print(unicode,name)
+                 -- print(unicode,name)
                 end
             end
             description.kerns = krn
diff --git a/tex/context/base/font-lib.mkvi b/tex/context/base/font-lib.mkvi
index 92db44722..c41bf6fd0 100644
--- a/tex/context/base/font-lib.mkvi
+++ b/tex/context/base/font-lib.mkvi
@@ -39,6 +39,8 @@
 \registerctxluafile{font-otf}{1.001} % otf main
 \registerctxluafile{font-otb}{1.001} % otf main base
 
+% \registerctxluafile{node-inj}{1.001}
+
 \ctxcommand{doifelse(nodes.properties)} {
     \doiffileelse{font-inj.lua}
         {\registerctxluafile{font-inj}{1.001}}
diff --git a/tex/context/base/lpdf-ano.lua b/tex/context/base/lpdf-ano.lua
index 395b0e457..827c43ec6 100644
--- a/tex/context/base/lpdf-ano.lua
+++ b/tex/context/base/lpdf-ano.lua
@@ -494,9 +494,7 @@ local function pdfurllink(url,destination,page)
         return false
     end
     if destination and destination ~= "" then
-        url = file.join(url,filename).."#"..destination
-    else
-        url = file.join(url,filename)
+        url = url .. "#" .. destination
     end
     return pdfdictionary {
         S   = pdf_uri,
diff --git a/tex/context/base/lpdf-ini.lua b/tex/context/base/lpdf-ini.lua
index e3e619ec6..a89b8b8c5 100644
--- a/tex/context/base/lpdf-ini.lua
+++ b/tex/context/base/lpdf-ini.lua
@@ -786,11 +786,12 @@ function lpdf.addtoinfo   (k,v) if not (lpdf.protectresources and info   [k]) th
 -------- lpdf.addtonames  (k,v) if not (lpdf.protectresources and names  [k]) then trace_set("names",  k) names  [k] = v end end
 
 local names = pdfdictionary {
-    Type = pdfconstant("Names")
+ -- Type = pdfconstant("Names")
 }
 
 local function flushnames()
     if next(names) and not environment.initex then
+        names.Type = pdfconstant("Names")
         trace_flush("names")
         lpdf.addtocatalog("Names",pdfreference(pdfimmediateobject(tostring(names))))
     end
diff --git a/tex/context/base/node-ini.lua b/tex/context/base/node-ini.lua
index 652b46caf..a9ef305c0 100644
--- a/tex/context/base/node-ini.lua
+++ b/tex/context/base/node-ini.lua
@@ -220,6 +220,8 @@ listcodes.column           = listcodes.alignment
 kerncodes.italiccorrection = kerncodes.userkern
 kerncodes.kerning          = kerncodes.fontkern
 
+whatcodes.textdir          = whatcodes.dir
+
 nodes.codes = allocate { -- mostly for listing
     glue    = skipcodes,
     noad    = noadcodes,
diff --git a/tex/context/base/node-res.lua b/tex/context/base/node-res.lua
index debb261e9..1a9d6f02e 100644
--- a/tex/context/base/node-res.lua
+++ b/tex/context/base/node-res.lua
@@ -257,6 +257,19 @@ function nutpool.glue(width,stretch,shrink,stretch_order,shrink_order)
     return someskip(glue,width,stretch,shrink,stretch_order,shrink_order)
 end
 
+function nutpool.negatedglue(glue)
+    local n = copy_nut(glue)
+    local s = copy_nut(getfield(n,"spec"))
+    local width   = getfield(s,"width")
+    local stretch = getfield(s,"stretch")
+    local shrink  = getfield(s,"shrink")
+    if width   then setfield(s,"width",  -width)   end
+    if stretch then setfield(s,"stretch",-stretch) end
+    if shrink  then setfield(s,"shrink", -shrink)  end
+    setfield(n,"spec",s)
+    return n
+end
+
 function nutpool.leftskip(width,stretch,shrink,stretch_order,shrink_order)
     return someskip(leftskip,width,stretch,shrink,stretch_order,shrink_order)
 end
diff --git a/tex/context/base/page-lin.lua b/tex/context/base/page-lin.lua
index 66b7e4684..0b241240c 100644
--- a/tex/context/base/page-lin.lua
+++ b/tex/context/base/page-lin.lua
@@ -39,10 +39,16 @@ local v_page             = variables.page
 local v_no               = variables.no
 
 local nodecodes          = nodes.nodecodes
+local skipcodes          = nodes.skipcodes
+local whatcodes          = nodes.whatcodes
 
 local hlist_code         = nodecodes.hlist
 local vlist_code         = nodecodes.vlist
 local whatsit_code       = nodecodes.whatsit
+local glue_code          = nodecodes.glue
+local glyph_code         = nodecodes.glyph
+local leftskip_code      = skipcodes.leftskip
+local textdir_code       = whatcodes.dir
 
 local a_displaymath      = attributes.private('displaymath')
 local a_linenumber       = attributes.private('linenumber')
@@ -56,6 +62,7 @@ local chunksize          = 250 -- not used in boxed
 local nuts               = nodes.nuts
 
 local getid              = nuts.getid
+local getsubtype         = nuts.getsubtype
 local getnext            = nuts.getnext
 local getattr            = nuts.getattr
 local getlist            = nuts.getlist
@@ -73,6 +80,12 @@ local insert_node_before = nuts.insert_before
 local is_display_math    = nuts.is_display_math
 local leftmarginwidth    = nuts.leftmarginwidth
 
+local negated_glue       = nuts.pool.negatedglue
+local new_hlist          = nuts.pool.hlist
+
+local ctx_convertnumber  = context.convertnumber
+local ctx_makelinenumber = context.makelinenumber
+
 -- cross referencing
 
 function lines.number(n)
@@ -122,7 +135,7 @@ filters.line = filters.line or { }
 
 function filters.line.default(data)
 --  helpers.title(data.entries.linenumber or "?",data.metadata)
-    context.convertnumber(data.entries.conversion or "numbers",data.entries.linenumber or "0")
+    ctx_convertnumber(data.entries.conversion or "numbers",data.entries.linenumber or "0")
 end
 
 function filters.line.page(data,prefixspec,pagespec) -- redundant
@@ -195,7 +208,7 @@ local function check_number(n,a,skip,sameline)
                 report_lines("skipping line number %s for setup %a: %s (%s)",#current_list,a,s,d.continue or v_no)
             end
         end
-        context.makelinenumber(tag,skipflag,s,getfield(n,"shift"),getfield(n,"width"),leftmarginwidth(getlist(n)),getfield(n,"dir"))
+        ctx_makelinenumber(tag,skipflag,s,getfield(n,"shift"),getfield(n,"width"),leftmarginwidth(getlist(n)),getfield(n,"dir"))
     end
 end
 
@@ -206,17 +219,18 @@ end
 local function identify(list)
     if list then
         for n in traverse_id(hlist_code,list) do
-            if getattr(n,a_linenumber) then
-                return list
+            local a = getattr(n,a_linenumber)
+            if a then
+                return list, a
             end
         end
         local n = list
         while n do
             local id = getid(n)
             if id == hlist_code or id == vlist_code then
-                local ok = identify(getlist(n))
+                local ok, a = identify(getlist(n))
                 if ok then
-                    return ok
+                    return ok, a
                 end
             end
             n = getnext(n)
@@ -236,65 +250,141 @@ function boxed.stage_one(n,nested)
     current_list = { }
     local box = getbox(n)
     if box then
-        local list = getlist(box)
-        if nested then
-            list = identify(list)
+        local found = nil
+        local list  = getlist(box)
+        if list and nested then
+            list, found = identify(list)
         end
-        local last_a, last_v, skip = nil, -1, false
-        for n in traverse_id(hlist_code,list) do -- attr test here and quit as soon as zero found
-            if getfield(n,"height") == 0 and getfield(n,"depth") == 0 then
-                -- skip funny hlists -- todo: check line subtype
-            else
-                local list = getlist(n)
-                local a = getattr(list,a_linenumber)
-                if a and a > 0 then
-                    if last_a ~= a then
-                        local da = data[a]
-                        local ma = da.method
-                        if ma == v_next then
-                            skip = true
-                        elseif ma == v_page then
-                            da.start = 1 -- eventually we will have a normal counter
-                        end
-                        last_a = a
-                        if trace_numbers then
-                            report_lines("starting line number range %s: start %s, continue %s",a,da.start,da.continue or v_no)
+        if list then
+            local last_a, last_v, skip = nil, -1, false
+            for n in traverse_id(hlist_code,list) do -- attr test here and quit as soon as zero found
+                if getfield(n,"height") == 0 and getfield(n,"depth") == 0 then
+                    -- skip funny hlists -- todo: check line subtype
+                else
+                    local list = getlist(n)
+                    local a = getattr(list,a_linenumber)
+                    if not a or a == 0 then
+                        local n = getnext(list)
+                        while n do
+                            local id = getid(n)
+                            if id == whatsit_code and getsubtype(n) == textdir_code then
+                                n = getnext(n)
+                            elseif id == glue_code and getsubtype(n) == leftskip_code then
+                                n = getnext(n)
+                            else
+if id == glyph_code then
+                                break
+else
+    -- can be hlist or skip (e.g. footnote line)
+    n = getnext(n)
+end
+                            end
                         end
+                        a = n and getattr(n,a_linenumber)
                     end
-                    if getattr(n,a_displaymath) then
-                        if is_display_math(n) then
-                            check_number(n,a,skip)
+                    if a and a > 0 then
+                        if last_a ~= a then
+                            local da = data[a]
+                            local ma = da.method
+                            if ma == v_next then
+                                skip = true
+                            elseif ma == v_page then
+                                da.start = 1 -- eventually we will have a normal counter
+                            end
+                            last_a = a
+                            if trace_numbers then
+                                report_lines("starting line number range %s: start %s, continue %s",a,da.start,da.continue or v_no)
+                            end
                         end
-                    else
-                        local v = getattr(list,a_verbatimline)
-                        if not v or v ~= last_v then
-                            last_v = v
-                            check_number(n,a,skip)
+                        if getattr(n,a_displaymath) then
+                            if is_display_math(n) then
+                                check_number(n,a,skip)
+                            end
                         else
-                            check_number(n,a,skip,true)
+                            local v = getattr(list,a_verbatimline)
+                            if not v or v ~= last_v then
+                                last_v = v
+                                check_number(n,a,skip)
+                            else
+                                check_number(n,a,skip,true)
+                            end
                         end
+                        skip = false
                     end
-                    skip = false
                 end
             end
         end
     end
 end
 
+-- [dir][leftskip][content]
+
+function boxed.stage_two(n,m)
+    if #current_list > 0 then
+        m = m or lines.scratchbox
+        local t, tn = { }, 0
+        for l in traverse_id(hlist_code,getlist(getbox(m))) do
+            tn = tn + 1
+            t[tn] = copy_node(l) -- use take_box instead
+        end
+        for i=1,#current_list do
+            local li = current_list[i]
+            local n, m, ti = li[1], li[2], t[i]
+            if ti then
+                local l = getlist(n)
+                -- we want to keep leftskip at the start
+--                 local id = getid(l)
+--                 if id == whatsit_code and getsubtype(l) == textdir_code then
+--                     l = getnext(l)
+--                     id = getid(l)
+--                 end
+--                 if getid(l) == glue_code and getsubtype(l) == leftskip_code then
+--                     -- [leftskip] [number] [rest]
+--                     local forward  = copy_node(l)
+--                     local backward = negated_glue(l)
+--                     local next     = getnext(l)
+--                     setfield(l,"next",backward)
+--                     setfield(backward,"prev",l)
+--                     setfield(backward,"next",ti)
+--                     setfield(ti,"prev",backward)
+--                     setfield(ti,"next",forward)
+--                     setfield(forward,"prev",ti)
+--                     setfield(forward,"next",next)
+--                     setfield(next,"prev",forward)
+--                 else
+                    -- [number] [rest]
+                    setfield(ti,"next",l)
+                    setfield(l,"prev",ti)
+                    setfield(n,"list",ti)
+--                 end
+                resolve(n,m)
+            else
+                report_lines("error in linenumbering (1)")
+                return
+            end
+       end
+    end
+end
+
 function boxed.stage_two(n,m)
     if #current_list > 0 then
         m = m or lines.scratchbox
         local t, tn = { }, 0
         for l in traverse_id(hlist_code,getlist(getbox(m))) do
             tn = tn + 1
-            t[tn] = copy_node(l)
+            t[tn] = copy_node(l) -- use take_box instead
         end
         for i=1,#current_list do
             local li = current_list[i]
             local n, m, ti = li[1], li[2], t[i]
             if ti then
-                setfield(ti,"next",getlist(n))
-                setfield(n,"list",ti)
+                local l = getlist(n)
+                setfield(ti,"next",l)
+                setfield(l,"prev",ti)
+                local h = copy_node(n)
+                setfield(h,"dir","TLT")
+                setfield(h,"list",ti)
+                setfield(n,"list",h)
                 resolve(n,m)
             else
                 report_lines("error in linenumbering (1)")
diff --git a/tex/context/base/page-lin.mkiv b/tex/context/base/page-lin.mkvi
index ae293091c..e3b628487 100644
--- a/tex/context/base/page-lin.mkiv
+++ b/tex/context/base/page-lin.mkvi
@@ -15,6 +15,7 @@
 % get rid of \mk* (left over from experimental times)
 %
 % to be redone (was experiment) .. can be hooked into margin code
+% reshuffle arguments
 
 \writestatus{loading}{ConTeXt Core Macros / Line Numbering}
 
@@ -61,14 +62,16 @@
 
 \installcorenamespace{linenumberinginstance}
 
+% tag skipflag s getfield(n,"shift") getfield(n,"width") leftmarginwidth(getlist(n)) getfield(n,"dir"))
+
 \let\makelinenumber\gobblesevenarguments % used at lua end
 
 \newconditional\page_postprocessors_needed_box
 
-\unexpanded\def\page_postprocessors_linenumbers_page   #1{\page_lines_add_numbers_to_box{#1}\plusone      \plusone   \zerocount}
-\unexpanded\def\page_postprocessors_linenumbers_box    #1{\page_lines_add_numbers_to_box{#1}\plusone      \plusone   \zerocount}
-\unexpanded\def\page_postprocessors_linenumbers_deepbox#1{\page_lines_add_numbers_to_box{#1}\plusone      \plusone   \plusone  }
-\unexpanded\def\page_postprocessors_linenumbers_column #1{\page_lines_add_numbers_to_box{#1}\currentcolumn\nofcolumns\zerocount}
+\unexpanded\def\page_postprocessors_linenumbers_page   #tag{\page_lines_add_numbers_to_box{#tag}\plusone      \plusone   \zerocount}
+\unexpanded\def\page_postprocessors_linenumbers_box    #tag{\page_lines_add_numbers_to_box{#tag}\plusone      \plusone   \zerocount}
+\unexpanded\def\page_postprocessors_linenumbers_deepbox#tag{\page_lines_add_numbers_to_box{#tag}\plusone      \plusone   \plusone  }
+\unexpanded\def\page_postprocessors_linenumbers_column #tag{\page_lines_add_numbers_to_box{#tag}\currentcolumn\nofcolumns\zerocount}
 
 \def\page_lines_parameters_regular
   {continue = "\ifnum\c_page_lines_mode=\zerocount\v!yes\else\v!no\fi",
@@ -143,47 +146,20 @@
    \c!step=1,
    \c!method=\v!first,
    \c!continue=\v!no,
-   \c!location=\v!left,
    \c!style=,
    \c!color=,
    \c!width=2\emwidth,
    \c!left=,
    \c!right=,
    \c!command=,
+   \c!margin=2.5\emwidth,
    \c!distance=\zeropoint,
+   \c!location=\v!default, % depends on direction, columns etc
    \c!align=\v!auto]
 
 \definelinenumbering
   []
 
-% no intermediate changes in values, define a class, otherwise each range
-% would need a number
-
-% todo: text
-
-\installcorenamespace{linenumberinglocation}
-\installcorenamespace{linenumberingalternative}
-
-\expandafter\let\csname\??linenumberinglocation\v!middle       \endcsname \zerocount
-\expandafter\let\csname\??linenumberinglocation\v!left         \endcsname \plusone
-\expandafter\let\csname\??linenumberinglocation\v!margin       \endcsname \plusone
-\expandafter\let\csname\??linenumberinglocation\v!inmargin     \endcsname \plusone
-\expandafter\let\csname\??linenumberinglocation\v!inleft       \endcsname \plusone
-\expandafter\let\csname\??linenumberinglocation\v!right        \endcsname \plustwo
-\expandafter\let\csname\??linenumberinglocation\v!inright      \endcsname \plustwo
-\expandafter\let\csname\??linenumberinglocation\v!inner        \endcsname \plusthree
-\expandafter\let\csname\??linenumberinglocation\v!outer        \endcsname \plusfour
-\expandafter\let\csname\??linenumberinglocation\v!text         \endcsname \plusfive
-\expandafter\let\csname\??linenumberinglocation\v!begin        \endcsname \plussix
-\expandafter\let\csname\??linenumberinglocation\v!end          \endcsname \plusseven
-
-\expandafter\let\csname\??linenumberingalternative\v!middle    \endcsname \zerocount
-\expandafter\let\csname\??linenumberingalternative\v!right     \endcsname \plusone
-\expandafter\let\csname\??linenumberingalternative\v!flushleft \endcsname \plusone
-\expandafter\let\csname\??linenumberingalternative\v!left      \endcsname \plustwo
-\expandafter\let\csname\??linenumberingalternative\v!flushright\endcsname \plustwo
-\expandafter\let\csname\??linenumberingalternative\v!auto      \endcsname \plusfive
-
 % \startlinenumbering[<startvalue>|continue|settings|name]
 % \startlinenumbering[name][<startvalue>|continue|settings]
 
@@ -254,8 +230,30 @@
    \fi
    \page_lines_start_followup}
 
+\newconditional\c_page_lines_auto_narrow
+
 \def\page_lines_start_followup
   {\numberinglinestrue
+   \edef\p_location{\linenumberingparameter\c!location}%
+   \setfalse\c_page_lines_auto_narrow
+   \ifhmode \else
+     \ifx\p_location\v!text
+       \ifdim\leftskip>\zeropoint \else
+         \advance\leftskip\linenumberingparameter\c!margin
+         \settrue\c_page_lines_auto_narrow
+       \fi
+     \else\ifx\p_location\v!begin
+       \ifdim\leftskip>\zeropoint \else
+         \advance\leftskip\linenumberingparameter\c!margin
+         \settrue\c_page_lines_auto_narrow
+       \fi
+     \else\ifx\p_location\v!end
+       \ifdim\leftskip>\zeropoint \else
+         \advance\rightskip\linenumberingparameter\c!margin
+         \settrue\c_page_lines_auto_narrow
+       \fi
+     \fi\fi\fi
+   \fi
    \the\beforeeverylinenumbering
    \globallet\page_postprocessors_page  \page_postprocessors_linenumbers_page
    \globallet\page_postprocessors_column\page_postprocessors_linenumbers_column
@@ -265,67 +263,39 @@
    \or
      \page_lines_start_define % only when assignment
    \fi
-   \attribute\linenumberattribute\getvalue{\??linenumberinginstance\currentlinenumbering}\relax}
+   \attribute\linenumberattribute\csname\??linenumberinginstance\currentlinenumbering\endcsname\relax}
 
 \unexpanded\def\stoplinenumbering
   {\attribute\linenumberattribute\attributeunsetvalue
    \the\aftereverylinenumbering
+   \ifconditional\c_page_lines_auto_narrow\par\fi
    \endgroup}
 
 % number placement .. will change into (the new) margin code
 
-\def\page_lines_number_inner_indeed{\doifoddpageelse\page_lines_number_left_indeed\page_lines_number_right_indeed}
-\def\page_lines_number_outer_indeed{\doifoddpageelse\page_lines_number_right_indeed\page_lines_number_left_indeed}
-
-\def\page_lines_number_left
-  {\ifcase\c_page_lines_location
-     \expandafter\page_lines_number_left_indeed
-   \or
-     \expandafter\page_lines_number_left_indeed
-   \or
-     \expandafter\page_lines_number_left_indeed
-   \or
-     \expandafter\page_lines_number_inner_indeed
-   \or
-     \expandafter\page_lines_number_outer_indeed
-   \or
-     \expandafter\page_lines_number_text_indeed
-   \or
-     \expandafter\page_lines_number_begin_indeed
-   \or
-     \expandafter\page_lines_number_end_indeed
-   \fi}
-
-\def\page_lines_number_right
-  {\ifcase\c_page_lines_location
-     \expandafter\page_lines_number_right_indeed
-   \or
-     \expandafter\page_lines_number_right_indeed
-   \or
-     \expandafter\page_lines_number_right_indeed
-   \or
-     \expandafter\page_lines_number_outer_indeed
-   \or
-     \expandafter\page_lines_number_inner_indeed
-   \or
-     \expandafter\page_lines_number_text_indeed
-   \or
-     \expandafter\page_lines_number_end_indeed
-   \or
-     \expandafter\page_lines_number_begin_indeed
-   \fi}
-
 \newconditional\c_page_lines_fake_number
 \newconstant   \b_page_lines_number
 \newconstant   \c_page_lines_column
 \newconstant   \c_page_lines_last_column
+\newdimen      \d_page_lines_line_width
+\settrue       \c_page_lines_dir_left_to_right
+
+\installcorenamespace{linenumberinghandler}
+
+\def\page_line_swap_align % can become a helper
+  {\ifx\p_align\v!inner     \let\p_align\v!outer     \else
+   \ifx\p_align\v!outer     \let\p_align\v!inner     \else
+   \ifx\p_align\v!flushleft \let\p_align\v!flushright\else
+   \ifx\p_align\v!flushright\let\p_align\v!flushleft \else
+   \ifx\p_align\v!left      \let\p_align\v!right     \else
+   \ifx\p_align\v!right     \let\p_align\v!left      \fi\fi\fi\fi\fi\fi}
 
-\def\page_lines_add_numbers_to_box#1#2#3#4% box col max nesting
+\def\page_lines_add_numbers_to_box#box#column#max#nesting%
   {\bgroup
-   \b_page_lines_number     #1\relax
-   \c_page_lines_column     #2\relax
-   \c_page_lines_last_column#3\relax
-   \c_page_lines_nesting    #4\relax
+   \b_page_lines_number     #box\relax
+   \c_page_lines_column     #column\relax
+   \c_page_lines_last_column#max\relax
+   \c_page_lines_nesting    #nesting\relax
    \fullrestoreglobalbodyfont
    \let\makelinenumber\page_lines_make_number % used at lua end
    \setbox\b_page_lines_scratch\vbox
@@ -337,171 +307,195 @@
 
 \let\page_lines_make_number_indeed\relax
 
-\def\page_lines_make_number#1#2%
-  {\edef\currentlinenumbering{#1}%
-   \ifcase#2\relax
-     \settrue \c_page_lines_fake_number
+% \def\page_lines_rlap{\ifconditional\c_page_lines_dir_left_to_right\expandafter\rlap\else\expandafter\llap\fi}
+% \def\page_lines_llap{\ifconditional\c_page_lines_dir_left_to_right\expandafter\llap\else\expandafter\rlap\fi}
+
+\def\page_lines_add_numbers_to_box#box#column#max#nesting%
+  {\bgroup
+   \b_page_lines_number     #box\relax
+   \c_page_lines_column     #column\relax
+   \c_page_lines_last_column#max\relax
+   \c_page_lines_nesting    #nesting\relax
+   \fullrestoreglobalbodyfont
+   \let\makelinenumber\page_lines_make_number % used at lua end
+   \setbox\b_page_lines_scratch\vbox
+     {\forgetall
+      \offinterlineskip
+      \ctxcommand{linenumbersstageone(\number\b_page_lines_number,\ifcase\c_page_lines_nesting false\else true\fi)}}%
+   \ctxcommand{linenumbersstagetwo(\number\b_page_lines_number,\number\b_page_lines_scratch)}% can move to lua code
+   \egroup}
+
+\def\page_lines_make_number#tag#mode#linenumber#shift#width#leftskip#dir% beware, one needs so compensate for this in the \hsize
+  {\naturalhbox to \zeropoint \bgroup
+   \ifcase#mode\relax
+   % \settrue \c_page_lines_fake_number
    \else
-     \setfalse\c_page_lines_fake_number
-   \fi
-   \c_page_lines_location \executeifdefined{\??linenumberinglocation   \linenumberingparameter\c!location}\plusone \relax % left
-   \c_page_lines_alignment\executeifdefined{\??linenumberingalternative\linenumberingparameter\c!align   }\plusfive\relax % auto
-   \ifcase\c_page_lines_last_column\relax
-     \settrue \c_page_lines_fake_number
-   \or
-    % one column
-     \ifcase\c_page_lines_location
-       \settrue \c_page_lines_fake_number
-       \let\page_lines_make_number_indeed\page_lines_number_fake_indeed
-     \or
-       \let\page_lines_make_number_indeed\page_lines_number_left
-     \or
-       \let\page_lines_make_number_indeed\page_lines_number_right
-     \or % inner
-       \let\page_lines_make_number_indeed\page_lines_number_inner_indeed
-     \or % outer
-       \let\page_lines_make_number_indeed\page_lines_number_outer_indeed
-     \or % text
-       \let\page_lines_make_number_indeed\page_lines_number_text_indeed
+   % \setfalse\c_page_lines_fake_number
+     \edef\currentlinenumbering{#tag}%
+     \def\linenumber{#linenumber}% unsafe
+     \d_page_lines_line_width#width\scaledpoint\relax
+     \d_page_lines_distance\linenumberingparameter\c!distance\relax
+     \edef\p_align{\linenumberingparameter\c!align}%
+     \edef\p_location{\linenumberingparameter\c!location}%
+     \ifcase\istltdir#dir\relax
+       \settrue \c_page_lines_dir_left_to_right
+     \else
+       \setfalse\c_page_lines_dir_left_to_right
+     \fi
+     %
+     % maybe we also need an option to ignore columns, so that we renumber
+     % once but on the other hand this assumes aligned lines
+     %
+     \ifcase\c_page_lines_last_column\relax
+       \settrue \c_page_lines_fake_number % why
      \or
-       \let\page_lines_make_number_indeed\page_lines_number_begin_indeed
+       % one column
      \or
-       \let\page_lines_make_number_indeed\page_lines_number_end_indeed
+       % two columns
+       \ifx\p_location\v!default % or just margin
+         \ifcase\c_page_lines_column\relax
+           \settrue \c_page_lines_fake_number % why
+         \or
+           % one
+           \let\p_location\v!left
+         \else
+           % two
+           \let\p_location\v!right
+           % can become a helper
+           \page_line_swap_align
+         \fi
+       \fi
+     \else
+       % too fuzzy
      \fi
-   \else\ifcase\c_page_lines_column\relax
-     \settrue \c_page_lines_fake_number
-   \or
-     \let\page_lines_make_number_indeed\page_lines_number_left
-     \ifcase\c_page_lines_location\or
-       \c_page_lines_location\plusone
-     \or
-       \c_page_lines_location\plustwo
+     \ifx\p_location\v!default
+        \ifconditional\c_page_lines_dir_left_to_right
+          \let\p_location\v!left
+        \else
+          \let\p_location\v!right
+          \page_line_swap_align % yes or no
+        \fi
+     \fi
+     %
+     \executeifdefined{\??linenumberinghandler\p_location}\relax
+   \fi
+   \egroup}
+
+\def\page_lines_number_inject#align#width%
+  {\edef\p_width{\linenumberingparameter\c!width}%
+   \ifx\p_width\v!margin
+     \d_page_lines_width#width%
+   \else
+     \d_page_lines_width\p_width
+   \fi
+   \relax
+   \ifdim\d_page_lines_width>\zeropoint
+%      \ifconditional\c_page_lines_dir_left_to_right\else
+%        \let\simplealignedbox\simplereversealignedbox
+%      \fi
+     \ifconditional\tracelinenumbering
+       \ruledhbox{\simplealignedbox\d_page_lines_width#align{\page_lines_number_inject_indeed}}%
      \else
-       \c_page_lines_location\plusone
-     \or
-       \c_page_lines_location\plusone
-     \or
-       \c_page_lines_location\plusone
-     \or
-       \c_page_lines_location\plusone % todo
-     \or
-       \c_page_lines_location\plusone % todo
+       \simplealignedbox\d_page_lines_width#align{\page_lines_number_inject_indeed}%
      \fi
    \else
-     \let\page_lines_make_number_indeed\page_lines_number_right
-     \ifcase\c_page_lines_location\or
-       \c_page_lines_location\plustwo
-     \or
-       \c_page_lines_location\plusone
-     \or
-       \c_page_lines_location\plustwo
-     \or
-       \c_page_lines_location\plustwo
-     \or
-       \c_page_lines_location\plustwo % todo
-     \or
-       \c_page_lines_location\plustwo % todo
+     \ifconditional\tracelinenumbering
+       \ruledhbox
+     \else
+     % \hbox
      \fi
-   \fi\fi
-   \page_lines_make_number_indeed{#1}}
-
-\let\page_lines_number_fake_indeed\gobblesixarguments % needs checking
-
-\def\page_lines_number_text_indeed#1#2#3#4#5#6% beware, one needs so compensate for this in the \hsize
-  {\hbox{\page_lines_number_construct{#1}{2}{#2}{#5}\hskip#3\scaledpoint}}
-
-\def\page_lines_number_left_indeed#1#2#3#4#5#6%
-  {\naturalhbox to \zeropoint
-     {\ifcase\istltdir#6\else \hskip-#4\scaledpoint \fi
-      \llap{\page_lines_number_construct{#1}{2}{#2}{#5}\kern#3\scaledpoint}}}
-
-\def\page_lines_number_right_indeed#1#2#3#4#5#6%
-  {\naturalhbox to \zeropoint
-     {\ifcase\istltdir#6\else \hskip-#4\scaledpoint \fi
-      \rlap{\hskip\dimexpr#4\scaledpoint+#3\scaledpoint\relax\page_lines_number_construct{#1}{1}{#2}{#5}}}}
+     {\page_lines_number_inject_indeed}%
+   \fi}
 
-\def\page_lines_number_begin_indeed#1#2#3#4#5#6%
-  {\ifcase\istltdir#6\relax
-     \c_page_lines_location\plusone
-     \expandafter\page_lines_number_left_indeed
-   \else
-     \c_page_lines_location\plustwo
-     \expandafter\page_lines_number_left_indeed
-   \fi{#1}{#2}{#3}{#4}{#5}{#6}}
-
-\def\page_lines_number_end_indeed#1#2#3#4#5#6%
-  {\ifcase\istltdir#6\relax
-     \c_page_lines_location\plustwo
-     \expandafter\page_lines_number_left_indeed
+\def\page_lines_number_inject_indeed
+  {\uselinenumberingstyleandcolor\c!style\c!color
+   \linenumberingparameter\c!command
+     {\linenumberingparameter\c!left
+      \convertnumber{\linenumberingparameter\c!conversion}\linenumber
+      \linenumberingparameter\c!right}}
+
+% \def\dodorlap{\hbox to \zeropoint{\box\nextbox\normalhss}\endgroup}
+% \def\dodollap{\hbox to \zeropoint{\normalhss\box\nextbox}\endgroup}
+
+\def\page_line_handle_left#align#width#distance%
+  {\llap
+     {\page_lines_number_inject#align#width%
+      \kern\dimexpr#distance+\d_page_lines_distance\relax
+      \the\everylinenumber
+      \hss}}
+
+\def\page_line_handle_right#align#width#distance%
+  {\rlap
+     {\kern\dimexpr#distance+\d_page_lines_distance+\d_page_lines_line_width\relax
+      \page_lines_number_inject#align#width%
+      \the\everylinenumber}}
+
+\setuvalue{\??linenumberinghandler\v!left}%
+  {\page_line_handle_left\p_align\leftmarginwidth\leftmargindistance}
+
+\setuvalue{\??linenumberinghandler\v!right}%
+  {\page_line_handle_right\p_align\rightmarginwidth\rightmargindistance}
+
+\setuvalue{\??linenumberinghandler\v!inner}%
+  {\ifodd\realpageno
+     \ifx\p_align\v!inner
+       \page_line_handle_left\v!flushleft\leftmarginwidth\leftmargindistance
+     \else\ifx\p_align\v!outer
+       \page_line_handle_left\v!flushright\leftmarginwidth\leftmargindistance
+     \else
+       \page_line_handle_left\p_align\leftmarginwidth\leftmargindistance
+     \fi\fi
    \else
-     \c_page_lines_location\plusone
-     \expandafter\page_lines_number_left_indeed
-   \fi{#1}{#2}{#3}{#4}{#5}{#6}}
+     \ifx\p_align\v!inner
+       \page_line_handle_right\v!flushright\rightmarginwidth\rightmargindistance
+     \else\ifx\p_align\v!outer
+       \page_line_handle_right\v!flushleft\rightmarginwidth\rightmargindistance
+     \else
+       \page_line_handle_right\p_align\rightmarginwidth\rightmargindistance
+     \fi\fi
+   \fi}
 
-\def\page_lines_number_construct#1#2#3#4% tag 1=left|2=right linenumber leftskip
-  {\begingroup
-   \def\currentlinenumbering{#1}%
-   \def\linenumber{#3}% unsafe
-   \doifelse{\linenumberingparameter\c!width}\v!margin
-     {\d_page_lines_width\leftmarginwidth}
-     {\d_page_lines_width\linenumberingparameter\c!width}%
-   \d_page_lines_distance\linenumberingparameter\c!distance\relax
-   \ifcase#2\relax\or\hskip\d_page_lines_distance\fi\relax
-   \ifnum\c_page_lines_location=\plusfive
-     \scratchdimen\dimexpr#4\scaledpoint-\d_page_lines_distance\relax
-     \c_page_lines_location\plusone
+\setuvalue{\??linenumberinghandler\v!outer}%
+  {\ifodd\realpageno
+     \ifx\p_align\v!inner
+       \page_line_handle_right\v!flushleft\leftmarginwidth\leftmargindistance
+     \else\ifx\p_align\v!outer
+       \page_line_handle_right\v!flushright\leftmarginwidth\leftmargindistance
+     \else
+       \page_line_handle_right\p_align\leftmarginwidth\leftmargindistance
+     \fi\fi
    \else
-     \scratchdimen\zeropoint
-   \fi
-   \ifcase\c_page_lines_alignment
-     \c_page_lines_location\zerocount % middle
-   \or
-     \c_page_lines_location\plusone % left
-   \or
-     \c_page_lines_location\plustwo % right
-   \fi
-   \ifconditional\tracelinenumbering\ruledhbox\else\hbox\fi to \d_page_lines_width
-     {\ifcase\c_page_lines_location
-        \hss % middle
-      \or
-        % left
-      \or
-        \hss % right
-      \or
-        \doifoddpageelse\relax\hss % inner
-      \or
-        \doifoddpageelse\hss\relax % outer
-      \fi
-      \ifconditional\c_page_lines_fake_number
-        % we need to reserve space
-      \else
-        \uselinenumberingstyleandcolor\c!style\c!color
-        \linenumberingparameter\c!command
-          {\linenumberingparameter\c!left
-           \convertnumber{\linenumberingparameter\c!conversion}{#3}%
-           \linenumberingparameter\c!right}%
-      \fi
-      \ifcase\c_page_lines_location
-        \hss % middle
-      \or
-        \hss % left
-      \or
-        % right
-      \or
-        \doifoddpageelse\hss\relax % inner
-      \or
-        \doifoddpageelse\relax\hss % outer
-      \fi}%
-   \ifcase#2\relax
-     \hskip-\scratchdimen
-   \or
-     \hskip-\scratchdimen
-   \or
-     \hskip\dimexpr\d_page_lines_distance-\scratchdimen\relax
-   \fi
-   \relax
-   \the\everylinenumber
-   \endgroup}
+     \ifx\p_align\v!inner
+       \page_line_handle_left\v!flushright\rightmarginwidth\rightmargindistance
+     \else\ifx\p_align\v!outer
+       \page_line_handle_left\v!flushleft\rightmarginwidth\rightmargindistance
+     \else
+       \page_line_handle_left\p_align\rightmarginwidth\rightmargindistance
+     \fi\fi
+   \fi}
+
+\def\page_line_handle_begin#align%
+  {\rlap
+     {\kern\d_page_lines_distance
+      \page_lines_number_inject#align\zeropoint
+      \the\everylinenumber}}
+
+\def\page_line_handle_end#align%
+  {\rlap
+     {\kern\d_page_lines_line_width\relax
+      \llap
+        {\page_lines_number_inject#align\zeropoint
+         \kern\d_page_lines_distance
+         \the\everylinenumber}}}
+
+\setuvalue{\??linenumberinghandler\v!begin}{\page_line_handle_begin\p_align}
+\setuvalue{\??linenumberinghandler\v!end  }{\page_line_handle_end  \p_align}
+\setuvalue{\??linenumberinghandler\v!text }{\page_line_handle_begin\p_align}
+
+\setuevalue{\??linenumberinghandler\v!inleft  }{\getvalue{\??linenumberinghandler\v!left }}
+\setuevalue{\??linenumberinghandler\v!inmargin}{\getvalue{\??linenumberinghandler\v!left }}
+\setuevalue{\??linenumberinghandler\v!margin  }{\getvalue{\??linenumberinghandler\v!left }}
+\setuevalue{\??linenumberinghandler\v!inright }{\getvalue{\??linenumberinghandler\v!right}}
 
 % referencing: \permithyphenation, also removes leading spaces (new per 29-11-2013)
 
@@ -523,7 +517,6 @@
      \expandafter\gobbleoneargument
    \fi}
 
-
 \def\page_lines_reference_show_start_indeed#1%
   {\setbox\scratchbox\hbox{\llap
      {\vrule\s!width\onepoint\s!depth\strutdp\s!height.8\strutht\raise.85\strutht\hbox{\llap{\tt\txx#1}}}}%
diff --git a/tex/context/base/page-mix.mkiv b/tex/context/base/page-mix.mkiv
index 38b5d672f..671f01ea3 100644
--- a/tex/context/base/page-mix.mkiv
+++ b/tex/context/base/page-mix.mkiv
@@ -542,7 +542,8 @@
   {\ctxcommand{mixfinalize()}%
    \setbox\b_page_mix_collected\vbox \bgroup
      \ifvoid\b_page_mix_preceding \else
-       \box\b_page_mix_preceding
+       \page_lines_add_numbers_to_box\b_page_mix_preceding\plusone\plusone\plusone
+      %\box\b_page_mix_preceding
        \global\d_page_mix_preceding_height\zeropoint
        \nointerlineskip
      \fi
diff --git a/tex/context/base/page-run.mkiv b/tex/context/base/page-run.mkiv
index dabf37252..1f2551ebc 100644
--- a/tex/context/base/page-run.mkiv
+++ b/tex/context/base/page-run.mkiv
@@ -79,13 +79,27 @@ local function todimen(name,unit,fmt)
     return number.todimen(tex.dimen[name],unit,fmt)
 end
 
-function commands.showlayoutvariables(options)
-
-    if options == "" then
+local function checkedoptions(options)
+    if type(options) == "table" then
+        return options
+    elseif not options or options == "" then
         options = "pt,cm"
     end
+    options = utilities.parsers.settings_to_hash(options)
+    local n = 4
+    for k, v in table.sortedhash(options) do
+        local m = tonumber(k)
+        if m then
+            n = m
+        end
+    end
+    options.n = n
+    return options
+end
+
+function commands.showlayoutvariables(options)
 
-    local options = utilities.parsers.settings_to_hash(options)
+    options = checkedoptions(options)
 
     local dimensions = { "pt", "bp", "cm", "mm", "dd", "cc", "pc", "nd", "nc", "sp", "in" }
 
@@ -215,6 +229,8 @@ end
 
 function commands.showlayout(options)
 
+    options = checkedoptions(options)
+
     if tex.count.textlevel == 0 then
 
         commands.showlayoutvariables(options)
@@ -225,7 +241,7 @@ function commands.showlayout(options)
         context.bgroup()
         context.showframe()
         context.setuplayout { marking = interfaces.variables.on }
-        for i=1,4 do
+        for i=1,(options.n or 4) do
             commands.showlayoutvariables(options)
             context.page()
         end
diff --git a/tex/context/base/spac-ali.mkiv b/tex/context/base/spac-ali.mkiv
index cf95064a2..c13e4ca76 100644
--- a/tex/context/base/spac-ali.mkiv
+++ b/tex/context/base/spac-ali.mkiv
@@ -1035,16 +1035,38 @@
 % \simplealignedbox{2cm}{right}{x}
 
 \installcorenamespace{alignsimple}
-
-\setvalue{\??alignsimple\v!right     }#1{{#1\hss}}
-\setvalue{\??alignsimple\v!left      }#1{{\hss#1}}
-\setvalue{\??alignsimple\v!flushright}#1{{\hss#1}}
-\setvalue{\??alignsimple\v!flushleft }#1{{#1\hss}}
-\setvalue{\??alignsimple\v!middle    }#1{{\hss#1\hss}}
+\installcorenamespace{alignsimplereverse}
+
+% todo: also handle \bgroup ... \egroup
+
+\unexpanded\def\spac_align_simple_left  #1{{#1\hss}}
+\unexpanded\def\spac_align_simple_right #1{{\hss#1}}
+\unexpanded\def\spac_align_simple_middle#1{{\hss#1\hss}}
+
+\letvalue{\??alignsimple       \v!right     }\spac_align_simple_left
+\letvalue{\??alignsimple       \v!outer     }\spac_align_simple_left   % not managed! see linenumbers
+\letvalue{\??alignsimple       \v!flushleft }\spac_align_simple_left
+\letvalue{\??alignsimple       \v!left      }\spac_align_simple_right
+\letvalue{\??alignsimple       \v!inner     }\spac_align_simple_right  % not managed! see linenumbers
+\letvalue{\??alignsimple       \v!flushright}\spac_align_simple_right
+\letvalue{\??alignsimple       \v!middle    }\spac_align_simple_middle
+
+\letvalue{\??alignsimplereverse\v!right     }\spac_align_simple_right
+\letvalue{\??alignsimplereverse\v!outer     }\spac_align_simple_right % not managed! see linenumbers
+\letvalue{\??alignsimplereverse\v!flushleft }\spac_align_simple_right
+\letvalue{\??alignsimplereverse\v!left      }\spac_align_simple_left
+\letvalue{\??alignsimplereverse\v!inner     }\spac_align_simple_left  % not managed! see linenumbers
+\letvalue{\??alignsimplereverse\v!flushright}\spac_align_simple_left
+\letvalue{\??alignsimplereverse\v!middle    }\spac_align_simple_middle
 
 \unexpanded\def\simplealignedbox#1#2%
   {\hbox to #1\csname\??alignsimple\ifcsname\??alignsimple#2\endcsname#2\else\v!right\fi\endcsname}
 
+\newconditional\alignsimplelefttoright \settrue\alignsimplelefttoright
+
+\unexpanded\def\simplereversealignedbox#1#2%
+  {\hbox to #1\csname\??alignsimplereverse\ifcsname\??alignsimplereverse#2\endcsname#2\else\v!left\fi\endcsname}
+
 % \installnamespace{alignsets}
 %
 % \setvalue{\??alignsets\v!right     }#1#2{\let#1\relax\let#2\hss  }
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 6408f9231..cffb13476 100644
--- a/tex/context/base/status-files.pdf
+++ b/tex/context/base/status-files.pdf
diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf
index 5fccd88e2..fc471de22 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/context/base/strc-lab.mkiv b/tex/context/base/strc-lab.mkiv
index ce4cdcc5e..3e6617126 100644
--- a/tex/context/base/strc-lab.mkiv
+++ b/tex/context/base/strc-lab.mkiv
@@ -58,10 +58,15 @@
      {\normalexpanded{\defineconstruction[#1][#3][\s!handler=\v!label,\c!level=#2]}%
       \setevalue{\??label#1:\s!parent}{\??label#3}}%
    \ifconditional\c_strc_constructions_define_commands
-     \setuevalue{\e!next #1}{\strc_labels_next   {#1}{\number#2}}% obsolete
-     \setuevalue{\c!reset#1}{\strc_labels_reset  {#1}{\number#2}}% obsolete
-     %setuevalue{\c!set  #1}{\strc_labels_set    {#1}{\number#2}}% obsolete
-     \setuevalue        {#1}{\strc_labels_command{#1}}%
+     \setuevalue{\e!next   #1}{\strc_labels_next   {#1}{\number#2}}% obsolete
+     \setuevalue{\v!reset  #1}{\strc_labels_reset  {#1}{\number#2}}% obsolete % should be \e!reset anyway
+     %setuevalue{\c!set    #1}{\strc_labels_set    {#1}{\number#2}}% obsolete
+   \ifcsname\v!current#1\endcsname
+     % we play safe
+   \else
+     \setuevalue{\v!current#1}{\strc_labels_current{#1}}%          % obsolete % should be \e!current anyway
+   \fi
+     \setuevalue          {#1}{\strc_labels_command{#1}}%
    \fi}
 
 % todo: \strc_labels_command for user
@@ -103,6 +108,8 @@
 \let\p_strc_constructions_title \empty
 \let\p_strc_constructions_number\empty
 
+\newconditional\c_strc_constructions_number_keep
+
 \setvalue{\??constructioninitializer\v!label}%
   {\let\currentlabel                    \currentconstruction
    \let\constructionparameter           \labelparameter
@@ -117,7 +124,9 @@
      \iftrialtypesetting
        \strc_counters_save\currentconstructionnumber
      \fi
-     \strc_counters_increment_sub\currentconstructionnumber\currentconstructionlevel
+     \ifconditional\c_strc_constructions_number_keep \else
+       \strc_counters_increment_sub\currentconstructionnumber\currentconstructionlevel
+     \fi
    \else
      \setfalse\c_strc_constructions_number_state
    \fi
@@ -137,11 +146,12 @@
 
 %D Interfaces:
 
-\let\strc_labels_command\strc_descriptions_command
+\unexpanded\def\strc_labels_command{\setfalse\c_strc_constructions_number_keep\strc_descriptions_command}
+\unexpanded\def\strc_labels_current{\settrue \c_strc_constructions_number_keep\strc_descriptions_command}
 
-\unexpanded\def\strc_labels_next {\strc_constructions_next_indeed \namedlabelparameter} % #1#2
-\unexpanded\def\strc_labels_reset{\strc_constructions_reset_indeed\namedlabelparameter} % #1#2
-%unexpanded\def\strc_labels_set  {\strc_constructions_set_indeed  \namedlabelparameter} % #1#2
+\unexpanded\def\strc_labels_next   {\strc_constructions_next_indeed \namedlabelparameter} % #1#2
+\unexpanded\def\strc_labels_reset  {\strc_constructions_reset_indeed\namedlabelparameter} % #1#2
+%unexpanded\def\strc_labels_set    {\strc_constructions_set_indeed  \namedlabelparameter} % #1#2
 
 % similar to enumerations
 
diff --git a/tex/context/base/strc-not.mkvi b/tex/context/base/strc-not.mkvi
index b15285f8c..48ef6b631 100644
--- a/tex/context/base/strc-not.mkvi
+++ b/tex/context/base/strc-not.mkvi
@@ -1303,6 +1303,7 @@
      \strc_notes_set_bodyfont
      \setbox\scratchbox\hbox
        {\strc_notes_flush_inserts}%
+     \page_postprocessors_linenumbers_deepbox\scratchbox
      \setbox\scratchbox\hbox
        {\setupcurrentnote
           [\c!location=,
diff --git a/tex/context/base/strc-ref.lua b/tex/context/base/strc-ref.lua
index a989321c4..0c8bb6e53 100644
--- a/tex/context/base/strc-ref.lua
+++ b/tex/context/base/strc-ref.lua
@@ -192,6 +192,38 @@ local function initializer() -- can we use a tobesaved as metatable for collecte
     nofreferred = #referred
 end
 
+-- no longer fone this way
+
+-- references.resolvers = references.resolvers or { }
+-- local resolvers = references.resolvers
+--
+-- function resolvers.section(var)
+--     local vi = lists.collected[var.i[2]]
+--     if vi then
+--         var.i = vi
+--         var.r = (vi.references and vi.references.realpage) or (vi.pagedata and vi.pagedata.realpage) or 1
+--     else
+--         var.i = nil
+--         var.r = 1
+--     end
+-- end
+--
+-- resolvers.float       = resolvers.section
+-- resolvers.description = resolvers.section
+-- resolvers.formula     = resolvers.section
+-- resolvers.note        = resolvers.section
+--
+-- function resolvers.reference(var)
+--     local vi = var.i[2]
+--     if vi then
+--         var.i = vi
+--         var.r = (vi.references and vi.references.realpage) or (vi.pagedata and vi.pagedata.realpage) or 1
+--     else
+--         var.i = nil
+--         var.r = 1
+--     end
+-- end
+
 -- We make the array sparse (maybe a finalizer should optionally return a table) because
 -- there can be quite some page links involved. We only store one action number per page
 -- which is normally good enough for what we want (e.g. see above/below) and we do
@@ -1383,6 +1415,8 @@ local function identify_outer(set,var,i)
     local arguments = var.arguments
     local operation = var.operation
     if inner then
+        -- tricky: in this case we can only use views when we're sure that all inners
+        -- are flushed in the outer document so that should become an option
         if arguments then
             -- outer::inner{argument}
             var.kind = "outer with inner with arguments"
@@ -1390,9 +1424,9 @@ local function identify_outer(set,var,i)
             -- outer::inner
             var.kind = "outer with inner"
         end
-        var.i = { "reference", inner }
-        resolvers.reference(var)
+        var.i = inner
         var.f = outer
+        var.r = (inner.references and inner.references.realpage) or (inner.pagedata and inner.pagedata.realpage) or 1
         if trace_identifying then
             report_identify_outer(set,var,i,"2e")
         end
diff --git a/tex/context/base/trac-deb.lua b/tex/context/base/trac-deb.lua
index ae3a4d067..c1c928f89 100644
--- a/tex/context/base/trac-deb.lua
+++ b/tex/context/base/trac-deb.lua
@@ -153,9 +153,11 @@ local function processerror(offset)
     local inputstack   = resolvers.inputstack
     local filename     = inputstack[#inputstack] or status.filename
     local linenumber   = tonumber(status.linenumber) or 0
+-- print(status.lasterrorstring)
+-- print(status.lastluaerrorstring)
     local lasttexerror = status.lasterrorstring or "?"
     local lastluaerror = status.lastluaerrorstring or lasttexerror
-    local luaerrorline = match(lastluaerror,[[lua:.-(%d+)]]) or (lastluaerror and find(lastluaerror,"?:0:",1,true) and 0)
+    local luaerrorline = match(lastluaerror,[[lua?]:.-(%d+)]]) or (lastluaerror and find(lastluaerror,"?:0:",1,true) and 0)
     local report       = luaerrorline and report_lua or report_tex
     tracers.printerror {
         filename     = filename,
diff --git a/tex/context/base/typo-brk.lua b/tex/context/base/typo-brk.lua
index 14151af43..f9a65c6ba 100644
--- a/tex/context/base/typo-brk.lua
+++ b/tex/context/base/typo-brk.lua
@@ -107,7 +107,7 @@ methods[2] = function(head,start) -- ( => (-
         local tmp
         head, start, tmp = remove_node(head,start)
         head, start = insert_node_before(head,start,new_disc())
-        setfield(start,"attr",copy_nodelist(getfield(tmp,"attr")))
+        setfield(start,"attr",copy_nodelist(getfield(tmp,"attr"))) -- just a copy will do
         setfield(start,"replace",tmp)
         local tmp = copy_node(tmp)
         local hyphen = copy_node(tmp)
@@ -125,7 +125,7 @@ methods[3] = function(head,start) -- ) => -)
         local tmp
         head, start, tmp = remove_node(head,start)
         head, start = insert_node_before(head,start,new_disc())
-        setfield(start,"attr",copy_nodelist(getfield(tmp,"attr")))
+        setfield(start,"attr",copy_nodelist(getfield(tmp,"attr"))) -- just a copy will do
         setfield(start,"replace",tmp)
         local tmp = copy_node(tmp)
         local hyphen = copy_node(tmp)
@@ -143,7 +143,7 @@ methods[4] = function(head,start) -- - => - - -
         local tmp
         head, start, tmp = remove_node(head,start)
         head, start = insert_node_before(head,start,new_disc())
-        setfield(start,"attr",copy_nodelist(getfield(tmp,"attr")))
+        setfield(start,"attr",copy_nodelist(getfield(tmp,"attr"))) -- just a copy will do
         setfield(start,"pre",copy_node(tmp))
         setfield(start,"post",copy_node(tmp))
         setfield(start,"replace",tmp)
@@ -171,7 +171,7 @@ methods[5] = function(head,start,settings) -- x => p q r
         if middle then
             setfield(start,"replace",(tonodes(tostring(middle),font,attr)))
         end
-        setfield(start,"attr",copy_nodelist(attr)) -- todo: critical only
+        setfield(start,"attr",copy_nodelist(attr)) -- todo: critical only -- just a copy will do
         free_node(tmp)
         insert_break(head,start,10000,10000)
     end
diff --git a/tex/context/base/typo-dua.lua b/tex/context/base/typo-dua.lua
index 7dfd7e81c..73b00f033 100644
--- a/tex/context/base/typo-dua.lua
+++ b/tex/context/base/typo-dua.lua
@@ -80,6 +80,7 @@ local getfield            = nuts.getfield
 local setfield            = nuts.setfield
 
 local remove_node         = nuts.remove
+local copy_node           = nuts.copy
 local insert_node_after   = nuts.insert_after
 local insert_node_before  = nuts.insert_before
 
@@ -708,20 +709,26 @@ local function apply_to_list(list,size,head,pardir)
         elseif id == glue_code then
             if enddir and getsubtype(current) == parfillskip_code then
                 -- insert the last enddir before \parfillskip glue
-                head = insert_node_before(head,current,new_textdir(enddir))
+                local d = new_textdir(enddir)
+-- setfield(d,"attr",copy_node(getfield(current,"attr")))
+                head = insert_node_before(head,current,d)
                 enddir = false
                 done = true
             end
         elseif id == whatsit_code then
             if begindir and getsubtype(current) == localpar_code then
                 -- local_par should always be the 1st node
-                head, current = insert_node_after(head,current,new_textdir(begindir))
+                local d = new_textdir(begindir)
+-- setfield(d,"attr",copy_node(getfield(current,"attr")))
+                head, current = insert_node_after(head,current,d)
                 begindir = nil
                 done = true
             end
         end
         if begindir then
-            head = insert_node_before(head,current,new_textdir(begindir))
+            local d = new_textdir(begindir)
+-- setfield(d,"attr",copy_node(getfield(current,"attr")))
+            head = insert_node_before(head,current,d)
             done = true
         end
         local skip = entry.skip
@@ -731,7 +738,9 @@ local function apply_to_list(list,size,head,pardir)
             end
         end
         if enddir then
-            head, current = insert_node_after(head,current,new_textdir(enddir))
+            local d = new_textdir(enddir)
+-- setfield(d,"attr",copy_node(getfield(current,"attr")))
+            head, current = insert_node_after(head,current,d)
             done = true
         end
         if not entry.remove then
diff --git a/tex/context/base/typo-dub.lua b/tex/context/base/typo-dub.lua
index 3d48f657e..b6581137b 100644
--- a/tex/context/base/typo-dub.lua
+++ b/tex/context/base/typo-dub.lua
@@ -70,6 +70,7 @@ local getfield            = nuts.getfield
 local setfield            = nuts.setfield
 
 local remove_node         = nuts.remove
+local copy_node           = nuts.copy
 local insert_node_after   = nuts.insert_after
 local insert_node_before  = nuts.insert_before
 
@@ -818,20 +819,26 @@ local function apply_to_list(list,size,head,pardir)
         elseif id == glue_code then
             if enddir and getsubtype(current) == parfillskip_code then
                 -- insert the last enddir before \parfillskip glue
-                head = insert_node_before(head,current,new_textdir(enddir))
+                local d = new_textdir(enddir)
+-- setfield(d,"attr",copy_node(getfield(current,"attr")))
+                head = insert_node_before(head,current,d)
                 enddir = false
                 done = true
             end
         elseif id == whatsit_code then
             if begindir and getsubtype(current) == localpar_code then
                 -- local_par should always be the 1st node
-                head, current = insert_node_after(head,current,new_textdir(begindir))
+                local d = new_textdir(begindir)
+-- setfield(d,"attr",copy_node(getfield(current,"attr")))
+                head, current = insert_node_after(head,current,d)
                 begindir = nil
                 done = true
             end
         end
         if begindir then
-            head = insert_node_before(head,current,new_textdir(begindir))
+            local d = new_textdir(begindir)
+-- setfield(d,"attr",copy_node(getfield(current,"attr")))
+            head = insert_node_before(head,current,d)
             done = true
         end
         local skip = entry.skip
@@ -841,7 +848,9 @@ local function apply_to_list(list,size,head,pardir)
             end
         end
         if enddir then
-            head, current = insert_node_after(head,current,new_textdir(enddir))
+            local d = new_textdir(enddir)
+-- setfield(d,"attr",copy_node(getfield(current,"attr")))
+            head, current = insert_node_after(head,current,d)
             done = true
         end
         if not entry.remove then
diff --git a/tex/generic/context/luatex/luatex-basics-gen.lua b/tex/generic/context/luatex/luatex-basics-gen.lua
index 9cf5b9317..a304ab6aa 100644
--- a/tex/generic/context/luatex/luatex-basics-gen.lua
+++ b/tex/generic/context/luatex/luatex-basics-gen.lua
@@ -254,6 +254,18 @@ function caches.loaddata(paths,name)
     for i=1,#paths do
         local data = false
         local luaname, lucname = makefullname(paths[i],name)
+        if lucname and not lfs.isfile(lucname) and type(caches.compile) == "function" then
+            -- in case we used luatex and luajittex mixed ... lub or luc file
+            texio.write(string.format("(compiling luc: %s)",lucname))
+            data = loadfile(luaname)
+            if data then
+                data = data()
+            end
+            if data then
+                caches.compile(data,luaname,lucname)
+                return data
+            end
+        end
         if lucname and lfs.isfile(lucname) then -- maybe also check for size
             texio.write(string.format("(load luc: %s)",lucname))
             data = loadfile(lucname)
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 001aadd13..c52bae2de 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 : luatex-fonts-merged.lua
 -- parent file : luatex-fonts.lua
--- merge date  : 03/28/14 15:04:10
+-- merge date  : 04/03/14 16:20:04
 
 do -- begin closure to overcome local limits and interference
 
@@ -3394,6 +3394,17 @@ function caches.loaddata(paths,name)
   for i=1,#paths do
     local data=false
     local luaname,lucname=makefullname(paths[i],name)
+    if lucname and not lfs.isfile(lucname) and type(caches.compile)=="function" then
+      texio.write(string.format("(compiling luc: %s)",lucname))
+      data=loadfile(luaname)
+      if data then
+        data=data()
+      end
+      if data then
+        caches.compile(data,luaname,lucname)
+        return data
+      end
+    end
     if lucname and lfs.isfile(lucname) then 
       texio.write(string.format("(load luc: %s)",lucname))
       data=loadfile(lucname)
@@ -5764,7 +5775,6 @@ unify=function(data,filename)
         if unicode then
           krn[unicode]=kern
         else
-          print(unicode,name)
         end
       end
       description.kerns=krn