beta 2013.09.20 14:01

12 files changed, 20 insertions, 14 deletions

diff --git a/tex/context/base/buff-ini.lua b/tex/context/base/buff-ini.lua
index 7a92b873e..9d0aa0a6f 100644
--- a/tex/context/base/buff-ini.lua
+++ b/tex/context/base/buff-ini.lua
@@ -364,7 +364,7 @@ function commands.runbuffer(name,encapsulate) -- we used to compare the saved fi
             content = formatters["\\starttext\n%s\n\\stoptext\n"](content)
         end
         io.savedata(filename,content)
-        local command = formatters["context %s"](filename)
+        local command = formatters["context %s %s"](jit and "--jit" or "",filename)
         report_typeset("running: %s\n",command)
         os.execute(command)
         markastypeset(names)
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index da3e9b66e..61ac09253 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.20 00:32}
+\newcontextversion{2013.09.20 14:01}
 
 %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 81208541f..b0cb5c512 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 d5dc4f1db..e7f118fdc 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.20 00:32}
+\edef\contextversion{2013.09.20 14:01}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/font-ini.mkvi b/tex/context/base/font-ini.mkvi
index 0d356895e..a627310e0 100644
--- a/tex/context/base/font-ini.mkvi
+++ b/tex/context/base/font-ini.mkvi
@@ -1524,7 +1524,7 @@
 
 \unexpanded\def\font_basics_define_body_font_name_identifier_a#name#identifier#style%
   {%\writestatus\m!fonts{[#name:#style] => [##identifier:#style]}%
-   \ifcsname\csname\??fontdefinitions#name:#style\endcsname
+   \ifcsname\??fontdefinitions#name:#style\endcsname
      \expandafter\let\csname\??fontdefinitions#name:#style\expandafter\endcsname\csname\??fontdefinitions#identifier:#style\endcsname
    \else
      \expandafter\def\csname\??fontdefinitions#name:#style\endcsname{\csname\??fontdefinitions#identifier:#style\endcsname}%
diff --git a/tex/context/base/font-syn.lua b/tex/context/base/font-syn.lua
index 34aeb0819..ead571938 100644
--- a/tex/context/base/font-syn.lua
+++ b/tex/context/base/font-syn.lua
@@ -828,7 +828,7 @@ local function analyzefiles(olddata)
     local oldindices         = olddata and olddata.indices        or { }
     local oldspecifications  = olddata and olddata.specifications or { }
     local oldrejected        = olddata and olddata.rejected       or { }
-    local treatmentdata      = fonts.treatments.data
+    local treatmentdata      = fonts.treatments and fonts.treatments.data or { } -- when used outside context
     local function identify(completename,name,suffix,storedname)
         local pathpart, basepart = splitbase(completename)
         nofread = nofread + 1
diff --git a/tex/context/base/l-url.lua b/tex/context/base/l-url.lua
index 4624a0507..7b7910fa7 100644
--- a/tex/context/base/l-url.lua
+++ b/tex/context/base/l-url.lua
@@ -79,12 +79,18 @@ setmetatable(escapes, { __index = function(t,k)
     return v
 end })
 
-local escaper   = Cs((R("09","AZ","az")^1 + P(" ")/"%%20" + S("-./_")^1 + P(1) / escapes)^0) -- space happens most
-local unescaper = Cs((escapedchar + 1)^0)
+local escaper    = Cs((R("09","AZ","az")^1 + P(" ")/"%%20" + S("-./_")^1 + P(1) / escapes)^0) -- space happens most
+local unescaper  = Cs((escapedchar + 1)^0)
+local getcleaner = Cs((P("+++") / "%%2B" + P("+") / "%%20" + P(1))^1)
 
-lpegpatterns.urlunescaped = escapedchar
-lpegpatterns.urlescaper   = escaper
-lpegpatterns.urlunescaper = unescaper
+lpegpatterns.urlunescaped  = escapedchar
+lpegpatterns.urlescaper    = escaper
+lpegpatterns.urlunescaper  = unescaper
+lpegpatterns.urlgetcleaner = getcleaner
+
+function url.unescapeget(str)
+    return lpegmatch(getcleaner,str)
+end
 
 -- todo: reconsider Ct as we can as well have five return values (saves a table)
 -- so we can have two parsers, one with and one without
diff --git a/tex/context/base/math-noa.lua b/tex/context/base/math-noa.lua
index f72f568d4..f3987c12f 100644
--- a/tex/context/base/math-noa.lua
+++ b/tex/context/base/math-noa.lua
@@ -1108,7 +1108,7 @@ local colors = {
 }
 
 classes[math_char] = function(pointer,what,n,parent)
-    local color = colors[getsubtype(parent)]
+    local color = colors[parent.subtype]
     if color then
         setcolor(pointer,color)
     else
diff --git a/tex/context/base/page-mix.lua b/tex/context/base/page-mix.lua
index ef5308546..7a97655d2 100644
--- a/tex/context/base/page-mix.lua
+++ b/tex/context/base/page-mix.lua
@@ -135,7 +135,7 @@ local function discardtopglue(current,discarded)
         elseif id == penalty_code then
             if current.penalty == forcedbreak then
                 discarded[#discarded+1] = current
-                current = getnext(current)
+                current = current.next
                 while current and current.id == glue_code do
                     size = size + current.spec.width
                     discarded[#discarded+1] = current
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 7a8e96de4..cd0124e77 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 325d8a435..ea0c241c1 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.20 00:32 MKIV beta  fmt: 2013.9.20  int: english/english
+ConTeXt  ver: 2013.09.20 14:01 MKIV beta  fmt: 2013.9.20  int: english/english
 
 system          > 'cont-new.mkiv' loaded
 (cont-new.mkiv)
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 9df3a35e4..13a42a24f 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/20/13 00:32:07
+-- merge date  : 09/20/13 14:01:24
 
 do -- begin closure to overcome local limits and interference