Refactor handling of baseCore, and take enrichment into account (zorkow/speech-rule-engine#462) #617
Conversation
…hment into account, and so that more computation is done in the common wrappers. Rename script to scriptChild for sonsistency with other similar values.
|
PS, this supersedes #605. |
| return (corebox.ic ? 1.05 * corebox.ic + .05 : 0); | ||
| public getBaseFence(fence: W, id: string): W { | ||
| if (!fence || !fence.node.attributes || !id) { | ||
| return null; |
There was a problem hiding this comment.
Should that not simply return fence? This is related to my question above.
There was a problem hiding this comment.
Actually in this view it is below.
There was a problem hiding this comment.
No. The three cases here are cases where the fence has not been found, but only the first one has fence being null, so if you returned fence in the other two cases, that would indicate that you found a semantic fence when you really didn't. You only want to return the fence when it exists, is a node with attributes (e.g., not a text node), and the data-semantic-id attribute matches the (non-empty) id that you are looking for. That is what line 322 below does.
Note that this was your code from your original PR (with the addition of the check for the attributes).
| * @return {W} The wrapper for the base core mi or mo (or whatever) | ||
| */ | ||
| public getBaseCore(): W { | ||
| let core = this.getSemanticBase() || this.childNodes[0]; |
There was a problem hiding this comment.
This confuses me: If the semantic base exists, would that not be a wrapper and therefore I would have take the first child?
There was a problem hiding this comment.
The wrapper is the output-jax-specific shell around the actual (internal) MathML node, node an enclosing MathML node. If the fence is an mo (an MmlMo node), for example, then getSemanticBase() will return the CHTMLmo object that is the wrapper for that MmlMo node. You don't need to take its children, because it is already the wrapper that you want.
|
No problem. Thanks for the original PR that prompted this updated version! |
This PR refactors the handling of the base core element for munderover and msubsup elements so that super- and subscripts can be placed properly after SRE enrichment. It also lays the groundwork for better TeX emulation for accents and over- and underlines (which will be in separate PRs).
The base core element, along its italic correction and relative scaling factor, are now found during the
constructor()rather than calling them (multiple times) when needed. The base core is used for vertical positioning of super- and subscripts, but the actual base for width and bounding box computations. The handling of the base core BBox and script BBoxes have been moved to the common wrappers, where possible.For consistency, the
scriptproperty has been change toscriptChild, to be comparable to the other child pointers.In
common/Wrappers/scriptbase.ts, because thecoreIC()andcoreScale()methods have been removed and new function added in that location, the diff gets a little mixed up about the changes, so it's a bit complicated to look at. You might view the actual file for that bit in order to read it easier.Resolves issue Speech-Rule-Engine/speech-rule-engine#462.