2015-04-03 20:04:00

1 files changed, 34 insertions, 23 deletions

diff --git a/tex/context/base/font-ext.lua b/tex/context/base/font-ext.lua
index 68dab3c46..6ab89c909 100644
--- a/tex/context/base/font-ext.lua
+++ b/tex/context/base/font-ext.lua
@@ -7,19 +7,17 @@ if not modules then modules = { } end modules ['font-ext'] = {
 }
 
 local next, type, byte = next, type, string.byte
-local gmatch, concat, format = string.gmatch, table.concat, string.format
-local utfchar = utf.char
 
-local commands, context = commands, context
-local fonts, utilities = fonts, utilities
+local context            = context
+local fonts              = fonts
+local utilities          = utilities
 
-local trace_protrusion = false  trackers.register("fonts.protrusion", function(v) trace_protrusion = v end)
-local trace_expansion  = false  trackers.register("fonts.expansion",  function(v) trace_expansion  = v end)
+local trace_protrusion   = false  trackers.register("fonts.protrusion", function(v) trace_protrusion = v end)
+local trace_expansion    = false  trackers.register("fonts.expansion",  function(v) trace_expansion  = v end)
 
 local report_expansions  = logs.reporter("fonts","expansions")
 local report_protrusions = logs.reporter("fonts","protrusions")
-
--- todo: byte(..) => 0xHHHH
+local report_opbd        = logs.reporter("fonts","otf opbd")
 
 --[[ldx--
 <p>When we implement functions that deal with features, most of them
@@ -42,6 +40,8 @@ local getparameters      = utilities.parsers.getparameters
 
 local setmetatableindex  = table.setmetatableindex
 
+local implement          = interfaces.implement
+
 -- -- -- -- -- --
 -- shared
 -- -- -- -- -- --
@@ -79,10 +79,6 @@ expansions.vectors = vectors
 
 classes.preset = { stretch = 2, shrink = 2, step = .5, factor = 1 }
 
-function commands.setupfontexpansion(class,settings)
-    getparameters(classes,class,'preset',settings)
-end
-
 classes['quality'] = {
     stretch = 2, shrink = 2, step = .5, vector = 'default', factor = 1
 }
@@ -172,7 +168,11 @@ registerafmfeature {
 
 fonts.goodies.register("expansions",  function(...) return fonts.goodies.report("expansions", trace_expansion, ...) end)
 
-local report_opbd = logs.reporter("fonts","otf opbd")
+implement {
+    name      = "setupfontexpansion",
+    arguments = { "string", "string" },
+    actions   = function(class,settings) getparameters(classes,class,'preset',settings) end
+}
 
 -- -- -- -- -- --
 -- protrusion
@@ -191,10 +191,6 @@ local vectors       = protrusions.vectors
 
 classes.preset = { factor = 1, left = 1, right = 1 }
 
-function commands.setupfontprotrusion(class,settings)
-    getparameters(classes,class,'preset',settings)
-end
-
 classes['pure'] = {
     vector = 'pure', factor = 1
 }
@@ -489,6 +485,12 @@ registerafmfeature {
 
 fonts.goodies.register("protrusions", function(...) return fonts.goodies.report("protrusions", trace_protrusion, ...) end)
 
+implement {
+    name      = "setupfontprotrusion",
+    arguments = { "string", "string" },
+    actions   = function(class,settings) getparameters(classes,class,'preset',settings) end
+}
+
 -- -- --
 
 local function initializenostackmath(tfmdata,value)
@@ -893,7 +895,10 @@ local new_special = nodes.pool.special
 local new_glyph   = nodes.pool.glyph
 local hpack_node  = node.hpack
 
-function fonts.helpers.addprivate(tfmdata,name,characterdata)
+local helpers     = fonts.helpers
+local currentfont = font.current
+
+function helpers.addprivate(tfmdata,name,characterdata)
     local properties = tfmdata.properties
     local privates = properties.privates
     local lastprivate = properties.lastprivate
@@ -917,7 +922,7 @@ function fonts.helpers.addprivate(tfmdata,name,characterdata)
     return lastprivate
 end
 
-function fonts.helpers.getprivatenode(tfmdata,name)
+local function getprivatenode(tfmdata,name)
     local properties = tfmdata.properties
     local privates = properties and properties.privates
     if privates then
@@ -939,12 +944,18 @@ function fonts.helpers.getprivatenode(tfmdata,name)
     end
 end
 
-function fonts.helpers.hasprivate(tfmdata,name)
+helpers.getprivatenode = getprivatenode
+
+function helpers.hasprivate(tfmdata,name)
     local properties = tfmdata.properties
     local privates = properties and properties.privates
     return privates and privates[name] or false
 end
 
-function commands.getprivatechar(name)
-    context(fonts.helpers.getprivatenode(fontdata[font.current()],name))
-end
+implement {
+    name      = "getprivatechar",
+    arguments = "string",
+    actions   = function(name)
+        context(getprivatenode(fontdata[currentfont()],name))
+    end
+}