summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans Hagen <pragma@wxs.nl>2013-09-18 19:57:00 +0200
committerHans Hagen <pragma@wxs.nl>2013-09-18 19:57:00 +0200
commit55b9041a2de87b34eb3fa158ae4952f484b6e9fa (patch)
treeba97b0853c32fc9c06a92b2f99d8d85c7febbf64
parent14cebb2c0ae1d04c4cb494f7daafd708c206f485 (diff)
downloadcontext-55b9041a2de87b34eb3fa158ae4952f484b6e9fa.tar.gz
beta 2013.09.18 19:57
-rw-r--r--scripts/context/ruby/base/switch.rb12
-rw-r--r--tex/context/base/cont-new.mkiv2
-rw-r--r--tex/context/base/context-version.pdfbin4108 -> 4109 bytes
-rw-r--r--tex/context/base/context.mkiv2
-rw-r--r--tex/context/base/status-files.pdfbin24750 -> 24755 bytes
-rw-r--r--tex/context/base/status-lua.log2
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
7 files changed, 10 insertions, 10 deletions
diff --git a/scripts/context/ruby/base/switch.rb b/scripts/context/ruby/base/switch.rb
index e1d2283a4..73f532082 100644
--- a/scripts/context/ruby/base/switch.rb
+++ b/scripts/context/ruby/base/switch.rb
@@ -487,20 +487,20 @@ class CommandLine
private
- def dirtyvalue(value)
+ def dirtyvalue(value) # \xFF suddenly doesn't work any longer
if value then
value.gsub(/([\"\'])(.*?)\1/) do
- $2.gsub(/\s+/o, "\xFFFC")
+ $2.gsub(/\s+/o, "\0xFF")
end
else
''
end
end
- def cleanvalue(value)
+ def cleanvalue(value) # \xFF suddenly doesn't work any longer
if value then
- # value.sub(/^([\"\'])(.*?)\1$/) { $2.gsub(/\xFFFC/o, ' ') }
- value.gsub(/\xFFFC/o, ' ')
+ # value.sub(/^([\"\'])(.*?)\1$/) { $2.gsub(/\xFF/o, ' ') }
+ value.gsub(/\0xFF/o, ' ')
else
''
end
@@ -569,7 +569,7 @@ class CommandLine
def locateseries(series, value)
- series.each do |key|
+ series.each_char do |key| # was .each but there is no alias to each_char any longer
locatesingle(key,cleanvalue(value))
end
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 497397121..c397f51f8 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.18 19:09}
+\newcontextversion{2013.09.18 19:57}
%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 bc99742ce..ceeaf90a4 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
Binary files differ
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 5f49d7857..ff39412f0 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.18 19:09}
+\edef\contextversion{2013.09.18 19:57}
\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 5ca575b44..a81b02912 100644
--- a/tex/context/base/status-files.pdf
+++ b/tex/context/base/status-files.pdf
Binary files differ
diff --git a/tex/context/base/status-lua.log b/tex/context/base/status-lua.log
index 10358a1a5..2bdae9389 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.18 19:09 MKIV beta fmt: 2013.9.18 int: english/english
+ConTeXt ver: 2013.09.18 19:57 MKIV beta fmt: 2013.9.18 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 b868d9ac3..190afa692 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/18/13 19:09:33
+-- merge date : 09/18/13 19:57:11
do -- begin closure to overcome local limits and interference