beta 2014.01.07 01:06

10 files changed, 41 insertions, 16 deletions

diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 27aa3bcbe..2bbd9ea9b 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.01.06 23:46}
+\newcontextversion{2014.01.07 01:06}
 
 %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 a80f8c240..db893977e 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 186a7074d..7934f5a26 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.01.06 23:46}
+\edef\contextversion{2014.01.07 01:06}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/math-fbk.lua b/tex/context/base/math-fbk.lua
index bd9a1d315..335e83a20 100644
--- a/tex/context/base/math-fbk.lua
+++ b/tex/context/base/math-fbk.lua
@@ -133,10 +133,8 @@ function fallbacks.apply(target,original)
                 else
                     -- something else
                 end
-                if trace_fallbacks then
-                    if characters[k] then
-                        report_fallbacks("extending math font %a with %U",target.properties.fullname,k)
-                    end
+                if trace_fallbacks and characters[k] then
+                    report_fallbacks("extending math font %a with %U",target.properties.fullname,k)
                 end
             end
         end
@@ -334,9 +332,10 @@ end
 
 local function accent_to_extensible(target,newchr,original,oldchr,height,depth,swap,offset)
     local characters = target.characters
-    local addprivate = fonts.helpers.addprivate
     local olddata = characters[oldchr]
-    if olddata and not olddata.commands then
+    -- brrr ... pagella has only next
+    if olddata and not olddata.commands and olddata.width > 0 then
+        local addprivate = fonts.helpers.addprivate
         if swap then
             swap = characters[swap]
             height = swap.depth
@@ -445,9 +444,9 @@ addextra(0xFE3DF, { description="EXTENSIBLE OF 0x03DF", unicodeslot=0xFE3DF, mat
 addextra(0xFE3DD, { description="EXTENSIBLE OF 0x03DD", unicodeslot=0xFE3DD, mathextensible = "r", mathstretch = "h" } )
 addextra(0xFE3B5, { description="EXTENSIBLE OF 0x03B5", unicodeslot=0xFE3B5, mathextensible = "r", mathstretch = "h" } )
 
-virtualcharacters[0xFE3DF] = function(data) return data.original.characters[0x23DF] end
-virtualcharacters[0xFE3DD] = function(data) return data.original.characters[0x23DD] end
-virtualcharacters[0xFE3B5] = function(data) return data.original.characters[0x23B5] end
+virtualcharacters[0xFE3DF] = function(data) return data.target.characters[0x23DF] end
+virtualcharacters[0xFE3DD] = function(data) return data.target.characters[0x23DD] end
+virtualcharacters[0xFE3B5] = function(data) return data.target.characters[0x23B5] end
 
 -- todo: add some more .. numbers might change
 
diff --git a/tex/context/base/mult-def.mkiv b/tex/context/base/mult-def.mkiv
index 192a380ee..db9fd8ee6 100644
--- a/tex/context/base/mult-def.mkiv
+++ b/tex/context/base/mult-def.mkiv
@@ -78,6 +78,7 @@
 \def\v!combination      {combination}
 \def\v!norepeat         {norepeat}
 \def\v!mixed            {mixed}
+\def\v!centerlast       {centerlast}
 
 \def\s!lcgreek          {lcgreek}
 \def\s!ucgreek          {ucgreek}
diff --git a/tex/context/base/page-mul.mkiv b/tex/context/base/page-mul.mkiv
index a874cd116..73d84fe14 100644
--- a/tex/context/base/page-mul.mkiv
+++ b/tex/context/base/page-mul.mkiv
@@ -1605,9 +1605,11 @@
     \else
         \balancecolumnsfalse
     \fi
-    \installalign\v!yes {\page_columns_align_option_yes }%
-    \installalign\v!no  {\page_columns_align_option_no  }%
-    \installalign\v!text{\page_columns_align_option_text}%
+    % % this won't work (blocked by check for overloading; too fuzzy anyway)
+    % \installalign\v!yes {\page_columns_align_option_yes }% \stretchcolumnstrue \inheritcolumnsfalse
+    % \installalign\v!no  {\page_columns_align_option_no  }% \stretchcolumnsfalse\inheritcolumnsfalse
+    % \installalign\v!text{\page_columns_align_option_text}% \stretchcolumnsfalse\inheritcolumnstrue
+    % %
     \stretchcolumnsfalse
     \inheritcolumnstrue
     \edef\p_align{\columnsparameter\c!align}%
diff --git a/tex/context/base/spac-ali.mkiv b/tex/context/base/spac-ali.mkiv
index 9c7e81379..cf95064a2 100644
--- a/tex/context/base/spac-ali.mkiv
+++ b/tex/context/base/spac-ali.mkiv
@@ -585,13 +585,36 @@
 \unexpanded\def\spac_align_use_now#1%
   {\csname\??alignmentnormalcache#1\endcsname}
 
-% The keywords:
+% Maybe we need something different in columns.
 
 \unexpanded\def\installalign#1#2% beware: commands must be unexpandable!
   {\ifcsname\??aligncommand#1\endcsname \else
      \setvalue{\??aligncommand#1}{\t_spac_align_collected\expandafter{\the\t_spac_align_collected#2}}%
    \fi}
 
+% beware, toks stuff and states are set at a differt time, so installalign is
+% only for special options
+%
+% \setvalue{\??aligncommand whatever}%
+%   {\c_spac_align_state_horizontal\plushundred
+%    \t_spac_align_collected\expandafter{\the\t_spac_align_collected .....}}
+%
+% this one could deal with both
+%
+% \unexpanded\def\installalignoption#1#2%
+%   {\ifcsname\??aligncommand#1\endcsname \else
+%      \setvalue{\??aligncommand#1}%
+%        {\spac_align_set_horizontal_none
+%         \c_spac_align_state_horizontal\plushundred % don't set
+%         \t_spac_align_collected\expandafter{\the\t_spac_align_collected#2}}%
+%    \fi}
+%
+% \installalignoption
+%   {whatever}
+%   {}
+
+% The keywords:
+
 \letvalue{\??aligncommand\empty            }\empty
 \setvalue{\??aligncommand\v!broad          }{\c_spac_align_state_broad     \plusone  }
 \setvalue{\??aligncommand\v!wide           }{\c_spac_align_state_broad     \plustwo  }
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 7573c7b4d..7782770b4 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 03156b345..e1fb8dcc7 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 751d8b9d3..5255cd5d0 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  : 01/06/14 23:46:25
+-- merge date  : 01/07/14 01:06:05
 
 do -- begin closure to overcome local limits and interference