2016-04-30 19:04:00

21 files changed, 56 insertions, 30 deletions

diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf
index ce6d65a98..36d2a69e7 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
diff --git a/tex/context/base/mkiv/cont-log.mkiv b/tex/context/base/mkiv/cont-log.mkiv
index b8eb0679f..11cdfb9b8 100644
--- a/tex/context/base/mkiv/cont-log.mkiv
+++ b/tex/context/base/mkiv/cont-log.mkiv
@@ -199,6 +199,7 @@
 \unexpanded\def\pdfTeX   {pdf\TeX}
 \unexpanded\def\pdfeTeX  {pdfe-\TeX}
 \unexpanded\def\luaTeX   {lua\TeX}
+\unexpanded\def\Lua      {Lua}
 \unexpanded\def\luajitTeX{luajit\TeX}
 \unexpanded\def\metaTeX  {meta\TeX}
 \unexpanded\def\XeTeX    {X\lower.5\exheight\hbox{\kern-.15\emwidth\mirror{E}}\kern-.1667\emwidth\TeX}
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index 128ab6e6c..192594188 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.27 10:18}
+\newcontextversion{2016.04.30 18:59}
 
 %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-todo.tex b/tex/context/base/mkiv/context-todo.tex
index 67204ac89..0674ad9fb 100644
--- a/tex/context/base/mkiv/context-todo.tex
+++ b/tex/context/base/mkiv/context-todo.tex
@@ -33,11 +33,15 @@
         play with box attributes
     \stopitem
     \startitem
+        check consistency between foonotes and running text (main color,
+        styles, properties)
+    \stopitem
+    \startitem
         redo some of the spacing (adapt to improvements in engine)
     \stopitem
     \startitem
-        use \type {\matheqnogapstep}, \type {\Ustack}, \type {\mathscriptsmode}
-        and other new math primitives
+        use \type {\matheqnogapstep}, \type {\Ustack}, \type {\mathscriptsmode}, \
+        \type {\mathdisplayskipmode} and other new math primitives
     \stopitem
 \stopitemize
 
diff --git a/tex/context/base/mkiv/context.mkiv b/tex/context/base/mkiv/context.mkiv
index 53a0811a0..74e0a48ea 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.27 10:18}
+\edef\contextversion{2016.04.30 18:59}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/mkiv/data-ini.lua b/tex/context/base/mkiv/data-ini.lua
index c74ff2e04..5ed2cce26 100644
--- a/tex/context/base/mkiv/data-ini.lua
+++ b/tex/context/base/mkiv/data-ini.lua
@@ -34,7 +34,7 @@ texconfig.shell_escape = 't'
 
 if not (environment and environment.default_texmfcnf) and kpse and kpse.default_texmfcnf then
     local default_texmfcnf = kpse.default_texmfcnf()
-    -- looks more like context:
+    -- looks more like context
     default_texmfcnf = gsub(default_texmfcnf,"$SELFAUTOLOC","selfautoloc:")
     default_texmfcnf = gsub(default_texmfcnf,"$SELFAUTODIR","selfautodir:")
     default_texmfcnf = gsub(default_texmfcnf,"$SELFAUTOPARENT","selfautoparent:")
diff --git a/tex/context/base/mkiv/data-pre.lua b/tex/context/base/mkiv/data-pre.lua
index 1c5016f86..70b2e7354 100644
--- a/tex/context/base/mkiv/data-pre.lua
+++ b/tex/context/base/mkiv/data-pre.lua
@@ -72,19 +72,23 @@ prefixes.pathname = function(str)
 end
 
 prefixes.selfautoloc = function(str)
-    return cleanpath(joinpath(getenv('SELFAUTOLOC'),str))
+    local pth = getenv('SELFAUTOLOC')
+    return cleanpath(str and joinpath(pth,str) or pth)
 end
 
 prefixes.selfautoparent = function(str)
