beta 2011.08.23 13:04

12 files changed, 176 insertions, 127 deletions

diff --git a/context/data/scite/context.properties b/context/data/scite/context.properties
index 006cfe640..3badb06ea 100644
--- a/context/data/scite/context.properties
+++ b/context/data/scite/context.properties
@@ -39,7 +39,7 @@ textwrapper.length=68
 
 file.patterns.tex=
 file.patterns.latex=
-file.patterns.context=*.tex;*.tui;*.tuo;*.sty;*.mkii;*.mkiv;*.mkvi;
+file.patterns.context=*.tex;*.mkii;*.mkiv;*.mkvi;
 
 # ConTeXt : keywords (if not yet loaded already)
 
@@ -63,7 +63,7 @@ lexer.$(file.patterns.example)=xml
 
 # Lua : patterns
 
-file.patterns.lua=*.lua;*.luc;*.cld;*.tuc;*.luj
+file.patterns.lua=*.lua;*.luc;*.cld;*.tuc;*.luj;*.tma;*.lfg
 
 filter.lua=Lua MkIV|$(file.patterns.lua)|
 lexer.$(file.patterns.lua)=lua
@@ -78,36 +78,29 @@ if PLAT_WIN
     name.context.console=$(ComSpec)
     name.context.gsview=gsview32.exe
     name.context.acrobat=
-    name.texexec.flag.pdfopen=--autopdf
+    name.flag.pdfopen=--autopdf
 
 # consoles: rxvt,konsole | acrobat: acroread,xpdfopen
 #
-#   name.texexec.flag.pdfopen=--autopdf --xpdf
+#   name.flag.pdfopen=--autopdf --xpdf
 
 if PLAT_GTK
     name.context.console=rxvt
     name.context.gsview=gv
     name.context.acrobat=acroread
-    name.texexec.flag.pdfopen=--autopdf
+    name.flag.pdfopen=--autopdf
 
 name.metafun.console=$(name.context.console)
 name.example.console=$(name.context.console)
 
-if PLAT_WIN
-    name.context.mtxrun=mtxrun --autogenerate
-
-if PLAT_GTK
-    name.context.mtxrun=mtxrun --autogenerate
+name.context.mtxrun=mtxrun --autogenerate
 
-name.context.concheck=$(name.context.mtxrun) --script check
-name.context.texexec=$(name.context.mtxrun) --script context $(name.texexec.flag.pdfopen)
+name.context.check=$(name.context.mtxrun) --script check
+name.context.run=$(name.context.mtxrun) --script context $(name.flag.pdfopen)
 name.context.texshow=$(name.context.mtxrun) texshow
-name.context.purge=$(name.context.mtxrun) ctxtools --purge --all
-name.context.update=$(name.context.mtxrun) texshow --update --force
+name.context.purge=$(name.context.mtxrun) --context --purge --all
 name.context.showcase=$(name.context.mtxrun) --launch showcase.pdf
 
-name.context.backend=pdf
-
 name.example.xmlcheck=tidy -quiet -utf8 -xml -errors
 
 name.metafun.mptopdf=$(name.context.mtxrun) --script mptopdf
@@ -146,19 +139,15 @@ import scite-ctx
 
 # hard coded compile / build / go
 
-command.compile.$(file.patterns.context)=$(name.context.concheck) $(FileNameExt)
+command.compile.$(file.patterns.context)=$(name.context.check) $(FileNameExt)
 command.compile.$(file.patterns.metafun)=
 command.compile.$(file.patterns.example)=$(name.example.xmlcheck) $(FileNameExt)
 command.compile.*.fo=$(name.example.xmlcheck) $(FileNameExt)
 
-#command.compile.subsystem.$(file.patterns.context)=1
-#command.compile.subsystem.$(file.patterns.metafun)=1
-#command.compile.subsystem.$(file.patterns.example)=1
-
-command.build.$(file.patterns.context)=$(name.context.texexec) --$(name.context.backend) $(FileNameExt)
+command.build.$(file.patterns.context)=$(name.context.run) $(FileNameExt)
 command.build.$(file.patterns.metafun)=$(name.metafun.mptopdf) $(FileNameExt)
