Skip to content

Commit

Permalink
v1.13.08
Browse files Browse the repository at this point in the history
  • Loading branch information
mattlag committed Mar 9, 2020
1 parent c475b3c commit ed65eb3
Show file tree
Hide file tree
Showing 4 changed files with 86 additions and 3 deletions.
4 changes: 2 additions & 2 deletions dev/js/_settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@

// Version
thisGlyphrStudioVersion: 'Version 1.13',
thisGlyphrStudioVersionNum: '1.13.07',
thisGlyphrStudioVersionDate: 1581460000000,
thisGlyphrStudioVersionNum: '1.13.08',
thisGlyphrStudioVersionDate: 1583800000000,

// Internal Dev Stuff
devmode: false, // global switch for all the stuff below
Expand Down
10 changes: 9 additions & 1 deletion dev/js/io_svg_outline_import.js
Original file line number Diff line number Diff line change
Expand Up @@ -234,12 +234,20 @@
}
}

// Clean up numbers
// Maintain scientific notation e+ and e- numbers
// Commas before all negative numbers
// Remove + to denote positive numbers
data = data.replace(/e/gi, 'e');

// Clean up negative numbers, and scientific notation numbers
data = data.replace(/e-/g, '~~~');
data = data.replace(/-/g, ',-');
data = data.replace(/~~~/g, 'e-');

data = data.replace(/e\+/g, '~~~');
data = data.replace(/\+/g, ',');
data = data.replace(/~~~/g, 'e+');


// Clean up whitespace
// if(data.charAt(0) === ' ') data = data.slice(1);
Expand Down
5 changes: 5 additions & 0 deletions dev/js/lib_xml_to_json.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@
var XMLdoc, XMLerror;
// debug('convertXMLtoJSON \t PASSED\n' + inputXML);

// Ignore namespace designations, which may not be properly
// defined in pasted code snippets. We ignore namespace stuff
// anyway, so we don't want to hit errors unnecessarily.
inputXML = inputXML.replace(/:/g, '-');

if (typeof window.DOMParser !== 'undefined') {
XMLdoc = (new window.DOMParser()).parseFromString(inputXML, 'text/xml');
} else if (typeof window.ActiveXObject !== 'undefined' && new window.ActiveXObject('Microsoft.XMLDOM')) {
Expand Down
70 changes: 70 additions & 0 deletions dist/Glyphr_Studio_-_1.13.08.html

Large diffs are not rendered by default.

0 comments on commit ed65eb3

Please sign in to comment.