Merge pull request #282 from bsdz/master

Refresh mathjax and add require package

Author: krassowski

packages/mathjax3-extension/package.json

@@ -30,7 +30,8 @@
     "lib/*.d.ts",
     "lib/*.js",
     "style/*.css",
-    "style/index.js"
+    "style/index.js",
+    "schema/**/*.json"
   ],
   "scripts": {
     "build": "jlpm run build:lib && jlpm run build:labextension:dev",
@@ -53,9 +54,9 @@
     "watch:src": "tsc -w"
   },
   "dependencies": {
-    "@jupyterlab/application": "^3.2.8",
-    "@jupyterlab/rendermime": "^3.2.8",
-    "mathjax-full": "^3.1.2"
+    "@jupyterlab/application": "^3.4.5",
+    "@jupyterlab/rendermime": "^3.4.5",
+    "mathjax-full": "^3.2.2"
   },
   "devDependencies": {
     "@jupyterlab/builder": "^3.2.8",
@@ -68,7 +69,8 @@
     "outputDir": "jupyterlab-mathjax3/labextension",
     "disabledExtensions": [
       "@jupyterlab/mathjax2-extension:plugin"
-    ]
+    ],
+    "schemaDir": "schema"
   },
   "styleModule": "style/index.js"
 }

packages/mathjax3-extension/schema/plugin.json

@@ -0,0 +1,38 @@
+{
+  "title": "MathJax 3 Plugin",
+  "description": "MathJax 3 math renderer for JupyterLab",
+  "jupyter.lab.menus": {
+    "context": [
+      {
+        "type": "separator",
+        "selector": ".jp-Notebook .jp-Cell",
+        "rank": 12
+      },
+      {
+        "command": "mathjax:clipboard",
+        "selector": ".MathJax",
+        "rank": 13
+      },
+      {
+        "command": "mathjax:scale",
+        "selector": ".MathJax",
+        "rank": 13
+      },
+      {
+        "command": "mathjax:scale",
+        "selector": ".MathJax",
+        "rank": 13,
+        "args": {
+          "scale": 1.5
+        }
+      },
+      {
+        "type": "separator",
+        "selector": ".jp-Notebook .jp-Cell",
+        "rank": 13
+      }
+    ]
+  },
+  "additionalProperties": false,
+  "type": "object"
+}

packages/mathjax3-extension/src/index.ts

@@ -1,7 +1,10 @@
 // Copyright (c) Jupyter Development Team.
 // Distributed under the terms of the Modified BSD License.
 
-import { JupyterFrontEndPlugin } from '@jupyterlab/application';
+import {
+  JupyterFrontEndPlugin,
+  JupyterFrontEnd,
+} from '@jupyterlab/application';
 
 import { ILatexTypesetter } from '@jupyterlab/rendermime';
 
@@ -24,6 +27,8 @@ import { HTMLHandler } from 'mathjax-full/js/handlers/html/HTMLHandler';
 
 import { browserAdaptor } from 'mathjax-full/js/adaptors/browserAdaptor';
 
+import 'mathjax-full/js/input/tex/require/RequireConfiguration';
+
 mathjax.handlers.register(SafeHandler(new HTMLHandler(browserAdaptor())));
 
 // Override dynamically generated fonts in favor
@@ -35,12 +40,12 @@ class emptyFont extends TeXFont {}
  * The MathJax 3 Typesetter.
  */
 export class MathJax3Typesetter implements ILatexTypesetter {
-  constructor() {
+  constructor(app: JupyterFrontEnd) {
     const chtml = new CHTML({
       font: new emptyFont(),
     });
     const tex = new TeX({
-      packages: AllPackages,
+      packages: AllPackages.concat('require'),
       inlineMath: [
         ['$', '$'],
         ['\\(', '\\)'],
@@ -56,6 +61,29 @@ export class MathJax3Typesetter implements ILatexTypesetter {
       InputJax: tex,
       OutputJax: chtml,
     });
+
+    const mjclipboard = 'mathjax:clipboard';
+    const mjscale = 'mathjax:scale';
+
+    app.commands.addCommand(mjclipboard, {
+      execute: (args: any) => {
+        const md = this._mathDocument;
+        const oJax: any = md.outputJax;
+        navigator.clipboard.writeText(oJax.math.math);
+      },
+      label: 'MathJax Copy Latex',
+    });
+
+    app.commands.addCommand(mjscale, {
+      execute: (args: any) => {
+        const scale = args['scale'] || 1.0;
+        const md = this._mathDocument;
+        md.outputJax.options.scale = scale;
+        md.rerender();
+      },
+      label: (args) =>
+        'Mathjax Scale ' + (args['scale'] ? `x${args['scale']}` : 'Reset'),
+    });
   }
 
   /**
@@ -77,7 +105,7 @@ const mathJax3Plugin: JupyterFrontEndPlugin<ILatexTypesetter> = {
   id: '@jupyterlab/mathjax3-extension:plugin',
   requires: [],
   provides: ILatexTypesetter,
-  activate: () => new MathJax3Typesetter(),
+  activate: (app: JupyterFrontEnd) => new MathJax3Typesetter(app),
   autoStart: true,
 };