summaryrefslogtreecommitdiff
path: root/tex
diff options
context:
space:
mode:
Diffstat (limited to 'tex')
-rw-r--r--tex/context/base/cont-new.mkii2
-rw-r--r--tex/context/base/cont-new.mkiv2
-rw-r--r--tex/context/base/context-version.pdfbin4133 -> 4135 bytes
-rw-r--r--tex/context/base/context-version.pngbin40048 -> 40298 bytes
-rw-r--r--tex/context/base/context.mkii2
-rw-r--r--tex/context/base/context.mkiv2
-rw-r--r--tex/context/base/font-col.lua20
-rw-r--r--tex/context/base/status-files.pdfbin24737 -> 24737 bytes
-rw-r--r--tex/context/base/status-lua.pdfbin210131 -> 210272 bytes
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
10 files changed, 15 insertions, 15 deletions
diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index 7114776b4..8221b3118 100644
--- a/tex/context/base/cont-new.mkii
+++ b/tex/context/base/cont-new.mkii
@@ -11,7 +11,7 @@
%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
%C details.
-\newcontextversion{2013.03.13 01:49}
+\newcontextversion{2013.03.13 12:15}
%D This file is loaded at runtime, thereby providing an
%D excellent place for hacks, patches, extensions and new
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index a53c59008..224cb5d53 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.03.13 01:49}
+\newcontextversion{2013.03.13 12:15}
%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 56b5ecd6d..45d05b1e5 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-version.png b/tex/context/base/context-version.png
index afc6ed874..871adf0d0 100644
--- a/tex/context/base/context-version.png
+++ b/tex/context/base/context-version.png
Binary files differ
diff --git a/tex/context/base/context.mkii b/tex/context/base/context.mkii
index 8ecf9749e..dc9025023 100644
--- a/tex/context/base/context.mkii
+++ b/tex/context/base/context.mkii
@@ -20,7 +20,7 @@
%D your styles an modules.
\edef\contextformat {\jobname}
-\edef\contextversion{2013.03.13 01:49}
+\edef\contextversion{2013.03.13 12:15}
%D For those who want to use this:
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 97b0f246c..60b1aea52 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.03.13 01:49}
+\edef\contextversion{2013.03.13 12:15}
%D For those who want to use this:
diff --git a/tex/context/base/font-col.lua b/tex/context/base/font-col.lua
index b884c1457..20c99c9b4 100644
--- a/tex/context/base/font-col.lua
+++ b/tex/context/base/font-col.lua
@@ -24,18 +24,18 @@ local trace_collecting = false trackers.register("fonts.collecting", function
local report_fonts = logs.reporter("fonts","collections")
-fonts.collections = fonts.collections or { }
-local collections = fonts.collections
+local collections = fonts.collections or { }
+fonts.collections = collections
-collections.definitions = collections.definitions or { }
-local definitions = collections.definitions
+local definitions = collections.definitions or { }
+collections.definitions = definitions
-collections.vectors = collections.vectors or { }
-local vectors = collections.vectors
+local vectors = collections.vectors or { }
+collections.vectors = vectors
local fontdata = fonts.hashes.identifiers
-
local glyph_code = nodes.nodecodes.glyph
+local currentfont = font.current
local fontpatternhassize = fonts.helpers.fontpatternhassize
@@ -63,7 +63,7 @@ function collections.define(name,font,ranges,details)
-- todo: details -> method=force|conditional rscale=
-- todo: remap=name
local d = definitions[name]
- if d then
+ if not d then
d = { }
definitions[name] = d
end
@@ -95,7 +95,7 @@ end
-- todo: provide a lua variant (like with definefont)
function collections.registermain(name)
- local last = font.current()
+ local last = currentfont()
if trace_collecting then
report_fonts("registering font %a with name %a",last,name)
end
@@ -164,7 +164,7 @@ end
-- if lpegmatch(okay,name) then
function collections.prepare(name)
- current = font.current()
+ current = currentfont()
if vectors[current] then
return
end
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 6484a2242..106bf08a9 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 d97aa464c..cbf32dc38 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 072ad10e8..3b919f1bd 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 : 03/13/13 01:49:09
+-- merge date : 03/13/13 12:15:24
do -- begin closure to overcome local limits and interference