2016-08-29 11:21:00

15 files changed, 77 insertions, 39 deletions

diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf
index 778f05726..6cafd4a4b 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
diff --git a/tex/context/base/mkiv/anch-bar.mkiv b/tex/context/base/mkiv/anch-bar.mkiv
index 3ae138a22..f8581da32 100644
--- a/tex/context/base/mkiv/anch-bar.mkiv
+++ b/tex/context/base/mkiv/anch-bar.mkiv
@@ -98,10 +98,10 @@
      {\def\currentsidebar{#1}%
       \setupcurrentsidebar[#2]}%
    \scratchdistance\sidebarparameter\c!distance\relax
+   \scratchdimen\sidebarparameter\c!leftmargindistance\relax
    \edef\m_level{\sidebarparameter\c!level}%
    \ifx\m_level\empty
      \ifnum\c_anch_sidebars_level=\plusone
-       \scratchdimen\sidebarparameter\c!leftmargindistance\relax
        \ifdim\scratchdimen=\zeropoint
          \advance\d_anch_sidebars_distance\scratchdistance\relax
        \else
@@ -112,7 +112,6 @@
      \fi
    \else
      \ifnum\m_level=\plusone
-       \scratchdimen\sidebarparameter\c!leftmargindistance\relax
        \ifdim\scratchdimen=\zeropoint
          \advance\d_anch_sidebars_distance\scratchdistance\relax
        \else
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index ed2c800d1..7384ff407 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.27 13:35}
+\newcontextversion{2016.08.29 11:16}
 
 %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 7e8bf498e..2b669be98 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.27 13:35}
+\edef\contextversion{2016.08.29 11:16}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/mkiv/font-sel.lua b/tex/context/base/mkiv/font-sel.lua
index f176fc17f..1bfd41c70 100644
--- a/tex/context/base/mkiv/font-sel.lua
+++ b/tex/context/base/mkiv/font-sel.lua
@@ -1,5 +1,5 @@
 if not modules then modules = { } end modules ['font-sel'] = {
-    version   = 1.000,
+    version   = 1.001,
     comment   = "companion to font-sel.mkvi",
     author    = "Wolfgang Schuster",
     copyright = "Wolfgang Schuster",
@@ -17,38 +17,38 @@ local splitat, lpegmatch         = lpeg.splitat, lpeg.match
 local formatters                 = string.formatters
 local settings_to_array          = utilities.parsers.settings_to_array
 local settings_to_hash           = utilities.parsers.settings_to_hash
+local allocate                   = utilities.storage.allocate
                                  
 local v_default                  = interfaces.variables.default
                                  
 local implement                  = interfaces.implement
-                                 
-local selectfont                 = fonts.select or { }
-fonts.select                     = selectfont
-                                 
-local data                       = selectfont.data or { }
-selectfont.data                  = data
-                                 
-local fallbacks                  = selectfont.fallbacks or { }
-selectfont.fallbacks             = fallbacks
-                                 
-local methods                    = selectfont.methods or { }
-selectfont.methods               = methods
-                                 
-local extras                     = selectfont.extras or { }
-selectfont.extras                = extras
-                                 
-local alternatives               = selectfont.alternatives or { }
-selectfont.alternatives          = alternatives
-                                 
-local presets                    = selectfont.presets or { }
-selectfont.presets               = presets
-                                 
-local defaults                   = selectfont.defaults or { }
-selectfont.defaults              = defaults
+
+local fonts                      = fonts
 
 local getlookups                 = fonts.names.getlookups
 local registerdesignsizes        = fonts.goodies.designsizes.register
 local bodyfontsizes              = storage.shared.bodyfontsizes
+
+fonts.select                     = fonts.select or { }
+local selectfont                 = fonts.select
+
+selectfont.data                  = selectfont.data         or allocate()
+selectfont.fallbacks             = selectfont.fallbacks    or allocate()
+selectfont.methods               = selectfont.methods      or allocate()
+selectfont.extras                = selectfont.extras       or allocate()
+selectfont.alternatives          = selectfont.alternatives or allocate()
+selectfont.presets               = selectfont.presets      or allocate()
+selectfont.defaults              = selectfont.defaults     or allocate()
+
+storage.register("fonts/select/presets", selectfont.presets, "fonts.select.presets")
+
+local data                       = selectfont.data
+local fallbacks                  = selectfont.fallbacks
+local methods                    = selectfont.methods
+local extras                     = selectfont.extras
+local alternatives               = selectfont.alternatives
+local presets                    = selectfont.presets
+local defaults                   = selectfont.defaults
                                  
 local ctx_definefontsynonym      = context.definefontsynonym
 local ctx_resetfontfallback      = context.resetfontfallback
diff --git a/tex/context/base/mkiv/font-sel.mkvi b/tex/context/base/mkiv/font-sel.mkvi
index 7561a2767..83b7a6b25 100644
--- a/tex/context/base/mkiv/font-sel.mkvi
+++ b/tex/context/base/mkiv/font-sel.mkvi
@@ -1,6 +1,6 @@
 %D \module
 %D   [     file=font-sel,
-%D      version=2016.06.19,
+%D      version=2016.08.28,
 %D        title=\CONTEXT\ User Module,
 %D     subtitle=Selectfont,
 %D       author=Wolfgang Schuster,
@@ -10,7 +10,7 @@
 
 \writestatus{loading}{ConTeXt User Module / Selectfont}
 
-\registerctxluafile{font-sel}{1.000}
+\registerctxluafile{font-sel}{1.001}
 
 \unprotect
 
diff --git a/tex/context/base/mkiv/math-ini.mkiv b/tex/context/base/mkiv/math-ini.mkiv
index ed92876ac..ca309df3d 100644
--- a/tex/context/base/mkiv/math-ini.mkiv
+++ b/tex/context/base/mkiv/math-ini.mkiv
@@ -2093,16 +2093,53 @@
 
 % if needed we can get rid of the normalize (predo in font code)
 
-\def\math_text_choice_font#1%
+% \def\math_text_choice_font#1#2#%
+%   {\normalizebodyfontsize\m_math_text_choice_face{\mathstyleface\normalmathstyle}%
+%    \hbox#2\bgroup
+%    \font_basics_switchtobodyfont\m_math_text_choice_face
+%    #1%
+%    \let\next}
+
+% \def\math_text_choice_word#1#2#%
+%   {\normalizebodyfontsize\m_math_text_choice_face{\mathstyleface\normalmathstyle}%
+%    \hbox#2\bgroup
+%    \font_basics_switchtobodyfont\m_math_text_choice_face
+%    #1%
+%    \nospacing % \normalnospaces\plusone
+%    \let\next}
+
+%D We accept a low level box specification so that one can make helpers:
+%D
+%D \startbuffer
+%D \startformula
+%D     \startalign[m=2,align={middle}]
+%D         \NC \text to 6cm{One\hfill}           \NC a = 1 \NR
+%D         \NC \text to 6cm{One Two\hfill}       \NC b = 2 \NR
+%D         \NC \text to 6cm{One Two Three\hfill} \NC c = 3 \NR
+%D     \stopalign
+%D \stopformula
+%D \stopbuffer
+%D
+%D \typebuffer \getbuffer
+
+\def\math_text_choice_font#1#2#%
   {\normalizebodyfontsize\m_math_text_choice_face{\mathstyleface\normalmathstyle}%
-   \hbox\bgroup
+   \hbox#2\bgroup
+   \bgroup
+   \aftergroup\hss
+   \aftergroup\egroup
+   \hss
    \font_basics_switchtobodyfont\m_math_text_choice_face
    #1%
    \let\next}
 
-\def\math_text_choice_word#1%
+\def\math_text_choice_word#1#2#%
   {\normalizebodyfontsize\m_math_text_choice_face{\mathstyleface\normalmathstyle}%
-   \hbox\bgroup
+   \hbox#2\bgroup
+   \bgroup
+   \aftergroup\hss
+   \aftergroup\egroup
+   \hss
    \font_basics_switchtobodyfont\m_math_text_choice_face
    #1%
    \nospacing % \normalnospaces\plusone
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index 847177f23..fda2e5c5f 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 ad2ce1c88..a4b5cbf32 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-num.lua b/tex/context/base/mkiv/strc-num.lua
index ef18406b8..233f8f0a8 100644
--- a/tex/context/base/mkiv/strc-num.lua
+++ b/tex/context/base/mkiv/strc-num.lua
@@ -444,7 +444,7 @@ function counters.restore(name)
     local saved = cd.saved
     if not saved then
         -- is ok
-    elseif #saved > 1 then
+    elseif #saved > 0 then
         cd.data = remove(saved)
     else
         report_counters("restore without save for counter %a",name)
diff --git a/tex/context/base/mkiv/tabl-ntb.mkiv b/tex/context/base/mkiv/tabl-ntb.mkiv
index 59b0f75c0..8dad83b29 100644
--- a/tex/context/base/mkiv/tabl-ntb.mkiv
+++ b/tex/context/base/mkiv/tabl-ntb.mkiv
@@ -1595,9 +1595,9 @@
    \ifinsidefloat
      % nothing, else we get a \hsized box
    \else
-     \registerparoptions % (*) better here
+     \registerparoptions % (*) better here (also does a \dontleavehmode)
    \fi
-   \box\b_tabl_ntb_final
+   \dontleavehmode\box\b_tabl_ntb_final
    \afterTABLEbox}
 
 \def\tabl_tbl_split_yes
diff --git a/tex/context/interface/mkiv/i-context.pdf b/tex/context/interface/mkiv/i-context.pdf
index d2fa14bdf..5f7088b13 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 892a15f8e..ed7937f2e 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-basics-gen.lua b/tex/generic/context/luatex/luatex-basics-gen.lua
index 8ea93cc21..2be55ccea 100644
--- a/tex/generic/context/luatex/luatex-basics-gen.lua
+++ b/tex/generic/context/luatex/luatex-basics-gen.lua
@@ -305,6 +305,7 @@ function caches.loaddata(readables,name,writable)
         local loader = false
         local luaname, lucname = makefullname(path,name)
         if lfs.isfile(lucname) then
+            texio.write(string.format("(load luc: %s)",lucname))
             loader = loadfile(lucname)
         end
         if not loader and lfs.isfile(luaname) then
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 6b899a13c..c680531d6 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/27/16 13:35:36
+-- merge date  : 08/29/16 11:16:30
 
 do -- begin closure to overcome local limits and interference
 
@@ -4487,6 +4487,7 @@ function caches.loaddata(readables,name,writable)
     local loader=false
     local luaname,lucname=makefullname(path,name)
     if lfs.isfile(lucname) then
+      texio.write(string.format("(load luc: %s)",lucname))
       loader=loadfile(lucname)
     end
     if not loader and lfs.isfile(luaname) then