Desktop, Mobile: Fixes #2374: Fix rendering of certain letters in Katex. Fixed printing when note contains Katex code

ElectronClient/app/copyPluginAssets.js

@@ -0,0 +1,18 @@
+require('app-module-path').addPath(`${__dirname}`);
+
+const fs = require('fs-extra');
+
+const rootDir = __dirname;
+const sourceDir = `${rootDir}/../../ReactNativeClient/lib/joplin-renderer/assets`;
+const destDir = `${rootDir}/gui/note-viewer/pluginAssets`;
+
+async function main() {
+	await fs.remove(destDir);
+	await fs.mkdirp(destDir);
+	await fs.copy(sourceDir, destDir);
+}
+
+main().catch((error) => {
+	console.error(error);
+	process.exit(1);
+});

ElectronClient/app/gui/note-viewer/highlight/VERSION.txt

@@ -1 +0,0 @@
-version 9.12.0

ElectronClient/app/gui/note-viewer/highlight/styles/atom-one-dark-reasonable.css

@@ -1,77 +0,0 @@
-/*
-
-Atom One Dark With support for ReasonML by Gidi Morris, based off work by Daniel Gamage
-
-Original One Dark Syntax theme from https://github.com/atom/one-dark-syntax
-
-*/
-.hljs {
-  display: block;
-  overflow-x: auto;
-  padding: 0.5em;
-  line-height: 1.3em;
-  color: #abb2bf;
-  background: #282c34;
-  border-radius: 5px;
-}
-.hljs-keyword, .hljs-operator {
-  color: #F92672;
-}
-.hljs-pattern-match {
-  color: #F92672;
-}
-.hljs-pattern-match .hljs-constructor {
-  color: #61aeee;
-}
-.hljs-function {
-  color: #61aeee;
-}
-.hljs-function .hljs-params {
-  color: #A6E22E;
-}
-.hljs-function .hljs-params .hljs-typing {
-  color: #FD971F;
-}
-.hljs-module-access .hljs-module {
-  color: #7e57c2;
-}
-.hljs-constructor {
-  color: #e2b93d;
-}
-.hljs-constructor .hljs-string {
-  color: #9CCC65;
-}
-.hljs-comment, .hljs-quote {
-  color: #b18eb1;
-  font-style: italic;
-}
-.hljs-doctag, .hljs-formula {
-  color: #c678dd;
-}
-.hljs-section, .hljs-name, .hljs-selector-tag, .hljs-deletion, .hljs-subst {
-  color: #e06c75;
-}
-.hljs-literal {
-  color: #56b6c2;
-}
-.hljs-string, .hljs-regexp, .hljs-addition, .hljs-attribute, .hljs-meta-string {
-  color: #98c379;
-}
-.hljs-built_in, .hljs-class .hljs-title {
-  color: #e6c07b;
-}
-.hljs-attr, .hljs-variable, .hljs-template-variable, .hljs-type, .hljs-selector-class, .hljs-selector-attr, .hljs-selector-pseudo, .hljs-number {
-  color: #d19a66;
-}
-.hljs-symbol, .hljs-bullet, .hljs-link, .hljs-meta, .hljs-selector-id, .hljs-title {
-  color: #61aeee;
-}
-.hljs-emphasis {
-  font-style: italic;
-}
-.hljs-strong {
-  font-weight: bold;
-}
-.hljs-link {
-  text-decoration: underline;
-}

ElectronClient/app/gui/note-viewer/highlight/styles/atom-one-light.css

