beta 2011.10.03 09:34

11 files changed, 62 insertions, 24 deletions

diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index d24e2d4f8..a937d8741 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.10.02 22:44}
+\newcontextversion{2011.10.03 09: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/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index bd35fb34c..d5d759a0b 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.10.02 22:44}
+\newcontextversion{2011.10.03 09: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-version.pdf b/tex/context/base/context-version.pdf
index 49e28803e..0d49092ef 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 c8dd0f4af..d22f76b85 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 53ec5343b..f74ced756 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.10.02 22:44}
+\edef\contextversion{2011.10.03 09:34}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 265181292..a307c4523 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.10.02 22:44}
+\edef\contextversion{2011.10.03 09:34}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/data-exp.lua b/tex/context/base/data-exp.lua
index f300f00b0..82fedcf6e 100644
--- a/tex/context/base/data-exp.lua
+++ b/tex/context/base/data-exp.lua
@@ -165,6 +165,11 @@ end
 --     return resolvers.cleanpath(str)
 -- end
 
+local cleanup = lpeg.replacer {
+    { "!"  , ""  },
+    { "\\" , "/" },
+}
+
 function resolvers.cleanpath(str) -- tricky, maybe only simple paths
     local doslashes  = (P("\\")/"/" + 1)^0
     local donegation = (P("!") /""     )^0
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index a7bd6be68..ac3caf0cb 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 f5e43d693..f0d58bf2c 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/context/base/strc-itm.mkiv b/tex/context/base/strc-itm.mkiv
index 16c97e691..c2ccfa493 100644
--- a/tex/context/base/strc-itm.mkiv
+++ b/tex/context/base/strc-itm.mkiv
@@ -883,21 +883,6 @@
          \hskip\leftskip\hskip\leftmargindistance}}%
    \itemgroupitem}
 
-\appendtoks \let\item        \itemgroupitem    \to \itemgroupcommands
-\appendtoks \let\noitem      \itemgroupnoitem  \to \itemgroupcommands
-\appendtoks \letvalue\v!item \itemgroupitem    \to \itemgroupcommands
-\appendtoks \let\itm         \itemgroupitem    \to \itemgroupcommands
-\appendtoks \let\but         \itemgroupbutton  \to \itemgroupcommands
-\appendtoks \let\nop         \itemgroupdummy   \to \itemgroupcommands
-\appendtoks \letvalue\v!sub  \itemgroupsubitem \to \itemgroupcommands
-\appendtoks \letvalue\v!sym  \itemgroupsymbol  \to \itemgroupcommands
-\appendtoks \letvalue\v!ran  \itemgroupedge    \to \itemgroupcommands
-\appendtoks \letvalue\v!head \itemgrouphead    \to \itemgroupcommands
-\appendtoks \letvalue\v!its  \itemgroupitems   \to \itemgroupcommands
-\appendtoks \letvalue\v!mar  \itemgroupmargin  \to \itemgroupcommands
-
-% todo : \startitem .. \stopitem
-%
 % beware, we don't group (yet) as we want to keep the left/right skip
 %
 % \startitemize
@@ -908,6 +893,28 @@
 %
 % so we need to keep that property
 
+\appendtoks
+    \let\item  \itemgroupitem
+    \let\noitem\itemgroupnoitem
+    \let\itm   \itemgroupitem
+    \let\but   \itemgroupbutton
+    \let\nop   \itemgroupdummy
+\to \itemgroupcommands
+
+\ifx\currentinterface \v!english \else
+
+    \appendtoks
+        \letvalue\v!item\itemgroupitem
+        \letvalue\v!sub \itemgroupsubitem
+        \letvalue\v!sym \itemgroupsymbol
+        \letvalue\v!ran \itemgroupedge
+        \letvalue\v!head\itemgrouphead
+        \letvalue\v!its \itemgroupitems
+        \letvalue\v!mar \itemgroupmargin
+    \to \itemgroupcommands
+
+\fi
+
 \let\startitemgroupitem\itemgroupitem
 
 \def\stopitemgroupitem
@@ -928,15 +935,41 @@
    \fi}
 
 \appendtoks
-  \letvalue{\e!start\v!item}\startitemgroupitem
-  \letvalue{\e!stop \v!item}\stopitemgroupitem
+    \let\startitem\startitemgroupitem
+    \let\stopitem \stopitemgroupitem
+    \let\starthead\startitemgroupitemhead
+    \let\stophead \stopitemgroupitemhead
 \to \itemgroupcommands
 
+\ifx\currentinterface \v!english \else
+
+    \appendtoks % can be sped up by \csname if needed
+        \letvalue{\e!start\v!item}\startitemgroupitem
+        \letvalue{\e!stop \v!item}\stopitemgroupitem
+        \letvalue{\e!start\v!head}\startitemgroupitemhead
+        \letvalue{\e!stop \v!head}\stopitemgroupitemhead
+    \to \itemgroupcommands
+
+\fi
+
 \appendtoks
-  \letvalue{\e!start\v!head}\startitemgroupitemhead
-  \letvalue{\e!stop \v!head}\stopitemgroupitemhead
+    \let\startspecialitem\startspecialitemgroupitem
+    \let\stopspecialitem \stopspecialitemgroupitem
 \to \itemgroupcommands
 
+\unexpanded\def\startspecialitemgroupitem[#1]%
+  {\csname\??op:\e!start:\ifcsname#1\endcsname #1\else\v!item\fi\endcsname}
+
+\unexpanded\def\stopspecialitemgroupitem
+  {\stopitemgroupitem}
+
+\letvalue{\??op:\e!start:\v!item}\itemgroupitem
+\letvalue{\??op:\e!start:\v!sub }\itemgroupsubitem
+\letvalue{\??op:\e!start:\v!sym }\itemgroupsymbol
+\letvalue{\??op:\e!start:\v!ran }\itemgroupedge
+\letvalue{\??op:\e!start:\v!its }\itemgroupitems
+\letvalue{\??op:\e!start:\v!mar }\itemgroupmargin
+
 % \startitemize
 %   \starthead {xx} test \stophead
 %   \startitem test \stopitem
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index ba34077c9..08a286e7a 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  : 10/02/11 22:44:18
+-- merge date  : 10/03/11 09:34:56
 
 do -- begin closure to overcome local limits and interference