-    return cleanpath(joinpath(getenv('SELFAUTOPARENT'),str))
+    local pth = getenv('SELFAUTOPARENT')
+    return cleanpath(str and joinpath(pth,str) or pth)
 end
 
 prefixes.selfautodir = function(str)
-    return cleanpath(joinpath(getenv('SELFAUTODIR'),str))
+    local pth = getenv('SELFAUTODIR')
+    return cleanpath(str and joinpath(pth,str) or pth)
 end
 
 prefixes.home = function(str)
-    return cleanpath(joinpath(getenv('HOME'),str))
+    local pth = getenv('HOME')
+    return cleanpath(str and joinpath(pth,str) or pth)
 end
 
 prefixes.env  = prefixes.environment
diff --git a/tex/context/base/mkiv/font-afm.lua b/tex/context/base/mkiv/font-afm.lua
index 99b857747..0d6b7cb99 100644
--- a/tex/context/base/mkiv/font-afm.lua
+++ b/tex/context/base/mkiv/font-afm.lua
@@ -228,7 +228,8 @@ do
 
     -- old font loader
 
-    local fontloader = fontloader
+    local fontloader      = fontloader
+    local get_indexes_old = false
 
     if fontloader then
 
@@ -236,7 +237,7 @@ do
         local open_font     = fontloader.open
         local close_font    = fontloader.close
 
-        local function get_indexes_old(data,pfbname)
+        get_indexes_old = function(data,pfbname)
             local pfbblob = open_font(pfbname)
             if pfbblob then
                 local characters = data.characters
@@ -394,7 +395,7 @@ do
         end
     end
 
-    if fontloader then
+    if get_indexes_old then
 
         afm.use_new_indexer = true
         get_indexes_new     = get_indexes
@@ -598,7 +599,15 @@ unify = function(data, filename)
     resources.private = private
 end
 
+local everywhere = { ["*"] = { ["*"] = true } } -- or: { ["*"] = { "*" } }
+local noflags    = { false, false, false, false }
+
+afm.experimental_normalize = false
+
 normalize = function(data)
+    if type(afm.experimental_normalize) == "function" then
+        afm.experimental_normalize(data)
+    end
 end
 
 fixnames = function(data)
@@ -616,7 +625,6 @@ fixnames = function(data)
     end
 end
 
