Merge pull request #1327 from mathjax/fix/nofont

Allow the no-font components to still have a default font, just not a packed one.

Author: dpvc

components/mjs/output/chtml/nofont.js

@@ -5,7 +5,6 @@ import {hasWindow} from '#js/util/context.js';
 export const FONTPATH = hasWindow ?
                         'https://cdn.jsdelivr.net/npm/@mathjax/%%FONT%%-font':
                         '@mathjax/%%FONT%%-font';
-
 export const OutputUtil = {
   config(jax, jaxClass, defaultFont, fontClass) {
 
@@ -14,7 +13,7 @@ export const OutputUtil = {
       combineDefaults(MathJax.config, jax, MathJax.config.output || {});
 
       let config = MathJax.config[jax];
-      let font = config.font || defaultFont;
+      let font = config.font || config.fontData || defaultFont;
       if (typeof(font) !== 'string') {
         config.fontData = font;
         config.font = font = font.NAME;
@@ -30,7 +29,7 @@ export const OutputUtil = {
       }
       const name = font.substring(1, font.length - 1);
 
-      if (name !== defaultFont) {
+      if (name !== defaultFont || !fontClass) {
 
         MathJax.loader.addPackageData(`output/${jax}`, {extraLoads: [`${font}/${jax}`]});
 

components/mjs/output/svg/nofont.js

@@ -84,13 +84,11 @@ const PLUGINS = function (js, dir, target, font, jax, name) {
   // Replace default font with the no-font file
   //
   if (!font) {
-    const jax = (name.match(/chtml|svg/) || ['chtml'])[0];
-    const nofont = path.resolve(DIRNAME, target, 'output', jax, 'nofont.js');
     plugins.push(
       new webpack.NormalModuleReplacementPlugin(
-        /DefaultFont.js/,
+        /-font\/.*?\/default\.js/,
         function (resource) {
-          resource.request = path.relative(resource.context, nofont).replace(/^([^.])/, './$1');
+          resource.request = resource.request.replace(/\/.*?\/default\.js/, '/nofont.js');
         }
       )
     );