2016-08-19 00:35:00

4 files changed, 25 insertions, 5 deletions

diff --git a/tex/context/modules/mkiv/m-graph.mkiv b/tex/context/modules/mkiv/m-graph.mkiv
index 62c4ec4cb..71af14cc8 100644
--- a/tex/context/modules/mkiv/m-graph.mkiv
+++ b/tex/context/modules/mkiv/m-graph.mkiv
@@ -25,7 +25,7 @@
    \c!method=\s!double]
 
 \startMPdefinitions{graph}
-    if unknown context_grap : input mp-grap.mpiv ; fi ;
+    loadmodule "grap" ;
 \stopMPdefinitions
 
 \protect
diff --git a/tex/context/modules/mkiv/s-fonts-features.lua b/tex/context/modules/mkiv/s-fonts-features.lua
index f78300f32..6f4032948 100644
--- a/tex/context/modules/mkiv/s-fonts-features.lua
+++ b/tex/context/modules/mkiv/s-fonts-features.lua
@@ -13,6 +13,10 @@ moduledata.fonts.features = moduledata.fonts.features or { }
 
 local sortedhash = table.sortedhash
 
+local v_yes  = interfaces.variables.yes
+local v_no   = interfaces.variables.no
+local c_name = interfaces.constants.name
+
 local NC, NR, bold = context.NC, context.NR, context.bold
 
 function moduledata.fonts.features.showused(specification)
@@ -207,3 +211,22 @@ function moduledata.fonts.features.showallkerns(specification)
         context.par()
     end
 end
+
+function moduledata.fonts.features.showfeatureset(specification)
+    specification = interfaces.checkedspecification(specification)
+    local name = specification[c_name]
+    if name then
+        local s = fonts.specifiers.contextsetups[name]
+        if s then
+            local t = table.copy(s)
+            t.number = nil
+            if t and next(t) then
+                context.starttabulate { "|T|T|" }
+                    for k, v in sortedhash(t) do
+                       NC() context(k) NC() context(v == true and v_yes or v == false and v_no or tostring(v)) NC() NR()
+                    end
+                context.stoptabulate()
+            end
+        end
+    end
+end
diff --git a/tex/context/modules/mkiv/s-fonts-features.mkiv b/tex/context/modules/mkiv/s-fonts-features.mkiv
index efd74adf4..2dca059ff 100644
--- a/tex/context/modules/mkiv/s-fonts-features.mkiv
+++ b/tex/context/modules/mkiv/s-fonts-features.mkiv
@@ -18,6 +18,7 @@
 \installmodulecommandluasingle \showusedfeatures {moduledata.fonts.features.showused}
 \installmodulecommandluasingle \showallkerns     {moduledata.fonts.features.showallkerns}
 \installmodulecommandluasingle \showbasekerns    {moduledata.fonts.features.showbasekerns}
+\installmodulecommandluasingle \showfeatureset   {moduledata.fonts.features.showfeatureset}
 
 \def\kernpairheight{.8\strutht}
 \def\kernpairdepth {.8\strutdp}
diff --git a/tex/context/modules/mkiv/s-pre-17.mkiv b/tex/context/modules/mkiv/s-pre-17.mkiv
index 9c46b4ed7..558d5afd2 100644
--- a/tex/context/modules/mkiv/s-pre-17.mkiv
+++ b/tex/context/modules/mkiv/s-pre-17.mkiv
@@ -52,10 +52,6 @@
 \defineoverlay [blowdown] [{\hboxreference[page:\realfolio]{\overlaybutton{page:\realfolio}}}]
 \defineoverlay [forward]  [\overlaybutton{forward}]
 
-\startMPinclusions
-    input "mp-abck.mpiv" ;
-\stopMPinclusions
-
 \startMPpositiongraphic{mppos:connection}
     path pa, pb, pc ; pair ca, cb ;
     initialize_box(\MPpos{\MPvar{self}}) ; pa := pxy ; ca := cxy ;