summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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.mkii2
-rw-r--r--tex/context/base/context.mkiv2
-rw-r--r--tex/context/base/font-aux.lua3
-rw-r--r--tex/context/base/s-fnt-10.mkiv40
-rw-r--r--tex/context/base/status-files.pdfbin23537 -> 23561 bytes
-rw-r--r--tex/context/base/strc-itm.mkiv4
-rw-r--r--tex/generic/context/luatex-fonts-merged.lua2
9 files changed, 26 insertions, 31 deletions
diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index c0af3ec21..8db6bea2d 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{2011.03.26 12:41}
+\newcontextversion{2011.03.27 14:48}
%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 8aed059b9..2df57e5e7 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{2011.03.26 12:41}
+\newcontextversion{2011.03.27 14:48}
%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/context.mkii b/tex/context/base/context.mkii
index f96fa884e..beaf55152 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{2011.03.26 12:41}
+\edef\contextversion{2011.03.27 14:48}
%D For those who want to use this:
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 97a319cf4..96f9b374e 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -20,7 +20,7 @@
%D your styles an modules.
\edef\contextformat {\jobname}
-\edef\contextversion{2011.03.26 12:41}
+\edef\contextversion{2011.03.27 14:48}
%D For those who want to use this:
diff --git a/tex/context/base/font-aux.lua b/tex/context/base/font-aux.lua
index a3e717b44..0396554ad 100644
--- a/tex/context/base/font-aux.lua
+++ b/tex/context/base/font-aux.lua
@@ -12,7 +12,7 @@ local wrap, yield = coroutine.wrap, coroutine.yield
local fonts, font = fonts, font
local iterators = { }
-fonts.interators = iterators
+fonts.iterators = iterators
local currentfont = font.current
local identifiers = fonts.hashes.identifiers
@@ -22,7 +22,6 @@ local sortedkeys = table.sortedkeys
-- for unicode, description in fonts.iterators.descriptions() do print(k,v) end
-- for index, glyph in fonts.iterators.glyphs () do print(k,v) end
-
local function checkeddata(data) -- beware, nullfont is the fallback in identifiers
local t = type(data)
if t == "table" then
diff --git a/tex/context/base/s-fnt-10.mkiv b/tex/context/base/s-fnt-10.mkiv
index c76574d6d..d5f097300 100644
--- a/tex/context/base/s-fnt-10.mkiv
+++ b/tex/context/base/s-fnt-10.mkiv
@@ -12,23 +12,21 @@
%C details.
\startluacode
-local format, sprint = string.format, tex.sprint
-
local fontdata = fonts.hashes.identifiers
-function fonts.handlers.otf.show_all()
- local tfmdata = fontdata[font.current()]
- if tfmdata and tfmdata.shared then
- local NC, NR, char = context.NC, context.NR, context.char
- context.starttabulate { "|l|r|c|" }
- for unicode, description in fonts.iterators.characters(tfmdata) do
- NC() context(description.name) NC() context(unicode) NC() char(unicode) NC() NR()
- end
- context.stoptabulate()
- end
-end
+-- function fonts.tracers.show_all()
+-- local tfmdata = fontdata[font.current()]
+-- if tfmdata and tfmdata.shared then
+-- local NC, NR, char = context.NC, context.NR, context.char
+-- context.starttabulate { "|l|r|c|" }
+-- for unicode, description in fonts.iterators.characters(tfmdata) do
+-- NC() context(description.name) NC() context(unicode) NC() char(unicode) NC() NR()
+-- end
+-- context.stoptabulate()
+-- end
+-- end
-function fonts.show_all()
+function fonts.tracers.show_all()
local tfmdata = fontdata[font.current()]
if tfmdata then
local NC, NR, HL, char, bold, tttf = context.NC, context.NR, context.HL, context.char, context.bold, context.tttf
@@ -90,13 +88,11 @@ function fonts.show_all()
end
end
-function fonts.show_glyphs()
+function fonts.tracers.show_glyphs()
local tfmdata = fontdata[font.current()]
if tfmdata then
- for k, v in ipairs(table.sortedkeys(tfmdata.characters)) do
- if v >=0 then
- context.showglyph(v) -- local macro
- end
+ for unicode, chr in fonts.iterators.characters(tfmdata) do
+ context.showglyph(unicode)
end
end
end
@@ -115,7 +111,7 @@ end
\nonknuthmode
\startcolumns[n=#3]
\TestFont
- \ctxlua { fonts.show_all() }
+ \ctxlua { fonts.tracers.show_all() }
\stopcolumns
\page
\egroup}
@@ -134,12 +130,12 @@ end
\nonknuthmode
\startcolumns[n=#3]
\TestFontB
- \ctxlua { fonts.show_glyphs() }
+ \ctxlua { fonts.tracers.show_glyphs() }
\stopcolumns
\page
\egroup}
-% \doifnotmode{demo} {\endinput}
+\doifnotmode{demo} {\endinput}
\starttext
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 8e121dcfb..eb8291462 100644
--- a/tex/context/base/status-files.pdf
+++ b/tex/context/base/status-files.pdf
Binary files differ
diff --git a/tex/context/base/strc-itm.mkiv b/tex/context/base/strc-itm.mkiv
index 24e343132..67f42f866 100644
--- a/tex/context/base/strc-itm.mkiv
+++ b/tex/context/base/strc-itm.mkiv
@@ -1072,15 +1072,15 @@
\fi
\ifdim\currentitemmaxwidth>\zeropoint
\setbox\itemgroupitembox\simplealignedbox
- {\getitemparameter\currentitemlevel\c!itemalign}
{\dimexpr\currentitemmaxwidth+\getitemparameter\currentitemlevel\c!distance\relax}
+ {\getitemparameter\currentitemlevel\c!itemalign}
{\box\itemgroupitembox\hskip\getitemparameter\currentitemlevel\c!distance}%
\fi
\else\ifdim\itemgroupaskedwidth>\zeropoint
\doifsomething{\getitemparameter\currentitemlevel\c!itemalign}
{\setbox\itemgroupitembox\simplealignedbox
- {\getitemparameter\currentitemlevel\c!itemalign}
{\dimexpr\itemgroupaskedwidth+\getitemparameter\currentitemlevel\c!distance\relax}
+ {\getitemparameter\currentitemlevel\c!itemalign}
{\box\itemgroupitembox\hskip\getitemparameter\currentitemlevel\c!distance}}%
\fi\fi
\globallet\doitemdestination\empty
diff --git a/tex/generic/context/luatex-fonts-merged.lua b/tex/generic/context/luatex-fonts-merged.lua
index 0f0437f53..2653514fd 100644
--- a/tex/generic/context/luatex-fonts-merged.lua
+++ b/tex/generic/context/luatex-fonts-merged.lua
@@ -1,6 +1,6 @@
-- merged file : luatex-fonts-merged.lua
-- parent file : luatex-fonts.lua
--- merge date : 03/27/11 14:17:54
+-- merge date : 03/27/11 14:48:17
do -- begin closure to overcome local limits and interference