From a17b1fdd189bb4f68fdfe51dbdc2ad8959faa411 Mon Sep 17 00:00:00 2001 From: "Davide P. Cervone" Date: Wed, 13 May 2020 10:36:22 -0400 Subject: [PATCH 1/3] Move BBox.ts to util folder --- ts/{output/common => util}/BBox.ts | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename ts/{output/common => util}/BBox.ts (100%) diff --git a/ts/output/common/BBox.ts b/ts/util/BBox.ts similarity index 100% rename from ts/output/common/BBox.ts rename to ts/util/BBox.ts From 14af7fd6c30c1a25d06cee82c4d7716d0facc42c Mon Sep 17 00:00:00 2001 From: "Davide P. Cervone" Date: Wed, 13 May 2020 10:42:08 -0400 Subject: [PATCH 2/3] Make compatibility BBox.ts in the output directories (shoudl be removed in the next version) --- ts/output/chtml/BBox.ts | 2 +- ts/output/common/BBox.ts | 24 ++++++++++++++++++++++++ ts/output/svg/BBox.ts | 4 ++-- ts/util/BBox.ts | 2 +- 4 files changed, 28 insertions(+), 4 deletions(-) create mode 100644 ts/output/common/BBox.ts diff --git a/ts/output/chtml/BBox.ts b/ts/output/chtml/BBox.ts index ee25d4db6..edcc347f3 100644 --- a/ts/output/chtml/BBox.ts +++ b/ts/output/chtml/BBox.ts @@ -21,4 +21,4 @@ * @author dpvc@mathjax.org (Davide Cervone) */ -export {BBox, BBoxData, BBoxStyleAdjust} from '../common/BBox.js'; +export * from '../../util/BBox.js'; diff --git a/ts/output/common/BBox.ts b/ts/output/common/BBox.ts new file mode 100644 index 000000000..5aadb2d96 --- /dev/null +++ b/ts/output/common/BBox.ts @@ -0,0 +1,24 @@ +/************************************************************* + * + * Copyright (c) 2017 The MathJax Consortium + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @fileoverview Implements the common bounding box object + * + * @author dpvc@mathjax.org (Davide Cervone) + */ + +export * from '../../util/BBox.js'; diff --git a/ts/output/svg/BBox.ts b/ts/output/svg/BBox.ts index ee25d4db6..e1bcf6561 100644 --- a/ts/output/svg/BBox.ts +++ b/ts/output/svg/BBox.ts @@ -16,9 +16,9 @@ */ /** - * @fileoverview Implements the CHTML bounding box object + * @fileoverview Implements the SVG bounding box object * * @author dpvc@mathjax.org (Davide Cervone) */ -export {BBox, BBoxData, BBoxStyleAdjust} from '../common/BBox.js'; +export * from '../../util/BBox.js'; diff --git a/ts/util/BBox.ts b/ts/util/BBox.ts index 548f839b7..73d7a6065 100644 --- a/ts/util/BBox.ts +++ b/ts/util/BBox.ts @@ -21,7 +21,7 @@ * @author dpvc@mathjax.org (Davide Cervone) */ -import {BIGDIMEN} from '../../util/lengths.js'; +import {BIGDIMEN} from './lengths.js'; /** * CSS styles that affect BBoxes From 4d39a72ffbb709c2a6cd15bb4d69644a5dbe9999 Mon Sep 17 00:00:00 2001 From: "Davide P. Cervone" Date: Wed, 13 May 2020 10:49:39 -0400 Subject: [PATCH 3/3] Redirect BBox imports to util (rather than output directory versions) --- ts/output/chtml/Wrapper.ts | 2 +- ts/output/chtml/Wrappers/math.ts | 2 +- ts/output/chtml/Wrappers/mmultiscripts.ts | 2 +- ts/output/chtml/Wrappers/mo.ts | 2 +- ts/output/chtml/Wrappers/mroot.ts | 2 +- ts/output/chtml/Wrappers/msqrt.ts | 2 +- ts/output/chtml/Wrappers/scriptbase.ts | 2 +- ts/output/chtml/Wrappers/semantics.ts | 2 +- ts/output/common/Wrapper.ts | 2 +- ts/output/common/Wrappers/TeXAtom.ts | 2 +- ts/output/common/Wrappers/TextNode.ts | 2 +- ts/output/common/Wrappers/maction.ts | 2 +- ts/output/common/Wrappers/menclose.ts | 2 +- ts/output/common/Wrappers/mfenced.ts | 2 +- ts/output/common/Wrappers/mfrac.ts | 2 +- ts/output/common/Wrappers/mglyph.ts | 2 +- ts/output/common/Wrappers/mi.ts | 2 +- ts/output/common/Wrappers/mmultiscripts.ts | 2 +- ts/output/common/Wrappers/mo.ts | 2 +- ts/output/common/Wrappers/mpadded.ts | 2 +- ts/output/common/Wrappers/mroot.ts | 2 +- ts/output/common/Wrappers/mrow.ts | 2 +- ts/output/common/Wrappers/mspace.ts | 2 +- ts/output/common/Wrappers/msqrt.ts | 2 +- ts/output/common/Wrappers/msubsup.ts | 2 +- ts/output/common/Wrappers/mtable.ts | 2 +- ts/output/common/Wrappers/mtr.ts | 2 +- ts/output/common/Wrappers/munderover.ts | 2 +- ts/output/common/Wrappers/scriptbase.ts | 2 +- ts/output/common/Wrappers/semantics.ts | 2 +- ts/output/svg/Wrappers/math.ts | 2 +- ts/output/svg/Wrappers/mo.ts | 2 +- ts/output/svg/Wrappers/mroot.ts | 2 +- ts/output/svg/Wrappers/msqrt.ts | 2 +- ts/output/svg/Wrappers/semantics.ts | 2 +- 35 files changed, 35 insertions(+), 35 deletions(-) diff --git a/ts/output/chtml/Wrapper.ts b/ts/output/chtml/Wrapper.ts index 3292c9dc4..f43c185e9 100644 --- a/ts/output/chtml/Wrapper.ts +++ b/ts/output/chtml/Wrapper.ts @@ -26,7 +26,7 @@ import * as LENGTHS from '../../util/lengths.js'; import {CommonWrapper, AnyWrapperClass, Constructor, StringMap} from '../common/Wrapper.js'; import {CHTML} from '../chtml.js'; import {CHTMLWrapperFactory} from './WrapperFactory.js'; -import {BBox} from './BBox.js'; +import {BBox} from '../../util/BBox.js'; import {CHTMLFontData, CHTMLCharOptions, CHTMLDelimiterData} from './FontData.js'; export {Constructor, StringMap} from '../common/Wrapper.js'; diff --git a/ts/output/chtml/Wrappers/math.ts b/ts/output/chtml/Wrappers/math.ts index 0530edf60..560f872e3 100644 --- a/ts/output/chtml/Wrappers/math.ts +++ b/ts/output/chtml/Wrappers/math.ts @@ -25,7 +25,7 @@ import {CHTMLWrapper, CHTMLConstructor} from '../Wrapper.js'; import {CommonMathMixin} from '../../common/Wrappers/math.js'; import {MmlMath} from '../../../core/MmlTree/MmlNodes/math.js'; import {StyleList} from '../../common/CssStyles.js'; -import {BBox} from '../BBox.js'; +import {BBox} from '../../../util/BBox.js'; /*****************************************************************/ /** diff --git a/ts/output/chtml/Wrappers/mmultiscripts.ts b/ts/output/chtml/Wrappers/mmultiscripts.ts index 408be77b6..681cfa3da 100644 --- a/ts/output/chtml/Wrappers/mmultiscripts.ts +++ b/ts/output/chtml/Wrappers/mmultiscripts.ts @@ -25,7 +25,7 @@ import {CHTMLWrapper, Constructor} from '../Wrapper.js'; import {CHTMLmsubsup} from './msubsup.js'; import {CommonMmultiscriptsMixin} from '../../common/Wrappers/mmultiscripts.js'; import {MmlMmultiscripts} from '../../../core/MmlTree/MmlNodes/mmultiscripts.js'; -import {BBox} from '../BBox.js'; +import {BBox} from '../../../util/BBox.js'; import {StyleList} from '../../common/CssStyles.js'; /*****************************************************************/ diff --git a/ts/output/chtml/Wrappers/mo.ts b/ts/output/chtml/Wrappers/mo.ts index 6d2d4e6e4..ce160e216 100644 --- a/ts/output/chtml/Wrappers/mo.ts +++ b/ts/output/chtml/Wrappers/mo.ts @@ -24,7 +24,7 @@ import {CHTMLWrapper, CHTMLConstructor, StringMap} from '../Wrapper.js'; import {CommonMoMixin, DirectionVH} from '../../common/Wrappers/mo.js'; import {MmlMo} from '../../../core/MmlTree/MmlNodes/mo.js'; -import {BBox} from '../BBox.js'; +import {BBox} from '../../../util/BBox.js'; import {StyleList} from '../../common/CssStyles.js'; import {DIRECTION} from '../FontData.js'; diff --git a/ts/output/chtml/Wrappers/mroot.ts b/ts/output/chtml/Wrappers/mroot.ts index 1861190d0..c29756abf 100644 --- a/ts/output/chtml/Wrappers/mroot.ts +++ b/ts/output/chtml/Wrappers/mroot.ts @@ -24,7 +24,7 @@ import {CHTMLWrapper} from '../Wrapper.js'; import {CHTMLmsqrt} from './msqrt.js'; import {CommonMrootMixin, MrootConstructor} from '../../common/Wrappers/mroot.js'; -import {BBox} from '../BBox.js'; +import {BBox} from '../../../util/BBox.js'; import {MmlMroot} from '../../../core/MmlTree/MmlNodes/mroot.js'; /*****************************************************************/ diff --git a/ts/output/chtml/Wrappers/msqrt.ts b/ts/output/chtml/Wrappers/msqrt.ts index 5db0cdc4c..b2ff3efd0 100644 --- a/ts/output/chtml/Wrappers/msqrt.ts +++ b/ts/output/chtml/Wrappers/msqrt.ts @@ -24,7 +24,7 @@ import {CHTMLWrapper, CHTMLConstructor} from '../Wrapper.js'; import {CommonMsqrtMixin} from '../../common/Wrappers/msqrt.js'; import {CHTMLmo} from './mo.js'; -import {BBox} from '../BBox.js'; +import {BBox} from '../../../util/BBox.js'; import {MmlMsqrt} from '../../../core/MmlTree/MmlNodes/msqrt.js'; import {StyleList} from '../../common/CssStyles.js'; diff --git a/ts/output/chtml/Wrappers/scriptbase.ts b/ts/output/chtml/Wrappers/scriptbase.ts index 6b8c5c795..3c23982a9 100644 --- a/ts/output/chtml/Wrappers/scriptbase.ts +++ b/ts/output/chtml/Wrappers/scriptbase.ts @@ -26,7 +26,7 @@ import {CHTMLWrapper, CHTMLConstructor} from '../Wrapper.js'; import {CommonScriptbaseMixin} from '../../common/Wrappers/scriptbase.js'; -import {BBox} from '../BBox.js'; +import {BBox} from '../../../util/BBox.js'; import {StyleData} from '../../common/CssStyles.js'; /*****************************************************************/ diff --git a/ts/output/chtml/Wrappers/semantics.ts b/ts/output/chtml/Wrappers/semantics.ts index 8c065eb15..cc7ef0bc4 100644 --- a/ts/output/chtml/Wrappers/semantics.ts +++ b/ts/output/chtml/Wrappers/semantics.ts @@ -24,7 +24,7 @@ import {CHTMLWrapper, CHTMLConstructor} from '../Wrapper.js'; import {CommonSemanticsMixin} from '../../common/Wrappers/semantics.js'; -import {BBox} from '../BBox.js'; +import {BBox} from '../../../util/BBox.js'; import {MmlSemantics, MmlAnnotation, MmlAnnotationXML} from '../../../core/MmlTree/MmlNodes/semantics.js'; import {XMLNode} from '../../../core/MmlTree/MmlNode.js'; import {StyleList} from '../../common/CssStyles.js'; diff --git a/ts/output/common/Wrapper.ts b/ts/output/common/Wrapper.ts index 0f9e71d63..b8dedf6f4 100644 --- a/ts/output/common/Wrapper.ts +++ b/ts/output/common/Wrapper.ts @@ -31,7 +31,7 @@ import * as LENGTHS from '../../util/lengths.js'; import {Styles} from '../../util/Styles.js'; import {CommonOutputJax} from './OutputJax.js'; import {CommonWrapperFactory} from './WrapperFactory.js'; -import {BBox} from './BBox.js'; +import {BBox} from '../../util/BBox.js'; import {FontData, DelimiterData, CharData, CharOptions, DIRECTION, NOSTRETCH} from './FontData.js'; import {StyleList} from '../common/CssStyles.js'; diff --git a/ts/output/common/Wrappers/TeXAtom.ts b/ts/output/common/Wrappers/TeXAtom.ts index 14c22ee19..8b394f613 100644 --- a/ts/output/common/Wrappers/TeXAtom.ts +++ b/ts/output/common/Wrappers/TeXAtom.ts @@ -22,7 +22,7 @@ */ import {AnyWrapper, WrapperConstructor, Constructor} from '../Wrapper.js'; -import {BBox} from '../BBox.js'; +import {BBox} from '../../../util/BBox.js'; import {TEXCLASS} from '../../../core/MmlTree/MmlNode.js'; /*****************************************************************/ diff --git a/ts/output/common/Wrappers/TextNode.ts b/ts/output/common/Wrappers/TextNode.ts index b0bb656e0..956658e95 100644 --- a/ts/output/common/Wrappers/TextNode.ts +++ b/ts/output/common/Wrappers/TextNode.ts @@ -22,7 +22,7 @@ */ import {AnyWrapper, WrapperConstructor, Constructor} from '../Wrapper.js'; -import {BBox} from '../BBox.js'; +import {BBox} from '../../../util/BBox.js'; import {TextNode} from '../../../core/MmlTree/MmlNode.js'; /*****************************************************************/ diff --git a/ts/output/common/Wrappers/maction.ts b/ts/output/common/Wrappers/maction.ts index c79756dd4..45ac1f95b 100644 --- a/ts/output/common/Wrappers/maction.ts +++ b/ts/output/common/Wrappers/maction.ts @@ -23,7 +23,7 @@ import {AnyWrapper, WrapperConstructor, Constructor, AnyWrapperClass} from '../Wrapper.js'; import {MmlMaction} from '../../../core/MmlTree/MmlNodes/maction.js'; -import {BBox} from '../BBox.js'; +import {BBox} from '../../../util/BBox.js'; import {split} from '../../../util/string.js'; /*****************************************************************/ diff --git a/ts/output/common/Wrappers/menclose.ts b/ts/output/common/Wrappers/menclose.ts index 87de16cbf..841237452 100644 --- a/ts/output/common/Wrappers/menclose.ts +++ b/ts/output/common/Wrappers/menclose.ts @@ -24,7 +24,7 @@ import {AnyWrapper, WrapperConstructor, Constructor, AnyWrapperClass} from '../Wrapper.js'; import * as Notation from '../Notation.js'; import {CommonMsqrt} from './msqrt.js'; -import {BBox} from '../BBox.js'; +import {BBox} from '../../../util/BBox.js'; import {AbstractMmlNode} from '../../../core/MmlTree/MmlNode.js'; import {split} from '../../../util/string.js'; diff --git a/ts/output/common/Wrappers/mfenced.ts b/ts/output/common/Wrappers/mfenced.ts index 0ec465aaf..7acb1d9fc 100644 --- a/ts/output/common/Wrappers/mfenced.ts +++ b/ts/output/common/Wrappers/mfenced.ts @@ -25,7 +25,7 @@ import {AnyWrapper, WrapperConstructor, Constructor} from '../Wrapper.js'; import {CommonInferredMrow} from './mrow.js'; import {MmlNode, AbstractMmlNode} from '../../../core/MmlTree/MmlNode.js'; import {MmlMfenced} from '../../../core/MmlTree/MmlNodes/mfenced.js'; -import {BBox} from '../BBox.js'; +import {BBox} from '../../../util/BBox.js'; /*****************************************************************/ /** diff --git a/ts/output/common/Wrappers/mfrac.ts b/ts/output/common/Wrappers/mfrac.ts index 3faf7a856..c933718b3 100644 --- a/ts/output/common/Wrappers/mfrac.ts +++ b/ts/output/common/Wrappers/mfrac.ts @@ -23,7 +23,7 @@ import {AnyWrapper, WrapperConstructor, Constructor} from '../Wrapper.js'; import {CommonMo} from './mo.js'; -import {BBox} from '../BBox.js'; +import {BBox} from '../../../util/BBox.js'; import {DIRECTION} from '../FontData.js'; /*****************************************************************/ diff --git a/ts/output/common/Wrappers/mglyph.ts b/ts/output/common/Wrappers/mglyph.ts index 97ecf4889..eb5f6b3d7 100644 --- a/ts/output/common/Wrappers/mglyph.ts +++ b/ts/output/common/Wrappers/mglyph.ts @@ -22,7 +22,7 @@ */ import {AnyWrapper, WrapperConstructor, Constructor} from '../Wrapper.js'; -import {BBox} from '../BBox.js'; +import {BBox} from '../../../util/BBox.js'; /*****************************************************************/ /** diff --git a/ts/output/common/Wrappers/mi.ts b/ts/output/common/Wrappers/mi.ts index c4bd8735b..fb10b6d5b 100644 --- a/ts/output/common/Wrappers/mi.ts +++ b/ts/output/common/Wrappers/mi.ts @@ -22,7 +22,7 @@ */ import {AnyWrapper, WrapperConstructor, Constructor} from '../Wrapper.js'; -import {BBox} from '../BBox.js'; +import {BBox} from '../../../util/BBox.js'; /*****************************************************************/ /** diff --git a/ts/output/common/Wrappers/mmultiscripts.ts b/ts/output/common/Wrappers/mmultiscripts.ts index 786b14a30..1bf330141 100644 --- a/ts/output/common/Wrappers/mmultiscripts.ts +++ b/ts/output/common/Wrappers/mmultiscripts.ts @@ -23,7 +23,7 @@ import {AnyWrapper, Constructor} from '../Wrapper.js'; import {CommonMsubsup, MsubsupConstructor} from './msubsup.js'; -import {BBox} from '../BBox.js'; +import {BBox} from '../../../util/BBox.js'; /*****************************************************************/ diff --git a/ts/output/common/Wrappers/mo.ts b/ts/output/common/Wrappers/mo.ts index 048ab96c4..46a2546cd 100644 --- a/ts/output/common/Wrappers/mo.ts +++ b/ts/output/common/Wrappers/mo.ts @@ -23,7 +23,7 @@ import {AnyWrapper, WrapperConstructor, Constructor} from '../Wrapper.js'; import {MmlMo} from '../../../core/MmlTree/MmlNodes/mo.js'; -import {BBox} from '../BBox.js'; +import {BBox} from '../../../util/BBox.js'; import {DelimiterData} from '../FontData.js'; import {DIRECTION, NOSTRETCH} from '../FontData.js'; diff --git a/ts/output/common/Wrappers/mpadded.ts b/ts/output/common/Wrappers/mpadded.ts index 381ceb609..15f6fb914 100644 --- a/ts/output/common/Wrappers/mpadded.ts +++ b/ts/output/common/Wrappers/mpadded.ts @@ -22,7 +22,7 @@ */ import {AnyWrapper, WrapperConstructor, Constructor} from '../Wrapper.js'; -import {BBox} from '../BBox.js'; +import {BBox} from '../../../util/BBox.js'; import {Property} from '../../../core/Tree/Node.js'; /*****************************************************************/ diff --git a/ts/output/common/Wrappers/mroot.ts b/ts/output/common/Wrappers/mroot.ts index 7fa83113b..0d7bbedde 100644 --- a/ts/output/common/Wrappers/mroot.ts +++ b/ts/output/common/Wrappers/mroot.ts @@ -24,7 +24,7 @@ import {Constructor} from '../../common/Wrapper.js'; import {CommonMsqrt, MsqrtConstructor} from './msqrt.js'; import {CommonMo} from './mo.js'; -import {BBox} from '../BBox.js'; +import {BBox} from '../../../util/BBox.js'; /*****************************************************************/ /** diff --git a/ts/output/common/Wrappers/mrow.ts b/ts/output/common/Wrappers/mrow.ts index 02fb1c4cd..59117dff8 100644 --- a/ts/output/common/Wrappers/mrow.ts +++ b/ts/output/common/Wrappers/mrow.ts @@ -23,7 +23,7 @@ import {AnyWrapper, WrapperConstructor, Constructor} from '../Wrapper.js'; import {CommonMo} from './mo.js'; -import {BBox} from '../BBox.js'; +import {BBox} from '../../../util/BBox.js'; import {DIRECTION} from '../FontData.js'; /*****************************************************************/ diff --git a/ts/output/common/Wrappers/mspace.ts b/ts/output/common/Wrappers/mspace.ts index 02817c548..61d1f8599 100644 --- a/ts/output/common/Wrappers/mspace.ts +++ b/ts/output/common/Wrappers/mspace.ts @@ -22,7 +22,7 @@ */ import {AnyWrapper, WrapperConstructor, Constructor} from '../Wrapper.js'; -import {BBox} from '../BBox.js'; +import {BBox} from '../../../util/BBox.js'; /*****************************************************************/ /** diff --git a/ts/output/common/Wrappers/msqrt.ts b/ts/output/common/Wrappers/msqrt.ts index 388cd7a18..9b0c22b79 100644 --- a/ts/output/common/Wrappers/msqrt.ts +++ b/ts/output/common/Wrappers/msqrt.ts @@ -23,7 +23,7 @@ import {AnyWrapper, WrapperConstructor, Constructor} from '../Wrapper.js'; import {CommonMo} from './mo.js'; -import {BBox} from '../BBox.js'; +import {BBox} from '../../../util/BBox.js'; import {DIRECTION} from '../FontData.js'; /*****************************************************************/ diff --git a/ts/output/common/Wrappers/msubsup.ts b/ts/output/common/Wrappers/msubsup.ts index 92c2112e9..11ae8bd27 100644 --- a/ts/output/common/Wrappers/msubsup.ts +++ b/ts/output/common/Wrappers/msubsup.ts @@ -24,7 +24,7 @@ import {AnyWrapper, Constructor} from '../Wrapper.js'; import {CommonScriptbase, ScriptbaseConstructor} from './scriptbase.js'; -import {BBox} from '../BBox.js'; +import {BBox} from '../../../util/BBox.js'; import {MmlMsubsup, MmlMsub, MmlMsup} from '../../../core/MmlTree/MmlNodes/msubsup.js'; /*****************************************************************/ diff --git a/ts/output/common/Wrappers/mtable.ts b/ts/output/common/Wrappers/mtable.ts index 0cf6eec0b..dac5726c8 100644 --- a/ts/output/common/Wrappers/mtable.ts +++ b/ts/output/common/Wrappers/mtable.ts @@ -24,7 +24,7 @@ import {AnyWrapper, WrapperConstructor, Constructor} from '../Wrapper.js'; import {CommonMtr} from './mtr.js'; import {CommonMo} from './mo.js'; -import {BBox} from '../BBox.js'; +import {BBox} from '../../../util/BBox.js'; import {DIRECTION} from '../FontData.js'; import {split, isPercent} from '../../../util/string.js'; import {sum, max} from '../../../util/numeric.js'; diff --git a/ts/output/common/Wrappers/mtr.ts b/ts/output/common/Wrappers/mtr.ts index f38b075eb..b013d2a0b 100644 --- a/ts/output/common/Wrappers/mtr.ts +++ b/ts/output/common/Wrappers/mtr.ts @@ -24,7 +24,7 @@ import {AnyWrapper, WrapperConstructor, Constructor} from '../Wrapper.js'; import {CommonMo} from './mo.js'; -import {BBox} from '../BBox.js'; +import {BBox} from '../../../util/BBox.js'; import {DIRECTION} from '../FontData.js'; /*****************************************************************/ diff --git a/ts/output/common/Wrappers/munderover.ts b/ts/output/common/Wrappers/munderover.ts index db36fa817..1f977aead 100644 --- a/ts/output/common/Wrappers/munderover.ts +++ b/ts/output/common/Wrappers/munderover.ts @@ -25,7 +25,7 @@ import {AnyWrapper, Constructor} from '../Wrapper.js'; import {CommonScriptbase, ScriptbaseConstructor} from './scriptbase.js'; import {MmlMunderover, MmlMunder, MmlMover} from '../../../core/MmlTree/MmlNodes/munderover.js'; -import {BBox} from '../BBox.js'; +import {BBox} from '../../../util/BBox.js'; /*****************************************************************/ /** diff --git a/ts/output/common/Wrappers/scriptbase.ts b/ts/output/common/Wrappers/scriptbase.ts index a5101da3b..e129786d3 100644 --- a/ts/output/common/Wrappers/scriptbase.ts +++ b/ts/output/common/Wrappers/scriptbase.ts @@ -27,7 +27,7 @@ import {AnyWrapper, WrapperConstructor, Constructor, AnyWrapperClass} from '../Wrapper.js'; import {CommonMo} from './mo.js'; import {MmlMsubsup} from '../../../core/MmlTree/MmlNodes/msubsup.js'; -import {BBox} from '../BBox.js'; +import {BBox} from '../../../util/BBox.js'; import {DIRECTION} from '../FontData.js'; /* diff --git a/ts/output/common/Wrappers/semantics.ts b/ts/output/common/Wrappers/semantics.ts index 8a96f6f82..186073659 100644 --- a/ts/output/common/Wrappers/semantics.ts +++ b/ts/output/common/Wrappers/semantics.ts @@ -22,7 +22,7 @@ */ import {AnyWrapper, WrapperConstructor, Constructor} from '../Wrapper.js'; -import {BBox} from '../BBox.js'; +import {BBox} from '../../../util/BBox.js'; /*****************************************************************/ /** diff --git a/ts/output/svg/Wrappers/math.ts b/ts/output/svg/Wrappers/math.ts index b5d26ca6c..0b7f67e11 100644 --- a/ts/output/svg/Wrappers/math.ts +++ b/ts/output/svg/Wrappers/math.ts @@ -25,7 +25,7 @@ import {SVGWrapper, SVGConstructor} from '../Wrapper.js'; import {CommonMathMixin} from '../../common/Wrappers/math.js'; import {MmlMath} from '../../../core/MmlTree/MmlNodes/math.js'; import {StyleList} from '../../common/CssStyles.js'; -import {BBox} from '../BBox.js'; +import {BBox} from '../../../util/BBox.js'; /*****************************************************************/ /** diff --git a/ts/output/svg/Wrappers/mo.ts b/ts/output/svg/Wrappers/mo.ts index 9c4e8d37e..ab108e107 100644 --- a/ts/output/svg/Wrappers/mo.ts +++ b/ts/output/svg/Wrappers/mo.ts @@ -24,7 +24,7 @@ import {SVGWrapper, SVGConstructor} from '../Wrapper.js'; import {CommonMoMixin} from '../../common/Wrappers/mo.js'; import {MmlMo} from '../../../core/MmlTree/MmlNodes/mo.js'; -import {BBox} from '../BBox.js'; +import {BBox} from '../../../util/BBox.js'; import {DIRECTION, SVGCharData, SVGCharOptions} from '../FontData.js'; diff --git a/ts/output/svg/Wrappers/mroot.ts b/ts/output/svg/Wrappers/mroot.ts index c7dd11aa1..93d046b46 100644 --- a/ts/output/svg/Wrappers/mroot.ts +++ b/ts/output/svg/Wrappers/mroot.ts @@ -24,7 +24,7 @@ import {SVGWrapper, Constructor} from '../Wrapper.js'; import {SVGmsqrt} from './msqrt.js'; import {CommonMrootMixin} from '../../common/Wrappers/mroot.js'; -import {BBox} from '../BBox.js'; +import {BBox} from '../../../util/BBox.js'; import {MmlMroot} from '../../../core/MmlTree/MmlNodes/mroot.js'; /*****************************************************************/ diff --git a/ts/output/svg/Wrappers/msqrt.ts b/ts/output/svg/Wrappers/msqrt.ts index f5acbac8a..8bb09fb15 100644 --- a/ts/output/svg/Wrappers/msqrt.ts +++ b/ts/output/svg/Wrappers/msqrt.ts @@ -23,7 +23,7 @@ import {SVGWrapper, SVGConstructor} from '../Wrapper.js'; import {CommonMsqrtMixin} from '../../common/Wrappers/msqrt.js'; -import {BBox} from '../BBox.js'; +import {BBox} from '../../../util/BBox.js'; import {MmlMsqrt} from '../../../core/MmlTree/MmlNodes/msqrt.js'; /*****************************************************************/ diff --git a/ts/output/svg/Wrappers/semantics.ts b/ts/output/svg/Wrappers/semantics.ts index 53d1d97d3..33e285695 100644 --- a/ts/output/svg/Wrappers/semantics.ts +++ b/ts/output/svg/Wrappers/semantics.ts @@ -24,7 +24,7 @@ import {SVGWrapper, SVGConstructor} from '../Wrapper.js'; import {CommonSemanticsMixin} from '../../common/Wrappers/semantics.js'; -import {BBox} from '../BBox.js'; +import {BBox} from '../../../util/BBox.js'; import {MmlSemantics, MmlAnnotation, MmlAnnotationXML} from '../../../core/MmlTree/MmlNodes/semantics.js'; import {XMLNode} from '../../../core/MmlTree/MmlNode.js'; import {StyleList} from '../../common/CssStyles.js';