fixing some padding/regex issues (also uncommenting number formatting)

This commit is contained in:
Andrew Danger Lyon 2013-03-25 14:45:41 -07:00
parent 8ad2f4433a
commit 97f8756700

View file

@ -350,14 +350,14 @@ var highlight_lisp = function() {
// --------------------------------------------------------------------- // ---------------------------------------------------------------------
// numbers // numbers
// --------------------------------------------------------------------- // ---------------------------------------------------------------------
//// binary // binary
//{regex: /([\s()])(#b[01]+)([\s()])/gi, replace: '$1<span class="number binary">$2</span>$3'}, {regex: /([\s()])(#b[01]+)([\s()])/gi, replace: '$1<span class="number binary">$2</span>$3'},
//// hex // hex
//{regex: /([\s()])(#x[\da-f]+)([\s()])/gi, replace: '$1<span class="number hex">$2</span>$3'}, {regex: /([\s()])(#x[\da-f]+)([\s()])/gi, replace: '$1<span class="number hex">$2</span>$3'},
//// float // float
//{regex: /([\s()])([+-]?(?:\d+\.\d+|\d+\.|\.\d+))([\s()])/g, replace: '$1<span class="number float">$2</span>$3'}, {regex: /([\s()])([+-]?(?:\d+\.\d+|\d+\.|\.\d+))([\s()])/g, replace: '$1<span class="number float">$2</span>$3'},
// integers // integers
{regex: /([\s()])([+-]?\d+)([\s()])/g, replace: '$1<span class="number integer">$2</span>$3'}, {regex: /([\s()])(\d+)([\s()])/g, replace: '$1<span class="number integer">$2</span>$3'},
// --------------------------------------------------------------------- // ---------------------------------------------------------------------
// misc parsers // misc parsers
@ -382,11 +382,15 @@ var highlight_lisp = function() {
html = html.replace(/&amp;/g, '&'); html = html.replace(/&amp;/g, '&');
html = html.replace(/&lt;/g, '<'); html = html.replace(/&lt;/g, '<');
html = html.replace(/&gt;/g, '>'); html = html.replace(/&gt;/g, '>');
// pad the HTML string (makes regexs much simpler)
html = "\n" + html + "\n";
for(var i = 0, n = replace.length; i < n; i++) for(var i = 0, n = replace.length; i < n; i++)
{ {
var rep = replace[i]; var rep = replace[i];
html = html.replace(rep.regex, rep.replace); html = html.replace(rep.regex, rep.replace);
} }
// unpad HTML string
html = html.replace(/(^\n|\n$)/g, '');
code_el.innerHTML = html; code_el.innerHTML = html;
}, },