-command.build.$(file.patterns.example)=$(name.context.texexec) --$(name.context.backend) --xml $(FileNameExt)
-command.build.*.fo=$(name.context.texexec) --$(name.context.backend) $(name.texexec.flag.pdfopen) --xml --use=foxet $(FileNameExt)
+command.build.$(file.patterns.example)=$(name.context.run) --xml $(FileNameExt)
+command.build.*.fo=$(name.context.run) $(name.flag.pdfopen) --xml --use=foxet $(FileNameExt)
 
 command.build.subsystem.$(file.patterns.context)=1
 command.build.subsystem.$(file.patterns.metafun)=1
@@ -188,7 +177,7 @@ command.name.0.$(file.patterns.context)=Check TeX File
 command.name.0.$(file.patterns.metafun)=
 command.name.0.$(file.patterns.example)=Check XML File
 
-command.0.$(file.patterns.context)=$(name.context.concheck) $(FileNameExt)
+command.0.$(file.patterns.context)=$(name.context.check) $(FileNameExt)
 command.0.$(file.patterns.metafun)=
 command.0.$(file.patterns.example)=$(name.example.xmlcheck) $(FileNameExt)
 
@@ -198,9 +187,9 @@ command.name.1.$(file.patterns.context)=Process TeX file
 command.name.1.$(file.patterns.metafun)=Process METAPOST File
 command.name.1.$(file.patterns.example)=Process XML File
 
-command.1.$(file.patterns.context)=$(name.context.texexec) --$(name.context.backend)         $(FileNameExt)
-command.1.$(file.patterns.metafun)=$(name.context.texexec) --$(name.context.backend) --mptex $(FileNameExt)
-command.1.$(file.patterns.example)=$(name.context.texexec) --$(name.context.backend) --xml   $(FileNameExt)
+command.1.$(file.patterns.context)=$(name.context.run) $(FileNameExt)
+command.1.$(file.patterns.metafun)=$(name.context.run) $(FileNameExt) --metapost
+command.1.$(file.patterns.example)=$(name.context.run) $(FileNameExt) --xml
 
 command.1.subsystem.$(file.patterns.context)=1
 command.1.subsystem.$(file.patterns.metafun)=1
@@ -208,32 +197,18 @@ command.1.subsystem.$(file.patterns.example)=1
 
 # 2 : pdf viewing
 
-command.name.2.$(file.patterns.context)=View PDF File
-command.name.2.$(file.patterns.metafun)=
-command.name.2.$(file.patterns.example)=View PDF File
+command.name.2.$(file.patterns.context)=View PDF File with GhostScript
+command.name.2.$(file.patterns.metafun)=View PDF File with GhostScript
+command.name.2.$(file.patterns.example)=View PDF File with GhostScript
 
-command.2.$(file.patterns.context)=$(name.context.gsview) $(FileName).pdf
-command.2.$(file.patterns.metafun)=
-command.2.$(file.patterns.example)=$(name.context.gsview) $(FileName).pdf
+command.2.$(file.patterns.context)=$(name.context.gsview) $(FileDir)/$(FileName).pdf
+command.2.$(file.patterns.metafun)=$(name.context.gsview) $(FileDir)/$(FileName).pdf
+command.2.$(file.patterns.example)=$(name.context.gsview) $(FileDir)/$(FileName).pdf
 
 command.subsystem.2.$(file.patterns.context)=2
 command.subsystem.2.$(file.patterns.metafun)=2
 command.subsystem.2.$(file.patterns.example)=2
 
