summaryrefslogtreecommitdiff
path: root/js/stmd.js
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2014-10-04 17:15:52 -0700
committerJohn MacFarlane <jgm@berkeley.edu>2014-10-04 17:15:52 -0700
commitcd198620a44576afb0f325abd58d503eab65bf32 (patch)
tree60cbfd9925bf199ef84aa7a6e5054e3f4f168f34 /js/stmd.js
parent9d590fa7cd1158da138e602af542d2ca59d8d76e (diff)
Further emph fallback optimizations.
Diffstat (limited to 'js/stmd.js')
-rwxr-xr-xjs/stmd.js18
1 files changed, 15 insertions, 3 deletions
diff --git a/js/stmd.js b/js/stmd.js
index 9a3a8c7..e227578 100755
--- a/js/stmd.js
+++ b/js/stmd.js
@@ -2486,6 +2486,8 @@
var delims_to_match = numdelims;
var current = [];
+ var firstend;
+ var firstpos;
var state = 0;
var can_close = false;
var can_open = false;
@@ -2506,10 +2508,14 @@
} else if (numclosedelims >= 2 && delims_to_match >= 2) {
delims_to_match -= 2;
this.pos += 2;
+ firstend = current.length;
+ firstpos = this.pos;
current = [{t: 'Strong', c: current}];
} else if (numclosedelims >= 1 && delims_to_match >= 1) {
delims_to_match -= 1;
this.pos += 1;
+ firstend = current.length;
+ firstpos = this.pos;
current = [{t: 'Emph', c: current}];
} else {
if (!(this.parseInline(current,true))) {
@@ -2526,13 +2532,19 @@
}
// we didn't match emphasis: fallback
- this.pos = startpos + 1;
+ inlines.push(Str(this.subject.slice(startpos,
+ startpos + delims_to_match)));
+ if (delims_to_match < numdelims) {
+ Array.prototype.push.apply(inlines, current.slice(0,firstend));
+ this.pos = firstpos;
+ } else { // delims_to_match === numdelims
+ this.pos = startpos + delims_to_match;
+ }
+
if (last_emphasis_closer) {
this.last_emphasis_closer[c] = last_emphasis_closer;
}
- inlines.push(Str(c));
return true;
-
};
// Attempt to parse link title (sans quotes), returning the string