beta 2013.01.24 16:47

11 files changed, 26 insertions, 15 deletions

diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index f6eb3500b..54caea4b5 100644
--- a/tex/context/base/cont-new.mkii
+++ b/tex/context/base/cont-new.mkii
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2013.01.24 10:07}
+\newcontextversion{2013.01.24 16:47}
 
 %D This file is loaded at runtime, thereby providing an
 %D excellent place for hacks, patches, extensions and new
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 1c5857a94..e741bc444 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.01.24 10:07}
+\newcontextversion{2013.01.24 16:47}
 
 %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 d6eb39e6a..b458d0e4b 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 855af435f..4eaf49515 100644
--- a/tex/context/base/context-version.png
+++ b/tex/context/base/context-version.png
diff --git a/tex/context/base/context.mkii b/tex/context/base/context.mkii
index cd74f1876..a2bad2e0f 100644
--- a/tex/context/base/context.mkii
+++ b/tex/context/base/context.mkii
@@ -20,7 +20,7 @@
 %D your styles an modules.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2013.01.24 10:07}
+\edef\contextversion{2013.01.24 16:47}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 4c516968d..df4918a3c 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.01.24 10:07}
+\edef\contextversion{2013.01.24 16:47}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/math-ini.mkiv b/tex/context/base/math-ini.mkiv
index 6cd084a38..25ae27d0f 100644
--- a/tex/context/base/math-ini.mkiv
+++ b/tex/context/base/math-ini.mkiv
@@ -373,11 +373,11 @@
 \let\math_tags_mo\firstofoneunexpanded
 \let\math_tags_mi\firstofoneunexpanded
 
-\unexpanded\def\math_tags_mn#1{\begingroup\mr#1\endgroup}
-\unexpanded\def\math_tags_ms#1{\begingroup\mr#1\endgroup}
+\unexpanded\def\math_tags_mn#1{\begingroup\mathupright#1\endgroup}
+\unexpanded\def\math_tags_ms#1{\begingroup\mathupright#1\endgroup}
 
-\unexpanded\def\mfunction         #1{{\mr\math_tags_function{#1}}}
-\unexpanded\def\mfunctionlabeltext#1{{\mr\math_tags_functionlabeltext{#1}}}
+\unexpanded\def\mfunction         #1{{\mathupright\math_tags_function{#1}}}
+\unexpanded\def\mfunctionlabeltext#1{{\mathupright\math_tags_functionlabeltext{#1}}}
 
 % Once this is stable we can store the number at the tex end which is
 % faster. Functions getnumbers >= 1000.
@@ -385,10 +385,10 @@
 \expanded\def\math_tags_mathfunction_indeed         #1{\ctxcommand{taggedmathfunction("#1",false,\ifconditional\c_apply_function true\else false\fi)}}
 \expanded\def\math_tags_mathfunctionlabeltext_indeed#1{\ctxcommand{taggedmathfunction("#1",true ,\ifconditional\c_apply_function true\else false\fi)}}
 
-\expanded\def\math_tags_mo_indeed#1{\begingroup   \attribute\mathcategoryattribute\plusone  #1\endgroup}
-\expanded\def\math_tags_mi_indeed#1{\begingroup   \attribute\mathcategoryattribute\plustwo  #1\endgroup}
-\expanded\def\math_tags_mn_indeed#1{\begingroup\mr\attribute\mathcategoryattribute\plusthree#1\endgroup}
-\expanded\def\math_tags_ms_indeed#1{\begingroup\mr\attribute\mathcategoryattribute\plusfour #1\endgroup}
+\expanded\def\math_tags_mo_indeed#1{\begingroup            \attribute\mathcategoryattribute\plusone  #1\endgroup}
+\expanded\def\math_tags_mi_indeed#1{\begingroup            \attribute\mathcategoryattribute\plustwo  #1\endgroup}
+\expanded\def\math_tags_mn_indeed#1{\begingroup\mathupright\attribute\mathcategoryattribute\plusthree#1\endgroup}
+\expanded\def\math_tags_ms_indeed#1{\begingroup\mathupright\attribute\mathcategoryattribute\plusfour #1\endgroup}
 
 \newconditional\c_apply_function
 
diff --git a/tex/context/base/node-ini.lua b/tex/context/base/node-ini.lua
index 74a039cf5..3caeb69dd 100644
--- a/tex/context/base/node-ini.lua
+++ b/tex/context/base/node-ini.lua
@@ -161,6 +161,15 @@ local margincodes = allocate {
     [1] = "right",
 }
 
+local disccodes = allocate {
+    [0] = "discretionary", -- \discretionary
+    [1] = "explicit",      -- \-
+    [2] = "automatic",     -- following a -
+    [3] = "regular",       -- simple
+    [4] = "first",         -- hard first item
+    [5] = "second",        -- hard second item
+}
+
 local function simplified(t)
     local r = { }
     for k, v in next, t do
@@ -183,11 +192,12 @@ penaltycodes = allocate(swapped(penaltycodes,penaltycodes))
 mathcodes    = allocate(swapped(mathcodes,mathcodes))
 fillcodes    = allocate(swapped(fillcodes,fillcodes))
 margincodes  = allocate(swapped(margincodes,margincodes))
+disccodes    = allocate(swapped(disccodes,disccodes))
 
-nodes.skipcodes    = skipcodes  nodes.gluecodes    = skipcodes -- more official
+nodes.skipcodes    = skipcodes     nodes.gluecodes    = skipcodes -- more official
 nodes.noadcodes    = noadcodes
 nodes.nodecodes    = nodecodes
-nodes.whatcodes    = whatcodes  nodes.whatsitcodes = whatcodes -- more official
+nodes.whatcodes    = whatcodes     nodes.whatsitcodes = whatcodes -- more official
 nodes.listcodes    = listcodes
 nodes.glyphcodes   = glyphcodes
 nodes.kerncodes    = kerncodes
@@ -195,6 +205,7 @@ nodes.penaltycodes = kerncodes
 nodes.mathcodes    = mathcodes
 nodes.fillcodes    = fillcodes
 nodes.margincodes  = margincodes
+nodes.disccodes    = disccodes     nodes.discretionarycodes = disccodes
 
 listcodes.row              = listcodes.alignment
 listcodes.column           = listcodes.alignment
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 96c69f619..e5a0ac4cc 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 5c9fd38ca..eae5bc446 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 2e719bfa8..d018e349b 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/24/13 10:07:12
+-- merge date  : 01/24/13 16:47:41
 
 do -- begin closure to overcome local limits and interference