@@ -1,96 +0,0 @@
-/*
-
-Atom One Light by Daniel Gamage
-Original One Light Syntax theme from https://github.com/atom/one-light-syntax
-
-base:    #fafafa
-mono-1:  #383a42
-mono-2:  #686b77
-mono-3:  #a0a1a7
-hue-1:   #0184bb
-hue-2:   #4078f2
-hue-3:   #a626a4
-hue-4:   #50a14f
-hue-5:   #e45649
-hue-5-2: #c91243
-hue-6:   #986801
-hue-6-2: #c18401
-
-*/
-
-.hljs {
-  display: block;
-  overflow-x: auto;
-  padding: 0.5em;
-  color: #383a42;
-  background: #fafafa;
-}
-
-.hljs-comment,
-.hljs-quote {
-  color: #a0a1a7;
-  font-style: italic;
-}
-
-.hljs-doctag,
-.hljs-keyword,
-.hljs-formula {
-  color: #a626a4;
-}
-
-.hljs-section,
-.hljs-name,
-.hljs-selector-tag,
-.hljs-deletion,
-.hljs-subst {
-  color: #e45649;
-}
-
-.hljs-literal {
-  color: #0184bb;
-}
-
-.hljs-string,
-.hljs-regexp,
-.hljs-addition,
-.hljs-attribute,
-.hljs-meta-string {
-  color: #50a14f;
-}
-
-.hljs-built_in,
-.hljs-class .hljs-title {
-  color: #c18401;
-}
-
-.hljs-attr,
-.hljs-variable,
-.hljs-template-variable,
-.hljs-type,
-.hljs-selector-class,
-.hljs-selector-attr,
-.hljs-selector-pseudo,
-.hljs-number {
-  color: #986801;
-}
-
-.hljs-symbol,
-.hljs-bullet,
-.hljs-link,
-.hljs-meta,
-.hljs-selector-id,
-.hljs-title {
-  color: #4078f2;
-}
-
-.hljs-emphasis {
-  font-style: italic;
-}
-
-.hljs-strong {
-  font-weight: bold;
-}
-
-.hljs-link {
-  text-decoration: underline;
-}

ElectronClient/app/package.json

@@ -8,7 +8,7 @@
     "pack": "node_modules/.bin/electron-builder --dir",
     "dist": "node_modules/.bin/electron-builder",
     "publish": "build -p always",
-    "postinstall": "node compile.js && node compile-package-info.js && node electronRebuild.js",
+    "postinstall": "node compile.js && node compile-package-info.js && node copyPluginAssets.js && node electronRebuild.js",
     "compile": "node compile.js && node compile-package-info.js",
     "install-141": "npm install --toolset=v141"
   },

ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/katex.js

@@ -194,11 +194,12 @@ module.exports = function(context) {
 			{ name: 'fonts/KaTeX_Main-Regular.woff2' },
 			{ name: 'fonts/KaTeX_Math-Italic.woff2' },
 			{ name: 'fonts/KaTeX_Size1-Regular.woff2' },
+			{ name: 'fonts/KaTeX_Size2-Regular.woff2' },
+			{ name: 'fonts/KaTeX_AMS-Regular.woff2' },
 		];
 	};
 
 	function renderToStringWithCache(latex, options) {
-		console.info('OPTSON', stringifySafe(options));
 		const cacheKey = md5(escape(latex) + escape(stringifySafe(options)));
 		if (cacheKey in cache_) {
 			return cache_[cacheKey];

ReactNativeClient/lib/joplin-renderer/README.md

@@ -49,4 +49,29 @@ function loadPluginAssets(assets) {
 		}
 	}
 }
+```
+
+## Development
+
+### Adding asset files
+
+A plugin (or rule) can have any number of assets, such as CSS or font files, associated with it. To add an asset to a plugin, follow these steps:
+
+- Add the file under `/assets/PLUGIN_NAME/your-asset-file.css`
+- Register this file within the plugin using `context.pluginAssets[PLUGIN_NAME] = [{ name: 'your-asset-file.css' }]`
+
+See katex.js for an example of how this is done.
+
+### Adding inline CSS
+
+A plugin can ask for some CSS to be included inline in the rendered HTML. This is convenient as it means no extra file needs to be packaged. Use this syntax to do this:
+
+```
+context.pluginAssets[PLUGIN_NAME] = [
+	{
+		inline: true,
+		text: ".my-css { background-color: 'green' }",
+		mime: 'text/css',
+	},
+];
 ```