@pie-lib/math-rendering 2.4.4 → 2.4.5

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.4.5](https://github.com/pie-framework/pie-lib/compare/@pie-lib/math-rendering@2.4.4...@pie-lib/math-rendering@2.4.5) (2022-07-18)
+
+
+### Reverts
+
+* Revert "fix(math-rendering): potential fix for box PD-1521" ([dac9a34](https://github.com/pie-framework/pie-lib/commit/dac9a34d599bb30bbb7c87c6e49df562fd486e5e))
+
+
+
+
+
 ## [2.4.4](https://github.com/pie-framework/pie-lib/compare/@pie-lib/math-rendering@2.4.3...@pie-lib/math-rendering@2.4.4) (2022-07-18)
 
 

package/lib/mstack/chtml.js

@@ -286,9 +286,6 @@ CHTMLmstack.styles = {
   'mjx-mstack > table > tr > .mjx-line': {
     padding: 0,
     'border-top': 'solid 1px black'
-  },
-  '.TEX-A': {
-    'font-family': 'MJXZERO, MJXTEX !important'
   }
 };
 //# sourceMappingURL=chtml.js.map

package/lib/mstack/chtml.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/mstack/chtml.js"],"names":["reduceText","acc","n","node","kind","text","Line","Row","columns","operator","count","direction","length","Error","diff","padding","_","times","map","mathNodeToCharArray","mn","childNodes","reduce","split","toColumnArray","child","console","warn","toCHTML","rowStack","f","first","nodes","tail","flatten","undefined","getStackData","mstack","compact","CHTMLmstack","factory","parent","ce","adaptor","document","createElement","bind","chtml","standardCHTMLnode","stackData","maxCols","r","table","appendChild","forEach","row","tr","td","setAttribute","textContent","cols","pad","c","t","CHTMLWrapper","styles","border"],"mappings":"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","sourcesContent":["import { CHTMLWrapper } from 'mathjax-full/js/output/chtml/Wrapper';\nimport _ from 'lodash';\n\nconst reduceText = (acc, n) => {\n  if (n.node && n.node.kind === 'text') {\n    acc += n.node.text;\n  }\n  return acc;\n};\n\nexport class Line {\n  constructor() {\n    this.kind = 'line';\n  }\n\n  get columns() {\n    return [];\n  }\n}\n\nexport class Row {\n  constructor(columns, operator) {\n    this.kind = 'row';\n    this.operator = operator;\n    this.columns = columns;\n  }\n\n  pad(count, direction = 'right') {\n    if (count < this.columns.length) {\n      throw new Error('no');\n    }\n\n    const diff = count - this.columns.length;\n\n    const padding = _.times(diff).map(n => '__pad__');\n    return direction === 'right' ? [...padding, ...this.columns] : [...this.columns, ...padding];\n  }\n}\n\nconst mathNodeToCharArray = mn => {\n  const text = mn.childNodes.reduce(reduceText, '');\n  return text.split('');\n};\n\n/**\n * Convert child a column entry\n * @param {*} child\n * @return an array of column content\n */\nconst toColumnArray = child => {\n  if (!child || !child.kind) {\n    return [];\n  }\n\n  if (child.kind === 'msrow') {\n    throw new Error('msrow in msrow?');\n  }\n\n  if (child.kind === 'mo') {\n    // We are going to treat this operator as a text array.\n    // It's probably going to be a decimal point\n    console.warn('mo that is not 1st node in msrow?');\n    return mathNodeToCharArray(child);\n    // throw new Error('mo must be first child of msrow');\n  }\n\n  if (child.kind === 'mn') {\n    return mathNodeToCharArray(child);\n  }\n\n  if (child.toCHTML) {\n    return child;\n  }\n};\n\n/**\n *  convert mstack chtml childNodes into a Row\n *  @param child chtml child node of mstack\n *  @return Row | Line\n */\nconst rowStack = child => {\n  if (!child || !child.kind) {\n    return;\n  }\n\n  if (child.kind === 'msrow') {\n    if (!child.childNodes || child.childNodes.length === 0) {\n      return new Row([]);\n    }\n    const f = _.first(child.childNodes);\n    const nodes = f && f.kind === 'mo' ? _.tail(child.childNodes) : child.childNodes;\n\n    const columns = _.flatten(nodes.map(toColumnArray));\n\n    return new Row(columns, f.kind === 'mo' ? f : undefined);\n  }\n\n  if (child.kind === 'mn') {\n    const columns = mathNodeToCharArray(child);\n    return new Row(columns, undefined);\n  }\n\n  if (child.kind === 'mo') {\n    console.warn('mo on its own row?');\n    return new Row([], child);\n  }\n\n  if (child.kind === 'msline') {\n    return new Line();\n  }\n\n  if (child.toCHTML) {\n    return new Row([child]);\n  }\n};\n\n/** convert MathJax chtml tree to Row[]\n * @param mstack the root of the mathjax chtml tree\n * @return Row[]\n */\n\nexport const getStackData = mstack => {\n  if (!mstack || !mstack.childNodes) {\n    return [];\n  }\n  return _.compact(mstack.childNodes.map(rowStack));\n};\n\nexport class CHTMLmstack extends CHTMLWrapper {\n  constructor(factory, node, parent = null) {\n    super(factory, node, parent);\n\n    this.ce = this.adaptor.document.createElement.bind(this.adaptor.document);\n  }\n\n  toCHTML(parent) {\n    const chtml = this.standardCHTMLnode(parent);\n\n    const stackData = getStackData(this);\n\n    // console.log('stackData', stackData);\n    const maxCols = stackData.reduce((acc, r) => {\n      if (r && r.columns.length > acc) {\n        acc = r.columns.length;\n      }\n      return acc;\n    }, 0);\n\n    const table = this.ce('table');\n    chtml.appendChild(table);\n\n    stackData.forEach(row => {\n      const tr = this.ce('tr');\n      table.appendChild(tr);\n\n      if (row.kind === 'row') {\n        const td = this.ce('td');\n        tr.appendChild(td);\n        if (row.operator && row.operator.toCHTML) {\n          td.setAttribute('class', 'inner');\n          row.operator.toCHTML(td);\n        } else {\n          td.textContent = '';\n        }\n\n        // align right for now:\n        const cols = row.pad(maxCols, 'right');\n        cols.forEach(c => {\n          const t = this.ce('td');\n          tr.appendChild(t);\n          if (c === '__pad__') {\n            t.textContent = '';\n          } else if (typeof c === 'string') {\n            t.textContent = c;\n          } else if (c.kind === 'none') {\n            t.textContent = '';\n          } else if (c.toCHTML) {\n            t.setAttribute('class', 'inner');\n            c.toCHTML(t);\n          }\n        });\n      } else if (row.kind === 'line') {\n        const td = this.ce('td');\n        tr.appendChild(td);\n        td.setAttribute('colspan', maxCols + 1);\n        td.setAttribute('class', 'mjx-line');\n        td.textContent = '';\n      }\n    });\n  }\n}\nCHTMLmstack.styles = {\n  'mjx-mstack > table': {\n    'line-height': 'initial',\n    border: 'solid 0px red',\n    'border-spacing': '0em',\n    'border-collapse': 'separate'\n  },\n  'mjx-mstack > table > tr': {\n    'line-height': 'initial'\n  },\n  'mjx-mstack > table > tr > td': {\n    // padding: '1.2rem',\n    border: 'solid 0px blue',\n    'font-family': 'sans-serif',\n    'line-height': 'initial'\n  },\n  'mjx-mstack > table > tr > td.inner': {\n    'font-family': 'inherit'\n  },\n  'mjx-mstack > table > tr > .mjx-line': {\n    padding: 0,\n    'border-top': 'solid 1px black'\n  },\n  '.TEX-A': {\n    'font-family': 'MJXZERO, MJXTEX !important'\n  }\n};\n"],"file":"chtml.js"}
+{"version":3,"sources":["../../src/mstack/chtml.js"],"names":["reduceText","acc","n","node","kind","text","Line","Row","columns","operator","count","direction","length","Error","diff","padding","_","times","map","mathNodeToCharArray","mn","childNodes","reduce","split","toColumnArray","child","console","warn","toCHTML","rowStack","f","first","nodes","tail","flatten","undefined","getStackData","mstack","compact","CHTMLmstack","factory","parent","ce","adaptor","document","createElement","bind","chtml","standardCHTMLnode","stackData","maxCols","r","table","appendChild","forEach","row","tr","td","setAttribute","textContent","cols","pad","c","t","CHTMLWrapper","styles","border"],"mappings":"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","sourcesContent":["import { CHTMLWrapper } from 'mathjax-full/js/output/chtml/Wrapper';\nimport _ from 'lodash';\n\nconst reduceText = (acc, n) => {\n  if (n.node && n.node.kind === 'text') {\n    acc += n.node.text;\n  }\n  return acc;\n};\n\nexport class Line {\n  constructor() {\n    this.kind = 'line';\n  }\n\n  get columns() {\n    return [];\n  }\n}\n\nexport class Row {\n  constructor(columns, operator) {\n    this.kind = 'row';\n    this.operator = operator;\n    this.columns = columns;\n  }\n\n  pad(count, direction = 'right') {\n    if (count < this.columns.length) {\n      throw new Error('no');\n    }\n\n    const diff = count - this.columns.length;\n\n    const padding = _.times(diff).map(n => '__pad__');\n    return direction === 'right' ? [...padding, ...this.columns] : [...this.columns, ...padding];\n  }\n}\n\nconst mathNodeToCharArray = mn => {\n  const text = mn.childNodes.reduce(reduceText, '');\n  return text.split('');\n};\n\n/**\n * Convert child a column entry\n * @param {*} child\n * @return an array of column content\n */\nconst toColumnArray = child => {\n  if (!child || !child.kind) {\n    return [];\n  }\n\n  if (child.kind === 'msrow') {\n    throw new Error('msrow in msrow?');\n  }\n\n  if (child.kind === 'mo') {\n    // We are going to treat this operator as a text array.\n    // It's probably going to be a decimal point\n    console.warn('mo that is not 1st node in msrow?');\n    return mathNodeToCharArray(child);\n    // throw new Error('mo must be first child of msrow');\n  }\n\n  if (child.kind === 'mn') {\n    return mathNodeToCharArray(child);\n  }\n\n  if (child.toCHTML) {\n    return child;\n  }\n};\n\n/**\n *  convert mstack chtml childNodes into a Row\n *  @param child chtml child node of mstack\n *  @return Row | Line\n */\nconst rowStack = child => {\n  if (!child || !child.kind) {\n    return;\n  }\n\n  if (child.kind === 'msrow') {\n    if (!child.childNodes || child.childNodes.length === 0) {\n      return new Row([]);\n    }\n    const f = _.first(child.childNodes);\n    const nodes = f && f.kind === 'mo' ? _.tail(child.childNodes) : child.childNodes;\n\n    const columns = _.flatten(nodes.map(toColumnArray));\n\n    return new Row(columns, f.kind === 'mo' ? f : undefined);\n  }\n\n  if (child.kind === 'mn') {\n    const columns = mathNodeToCharArray(child);\n    return new Row(columns, undefined);\n  }\n\n  if (child.kind === 'mo') {\n    console.warn('mo on its own row?');\n    return new Row([], child);\n  }\n\n  if (child.kind === 'msline') {\n    return new Line();\n  }\n\n  if (child.toCHTML) {\n    return new Row([child]);\n  }\n};\n\n/** convert MathJax chtml tree to Row[]\n * @param mstack the root of the mathjax chtml tree\n * @return Row[]\n */\n\nexport const getStackData = mstack => {\n  if (!mstack || !mstack.childNodes) {\n    return [];\n  }\n  return _.compact(mstack.childNodes.map(rowStack));\n};\n\nexport class CHTMLmstack extends CHTMLWrapper {\n  constructor(factory, node, parent = null) {\n    super(factory, node, parent);\n\n    this.ce = this.adaptor.document.createElement.bind(this.adaptor.document);\n  }\n\n  toCHTML(parent) {\n    const chtml = this.standardCHTMLnode(parent);\n\n    const stackData = getStackData(this);\n\n    // console.log('stackData', stackData);\n    const maxCols = stackData.reduce((acc, r) => {\n      if (r && r.columns.length > acc) {\n        acc = r.columns.length;\n      }\n      return acc;\n    }, 0);\n\n    const table = this.ce('table');\n    chtml.appendChild(table);\n\n    stackData.forEach(row => {\n      const tr = this.ce('tr');\n      table.appendChild(tr);\n\n      if (row.kind === 'row') {\n        const td = this.ce('td');\n        tr.appendChild(td);\n        if (row.operator && row.operator.toCHTML) {\n          td.setAttribute('class', 'inner');\n          row.operator.toCHTML(td);\n        } else {\n          td.textContent = '';\n        }\n\n        // align right for now:\n        const cols = row.pad(maxCols, 'right');\n        cols.forEach(c => {\n          const t = this.ce('td');\n          tr.appendChild(t);\n          if (c === '__pad__') {\n            t.textContent = '';\n          } else if (typeof c === 'string') {\n            t.textContent = c;\n          } else if (c.kind === 'none') {\n            t.textContent = '';\n          } else if (c.toCHTML) {\n            t.setAttribute('class', 'inner');\n            c.toCHTML(t);\n          }\n        });\n      } else if (row.kind === 'line') {\n        const td = this.ce('td');\n        tr.appendChild(td);\n        td.setAttribute('colspan', maxCols + 1);\n        td.setAttribute('class', 'mjx-line');\n        td.textContent = '';\n      }\n    });\n  }\n}\nCHTMLmstack.styles = {\n  'mjx-mstack > table': {\n    'line-height': 'initial',\n    border: 'solid 0px red',\n    'border-spacing': '0em',\n    'border-collapse': 'separate'\n  },\n  'mjx-mstack > table > tr': {\n    'line-height': 'initial'\n  },\n  'mjx-mstack > table > tr > td': {\n    // padding: '1.2rem',\n    border: 'solid 0px blue',\n    'font-family': 'sans-serif',\n    'line-height': 'initial'\n  },\n  'mjx-mstack > table > tr > td.inner': {\n    'font-family': 'inherit'\n  },\n  'mjx-mstack > table > tr > .mjx-line': {\n    padding: 0,\n    'border-top': 'solid 1px black'\n  }\n};\n"],"file":"chtml.js"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pie-lib/math-rendering",
-  "version": "2.4.4",
+  "version": "2.4.5",
   "description": "math rendering utilities",
   "publishConfig": {
     "access": "public"
@@ -14,6 +14,6 @@
     "lodash": "^4.17.11",
     "mathjax-full": "3.2.0"
   },
-  "gitHead": "f766e0fdb9e51a9449324db51ccaa93904211710",
+  "gitHead": "856c051f8dcb735d955408ffcfe49f22f96729c9",
   "scripts": {}
 }

package/src/mstack/chtml.js

@@ -211,8 +211,5 @@ CHTMLmstack.styles = {
   'mjx-mstack > table > tr > .mjx-line': {
     padding: 0,
     'border-top': 'solid 1px black'
-  },
-  '.TEX-A': {
-    'font-family': 'MJXZERO, MJXTEX !important'
   }
 };