beta 2013.09.02 23:42

9 files changed, 35 insertions, 12 deletions

diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index b34d83c8e..152e4791d 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{2013.09.01 23:43}
+\newcontextversion{2013.09.02 23:42}
 
 %D This file is loaded at runtime, thereby providing an excellent place for
 %D hacks, patches, extensions and new features.
diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf
index beb579ace..2eb4d1855 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 70f6068b7..0ab94bb68 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -25,7 +25,7 @@
 %D up and the dependencies are more consistent.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2013.09.01 23:43}
+\edef\contextversion{2013.09.02 23:42}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/l-dir.lua b/tex/context/base/l-dir.lua
index e47de6031..40081cc3b 100644
--- a/tex/context/base/l-dir.lua
+++ b/tex/context/base/l-dir.lua
@@ -26,6 +26,8 @@ local isfile     = lfs.isfile
 local currentdir = lfs.currentdir
 local chdir      = lfs.chdir
 
+local onwindows  = os.type == "windows" or find(os.getenv("PATH"),";")
+
 -- in case we load outside luatex
 
 if not isdir then
@@ -136,11 +138,33 @@ end
 
 dir.collectpattern = collectpattern
 
-local pattern = Ct {
-    [1] = (C(P(".") + P("/")^1) + C(R("az","AZ") * P(":") * P("/")^0) + Cc("./")) * V(2) * V(3),
-    [2] = C(((1-S("*?/"))^0 * P("/"))^0),
-    [3] = C(P(1)^0)
-}
+local separator
+
+if onwindows then -- we could sanitize here
+
+--     pattern = Ct {
+--         [1] = (C(P(".") + S("/\\")^1) + C(R("az","AZ") * P(":") * S("/\\")^0) + Cc("./")) * V(2) * V(3),
+--         [2] = C(((1-S("*?/\\"))^0 * S("/\\"))^0),
+--         [3] = C(P(1)^0)
+--     }
+
+    local slash = S("/\\") / "/"
+
+    pattern = Ct {
+        [1] = (Cs(P(".") + slash^1) + Cs(R("az","AZ") * P(":") * slash^0) + Cc("./")) * V(2) * V(3),
+        [2] = Cs(((1-S("*?/\\"))^0 * slash)^0),
+        [3] = Cs(P(1)^0)
+    }
+
+else -- assume unix
+
+    pattern = Ct {
+        [1] = (C(P(".") + P("/")^1) + Cc("./")) * V(2) * V(3),
+        [2] = C(((1-S("*?/"))^0 * P("/"))^0),
+        [3] = C(P(1)^0)
+    }
+
+end
 
 local filter = Cs ( (
     P("**") / ".*" +
@@ -257,8 +281,6 @@ end
 
 local make_indeed = true -- false
 
-local onwindows = os.type == "windows" or find(os.getenv("PATH"),";")
-
 if onwindows then
 
     function dir.mkdirs(...)
diff --git a/tex/context/base/page-mix.mkiv b/tex/context/base/page-mix.mkiv
index 56a1249ca..a40418d58 100644
--- a/tex/context/base/page-mix.mkiv
+++ b/tex/context/base/page-mix.mkiv
@@ -226,7 +226,7 @@
 
 \unexpanded\def\page_mix_command_set_hsize
   {\hsize\d_page_mix_column_width
-   \textwidth\d_page_mul_used_width} % needs thinking ... grouping etc
+   \textwidth\d_page_mix_column_width}
 
 %D When setting the vsize we make sure that we collect a few more lines than needed
 %D so that we have enough to split over the columns. Collecting too much is somewhat
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index f43aa0865..1274adee6 100644
--- a/tex/context/base/status-files.pdf
+++ b/tex/context/base/status-files.pdf
diff --git a/tex/context/base/status-lua.log b/tex/context/base/status-lua.log
index 3820e0e4a..55845e697 100644
--- a/tex/context/base/status-lua.log
+++ b/tex/context/base/status-lua.log
@@ -1,6 +1,6 @@
 (cont-yes.mkiv
 
-ConTeXt  ver: 2013.09.01 23:43 MKIV beta  fmt: 2013.9.1  int: english/english
+ConTeXt  ver: 2013.09.02 23:42 MKIV beta  fmt: 2013.9.2  int: english/english
 
 system          > 'cont-new.mkiv' loaded
 (cont-new.mkiv)
diff --git a/tex/context/base/tabl-tbl.mkiv b/tex/context/base/tabl-tbl.mkiv
index 8bc0624e6..57b5dd9c8 100644
--- a/tex/context/base/tabl-tbl.mkiv
+++ b/tex/context/base/tabl-tbl.mkiv
@@ -728,6 +728,7 @@
 
 \installcorenamespace{tabulatecolorspec}
 
+\setvalue{\??tabulatecolorspec C}#1{\xdef\m_tabl_tabulate_color     {#1}\global\c_tabl_tabulate_colorspan\zerocount}
 \setvalue{\??tabulatecolorspec L}#1{\xdef\m_tabl_tabulate_color     {#1}\global\c_tabl_tabulate_colorspan\plusone  }
 \setvalue{\??tabulatecolorspec M}#1{\xdef\m_tabl_tabulate_color     {#1}\global\c_tabl_tabulate_colorspan\plustwo  }
 \setvalue{\??tabulatecolorspec R}#1{\xdef\m_tabl_tabulate_color     {#1}\global\c_tabl_tabulate_colorspan\plusthree}
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 2f7009708..b8aa292ac 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  : 09/01/13 23:43:34
+-- merge date  : 09/02/13 23:42:52
 
 do -- begin closure to overcome local limits and interference