Skip to content

Fix problem with Styles handling of margin. (mathjax/MathJax#3443) #1362

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

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fix problem with Styles handling of margin. (mathjax/MathJax#3443) #1362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
97 changes: 97 additions & 0 deletions testsuite/tests/util/Styles.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,69 @@ describe('CssStyles object', () => {
'padding-right': '0',
'padding-top': '0'
}, 'padding: 0;');
cssTest('padding-left: 2px; padding: 0', {
'padding': '0',
'padding-bottom': '0',
'padding-left': '0',
'padding-right': '0',
'padding-top': '0'
}, 'padding: 0;');
cssTest('padding:', {}, '');
});

test('margin', () => {
cssTest('margin-left: 2px; margin: 0', {
'margin': '0',
'margin-bottom': '0',
'margin-left': '0',
'margin-right': '0',
'margin-top': '0'
}, 'margin: 0;');
cssTest('margin: 3px', {
'margin': '3px',
'margin-bottom': '3px',
'margin-left': '3px',
'margin-right': '3px',
'margin-top': '3px'
});
cssTest('margin: 3px; margin-right: 1px', {
'margin': '3px 1px 3px 3px',
'margin-bottom': '3px',
'margin-left': '3px',
'margin-right': '1px',
'margin-top': '3px'
}, 'margin: 3px 1px 3px 3px;');
cssTest('margin-top: 0; margin-right: 1px; margin-bottom: 0; margin-left: 1px', {
'margin': '0 1px',
'margin-bottom': '0',
'margin-left': '1px',
'margin-right': '1px',
'margin-top': '0'
}, 'margin: 0 1px;');
cssTest('margin-top: 0; margin-right: 1px; margin-bottom: 2px; margin-left: 1px', {
'margin': '0 1px 2px',
'margin-bottom': '2px',
'margin-left': '1px',
'margin-right': '1px',
'margin-top': '0'
}, 'margin: 0 1px 2px;');
cssTest('margin-top: 0; margin-right: 0; margin-bottom: 0; margin-left: 0', {
'margin': '0',
'margin-bottom': '0',
'margin-left': '0',
'margin-right': '0',
'margin-top': '0'
}, 'margin: 0;');
cssTest('margin-left: 2px; margin: 0', {
'margin': '0',
'margin-bottom': '0',
'margin-left': '0',
'margin-right': '0',
'margin-top': '0'
}, 'margin: 0;');
cssTest('margin:', {}, '');
}),

test('border', () => {
cssTest('border: 3px solid red', {
'border': '3px solid red',
Expand Down Expand Up @@ -255,6 +315,31 @@ describe('CssStyles object', () => {
'background': 'red',
'background-clip': 'none',
});
cssTest(' border-top: inset blue 2px; border: 3px solid red', {
'border': '3px solid red',
'border-top': '3px solid red',
'border-top-color': 'red',
'border-top-style': 'solid',
'border-top-width': '3px',
'border-right': '3px solid red',
'border-right-color': 'red',
'border-right-style': 'solid',
'border-right-width': '3px',
'border-bottom': '3px solid red',
'border-bottom-color': 'red',
'border-bottom-style': 'solid',
'border-bottom-width': '3px',
'border-left': '3px solid red',
'border-left-color': 'red',
'border-left-style': 'solid',
'border-left-width': '3px',
}, 'border: 3px solid red;');
cssTest('border-top-color: blue; border-top: 3px solid red', {
'border-top': '3px solid red',
'border-top-color': 'red',
'border-top-style': 'solid',
'border-top-width': '3px',
}, 'border-top: 3px solid red;');
});

test('font', () => {
Expand Down Expand Up @@ -356,4 +441,16 @@ describe('CssStyles object', () => {
expect(styles.get('border')).toBe('');
});

test('set()', () => {
const styles = new Styles('padding-left: 2px');
styles.set('padding-left', '3px');
expect(styles.get('padding-left')).toBe('3px');
expect(styles.get('padding')).toBe('');
expect(styles.cssText).toBe('padding-left: 3px;');
styles.set('padding', '');
expect(styles.get('padding-left')).toBe('');
expect(styles.get('padding')).toBe('');
expect(styles.cssText).toBe('');
});

});
8 changes: 6 additions & 2 deletions ts/output/chtml/Wrapper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,11 +444,15 @@ export class ChtmlWrapper<N, T, D> extends CommonWrapper<
const adaptor = this.adaptor;
if (align === 'center' || align === 'left') {
const L = this.getBBox().L;
adaptor.setStyle(chtml, 'margin-left', this.em(shift + L));
if (shift + L) {
adaptor.setStyle(chtml, 'margin-left', this.em(shift + L));
}
}
if (align === 'center' || align === 'right') {
const R = this.getBBox().R;
adaptor.setStyle(chtml, 'margin-right', this.em(-shift + R));
if (shift + R) {
adaptor.setStyle(chtml, 'margin-right', this.em(-shift + R));
}
}
}

Expand Down
6 changes: 6 additions & 0 deletions ts/util/Styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,6 +365,12 @@ export class Styles {
combine: combineTRBL,
},

margin: {
children: TRBL,
split: splitTRBL,
combine: combineTRBL,
},

border: {
children: TRBL,
split: splitSame,
Expand Down