-# 2 : postscript
-
-# command.name.2.$(file.patterns.context)=View PS File
-# command.name.2.$(file.patterns.metafun)=View PS File (1)
-# command.name.2.$(file.patterns.example)=View PS File
-
-# command.2.$(file.patterns.context)=$(name.context.gsview) $(FileName).ps
-# command.2.$(file.patterns.metafun)=$(name.context.gsview) $(FileName).1
-# command.2.$(file.patterns.example)=$(name.context.gsview) $(FileName).ps
-
-# command.subsystem.2.$(file.patterns.context)=2
-# command.subsystem.2.$(file.patterns.metafun)=2
-# command.subsystem.2.$(file.patterns.example)=2
-
 # 3 : clean up
 
 command.name.3.$(file.patterns.context)=Purge Files
@@ -254,18 +229,6 @@ command.name.4.$(file.patterns.context)=Show Documentation
 command.name.4.$(file.patterns.metafun)=Show Documentation
 command.name.4.$(file.patterns.example)=Show Documentation
 
-# 5 : example framework applications
-
-#~ command.5=$(name.context.examplap)
-#~ command.5.$(file.patterns.context)=$(name.context.examplap)
-#~ command.5.$(file.patterns.metafun)=$(name.context.examplap)
-#~ command.5.$(file.patterns.example)=$(name.context.examplap)
-
-#~ command.name.5=Start Interfaces
-#~ command.name.5.$(file.patterns.context)=Start Interfaces
-#~ command.name.5.$(file.patterns.metafun)=Start Interfaces
-#~ command.name.5.$(file.patterns.example)=Start Interfaces
-
 # 6 : console
 
 command.name.6=Start Console
@@ -285,43 +248,24 @@ command.name.7.$(file.patterns.context)=Generate Listing
 command.name.7.$(file.patterns.metafun)=Generate Listing
 command.name.7.$(file.patterns.example)=Generate Listing
 
-command.7=$(name.context.texexec)                          --$(name.context.backend) --list --result=$(FileName) $(FileNameExt)
-command.7.$(file.patterns.context)=$(name.context.texexec) --$(name.context.backend) --list --result=$(FileName) $(FileNameExt)
-command.7.$(file.patterns.metafun)=$(name.context.texexec) --$(name.context.backend) --list --result=$(FileName) $(FileNameExt)
-command.7.$(file.patterns.example)=$(name.context.texexec) --$(name.context.backend) --list --result=$(FileName) $(FileNameExt)
+command.7=$(name.context.run)                          --extra=listing --pretty --result=$(FileName) $(FileNameExt)
+command.7.$(file.patterns.context)=$(name.context.run) --extra=listing --pretty --result=$(FileName) $(FileNameExt)
+command.7.$(file.patterns.metafun)=$(name.context.run) --extra=listing --pretty --result=$(FileName) $(FileNameExt)
+command.7.$(file.patterns.example)=$(name.context.run) --extra=listing --pretty --result=$(FileName) $(FileNameExt)
 
 command.7.subsystem=1
 command.7.subsystem.$(file.patterns.context)=1
 command.7.subsystem.$(file.patterns.metafun)=1
 command.7.subsystem.$(file.patterns.example)=1
 
-# 8 : reserved
-
-command.name.8.$(file.patterns.context)=
-command.name.8.$(file.patterns.metafun)=
-command.name.8.$(file.patterns.example)=
-command.8.$(file.patterns.context)=
-command.8.$(file.patterns.metafun)=
-command.8.$(file.patterns.example)=
-
-# 9 : reserved
-
-command.name.9=
-command.name.9.$(file.patterns.context)=
-command.name.9.$(file.patterns.metafun)=
-command.name.9.$(file.patterns.example)=
-command.9.$(file.patterns.context)=
-command.9.$(file.patterns.metafun)=
-command.9.$(file.patterns.example)=
-
 # 10: arranging
 
 command.name.10.$(file.patterns.context)=Process and Arrange
 command.name.10.$(file.patterns.metafun)=Process and Arrange
 command.name.10.$(file.patterns.example)=Process and Arrange
