2020-12-08 11:09:00

1 files changed, 8 insertions, 29 deletions

diff --git a/tex/context/base/mkiv/font-ctx.lua b/tex/context/base/mkiv/font-ctx.lua
index 6c21bc0cc..5c93f302f 100644
--- a/tex/context/base/mkiv/font-ctx.lua
+++ b/tex/context/base/mkiv/font-ctx.lua
@@ -167,11 +167,6 @@ addformatter(formatters,"font:features",[["'"..sequenced(%s," ",true).."'"]],{ s
 -- ... like font-sfm or so
 
 constructors.resolvevirtualtoo = true -- context specific (due to resolver)
-
-if CONTEXTLMTXMODE and CONTEXTLMTXMODE > 0 then
-    constructors.fixprotrusion = false
-end
-
 constructors.sharefonts        = true -- experimental
 constructors.nofsharedfonts    = 0
 constructors.nofsharedhashes   = 0
@@ -339,12 +334,7 @@ implement {
     permanent = false,
     actions   = function()
         for i=1,7 do
-            if CONTEXTLMTXMODE > 0 then
-                font.setfontdimen(0,i,0)
-            else
-                -- we have no direct method
-                context([[\fontdimen%s\nullfont\zeropoint]],i)
-            end
+            context([[\fontdimen%s\nullfont\zeropoint]],i)
         end
         definers.resetnullfont()
     end
@@ -1657,17 +1647,7 @@ tfmdata.original = specification.specification
         return id, csnames[id]
     end
 
-    local read
-
-    if CONTEXTLMTXMODE and CONTEXTLMTXMODE > 0 then -- maybe always
-        read = function(name,size)
-            return (define { name = name, size = size } or 0)
-        end
-    else
-        read = definers.read
-    end
-
-    callbacks.register('define_font', read, "definition of fonts (tfmdata preparation)")
+    callbacks.register('define_font', definers.read, "definition of fonts (tfmdata preparation)")
 
     -- here
 
@@ -1833,7 +1813,7 @@ function mappings.loadfile(name)
         if trace_mapfiles then
             report_mapfiles("loading map file %a",name)
         end
-        lpdf.setmapfile(name)
+        lpdf.setmapfile(name) -- bah. will go in lmtx
         loaded[name] = true
     end
 end
@@ -1851,7 +1831,7 @@ function mappings.loadline(how,line)
         if trace_mapfiles then
             report_mapfiles("processing map line %a",line)
         end
-        lpdf.setmapline(how)
+        lpdf.setmapline(how) -- bah. will go in lmtx
         loaded[how] = true
     end
 end
@@ -1860,6 +1840,10 @@ function mappings.reset()
     lpdf.setmapfile("") -- tricky ... backend related
 end
 
+function mappings.getentry(...)
+    return lpdf.getmapentry(...) -- tricky ... backend related
+end
+
 implement {
     name      = "loadmapfile",
     actions   = mappings.loadfile,
@@ -3390,8 +3374,3 @@ function fonts.helpers.collectanchors(tfmdata)
     return anchors
 
 end
-
-if CONTEXTLMTXMODE > 0 then
-    fonts.constructors.addtounicode = false
-    fonts.constructors.autocleanup  = false
-end