Merge pull request #650 from mathquill/ci.fix-timeouts
CI: Fix timeouts, logfiles
diff --git a/README.md b/README.md
deleted file mode 120000
index e892330..0000000
--- a/README.md
+++ /dev/null
@@ -1 +0,0 @@
-docs/index.md
\ No newline at end of file
diff --git a/docs/index.md b/README.md
similarity index 100%
rename from docs/index.md
rename to README.md
diff --git a/docs/README.md b/docs/README.md
index dd0ea36..32d46ee 120000
--- a/docs/README.md
+++ b/docs/README.md
@@ -1 +1 @@
-index.md
\ No newline at end of file
+../README.md
\ No newline at end of file
diff --git a/docs/index.md b/docs/index.md
new file mode 120000
index 0000000..32d46ee
--- /dev/null
+++ b/docs/index.md
@@ -0,0 +1 @@
+../README.md
\ No newline at end of file
diff --git a/src/commands/math/commands.js b/src/commands/math/commands.js
index 483d591..2b9baf8 100644
--- a/src/commands/math/commands.js
+++ b/src/commands/math/commands.js
@@ -588,8 +588,8 @@
Fragment(cursor[side], cursor.parent.ends[side], -side) // me and ghost outside
.disown().withDirAdopt(-side, brack.parent, brack, brack[side])
.jQ.insDirOf(side, brack.jQ);
- brack.bubble('reflow');
}
+ brack.bubble('reflow');
}
else {
brack = this, side = brack.side;
@@ -688,7 +688,9 @@
'⟩': '⟨',
'\\langle ': '\\rangle ',
'\\rangle ': '\\langle ',
- '|': '|'
+ '|': '|',
+ '\\lVert ' : '\\rVert ',
+ '\\rVert ' : '\\lVert ',
};
function bindCharBracketPair(open, ctrlSeq) {
@@ -702,6 +704,8 @@
LatexCmds.langle = bind(Bracket, L, '⟨', '⟩', '\\langle ', '\\rangle ');
LatexCmds.rangle = bind(Bracket, R, '⟨', '⟩', '\\langle ', '\\rangle ');
CharCmds['|'] = bind(Bracket, L, '|', '|', '|', '|');
+LatexCmds.lVert = bind(Bracket, L, '∥', '∥', '\\lVert ', '\\rVert ');
+LatexCmds.rVert = bind(Bracket, R, '∥', '∥', '\\lVert ', '\\rVert ');
LatexCmds.left = P(MathCommand, function(_) {
_.parser = function() {
@@ -710,13 +714,17 @@
var succeed = Parser.succeed;
var optWhitespace = Parser.optWhitespace;
- return optWhitespace.then(regex(/^(?:[([|]|\\\{)/))
- .then(function(ctrlSeq) { // TODO: \langle, \rangle
+ return optWhitespace.then(regex(/^(?:[([|]|\\\{|\\langle\b|\\lVert\b)/))
+ .then(function(ctrlSeq) {
var open = (ctrlSeq.charAt(0) === '\\' ? ctrlSeq.slice(1) : ctrlSeq);
+ if (ctrlSeq=="\\langle") { open = '⟨'; ctrlSeq = ctrlSeq + ' '; }
+ if (ctrlSeq=="\\lVert") { open = '∥'; ctrlSeq = ctrlSeq + ' '; }
return latexMathParser.then(function (block) {
return string('\\right').skip(optWhitespace)
- .then(regex(/^(?:[\])|]|\\\})/)).map(function(end) {
+ .then(regex(/^(?:[\])|]|\\\}|\\rangle\b|\\rVert\b)/)).map(function(end) {
var close = (end.charAt(0) === '\\' ? end.slice(1) : end);
+ if (end=="\\rangle") { close = '⟩'; end = end + ' '; }
+ if (end=="\\rVert") { close = '∥'; end = end + ' '; }
var cmd = Bracket(0, open, close, ctrlSeq, end);
cmd.blocks = [ block ];
block.adopt(cmd, 0, 0);
diff --git a/test/unit/latex.test.js b/test/unit/latex.test.js
index 4cf59fa..ab6d925 100644
--- a/test/unit/latex.test.js
+++ b/test/unit/latex.test.js
@@ -85,6 +85,24 @@
assert.equal(tree.join('latex'), '\\left(123\\right)');
});
+ test('langle/rangle (issue #508)', function() {
+ var tree = latexMathParser.parse('\\left\\langle 123\\right\\rangle)');
+
+ assert.ok(tree.ends[L] instanceof Bracket);
+ var contents = tree.ends[L].ends[L].join('latex');
+ assert.equal(contents, '123');
+ assert.equal(tree.join('latex'), '\\left\\langle 123\\right\\rangle )');
+ });
+
+ test('lVert/rVert', function() {
+ var tree = latexMathParser.parse('\\left\\lVert 123\\right\\rVert)');
+
+ assert.ok(tree.ends[L] instanceof Bracket);
+ var contents = tree.ends[L].ends[L].join('latex');
+ assert.equal(contents, '123');
+ assert.equal(tree.join('latex'), '\\left\\lVert 123\\right\\rVert )');
+ });
+
test('parens with whitespace', function() {
assertParsesLatex('\\left ( 123 \\right ) ', '\\left(123\\right)');
});
@@ -308,5 +326,7 @@
testCantParse('unmatched close brace', '}', ' 1 + 2 } ', '1 - {2 + 3} }', '\\sqrt{ x }} + \\sqrt{y}');
testCantParse('unmatched open brace', '{', '1 * { 2 + 3', '\\frac{ \\sqrt x }{{ \\sqrt y}');
testCantParse('unmatched \\left/\\right', '\\left ( 1 + 2 )', ' [ 1, 2 \\right ]');
+ testCantParse('langlerfish/ranglerfish (checking for confusion with langle/rangle)',
+ '\\left\\langlerfish 123\\right\\ranglerfish)');
});
});
diff --git a/test/unit/publicapi.test.js b/test/unit/publicapi.test.js
index 55645b6..4791491 100644
--- a/test/unit/publicapi.test.js
+++ b/test/unit/publicapi.test.js
@@ -304,6 +304,23 @@
});
}
});
+
+ suite('edit handler', function() {
+ test('fires when closing a bracket expression', function() {
+ var count = 0;
+ var mq = MQ.MathField($('<span>').appendTo('#mock')[0], {
+ handlers: {
+ edit: function() {
+ count += 1;
+ }
+ }
+ });
+ mq.typedText('(3, 4');
+ var countBeforeClosingBracket = count;
+ mq.typedText(']');
+ assert.equal(count, countBeforeClosingBracket + 1);
+ });
+ });
suite('.cmd(...)', function() {
var mq;