-command.10.$(file.patterns.context)=$(name.context.texexec) --arrange --$(name.context.backend)         $(FileNameExt)
-command.10.$(file.patterns.metafun)=$(name.context.texexec)           --$(name.context.backend) --mptex $(FileNameExt)
-command.10.$(file.patterns.example)=$(name.context.texexec) --arrange --$(name.context.backend) --xml   $(FileNameExt)
+command.10.$(file.patterns.context)=$(name.context.run) --arrange         $(FileNameExt)
+command.10.$(file.patterns.metafun)=$(name.context.run)           --mptex $(FileNameExt)
+command.10.$(file.patterns.example)=$(name.context.run) --arrange --xml   $(FileNameExt)
 command.10.subsystem.$(file.patterns.context)=1
 command.10.subsystem.$(file.patterns.metafun)=1
 command.10.subsystem.$(file.patterns.example)=1
@@ -331,9 +275,9 @@ command.10.subsystem.$(file.patterns.example)=1
 command.name.11.$(file.patterns.context)=Generate Formats (pdfTeX)
 command.name.11.$(file.patterns.metafun)=Generate Formats
 command.name.11.$(file.patterns.example)=Generate Formats
-command.11.$(file.patterns.context)=$(name.context.texexec) --make --all --pdftex
-command.11.$(file.patterns.metafun)=$(name.context.texexec) --make --all
-command.11.$(file.patterns.example)=$(name.context.texexec) --make --all
+command.11.$(file.patterns.context)=$(name.context.run) --make --all --pdftex
+command.11.$(file.patterns.metafun)=$(name.context.run) --make --all
+command.11.$(file.patterns.example)=$(name.context.run) --make --all
 command.11.subsystem.$(file.patterns.context)=1
 command.11.subsystem.$(file.patterns.metafun)=1
 command.11.subsystem.$(file.patterns.example)=1
@@ -341,27 +285,15 @@ command.11.subsystem.$(file.patterns.example)=1
 # 12: make
 
 command.name.12.$(file.patterns.context)=Generate Formats (luaTeX)
-command.12.$(file.patterns.context)=$(name.context.texexec) --make --all --luatex
+command.12.$(file.patterns.context)=$(name.context.run) --make --all --luatex
 command.12.subsystem.$(file.patterns.context)=1
 
 # 13: make
 
 command.name.13.$(file.patterns.context)=Generate Formats (XeTeX)
-command.13.$(file.patterns.context)=$(name.context.texexec) --make --all --xetex
+command.13.$(file.patterns.context)=$(name.context.run) --make --all --xetex
 command.13.subsystem.$(file.patterns.context)=1
 
-# 14: update
-
-command.name.14=Update ConTeXt
-command.name.14.$(file.patterns.context)=Update ConTeXt
-command.name.14.$(file.patterns.metafun)=Update ConTeXt
-command.name.14.$(file.patterns.example)=Update ConTeXt
-
-command.14=$(name.context.update)
-command.14.$(file.patterns.context)=$(name.context.update)
-command.14.$(file.patterns.metafun)=$(name.context.update)
-command.14.$(file.patterns.example)=$(name.context.update)
-
 # 15: example
 
 command.name.15=Documentation Server
@@ -387,25 +319,17 @@ Ctrl+F12|IDM_BUILD|\
 Shift+F12|IDM_GO|\
 Alt+F12|IDM_STOPEXECUTE|\
 
-# Editor: fonts (16.5/11.5)
-
-# install: fonts/truetype/hoekwater/lm/LMTypewriter10-Regular.ttf
+# Editor: fonts
 
 if PLAT_WIN
-    font.monospace=font:LMTypewriter10-Regular,size:14
-    font.errorfont=font:LMTypewriter10-Regular,size:12
+    font.monospace=font:Dejavu Sans Mono,size:14
+    font.errorfont=font:Dejavu Sans Mono,size:7
 
 if PLAT_GTK
