Skip to content

Table support #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dpvc merged 4 commits into from
Dec 6, 2017
Merged

Table support #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
003df73
Fix issues reported by Volker
dpvc Oct 10, 2017
3a3f1df
Add fnOP as per Volker's request
dpvc Oct 28, 2017
b740a3d
Merge pull request #53 from mathjax/v2-fixes
dpvc Dec 6, 2017
4e4ad55
Merge branch 'master' into table-support
dpvc Dec 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion mathjax2/legacy/jax/element/MmlNode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
'isError',
'multiline',
'variantForm',
'autoOP'
'autoOP',
'fnOP'
];
var RENAME = {
texWithDelims: 'withDelims'
Expand Down
16 changes: 8 additions & 8 deletions mathjax3-ts/output/chtml/Wrappers/mtable.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,18 +88,18 @@ export class CHTMLmtable extends CHTMLWrapper {
const attributes = this.node.attributes;
const frame = attributes.get('frame') !== 'none';
const lines = frame || attributes.get('columnlines') !== 'none' || attributes.get('rowlines') !== 'none';
const fspacing = (lines ? this.convertLengths(this.getAttributeArray('framespacing')) : ['0', '0']);
const fspacing = (lines ? this.convertLengths(this.getAttributeArray('framespacing')) : []);
//
// Pad the rows of the table, if needed
// Then set the column and row attributes for alignment, spacing, and lines
// Finally, add the frame, if needed
//
this.padRows();
this.handleColumnAlign();
this.handleColumnSpacing(lines, fspacing[0]);
this.handleColumnSpacing(lines, fspacing[0] || '0');
this.handleColumnLines();
this.handleRowAlign();
this.handleRowSpacing(lines, fspacing[1]);
this.handleRowSpacing(lines, fspacing[1] || '0');
this.handleRowLines();
this.handleFrame(frame);
}
Expand Down Expand Up @@ -129,16 +129,16 @@ export class CHTMLmtable extends CHTMLWrapper {
const cSpace = this.convertLengths(this.getColumnAttributes('columnspacing')).slice(0, cMax);
const rSpace = this.convertLengths(this.getRowAttributes('rowspacing')).slice(0, rMax);
const frame = this.node.attributes.get('frame') !== 'none';
const fSpace = (frame ? this.convertLengths(this.getAttributeArray('framespacing')) : ['0', '0']);
const fSpace = (frame ? this.convertLengths(this.getAttributeArray('framespacing')) : []);
const cLines = this.getColumnAttributes('columnlines').slice(0, cMax).map(x => (x === 'none' ? 0 : .07));
const rLines = this.getColumnAttributes('rowlines').slice(0, cMax).map(x => (x === 'none' ? 0 : .07));
const a = this.font.params.axis_height;
const h = H.concat(D, rLines).reduce((a, b) => a + b) + (frame ? .14 : 0) +
rSpace.map(x => parseFloat(x)).reduce((a, b) => a + b) + 2 * parseFloat(fSpace[1]);
rSpace.map(x => parseFloat(x)).reduce((a, b) => a + b) + 2 * parseFloat(fSpace[1] || '0');
bbox.h = h / 2 + a;
bbox.d = h / 2 - a;
bbox.w = W.concat(cLines).reduce((a, b) => a + b) +
cSpace.map(x => parseFloat(x)).reduce((a, b) => a + b) + 2 * parseFloat(fSpace[1]);
cSpace.map(x => parseFloat(x)).reduce((a, b) => a + b) + 2 * parseFloat(fSpace[1] || '0');
}

/******************************************************************/
Expand All @@ -155,7 +155,7 @@ export class CHTMLmtable extends CHTMLWrapper {
}

/*
* Set the cell aligmentsbased on the table, row, or cell columnalign attributes
* Set the cell aligments based on the table, row, or cell columnalign attributes
*/
protected handleColumnAlign() {
const colAlign = this.getColumnAttributes('columnalign') || [];
Expand Down Expand Up @@ -318,7 +318,7 @@ export class CHTMLmtable extends CHTMLWrapper {
}

/*
* Add a frame to the mjx-itable, if needed
* Add a frame to the mtable, if needed
*/
protected handleFrame(frame: boolean) {
if (frame) {
Expand Down