From 589e86e9bb5595bc7f5180e0429aa49f5533f950 Mon Sep 17 00:00:00 2001 From: Xavier Ripoll Date: Mon, 15 Oct 2018 15:26:04 +0200 Subject: [PATCH] MOODLE-556: Updated basic tests to normalize whitespace between non-text tags --- .../HTMLPurifier/HTMLModule/MathBasicTest.php | 10 +- tests/MathML/basic/bad/badAttribs2.mml | 11 +- tests/MathML/basic/bad/badBvar1.mml | 114 +-------- tests/MathML/basic/bad/badCondContent1.mml | 227 +----------------- tests/MathML/basic/bad/badMoment1.mml | 31 +-- tests/MathML/basic/bad/badPiecewise1.mml | 24 +- tests/MathML/basic/bad/badTag1.mml | 22 +- tests/MathML/basic/bad/badTagPhantom2.mml | 10 +- tests/MathML/basic/bad/deprecated-mtd1.mml | 6 +- tests/MathML/basic/bad/deprecated-mtd2.mml | 8 +- tests/MathML/basic/bad/deprecated-test3.mml | 19 +- tests/MathML/basic/bad/mrootE2.mml | 15 +- tests/MathML/basic/bad/mtable1.mml | 22 +- tests/MathML/basic/bad/noChildContent.mml | 203 +--------------- .../MathML/basic/bad/noChildPresentation.mml | 173 +------------ .../basic/bad/tooFewContentContainer.mml | 94 +------- tests/MathML/basic/good/1.mml | 13 +- tests/MathML/basic/good/10.mml | 32 +-- tests/MathML/basic/good/11.mml | 12 +- tests/MathML/basic/good/12.mml | 53 +--- tests/MathML/basic/good/13.mml | 34 +-- tests/MathML/basic/good/14.mml | 52 +--- tests/MathML/basic/good/15.mml | 15 +- tests/MathML/basic/good/16.mml | 14 +- tests/MathML/basic/good/17.mml | 12 +- tests/MathML/basic/good/18.mml | 63 +---- tests/MathML/basic/good/19.mml | 16 +- tests/MathML/basic/good/2.mml | 11 +- tests/MathML/basic/good/20.mml | 12 +- tests/MathML/basic/good/21.mml | 35 +-- tests/MathML/basic/good/22.mml | 59 +---- tests/MathML/basic/good/23.mml | 88 +------ tests/MathML/basic/good/24.mml | 163 +------------ tests/MathML/basic/good/25.mml | 10 +- tests/MathML/basic/good/26.mml | 12 +- tests/MathML/basic/good/27.mml | 16 +- tests/MathML/basic/good/28.mml | 8 +- tests/MathML/basic/good/3.mml | 20 +- tests/MathML/basic/good/4.mml | 18 +- tests/MathML/basic/good/5.mml | 13 +- tests/MathML/basic/good/6.mml | 49 +--- tests/MathML/basic/good/7.mml | 49 +--- tests/MathML/basic/good/8.mml | 15 +- tests/MathML/basic/good/9.mml | 45 +--- 44 files changed, 44 insertions(+), 1884 deletions(-) diff --git a/tests/HTMLPurifier/HTMLModule/MathBasicTest.php b/tests/HTMLPurifier/HTMLModule/MathBasicTest.php index 4c9daa4c..e8266deb 100644 --- a/tests/HTMLPurifier/HTMLModule/MathBasicTest.php +++ b/tests/HTMLPurifier/HTMLModule/MathBasicTest.php @@ -69,15 +69,7 @@ class HTMLPurifier_HTMLModule_MathBasicTest extends HTMLPurifier_HTMLModuleHarne // Incorrectly formed MathML trees that yield an error public function testError() { - $snippet = '' . -' - - - 5 - 2 - - -'; + $snippet = '52'; $this->expectError(); diff --git a/tests/MathML/basic/bad/badAttribs2.mml b/tests/MathML/basic/bad/badAttribs2.mml index e36651ce..56a2e8bc 100644 --- a/tests/MathML/basic/bad/badAttribs2.mml +++ b/tests/MathML/basic/bad/badAttribs2.mml @@ -1,10 +1 @@ - - - - - 2 - 5 - - + - x - \ No newline at end of file +25+x \ No newline at end of file diff --git a/tests/MathML/basic/bad/badBvar1.mml b/tests/MathML/basic/bad/badBvar1.mml index 5578d737..ede1a81e 100644 --- a/tests/MathML/basic/bad/badBvar1.mml +++ b/tests/MathML/basic/bad/badBvar1.mml @@ -1,113 +1 @@ - - - - - - - - correct: - - - - x - - - - - - correct w/ degree - - - - x - - 2 - - - - - - - missing <ci>: - - - - - - - - missing <ci> w/ degree: - - - - - 2 - - - - - - - 2 <ci>s - - - - x - y - - - - - - 2 w/ degree - - - - x - y - - 2 - - - - - - - <mi/>used - - - - x - - - - - - <mi/>used w/ degree - - - - x - - 2 - - - - - - - missing <ci>, 2 degrees - - - - - 4 - - - 2 - - - - - - \ No newline at end of file +correct:xcorrect w/ degreex2missing <ci>:missing <ci> w/ degree:22 <ci>sxy2 w/ degreexy2<mi/>usedx<mi/>used w/ degreex2missing <ci>, 2 degrees42 \ No newline at end of file diff --git a/tests/MathML/basic/bad/badCondContent1.mml b/tests/MathML/basic/bad/badCondContent1.mml index 0beef936..28a52c01 100644 --- a/tests/MathML/basic/bad/badCondContent1.mml +++ b/tests/MathML/basic/bad/badCondContent1.mml @@ -1,226 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 2 - - - - - - - - - - - - - - - - 2 - - - - - - - - - - - - - - 2 - - - - - - - - - - - - - - - 2 - - - - x - - - - - - - - - - - - - 2 - - - - - - 2 - 5 - - - - - - - - - - - 2 - x - y - - - - - - - - 2 - x - y - - - - - - - - - - 2 - - - - - - 2 - 5 - - - - - - - - - - - - - 2 - - - - - - 2 - 5 - - - - - - - - - - - - - 2 - - - - - - 2 - 5 - - - - - - - - - - - - - 2 - - - - - - 2 - 5 - - - - - - - - - - - 2 - 5 - - - - 2 - - 5 - - - - - - \ No newline at end of file +2222x2252xy2xy2252252252252525 \ No newline at end of file diff --git a/tests/MathML/basic/bad/badMoment1.mml b/tests/MathML/basic/bad/badMoment1.mml index e0cb1a05..f41c9ec6 100644 --- a/tests/MathML/basic/bad/badMoment1.mml +++ b/tests/MathML/basic/bad/badMoment1.mml @@ -1,30 +1 @@ - - - - - - - - 3 - - - 0 - - - 4 - - X - - - - - - 3 - - x - - 0 - - X - - \ No newline at end of file +304X3x0X \ No newline at end of file diff --git a/tests/MathML/basic/bad/badPiecewise1.mml b/tests/MathML/basic/bad/badPiecewise1.mml index 20cc6c04..6d9bc0b2 100644 --- a/tests/MathML/basic/bad/badPiecewise1.mml +++ b/tests/MathML/basic/bad/badPiecewise1.mml @@ -1,23 +1 @@ - - - - - - 0 - - - x - 5 - - - - x - - - y - - - x - - - \ No newline at end of file +0x5xyx \ No newline at end of file diff --git a/tests/MathML/basic/bad/badTag1.mml b/tests/MathML/basic/bad/badTag1.mml index 14e75961..e971ae34 100644 --- a/tests/MathML/basic/bad/badTag1.mml +++ b/tests/MathML/basic/bad/badTag1.mml @@ -1,21 +1 @@ - - - - - 5 - 2 - - + - - 2 - 5 - - + - - 5 - + - 5 - - + - - \ No newline at end of file +52+25+5+5+ \ No newline at end of file diff --git a/tests/MathML/basic/bad/badTagPhantom2.mml b/tests/MathML/basic/bad/badTagPhantom2.mml index 9535a127..d95ed06a 100644 --- a/tests/MathML/basic/bad/badTagPhantom2.mml +++ b/tests/MathML/basic/bad/badTagPhantom2.mml @@ -1,9 +1 @@ - - - - 2 - + - - 14 - - \ No newline at end of file +2+14 \ No newline at end of file diff --git a/tests/MathML/basic/bad/deprecated-mtd1.mml b/tests/MathML/basic/bad/deprecated-mtd1.mml index 84fe3536..e4fda211 100644 --- a/tests/MathML/basic/bad/deprecated-mtd1.mml +++ b/tests/MathML/basic/bad/deprecated-mtd1.mml @@ -1,5 +1 @@ - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/tests/MathML/basic/bad/deprecated-mtd2.mml b/tests/MathML/basic/bad/deprecated-mtd2.mml index 90600f2a..28e63d51 100644 --- a/tests/MathML/basic/bad/deprecated-mtd2.mml +++ b/tests/MathML/basic/bad/deprecated-mtd2.mml @@ -1,7 +1 @@ - - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/tests/MathML/basic/bad/deprecated-test3.mml b/tests/MathML/basic/bad/deprecated-test3.mml index 63da8b05..a57a8473 100644 --- a/tests/MathML/basic/bad/deprecated-test3.mml +++ b/tests/MathML/basic/bad/deprecated-test3.mml @@ -1,18 +1 @@ - - - - - 2 - - 5 - - - - - - 4 - + - 3 - - - \ No newline at end of file +254+3 \ No newline at end of file diff --git a/tests/MathML/basic/bad/mrootE2.mml b/tests/MathML/basic/bad/mrootE2.mml index bd1f3c35..0d1a0983 100644 --- a/tests/MathML/basic/bad/mrootE2.mml +++ b/tests/MathML/basic/bad/mrootE2.mml @@ -1,14 +1 @@ - - - - - - 3 - x - 2 - - - 3 - - - \ No newline at end of file +3x23 \ No newline at end of file diff --git a/tests/MathML/basic/bad/mtable1.mml b/tests/MathML/basic/bad/mtable1.mml index 6d7b8607..8e258066 100644 --- a/tests/MathML/basic/bad/mtable1.mml +++ b/tests/MathML/basic/bad/mtable1.mml @@ -1,21 +1 @@ - - - - - - 1111.23 - 0 - 0 - - - 0 - 1123 - 0 - - - 0.2 - 0 - 1123 - - - \ No newline at end of file +1111.23000112300.201123 \ No newline at end of file diff --git a/tests/MathML/basic/bad/noChildContent.mml b/tests/MathML/basic/bad/noChildContent.mml index 3991e626..ba98a7d7 100644 --- a/tests/MathML/basic/bad/noChildContent.mml +++ b/tests/MathML/basic/bad/noChildContent.mml @@ -1,202 +1 @@ - - - - - - - apply - - - - - - - - reln - - - - - - - - fn - - - - - - - - interval - - - - - - - - condition - - - - - - - - declare - - - - - - - - lambda - - - - - - - - domainofapp - - - - - - - - piecewise - - - - - - - - piece - - - - - - - - otherwise - - - - - - - - lowlimit - - - - - - - - uplimit - - - - - - - - bvar - - - - - - - - degree - - - - - - - - set - - - - - - - - list - - - - - - - - moment - - - - - - - - momentabout - - - - - - - - vector - - - - - - - - matrix - - - - - - - - matrixrow - - - - - - - - - - semantics - - - - - - - - annotation - - - - - - - - - \ No newline at end of file +applyrelnfnintervalconditiondeclarelambdadomainofapppiecewisepieceotherwiselowlimituplimitbvardegreesetlistmomentmomentaboutvectormatrixmatrixrowsemanticsannotation \ No newline at end of file diff --git a/tests/MathML/basic/bad/noChildPresentation.mml b/tests/MathML/basic/bad/noChildPresentation.mml index 3f6dffb2..cf73f48e 100644 --- a/tests/MathML/basic/bad/noChildPresentation.mml +++ b/tests/MathML/basic/bad/noChildPresentation.mml @@ -1,172 +1 @@ - - - - - - - mrow - - - - - - - - frac - - - - - - - - sqrt - - - - - - - - root - - - - - - - - style - - - - - - - - error - - - - - - - - padded - - - - - - - - phantom - - - - - - - - fenced - - - - - - - - enclose - - - - - - - - sub - - - - - - - - sup - - - - - - - - subsup - - - - - - - - under - - - - - - - - over - - - - - - - - underover - - - - - - - - multiscripts - - - - - - - - table - - - - - - - - table row - - - - - - - - - - table cell - - - - - - - - - - - \ No newline at end of file +mrowfracsqrtrootstyleerrorpaddedphantomfencedenclosesubsupsubsupunderoverunderovermultiscriptstabletable rowtable cell \ No newline at end of file diff --git a/tests/MathML/basic/bad/tooFewContentContainer.mml b/tests/MathML/basic/bad/tooFewContentContainer.mml index 3aeaf0b6..d4b3b68a 100644 --- a/tests/MathML/basic/bad/tooFewContentContainer.mml +++ b/tests/MathML/basic/bad/tooFewContentContainer.mml @@ -1,93 +1 @@ - - - - - - - reln - - - - - - , - - - a - - - - - - interval - - - - 2 - - - - - - lambda - - - - - x - - - , - - - x - - - - - - - bvar - - - - - 2 - - - - - - - set - - - - - - - x - 5 - - - - - - - - list - - - - - - - x - 5 - - - - - - - \ No newline at end of file +reln,ainterval2lambdax,xbvar2setx5listx5 \ No newline at end of file diff --git a/tests/MathML/basic/good/1.mml b/tests/MathML/basic/good/1.mml index 8c7199ad..3b0d8343 100644 --- a/tests/MathML/basic/good/1.mml +++ b/tests/MathML/basic/good/1.mml @@ -1,12 +1 @@ - - - - x - 2 - - - y - 2 - - - \ No newline at end of file +x2y2 \ No newline at end of file diff --git a/tests/MathML/basic/good/10.mml b/tests/MathML/basic/good/10.mml index d12e90f0..a26edff9 100644 --- a/tests/MathML/basic/good/10.mml +++ b/tests/MathML/basic/good/10.mml @@ -1,31 +1 @@ - - - - ∑ - - - - 0 - ≤ - i - ≤ - m - - - 0 - < - j - < - n - - - - - P - ( - i - , - j - ) - - \ No newline at end of file +∑0≤i≤m0<j<nP(i,j) \ No newline at end of file diff --git a/tests/MathML/basic/good/11.mml b/tests/MathML/basic/good/11.mml index ac832a2f..b7ca8e3c 100644 --- a/tests/MathML/basic/good/11.mml +++ b/tests/MathML/basic/good/11.mml @@ -1,11 +1 @@ - - - - x - - 2 - y - - - - \ No newline at end of file +x2y \ No newline at end of file diff --git a/tests/MathML/basic/good/12.mml b/tests/MathML/basic/good/12.mml index 6801058e..be3c5b6c 100644 --- a/tests/MathML/basic/good/12.mml +++ b/tests/MathML/basic/good/12.mml @@ -1,52 +1 @@ - - - - ∑ - - i - = - 1 - - p - - - ∑ - - j - = - 1 - - q - - - ∑ - - k - = - 1 - - r - - - a - - i - j - - - - b - - j - k - - - - c - - k - i - - - - \ No newline at end of file +∑i=1p∑j=1q∑k=1raijbjkcki \ No newline at end of file diff --git a/tests/MathML/basic/good/13.mml b/tests/MathML/basic/good/13.mml index 02c6e6ff..fd9ce75e 100644 --- a/tests/MathML/basic/good/13.mml +++ b/tests/MathML/basic/good/13.mml @@ -1,33 +1 @@ - - - - 1 - + - - 1 - + - - 1 - + - - 1 - + - - 1 - + - - 1 - + - - 1 - + - x - - - - - - - - - \ No newline at end of file +1+1+1+1+1+1+1+x \ No newline at end of file diff --git a/tests/MathML/basic/good/14.mml b/tests/MathML/basic/good/14.mml index b4eca430..9424560f 100644 --- a/tests/MathML/basic/good/14.mml +++ b/tests/MathML/basic/good/14.mml @@ -1,51 +1 @@ - - - - ( - - - ∂ - 2 - - - ∂ - - x - 2 - - - - + - - - ∂ - 2 - - - ∂ - - y - 2 - - - - ) - - - - | - φ - ( - x - + - i - y - ) - | - - 2 - - = - 0 - - \ No newline at end of file +(∂2∂x2+∂2∂y2)|φ(x+iy)|2=0 \ No newline at end of file diff --git a/tests/MathML/basic/good/15.mml b/tests/MathML/basic/good/15.mml index 751c0896..d991945a 100644 --- a/tests/MathML/basic/good/15.mml +++ b/tests/MathML/basic/good/15.mml @@ -1,14 +1 @@ - - - - 2 - - 2 - - 2 - x - - - - - \ No newline at end of file +222x \ No newline at end of file diff --git a/tests/MathML/basic/good/16.mml b/tests/MathML/basic/good/16.mml index 03a1d712..7f07919b 100644 --- a/tests/MathML/basic/good/16.mml +++ b/tests/MathML/basic/good/16.mml @@ -1,13 +1 @@ - - - - ∫ - 1 - x - - - dt - t - - - \ No newline at end of file +∫1xdtt \ No newline at end of file diff --git a/tests/MathML/basic/good/17.mml b/tests/MathML/basic/good/17.mml index 0ce58b9d..4df85ebb 100644 --- a/tests/MathML/basic/good/17.mml +++ b/tests/MathML/basic/good/17.mml @@ -1,11 +1 @@ - - - - ∬ - D - - dx - - dy - - \ No newline at end of file +∬Ddxdy \ No newline at end of file diff --git a/tests/MathML/basic/good/18.mml b/tests/MathML/basic/good/18.mml index e8c56681..39aed2de 100644 --- a/tests/MathML/basic/good/18.mml +++ b/tests/MathML/basic/good/18.mml @@ -1,62 +1 @@ - - - f - ( - x - ) - = - - { - - - - - 1 - / - 3 - - - - - if  - 0 - ≤ - x - ≤ - 1 - ; - - - - - - - 2 - / - 3 - - - - - if  - 3 - ≤ - x - ≤ - 4 - ; - - - - - - 0 - - - elsewhere. - - - - - - \ No newline at end of file +f(x)={1/3if 0≤x≤1;2/3if 3≤x≤4;0elsewhere. \ No newline at end of file diff --git a/tests/MathML/basic/good/19.mml b/tests/MathML/basic/good/19.mml index 660017e7..b3a38699 100644 --- a/tests/MathML/basic/good/19.mml +++ b/tests/MathML/basic/good/19.mml @@ -1,15 +1 @@ - - - - x - + - ... - + - x - - - ⏞ - k times - - - \ No newline at end of file +x+...+x⏞ktimes \ No newline at end of file diff --git a/tests/MathML/basic/good/2.mml b/tests/MathML/basic/good/2.mml index 25102c42..613027a5 100644 --- a/tests/MathML/basic/good/2.mml +++ b/tests/MathML/basic/good/2.mml @@ -1,10 +1 @@ - - - - F - 3 - - 2 - - - \ No newline at end of file +F32 \ No newline at end of file diff --git a/tests/MathML/basic/good/20.mml b/tests/MathML/basic/good/20.mml index 99646908..da4936aa 100644 --- a/tests/MathML/basic/good/20.mml +++ b/tests/MathML/basic/good/20.mml @@ -1,11 +1 @@ - - - - y - - x - 2 - - - - \ No newline at end of file +yx2 \ No newline at end of file diff --git a/tests/MathML/basic/good/21.mml b/tests/MathML/basic/good/21.mml index a822b702..3b10159a 100644 --- a/tests/MathML/basic/good/21.mml +++ b/tests/MathML/basic/good/21.mml @@ -1,34 +1 @@ - - - - ∑ - - p -  prime - - - f - ( - p - ) - = - - ∫ - - t - > - 1 - - - f - ( - t - ) - - d - π - ( - t - ) - - \ No newline at end of file +∑p primef(p)=∫t>1f(t)dπ(t) \ No newline at end of file diff --git a/tests/MathML/basic/good/22.mml b/tests/MathML/basic/good/22.mml index 24ea8e95..79eaa437 100644 --- a/tests/MathML/basic/good/22.mml +++ b/tests/MathML/basic/good/22.mml @@ -1,58 +1 @@ - - - { - - - - - ( - a - , - ... - , - a - - - ⏞ - - k -   - a - \'s - - - - , - - - ( - b - , - ... - , - b - - - ⏞ - - ℓ -   - b - \'s - - - - - - ⏟ - - k - + - ℓ -  elements - - - - } - - \ No newline at end of file +{(a,...,a⏞k a\'s,(b,...,b⏞ℓ b\'s⏟k+ℓ elements} \ No newline at end of file diff --git a/tests/MathML/basic/good/23.mml b/tests/MathML/basic/good/23.mml index b2bbfb54..3ed810e5 100644 --- a/tests/MathML/basic/good/23.mml +++ b/tests/MathML/basic/good/23.mml @@ -1,87 +1 @@ - - - ( - - - - - ( - - - - a - - - b - - - - - c - - - d - - - - ) - - - - - ( - - - - e - - - f - - - - - g - - - h - - - - ) - - - - - - 0 - - - - ( - - - - i - - - j - - - - - k - - - l - - - - ) - - - - - ) - - \ No newline at end of file +((abcd)(efgh)0(ijkl)) \ No newline at end of file diff --git a/tests/MathML/basic/good/24.mml b/tests/MathML/basic/good/24.mml index 8f68ac37..5a544951 100644 --- a/tests/MathML/basic/good/24.mml +++ b/tests/MathML/basic/good/24.mml @@ -1,162 +1 @@ - - - det - | - - - - - c - 0 - - - - - c - 1 - - - - - c - 2 - - - - … - - - - c - n - - - - - - - c - 1 - - - - - c - 2 - - - - - c - 3 - - - - … - - - - c - - n - + - 1 - - - - - - - - c - 2 - - - - - c - 3 - - - - - c - 4 - - - - … - - - - c - - n - + - 2 - - - - - - - ⋮ - - - ⋮ - - - ⋮ - - - - - ⋮ - - - - - - c - n - - - - - c - - n - + - 1 - - - - - - c - - n - + - 2 - - - - - … - - - - c - - 2 - n - - - - - - | - > - 0 - - \ No newline at end of file +det|c0c1c2…cnc1c2c3…cn+1c2c3c4…cn+2⋮⋮⋮⋮cncn+1cn+2…c2n|>0 \ No newline at end of file diff --git a/tests/MathML/basic/good/25.mml b/tests/MathML/basic/good/25.mml index 54af3311..0e0a55eb 100644 --- a/tests/MathML/basic/good/25.mml +++ b/tests/MathML/basic/good/25.mml @@ -1,9 +1 @@ - - - y - - x - 2 - - - \ No newline at end of file +yx2 \ No newline at end of file diff --git a/tests/MathML/basic/good/26.mml b/tests/MathML/basic/good/26.mml index 490c384b..33e4f28b 100644 --- a/tests/MathML/basic/good/26.mml +++ b/tests/MathML/basic/good/26.mml @@ -1,11 +1 @@ - - - - x - 92 - 31415 - - + - π - - \ No newline at end of file +x9231415+π \ No newline at end of file diff --git a/tests/MathML/basic/good/27.mml b/tests/MathML/basic/good/27.mml index 71ff0843..193ec66d 100644 --- a/tests/MathML/basic/good/27.mml +++ b/tests/MathML/basic/good/27.mml @@ -1,15 +1 @@ - - - x - - y - b - a - - - z - c - d - - - \ No newline at end of file +xybazcd \ No newline at end of file diff --git a/tests/MathML/basic/good/28.mml b/tests/MathML/basic/good/28.mml index 7c643cc7..9c152901 100644 --- a/tests/MathML/basic/good/28.mml +++ b/tests/MathML/basic/good/28.mml @@ -1,7 +1 @@ - - - y - 3 - ‴ - - \ No newline at end of file +y3‴ \ No newline at end of file diff --git a/tests/MathML/basic/good/3.mml b/tests/MathML/basic/good/3.mml index 4203cc5b..057034bf 100644 --- a/tests/MathML/basic/good/3.mml +++ b/tests/MathML/basic/good/3.mml @@ -1,19 +1 @@ - - - - - x - + - - y - 2 - - - - k - + - 1 - - - - \ No newline at end of file +x+y2k+1 \ No newline at end of file diff --git a/tests/MathML/basic/good/4.mml b/tests/MathML/basic/good/4.mml index 7abbff22..16f18ff9 100644 --- a/tests/MathML/basic/good/4.mml +++ b/tests/MathML/basic/good/4.mml @@ -1,17 +1 @@ - - - x - + - - y - - 2 - - k - + - 1 - - - - - \ No newline at end of file +x+y2k+1 \ No newline at end of file diff --git a/tests/MathML/basic/good/5.mml b/tests/MathML/basic/good/5.mml index bc57720f..48a2b3a5 100644 --- a/tests/MathML/basic/good/5.mml +++ b/tests/MathML/basic/good/5.mml @@ -1,12 +1 @@ - - - - a - - b - / - 2 - - - - \ No newline at end of file +ab/2 \ No newline at end of file diff --git a/tests/MathML/basic/good/6.mml b/tests/MathML/basic/good/6.mml index 238507d7..91146323 100644 --- a/tests/MathML/basic/good/6.mml +++ b/tests/MathML/basic/good/6.mml @@ -1,48 +1 @@ - - - - a - 0 - - + - - 1 - - - a - 1 - - + - - 1 - - - a - 2 - - + - - 1 - - - a - 3 - - + - - 1 - - - a - 4 - - - - - - - - - - - \ No newline at end of file +a0+1a1+1a2+1a3+1a4 \ No newline at end of file diff --git a/tests/MathML/basic/good/7.mml b/tests/MathML/basic/good/7.mml index 08d7cb31..4a9ee251 100644 --- a/tests/MathML/basic/good/7.mml +++ b/tests/MathML/basic/good/7.mml @@ -1,48 +1 @@ - - - - a - 0 - - + - - 1 - - - a - 1 - - + - - 1 - - - a - 2 - - + - - 1 - - - a - 3 - - + - - 1 - - - a - 4 - - - - - - - - - - - \ No newline at end of file +a0+1a1+1a2+1a3+1a4 \ No newline at end of file diff --git a/tests/MathML/basic/good/8.mml b/tests/MathML/basic/good/8.mml index d99feab8..bf98a4fa 100644 --- a/tests/MathML/basic/good/8.mml +++ b/tests/MathML/basic/good/8.mml @@ -1,14 +1 @@ - - - ( - - n - - k - / - 2 - - - ) - - \ No newline at end of file +(nk/2) \ No newline at end of file diff --git a/tests/MathML/basic/good/9.mml b/tests/MathML/basic/good/9.mml index fc2a19cf..737c1800 100644 --- a/tests/MathML/basic/good/9.mml +++ b/tests/MathML/basic/good/9.mml @@ -1,44 +1 @@ - - - - ( - - p - 2 - - ) - - - x - 2 - - - y - - p - - - 2 - - - - - - 1 - - 1 - - - x - - - - 1 - - 1 - - - - x - 2 - - - - - \ No newline at end of file +(p2)x2yp-2-11-x11-x2 \ No newline at end of file