-    font.monospace=font:!lm mono 10 regular,size:14
-    font.errorfont=font:!lm mono 10 regular,size:12
-
-#~ if PLAT_WIN
-	#~ font.monospace=font:Lucida Console,size:12
-	#~ font.monospace=font:Lucida Sans Unicode,size:12
-	#~ font.monospace=font:OpenSymbol,size:17
+    font.monospace=font:!Dejavu Sans Mono,size:14
+    font.errorfont=font:!Dejavu Sans Mono,size:7
 
 font.base=$(font.monospace)
-#~ font.small=$(font.monospace)
 font.comment=$(font.monospace)
 font.text=$(font.monospace)
 font.text.comment=$(font.monospace)
@@ -427,6 +351,17 @@ color.fore.cyan=fore:#007F7F
 color.fore.magenta=fore:#7F007F
 color.fore.yellow=fore:#7F7F00
 
+# Editor: color schemes
+
+caret.width=3
+
+style.*.32=$(font.base),$(color.back.textpanel)
+style.*.33=$(font.base),$(color.back.linepanel)
+
+style.errorlist.32=$(font.errorfont),$(color.back.logpanel)
+
+selection.back=#000000
+
 # Editor: fast switching between files
 
 tabbar.visible=1
@@ -488,12 +423,12 @@ source.files=$(file.patterns.context);$(file.patterns.metafun);$(file.patterns.e
 # Editor: printing
 
 if PLAT_WIN
-  print.colour.mode=1
-  print.margins=750,750,750,750
-  print.header.format=$(FileNameExt) — Printed on $(CurrentDate), $(CurrentTime) — Page $(CurrentPage)
-  print.footer.format=$(FilePath) — File date: $(FileDate) — File time: $(FileTime)
-  print.header.style=font:LMTypewriter10,size:10
-  print.footer.style=font:LMTypewriter10,size:10
+    print.colour.mode=1
+    print.margins=750,750,750,750
+    print.header.format=$(FileNameExt) — Printed on $(CurrentDate), $(CurrentTime) — Page $(CurrentPage)
+    print.footer.format=$(FilePath) — File date: $(FileDate) — File time: $(FileTime)
+    print.header.style=font:Dejavu Sans Mono,size:10
+    print.footer.style=font:Dejavu Sans Mono,size:10
 
 # Editor: processing
 
@@ -556,4 +491,29 @@ style.errorlist.15=$(color.fore.red)
 # Intel Fortran Compiler error
 style.errorlist.16=$(color.fore.red)
 
+# done in pragma.properties:
+
+#  # Editor: filters
+#
+#  open.filter=\
+#  All Files (*.*)|*.*|\
+#  $(filter.context)\
+#  $(filter.metafun)\
+#  $(filter.example)\
+#  $(filter.lua)\
+#  $(filter.ruby)\
+#  $(filter.perl)\
+#  $(filter.text)
+#
+#  # Editor: menus
+#
+#  menu.language=\
+#  TeX|tex||\
+#  Metapost|metapost||\
+#  XML|xml||\
+#  Lua|lua||\
+#  Ruby|ruby||\
+#  Perl|perl||\
+#  Text|txt||
+
 # Context: end of file
diff --git a/context/data/scite/pragma.example-properties b/context/data/scite/pragma.example-properties
new file mode 100644
index 000000000..e596b131c
--- /dev/null
+++ b/context/data/scite/pragma.example-properties
@@ -0,0 +1,87 @@
+# file    : pragma.properties
+# version : 18 august 2003
+# author  : Hans Hagen / PRAGMA ADE / www.pragma-ade.com
+
+# save.backup.first=1
+# save.backup.once=1
+# save.backup.suffix=.bak
+
+# TeX: experimental features
+
+keywordclass.primitives.pdftex.experimental=\
+    pdfavoidoverfull \
+    pdflastdemerits \
+    pdflastvbreakpenalty \
+    pdflinesnapx pdflinesnapy \
+    pdfmaxpenalty pdfminpenalty pdfmovechars \
+    pdfsnaprefpoint pdfsnapx pdfsnapy \
+    pdfstartthread
+
+# Editor: screen
+
+position.left=25
+position.top=25
+position.width=1550
+position.height=1100
+output.horizontal.size=250
+output.vertical.size=100
+
+# Editor: filters
+
+open.filter=\
+All Files (*.*)|*.*|\
+$(filter.context)\
+$(filter.metafun)\
+$(filter.example)\
+$(filter.lua)\
+$(filter.ruby)\
+$(filter.perl)\
+$(filter.text)
+
+# Editor: menus
+
+menu.language=\
+TeX|tex||\
+Metapost|metapost||\
+XML|xml||\
+Lua|lua||\
+Ruby|ruby||\
+Perl|perl||\
+Text|txt||
+
+# Abbreviations : demo
+
+# ext=\\externalfigure[|][width=,height=]
+# for=\n\\startformula\n|\n\\stopformula\n
+# itm=\\startitemize\n\\item |\n\\item \n\\stopitemize
+# tab=\\starttable[||c||c||]\n\\NC | \\NC  \\NC \\AR\n\\NC  \\NC  \\NC \\AR\n\\stoptable\n
+# TAB=\\bTABLE\n\\bTR \\bTD | \\eTD \\bTD  \\eTD \\eTR\n\\bTR \\bTD  \\eTD \\bTD  \\eTD \\eTR\n\\eTABLE\n
+# tbl=\\starttabulate\n\\NC | \\NC  \\NC \\AR\n\\NC  \\NC  \\NC \\NR\n\\stoptabulate\n
+# tpg=\\starttyping\n|\n\\stoptyping\n
+# txt=\\starttext\n\n|\n\n\\stoptext
+#
+# pfg=\\placefigure\n  {}\n  {|}
+# ptb=\\placetable\n  {}\n  {|}
+# pfr=\\placeformula[]\n\\startformula\n|\n\\stopformula\n
+#
+# c=\\chapter{|}\n\n
+# e=\\emph{|}
+# i=\\item |
+# k=\\cap{|}
+# m=\\mathematics{|}
+# s=\\section{|}\n\n
+# t=\\type{|}
+#
+# mu=\\startusableMPgraphic{|}\n\n\\stopusableMPgraphic\n
+# mr=\\startreusableMPgraphic{|}\n\n\\stopreusableMPgraphic\n
+# mq=\\startuniqueMPgraphic{|}\n\n\\stopuniqueMPgraphic\n
+#
+# um=\useMPgraphic{|}
+# rm=\reuseMPgraphic{|}
+# qm=\uniqueMPgraphic{|}
+
+keywords2.$(file.patterns.lua)=$(keywordclass2.lua)$(keywordclass2.lua5)
+keywords3.$(file.patterns.lua)=$(keywordclass3.lua5)
+keywords4.$(file.patterns.lua)=$(keywordclass4.lua5)
+
+#~ keywords4.$(file.patterns.lua)=$(keywordclass4.lua4)
diff --git a/context/data/scite/sciteuser.example-properties b/context/data/scite/sciteuser.example-properties
new file mode 100644
index 000000000..c96c67f07
--- /dev/null
+++ b/context/data/scite/sciteuser.example-properties
@@ -0,0 +1,2 @@
+import context
+import pragma
diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index 5fb5670d0..606d035fd 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.08.23 12:04}
+\newcontextversion{2011.08.23 13:04}
 
 %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 0f5bb0d96..22b9b10d9 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.08.23 12:04}
+\newcontextversion{2011.08.23 13:04}
 
 %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 f53ba87b3..a43882f0a 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 38a66bac9..192df98ef 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 4dcb714a5..ce774e9d8 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.08.23 12:04}
+\edef\contextversion{2011.08.23 13:04}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index e2cc12234..705823f3b 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.08.23 12:04}
+\edef\contextversion{2011.08.23 13:04}
 
 %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 96c00b7c7..42f71838c 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 0aaf89540..ab1c683f0 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 1fb3259b4..8bd088870 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  : 08/23/11 12:04:56
+-- merge date  : 08/23/11 13:04:49
 
 do -- begin closure to overcome local limits and interference