13.0.0 release

ChangeLog

@@ -1,6 +1,13 @@
+21-APR-2020: 13.0.0
+
+- Redirects old desktop versions
+- Fixes Edit menu in Chrome app
+- Uses SVG for math typesetting
+- Uses mxGraph 4.1.2 beta 4
+
 16-APR-2020: 12.9.14
 
-- renamed jscolor to mxJSColor to avoid clash
+- Renamed jscolor to mxJSColor to avoid clash
 
 15-APR-2020: 12.9.13
 

VERSION

@@ -1 +1 @@
-12.9.14
+13.0.0

etc/redirect-worker/redirect.js

@@ -113,6 +113,7 @@ const redirectMap = new Map([
 		['/simplified-tags-plugin/', 'https://www.diagrams.net/doc/faq/tags-plugin'],
 		['/github-support/', 'https://www.diagrams.net/blog/github-support'],
 		['/support-for-your-language-in-draw-io/', 'https://www.diagrams.net/blog/translate-drawio'],
+		['/translate-drawio/', 'https://www.diagrams.net/blog/translate-drawio'],
 		['/altshiftcursor/', 'https://www.diagrams.net/blog/shortcut-clone-connect'],
 		['/altshiftselect-now-removes-selected-cells%ef%bb%bf/', 'https://www.diagrams.net/blog/shortcut-deselect-shapes'],
 		['/draw-io-diagrams-for-confluence/', 'https://www.diagrams.net/integrations'],

src/main/webapp/connect/onedrive_common/editor.js

@@ -413,7 +413,7 @@ function OneDriveEditor(onSubmit, getFileInfoFn, idSuffix, notStandalone, drawio
 		autoSizeChanged(this.checked);
 	});
 	
-	var signOut = GAC.$('#signout' + idSuffix);
+	var signOut = AC.$('#signout' + idSuffix);
 	
 	if (signOut)
 	{

src/main/webapp/index.html

@@ -391,7 +391,22 @@
 /**
  * Main
  */
-App.main();
+if (navigator.userAgent != null && navigator.userAgent.toLowerCase().
+	indexOf(' electron/') >= 0 && process.versions.electron < 5)
+{
+	// Redirects old Electron app to latest version
+	var div = document.getElementById('geInfo');
+	
+	if (div != null)
+	{
+		div.innerHTML = '<center><h2>You are using an out of date version of this app.<br>Please download the latest version ' +
+			'<a href="https://github.com/jgraph/drawio-desktop/releases/latest" target="_blank">here</a>.</h2></center>';
+	}
+}
+else
+{
+	App.main();
+}
 </script>
 </body>
 </html>

src/main/webapp/js/diagramly/Editor.js

@@ -1351,7 +1351,7 @@
 	 */
 	Editor.initMath = function(src, config)
 	{
-		src = (src != null) ? src : DRAW_MATH_URL + '/MathJax.js?config=TeX-MML-AM_HTMLorMML';
+		src = (src != null) ? src : DRAW_MATH_URL + '/MathJax.js';
 		Editor.mathJaxQueue = [];
 		
 		Editor.doMathJaxRender = function(container)
@@ -1377,13 +1377,14 @@
 				// Specification recommends using SVG over HTML-CSS if browser is known
 				// Check if too inconsistent with image export and print output
 				MathJax.Hub.Config(config || {
-					jax: ['input/TeX', 'input/MathML', 'input/AsciiMath', 'output/HTML-CSS'],
+					jax: ['input/TeX', 'input/MathML', 'input/AsciiMath', 'output/SVG'],
 					extensions: ['tex2jax.js', 'mml2jax.js', 'asciimath2jax.js'],
-					'HTML-CSS': {
-						imageFont: null
-					},
 					TeX: {
-					  extensions: ['AMSmath.js', 'AMSsymbols.js', 'noErrors.js', 'noUndefined.js']
+						extensions: ['AMSmath.js', 'AMSsymbols.js', 'noErrors.js', 'noUndefined.js']
+					},
+					// Needed for client-side export to work
+					SVG: {
+						useFontCache: false
 					},
 					// Ignores math in in-place editor
 					tex2jax: {
@@ -2141,13 +2142,11 @@
 	};
 	
 	/**
-	 * See fixme in convertMath for client-side image generation with math.
+	 * Disables client-side image export if math is enabled.
 	 */
 	Editor.prototype.isExportToCanvas = function()
 	{
-		// LATER: Fix math rendering in Safari and CSS in Chrome on Windows and Linux
-		return mxClient.IS_CHROMEAPP || (this.useCanvasForExport && (!this.graph.mathEnabled ||
-			(!mxClient.IS_SF && !((mxClient.IS_GC || mxClient.IS_EDGE) && !mxClient.IS_MAC))));
+		return mxClient.IS_CHROMEAPP || this.useCanvasForExport;
 	};
 
 	/**
@@ -5969,19 +5968,16 @@
 					doc.writeln('MathJax.Hub.Config({');
 					doc.writeln('showMathMenu: false,');
 					doc.writeln('messageStyle: "none",');
-					doc.writeln('jax: ["input/TeX", "input/MathML", "input/AsciiMath", "output/HTML-CSS"],');
+					doc.writeln('jax: ["input/TeX", "input/MathML", "input/AsciiMath", "output/SVG"],');
 					doc.writeln('extensions: ["tex2jax.js", "mml2jax.js", "asciimath2jax.js"],');
-					doc.writeln('"HTML-CSS": {');
-					doc.writeln('imageFont: null');
-					doc.writeln('},');
 					doc.writeln('TeX: {');
 					doc.writeln('extensions: ["AMSmath.js", "AMSsymbols.js", "noErrors.js", "noUndefined.js"]');
 					doc.writeln('},');
 					doc.writeln('tex2jax: {');
-					doc.writeln('	ignoreClass: "geDisableMathJax"');
+					doc.writeln('ignoreClass: "geDisableMathJax"');
 				  	doc.writeln('},');
 				  	doc.writeln('asciimath2jax: {');
-					doc.writeln('	ignoreClass: "geDisableMathJax"');
+					doc.writeln('ignoreClass: "geDisableMathJax"');
 				  	doc.writeln('}');
 					doc.writeln('});');
 					

src/main/webapp/js/diagramly/EditorUi.js

@@ -4381,23 +4381,14 @@
 			}
 			else
 			{
-				var temp = (base64Encoded) ? data : btoa(unescape(encodeURIComponent(data)));
-				
 				if (mimeType == 'image/svg+xml')
 				{
-					// Workaround for scaled output in Chrome
-					if (mxClient.IS_GC && mxClient.IS_MAC)
-					{
-						win.document.write('<html><object style="max-width:100%;" data="data:' +
-								mimeType  + ';base64,' + temp + '"/></html>');
-					}
-					else
-					{
-						win.document.write('<html>'+ data + '</html>');
-					}
+					win.document.write('<html>'+ data + '</html>');
 				}
 				else
 				{
+					var temp = (base64Encoded) ? data : btoa(unescape(encodeURIComponent(data)));
+				
 					win.document.write('<html><img style="max-width:100%;" src="data:' +
 						mimeType  + ';base64,' + temp + '"/></html>');
 				}

src/main/webapp/js/diagramly/Embed.js

@@ -51,11 +51,8 @@
 				AuthorInit: function ()
 				{
 					MathJax.Hub.Config({
-						jax: ['input/TeX', 'input/MathML', 'input/AsciiMath', 'output/HTML-CSS'],
+						jax: ['input/TeX', 'input/MathML', 'input/AsciiMath', 'output/SVG'],
 						extensions: ['tex2jax.js', 'mml2jax.js', 'asciimath2jax.js'],
-						'HTML-CSS': {
-							imageFont: null
-						},
 						TeX: {
 						  extensions: ['AMSmath.js', 'AMSsymbols.js', 'noErrors.js', 'noUndefined.js']
 						}

src/main/webapp/js/diagramly/Menus.js

@@ -293,8 +293,7 @@
 		
 		editorUi.actions.put('exportPdf', new Action(mxResources.get('formatPdf') + '...', function()
 		{
-			if ((typeof(mxIsElectron) === 'undefined' || !mxIsElectron) &&
-				(editorUi.isOffline() || editorUi.printPdfExport))
+			if (!EditorUi.isElectronApp && (editorUi.isOffline() || editorUi.printPdfExport))
 			{
 				// Export PDF action for chrome OS (same as print with different dialog title)
 				editorUi.showDialog(new PrintDialog(editorUi, mxResources.get('formatPdf')).container, 360,
@@ -3217,7 +3216,7 @@
 		{
 			this.addMenuItems(menu, ['undo', 'redo', '-', 'cut', 'copy']);
 			
-			if (mxIsElectron)
+			if (EditorUi.isElectronApp)
 			{
 				this.addMenuItems(menu, ['copyAsImage']);
 			}

src/main/webapp/js/embed.dev.js

@@ -51,11 +51,8 @@
 				AuthorInit: function ()
 				{
 					MathJax.Hub.Config({
-						jax: ['input/TeX', 'input/MathML', 'input/AsciiMath', 'output/HTML-CSS'],
+						jax: ['input/TeX', 'input/MathML', 'input/AsciiMath', 'output/SVG'],
 						extensions: ['tex2jax.js', 'mml2jax.js', 'asciimath2jax.js'],
-						'HTML-CSS': {
-							imageFont: null
-						},
 						TeX: {
 						  extensions: ['AMSmath.js', 'AMSsymbols.js', 'noErrors.js', 'noUndefined.js']
 						}

src/main/webapp/math/jax/output/SVG/fonts/TeX/AMS/Regular/GeneralPunctuation.js

@@ -0,0 +1,19 @@
+/*
+ *  /MathJax/jax/output/SVG/fonts/TeX/AMS/Regular/GeneralPunctuation.js
+ *
+ *  Copyright (c) 2009-2018 The MathJax Consortium
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+MathJax.Hub.Insert(MathJax.OutputJax.SVG.FONTDATA.FONTS.MathJax_AMS,{8245:[560,-43,275,12,244,"12 501Q12 527 31 542T63 558Q73 560 77 560Q114 560 128 528Q133 518 188 293T244 61Q244 56 223 50T195 43Q192 43 190 45T102 263T14 486Q12 496 12 501"]});MathJax.Ajax.loadComplete(MathJax.OutputJax.SVG.fontDir+"/AMS/Regular/GeneralPunctuation.js");

src/main/webapp/math/jax/output/SVG/fonts/TeX/AMS/Regular/MiscMathSymbolsB.js

@@ -0,0 +1,19 @@
+/*
+ *  /MathJax/jax/output/SVG/fonts/TeX/AMS/Regular/MiscMathSymbolsB.js
+ *
+ *  Copyright (c) 2009-2018 The MathJax Consortium
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+MathJax.Hub.Insert(MathJax.OutputJax.SVG.FONTDATA.FONTS.MathJax_AMS,{10731:[716,132,667,56,611,"318 709Q325 716 332 716Q340 716 344 713T474 511Q611 298 611 292Q611 285 526 152Q494 103 474 72Q347 -128 344 -130Q340 -132 333 -132T322 -130Q319 -128 257 -31T131 169T60 278Q56 285 56 292Q56 298 60 305Q73 326 194 516T318 709"]});MathJax.Ajax.loadComplete(MathJax.OutputJax.SVG.fontDir+"/AMS/Regular/MiscMathSymbolsB.js");

src/main/webapp/math/jax/output/SVG/fonts/TeX/Fraktur/Bold/Main.js

@@ -0,0 +1,19 @@
+/*
+ *  /MathJax/jax/output/SVG/fonts/TeX/Fraktur/Bold/Main.js
+ *
+ *  Copyright (c) 2009-2018 The MathJax Consortium
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+MathJax.OutputJax.SVG.FONTDATA.FONTS["MathJax_Fraktur-bold"]={directory:"Fraktur/Bold",family:"MathJax_Fraktur",id:"MJFRAKB",weight:"bold",Ranges:[[0,127,"BasicLatin"],[128,57343,"Other"],[58112,58128,"PUA"]]};MathJax.Ajax.loadComplete(MathJax.OutputJax.SVG.fontDir+"/Fraktur/Bold/Main.js");

src/main/webapp/math/jax/output/SVG/fonts/TeX/Fraktur/Regular/Main.js

@@ -0,0 +1,19 @@
+/*
+ *  /MathJax/jax/output/SVG/fonts/TeX/Fraktur/Regular/Main.js
+ *
+ *  Copyright (c) 2009-2018 The MathJax Consortium
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+MathJax.OutputJax.SVG.FONTDATA.FONTS.MathJax_Fraktur={directory:"Fraktur/Regular",family:"MathJax_Fraktur",id:"MJFRAK",Ranges:[[0,127,"BasicLatin"],[128,57343,"Other"],[58112,58128,"PUA"]]};MathJax.Ajax.loadComplete(MathJax.OutputJax.SVG.fontDir+"/Fraktur/Regular/Main.js");

src/main/webapp/math/jax/output/SVG/fonts/TeX/Main/Italic/MathOperators.js

@@ -0,0 +1,19 @@
+/*
+ *  /MathJax/jax/output/SVG/fonts/TeX/Main/Italic/MathOperators.js
+ *
+ *  Copyright (c) 2009-2015 The MathJax Consortium
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+MathJax.Hub.Insert(MathJax.OutputJax.SVG.FONTDATA.FONTS["MathJax_Main-italic"],{8710:[716,0,818,70,751,""]});MathJax.Ajax.loadComplete(MathJax.OutputJax.SVG.fontDir+"/Main/Italic/MathOperators.js");

src/main/webapp/math/jax/output/SVG/fonts/TeX/Main/Regular/LatinExtendedA.js

@@ -0,0 +1,19 @@
+/*
+ *  /MathJax/jax/output/SVG/fonts/TeX/Main/Regular/LatinExtendedA.js
+ *
+ *  Copyright (c) 2009-2018 The MathJax Consortium
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+MathJax.Hub.Insert(MathJax.OutputJax.SVG.FONTDATA.FONTS.MathJax_Main,{305:[443,0,278,26,255,"247 0Q232 3 143 3Q132 3 106 3T56 1L34 0H26V46H42Q70 46 91 49Q100 53 102 60T104 102V205V293Q104 345 102 359T88 378Q74 385 41 385H30V408Q30 431 32 431L42 432Q52 433 70 434T106 436Q123 437 142 438T171 441T182 442H185V62Q190 52 197 50T232 46H255V0H247"]});MathJax.Ajax.loadComplete(MathJax.OutputJax.SVG.fontDir+"/Main/Regular/LatinExtendedA.js");

src/main/webapp/math/jax/output/SVG/fonts/TeX/Main/Regular/MathOperators.js

@@ -0,0 +1,19 @@
+/*
+ *  /MathJax/jax/output/SVG/fonts/TeX/Main/Regular/MathOperators.js
+ *
+ *  Copyright (c) 2009-2015 The MathJax Consortium
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+MathJax.Hub.Insert(MathJax.OutputJax.SVG.FONTDATA.FONTS.MathJax_Main,{8710:[716,0,833,46,786,""]});MathJax.Ajax.loadComplete(MathJax.OutputJax.SVG.fontDir+"/Main/Regular/MathOperators.js");

src/main/webapp/math/jax/output/SVG/fonts/TeX/Main/Regular/SpacingModLetters.js

@@ -0,0 +1,19 @@
+/*
+ *  /MathJax/jax/output/SVG/fonts/TeX/Main/Regular/SpacingModLetters.js
+ *
+ *  Copyright (c) 2009-2018 The MathJax Consortium
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+MathJax.Hub.Insert(MathJax.OutputJax.SVG.FONTDATA.FONTS.MathJax_Main,{730:[715,-542,500,147,352,"147 628Q147 669 179 692T244 715Q298 715 325 689T352 629Q352 592 323 567T249 542Q202 542 175 567T147 628ZM313 628Q313 660 300 669T259 678H253Q248 678 242 678T234 679Q217 679 207 674T192 659T188 644T187 629Q187 600 198 590Q210 579 250 579H265Q279 579 288 581T305 595T313 628"]});MathJax.Ajax.loadComplete(MathJax.OutputJax.SVG.fontDir+"/Main/Regular/SpacingModLetters.js");

src/main/webapp/math/jax/output/SVG/fonts/TeX/SansSerif/Bold/Main.js

@@ -0,0 +1,19 @@
+/*
+ *  /MathJax/jax/output/SVG/fonts/TeX/SansSerif/Bold/Main.js
+ *
+ *  Copyright (c) 2009-2018 The MathJax Consortium
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+MathJax.OutputJax.SVG.FONTDATA.FONTS["MathJax_SansSerif-bold"]={directory:"SansSerif/Bold",family:"MathJax_SansSerif",id:"MJSSB",weight:"bold",Ranges:[[0,127,"BasicLatin"],[128,65535,"Other"],[768,879,"CombDiacritMarks"]]};MathJax.Ajax.loadComplete(MathJax.OutputJax.SVG.fontDir+"/SansSerif/Bold/Main.js");