2016-04-27 00:05:00

15 files changed, 53 insertions, 30 deletions

diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf
index d716e9f20..20d358802 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index b9f7c3413..1c48a221d 100644
--- a/tex/context/base/mkiv/cont-new.mkiv
+++ b/tex/context/base/mkiv/cont-new.mkiv
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2016.04.25 13:30}
+\newcontextversion{2016.04.27 00:00}
 
 %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/mkiv/context.mkiv b/tex/context/base/mkiv/context.mkiv
index 472f5632e..ce8eceacf 100644
--- a/tex/context/base/mkiv/context.mkiv
+++ b/tex/context/base/mkiv/context.mkiv
@@ -39,7 +39,7 @@
 %D up and the dependencies are more consistent.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2016.04.25 13:30}
+\edef\contextversion{2016.04.27 00:00}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/mkiv/font-dsp.lua b/tex/context/base/mkiv/font-dsp.lua
index 14e816d5e..85a80bdf8 100644
--- a/tex/context/base/mkiv/font-dsp.lua
+++ b/tex/context/base/mkiv/font-dsp.lua
@@ -525,7 +525,7 @@ local function chainedcontext(f,fontdata,lookupid,lookupoffset,offset,glyphs,nof
                             end
                         end
                         local noflookups = readushort(f)
-                        local lookups = { }
+                        local lookups    = { }
                         for i=1,noflookups do
                             lookups[readushort(f)+1] = readushort(f) + 1
                         end
diff --git a/tex/context/base/mkiv/font-ots.lua b/tex/context/base/mkiv/font-ots.lua
index ac8198971..57ddf9071 100644
--- a/tex/context/base/mkiv/font-ots.lua
+++ b/tex/context/base/mkiv/font-ots.lua
@@ -2144,7 +2144,7 @@ local function handle_contextchain(head,start,dataset,sequence,contexts,rlmode)
                 else
                     local discfound = nil
                     local n = f + 1
-                    last = getnext(last)
+                    last = getnext(last) -- the second in current (first already matched)
                     while n <= l do
                         if not last and (sweeptype == "post" or sweeptype == "replace") then
                             last      = getnext(sweepnode)
@@ -2185,7 +2185,6 @@ local function handle_contextchain(head,start,dataset,sequence,contexts,rlmode)
                                     end
                                     break
                                 end
-                                last = getnext(last)
                             elseif char == false then
                                 if discfound then
                                     notmatchreplace[discfound] = true
@@ -2238,6 +2237,7 @@ local function handle_contextchain(head,start,dataset,sequence,contexts,rlmode)
                                     end
                                     match = not notmatchpre[last]
                                 end
+                                -- maybe only if match
                                 last = getnext(last)
                             else
                                 match = false
@@ -2273,8 +2273,12 @@ local function handle_contextchain(head,start,dataset,sequence,contexts,rlmode)
                                             if trace_skips then
                                                 show_skip(dataset,sequence,char,ck,class)
                                             end
+                                            prev = getprev(prev) -- moved here
                                         elseif seq[n][char] then
-                                            n = n -1
+                                            if n > 1 then -- new test
+                                                prev = getprev(prev) -- moved here
+                                            end
+                                            n = n - 1
                                         else
                                             if discfound then
                                                 notmatchreplace[discfound] = true
@@ -2293,7 +2297,7 @@ local function handle_contextchain(head,start,dataset,sequence,contexts,rlmode)
                                         end
                                         break
                                     end
-                                    prev = getprev(prev)
+                                 -- prev = getprev(prev) -- moved up
                                 elseif char == false then
                                     if discfound then
                                         notmatchreplace[discfound] = true
@@ -2357,21 +2361,20 @@ local function handle_contextchain(head,start,dataset,sequence,contexts,rlmode)
                                             if not match then
                                                 break
                                             end
-                                        else
-                                            -- skip 'm
                                         end
-                                    else
-                                        -- skip 'm
                                     end
+                                    -- maybe only if match
+                                    prev = getprev(prev)
                                 elseif seq[n][32] then
                                     n = n - 1
+                                    prev = getprev(prev)
                                 else
                                     match = false
                                     break
                                 end
-                                prev = getprev(prev)
                             elseif seq[n][32] then -- somewhat special, as zapfino can have many preceding spaces
                                 n = n - 1
+                                prev = getprev(prev) -- was absent
                             else
                                 match = false
                                 break
@@ -2409,7 +2412,11 @@ local function handle_contextchain(head,start,dataset,sequence,contexts,rlmode)
                                         if trace_skips then
                                             show_skip(dataset,sequence,char,ck,class)
                                         end
+                                        current = getnext(current) -- was absent
                                     elseif seq[n][char] then
+                                        if n < s then -- new test
+                                            current = getnext(current) -- was absent
+                                        end
                                         n = n + 1
                                     else
                                         if discfound then
@@ -2491,10 +2498,11 @@ local function handle_contextchain(head,start,dataset,sequence,contexts,rlmode)
                                 match = false
                                 break
                             end
+                            -- maybe only if match
                             current = getnext(current)
                         elseif seq[n][32] then
                             n = n + 1
-current = getnext(current)
+                            current = getnext(current)
                         else
                             match = false
                             break
diff --git a/tex/context/base/mkiv/meta-tex.mkiv b/tex/context/base/mkiv/meta-tex.mkiv
index 35b5c133b..8d24f687c 100644
--- a/tex/context/base/mkiv/meta-tex.mkiv
+++ b/tex/context/base/mkiv/meta-tex.mkiv
@@ -37,17 +37,20 @@
 \unexpanded\def\meta_textext_indeed#1#2%
   {\begingroup
    \setbox\nextbox\hbox{#2}%
-   \executeifdefined{\??graphictexdepth#1}{\getvalue{\??graphictexdepth\s!depth}}%
+   \ifcsname\??graphictexdepth#1\endcsname
+     \lastnamedcs
+   \else
+     \syst_boxes_lower_nextbox_dp
+   \fi
    \box\nextbox
    \endgroup}
 
 \def\getTeXtext#1%
-  {\getvalue{\??graphictextext#1}}
+  {\begincsname\??graphictextext#1\endcsname}
 
-\setvalue{\??graphictexdepth d}{\setbox\nextbox\hpack{\lower\dp\nextbox\box\nextbox}}  % unchecked
-\letvalue{\??graphictexdepth n}\donothing                                             % unchecked
-
-\setvalue{\??graphictexdepth\s!depth  }{\getvalue{\??graphictexdepth d}}
+\letvalue{\??graphictexdepth         d}\syst_boxes_lower_nextbox_dp
+\letvalue{\??graphictexdepth  \s!depth}\syst_boxes_lower_nextbox_dp
+\letvalue{\??graphictexdepth         n}\donothing
 \letvalue{\??graphictexdepth\s!nodepth}\donothing
 
 % \definetextext[framed]{\framed}
diff --git a/tex/context/base/mkiv/mult-low.lua b/tex/context/base/mkiv/mult-low.lua
index c9a13c1e8..d3bdc5ffd 100644
--- a/tex/context/base/mkiv/mult-low.lua
+++ b/tex/context/base/mkiv/mult-low.lua
@@ -263,7 +263,7 @@ return {
         --
         "removetoks", "appendtoks", "prependtoks", "appendtotoks", "prependtotoks", "to",
         --
-        "endgraf", "endpar", "everyendpar", "reseteverypar", "finishpar", "empty", "null", "space", "quad", "enspace", "nbsp",
+        "endgraf", "endpar", "everyendpar", "reseteverypar", "finishpar", "empty", "null", "space", "quad", "enspace", "emspace", "charspace", "nbsp",
         "obeyspaces", "obeylines", "obeyedspace", "obeyedline", "obeyedtab", "obeyedpage",
         "normalspace",
         --
diff --git a/tex/context/base/mkiv/publ-ini.mkiv b/tex/context/base/mkiv/publ-ini.mkiv
index cf51b831a..29ba543cd 100644
--- a/tex/context/base/mkiv/publ-ini.mkiv
+++ b/tex/context/base/mkiv/publ-ini.mkiv
@@ -1805,7 +1805,8 @@
   [\c!interaction=\v!start,
    \c!alternative=num, % default cite form, normally defined in the cite namespace
    \c!inbetween=\btxspace,
-   \c!range=\endash,   % separator:range?
+ % \c!range=\endash,   % separator:range?
+   \c!range=\directdiscretionary\endash,
    \c!compress=\v!yes, % was no?
    \c!authorconversion=normal,
    \c!sorttype=normal, % normal, reverse or none
diff --git a/tex/context/base/mkiv/spac-hor.mkiv b/tex/context/base/mkiv/spac-hor.mkiv
index 7c5358c51..19f2f53b3 100644
--- a/tex/context/base/mkiv/spac-hor.mkiv
+++ b/tex/context/base/mkiv/spac-hor.mkiv
@@ -603,6 +603,8 @@
 
 \let\emspace\quad
 
+\unexpanded\def\charspace{ } % the unexpandable \space (as space can also be delimiter for numbers)
+
 % Suggested by GB (not the name -):
 
 \def\rapfillskip{.5\hsize plus .092\hsize minus .5\hsize} % D.A.'s value
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index 061919207..2a3cd85e7 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 ff140b349..832ebd0a0 100644
--- a/tex/context/base/mkiv/status-lua.pdf
+++ b/tex/context/base/mkiv/status-lua.pdf
diff --git a/tex/context/base/mkiv/supp-box.mkiv b/tex/context/base/mkiv/supp-box.mkiv
index a302076f2..9f4c58ad7 100644
--- a/tex/context/base/mkiv/supp-box.mkiv
+++ b/tex/context/base/mkiv/supp-box.mkiv
@@ -285,6 +285,9 @@
      \expandafter\syst_boxes_smash_process_option
    \fi}
 
+\def\syst_boxes_lower_nextbox_dp
+  {\setbox\nextbox\hpack{\lower\dp\nextbox\box\nextbox}}
+
 %D \starttabulate[|l|l|]
 %D \NC w   \NC \ruledhbox{\smash  [w]{This is some great smashing, isn't it?}} \NC \NR
 %D \NC h   \NC \ruledhbox{\smash  [h]{This is some great smashing, isn't it?}} \NC \NR
diff --git a/tex/context/interface/mkiv/i-context.pdf b/tex/context/interface/mkiv/i-context.pdf
index 8aec86795..07eb73732 100644
--- a/tex/context/interface/mkiv/i-context.pdf
+++ b/tex/context/interface/mkiv/i-context.pdf
diff --git a/tex/context/interface/mkiv/i-readme.pdf b/tex/context/interface/mkiv/i-readme.pdf
index 51ca820cd..18327f2f0 100644
--- a/tex/context/interface/mkiv/i-readme.pdf
+++ b/tex/context/interface/mkiv/i-readme.pdf
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index ab81bc6c5..efb7aebff 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  : 04/25/16 13:30:09
+-- merge date  : 04/27/16 00:00:41
 
 do -- begin closure to overcome local limits and interference
 
@@ -20036,7 +20036,7 @@ local function handle_contextchain(head,start,dataset,sequence,contexts,rlmode)
         else
           local discfound=nil
           local n=f+1
-          last=getnext(last)
+          last=getnext(last) 
           while n<=l do
             if not last and (sweeptype=="post" or sweeptype=="replace") then
               last=getnext(sweepnode)
@@ -20077,7 +20077,6 @@ local function handle_contextchain(head,start,dataset,sequence,contexts,rlmode)
                   end
                   break
                 end
-                last=getnext(last)
               elseif char==false then
                 if discfound then
                   notmatchreplace[discfound]=true
@@ -20162,8 +20161,12 @@ local function handle_contextchain(head,start,dataset,sequence,contexts,rlmode)
                       if trace_skips then
                         show_skip(dataset,sequence,char,ck,class)
                       end
+                      prev=getprev(prev) 
                     elseif seq[n][char] then
-                      n=n -1
+                      if n>1 then 
+                        prev=getprev(prev) 
+                      end
+                      n=n-1
                     else
                       if discfound then
                         notmatchreplace[discfound]=true
@@ -20182,7 +20185,6 @@ local function handle_contextchain(head,start,dataset,sequence,contexts,rlmode)
                     end
                     break
                   end
-                  prev=getprev(prev)
                 elseif char==false then
                   if discfound then
                     notmatchreplace[discfound]=true
@@ -20244,19 +20246,19 @@ local function handle_contextchain(head,start,dataset,sequence,contexts,rlmode)
                       if not match then
                         break
                       end
-                    else
                     end
-                  else
                   end
+                  prev=getprev(prev)
                 elseif seq[n][32] then
                   n=n-1
+                  prev=getprev(prev)
                 else
                   match=false
                   break
                 end
-                prev=getprev(prev)
               elseif seq[n][32] then 
                 n=n-1
+                prev=getprev(prev) 
               else
                 match=false
                 break
@@ -20291,7 +20293,11 @@ local function handle_contextchain(head,start,dataset,sequence,contexts,rlmode)
                     if trace_skips then
                       show_skip(dataset,sequence,char,ck,class)
                     end
+                    current=getnext(current) 
                   elseif seq[n][char] then
+                    if n<s then 
+                      current=getnext(current) 
+                    end
                     n=n+1
                   else
                     if discfound then
@@ -20374,7 +20380,7 @@ local function handle_contextchain(head,start,dataset,sequence,contexts,rlmode)
               current=getnext(current)
             elseif seq[n][32] then
               n=n+1
-current=getnext(current)
+              current=getnext(current)
             else
               match=false
               break