7 files changed, 11 insertions, 10 deletions

diff --git a/tex/context/base/back-exp.lua b/tex/context/base/back-exp.lua
index f379878dd..b528f5a14 100644
--- a/tex/context/base/back-exp.lua
+++ b/tex/context/base/back-exp.lua
@@ -188,6 +188,7 @@ local attribentities    = { ["&"] = "&amp;", [">"] = "&gt;", ["<"] = "&lt;", ['"
 local p_entity          = lpeg.replacer(entities) -- was: entityremapper = utf.remapper(entities)
 local p_attribute       = lpeg.replacer(attribentities)
 local p_stripper        = lpeg.patterns.stripper
+local p_escaped         = lpeg.patterns.xml.escaped
 
 local alignmapping = {
     flushright = "right",
@@ -811,23 +812,23 @@ do
     function specials.url(result,var)
         local url = references.checkedurl(var.operation)
         if url and url ~= "" then
-            result[#result+1] = f_url(url)
+            result[#result+1] = f_url(lpegmatch(p_escaped,url))
         end
     end
 
     function specials.file(result,var)
         local file = references.checkedfile(var.operation)
         if file and file ~= "" then
-            result[#result+1] = f_file(file)
+            result[#result+1] = f_file(lpegmatch(p_escaped,file))
         end
     end
 
     function specials.fileorurl(result,var)
         local file, url = references.checkedfileorurl(var.operation,var.operation)
         if url and url ~= "" then
-            result[#result+1] = f_url(url)
+            result[#result+1] = f_url(lpegmatch(p_escaped,url))
         elseif file and file ~= "" then
-            result[#result+1] = f_file(file)
+            result[#result+1] = f_file(lpegmatch(p_escaped,file))
         end
     end
 
@@ -846,7 +847,7 @@ do
                 if prefix and prefix ~= "" then
                     result[#result+1] = f_prefix(prefix)
                 end
-                result[#result+1] = f_destination(reference)
+                result[#result+1] = f_destination(lpegmatch(p_escaped,reference))
                 for i=1,#references do
                     local r = references[i]
                     local e = evaluators[r.kind]
@@ -866,7 +867,7 @@ do
                 if prefix and prefix ~= "" then
                     result[#result+1] = f_prefix(prefix)
                 end
-                result[#result+1] = f_reference(reference)
+                result[#result+1] = f_reference(lpegmatch(p_escaped,reference))
             end
             local internal = references.internal
             if internal and internal ~= "" then
@@ -1454,7 +1455,7 @@ do
         local n = 0
         for k, v in next, a do
             n = n + 1
-            r[n] = f_attribute(k,v)
+            r[n] = f_attribute(k,v) -- lpegmatch(p_escaped,v)
         end
         return concat(r,"",1,n)
     end
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 04bc5a5b7..c14360141 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{2014.08.28 19:35}
+\newcontextversion{2014.08.28 20:19}
 
 %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 8a938e9f1..dd4b097ae 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 5d96d2ac3..fa218f7e5 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -28,7 +28,7 @@
 %D up and the dependencies are more consistent.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2014.08.28 19:35}
+\edef\contextversion{2014.08.28 20:19}
 \edef\contextkind   {beta}
 
 %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 e2be4a0b0..056508a6f 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 c175356dc..394676a26 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 12ab1211d..be74c9c05 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/28/14 19:35:24
+-- merge date  : 08/28/14 20:19:26
 
 do -- begin closure to overcome local limits and interference