'
+ + this.tableHtml()
+ + ''
+ ;
+
+ return super_.html.call(this);
+ };
+ _.addRow = function(afterCell) {
+ var separator = this.htmlColumnSeparator;
+ return super_.addRow.call(this, afterCell, function (newRow) {
+ // modifyNewRow callback adds column separator as middle cell
+ newRow.find('td').eq(0).after(separator);
+ });
+ };
+ // jQadd hack to keep the cursor in the correct row on seek
+ _.jQadd = function(jQ) {
+ var cmd = this, eachChild = this.eachChild;
+ jQ = super_.jQadd.call(this, jQ);
+
+ // Listen for mousedown on td.mq-align-equal descendants
+ // Handler will run just before `this.seek` is triggered by a similar
+ // listener in the controller.
+ jQ.delegate('td.mq-align-equal', 'mousedown.mathquill.alignenv', function (e) {
+ var tds = $(e.currentTarget).siblings('td');
+ var row = Fragment(
+ Node.byId[tds[0].getAttribute(mqBlockId)],
+ Node.byId[tds[1].getAttribute(mqBlockId)]
+ );
+
+ // Temporarily monkey-patch eachChild so that seek is limited
+ // to this row only.
+ // TODO - fix this properly
+ cmd.eachChild = function() {
+ row.each.apply(row, arguments);
+ cmd.eachChild = eachChild;
+ };
+ });
+ return jQ;
+ };
+});
+
+// Replacement for mathblocks inside TabularEnv cells
+// Adds tabular-specific keyboard commands
+var TabularCell = P(MathBlock, function(_, super_) {
_.init = function(row, parent, replaces) {
super_.init.call(this);
this.row = row;
diff --git a/src/css/math.less b/src/css/math.less
index b27a3ab43..e746dd06c 100644
--- a/src/css/math.less
+++ b/src/css/math.less
@@ -50,7 +50,7 @@
.mq-text-mode {
display: inline-block;
- white-space: pre;
+ white-space: pre;
}
.mq-text-mode.mq-hasCursor {
@@ -311,7 +311,7 @@
display: block;
text-align: center;
}
-
+
.mq-hat-prefix {
display: block;
text-align: center;
@@ -374,7 +374,7 @@
}
}
- .mq-matrix {
+ .mq-tabular {
vertical-align: middle;
margin-left: 0.1em;
margin-right: 0.1em;
@@ -396,6 +396,17 @@
padding: 0.1em 0.3em;
vertical-align: baseline;
}
- }
+ &.mq-rcl {
+ td:nth-child(1) {
+ text-align: right;
+ }
+ td:nth-child(2) {
+ text-align: center;
+ }
+ td:nth-child(3) {
+ text-align: left;
+ }
+ }
+ }
}
diff --git a/test/unit/latex.test.js b/test/unit/latex.test.js
index afa3a32a5..c6b2a5dcb 100644
--- a/test/unit/latex.test.js
+++ b/test/unit/latex.test.js
@@ -147,6 +147,9 @@ suite('latex', function() {
// Adds missing cells
assertParsesLatex('\\begin{Vmatrix}x&y\\\\1\\end{Vmatrix}', '\\begin{Vmatrix}x&y\\\\1&\\end{Vmatrix}');
assertParsesLatex('\\begin{Vmatrix}x\\\\x&y\\\\x\\end{Vmatrix}', '\\begin{Vmatrix}x&\\\\x&y\\\\x&\\end{Vmatrix}');
+
+ // align*
+ assertParsesLatex('\\begin{align*}y&=ax^2+bx+c\\\\y&=mx+c\\end{align*}');
});
suite('public API', function() {
diff --git a/test/unit/typing.test.js b/test/unit/typing.test.js
index 7e8a40035..0c6b5f7de 100644
--- a/test/unit/typing.test.js
+++ b/test/unit/typing.test.js
@@ -1175,6 +1175,26 @@ suite('typing with auto-replaces', function() {
assertLatex('\\begin{matrix}1&2&3\\\\4&5a&6\\\\7&8&9\\end{matrix}b');
});
+ test('renders align* environment', function() {
+ // y = mx + c
+ mq.write('\\begin{align*}&=\\end{align*}');
+ mq.keystroke('Left Left').typedText('y')
+ .keystroke('Right').typedText('mx+c');
+ assertLatex('\\begin{align*}y&=mx+c\\end{align*}');
+
+ // Shift-Enter adds a new line.
+ // y = mx + c
+ // y - c = mx
+ // y - c / m = x
+ mq.keystroke('Shift-Enter Left')
+ .typedText('y-c').keystroke('Right').typedText('mx')
+ .keystroke('Shift-Enter Left')
+ .typedText('/y-c').keystroke('Down').typedText('m')
+ .keystroke('Right Right').typedText('x');
+
+ assertLatex('\\begin{align*}y&=mx+c\\\\y-c&=mx\\\\\\frac{y-c}{m}&=x\\end{align*}')
+ });
+
test('delete key removes empty matrix row/column', function() {
mq.write('\\begin{matrix}a&&b\\\\&c&d\\\\&e&f\\end{matrix}');
@@ -1194,7 +1214,7 @@ suite('typing with auto-replaces', function() {
test('brackets are scaled immediately', function() {
mq.write('\\begin{bmatrix}x\\end{bmatrix}');
function bracketHeight() {
- return $(mq.el()).find('.mq-matrix .mq-paren.mq-scaled')[0].getBoundingClientRect().height;
+ return $(mq.el()).find('.mq-tabular .mq-paren.mq-scaled')[0].getBoundingClientRect().height;
}
var height = bracketHeight();
mq.keystroke('Left Shift-Enter');
diff --git a/test/visual.html b/test/visual.html
index 42a968452..8b03663f2 100644
--- a/test/visual.html
+++ b/test/visual.html
@@ -289,6 +289,25 @@ Text mode
Mutiple consecutive spaces in the middle of a text mode block should not collapse into one space: \text{three spaces}
+Matrix align* environments
+align* environments should render with each row's = sign aligned, the LHS aligned right, and the RHS aligned left
+
+ \begin{align*}
+ y &= mx+c \\
+ y-c &= mx \\
+ \frac{y-c}{m} &= x
+ \end{align*}
+
+
align* environments can be edited. New row: shift+enter.
+
+ \begin{align*}
+ y &= mx+c \\
+ y-c &= mx \\
+ \frac{y-c}{m} &= x
+ \end{align*}
+
+
+