Version 2.6

.gitignore

@@ -1,4 +1 @@
-node_modules
-package-lock.json
-test.md
-test2.md
+node_modules

css/vscode-texmath.css

@@ -1,10 +1,14 @@
-p { text-align: justify; }
+p { 
+    text-align: justify; 
+    hyphens: auto;
+}
 
 table {
     display: table !important;
     width: auto !important;
     margin-left: auto !important;
-    margin-right: auto !important; 
+    margin-right: auto !important;
+    margin-bottom: 1em !important;
     border-collapse: collapse !important;
 }
 
@@ -22,9 +26,25 @@ figure > img {
     display: block;
     margin: 0 auto;
     page-break-inside: avoid;
+    text-align: center;
 }
 figcaption { 
-    display: block;
-    text-align: center;
+    font-size: 0.9em;
     margin-top: 0.5em;
+    text-align: center;
+}
+
+aside {
+  font-size: 0.9em;
+  max-width: 300px;
+  padding: 0 0 0 1em;
+  margin: 0 0 0 1em;
+  float: right;
+}
+
+aside > *:first-child {
+  margin-top: 0;
+}
+aside > *:last-child {
+  margin-bottom: 0;
 }

extension.js

@@ -46,7 +46,7 @@ const ext = {
      */
     asHTML(markdown) {
         const usrcss = ext.cfg('style');
-        const theme = ext.cfg('default');
+        const theme = ext.cfg('theme');
         const extPath = vscode.extensions.getExtension("goessner.mdmath").extensionPath;
         const tmplturi = path.resolve(extPath, './themes/', theme, './theme.js');
         const cssuri = path.resolve(extPath, './themes/', theme, './style.css');
@@ -180,16 +180,14 @@ exports.activate = function activate(context) {
         extendMarkdownIt(md) {
             const tm = require('markdown-it-texmath');
             const delimiters = JSON.parse(JSON.stringify(ext.cfg('delimiters'))) || 'dollars'; // wondering why this JSON stuff is necessary ...
+            const katexOptions = JSON.parse(JSON.stringify(ext.cfg('katexoptions') || '')) || {};
             const macros = ext.loadMacros();
-            const katexOptions = JSON.parse(JSON.stringify(ext.cfg('katexOptions') || '')) 
-                              || macros && { macros }
-                              || {};
             const outerSpace = ext.cfg('outerspace') || false;
-            const options = { "engine": require('katex'),
+            const options =  { "engine": require('katex'),
                                "delimiters": delimiters,
                                "outerSpace": outerSpace,
-                               "katexOptions": katexOptions
-                            };
+                               "katexOptions": macros && !katexOptions.macros ? Object.assign(katexOptions, macros) : katexOptions
+                                };
 
            (ext.mdit = md).use(tm, options);
            return ext.mdit;

package.json

@@ -3,15 +3,15 @@
 	"displayName": "Markdown+Math",
 	"description": "LaTeX Math for Markdown ... with macros and more",
 	"icon": "img/icon.png",
-	"version": "2.5.5",
+	"version": "2.6.0",
 	"author": "Stefan Goessner",
 	"publisher": "goessner",
 	"keywords": [
 		"TeX",
 		"LaTeX",
 		"KaTeX",
 		"markdown",
-	    "markdown-it",
+		"markdown-it",
 		"math",
 		"multi-root ready"
 	],
@@ -50,7 +50,11 @@
 				"mdmath.theme": {
 					"type": "string",
 					"default": "default",
-					"enum": ["default", "minimal", "publication"],
+					"enum": [
+						"default",
+						"minimal",
+						"publication"
+					],
 					"description": "Choose from available themes ['default','minimal','publication']."
 				},
 				"mdmath.macros": {
@@ -62,13 +66,13 @@
 					"type": "string",
 					"default": "",
 					"description": "Absolute path of JSON file containing TeX macro definitions."
-                },
-                "mdmath.outerspace": {
+				},
+				"mdmath.outerspace": {
 					"type": "boolean",
 					"default": false,
 					"description": "Enclose inline math `$` pair with space characters, as a guard against misinterpretation of single `$`'s in normal markdown (default: `false` for backward compatibility)."
 				},
-                "mdmath.katexoptions": {
+				"mdmath.katexoptions": {
 					"type": "object",
 					"default": {},
 					"description": "Katex options definition. (see https://katex.org/docs/options.html)"

readme.md

@@ -1,16 +1,9 @@
-# ![mdmath](img/icon.png) Markdown+Math
-
-[![License](https://img.shields.io/github/license/goessner/markdown-it-texmath.svg)](https://github.com/goessner/mdmath/blob/master/licence.txt)
-[![npm](https://img.shields.io/npm/v/markdown-it-texmath.svg)](https://www.npmjs.com/package/markdown-it-texmath)
-[![npm](https://img.shields.io/npm/dt/markdown-it-texmath.svg)](https://www.npmjs.com/package/markdown-it-texmath)
-[![](https://data.jsdelivr.com/v1/package/npm/markdown-it-texmath/badge)](https://www.jsdelivr.com/package/npm/markdown-it-texmath)
+# ![mdmath](https://github.com/goessner/mdmath/raw/master/img/icon.png) Markdown+Math
 
 [![marketplace](https://vsmarketplacebadge.apphb.com/version/goessner.mdmath.svg)](https://marketplace.visualstudio.com/items?itemName=goessner.mdmath)
 [![marketplace](https://vsmarketplacebadge.apphb.com/installs-short/goessner.mdmath.svg)](https://marketplace.visualstudio.com/items?itemName=goessner.mdmath)
 [![License](https://img.shields.io/github/license/goessner/mdmath.svg)](https://github.com/goessner/mdmath/blob/master/LICENSE.txt)
 [![npm](https://img.shields.io/npm/v/mdmath.svg)](https://www.npmjs.com/package/mdmath)
-[![npm](https://img.shields.io/npm/dt/mdmath.svg)](https://www.npmjs.com/package/mdmath)
-
 
 ## What is it ...
 
@@ -63,7 +56,7 @@ document format.
     * display: `$$...$$`
     * display + equation number: `$$...$$ (1)`
 
-![mdmath editing](./img/mdmath.gif)
+![mdmath editing](https://github.com/goessner/mdmath/raw/master/./img/mdmath.gif)
 
 ## Installation ...
 
@@ -103,13 +96,12 @@ npm install
   "mdmath.delimiters": "dollars",
   "mdmath.macros": {},
   "mdmath.macroFile": "",
-  "mdmath.katexOptions": {},
   "mdmath.savePath": "./${file.name}.html",
   "mdmath.autosave": false,
   "mdmath.style": ""
 ```
 ###  Example Settings
-![mdmath example user settings](./img/usersettings.png)
+![mdmath example user settings](https://github.com/goessner/mdmath/raw/master/./img/usersettings.png)
 
 ## Dependencies
 
@@ -120,8 +112,7 @@ npm install
 * __How to define my own CSS file for HTML export ?__
   * Define it by the user setting `mdmath.style` as an absolute URL. So for an example you might choose `mdmath.style: "file://c:/mystyle/mystyle.css"` with windows.
 * __How to define and use macros ?__
-  * Note: **This is deprecated**. Prefer using KaTeX options (s. below).
-   Define them in user settings. For example ...
+  * Define them in user settings. For example ...
   ```json
   "mdmath.macros": {
       "\\RR": "\\mathbb{R}",
@@ -143,28 +134,6 @@ npm install
   * User macro definition file has priority over user defined macro settings, which are ignored then.
 * __Are there global predefined macros ?__
   * No. Macros are user defined with user settings `mdmath.macros`. So they are available in all user specific markdown documents.
-* __How to define and use Katex options ?__
-  * Define them in user settings. For example ...
-  ```json
-  "mdmath.katexOptions": {
-      "leqno": true
-  }
-  ```
-
-* __Can I define and use macros in Katex options together with the ones in a user macro file?__
-  * Yes. Macros can be defined using `mdmath.macros` and `mdmath.macroFile` together with `mdmath.katexOptions`. For example...
-  ```json
-  "mdmath.katexOptions": {
-      "leqno": true,
-      "macros": {
-          "\\RR": "\\mathbb{R}"
-      }
-  }
-  ```
-  * Note: Prefer them over deprecated `macro` definition!
-  * Macros in `mdmath.katexOptions` have priority over those in `mdmath.macros` and `mdmath.macroFile`. So there is an 'either / or'!
-* __Why don't I see changes in my preview window after editing Katex options?__
-  * Close your current windows and open new ones for the changes to be applied.
 * __Can I write the HTML source to a file ?__
   * Yes. Use the `Markdown: Save Markdown+Math to Html` command or the key binding <kbd>Ctrl</kbd>+<kbd>K</kbd><kbd>,</kbd>. 
   * The Html file is written to the folder where the markdown file resides in. This is the default.
@@ -225,11 +194,11 @@ The following folks helped to make `mdmath` even better.
 
 ## Contributing
 
-See [`.github/CONTRIBUTING.md`](.github/CONTRIBUTING.md)
+See [`.github/CONTRIBUTING.md`](https://github.com/goessner/mdmath/blob/master/.github/CONTRIBUTING.md)
 
 ## Changelog
 
-See [`changelog.md`](changelog.md)
+See [`changelog.md`](https://github.com/goessner/mdmath/blob/master/changelog.md)
 
 ## License
 

syntaxes/dollars.json

@@ -3,9 +3,9 @@
 	"injectionSelector": "meta.paragraph.markdown",
 	"patterns": [
 		{
-			"name":"block-dollars",
-			"begin": "(\\$\\$)",
-			"end": "(\\$\\$)",
+			"name":"pandoc-dollars",
+			"begin": "(^|\\s*)\\$\\$",
+			"end": "\\$\\$",
             "contentName": "markup.inline.raw"
 		},
 		{

themes/publication/style.css

@@ -1,5 +1,5 @@
 /**
- * microjam.latex.css
+ * mdmath.latex.css
  *
  * Inspired by: https://github.com/vincentdoerig/latex-css
  */
@@ -269,6 +269,7 @@ figure {
 }
 figcaption {
   font-size: 0.95em;
+  text-align: center;
 }
 
 table {

themes/publication/theme.js

@@ -12,7 +12,7 @@ ${data.tags ? `<meta name="keywords" content="${data.tags.join()}">` : ''}
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/highlight.js/styles/vs.min.css">
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/katex/dist/katex.min.css">
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/markdown-it-texmath/css/texmath.min.css">
-<link rel="stylesheet" href="${data.cssuri}">
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/gh/goessner/mdmath/themes/publication/style.css">
 ${data.usrcss ? `<link rel="stylesheet" href="${data.usrcss}">` : ''}
 <title>${data.title}</title>
 </head>

triangle.md

@@ -11,7 +11,7 @@ $$a{\bold e}_\alpha + b\tilde{\bold e}_\alpha + c{\bold e}_x = \bold 0$$ (1)
 
 with
 
-$${\bold e}_\alpha = \begin{pmatrix}\cos\alpha\\ \sin\alpha\end{pmatrix} \quad and \quad \tilde{\bold e}_\alpha = \begin{pmatrix}-\sin\alpha\\ \cos\alpha\end{pmatrix}$$
+$${\bold e}_\alpha = \begin{pmatrix}\cos\alpha\\ \sin\alpha\end{pmatrix} \quad and \quad {\tilde\bold e}_\alpha = \begin{pmatrix}-\sin\alpha\\ \cos\alpha\end{pmatrix}$$
 
 Resolving for the hypothenuse part $c{\bold e}_x$ in the loop closure equation (1)