beta 2010.03.02 12:34

8 files changed, 321 insertions, 89 deletions

diff --git a/tex/context/base/bibl-bib.lua b/tex/context/base/bibl-bib.lua
index 4fe41caa9..b3199a506 100644
--- a/tex/context/base/bibl-bib.lua
+++ b/tex/context/base/bibl-bib.lua
@@ -30,6 +30,10 @@ local shortcuts = { }
 local data      = { }
 local entries
 
+-- Currently we expand shortcuts and for large ones (like the acknowledgements
+-- in tugboat.bib this is not that efficient. However, eventually stings get
+-- hashed again.
+
 local function do_shortcut(tag,key,value)
     bibtex.shortcuts = bibtex.shortcuts + 1
     if lower(tag) == "@string" then
diff --git a/tex/context/base/cont-new.tex b/tex/context/base/cont-new.tex
index aadc97bdf..aada1b888 100644
--- a/tex/context/base/cont-new.tex
+++ b/tex/context/base/cont-new.tex
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2010.03.01 23:24}
+\newcontextversion{2010.03.02 12:34}
 
 %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.tex b/tex/context/base/context.tex
index 56f2c37ad..6a89f4cfe 100644
--- a/tex/context/base/context.tex
+++ b/tex/context/base/context.tex
@@ -20,7 +20,7 @@
 %D your styles an modules.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2010.03.01 23:24}
+\edef\contextversion{2010.03.02 12:34}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/math-lbr.mkii b/tex/context/base/math-lbr.mkii
index 05a422cba..cf69eec1f 100644
--- a/tex/context/base/math-lbr.mkii
+++ b/tex/context/base/math-lbr.mkii
@@ -376,21 +376,52 @@
 
 % we define the whole lot, although only a few differ (esp dot)
 
