Version 1.0.1

Fixes JDMCreator#3 and JDMCreator#4
See changelog for details

Author: JDMCreator

readme.md

@@ -1,16 +1,16 @@
 ## LaTeX Table Editor ##
 
-**Version 0.9.1**
+**Version 1.0.1**
 
-This is the GitHub page of an Open Source WYSIWYG table editor that exports to multiples languages including LaTeX, Plain TeX, CSV, HTML, BBCode, Eplain and Markdown.
+This is the GitHub page of an Open Source WYSIWYG table editor that exports to multiples languages including LaTeX, Plain TeX, CSV, HTML, BBCode, Eplain, PreTeXt and Markdown.
 
 ### Use
 
 You can use it [here](http://www.latex-tables.com/).
 
 ### Dependencies
 
-You need Bootstrap 3 and JQuery. See the online example.
+You need Bootstrap 3, ntc.js and JQuery. See the online example.
 
 ### Formats supported
 
@@ -22,13 +22,14 @@ You need Bootstrap 3 and JQuery. See the online example.
  - CSV
  - BBCode
  - Eplain
+ - PreTeXt
  - Text (coming soon)
  - ConTeXt (coming soon)
  - MediaWiki (coming soon)
 
 ### Status
 
-The **LaTeX Table Editor** is in beta. No API is stable for now.
+The **LaTeX Table Editor** is now a stable release. No public API is documented for now.
 
 ### Report an issue
 

src/changelog.txt

@@ -6,7 +6,24 @@ Legend
 [#] Fixed
 Dates use a YYYY/MM/DD format.
 
-Version 1.0
+Version 1.0.1 (2018/03/06)
+===========
+
+| Note on this release :
+|     Fix an issue with colorpicker and export to PreTeXt
+
+CORE
+
+[#] The system colorpicker didn't use the actual color
+
+PRETEXT EXPORT
+
+[/] Changed default indentation to two spaces
+[#] Fix an issue where special characters in equations were converted to XML
+[#] Replace <,>,& with \lt, \gt, \amp in equations
+
+
+Version 1.0 (2018/03/01)
 ===========
 
 | First stable release.
@@ -61,7 +78,7 @@ PRETEXT EXPORT
 
 [+] New PreTeXt export module
 
-Version 0.9.1 BETA
+Version 0.9.1 BETA (2018/01/18)
 ===========
 
 | Note on this release :

src/colorPicker.js

@@ -67,6 +67,7 @@ console.log(h);
 			$("colorpicker-b").value = color[2];
 			$("colorpicker-rgb").value = rgb;
 			$("colorpicker-hex").value = hex;
+			$("colorpicker-system-input").value = hex;
 			$("colorpicker-hsl").value = hsl;
 			$("colorpicker-container").style.color = hex;
 			$("colorpicker-name").innerHTML = name;

src/index.html

@@ -468,7 +468,7 @@ <h5>Default Colors</h5>
 	</div>
 	<div style="text-align:center;">
 		<label>
-		<input type="color" oninput="ColorPicker.color(this.value)" hidden>
+		<input type="color" oninput="ColorPicker.color(this.value)" id="colorpicker-system-input" hidden>
 		<a type="button" data-toggle="tooltip" title="Use system colorpicker" class="btn btn-default"><span class="glyphicon glyphicon-tint"></span></a>
 		</label>
 		<div class="btn-group" role="group" aria-label="...">
@@ -667,7 +667,7 @@ <h4>Eplain options</h4>
 							<h4>PreTeXt options</h4>
 <h5>Indentation</h5>
 <select id="opt-pretext-indent" class="form-control"><option value="tab">Tab</option>
-<option value="two">Two spaces</option>
+<option value="two" selected>Two spaces</option>
 <option value="four">Four spaces</option></select>
 						</div>
       </div>

src/js.js

@@ -102,7 +102,7 @@ function $id(id) {
 			return "[rgb]{"+sep+"}";
 		},
 		table = new(function() {
-			this.version = "1.0";
+			this.version = "1.0.1";
 			this.create = function(cols, rows) {
 				rows = parseInt(rows, 10);
 				cols = parseInt(cols, 10);

src/toPreTeXt.js

@@ -1,5 +1,5 @@
 (function(){
-	var indent = "tab";
+	var indent = "two";
 	function beautify(html){
 		var str = ""
 		html = html.replace(/<\s*(\/?)\s*([a-z]+)[^>]*>/gi,function(full,close,name){
@@ -31,10 +31,14 @@
 	var getContent = function(cell){
 		var container = (cell.refCell||cell).cell.cloneNode(true);
 		// First, we take care of math
-		var equations = container.querySelectorAll("span.latex-equation");
+		var equations = container.querySelectorAll("span.latex-equation"),
+		equationArr = [];
 		for(var i=0,eq;i<equations.length;i++){
 			eq = equations[i];
-			var text = document.createTextNode("****m****"+(eq.innerText || eq.textContent).replace(/\n\r/g, "")+"****/m****");
+			var text = document.createTextNode("****m"+equationArr.length+"****"),
+			contentMath = (eq.innerText||eq.textContent).replace(/[\n\r]+/g, "")
+					.replace(/</g, "\\lt ").replace(/>/g, "\\gt ").replace(/\&/g, "\\amp ");
+			equationArr.push(contentMath);
 			eq.parentNode.replaceChild(text, eq);
 		}
 		var text = container.innerText.replace(/([^\n\r])[\n\r]+$/, "$1");
@@ -57,7 +61,12 @@
 				">" : "greater"
 			}[char]+">";
 		});
-		text = text.replace(/\*\*\*\*(\/?(?:line|m))\*\*\*\*/g, function(full, name){
+		text = text.replace(/\*\*\*\*(\/?(?:line|m\d+))\*\*\*\*/g, function(full, name){
+			if(name.charAt(0) == "m"){
+				name = +(name.substring(1));
+				var contentMath = equationArr[name];
+				return "<m>"+contentMath+"</m>";
+			}
 			return "<"+name+">";
 		});
 		var frag = document.createDocumentFragment(),