beta 2009.08.13 11:45

10 files changed, 42 insertions, 27 deletions

diff --git a/tex/context/base/cont-new.tex b/tex/context/base/cont-new.tex
index 6488ee2dc..097827145 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{2009.08.12 23:13}
+\newcontextversion{2009.08.13 11:45}
 
 %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 e91847fbf..33a26b752 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{2009.08.12 23:13}
+\edef\contextversion{2009.08.13 11:45}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/core-spa.mkiv b/tex/context/base/core-spa.mkiv
index c23799be3..5d7836f5b 100644
--- a/tex/context/base/core-spa.mkiv
+++ b/tex/context/base/core-spa.mkiv
@@ -1085,7 +1085,7 @@
 %      \unskip\unskip\unskip\unskip\unskip
 %    \fi}
 
-\def\removeunwantedspaces
+\unexpanded\def\removeunwantedspaces
   {\ifhmode
      \expandafter \doremoveunwantedspace
    \fi}
diff --git a/tex/context/base/math-vfu.lua b/tex/context/base/math-vfu.lua
index 02e749dee..fb5113be4 100644
--- a/tex/context/base/math-vfu.lua
+++ b/tex/context/base/math-vfu.lua
@@ -1312,7 +1312,7 @@ mathematics.make_font ( "lmroman5-math", {
     { name = "msam5.tfm", vector = "tex-ma" },
     { name = "msbm5.tfm", vector = "tex-mb" },
  -- { name = "rm-lmbx5.tfm", vector = "tex-bf" } ,
-    { name = "lmroman5-bold", "tex-bf" } ,
+    { name = "lmroman5-bold", vector = "tex-bf" } ,
     { name = "lmmib5.tfm", vector = "tex-bi", skewchar=0x7F } ,
     { name = "lmsans8-regular.otf", vector = "tex-ss", optional=true },
     { name = "lmmono8-regular.otf", vector = "tex-tt", optional=true },
@@ -1333,7 +1333,7 @@ mathematics.make_font ( "lmroman6-math", {
     { name = "msam5.tfm", vector = "tex-ma" },
     { name = "msbm5.tfm", vector = "tex-mb" },
  -- { name = "rm-lmbx6.tfm", vector = "tex-bf" } ,
-    { name = "lmroman6-bold.otf", "tex-bf" } ,
+    { name = "lmroman6-bold.otf", vector = "tex-bf" } ,
     { name = "lmmib5.tfm", vector = "tex-bi", skewchar=0x7F } ,
     { name = "lmsans8-regular.otf", vector = "tex-ss", optional=true },
     { name = "lmmono8-regular.otf", vector = "tex-tt", optional=true },
@@ -1357,7 +1357,7 @@ mathematics.make_font ( "lmroman7-math", {
     { name = "msam7.tfm", vector = "tex-ma" },
     { name = "msbm7.tfm", vector = "tex-mb" },
  -- { name = "rm-lmbx7.tfm", vector = "tex-bf" } ,
-    { name = "lmroman7-bold.otf", "tex-bf" } ,
+    { name = "lmroman7-bold.otf", vector = "tex-bf" } ,
     { name = "lmmib7.tfm", vector = "tex-bi", skewchar=0x7F } ,
     { name = "lmsans8-regular.otf", vector = "tex-ss", optional=true },
     { name = "lmmono8-regular.otf", vector = "tex-tt", optional=true },
@@ -1379,7 +1379,7 @@ mathematics.make_font ( "lmroman8-math", {
     { name = "msam7.tfm", vector = "tex-ma" },
     { name = "msbm7.tfm", vector = "tex-mb" },
  -- { name = "rm-lmbx8.tfm", vector = "tex-bf" } ,
-    { name = "lmroman8-bold.otf", "tex-bf" } ,
+    { name = "lmroman8-bold.otf", vector = "tex-bf" } ,
     { name = "lmmib7.tfm", vector = "tex-bi", skewchar=0x7F } ,
     { name = "lmsans8-regular.otf", vector = "tex-ss", optional=true },
     { name = "lmmono8-regular.otf", vector = "tex-tt", optional=true },
@@ -1401,7 +1401,7 @@ mathematics.make_font ( "lmroman9-math", {
     { name = "msam10.tfm", vector = "tex-ma" },
     { name = "msbm10.tfm", vector = "tex-mb" },
  -- { name = "rm-lmbx9.tfm", vector = "tex-bf" } ,
-    { name = "lmroman9-bold.otf", "tex-bf" } ,
+    { name = "lmroman9-bold.otf", vector = "tex-bf" } ,
     { name = "lmmib10.tfm", vector = "tex-bi", skewchar=0x7F } ,
     { name = "lmsans9-regular.otf", vector = "tex-ss", optional=true },
     { name = "lmmono9-regular.otf", vector = "tex-tt", optional=true },
@@ -1426,7 +1426,7 @@ mathematics.make_font ( "lmroman10-math", {
     { name = "msam10.tfm", vector = "tex-ma" },
     { name = "msbm10.tfm", vector = "tex-mb" },
  -- { name = "rm-lmbx10.tfm", vector = "tex-bf" } ,
-    { name = "lmroman10-bold.otf", "tex-bf" } ,
+    { name = "lmroman10-bold.otf", vector = "tex-bf" } ,
     { name = "lmmib10.tfm", vector = "tex-bi", skewchar=0x7F } ,
     { name = "lmsans10-regular.otf", vector = "tex-ss", optional=true },
     { name = "lmmono10-regular.otf", vector = "tex-tt", optional=true },
@@ -1444,7 +1444,7 @@ mathematics.make_font ( "lmroman10-boldmath", {
     { name = "msam10.tfm", vector = "tex-ma" },
     { name = "msbm10.tfm", vector = "tex-mb" },
  -- { name = "rm-lmbx10.tfm", vector = "tex-bf" } ,
-    { name = "lmroman10-bold.otf", "tex-bf" } ,
+    { name = "lmroman10-bold.otf", vector = "tex-bf" } ,
     { name = "lmmib10.tfm", vector = "tex-bi", skewchar=0x7F } ,
     { name = "lmsans10-regular.otf", vector = "tex-ss", optional=true },
     { name = "lmmono10-regular.otf", vector = "tex-tt", optional=true },
@@ -1465,7 +1465,7 @@ mathematics.make_font ( "lmroman12-math", {
     { name = "msam10.tfm", vector = "tex-ma" },
     { name = "msbm10.tfm", vector = "tex-mb" },
  -- { name = "rm-lmbx12.tfm", vector = "tex-bf" } ,
-    { name = "lmroman12-bold.otf", "tex-bf" } ,
+    { name = "lmroman12-bold.otf", vector = "tex-bf" } ,
     { name = "lmmib10.tfm", vector = "tex-bi", skewchar=0x7F } ,
     { name = "lmsans12-regular.otf", vector = "tex-ss", optional=true },
     { name = "lmmono12-regular.otf", vector = "tex-tt", optional=true },
@@ -1484,7 +1484,7 @@ mathematics.make_font ( "lmroman17-math", {
     { name = "msam10.tfm", vector = "tex-ma" },
     { name = "msbm10.tfm", vector = "tex-mb" },
  -- { name = "rm-lmbx12.tfm", vector = "tex-bf" } ,
-    { name = "lmroman12-bold.otf", "tex-bf" } ,
+    { name = "lmroman12-bold.otf", vector = "tex-bf" } ,
     { name = "lmmib10.tfm", vector = "tex-bi", skewchar=0x7F } ,
     { name = "lmsans17-regular.otf", vector = "tex-ss", optional=true },
     { name = "lmmono17-regular.otf", vector = "tex-tt", optional=true },
diff --git a/tex/context/base/sort-ini.lua b/tex/context/base/sort-ini.lua
index 3930e85fe..5f045938f 100644
--- a/tex/context/base/sort-ini.lua
+++ b/tex/context/base/sort-ini.lua
@@ -26,7 +26,8 @@ sorters.replacements = { }
 sorters.language     = 'en'
 
 function sorters.comparers.basic(sort_a,sort_b)
-    local sm = sorters.mappings[sorters.language or sorters.defaultlanguage] -- slow, will become sorters.initialize
+    -- sm assignment is slow, will become sorters.initialize
+    local sm = sorters.mappings[sorters.language or sorters.defaultlanguage] or sorters.mappings.en
     if #sort_a > #sort_b then
         if #sort_b == 0 then
             return 1
diff --git a/tex/context/base/strc-des.mkiv b/tex/context/base/strc-des.mkiv
index 42e216789..2c3a0d641 100644
--- a/tex/context/base/strc-des.mkiv
+++ b/tex/context/base/strc-des.mkiv
@@ -670,7 +670,7 @@
       \descriptionparameter\c!left
       \currentenumerationfullnumber
       % save cq. treat expansion etc
-      \doifsomething{#2}
+      \doiftext{#2} % always true anyway
         {\doif{\descriptionparameter\c!title}\v!yes
            {\begingroup
             \dosetdescriptionattributes\c!titlestyle\c!titlecolor
diff --git a/tex/context/base/strc-mat.mkii b/tex/context/base/strc-mat.mkii
index 342f3f3fb..0d32cb298 100644
--- a/tex/context/base/strc-mat.mkii
+++ b/tex/context/base/strc-mat.mkii
@@ -409,11 +409,13 @@
      \beforedisplayspace
      \par
      \ifvmode
-        \prevdepth-\maxdimen % texbook pagina 79-80
-        % otherwise problems at the top of a page, don't remove:
-        \verticalstrut
-        \vskip-\struttotal
-        \vskip-\baselineskip
+        \ifindentfirstparagraph % tricky, probably needs more testing
+          \prevdepth-\maxdimen % texbook pagina 79-80
+          % otherwise problems at the top of a page, don't remove:
+          \verticalstrut
+          \vskip-\struttotal
+          \vskip-\baselineskip
+        \fi
      \fi
    \fi
    $$\setdisplaydimensions
diff --git a/tex/context/base/syst-ini.tex b/tex/context/base/syst-ini.tex
index 8a756731b..2a04f1112 100644
--- a/tex/context/base/syst-ini.tex
+++ b/tex/context/base/syst-ini.tex
@@ -471,7 +471,13 @@
 \chardef\@@scrollmode    = 2
 \chardef\@@errorstopmode = 3
 
-%D Constants to be used with \type {\lastnodetype}.
+%D Constants to be used with \type {\lastnodetype}. The \type
+%D {\lastnodetype} primitive is \ETEX\ compliant. The valid range is
+%D still -1 .. 15 and glyph nodes have number 0 (used to be char
+%D node) and ligature nodes are mapped to 7. That way macro packages
+%D can use the same symbolic names as in traditional \ETEX. Keep in
+%D mind that the internal node numbers are different and that there
+%D are more node types that 15.
 
 \chardef\@@charnode          =  0
 \chardef\@@hlistnode         =  1
diff --git a/tex/context/bib/t-bib.tex b/tex/context/bib/t-bib.tex
index 05b2d0b3e..e290b8b69 100644
--- a/tex/context/bib/t-bib.tex
+++ b/tex/context/bib/t-bib.tex
@@ -1072,16 +1072,22 @@
 \def\bibdogetupsometextprefix#1#2#3%
   {\ifcsname#2#1#3\endcsname
      \csname#2#1#3\endcsname
-   \else\@EA\ifx\csname\??la#1\c!default\endcsname\empty
+   \else\ifcsname\??la#1\c!default\endcsname
+     \@EA\ifx\csname\??la#1\c!default\endcsname\empty
+       \ifcsname#2#3\endcsname
+         \csname#2#3\endcsname
+       \else\ifcsname#2\s!en#3\endcsname
+         \csname#2\s!en#3\endcsname
+       \fi\fi
+     \else
+       \expandafter\bibdogetupsometextprefix\csname\??la#1\c!default\endcsname{#2}{#3}%
+     \fi
+   \else
      \ifcsname#2#3\endcsname
        \csname#2#3\endcsname
      \else\ifcsname#2\s!en#3\endcsname
        \csname#2\s!en#3\endcsname
-     \else
-       \reporttextprefixerror{#1}{#2}{#3}%
      \fi\fi
-   \else
-     \bibdogetupsometextprefix{\csname\??la#1\c!default\endcsname}{#2}{#3}%
    \fi\fi}
 
 \def\docompletepublications[#1]%
@@ -1425,7 +1431,7 @@
              \edef\currentbibauthor{\currentbibauthor ##1\bibalternative{andtext}}%
           \else
              \edef\currentbibauthor{\currentbibauthor ##1\bibalternative{namesep}}%
-          \fi 
+          \fi
         \fi }%
      \processcommalist[#2]\bibprocessauthoritem }
 
diff --git a/tex/generic/context/luatex-fonts-merged.lua b/tex/generic/context/luatex-fonts-merged.lua
index b57b88449..ff2e24f95 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  : 08/12/09 23:15:10
+-- merge date  : 08/13/09 11:47:04
 
 do -- begin closure to overcome local limits and interference