7 files changed, 54 insertions, 9 deletions
diff --git a/tex/context/base/cont-new.tex b/tex/context/base/cont-new.tex
index 1c44d3050..5dcd7d962 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.11.01 12:14}
+\newcontextversion{2010.11.01 21:16}
 
 %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 be9700d73..6fdd1fe28 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.11.01 12:14}
+\edef\contextversion{2010.11.01 21:16}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/l-lpeg.lua b/tex/context/base/l-lpeg.lua
index 5c53fe710..4eb601432 100644
--- a/tex/context/base/l-lpeg.lua
+++ b/tex/context/base/l-lpeg.lua
@@ -11,8 +11,8 @@ local lpeg = require("lpeg")
 lpeg.patterns  = lpeg.patterns or { } -- so that we can share
 local patterns = lpeg.patterns
 
-local P, R, S, Ct, C, Cs, Cc, V = lpeg.P, lpeg.R, lpeg.S, lpeg.Ct, lpeg.C, lpeg.Cs, lpeg.Cc, lpeg.V
-local match = lpeg.match
+local P, R, S, V, match = lpeg.P, lpeg.R, lpeg.S, lpeg.V, lpeg.match
+local Ct, C, Cs, Cc, Cf, Cg = lpeg.Ct, lpeg.C, lpeg.Cs, lpeg.Cc, lpeg.Cf, lpeg.Cg
 
 local utfcharacters    = string.utfcharacters
 local utfgmatch        = unicode and unicode.utf8.gmatch
diff --git a/tex/context/base/trac-log.lua b/tex/context/base/trac-log.lua
index bffcc6c2e..768f61821 100644
--- a/tex/context/base/trac-log.lua
+++ b/tex/context/base/trac-log.lua
@@ -394,6 +394,12 @@ function logs.obsolete(old,new)
     end
 end
 
-function logs.texerrormessage(...) -- for the moment we put this function here
-    tex.error(format(...), { })
+if tex and tex.error then
+    function logs.texerrormessage(...) -- for the moment we put this function here
+        tex.error(format(...), { })
+    end
+else
+    function logs.texerrormessage(...)
+        print(format(...))
+    end
 end
diff --git a/tex/context/base/util-prs.lua b/tex/context/base/util-prs.lua
index 08fe2f686..17a10201f 100644
--- a/tex/context/base/util-prs.lua
+++ b/tex/context/base/util-prs.lua
@@ -11,6 +11,8 @@ utilities.parsers = utilities.parsers or { }
 local parsers     = utilities.parsers
 parsers.patterns  = parsers.patterns or { }
 
+-- we could use a Cf Cg construct
+
 local P, R, V, C, Ct, Carg = lpeg.P, lpeg.R, lpeg.V, lpeg.C, lpeg.Ct, lpeg.Carg
 local lpegmatch = lpeg.match
 local concat, format, gmatch = table.concat, string.format, string.gmatch
diff --git a/tex/context/bib/sample.bib b/tex/context/bib/sample.bib
new file mode 100644
index 000000000..70df38940
--- /dev/null
+++ b/tex/context/bib/sample.bib
@@ -0,0 +1,37 @@
+@STRING{hh = {Hans Hagen}}
+
+@ELECTRONIC{hh2010,
+  author = hh,
+  year = {2010},
+  title = {Metafun. \CONTEXT\ mkiv},
+  url = {http://www.pragma-ade.nl/general/manuals/metafun-s.pdf},
+}
+
+@ARTICLE{hh2010a,
+  author = hh,
+  title = {The Font Name Mess},
+  journal = {MAPS},
+  year = {2010},
+  volume = {40},
+  pages = {2-8},
+  keywords = {context},
+}
+
+@ARTICLE{hh2010b,
+  author = hh,
+  title = {Grouping in Hybrid Environments},
+  journal = {MAPS},
+  year = {2010},
+  volume = {40},
+  pages = {67-71},
+  timestamp = {2010.10.28}
+}
+
+@BOOK{Eijkhout1991,
+  title = {\TeX\ by Topic. A \TeX nician's Reference},
+  publisher = {Addison-Wesley},
+  year = {1991},
+  author = {Victor Eijkhout},
+  address = {London},
+  keywords = {general},
+}
diff --git a/tex/generic/context/luatex-fonts-merged.lua b/tex/generic/context/luatex-fonts-merged.lua
index b366fb801..a8ad77afd 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  : 11/01/10 12:14:26
+-- merge date  : 11/01/10 21:16:51
 
 do -- begin closure to overcome local limits and interference
 
@@ -190,8 +190,8 @@ local lpeg = require("lpeg")
 lpeg.patterns  = lpeg.patterns or { } -- so that we can share
 local patterns = lpeg.patterns
 
-local P, R, S, Ct, C, Cs, Cc, V = lpeg.P, lpeg.R, lpeg.S, lpeg.Ct, lpeg.C, lpeg.Cs, lpeg.Cc, lpeg.V
-local match = lpeg.match
+local P, R, S, V, match = lpeg.P, lpeg.R, lpeg.S, lpeg.V, lpeg.match
+local Ct, C, Cs, Cc, Cf, Cg = lpeg.Ct, lpeg.C, lpeg.Cs, lpeg.Cc, lpeg.Cf, lpeg.Cg
 
 local utfcharacters    = string.utfcharacters
 local utfgmatch        = unicode and unicode.utf8.gmatch