beta 2011.11.03 23:27

2 files changed, 106 insertions, 64 deletions

diff --git a/tex/generic/context/luatex/luatex-fonts-ext.lua b/tex/generic/context/luatex/luatex-fonts-ext.lua
index 951afcc7e..d8884ccc7 100644
--- a/tex/generic/context/luatex/luatex-fonts-ext.lua
+++ b/tex/generic/context/luatex/luatex-fonts-ext.lua
@@ -29,7 +29,7 @@ local function initializeitlc(tfmdata,value)
                     d.italic = it
                 end
             end
-            tfmdata.properties.italic_correction = true
+            tfmdata.properties.hasitalics = true
         end
     end
 end
@@ -54,7 +54,7 @@ local function initializeslant(tfmdata,value)
     elseif value < -1 then
         value = -1
     end
-    tfmdata.parameters.slant_factor = value
+    tfmdata.parameters.slantfactor = value
 end
 
 otffeatures.register {
@@ -75,7 +75,7 @@ local function initializeextend(tfmdata,value)
     elseif value < -10 then
         value = -10
     end
-    tfmdata.parameters.extend_factor = value
+    tfmdata.parameters.extendfactor = value
 end
 
 otffeatures.register {
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 4d5f40409..9350da2b5 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  : 11/02/11 20:10:53
+-- merge date  : 11/03/11 23:27:13
 
 do -- begin closure to overcome local limits and interference
 
@@ -3219,6 +3219,16 @@ constructors.cache           = containers.define("fonts", "constructors", constr
 constructors.privateoffset   = 0xF0000 -- 0x10FFFF
 
 -- Some experimental helpers (handy for tracing):
+--
+-- todo: extra:
+--
+-- extra_space       => space.extra
+-- space             => space.width
+-- space_stretch     => space.stretch
+-- space_shrink      => space.shrink
+
+-- We do keep the x-height, extra_space, space_shrink and space_stretch
+-- around as these are low level official names.
 
 constructors.keys = {
     properties = {
@@ -3233,12 +3243,12 @@ constructors.keys = {
         psname                 = "string",
         name                   = "string",
         virtualized            = "boolean",
-        italic_correction      = "boolean",
-        auto_italic_correction = "boolean",
-        no_stackmath           = "boolean",
+        hasitalics             = "boolean",
+        autoitalicamount       = "basepoints",
+        nostackmath            = "boolean",
         noglyphnames           = "boolean",
         mode                   = "string",
-        has_math               = "boolean",
+        hasmath                = "boolean",
         mathitalics            = "boolean",
         textitalics            = "boolean",
         finalized              = "boolean",
@@ -3248,7 +3258,7 @@ constructors.keys = {
         scriptpercentage       = "float",
         scriptscriptpercentage = "float",
         units                  = "cardinal",
-        designsize             = "scalespoints",
+        designsize             = "scaledpoints",
         expansion              = {
                                     stretch = "integerscale", -- might become float
                                     shrink  = "integerscale", -- might become float
@@ -3258,23 +3268,38 @@ constructors.keys = {
         protrusion             = {
                                     auto    = "boolean",
                                  },
-        expand_factor          = "float",
-        slant_factor           = "float",
+        slantfactor            = "float",
+        extendfactor           = "float",
         factor                 = "float",
         hfactor                = "float",
         vfactor                = "float",
         size                   = "scaledpoints",
         units                  = "scaledpoints",
         scaledpoints           = "scaledpoints",
-        slant                  = "float",
-        space                  = "scaledpoints",
-        space_stretch          = "scaledpoints",
-        space_shrink           = "scaledpoints",
-        x_height               = "scaledpoints",
+        slantperpoint          = "scaledpoints",
+        spacing                = {
+                                    width   = "scaledpoints",
+                                    stretch = "scaledpoints",
+                                    shrink  = "scaledpoints",
+                                    extra   = "scaledpoints",
+                                 },
+        xheight                = "scaledpoints",
         quad                   = "scaledpoints",
-        extra_space            = "scaledpoints",
         ascender               = "scaledpoints",
         descender              = "scaledpoints",
+        synonyms               = {
+                                    space         = "spacing.width",
+                                    spacestretch  = "spacing.stretch",
+                                    spaceshrink   = "spacing.shrink",
+                                    extraspace    = "spacing.extra",
+                                    x_height      = "xheight",
+                                    space_stretch = "spacing.stretch",
+                                    space_shrink  = "spacing.shrink",
+                                    extra_space   = "spacing.extra",
+                                    em            = "quad",
+                                    ex            = "xheight",
+                                    slant         = "slantperpoint",
+                                  },
     },
     description = {
         width                  = "basepoints",
@@ -3288,7 +3313,6 @@ constructors.keys = {
         depth                  = "scaledpoints",
         italic                 = "scaledpoints",
     },
-
 }
 
 -- This might become an interface:
@@ -3340,7 +3364,7 @@ excessive memory usage in CJK fonts, we no longer pass the boundingbox.)</p>
 
 -- The scaler is only used for otf and afm and virtual fonts. If
 -- a virtual font has italic correction make sure to set the
--- italic_correction flag. Some more flags will be added in
+-- hasitalics flag. Some more flags will be added in
 -- the future.
 
 --[[ldx--
@@ -3419,6 +3443,29 @@ function constructors.assignmathparameters(target,original) -- simple variant, n
     end
 end
 
+function constructors.enhanceparameters(parameters)
+    local xheight = parameters.x_height
+    local quad    = parameters.quad
+    local space   = parameters.space
+    local stretch = parameters.space_stretch
+    local shrink  = parameters.space_shrink
+    local extra   = parameters.extra_space
+    local slant   = parameters.slant
+    parameters.xheight       = xheight
+    parameters.spacestretch  = stretch
+    parameters.spaceshrink   = shrink
+    parameters.extraspace    = extra
+    parameters.em            = quad
+    parameters.ex            = xheight
+    parameters.slantperpoint = slant
+    parameters.spacing = {
+        width   = space,
+        stretch = stretch,
+        shrink  = shrink,
+        extra   = extra,
+    }
+end
+
 function constructors.scale(tfmdata,specification)
     local target         = { } -- the new table
     --
@@ -3548,17 +3595,17 @@ function constructors.scale(tfmdata,specification)
         target.auto_protrude = protrusion.auto
     end
     -- widening
-    local extend_factor = parameters.extend_factor or 0
-    if extend_factor ~= 0 and extend_factor ~= 1 then
-        hdelta = hdelta * extend_factor
-        target.extend = extend_factor * 1000 -- extent ?
+    local extendfactor = parameters.extendfactor or 0
+    if extendfactor ~= 0 and extendfactor ~= 1 then
+        hdelta = hdelta * extendfactor
+        target.extend = extendfactor * 1000 -- extent ?
     else
         target.extend = 1000 -- extent ?
     end
     -- slanting
-    local slant_factor = parameters.slant_factor or 0
-    if slant_factor ~= 0 then
-        target.slant = slant_factor * 1000
+    local slantfactor = parameters.slantfactor or 0
+    if slantfactor ~= 0 then
+        target.slant = slantfactor * 1000
     else
         target.slant = 0
     end
@@ -3570,20 +3617,20 @@ function constructors.scale(tfmdata,specification)
     targetparameters.units        = units
     targetparameters.scaledpoints = askedscaledpoints
     --
-    local isvirtual     = properties.virtualized or tfmdata.type == "virtual"
-    local hasquality    = target.auto_expand or target.auto_protrude
-    local hasitalic     = properties.italic_correction
-    local autoitalic    = properties.auto_italic_correction
-    local stackmath     = not properties.no_stackmath
-    local nonames       = properties.noglyphnames
-    local nodemode      = properties.mode == "node"
+    local isvirtual        = properties.virtualized or tfmdata.type == "virtual"
+    local hasquality       = target.auto_expand or target.auto_protrude
+    local hasitalics       = properties.hasitalics
+    local autoitalicamount = properties.autoitalicamount
+    local stackmath        = not properties.nostackmath
+    local nonames          = properties.noglyphnames
+    local nodemode         = properties.mode == "node"
     --
     if changed and not next(changed) then
         changed = false
     end
     --
     target.type = isvirtual and "virtual" or "real"
-    -- this will move to some subtable so that it is copied at once
+    --
     target.postprocessors = tfmdata.postprocessors
     --
     local targetslant         = (parameters.slant         or parameters[1] or 0)
@@ -3594,7 +3641,7 @@ function constructors.scale(tfmdata,specification)
     local targetquad          = (parameters.quad          or parameters[6] or 0)*hdelta
     local targetextra_space   = (parameters.extra_space   or parameters[7] or 0)*hdelta
     --
-    targetparameters.slant         = targetslant
+    targetparameters.slant         = targetslant -- slantperpoint
     targetparameters.space         = targetspace
     targetparameters.space_stretch = targetspace_stretch
     targetparameters.space_shrink  = targetspace_shrink
@@ -3610,11 +3657,8 @@ function constructors.scale(tfmdata,specification)
     if descender then
         targetparameters.descender = delta * descender
     end
-    -- copies, might disappear
-    targetparameters.xheight      = targetparameters.xheight      or targetparameters.x_height      or parameters.x_height
-    targetparameters.extraspace   = targetparameters.extraspace   or targetparameters.extra_space   or parameters.extra_space
-    targetparameters.spacestretch = targetparameters.spacestretch or targetparameters.space_stretch or parameters.space_stretch
-    targetparameters.spaceshrink  = targetparameters.spaceshrink  or targetparameters.space_shrink  or parameters.space_shrink
+    --
+    constructors.enhanceparameters(targetparameters) -- official copies for us
     --
     local protrusionfactor = (targetquad ~= 0 and 1000/targetquad) or 0
     local scaledwidth      = defaultwidth  * hdelta
@@ -3626,14 +3670,14 @@ function constructors.scale(tfmdata,specification)
             hdelta,vdelta,name or "noname",fullname or "nofullname",filename or "nofilename")
     end
     --
-    local hasmath = (properties.has_math or next(mathparameters)) and true
+    local hasmath = (properties.hasmath or next(mathparameters)) and true
     if hasmath then
         if trace_defining then
             report_defining("math enabled for: name '%s', fullname: '%s', filename: '%s'",
                 name or "noname",fullname or "nofullname",filename or "nofilename")
         end
         constructors.assignmathparameters(target,tfmdata) -- does scaling and whatever is needed
-        properties.has_math   = true
+        properties.hasmath    = true
         target.nomath         = false
         target.MathConstants  = target.mathparameters
     else
@@ -3641,7 +3685,7 @@ function constructors.scale(tfmdata,specification)
             report_defining("math disabled for: name '%s', fullname: '%s', filename: '%s'",
                 name or "noname",fullname or "nofullname",filename or "nofilename")
         end
-        properties.has_math   = false
+        properties.hasmath    = false
         target.nomath         = true
         target.mathparameters = nil -- nop
     end
@@ -3658,7 +3702,7 @@ function constructors.scale(tfmdata,specification)
                     name or "noname",fullname or "nofullname",filename or "nofilename")
             end
         end
-        autoitalic = false -- new
+        autoitalicamount = false -- new
     else
         if properties.textitalics then
             italickey = "italic_correction"
@@ -3667,7 +3711,7 @@ function constructors.scale(tfmdata,specification)
                     name or "noname",fullname or "nofullname",filename or "nofilename")
             end
             if properties.delaytextitalics then
-                autoitalic = false
+                autoitalicamount = false
             end
         end
     end
@@ -3772,17 +3816,17 @@ function constructors.scale(tfmdata,specification)
             end
         end
         --
-        if autoitalic then
+        if autoitalicamount then
             local vi = description.italic
             if not vi then
-                local vi = description.boundingbox[3] - description.width + autoitalic
+                local vi = description.boundingbox[3] - description.width + autoitalicamount
                 if vi > 0 then -- < 0 indicates no overshoot or a very small auto italic
                     chr[italickey] = vi*hdelta
                 end
             elseif vi ~= 0 then
                 chr[italickey] = vi*hdelta
             end
-        elseif hasitalic then
+        elseif hasitalics then
             local vi = description.italic
             if vi and vi ~= 0 then
                 chr[italickey] = vi*hdelta
@@ -3956,12 +4000,12 @@ function constructors.finalize(tfmdata)
         parameters.size = tfmdata.size
     end
     --
-    if not parameters.extend_factor then
-        parameters.extend_factor = tfmdata.extend or 0
+    if not parameters.extendfactor then
+        parameters.extendfactor = tfmdata.extend or 0
     end
     --
-    if not parameters.slant_factor then
-        parameters.slant_factor = tfmdata.slant or 0
+    if not parameters.slantfactor then
+        parameters.slantfactor = tfmdata.slant or 0
     end
     --
     if not parameters.designsize then
@@ -4014,8 +4058,8 @@ function constructors.finalize(tfmdata)
     -- tfmdata.fonts
     -- tfmdata.unscaled
     --
-    if not properties.has_math then
-        properties.has_math  = not tfmdata.nomath
+    if not properties.hasmath then
+        properties.hasmath  = not tfmdata.nomath
     end
     --
     tfmdata.MathConstants  = nil
@@ -5706,7 +5750,7 @@ local mt = {
 }
 
 actions["prepare tables"] = function(data,filename,raw)
-    data.properties.italic_correction = false
+    data.properties.hasitalics = false
 end
 
 actions["add dimensions"] = function(data,filename)
@@ -5791,7 +5835,7 @@ local function somecopy(old) -- fast one
     end
 end
 
--- not setting italic_correction and class (when nil) during
+-- not setting hasitalics and class (when nil) during
 -- table cronstruction can save some mem
 
 actions["prepare glyphs"] = function(data,filename,raw)
@@ -6035,7 +6079,7 @@ actions["analyze glyphs"] = function(data,filename,raw) -- maybe integrate this
     local resources         = data.resources
     local metadata          = data.metadata
     local properties        = data.properties
-    local italic_correction = false
+    local hasitalics        = false
     local widths            = { }
     local marks             = { }
     for unicode, description in next, descriptions do
@@ -6047,7 +6091,7 @@ actions["analyze glyphs"] = function(data,filename,raw) -- maybe integrate this
             -- skip
         else
             description.italic = italic
-            italic_correction  = true
+            hasitalics = true
         end
         local width = glyph.width
         widths[width] = (widths[width] or 0) + 1
@@ -6060,7 +6104,7 @@ actions["analyze glyphs"] = function(data,filename,raw) -- maybe integrate this
         end
     end
     -- flag italic
-    properties.italic_correction = italic_correction
+    properties.hasitalics = hasitalics
     -- flag marks
     resources.marks = marks
     -- share most common width for cjk fonts
@@ -6500,8 +6544,6 @@ actions["reorganize lookups"] = function(data,filename,raw)
     end
 end
 
--- to be checked italic_correction
-
 local function check_variants(unicode,the_variants,splitter,unicodes)
     local variants = the_variants.variants
     if variants then -- use splitter
@@ -12620,7 +12662,7 @@ local function initializeitlc(tfmdata,value)
                     d.italic = it
                 end
             end
-            tfmdata.properties.italic_correction = true
+            tfmdata.properties.hasitalics = true
         end
     end
 end
@@ -12645,7 +12687,7 @@ local function initializeslant(tfmdata,value)
     elseif value < -1 then
         value = -1
     end
-    tfmdata.parameters.slant_factor = value
+    tfmdata.parameters.slantfactor = value
 end
 
 otffeatures.register {
@@ -12666,7 +12708,7 @@ local function initializeextend(tfmdata,value)
     elseif value < -10 then
         value = -10
     end
-    tfmdata.parameters.extend_factor = value
+    tfmdata.parameters.extendfactor = value
 end
 
 otffeatures.register {