beta 2013.04.17 18:36

9 files changed, 24 insertions, 16 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
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
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
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
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]