2016-08-23 11:18:00

10 files changed, 42 insertions, 18 deletions

diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf
index 2dcee03b8..797385b92 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 9af40da62..a96d4ff24 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.08.21 16:29}
+\newcontextversion{2016.08.23 11:14}
 
 %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 9a14d3205..d88a97a6e 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.08.21 16:29}
+\edef\contextversion{2016.08.23 11:14}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/mkiv/font-ots.lua b/tex/context/base/mkiv/font-ots.lua
index f2fa886b5..0c0347c25 100644
--- a/tex/context/base/mkiv/font-ots.lua
+++ b/tex/context/base/mkiv/font-ots.lua
@@ -3757,11 +3757,15 @@ local function spaceinitializer(tfmdata,value) -- attr
                             local step = steps[i]
                             local coverage = step.coverage
                             if coverage then
+                                -- what to do if we have no [1] but only [2]
                                 local kerns = coverage[32]
                                 if kerns then
                                     for k, v in next, kerns do
                                         if type(v) == "table" then
-                                            right[k] = v[1][3]
+                                            local one = v[1]
+                                            if one then
+                                                right[k] = one[3]
+                                            end
                                         else
                                             right[k] = v
                                         end
@@ -3771,7 +3775,10 @@ local function spaceinitializer(tfmdata,value) -- attr
                                     local kern = v[32]
                                     if kern then
                                         if type(kern) == "table" then
-                                            left[k] = kern[1][3]
+                                            local one = v[1]
+                                            if one then
+                                                left[k] = one[3]
+                                            end
                                         else
                                             left[k] = kern
                                         end
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index 6d479dfce..ae89dcfeb 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 d6cb56aac..f85658e66 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-flt.mkvi b/tex/context/base/mkiv/strc-flt.mkvi
index e83e036fa..90294cf38 100644
--- a/tex/context/base/mkiv/strc-flt.mkvi
+++ b/tex/context/base/mkiv/strc-flt.mkvi
@@ -1865,17 +1865,28 @@
       \v!outer=>\doifelserightpagefloat{\let\next\strc_floats_relocate_caption_right}{\let\next\strc_floats_relocate_caption_left }]%
    \next}
 
-\installfloatboxbuilder \v!none    \strc_floats_build_box_default
-\installfloatboxbuilder \s!default \strc_floats_build_box_default
-\installfloatboxbuilder \v!high    \strc_floats_build_box_high
-\installfloatboxbuilder \v!low     \strc_floats_build_box_low
-\installfloatboxbuilder \v!middle  \strc_floats_build_box_middle
-
-\installfloatboxbuilder \v!left    \strc_floats_build_box_side
-\installfloatboxbuilder \v!right   \strc_floats_build_box_side
-
-\installfloatboxbuilder \v!top     \strc_floats_build_box_top
-\installfloatboxbuilder \v!bottom  \strc_floats_build_box_bottom
+\installfloatboxbuilder \v!none         \strc_floats_build_box_default
+\installfloatboxbuilder \s!default      \strc_floats_build_box_default
+\installfloatboxbuilder \v!high         \strc_floats_build_box_high
+\installfloatboxbuilder \v!low          \strc_floats_build_box_low
+\installfloatboxbuilder \v!middle       \strc_floats_build_box_middle
+
+\installfloatboxbuilder \v!rightmargin  \strc_floats_build_box_side % added 2016-08-23
+\installfloatboxbuilder \v!leftmargin   \strc_floats_build_box_side % added 2016-08-23
+\installfloatboxbuilder \v!innermargin  \strc_floats_build_box_side % added 2016-08-23
+\installfloatboxbuilder \v!outermargin  \strc_floats_build_box_side % added 2016-08-23
+
+\installfloatboxbuilder \v!left         \strc_floats_build_box_side
+\installfloatboxbuilder \v!right        \strc_floats_build_box_side
+\installfloatboxbuilder \v!inner        \strc_floats_build_box_side % added 2016-08-23
+\installfloatboxbuilder \v!outer        \strc_floats_build_box_side % added 2016-08-23
+
+\installfloatboxbuilder \v!lefthanging  \strc_floats_build_box_side % added 2016-08-23
+\installfloatboxbuilder \v!righthanging \strc_floats_build_box_side % added 2016-08-23
+\installfloatboxbuilder \v!hang         \strc_floats_build_box_side % added 2016-08-23
+
+\installfloatboxbuilder \v!top          \strc_floats_build_box_top
+\installfloatboxbuilder \v!bottom       \strc_floats_build_box_bottom
 
 % \setuplayout[grid=yes] \showgrid \setupcaptions[style=smallbodyfont,location=grid,inbetween=]
 %
diff --git a/tex/context/interface/mkiv/i-context.pdf b/tex/context/interface/mkiv/i-context.pdf
index 5f9ad492f..2a0ec1548 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 f104d9efc..cf81b5ce8 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 29bf21303..7b594b03b 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  : 08/21/16 16:29:10
+-- merge date  : 08/23/16 11:14:05
 
 do -- begin closure to overcome local limits and interference
 
@@ -21132,7 +21132,10 @@ local function spaceinitializer(tfmdata,value)
                 if kerns then
                   for k,v in next,kerns do
                     if type(v)=="table" then
-                      right[k]=v[1][3]
+                      local one=v[1]
+                      if one then
+                        right[k]=one[3]
+                      end
                     else
                       right[k]=v
                     end
@@ -21142,7 +21145,10 @@ local function spaceinitializer(tfmdata,value)
                   local kern=v[32]
                   if kern then
                     if type(kern)=="table" then
-                      left[k]=kern[1][3]
+                      local one=v[1]
+                      if one then
+                        left[k]=one[3]
+                      end
                     else
                       left[k]=kern
                     end