Merge branch 'dev'

Author: ldeniau

src/madl_etrck.mad

@@ -523,7 +523,9 @@ local function get_algn (elm, m)
 end
 
 local function get_frng (elm, m, f)
-  if not (m.cmap and elm.is_thick) then return true end -- avoid to retrieve all
+  if not (m.cmap and elm.is_thick) or f == fnil then
+    return f ~= fnil
+  end
 
   local frng, fmax, fken, fkex, e1, e2, h1, h2, fint, fintx, hgap, f1, f2 =
            0,    0,false,false,  0,  0,  0,  0,    0,     0,    0,  0,  0
@@ -565,11 +567,19 @@ end
 
 -- helpers --------------------------------------------------------------------o
 
+-- debug/optimisation counters
+local n_ctilt     = 0
+local n_cmisalign = 0
+local n_cfringe   = 0
+
 local function ctilt (elm, m, dir)
   if not m.cmap then
     return tilt(elm, m, dir)
   end
 
+--n_ctilt = n_ctilt+1
+--io.write("ctilt: ", n_ctilt, "\n")
+
   if dir == m.sdir then -- copy only once
     local c = xflw(m)
     c.tlt = xcpy(c.tlt, m.tlt)
@@ -578,11 +588,15 @@ local function ctilt (elm, m, dir)
   maps[m.cmap][tilt](xflw_(m), dir)
 end
 
+
 local function cmisalign (elm, m, dir)
   if not m.cmap then
     return misalign(elm, m, dir)
   end
 
+--n_cmisalign = n_cmisalign+1
+--io.write("cmisalign: ", n_cmisalign, "\n")
+
   if dir == m.sdir then -- copy only once
     local a = m.algn
     local c = xflw(m)
@@ -604,6 +618,9 @@ local function cfringe (elm, m, dir, frng)
     return frng(elm, m, dir)
   end
 
+--n_cfringe = n_cfringe+1
+--io.write("cfringe: ", n_cfringe, "\n")
+
   local f = m.frng
   local c = xflw(m)
   local a = m.pdir == dir and f.e2 - f.e1 or 0