beta 2011.04.23 22:29

9 files changed, 8 insertions, 8 deletions

diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index f18aa4a2c..dffa7076d 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{2011.04.22 18:17}
+\newcontextversion{2011.04.23 22: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 cd2518e64..71cbb42c5 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{2011.04.22 18:17}
+\newcontextversion{2011.04.23 22: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.mkii b/tex/context/base/context.mkii
index 9b252fc19..40d111711 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{2011.04.22 18:17}
+\edef\contextversion{2011.04.23 22:29}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 9b783a093..a09b7866e 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -20,7 +20,7 @@
 %D your styles an modules.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2011.04.22 18:17}
+\edef\contextversion{2011.04.23 22:29}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 03ad47eb3..2c76454fc 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 554a3d15f..9e8f90efa 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/context/base/strc-lst.lua b/tex/context/base/strc-lst.lua
index 086f42c93..21015e43a 100644
--- a/tex/context/base/strc-lst.lua
+++ b/tex/context/base/strc-lst.lua
@@ -489,11 +489,11 @@ function lists.location(n)
     texsprint(l.references.internal or n)
 end
 
-function lists.label(n)
+function lists.label(n,default)
     local l = lists.result[n]
     local t = l.titledata
     if t then
-        texsprint(t.label)
+        texsprint(t.label or default or "")
     end
 end
 
diff --git a/tex/context/base/strc-lst.mkiv b/tex/context/base/strc-lst.mkiv
index 26e2392bd..c2be8338a 100644
--- a/tex/context/base/strc-lst.mkiv
+++ b/tex/context/base/strc-lst.mkiv
@@ -564,7 +564,7 @@
    \else\ifx\currentlistlabel\v!none % real minimal (as suggested by WS)
      \currentlistnumber
    \else\ifx\currentlistlabel\v!yes % auto (use value stored in tuc file)
-     \edef\currentlistlabel{\ctxlua{structures.lists.label(\currentlistindex)}}%
+     \edef\currentlistlabel{\ctxlua{structures.lists.label(\currentlistindex,"\currentlistlabel")}}%
      \leftlabeltext\currentlistlabel
      \listparameter\c!starter
      \currentlistnumber
diff --git a/tex/generic/context/luatex-fonts-merged.lua b/tex/generic/context/luatex-fonts-merged.lua
index e2c86f1ac..bab0b14bf 100644
--- a/tex/generic/context/luatex-fonts-merged.lua
+++ b/tex/generic/context/luatex-fonts-merged.lua
@@ -1,6 +1,6 @@
 -- merged file : luatex-fonts-merged.lua
 -- parent file : luatex-fonts.lua
--- merge date  : 04/22/11 18:17:39
+-- merge date  : 04/23/11 22:29:11
 
 do -- begin closure to overcome local limits and interference