beta 2013.04.15 22:30

11 files changed, 23 insertions, 66 deletions

diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 5286fb829..eb38ed86a 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{2013.04.15 10:36}
+\newcontextversion{2013.04.15 22:30}
 
 %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 fdab10f7e..086a2ca97 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
diff --git a/tex/context/base/context-version.png b/tex/context/base/context-version.png
index 499f3fd4c..5a5146bbd 100644
--- a/tex/context/base/context-version.png
+++ b/tex/context/base/context-version.png
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 5a6df19ef..772483ed2 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -25,7 +25,7 @@
 %D up and the dependencies are more consistent.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2013.04.15 10:36}
+\edef\contextversion{2013.04.15 22:30}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/math-frc.lua b/tex/context/base/math-frc.lua
deleted file mode 100644
index 4f531a530..000000000
--- a/tex/context/base/math-frc.lua
+++ /dev/null
@@ -1,51 +0,0 @@
-if not modules then modules = { } end modules ['math-frc'] = {
-    version   = 1.001,
-    comment   = "companion to math-frc.mkiv",
-    author    = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
-    copyright = "PRAGMA ADE / ConTeXt Development Team",
-    license   = "see context related readme files"
-}
-
-local utfchar = utf.char
-
-local context = context
-local variables = interfaces.variables
-
-local v_no  = variables.no
-local v_yes = variables.yes
-
-local resolved = {
-    [0x007B] = "\\{",
-    [0x007D] = "\\}",
-}
-
-table.setmetatableindex(resolved, function(t,k)
-    local v = utfchar(k)
-    t[k] = v
-    return v
-end)
-
-local normalatop = context.normalatop
-local normalover = context.normalover
-
-function commands.math_frac(how,left,right,width)
-    if how == v_no then
-        if left == 0x002E and right == 0x002E then
-            normalatop()
-        else
-            context("\\atopwithdelims%s%s",resolved[left],resolved[right])
-        end
-    elseif how == v_yes then
-        if left == 0x002E and right == 0x002E then
-            context("\\normalabove%ssp",width)
-        else
-            context("\\abovewithdelims%s%s%ssp",resolved[left],resolved[right],width)
-        end
-    else -- v_auto
-        if left == 0x002E and right == 0x002E then
-            normalover()
-        else
-            context("\\overwithdelims%s%s",resolved[left],resolved[right])
-        end
-    end
-end
diff --git a/tex/context/base/pack-com.mkiv b/tex/context/base/pack-com.mkiv
index 626410bc5..5ac56d07e 100644
--- a/tex/context/base/pack-com.mkiv
+++ b/tex/context/base/pack-com.mkiv
@@ -158,7 +158,7 @@
 \unexpanded\def\pack_common_caption_stop {\removeunwantedspaces\egroup}
 
 \unexpanded\def\stopcombination
-  {\bgroup\normalexpanded{\egroup{}\ctxcommand{ntimes("{}{}",\number\c_pack_combinations_n)}}%
+  {\bgroup\normalexpanded{\egroup{}\ctxcommand{ntimes("{}{}",\number\c_pack_combinations_n)}}% brr
    \dostoptagged
    \egroup
    \egroup}
@@ -171,13 +171,17 @@
    \edef\currentcombination{#1}%
    \edef\currentcombinationspec{#2}%
    \ifx\currentcombinationspec\empty
-     \doifinstringelse{*}\currentcombination
-       {\edef\currentcombinationspec{\currentcombination*\plusone*}%
-        \let\currentcombination\empty}
-       {\doifnumberelse\currentcombination
+     \doifassignmentelse{#1}%
+       {\let\currentcombination\empty
+        \setupcurrentcombination[#1]%
+        \edef\currentcombinationspec{\combinationparameter\c!nx*\combinationparameter\c!ny*}}
+       {\doifinstringelse{*}\currentcombination
           {\edef\currentcombinationspec{\currentcombination*\plusone*}%
            \let\currentcombination\empty}
-          {\edef\currentcombinationspec{\combinationparameter\c!nx*\combinationparameter\c!ny*}}}%
+          {\doifnumberelse\currentcombination
+             {\edef\currentcombinationspec{\currentcombination*\plusone*}%
+              \let\currentcombination\empty}
+             {\edef\currentcombinationspec{\combinationparameter\c!nx*\combinationparameter\c!ny*}}}}%
    \else
      \doifassignmentelse{#2}%
        {\setupcurrentcombination[#2]%
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index d85682e58..dedcf1683 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 87bf2df81..04de078cc 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/context/base/strc-not.lua b/tex/context/base/strc-not.lua
index b3a50c0d6..882e00a44 100644
--- a/tex/context/base/strc-not.lua
+++ b/tex/context/base/strc-not.lua
@@ -125,7 +125,10 @@ local function setstate(tag,newkind)
             state.kind = newkind
         end
     else
+-- if newkind == "postpone" and state.kind == "store" then
+-- else
         state.kind = newkind
+-- end
     end
     --  state.start can already be set and will be set when an entry is added or flushed
     return state
diff --git a/tex/context/base/strc-not.mkvi b/tex/context/base/strc-not.mkvi
index 09ea41bc4..921bd0373 100644
--- a/tex/context/base/strc-not.mkvi
+++ b/tex/context/base/strc-not.mkvi
@@ -17,8 +17,8 @@
 
 \unprotect
 
+% todo: finish local rendering
 % todo: more p_strc_notations_* (outside trial loop)
-
 % todo: see if we can now use \insertpenalties (>0 == some left)
 
 \ifdefined\dotagsetnotesymbol \else \let\dotagsetnotesymbol\relax \fi
@@ -37,12 +37,12 @@
 % textcommand/textstyle/textcolor : set by note commandhandler and used for inline number
 
 %D \macros
-%D   {setupnote,setupnotedefinition}
+%D   {setupnote,setupnotation}
 %D
 %D We can influence footnote typesetting with the setup
 %D command:
 %D
-%D \showsetup{setupnotes}
+%D \showsetup{setupnotation}
 %D \showsetup{setupnote}
 %D
 %D The definition command indicate that we can frame the footnote
@@ -1476,7 +1476,7 @@
 %D These commands can be used like:
 %D
 %D \startbuffer
-%D \startlocalnotes[width=.3\hsize,n=0]
+%D \startlocalnotes[footnote]
 %D   \placetable
 %D     {Some Table}
 %D     \placeontopofeachother
@@ -1486,7 +1486,8 @@
 %D        \VL Bene\footnote{Nota} \VL Nota\footnote{Bene} \VL\SR
 %D        \HL
 %D        \stoptable}
-%D       {\placelocalnotes}
+%D       {\setupnotation[footnote][alternative={serried},distance=.5em,after=\hskip1em]%
+%D        \placelocalnotes[footnote]}
 %D \stoplocalnotes
 %D \stopbuffer
 %D
@@ -1728,7 +1729,7 @@
 
 %D Compatibility macros:
 
-\unexpanded\def\setupfootnotedefinition{\setupnotedefinition                           [\v!footnote]}
+\unexpanded\def\setupfootnotedefinition{\setupnotation                                 [\v!footnote]}
 \unexpanded\def\setupfootnotes         {\setupnote                                     [\v!footnote]}
            \def\footnotetext           {\setnotetext                                   [\v!footnote]}
 \unexpanded\def\placefootnotes         {\dodoubleempty\strc_notes_place_footnotes      [\v!footnote]}
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index bfd187ae0..e8fbba356 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  : 04/15/13 10:36:49
+-- merge date  : 04/15/13 22:30:29
 
 do -- begin closure to overcome local limits and interference