Skip to content

Commit ee6eea3

Browse files
zorkowzorkow
authored
Merge pull request #824 from Speech-Rule-Engine/fix/maction_enrichment_issue
Fix for added elements in mactions/toggles
2 parents 721cdc2 + 129ab6d commit ee6eea3

File tree

7 files changed

+280
-20
lines changed

7 files changed

+280
-20
lines changed

‎testsuite/expected/semantic/enrich_mathml/issues.json‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,36 @@
180180
},
181181
"MJ_Issue_3431_text": {
182182
"expected": "<math type=\"punctuated\" role=\"text\" id=\"5\" children=\"0,1,2\" collapsed=\"(5 (c 3 4) 0 1 2)\"><mtext type=\"text\" role=\"unknown\" font=\"normal\" annotation=\"clearspeak:unit\" id=\"0\" parent=\"5\">aber</mtext><mtext type=\"text\" role=\"unknown\" annotation=\"clearspeak:unit\" id=\"1\" parent=\"5\">,</mtext><mtext type=\"text\" role=\"unknown\" font=\"normal\" annotation=\"clearspeak:unit\" id=\"2\" parent=\"5\">nicht</mtext></math>"
183+
},
184+
"issue_toogle_times_0": {
185+
"expected": "<math type=\"infixop\" role=\"implicit\" annotation=\"clearspeak:unit\" id=\"5\" children=\"0,1,2\" content=\"3,4\"><mi data-latex=\"D\" type=\"identifier\" role=\"latinletter\" font=\"italic\" annotation=\"clearspeak:simple\" id=\"0\" parent=\"5\" attributes=\"latex:D\">D</mi><maction data-latex=\"\\toggle{f}{m}\\endtoggle\"><mi data-latex=\"f\" type=\"identifier\" role=\"latinletter\" font=\"italic\" annotation=\"clearspeak:simple\" id=\"1\" parent=\"5\" attributes=\"latex:\\toggle{f}{m}\\endtoggle\">f</mi><mi data-latex=\"m\">m</mi></maction><mo type=\"operator\" role=\"multiplication\" id=\"3\" parent=\"5\" added=\"true\" operator=\"infixop,⁢\">⁢</mo><mo type=\"operator\" role=\"multiplication\" id=\"4\" parent=\"5\" added=\"true\" operator=\"infixop,⁢\">⁢</mo><mi data-latex=\"x\" type=\"identifier\" role=\"latinletter\" font=\"italic\" annotation=\"clearspeak:simple\" id=\"2\" parent=\"5\" attributes=\"latex:x\">x</mi></math>"
186+
},
187+
"issue_toogle_times_1": {
188+
"expected": "<math type=\"infixop\" role=\"implicit\" annotation=\"clearspeak:unit\" id=\"5\" children=\"0,1,2\" content=\"3,4\"><mi data-latex=\"D\" type=\"identifier\" role=\"latinletter\" font=\"italic\" annotation=\"clearspeak:simple\" id=\"0\" parent=\"5\" attributes=\"latex:D\">D</mi><maction data-latex=\"\\toggle{f}{g}{m}\\endtoggle\"><mi data-latex=\"f\" type=\"identifier\" role=\"latinletter\" font=\"italic\" annotation=\"clearspeak:simple\" id=\"1\" parent=\"5\" attributes=\"latex:\\toggle{f}{g}{m}\\endtoggle\">f</mi><mi data-latex=\"g\">g</mi><mi data-latex=\"m\">m</mi></maction><mo type=\"operator\" role=\"multiplication\" id=\"3\" parent=\"5\" added=\"true\" operator=\"infixop,⁢\">⁢</mo><mo type=\"operator\" role=\"multiplication\" id=\"4\" parent=\"5\" added=\"true\" operator=\"infixop,⁢\">⁢</mo><mi data-latex=\"x\" type=\"identifier\" role=\"latinletter\" font=\"italic\" annotation=\"clearspeak:simple\" id=\"2\" parent=\"5\" attributes=\"latex:x\">x</mi></math>"
189+
},
190+
"issue_toogle_times_2": {
191+
"expected": "<math type=\"infixop\" role=\"implicit\" annotation=\"clearspeak:unit\" id=\"5\" children=\"0,1,2\" content=\"3,4\"><mi data-latex=\"D\" type=\"identifier\" role=\"latinletter\" font=\"italic\" annotation=\"clearspeak:simple\" id=\"0\" parent=\"5\" attributes=\"latex:D\">D</mi><maction data-latex=\"\\toggle{m}{f}\\endtoggle\"><mi data-latex=\"m\" type=\"identifier\" role=\"latinletter\" font=\"italic\" annotation=\"clearspeak:simple\" id=\"1\" parent=\"5\" attributes=\"latex:\\toggle{m}{f}\\endtoggle\">m</mi><mi data-latex=\"f\">f</mi></maction><mo type=\"operator\" role=\"multiplication\" id=\"3\" parent=\"5\" added=\"true\" operator=\"infixop,⁢\">⁢</mo><mo type=\"operator\" role=\"multiplication\" id=\"4\" parent=\"5\" added=\"true\" operator=\"infixop,⁢\">⁢</mo><mi data-latex=\"x\" type=\"identifier\" role=\"latinletter\" font=\"italic\" annotation=\"clearspeak:simple\" id=\"2\" parent=\"5\" attributes=\"latex:x\">x</mi></math>"
192+
},
193+
"issue_toogle_appl_0": {
194+
"expected": "<math type=\"infixop\" role=\"implicit\" annotation=\"clearspeak:unit\" id=\"5\" children=\"0,1,2\" content=\"3,4\"><mi data-latex=\"F\" type=\"identifier\" role=\"latinletter\" font=\"italic\" annotation=\"clearspeak:simple\" id=\"0\" parent=\"5\" attributes=\"latex:F\">F</mi><maction data-latex=\"\\toggle{f}{m}\\endtoggle\"><mi data-latex=\"f\" type=\"identifier\" role=\"latinletter\" font=\"italic\" annotation=\"clearspeak:simple\" id=\"1\" parent=\"5\" attributes=\"latex:\\toggle{f}{m}\\endtoggle\">f</mi><mi data-latex=\"m\">m</mi></maction><mo type=\"operator\" role=\"multiplication\" id=\"3\" parent=\"5\" added=\"true\" operator=\"infixop,⁢\">⁢</mo><mo type=\"operator\" role=\"multiplication\" id=\"4\" parent=\"5\" added=\"true\" operator=\"infixop,⁢\">⁢</mo><mi data-latex=\"x\" type=\"identifier\" role=\"latinletter\" font=\"italic\" annotation=\"clearspeak:simple\" id=\"2\" parent=\"5\" attributes=\"latex:x\">x</mi></math>"
195+
},
196+
"issue_toogle_appl_1": {
197+
"expected": "<math type=\"infixop\" role=\"implicit\" annotation=\"clearspeak:unit\" id=\"5\" children=\"0,1,2\" content=\"3,4\"><mi data-latex=\"F\" type=\"identifier\" role=\"latinletter\" font=\"italic\" annotation=\"clearspeak:simple\" id=\"0\" parent=\"5\" attributes=\"latex:F\">F</mi><maction data-latex=\"\\toggle{f}{g}{m}\\endtoggle\"><mi data-latex=\"f\" type=\"identifier\" role=\"latinletter\" font=\"italic\" annotation=\"clearspeak:simple\" id=\"1\" parent=\"5\" attributes=\"latex:\\toggle{f}{g}{m}\\endtoggle\">f</mi><mi data-latex=\"g\">g</mi><mi data-latex=\"m\">m</mi></maction><mo type=\"operator\" role=\"multiplication\" id=\"3\" parent=\"5\" added=\"true\" operator=\"infixop,⁢\">⁢</mo><mo type=\"operator\" role=\"multiplication\" id=\"4\" parent=\"5\" added=\"true\" operator=\"infixop,⁢\">⁢</mo><mi data-latex=\"x\" type=\"identifier\" role=\"latinletter\" font=\"italic\" annotation=\"clearspeak:simple\" id=\"2\" parent=\"5\" attributes=\"latex:x\">x</mi></math>"
198+
},
199+
"issue_toogle_appl_2": {
200+
"expected": "<math type=\"infixop\" role=\"implicit\" annotation=\"clearspeak:unit\" id=\"5\" children=\"0,1,2\" content=\"3,4\"><mi data-latex=\"F\" type=\"identifier\" role=\"latinletter\" font=\"italic\" annotation=\"clearspeak:simple\" id=\"0\" parent=\"5\" attributes=\"latex:F\">F</mi><maction data-latex=\"\\toggle{m}{f}\\endtoggle\"><mi data-latex=\"m\" type=\"identifier\" role=\"latinletter\" font=\"italic\" annotation=\"clearspeak:simple\" id=\"1\" parent=\"5\" attributes=\"latex:\\toggle{m}{f}\\endtoggle\">m</mi><mi data-latex=\"f\">f</mi></maction><mo type=\"operator\" role=\"multiplication\" id=\"3\" parent=\"5\" added=\"true\" operator=\"infixop,⁢\">⁢</mo><mo type=\"operator\" role=\"multiplication\" id=\"4\" parent=\"5\" added=\"true\" operator=\"infixop,⁢\">⁢</mo><mi data-latex=\"x\" type=\"identifier\" role=\"latinletter\" font=\"italic\" annotation=\"clearspeak:simple\" id=\"2\" parent=\"5\" attributes=\"latex:x\">x</mi></math>"
201+
},
202+
"issue_toogle_2appl_0": {
203+
"expected": "<math type=\"infixop\" role=\"implicit\" annotation=\"clearspeak:unit\" id=\"5\" children=\"0,1,2\" content=\"3,4\"><maction data-latex=\"\\toggle{F}{M}\\endtoggle\"><mi data-latex=\"F\" type=\"identifier\" role=\"latinletter\" font=\"italic\" annotation=\"clearspeak:simple\" id=\"0\" parent=\"5\" attributes=\"latex:\\toggle{F}{M}\\endtoggle\">F</mi><mi data-latex=\"M\">M</mi></maction><maction data-latex=\"\\toggle{f}{m}\\endtoggle\"><mi data-latex=\"f\" type=\"identifier\" role=\"latinletter\" font=\"italic\" annotation=\"clearspeak:simple\" id=\"1\" parent=\"5\" attributes=\"latex:\\toggle{f}{m}\\endtoggle\">f</mi><mi data-latex=\"m\">m</mi></maction><mo type=\"operator\" role=\"multiplication\" id=\"3\" parent=\"5\" added=\"true\" operator=\"infixop,⁢\">⁢</mo><mo type=\"operator\" role=\"multiplication\" id=\"4\" parent=\"5\" added=\"true\" operator=\"infixop,⁢\">⁢</mo><mi data-latex=\"x\" type=\"identifier\" role=\"latinletter\" font=\"italic\" annotation=\"clearspeak:simple\" id=\"2\" parent=\"5\" attributes=\"latex:x\">x</mi></math>"
204+
},
205+
"issue_toogle_2appl_1": {
206+
"expected": "<math type=\"infixop\" role=\"implicit\" annotation=\"clearspeak:unit\" id=\"5\" children=\"0,1,2\" content=\"3,4\"><maction data-latex=\"\\toggle{F}{G}{M}\\endtoggle\"><mi data-latex=\"F\" type=\"identifier\" role=\"latinletter\" font=\"italic\" annotation=\"clearspeak:simple\" id=\"0\" parent=\"5\" attributes=\"latex:\\toggle{F}{G}{M}\\endtoggle\">F</mi><mi data-latex=\"G\">G</mi><mi data-latex=\"M\">M</mi></maction><maction data-latex=\"\\toggle{f}{m}\\endtoggle\"><mi data-latex=\"f\" type=\"identifier\" role=\"latinletter\" font=\"italic\" annotation=\"clearspeak:simple\" id=\"1\" parent=\"5\" attributes=\"latex:\\toggle{f}{m}\\endtoggle\">f</mi><mi data-latex=\"m\">m</mi></maction><mo type=\"operator\" role=\"multiplication\" id=\"3\" parent=\"5\" added=\"true\" operator=\"infixop,⁢\">⁢</mo><mo type=\"operator\" role=\"multiplication\" id=\"4\" parent=\"5\" added=\"true\" operator=\"infixop,⁢\">⁢</mo><mi data-latex=\"x\" type=\"identifier\" role=\"latinletter\" font=\"italic\" annotation=\"clearspeak:simple\" id=\"2\" parent=\"5\" attributes=\"latex:x\">x</mi></math>"
207+
},
208+
"issue_toogle_2appl_2": {
209+
"expected": "<math type=\"infixop\" role=\"implicit\" annotation=\"clearspeak:unit\" id=\"5\" children=\"0,1,2\" content=\"3,4\"><maction data-latex=\"\\toggle{M}{F}\\endtoggle\"><mi data-latex=\"M\" type=\"identifier\" role=\"latinletter\" font=\"italic\" annotation=\"clearspeak:simple\" id=\"0\" parent=\"5\" attributes=\"latex:\\toggle{M}{F}\\endtoggle\">M</mi><mi data-latex=\"F\">F</mi></maction><maction data-latex=\"\\toggle{f}{m}\\endtoggle\"><mi data-latex=\"f\" type=\"identifier\" role=\"latinletter\" font=\"italic\" annotation=\"clearspeak:simple\" id=\"1\" parent=\"5\" attributes=\"latex:\\toggle{f}{m}\\endtoggle\">f</mi><mi data-latex=\"m\">m</mi></maction><mo type=\"operator\" role=\"multiplication\" id=\"3\" parent=\"5\" added=\"true\" operator=\"infixop,⁢\">⁢</mo><mo type=\"operator\" role=\"multiplication\" id=\"4\" parent=\"5\" added=\"true\" operator=\"infixop,⁢\">⁢</mo><mi data-latex=\"x\" type=\"identifier\" role=\"latinletter\" font=\"italic\" annotation=\"clearspeak:simple\" id=\"2\" parent=\"5\" attributes=\"latex:x\">x</mi></math>"
210+
},
211+
"issue_toogle_2appl_3": {
212+
"expected": "<math type=\"infixop\" role=\"implicit\" annotation=\"clearspeak:unit\" id=\"5\" children=\"0,1,2\" content=\"3,4\"><maction data-latex=\"\\toggle{M}{F}\\endtoggle\"><mi data-latex=\"M\" type=\"identifier\" role=\"latinletter\" font=\"italic\" annotation=\"clearspeak:simple\" id=\"0\" parent=\"5\" attributes=\"latex:\\toggle{M}{F}\\endtoggle\">M</mi><mi data-latex=\"F\">F</mi></maction><maction data-latex=\"\\toggle{a}{m}\\endtoggle\"><mi data-latex=\"a\" type=\"identifier\" role=\"latinletter\" font=\"italic\" annotation=\"clearspeak:simple\" id=\"1\" parent=\"5\" attributes=\"latex:\\toggle{a}{m}\\endtoggle\">a</mi><mi data-latex=\"m\">m</mi></maction><mo type=\"operator\" role=\"multiplication\" id=\"3\" parent=\"5\" added=\"true\" operator=\"infixop,⁢\">⁢</mo><mo type=\"operator\" role=\"multiplication\" id=\"4\" parent=\"5\" added=\"true\" operator=\"infixop,⁢\">⁢</mo><mi data-latex=\"x\" type=\"identifier\" role=\"latinletter\" font=\"italic\" annotation=\"clearspeak:simple\" id=\"2\" parent=\"5\" attributes=\"latex:x\">x</mi></math>"
183213
}
184214
}
185215
}

0 commit comments

Comments
 (0)