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.pdfbin4137 -> 4135 bytes
-rw-r--r--tex/context/base/context-version.pngbin40452 -> 40102 bytes
-rw-r--r--tex/context/base/context.mkii2
-rw-r--r--tex/context/base/context.mkiv2
-rw-r--r--tex/context/base/font-enh.lua40
-rw-r--r--tex/context/base/node-ini.mkiv1
-rw-r--r--tex/context/base/node-snp.lua66
-rw-r--r--tex/context/base/node-tra.lua54
-rw-r--r--tex/context/base/status-files.pdfbin24762 -> 24807 bytes
-rw-r--r--tex/context/base/status-lua.pdfbin211531 -> 211653 bytes
-rw-r--r--tex/context/base/status-mkiv.lua5
-rw-r--r--tex/context/base/symb-imp-cc.mkiv52
-rw-r--r--tex/context/base/trac-tim.lua2
-rw-r--r--tex/context/fonts/cc-icons.lfg23
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
17 files changed, 180 insertions, 73 deletions
diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index 898380b81..8143f7ad7 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.21 23:27}
+\newcontextversion{2013.03.22 12:06}
%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 0c8a13691..4d7010018 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.21 23:27}
+\newcontextversion{2013.03.22 12:06}
%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 6b3085d46..5f5d276e4 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 5338fd32c..ecec9716f 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 a0e0d3324..0cfa4d7c1 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.21 23:27}
+\edef\contextversion{2013.03.22 12:06}
%D For those who want to use this:
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 2bd5c1d1b..0734bb7c2 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.21 23:27}
+\edef\contextversion{2013.03.22 12:06}
%D For those who want to use this:
diff --git a/tex/context/base/font-enh.lua b/tex/context/base/font-enh.lua
index 65bbe7bd9..9338fc20b 100644
--- a/tex/context/base/font-enh.lua
+++ b/tex/context/base/font-enh.lua
@@ -8,8 +8,12 @@ if not modules then modules = { } end modules ['font-enh'] = {
local next = next
-local trace_defining = false trackers.register("fonts.defining", function(v) trace_defining = v end)
-local report_defining = logs.reporter("fonts","defining")
+local trace_unicoding = false
+
+trackers.register("fonts.defining", function(v) trace_unicoding = v end)
+trackers.register("fonts.unicoding", function(v) trace_unicoding = v end)
+
+local report_unicoding = logs.reporter("fonts","unicoding")
local fonts = fonts
local constructors = fonts.constructors
@@ -43,8 +47,8 @@ local registerotffeature = otffeatures.register
-- end
-- for newcode, oldcode in next, data.unicodes do
-- if newcode ~= oldcode then
--- if trace_defining then
--- report_defining("reencoding %U to %U",oldcode,newcode)
+-- if trace_unicoding then
+-- report_unicoding("reencoding %U to %U",oldcode,newcode)
-- end
-- characters[newcode] = original[oldcode]
-- end
@@ -71,8 +75,8 @@ local registerotffeature = otffeatures.register
-- end
-- for k,v in next, vector do
-- if k ~= v then
--- if trace_defining then
--- report_defining("remapping %U to %U",k,v)
+-- if trace_unicoding then
+-- report_unicoding("remapping %U to %U",k,v)
-- end
-- local c = original[k]
-- characters[v] = c
@@ -137,13 +141,17 @@ local function initializeunicoding(tfmdata)
description = descriptions[newcode],
}
end
- local original = originals[oldcode]
- if original then
- characters [newcode] = original.character
- descriptions[newcode] = original.description
+ if oldcode then
+ local original = originals[oldcode]
+ if original then
+ characters [newcode] = original.character
+ descriptions[newcode] = original.description
+ else
+ characters [newcode] = characters [oldcode]
+ descriptions[newcode] = descriptions[oldcode]
+ end
else
- characters [newcode] = characters [oldcode]
- descriptions[newcode] = descriptions[oldcode]
+ oldcoding[name] = newcode
end
if tounicode then
local index = descriptions[newcode].index
@@ -151,8 +159,12 @@ local function initializeunicoding(tfmdata)
tounicodes[index] = tosixteen(newcode) -- shared (we could have a metatable)
end
end
- if trace_defining then
- report_defining("aliasing glyph %a from %U to %U",name,oldcode,newcode)
+ if trace_unicoding then
+ if oldcode then
+ report_unicoding("aliasing glyph %a from %U to %U",name,oldcode,newcode)
+ else
+ report_unicoding("aliasing glyph %a to %U",name,newcode)
+ end
end
end
end
diff --git a/tex/context/base/node-ini.mkiv b/tex/context/base/node-ini.mkiv
index 12798e161..39d48a00a 100644
--- a/tex/context/base/node-ini.mkiv
+++ b/tex/context/base/node-ini.mkiv
@@ -23,6 +23,7 @@
\registerctxluafile{node-aux}{1.001}
\registerctxluafile{node-tst}{1.001}
\registerctxluafile{node-tra}{1.001} % we might split it off (module)
+\registerctxluafile{node-snp}{1.001}
\registerctxluafile{node-tsk}{1.001}
\registerctxluafile{node-tex}{1.001}
\registerctxluafile{node-pro}{1.001}
diff --git a/tex/context/base/node-snp.lua b/tex/context/base/node-snp.lua
new file mode 100644
index 000000000..31c7771ac
--- /dev/null
+++ b/tex/context/base/node-snp.lua
@@ -0,0 +1,66 @@
+if not modules then modules = { } end modules ['node-snp'] = {
+ version = 1.001,
+ comment = "companion to node-ini.mkiv",
+ author = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
+ copyright = "PRAGMA ADE / ConTeXt Development Team",
+ license = "see context related readme files"
+}
+
+if not nodes then
+ nodes = { } -- also loaded in mtx-timing
+end
+
+local snapshots = { }
+nodes.snapshots = snapshots
+
+local nodeusage = nodes.pool and nodes.pool.usage
+local clock = os.gettimeofday or os.clock -- should go in environment
+local lasttime = clock()
+local samples = { }
+
+local parameters = {
+ "cs_count",
+ "dyn_used",
+ "elapsed_time",
+ "luabytecode_bytes",
+ "luastate_bytes",
+ "max_buf_stack",
+ "obj_ptr",
+ "pdf_mem_ptr",
+ "pdf_mem_size",
+ "pdf_os_cntr",
+-- "pool_ptr", -- obsolete
+ "str_ptr",
+}
+
+function snapshots.takesample(comment)
+ if nodeusage then
+ local c = clock()
+ local t = {
+ elapsed_time = c - lasttime,
+ node_memory = nodeusage(),
+ comment = comment,
+ }
+ for i=1,#parameters do
+ local parameter = parameters[i]
+ local ps = status[parameter]
+ if ps then
+ t[parameter] = ps
+ end
+ end
+ samples[#samples+1] = t
+ lasttime = c
+ end
+end
+
+function snapshots.getsamples()
+ return samples -- one return value !
+end
+
+function snapshots.resetsamples()
+ samples = { }
+end
+
+function snapshots.getparameters()
+ return parameters
+end
diff --git a/tex/context/base/node-tra.lua b/tex/context/base/node-tra.lua
index 10d44a4cc..916b2143d 100644
--- a/tex/context/base/node-tra.lua
+++ b/tex/context/base/node-tra.lua
@@ -527,57 +527,3 @@ nodes.visualizers = { }
function nodes.visualizers.handler(head)
return head, false
end
-
--- also moved here
-
-local snapshots = { }
-nodes.snapshots = snapshots
-
-local nodeusage = nodepool.usage
-
-local lasttime = clock()
-local samples = { }
-local parameters = {
- "cs_count",
- "dyn_used",
- "elapsed_time",
- "luabytecode_bytes",
- "luastate_bytes",
- "max_buf_stack",
- "obj_ptr",
- "pdf_mem_ptr",
- "pdf_mem_size",
- "pdf_os_cntr",
--- "pool_ptr", -- obsolete
- "str_ptr",
-}
-
-function snapshots.takesample(comment)
- local c = clock()
- local t = {
- elapsed_time = c - lasttime,
- node_memory = nodeusage(),
- comment = comment,
- }
- for i=1,#parameters do
- local parameter = parameters[i]
- local ps = status[parameter]
- if ps then
- t[parameter] = ps
- end
- end
- samples[#samples+1] = t
- lasttime = c
-end
-
-function snapshots.getsamples()
- return samples -- one return value !
-end
-
-function snapshots.resetsamples()
- samples = { }
-end
-
-function snapshots.getparameters()
- return parameters
-end
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 22f54435d..f2d760198 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 4bc2c0fc3..c05736dfb 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
Binary files differ
diff --git a/tex/context/base/status-mkiv.lua b/tex/context/base/status-mkiv.lua
index cf41da58c..b09e498e8 100644
--- a/tex/context/base/status-mkiv.lua
+++ b/tex/context/base/status-mkiv.lua
@@ -4017,6 +4017,11 @@ return {
},
{
category = "lua",
+ filename = "node-snp",
+ status = "todo",
+ },
+ {
+ category = "lua",
filename = "node-tsk",
status = "todo",
},
diff --git a/tex/context/base/symb-imp-cc.mkiv b/tex/context/base/symb-imp-cc.mkiv
new file mode 100644
index 000000000..6d544289b
--- /dev/null
+++ b/tex/context/base/symb-imp-cc.mkiv
@@ -0,0 +1,52 @@
+%D \module
+%D [ file=symb-imp-cc,
+%D version=2013.03.22,
+%D title=\CONTEXT\ Symbol Libraries,
+%D subtitle=Creative Commons,
+%D author=Hans Hagen,
+%D date=\currentdate,
+%D copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+\definefontfeature
+ [cc-icons]
+ [mode=base,
+ goodies=cc-icons,
+ unicoding=yes]
+
+\definefontsynonym
+ [creativecommons]
+ [cc-icons*cc-icons]
+
+\startsymbolset[cc]
+ \definesymbol [sa] [\getnamedglyphdirect{creativecommons}{sa}]
+ \definesymbol [by] [\getnamedglyphdirect{creativecommons}{by}]
+ \definesymbol [cc] [\getnamedglyphdirect{creativecommons}{cc}]
+ \definesymbol [nd] [\getnamedglyphdirect{creativecommons}{nd}]
+ \definesymbol [nc] [\getnamedglyphdirect{creativecommons}{nc}]
+ \definesymbol [sampling] [\getnamedglyphdirect{creativecommons}{sampling}]
+ \definesymbol [share] [\getnamedglyphdirect{creativecommons}{share}]
+ \definesymbol [remix] [\getnamedglyphdirect{creativecommons}{remix}]
+ \definesymbol [logo] [\getnamedglyphdirect{creativecommons}{logo}]
+
+ \definesymbol [cc-by-sa-nc] [\dontleavehmode\lower.25ex\hbox\bgroup
+ \getnamedglyphdirect{creativecommons}{cc}\enspace
+ \getnamedglyphdirect{creativecommons}{by}\enspace
+ \getnamedglyphdirect{creativecommons}{sa}\enspace
+ \getnamedglyphdirect{creativecommons}{nc}%
+ \egroup]
+
+\stopsymbolset
+
+\continueifinputfile{symb-imp-cc.mkiv}
+
+\starttext
+
+ \showsymbolset[cc]
+
+ \symbol[cc][cc-by-sa-nc]
+
+\stoptext
diff --git a/tex/context/base/trac-tim.lua b/tex/context/base/trac-tim.lua
index 527efa088..15ac9bf1b 100644
--- a/tex/context/base/trac-tim.lua
+++ b/tex/context/base/trac-tim.lua
@@ -16,6 +16,8 @@ moduledata.progress = progress
local report_timing = logs.reporter("timing")
+if not nodes then nodes = { } end -- when loaded in mtxrun
+
progress.parameters = nodes and nodes.snapshots.getparameters
progress.defaultfilename = ((tex and tex.jobname) or "whatever") .. "-luatex-progress"
diff --git a/tex/context/fonts/cc-icons.lfg b/tex/context/fonts/cc-icons.lfg
new file mode 100644
index 000000000..2739918af
--- /dev/null
+++ b/tex/context/fonts/cc-icons.lfg
@@ -0,0 +1,23 @@
+local utfbyte = utf.byte
+
+return {
+ name = "cc-icons",
+ version = "1.00",
+ comment = "Goodies that complement creative commons icons.",
+ author = "Hans Hagen",
+ copyright = "ConTeXt development team",
+ remapping = {
+ tounicode = true,
+ unicodes = {
+ sa = utfbyte("a"),
+ by = utfbyte("b"),
+ cc = utfbyte("c"),
+ nd = utfbyte("d"),
+ nc = utfbyte("n"),
+ sampling = utfbyte("m"),
+ share = utfbyte("s"),
+ remix = utfbyte("r"),
+ logo = utfbyte("C"),
+ },
+ },
+}
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 99c1a22f0..5786e460b 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/21/13 23:27:35
+-- merge date : 03/22/13 12:06:35
do -- begin closure to overcome local limits and interference
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-24 12:14:49 +0000