beta 2011.10.03 09:34

8 files changed, 72 insertions, 19 deletions

diff --git a/scripts/context/lua/mtxrun.lua b/scripts/context/lua/mtxrun.lua
index c5232a6d3..b8c1cc587 100644
--- a/scripts/context/lua/mtxrun.lua
+++ b/scripts/context/lua/mtxrun.lua
@@ -10637,6 +10637,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/scripts/context/stubs/mswin/mtxrun.lua b/scripts/context/stubs/mswin/mtxrun.lua
index c5232a6d3..b8c1cc587 100644
--- a/scripts/context/stubs/mswin/mtxrun.lua
+++ b/scripts/context/stubs/mswin/mtxrun.lua
@@ -10637,6 +10637,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/scripts/context/stubs/unix/mtxrun b/scripts/context/stubs/unix/mtxrun
index c5232a6d3..b8c1cc587 100755
--- a/scripts/context/stubs/unix/mtxrun
+++ b/scripts/context/stubs/unix/mtxrun
@@ -10637,6 +10637,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/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/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