beta 2012.07.18 10:29

12 files changed, 32 insertions, 20 deletions

diff --git a/tex/context/base/char-def.lua b/tex/context/base/char-def.lua
index 3c8f9d5d9..e5cd73940 100644
--- a/tex/context/base/char-def.lua
+++ b/tex/context/base/char-def.lua
@@ -58673,7 +58673,7 @@ characters.data={
   description="TURNED AMPERSAND",
   direction="on",
   linebreak="al",
-  mathclass="bin",
+  mathclass="binary",
   mathname="upand",
   unicodeslot=0x214B,
  },
@@ -60891,11 +60891,11 @@ characters.data={
   linebreak="ai",
   mathspec={
    {
-    class="bin",
+    class="binary",
     name="vee",
    },
    {
-    class="bin",
+    class="binary",
     name="lor",
    },
   },
@@ -62406,7 +62406,7 @@ characters.data={
   description="NORMAL SUBGROUP OF",
   direction="on",
   linebreak="al",
-  mathclass="bin",
+  mathclass="binary",
   mirror=0x22B3,
   unicodeslot=0x22B2,
  },
@@ -62416,7 +62416,7 @@ characters.data={
   description="CONTAINS AS NORMAL SUBGROUP",
   direction="on",
   linebreak="al",
-  mathclass="bin",
+  mathclass="binary",
   mirror=0x22B2,
   unicodeslot=0x22B3,
  },
@@ -68392,6 +68392,8 @@ characters.data={
   description="BLACK UP-POINTING TRIANGLE",
   direction="on",
   linebreak="ai",
+  mathclass="binary",
+  mathname="blacktriangle",
   unicodeslot=0x25B2,
  },
  [0x25B3]={
@@ -68436,7 +68438,7 @@ characters.data={
   description="BLACK RIGHT-POINTING TRIANGLE",
   direction="on",
   linebreak="ai",
-  mathclass="bin",
+  mathclass="binary",
   mathname="blacktriangleright",
   unicodeslot=0x25B6,
  },
@@ -68447,7 +68449,7 @@ characters.data={
   description="WHITE RIGHT-POINTING TRIANGLE",
   direction="on",
   linebreak="ai",
-  mathclass="bin",
+  mathclass="binary",
   mathname="triangleright",
   unicodeslot=0x25B7,
  },
@@ -68456,8 +68458,6 @@ characters.data={
   description="BLACK RIGHT-POINTING SMALL TRIANGLE",
   direction="on",
   linebreak="al",
-  mathclass="bin",
-  mathname="blacktriangleleft",
   unicodeslot=0x25B8,
  },
  [0x25B9]={
@@ -68490,6 +68490,8 @@ characters.data={
   description="BLACK DOWN-POINTING TRIANGLE",
   direction="on",
   linebreak="ai",
+  mathclass="binary",
+  mathname="blacktriangledown",
   unicodeslot=0x25BC,
  },
  [0x25BD]={
@@ -68499,8 +68501,16 @@ characters.data={
   description="WHITE DOWN-POINTING TRIANGLE",
   direction="on",
   linebreak="ai",
-  mathclass="binary",
-  mathname="bigtriangledown",
+  mathspec={
+   {
+    class="binary",
+    name="triangledown",
+   },
+   {
+    class="binary",
+    name="bigtriangledown",
+   },
+  },
   unicodeslot=0x25BD,
  },
  [0x25BE]={
@@ -68525,6 +68535,8 @@ characters.data={
   description="BLACK LEFT-POINTING TRIANGLE",
   direction="on",
   linebreak="ai",
+  mathclass="binary",
+  mathname="blacktriangleleft",
   unicodeslot=0x25C0,
  },
  [0x25C1]={
@@ -68534,7 +68546,7 @@ characters.data={
   description="WHITE LEFT-POINTING TRIANGLE",
   direction="on",
   linebreak="ai",
-  mathclass="bin",
+  mathclass="binary",
   mathname="triangleleft",
   unicodeslot=0x25C1,
  },
diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index 7ec44d2eb..35f5d420c 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{2012.07.17 16:42}
+\newcontextversion{2012.07.18 10:29}
 
 %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 4a0b05102..0b8fa0677 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{2012.07.17 16:42}
+\newcontextversion{2012.07.18 10:29}
 
 %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/context-version.pdf b/tex/context/base/context-version.pdf
index 75a91cef5..56217d7b6 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 52f10ed09..f7b3dd753 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 ea8dbda6b..ded3254c7 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{2012.07.17 16:42}
+\edef\contextversion{2012.07.18 10:29}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index d07eddc07..e7a005517 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{2012.07.17 16:42}
+\edef\contextversion{2012.07.18 10:29}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/math-vfu.lua b/tex/context/base/math-vfu.lua
index 21b101894..02de7efd6 100644
--- a/tex/context/base/math-vfu.lua
+++ b/tex/context/base/math-vfu.lua
@@ -1358,7 +1358,7 @@ mathencodings["tex-ma"] = {
     --  [0x0] = 0x4C, -- arrowaxisleft
     [0x025B2] = 0x4D, -- triangle              \triangleup \vartriangle
     [0x025B2] = 0x4E, -- trianglesolid         \blacktriangle
-    [0x025BC] = 0x4F, -- triangleinv           \triangledown
+    [0x025BD] = 0x4F, -- triangleinv           \triangledown
     [0x02256] = 0x50, -- ringinequal           \eqcirc
     [0x022DA] = 0x51, -- lessequalgreater      \lesseqgtr
     [0x022DB] = 0x52, -- greaterlessequal      \gtreqless
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 6f6736e91..a1f9c98a0 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 6499327bd..00593e152 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/context/base/strc-sec.mkiv b/tex/context/base/strc-sec.mkiv
index f67921ce3..9177c9f57 100644
--- a/tex/context/base/strc-sec.mkiv
+++ b/tex/context/base/strc-sec.mkiv
@@ -924,8 +924,8 @@
    \ifx\p_text\empty \else
      \doifelselayouttextline\v!text  {\normalexpanded{\setuplayouttext[\v!text  ][\c!state=\p_text  ]}}\donothing
    \fi
-   \edef\p_header{\headparameter\c!footer}%
-   \ifx\p_header\empty \else
+   \edef\p_footer{\headparameter\c!footer}%
+   \ifx\p_footer\empty \else
      \doifelselayouttextline\v!footer{\normalexpanded{\setuplayouttext[\v!footer][\c!state=\p_footer]}}\donothing
    \fi}
 
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index b6eabbeb4..4401ff181 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  : 07/17/12 16:42:27
+-- merge date  : 07/18/12 10:29:39
 
 do -- begin closure to overcome local limits and interference