-
 --[[ldx--
 <p>These helpers extend the basic table with extra ligatures, texligatures
 and extra kerns. This saves quite some lookups later.</p>
diff --git a/tex/context/base/mkiv/font-dsp.lua b/tex/context/base/mkiv/font-dsp.lua
index 85a80bdf8..330a9400c 100644
--- a/tex/context/base/mkiv/font-dsp.lua
+++ b/tex/context/base/mkiv/font-dsp.lua
@@ -1144,8 +1144,8 @@ local function handlemark(f,fontdata,lookupid,lookupoffset,offset,glyphs,nofglyp
             end
             for i=1,nofbaserecords do
                 local components = baserecords[i]
-                local b = basecoverage[i]
                 if components then
+                    local b = basecoverage[i]
                     for c=1,#components do
                         local classes = components[c]
                         if classes then
@@ -1160,7 +1160,7 @@ local function handlemark(f,fontdata,lookupid,lookupoffset,offset,glyphs,nofglyp
                                 end
                             end
                         end
-                        components[i] = classes
+--                         components[i] = classes
                     end
                 end
             end
diff --git a/tex/context/base/mkiv/font-mis.lua b/tex/context/base/mkiv/font-mis.lua
index 06bf22049..b50da5417 100644
--- a/tex/context/base/mkiv/font-mis.lua
+++ b/tex/context/base/mkiv/font-mis.lua
@@ -21,7 +21,7 @@ local readers  = otf.readers
 
 if readers then
 
-    otf.version = otf.version or 3.018
+    otf.version = otf.version or 3.019
     otf.cache   = otf.cache   or containers.define("fonts", "otl", otf.version, true)
 
     function fonts.helpers.getfeatures(name,save)
diff --git a/tex/context/base/mkiv/font-otl.lua b/tex/context/base/mkiv/font-otl.lua
index bcea27520..f7b6eb5ae 100644
--- a/tex/context/base/mkiv/font-otl.lua
+++ b/tex/context/base/mkiv/font-otl.lua
@@ -53,7 +53,7 @@ local report_otf         = logs.reporter("fonts","otf loading")
 local fonts              = fonts
 local otf                = fonts.handlers.otf
 
-otf.version              = 3.018 -- beware: also sync font-mis.lua and in mtx-fonts
+otf.version              = 3.019 -- beware: also sync font-mis.lua and in mtx-fonts
 otf.cache                = containers.define("fonts", "otl", otf.version, true)
 
 local otfreaders         = otf.readers
diff --git a/tex/context/base/mkiv/font-ots.lua b/tex/context/base/mkiv/font-ots.lua
index 90fcde28c..21225c227 100644
--- a/tex/context/base/mkiv/font-ots.lua
+++ b/tex/context/base/mkiv/font-ots.lua
@@ -3347,7 +3347,7 @@ local function txtdirstate(start,stack,top,rlparmode)
         new = rlparmode
     end
     if trace_directions then
-        report_process("directions after txtdir %a: parmode %a, txtmode %a, level %a",dir,mref(rlparmode),mref(new),topstack)
+        report_process("directions after txtdir %a: parmode %a, txtmode %a, level %a",dir,mref(rlparmode),mref(new),top)
     end
     return getnext(start), top, new
 end
diff --git a/tex/context/base/mkiv/l-file.lua b/tex/context/base/mkiv/l-file.lua
index 7ed6370f2..b6822e954 100644
--- a/tex/context/base/mkiv/l-file.lua
+++ b/tex/context/base/mkiv/l-file.lua
@@ -436,7 +436,7 @@ local deslasher = lpeg.replacer(S("\\/")^1,"/")
 
 function file.join(one, two, three, ...)
     if not two then
-        return one == "" and one or lpegmatch(stripper,one)
+        return one == "" and one or lpegmatch(reslasher,one)
     end
     if one == "" then
         return lpegmatch(stripper,three and concat({ two, three, ... },"/") or two)
diff --git a/tex/context/base/mkiv/mult-low.lua b/tex/context/base/mkiv/mult-low.lua
index d3bdc5ffd..c9009cf1a 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", "emspace", "charspace", "nbsp",
+        "endgraf", "endpar", "everyendpar", "reseteverypar", "finishpar", "empty", "null", "space", "quad", "enspace", "emspace", "charspace", "nbsp", "crlf",
         "obeyspaces", "obeylines", "obeyedspace", "obeyedline", "obeyedtab", "obeyedpage",
         "normalspace",
         --
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index 6ad1e32c3..5783d5af5 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 e36b93b6d..4b328d10b 100644
--- a/tex/context/base/mkiv/status-lua.pdf
+++ b/tex/context/base/mkiv/status-lua.pdf
diff --git a/tex/context/base/mkiv/strc-not.mkvi b/tex/context/base/mkiv/strc-not.mkvi
index edbbf92b3..81d534937 100644
--- a/tex/context/base/mkiv/strc-not.mkvi
+++ b/tex/context/base/mkiv/strc-not.mkvi
@@ -1320,7 +1320,8 @@
    \let\flushnotes\relax
    \let\postponenotes\relax
    \forgetall
-   \resetallattributes % new, we don't want color bleed into notes
+   \resetallattributes   % new, we don't want color bleed into notes
+   \inheritmaintextcolor % but we do want to obey the textcolor
 \to \everybeforenoteinsert
 
 \appendtoks
diff --git a/tex/context/interface/mkiv/i-context.pdf b/tex/context/interface/mkiv/i-context.pdf
index 8b08c9168..fb0189038 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-logo.xml b/tex/context/interface/mkiv/i-logo.xml
index a14717e93..e3327400a 100644
--- a/tex/context/interface/mkiv/i-logo.xml
+++ b/tex/context/interface/mkiv/i-logo.xml
@@ -36,6 +36,8 @@
 
     <cd:command name="pdfeTeX" file="cont-log.mkiv"/>
 
+    <cd:command name="Lua" file="cont-log.mkiv"/>
+
     <cd:command name="luaTeX" file="cont-log.mkiv"/>
 
     <cd:command name="luajitTeX" file="cont-log.mkiv"/>
@@ -100,4 +102,4 @@
 
     <cd:command name="XETEX" file="cont-log.mkiv"/>
 
-</cd:interface>
\ No newline at end of file
+</cd:interface>
diff --git a/tex/context/interface/mkiv/i-readme.pdf b/tex/context/interface/mkiv/i-readme.pdf
index a7d76f313..ad3caeb5b 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 5be649346..eae91cae9 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/27/16 10:18:10
+-- merge date  : 04/30/16 18:59:27
 
 do -- begin closure to overcome local limits and interference
 
@@ -2545,7 +2545,7 @@ local reslasher=lpeg.replacer(S("\\/"),"/")
 local deslasher=lpeg.replacer(S("\\/")^1,"/")
 function file.join(one,two,three,...)
   if not two then
-    return one=="" and one or lpegmatch(stripper,one)
+    return one=="" and one or lpegmatch(reslasher,one)
   end
   if one=="" then
     return lpegmatch(stripper,three and concat({ two,three,... },"/") or two)
@@ -7114,11 +7114,12 @@ end
 local get_indexes
 do
   local fontloader=fontloader
+  local get_indexes_old=false
   if fontloader then
     local font_to_table=fontloader.to_table
     local open_font=fontloader.open
     local close_font=fontloader.close
-    local function get_indexes_old(data,pfbname)
+    get_indexes_old=function(data,pfbname)
       local pfbblob=open_font(pfbname)
       if pfbblob then
         local characters=data.characters
@@ -7235,7 +7236,7 @@ do
       end
     end
   end
-  if fontloader then
+  if get_indexes_old then
     afm.use_new_indexer=true
     get_indexes_new=get_indexes
     get_indexes=function(data,pfbname)
@@ -7415,7 +7416,13 @@ unify=function(data,filename)
   resources.marks={}
   resources.private=private
 end
+local everywhere={ ["*"]={ ["*"]=true } } 
+local noflags={ false,false,false,false }
+afm.experimental_normalize=false
 normalize=function(data)
+  if type(afm.experimental_normalize)=="function" then
+    afm.experimental_normalize(data)
+  end
 end
 fixnames=function(data)
   for k,v in next,data.descriptions do
@@ -12678,8 +12685,8 @@ local function handlemark(f,fontdata,lookupid,lookupoffset,offset,glyphs,nofglyp
       end
       for i=1,nofbaserecords do
         local components=baserecords[i]
-        local b=basecoverage[i]
         if components then
+          local b=basecoverage[i]
           for c=1,#components do
             local classes=components[c]
             if classes then
@@ -12694,7 +12701,6 @@ local function handlemark(f,fontdata,lookupid,lookupoffset,offset,glyphs,nofglyp
                 end
               end
             end
-            components[i]=classes
           end
         end
       end
@@ -15639,7 +15645,7 @@ local trace_defining=false registertracker("fonts.defining",function(v) trace_de
 local report_otf=logs.reporter("fonts","otf loading")
 local fonts=fonts
 local otf=fonts.handlers.otf
-otf.version=3.018 
+otf.version=3.019 
 otf.cache=containers.define("fonts","otl",otf.version,true)
 local otfreaders=otf.readers
 local hashes=fonts.hashes
@@ -21029,7 +21035,7 @@ local function txtdirstate(start,stack,top,rlparmode)
     new=rlparmode
   end
   if trace_directions then
-    report_process("directions after txtdir %a: parmode %a, txtmode %a, level %a",dir,mref(rlparmode),mref(new),topstack)
+    report_process("directions after txtdir %a: parmode %a, txtmode %a, level %a",dir,mref(rlparmode),mref(new),top)
   end
   return getnext(start),top,new
 end