-\startmathcollection[lbr]
+% \startmathcollection[lbr]
+% 
+% \definemathsymbol [acute]     [accent] [tf] ["13] % mr -> tf
+% \definemathsymbol [grave]     [accent] [tf] ["12] % mr -> tf
+% \definemathsymbol [ddot]      [accent] [tf] ["7F] % mr -> tf
+% \definemathsymbol [tilde]     [accent] [tf] ["7E] % mr -> tf
+% \definemathsymbol [bar]       [accent] [tf] ["16] % mr -> tf
+% \definemathsymbol [breve]     [accent] [tf] ["15] % mr -> tf
+% \definemathsymbol [check]     [accent] [tf] ["14] % mr -> tf
+% \definemathsymbol [hat]       [accent] [tf] ["5E] % mr -> tf
+% \definemathsymbol [vec]       [accent] [mi] ["7E] % [ord]
+% \definemathsymbol [dot]       [accent] [tf] ["05] % mr -> tf, 5F -> 05
+% \definemathsymbol [widetilde] [accent] [ex] ["65] % [ord]
+% \definemathsymbol [widehat]   [accent] [ex] ["62] % [ord]
+% 
+% \stopmathcollection
 
-\definemathsymbol [acute]     [accent] [tf] ["13] % mr -> tf
-\definemathsymbol [grave]     [accent] [tf] ["12] % mr -> tf
-\definemathsymbol [ddot]      [accent] [tf] ["7F] % mr -> tf
-\definemathsymbol [tilde]     [accent] [tf] ["7E] % mr -> tf
-\definemathsymbol [bar]       [accent] [tf] ["16] % mr -> tf
-\definemathsymbol [breve]     [accent] [tf] ["15] % mr -> tf
-\definemathsymbol [check]     [accent] [tf] ["14] % mr -> tf
-\definemathsymbol [hat]       [accent] [tf] ["5E] % mr -> tf
-\definemathsymbol [vec]       [accent] [mi] ["7E] % [ord]
-\definemathsymbol [dot]       [accent] [tf] ["05] % mr -> tf, 5F -> 05
-\definemathsymbol [widetilde] [accent] [ex] ["65] % [ord]
-\definemathsymbol [widehat]   [accent] [ex] ["62] % [ord]
+\startmathcollection[lbr:texnansi]
+	\definemathsymbol [acute]    [accent] [tf] ["13]
+	\definemathsymbol [grave]    [accent] [tf] ["12]
+	\definemathsymbol [ddot]     [accent] [tf] ["7F]
+	%definemathsymbol [ddot]     [accent] [tf] ["A8] % both is OK
+	\definemathsymbol [tilde]    [accent] [tf] ["7E]
+	%definemathsymbol [tilde]    [accent] [tf] ["98] % both is OK
+	\definemathsymbol [bar]      [accent] [tf] ["16]
+	\definemathsymbol [breve]    [accent] [tf] ["15]
+	\definemathsymbol [check]    [accent] [tf] ["14]
+	\definemathsymbol [hat]      [accent] [tf] ["5E]
+	%definemathsymbol [hat]      [accent] [tf] ["88] % both is OK
+	\definemathsymbol [dot]      [accent] [tf] ["05]
+	% Why is mathring not defined??
+	\definemathsymbol [mathring] [accent] [tf] ["17]
+\stopmathcollection
 
+\startmathcollection[lbr:ec]
+	\definemathsymbol [acute]    [accent] [tf] ["01]
+	\definemathsymbol [grave]    [accent] [tf] ["00]
+	\definemathsymbol [ddot]     [accent] [tf] ["04]
+	\definemathsymbol [tilde]    [accent] [tf] ["03]
+	\definemathsymbol [bar]      [accent] [tf] ["09]
+	\definemathsymbol [breve]    [accent] [tf] ["08]
+	\definemathsymbol [check]    [accent] [tf] ["07]
+	\definemathsymbol [hat]      [accent] [tf] ["02]
+	\definemathsymbol [dot]      [accent] [tf] ["0A]
+	% Why is mathring not defined??
+	\definemathsymbol [mathring] [accent] [tf] ["06]
 \stopmathcollection
 
 \def\LBRroot#1#2%
diff --git a/tex/context/base/math-vfu.lua b/tex/context/base/math-vfu.lua
index 6ed0a6abe..c209d52ef 100644
--- a/tex/context/base/math-vfu.lua
+++ b/tex/context/base/math-vfu.lua
@@ -1715,95 +1715,285 @@ mathematics.make_font ( "hvmath-math", {
 
 -- the lucida mess
 
+--~ fonts.enc.math["lbr-ma"] = {
+--~     [0x000A5] = 0x03, -- yen
+--~     [0x000B7] = 0xE1, -- centerdot
+--~     [0x000F0] = 0x03, -- eth
+--~     [0x00127] = 0x1B, -- hbar
+--~     [0x003DC] = 0x03, -- digamma
+--~     [0x003F6] = 0x03, -- backepsilon
+--~     [0x0219A] = 0x32, -- nleftarrow
+--~     [0x0219B] = 0x33, -- nrightarrow
+--~     [0x0219E] = 0x23, -- twoheadleftarrow
+--~     [0x021A0] = 0x25, -- twoheadrightarrow
+--~     [0x021A2] = 0x28, -- leftarrowtail
+--~     [0x021A3] = 0x29, -- rightarrowtail
+--~     [0x021A6] = 0x2C, -- mapsto
+--~     [0x021A9] = 0x3C, -- hookleftarrow
+--~     [0x021AA] = 0x3E, -- hookrightarrow
+--~     [0x021AB] = 0x3F, -- looparrowleft
+--~     [0x021AC] = 0x40, -- looparrowright
+--~     [0x021AD] = 0x91, -- leftrightsquigarrow
+--~     [0x021AE] = 0x34, -- nleftrightarrow
+--~     [0x021B0] = 0x7B, -- Lsh
+--~     [0x021B1] = 0x7D, -- Rsh
+--~     [0x021B6] = 0x87, -- curvearrowleft
+--~     [0x021B7] = 0x88, -- curvearrowright
+--~     [0x021BA] = 0x8C, -- circlearrowright
+--~     [0x021BB] = 0x8B, -- circlearrowleft
+--~     [0x021BF] = 0x76, -- upharpoonleft
+--~     [0x021C2] = 0x77, -- downharpoonright
+--~     [0x021C3] = 0x78, -- downharpoonleft
+--~     [0x021C4] = 0x6D, -- rightleftarrows
+--~     [0x021C6] = 0x6E, -- leftrightarrows
+--~     [0x021C7] = 0x71, -- leftleftarrows
+--~     [0x021C8] = 0x72, -- upuparrows
+--~     [0x021C9] = 0x73, -- rightrightarrows
+--~     [0x021CA] = 0x74, -- downdownarrows
+--~     [0x021CB] = 0x79, -- leftrightharpoons
+--~     [0x021CC] = 0x7A, -- rightleftharpoons
+--~     [0x021CD] = 0x66, -- nLeftarrow
+--~     [0x021CE] = 0x67, -- nLeftrightarrow
+--~     [0x021CF] = 0x68, -- nRightarrow
+--~     [0x021DA] = 0x6A, -- Lleftarrow
+--~     [0x021DB] = 0x6C, -- Rrightarrow
+--~     [0x021E0] = 0x38, -- dashleftarrow
+--~     [0x02204] = 0x20, -- nexists
+--~     [0x02226] = 0xF7, -- nparallel
+--~     [0x02241] = 0x96, -- nsim
+--~     [0x02268] = 0xDC, -- lneqq
+--~     [0x02269] = 0xDE, -- gneqq
+--~     [0x0226E] = 0x9A, -- nless
+--~     [0x0226F] = 0x9B, -- ngtr
+--~     [0x02270] = 0x9C, -- nleq
+--~     [0x02271] = 0x9D, -- ngeq
+--~     [0x02280] = 0xE5, -- nprec
+--~     [0x02281] = 0xE6, -- nsucc
+--~     [0x02288] = 0xC8, -- nsubseteq
+--~     [0x02289] = 0xC9, -- nsupseteq
+--~     [0x0228A] = 0xCC, -- subsetneq
+--~     [0x0228B] = 0xCD, -- supsetneq
+--~     [0x022AC] = 0xF8, -- nvdash
+--~     [0x022AD] = 0xFA, -- nvDash
+--~     [0x022AE] = 0xF9, -- nVdash
+--~     [0x022AF] = 0xFB, -- nVDash
+--~     [0x022BA] = 0x03, -- intercal
+--~     [0x022D4] = 0xF3, -- pitchfork
+--~     [0x022E6] = 0xE0, -- lnsim
+--~     [0x022E7] = 0xE2, -- gnsim
+--~     [0x022E8] = 0xEB, -- precnsim
+--~     [0x022E9] = 0xEC, -- succnsim
+--~     [0x022EA] = 0xF0, -- ntriangleright
+--~     [0x022EB] = 0xEF, -- ntriangleleft
+--~     [0x022EC] = 0xF1, -- ntrianglelefteq
+--~     [0x022ED] = 0xF2, -- ntrianglerighteq
+--~     [0x0231C] = 0x5B, -- ulcorner
+--~     [0x0231D] = 0x5C, -- urcorner
+--~     [0x0231E] = 0x5D, -- llcorner
+--~     [0x0231F] = 0x5E, -- lrcorner
+--~     [0x025A2] = 0x03, -- blacksquare
+--~     [0x02605] = 0xAB, -- bigstar
+--~     [0x02713] = 0xAC, -- checkmark
+--~     [0x029EB] = 0x09, -- blacklozenge
+--~     [0x02A87] = 0xDA, -- lneq
+--~     [0x02A89] = 0xE4, -- lnapprox
+--~     [0x02A8A] = 0xE3, -- gnapprox
+--~     [0x02AB5] = 0xE9, -- precneqq
+--~     [0x02AB6] = 0xEA, -- succneqq
+--~     [0x02AB9] = 0xED, -- precnapprox
+--~     [0x02ABA] = 0xEE, -- succnapprox
+--~     [0x02ACB] = 0xCE, -- subsetneqq
+--~     [0x02ACC] = 0xCF, -- supsetneqq
+--~ }
+
 fonts.enc.math["lbr-ma"] = {
-    [0x000A5] = 0x03, -- yen
-    [0x000B7] = 0xE1, -- centerdot
-    [0x000F0] = 0x03, -- eth
+    [0x025CB] = 0x00, -- circle
+    [0x025CF] = 0x01, -- blackcircle
+    [0x025A1] = 0x02, -- square
+    [0x025A0] = 0x03, -- blacksquare
+    [0x025B3] = 0x04, -- triangleup
+    [0x025B2] = 0x05, -- blacktriangleup
+    [0x025BD] = 0x06, -- triangledown
+    [0x025BC] = 0x07, -- blacktriangledown
+    [0x02B28] = 0x08, -- lozenge
+    [0x02B27] = 0x09, -- blacklozenge
+    [0x02B29] = 0x0A, -- blackdiamond
+    [0x02571] = 0x0B, -- upright
+    [0x02572] = 0x0C, -- downright
+    [0x022E4] = 0x0D, -- squareimageofnoteq
+    [0x022E5] = 0x0E, -- squareoriginalofnoteq
+    [0x02A4F] = 0x0F, -- dblsquareunion
+    [0x02A4E] = 0x10, -- dblsquareintersection
+    [0x02A64] = 0x11, -- zdomainantirestriction
+    [0x02A65] = 0x12, -- zrangeantirestriction
+    [0x022EE] = 0x13, -- verticalellipsis
+    [0x022EF] = 0x14, -- ellipsis
+    [0x022F0] = 0x15, -- uprightellipsis
+    [0x022F1] = 0x16, -- downrightellipsis
+    [0x022D5] = 0x17, -- equalparallel
+
+    [0x0225B] = 0x1A, -- stareq
     [0x00127] = 0x1B, -- hbar
-    [0x003DC] = 0x03, -- digamma
-    [0x003F6] = 0x03, -- backepsilon
-    [0x0219A] = 0x32, -- nleftarrow
-    [0x0219B] = 0x33, -- nrightarrow
-    [0x0219E] = 0x23, -- twoheadleftarrow
-    [0x021A0] = 0x25, -- twoheadrightarrow
+    [0x022F6] = 0x1C, -- barelementof
+    [0x02209] = 0x1D, -- notelementof
+    [0x022FD] = 0x1E, -- barcontains
+    [0x0220C] = 0x1F, -- notcontain
+    [0x02204] = 0x20, -- nexists
+    [0x02194] = 0x21, -- leftrightarrow
+    [0x02195] = 0x22, -- updownarrow
+    [0x0219E] = 0x23, -- leftleftarrow
+    [0x0219F] = 0x24, -- upuparrow
+    [0x021A0] = 0x25, -- rightrightarrow
+--  [0x00026] = 0x26, -- amperand
+    [0x021A1] = 0x27, -- downdownarrow
     [0x021A2] = 0x28, -- leftarrowtail
     [0x021A3] = 0x29, -- rightarrowtail
-    [0x021A6] = 0x2C, -- mapsto
+    [0x021A4] = 0x2A, -- leftarrowbar
+    [0x021A6] = 0x2B, -- rightarrowbar
+    [0x021A5] = 0x2C, -- uparrowbar
+--  [0x02212] = 0x2D, -- minus
+--  [0x0002D] = 0x2D, -- minus
+    [0x021A7] = 0x2E, -- downarrowbar
+    [0x021E4] = 0x2F, -- barleftarrow
+    [0x021E5] = 0x30, -- barrightarrow
+
+    [0x021E0] = 0x38, -- dashleftarrow
+    [0x021E1] = 0x39, -- dashuparrow
+    [0x021E2] = 0x3A, -- dashrightarrow
+    [0x021E3] = 0x3B, -- dashdownarrow
     [0x021A9] = 0x3C, -- hookleftarrow
+--  [0x0003D] = 0x3D, -- equalto
     [0x021AA] = 0x3E, -- hookrightarrow
     [0x021AB] = 0x3F, -- looparrowleft
     [0x021AC] = 0x40, -- looparrowright
-    [0x021AD] = 0x91, -- leftrightsquigarrow
-    [0x021AE] = 0x34, -- nleftrightarrow
-    [0x021B0] = 0x7B, -- Lsh
-    [0x021B1] = 0x7D, -- Rsh
-    [0x021B6] = 0x87, -- curvearrowleft
-    [0x021B7] = 0x88, -- curvearrowright
-    [0x021BA] = 0x8C, -- circlearrowright
-    [0x021BB] = 0x8B, -- circlearrowleft
-    [0x021BF] = 0x76, -- upharpoonleft
-    [0x021C2] = 0x77, -- downharpoonright
-    [0x021C3] = 0x78, -- downharpoonleft
-    [0x021C4] = 0x6D, -- rightleftarrows
-    [0x021C6] = 0x6E, -- leftrightarrows
-    [0x021C7] = 0x71, -- leftleftarrows
-    [0x021C8] = 0x72, -- upuparrows
-    [0x021C9] = 0x73, -- rightrightarrows
-    [0x021CA] = 0x74, -- downdownarrows
-    [0x021CB] = 0x79, -- leftrightharpoons
-    [0x021CC] = 0x7A, -- rightleftharpoons
+    [0x1D538] = 0x41, -- A                     (blackboard A)
+    [0x1D539] = 0x42, -- B
+    [0x02102] = 0x43, -- C
+    [0x1D53B] = 0x44, -- D
+    [0x1D53C] = 0x45, -- E
+    [0x1D53D] = 0x46, -- F
+    [0x1D53E] = 0x47, -- G
+    [0x0210D] = 0x48, -- H
+    [0x1D540] = 0x49, -- I
+    [0x1D541] = 0x4A, -- J
+    [0x1D542] = 0x4B, -- K
+    [0x1D543] = 0x4C, -- L
+    [0x1D544] = 0x4D, -- M
+    [0x02115] = 0x4E, -- N
+    [0x1D546] = 0x4F, -- O
+    [0x02119] = 0x50, -- P
+    [0x0211A] = 0x51, -- Q
+    [0x0211D] = 0x52, -- R
+    [0x1D54A] = 0x53, -- S
+    [0x1D54B] = 0x54, -- T
+    [0x1D54C] = 0x55, -- U
+    [0x1D54D] = 0x56, -- V
+    [0x1D54E] = 0x57, -- W
+    [0x1D54F] = 0x58, -- X
+    [0x1D550] = 0x59, -- Y
+    [0x02124] = 0x5A, -- Z                     (blackboard Z)
+    [0x0231C] = 0x5B, -- ulcorner
+    [0x0231D] = 0x5C, -- urcorner
+    [0x0231E] = 0x5D, -- llcorner
+    [0x0231F] = 0x5E, -- lrcorner
+    [0x02225] = 0x5F, -- parallel, Vert, lVert, rVert, arrowvert
+    [0x021D5] = 0x60, -- Updownarrow
+    [0x021D4] = 0x61, -- Leftrightarrow
+    [0x021D6] = 0x62, -- Upleftarrow
+    [0x021D7] = 0x63, -- Uprightarrow
+    [0x021D9] = 0x64, -- Downleftarrow
+    [0x021D8] = 0x65, -- Downrightarrow
     [0x021CD] = 0x66, -- nLeftarrow
     [0x021CE] = 0x67, -- nLeftrightarrow
     [0x021CF] = 0x68, -- nRightarrow
+--  [0x021CE] = 0x69, -- nLeftrightarrow -- what's the difference between this and 0x0067[0x021CE]
     [0x021DA] = 0x6A, -- Lleftarrow
+    [0x1D55C] = 0x6B, -- k                     \Bbbk (blackboard k)
     [0x021DB] = 0x6C, -- Rrightarrow
-    [0x021E0] = 0x38, -- dashleftarrow
-    [0x02204] = 0x20, -- nexists
-    [0x02226] = 0xF7, -- nparallel
-    [0x02241] = 0x96, -- nsim
-    [0x02268] = 0xDC, -- lneqq
-    [0x02269] = 0xDE, -- gneqq
+    [0x021C4] = 0x6D, -- rlarrow
+    [0x021C6] = 0x6E, -- lrarrow
+    [0x021C5] = 0x6F, -- udarrow
+--  [0x021C5] = 0x70, -- duarrow
+    [0x021C7] = 0x71, -- llarrow
+    [0x021C8] = 0x72, -- uuarrow
+    [0x021C9] = 0x73, -- rrarrow
+    [0x021CA] = 0x74, -- ddarrow
+    [0x021BE] = 0x75, -- rupharpoon
+    [0x021BF] = 0x76, -- lupharpoon
+    [0x021C2] = 0x77, -- rdownharpoon
+    [0x021C3] = 0x78, -- ldownharpoon
+    [0x021CB] = 0x79, -- lrharpoon
+    [0x021CC] = 0x7A, -- rlharpoon
+    [0x021B0] = 0x7B, -- upthenleftarrow
+--  [0x00000] = 0x7C, -- part
+    [0x021B1] = 0x7D, -- upthenrightarrow
+--  [0x00000] = 0x7E, -- part
+    [0x02276] = 0x7F, -- ltgt
+    [0x021B2] = 0x81, -- downthenleftarrow
+    [0x021B3] = 0x82, -- downthenrightarrow
+    [0x02B0E] = 0x83, -- rightthendownarrow
+    [0x02B10] = 0x84, -- leftthendownarrow
+    [0x02B0F] = 0x85, -- rightthenuparrow
+    [0x02B11] = 0x86, -- leftthenuparrow
+    [0x021B6] = 0x87, -- leftarcarrow
+    [0x021B7] = 0x88, -- rightarcarrow
+    [0x0293D] = 0x89, -- leftarcarrowplus
+    [0x0293C] = 0x8A, -- rightarcarrowminus
+    [0x021BA] = 0x8B, -- anticlockwise
+    [0x021BB] = 0x8C, -- clockwise
+
+    [0x02260] = 0x94, -- noteq
+    [0x02262] = 0x95, -- notidentical
+    [0x02241] = 0x96, -- nottilde
+    [0x02244] = 0x97, -- notasymptoticallyequal
+    [0x02249] = 0x98, -- notalmostequal
+    [0x02247] = 0x99, -- notapproximatelyeq
     [0x0226E] = 0x9A, -- nless
     [0x0226F] = 0x9B, -- ngtr
     [0x02270] = 0x9C, -- nleq
     [0x02271] = 0x9D, -- ngeq
-    [0x02280] = 0xE5, -- nprec
-    [0x02281] = 0xE6, -- nsucc
+    [0x022E6] = 0x9E, -- lnsim
+    [0x022E7] = 0x9F, -- gnsim
+    [0x02605] = 0xAB, -- black star
+    [0x02713] = 0xAC, -- check
+    [0x02277] = 0xC5, -- gtlt
+    [0x02284] = 0xC6, -- nsubsetof
+    [0x02285] = 0xC7, -- nsupsetof
     [0x02288] = 0xC8, -- nsubseteq
     [0x02289] = 0xC9, -- nsupseteq
+
     [0x0228A] = 0xCC, -- subsetneq
     [0x0228B] = 0xCD, -- supsetneq
-    [0x022AC] = 0xF8, -- nvdash
-    [0x022AD] = 0xFA, -- nvDash
-    [0x022AE] = 0xF9, -- nVdash
-    [0x022AF] = 0xFB, -- nVDash
-    [0x022BA] = 0x03, -- intercal
-    [0x022D4] = 0xF3, -- pitchfork
+
+--  [0x0228A] = 0xD0, -- subsetneq
+--  [0x0228B] = 0xD1, -- supsetneq
+
+    [0x02270] = 0xD6, -- nleq
+    [0x02271] = 0xD7, -- ngeq
+
+    [0x02268] = 0xDC, -- lneqq
+    [0x02269] = 0xDD, -- gneqq
+
     [0x022E6] = 0xE0, -- lnsim
+    [0x02219] = 0xE1, -- bullet
     [0x022E7] = 0xE2, -- gnsim
+
+    [0x02280] = 0xE5, -- nprec
+    [0x02281] = 0xE6, -- nsucc
+
     [0x022E8] = 0xEB, -- precnsim
     [0x022E9] = 0xEC, -- succnsim
-    [0x022EA] = 0xF0, -- ntriangleright
-    [0x022EB] = 0xEF, -- ntriangleleft
-    [0x022EC] = 0xF1, -- ntrianglelefteq
-    [0x022ED] = 0xF2, -- ntrianglerighteq
-    [0x0231C] = 0x5B, -- ulcorner
-    [0x0231D] = 0x5C, -- urcorner
-    [0x0231E] = 0x5D, -- llcorner
-    [0x0231F] = 0x5E, -- lrcorner
-    [0x025A2] = 0x03, -- blacksquare
-    [0x02605] = 0xAB, -- bigstar
-    [0x02713] = 0xAC, -- checkmark
-    [0x029EB] = 0x09, -- blacklozenge
-    [0x02A87] = 0xDA, -- lneq
-    [0x02A89] = 0xE4, -- lnapprox
-    [0x02A8A] = 0xE3, -- gnapprox
-    [0x02AB5] = 0xE9, -- precneqq
-    [0x02AB6] = 0xEA, -- succneqq
-    [0x02AB9] = 0xED, -- precnapprox
-    [0x02ABA] = 0xEE, -- succnapprox
-    [0x02ACB] = 0xCE, -- subsetneqq
-    [0x02ACC] = 0xCF, -- supsetneqq
+
+    [0x022EA] = 0xEF, -- nnormalsub
+    [0x022EB] = 0xF0, -- ncontainnormalsub
+    [0x022EC] = 0xF1, -- nnormalsubeq
+    [0x022ED] = 0xF2, -- ncontainnormalsubeq
+
+    [0x02226] = 0xF7, -- nparallel
+    [0x022AC] = 0xF8, -- nvdash
+    [0x022AE] = 0xF9, -- nVdash
+    [0x022AD] = 0xFA, -- nvDash
+    [0x022AF] = 0xFB, -- nVDash
 }
 
 fonts.enc.math["lbr-mb"] = {
diff --git a/tex/context/base/strc-not.mkiv b/tex/context/base/strc-not.mkiv
index 824fe3def..4f89ac4d6 100644
--- a/tex/context/base/strc-not.mkiv
+++ b/tex/context/base/strc-not.mkiv
@@ -631,13 +631,18 @@
        \endgroup
      \fi
    \fi
-   \ifconditional\skipnoteplacement \else
+%    \ifconditional\skipnoteplacement \else
+%      \kern\notesignal\relax % \relax is needed to honor spaces
+%      \iftrialtypesetting
+%        % todo: reserve some space for symbol, in that case we need to be able to roll back notes
+%      \else
+%        \global\setfalse\skipnoteplacement
+%      \fi
+%    \fi}
+   \ifconditional\skipnoteplacement
+     \global\setfalse\skipnoteplacement
+   \else
      \kern\notesignal\relax % \relax is needed to honor spaces
-     \iftrialtypesetting
-       % todo: reserve some space for symbol, in that case we need to be able to roll back notes
-     \else
-       \global\setfalse\skipnoteplacement
-     \fi
    \fi}
 
 \def\dolastnotesymbol
diff --git a/tex/context/base/type-one.mkii b/tex/context/base/type-one.mkii
index 71ca93cd9..17ba108cb 100644
--- a/tex/context/base/type-one.mkii
+++ b/tex/context/base/type-one.mkii
@@ -2390,7 +2390,7 @@
         \loadmapfile[lucida.map]
     \stoptypescript
 
-    \starttypescript [math] [lucida] [texnansi,ec,8r]
+    \starttypescript [math] [lucida] [default]
         \definefontsynonym [LucidaNewMath-AltItalic]     [hlcrima]
         \definefontsynonym [LucidaNewMath-Arrows]        [hlcra]
         \definefontsynonym [LucidaNewMath-Extension]     [hlcrv]
@@ -2398,10 +2398,11 @@
         \definefontsynonym [LucidaNewMath-Italic]        [hlcrim]
         \definefontsynonym [LucidaNewMath-Symbol]        [hlcry]
         \definefontsynonym [LucidaBlackletter]           [hlcrf8y] % what a mess
+        \usemathcollection[lbr]
         \loadmapfile [lucida.map]
     \stoptypescript
 
-    \starttypescript [boldmath,bfmath] [lucida] [texnansi,ec,8r]
+    \starttypescript [boldmath,bfmath] [lucida] [default]
         \definefontsynonym [LucidaNewMath-AltDemiItalic] [hlcdima]
         \definefontsynonym [LucidaNewMath-Arrows-Demi]   [hlcda]
         \definefontsynonym [LucidaNewMath-Extension]     [hlcrv]
@@ -2500,7 +2501,8 @@
     % Lucida Math
 
     \starttypescript [math] [lucida] [name]
-        \definefontsynonym [MathRoman]     [LucidaBright]
+        % \definefontsynonym [MathRoman]     [LucidaBright]
+        \definefontsynonym [MathRoman]     [LucidaNewMath-Roman]
         \definefontsynonym [MathExtension] [LucidaNewMath-Extension]
         \definefontsynonym [MathItalic]    [LucidaNewMath-AltItalic]
         \definefontsynonym [MathSymbol]    [LucidaNewMath-Symbol]
diff --git a/tex/generic/context/luatex-fonts-merged.lua b/tex/generic/context/luatex-fonts-merged.lua
index 58929f7e8..77600a7bd 100644
--- a/tex/generic/context/luatex-fonts-merged.lua
+++ b/tex/generic/context/luatex-fonts-merged.lua
@@ -1,6 +1,6 @@
 -- merged file : c:/data/develop/context/texmf/tex/generic/context/luatex-fonts-merged.lua
 -- parent file : c:/data/develop/context/texmf/tex/generic/context/luatex-fonts.lua
--- merge date  : 03/01/10 23:28:51
+-- merge date  : 03/02/10 12:39:47
 
 do -- begin closure to overcome local limits and interference