summaryrefslogtreecommitdiff
path: root/tex
diff options
context:
space:
mode:
Diffstat (limited to 'tex')
-rw-r--r--tex/context/base/cont-new.mkiv2
-rw-r--r--tex/context/base/context-version.pdfbin4132 -> 4134 bytes
-rw-r--r--tex/context/base/context-version.pngbin40520 -> 40526 bytes
-rw-r--r--tex/context/base/context.mkiv2
-rw-r--r--tex/context/base/font-enh.lua9
-rw-r--r--tex/context/base/l-package.lua8
-rw-r--r--tex/context/base/status-files.pdfbin24733 -> 24748 bytes
-rw-r--r--tex/context/base/status-lua.pdfbin211450 -> 211484 bytes
-rw-r--r--tex/context/base/symb-imp-cc.mkiv19
-rw-r--r--tex/context/fonts/cc-icons.lfg6
-rw-r--r--tex/context/fonts/ccicons.lfg4
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
12 files changed, 30 insertions, 22 deletions
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 17f7b3d08..52c58c99c 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.04.17 17:29}
+\newcontextversion{2013.04.17 18:36}
%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 eb9088ef9..9c62d6945 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 83a3164fd..7e9beb60a 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.mkiv b/tex/context/base/context.mkiv
index 5fece4a9b..7b0ad79d7 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.04.17 17:29}
+\edef\contextversion{2013.04.17 18:36}
\edef\contextkind {beta}
%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 9338fc20b..2bf0741f5 100644
--- a/tex/context/base/font-enh.lua
+++ b/tex/context/base/font-enh.lua
@@ -154,9 +154,12 @@ local function initializeunicoding(tfmdata)
oldcoding[name] = newcode
end
if tounicode then
- local index = descriptions[newcode].index
- if not tounicodes[index] then
- tounicodes[index] = tosixteen(newcode) -- shared (we could have a metatable)
+ local description = descriptions[newcode]
+ if description then
+ local index = description.index
+ if not tounicodes[index] then
+ tounicodes[index] = tosixteen(newcode) -- shared (we could have a metatable)
+ end
end
end
if trace_unicoding then
diff --git a/tex/context/base/l-package.lua b/tex/context/base/l-package.lua
index a695531c9..7b82fa541 100644
--- a/tex/context/base/l-package.lua
+++ b/tex/context/base/l-package.lua
@@ -60,10 +60,10 @@ local helpers = package.helpers or {
trace = false,
report = function(...) print(format(...)) end,
builtin = {
- ["preload table"] = package.searchers[1], -- special case, built-in libs
- ["path specification"] = package.searchers[2],
- ["cpath specification"] = package.searchers[3],
- ["all in one fallback"] = package.searchers[4], -- special case, combined libs
+ ["preload table"] = searchers[1], -- special case, built-in libs
+ ["path specification"] = searchers[2],
+ ["cpath specification"] = searchers[3],
+ ["all in one fallback"] = searchers[4], -- special case, combined libs
},
methods = {
},
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 2930dd72e..b61a21221 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 82c891fd6..51f1cf8c5 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
Binary files differ
diff --git a/tex/context/base/symb-imp-cc.mkiv b/tex/context/base/symb-imp-cc.mkiv
index 40274745b..45ea97732 100644
--- a/tex/context/base/symb-imp-cc.mkiv
+++ b/tex/context/base/symb-imp-cc.mkiv
@@ -11,20 +11,25 @@
%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
%C details.
-\definefontfeature
- [cc-icons]
- [mode=base,
- goodies=cc-icons,
- unicoding=yes]
\doiffontpresentelse{ccicons.otf} { % redone ctan version
+ \definefontfeature
+ [creativecommons]
+ [mode=base,
+ goodies=ccicons,
+ unicoding=yes]
\definefontsynonym
[creativecommons]
- [ccicons*cc-icons]
+ [ccicons*creativecommons]
} { % official version
+ \definefontfeature
+ [creativecommons]
+ [mode=base,
+ goodies=cc-icons,
+ unicoding=yes]
\definefontsynonym
[creativecommons]
- [cc-icons*cc-icons]
+ [cc-icons*creativecommons]
}
\startsymbolset[cc]
diff --git a/tex/context/fonts/cc-icons.lfg b/tex/context/fonts/cc-icons.lfg
index 902de05b3..fd0759b78 100644
--- a/tex/context/fonts/cc-icons.lfg
+++ b/tex/context/fonts/cc-icons.lfg
@@ -14,11 +14,11 @@ return {
cc = utfbyte("c"),
nd = utfbyte("d"),
-- nceu = utfbyte("e"),
- nc = utfbyte("n"),
sampling = utfbyte("m"),
- -- pd = utfbyte("p"),
- share = utfbyte("s"),
+ nc = utfbyte("n"),
+ pd = utfbyte("p"),
remix = utfbyte("r"),
+ share = utfbyte("s"),
-- ncjp = utfbyte("y"),
-- zero = utfbyte("z"),
logo = utfbyte("C"),
diff --git a/tex/context/fonts/ccicons.lfg b/tex/context/fonts/ccicons.lfg
index a09c78fc4..b79b3fb93 100644
--- a/tex/context/fonts/ccicons.lfg
+++ b/tex/context/fonts/ccicons.lfg
@@ -14,11 +14,11 @@ return {
cc = utfbyte("c"), -- logo (so not the same name)
nd = utfbyte("d"),
nceu = utfbyte("e"),
- nc = utfbyte("n"),
sampling = utfbyte("m"),
+ nc = utfbyte("n"),
pd = utfbyte("p"),
- share = utfbyte("s"),
remix = utfbyte("r"),
+ share = utfbyte("s"),
ncjp = utfbyte("y"),
zero = utfbyte("z"),
logo = 0x00A9, -- copyright
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 62be360ed..44f42edee 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 : 04/17/13 17:29:33
+-- merge date : 04/17/13 18:36:10
do -- begin closure to overcome local limits and interference