From bcbfd6302170590214528cd7d4b08502b61793d1 Mon Sep 17 00:00:00 2001 From: Richard Gibson Date: Tue, 10 Jan 2023 14:19:20 -0500 Subject: [PATCH] Consistently trim comma-separated list items --- src/Meta.ts | 3 ++- src/Spec.ts | 2 +- src/Xref.ts | 10 ++++++++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/Meta.ts b/src/Meta.ts index 61be6dc4..6728eb3f 100644 --- a/src/Meta.ts +++ b/src/Meta.ts @@ -17,7 +17,7 @@ export default class Meta extends Builder { node .getAttribute('effects')! .split(',') - .map(c => c.trim()), + .map(e => e.trim()), node ); for (const effect of effects) { @@ -40,6 +40,7 @@ export default class Meta extends Builder { const classNames = node .getAttribute('effects')! .split(',') + .map(e => e.trim()) .map(e => `e-${e}`) .join(' '); const span = spec.doc.createElement('span'); diff --git a/src/Spec.ts b/src/Spec.ts index 97237ec9..c11256d0 100644 --- a/src/Spec.ts +++ b/src/Spec.ts @@ -2005,7 +2005,7 @@ async function walk(walker: TreeWalker, context: Context) { throw new Error('oldids found on unsupported element: ' + context.node.nodeName); } oldids - .split(/,/g) + .split(',') .map(s => s.trim()) .forEach(oid => { const s = spec.doc.createElement('span'); diff --git a/src/Xref.ts b/src/Xref.ts index 936e60d9..64902074 100644 --- a/src/Xref.ts +++ b/src/Xref.ts @@ -46,13 +46,19 @@ export default class Xref extends Builder { node.parentElement.children[0] === node ) { if (node.parentElement.hasAttribute('effects')) { - const addEffects = node.parentElement.getAttribute('effects')!.split(','); + const addEffects = node.parentElement + .getAttribute('effects')! + .split(',') + .map(e => e.trim()); if (addEffects.length !== 0) { this.addEffects = validateEffects(spec, addEffects, node.parentElement); } } if (node.parentElement.hasAttribute('suppress-effects')) { - const suppressEffects = node.parentElement.getAttribute('suppress-effects')!.split(','); + const suppressEffects = node.parentElement + .getAttribute('suppress-effects')! + .split(',') + .map(e => e.trim()); if (suppressEffects.length !== 0) { this.suppressEffects = validateEffects(spec, suppressEffects, node.parentElement); }