summaryrefslogtreecommitdiff
path: root/tex
diff options
context:
space:
mode:
authorHans Hagen <pragma@wxs.nl>2013-06-10 22:51:00 +0200
committerHans Hagen <pragma@wxs.nl>2013-06-10 22:51:00 +0200
commit522bda44879e834e502851dee212bbb4eb93fc11 (patch)
tree0a8312316e285291b8bdb56eb1601e014eebc015 /tex
parentd417ab69ba3ef350b2c576d1eacb9b555df9c870 (diff)
downloadcontext-522bda44879e834e502851dee212bbb4eb93fc11.tar.gz
beta 2013.06.10 22:51
Diffstat (limited to 'tex')
-rw-r--r--tex/context/base/cont-new.mkiv2
-rw-r--r--tex/context/base/context-version.pdfbin4104 -> 4103 bytes
-rw-r--r--tex/context/base/context.mkiv2
-rw-r--r--tex/context/base/m-database.lua5
-rw-r--r--tex/context/base/m-database.mkiv1
-rw-r--r--tex/context/base/status-files.pdfbin24634 -> 24635 bytes
-rw-r--r--tex/context/base/status-lua.pdfbin213137 -> 213195 bytes
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
8 files changed, 8 insertions, 4 deletions
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 2dfef3f31..0e3ff6cf6 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.06.10 22:31}
+\newcontextversion{2013.06.10 22:51}
%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 f3726f9a2..f08b763d1 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 2efac7624..2d018984d 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.06.10 22:31}
+\edef\contextversion{2013.06.10 22:51}
\edef\contextkind {beta}
%D For those who want to use this:
diff --git a/tex/context/base/m-database.lua b/tex/context/base/m-database.lua
index 0aaee7e93..31e87ad40 100644
--- a/tex/context/base/m-database.lua
+++ b/tex/context/base/m-database.lua
@@ -48,6 +48,8 @@ function moduledata.database.csv.process(settings)
data = buffers.getlines(settings.database)
end
if data and #data > 0 then
+ local catcodes = tonumber(settings.catcodes) or tex.catcodetable
+ context.pushcatcodes(catcodes)
if trace_flush then
context.pushlogger(report_database)
end
@@ -65,7 +67,7 @@ function moduledata.database.csv.process(settings)
local quotedata = nil
for chr in gmatch(quotechar,".") do
local quotechar = lpegP(chr)
- local quoteword = l_space^0 * quotechar * lpegC((1 - quotechar)^0) * quotechar * l_space^0
+ local quoteword = lpegCs(((l_space^0 * quotechar)/"") * (1 - quotechar)^0 * ((quotechar * l_space^0)/""))
if quotedata then
quotedata = quotedata + quoteword
else
@@ -120,6 +122,7 @@ function moduledata.database.csv.process(settings)
context.endgroup()
end
end
+ context.popcatcodes()
if trace_flush then
context.poplogger()
end
diff --git a/tex/context/base/m-database.mkiv b/tex/context/base/m-database.mkiv
index b7357f11a..cc7dd3d72 100644
--- a/tex/context/base/m-database.mkiv
+++ b/tex/context/base/m-database.mkiv
@@ -68,6 +68,7 @@
left = \!!bs\databaseparameter\c!left \!!es,
right = \!!bs\databaseparameter\c!right \!!es,
command = \!!bs\databaseparameter\c!command \!!es,
+ catcodes = \number\catcodetable
}}}
\unexpanded\def\processdatabasebuffer{\dodoubleempty\module_database_process_buffer}
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index a5197f7b8..bff528ee0 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.pdf b/tex/context/base/status-lua.pdf
index c124504c2..c2a6132f1 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
Binary files differ
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 406e567b3..4cd0c4dc0 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 : 06/10/13 22:31:59
+-- merge date : 06/10/13 22:51:12
do -- begin closure to overcome local limits and interference