Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1909 poet mathml3 #65

Merged
merged 5 commits into from
Jul 23, 2024
Merged

1909 poet mathml3 #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a645034
Use MathML 3 and remove MathML 2
philschatz Apr 4, 2022
1bf3546
:skull: hack id attributes because they interfere
philschatz Apr 4, 2022
0276777
Remove mathml hack, do not check for id uniqueness
TylerZeroMaster Apr 12, 2022
b2f1f25
Upgrade test data to work with MathML3
TylerZeroMaster Apr 13, 2022
ebc81ef
Remove option 'false' from document 'noindex' attribute
TylerZeroMaster Jul 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cnxml/jing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def _parse_jing_output(output):
def jing(rng_filepath, *xml_filepaths):
"""Run jing.jar using the RNG file against the given XML file."""
cmd = ['java', '-jar']
cmd.extend([str(JING_JAR), str(rng_filepath)])
cmd.extend([str(JING_JAR), '-i', str(rng_filepath)])
for xml_filepath in xml_filepaths:
cmd.append(str(xml_filepath))
proc = subprocess.Popen(cmd,
Expand Down
10 changes: 5 additions & 5 deletions cnxml/tests/data/invalid.cnxml
View file
Open in desktop

Large diffs are not rendered by default.

616 changes: 308 additions & 308 deletions cnxml/tests/data/valid-derived-from-2.cnxml
View file
Open in desktop

Large diffs are not rendered by default.

696 changes: 348 additions & 348 deletions cnxml/tests/data/valid-derived-from.cnxml
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions cnxml/tests/data/valid.cnxml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -812,7 +812,7 @@

<m:math><m:semantics><m:mrow><m:mrow><m:msub><m:mi>v</m:mi><m:mrow><m:mn>0</m:mn><m:mi>y</m:mi></m:mrow></m:msub></m:mrow><m:mrow/></m:mrow><m:annotation encoding="StarMath 5.0"> size 12{v rSub { size 8{0y} } } {}</m:annotation></m:semantics></m:math>, the component of the initial velocity in the <emphasis effect="italics">y</emphasis>-direction. It is given by

<m:math><m:semantics><m:mrow><m:mrow><m:mrow><m:mrow><m:msub><m:mi>v</m:mi><m:mrow><m:mn>0</m:mn><m:mi>y</m:mi></m:mrow></m:msub><m:mo stretchy="false">=</m:mo><m:msub><m:mi>v</m:mi><m:msup><m:mn>0</m:mn></m:msup></m:msub></m:mrow><m:mrow><m:mrow><m:mspace width="0.25em"/><m:mtext>sin</m:mtext><m:mspace width="0.25em"/><m:mi>&#952;</m:mi></m:mrow></m:mrow></m:mrow></m:mrow><m:mrow/></m:mrow><m:annotation encoding="StarMath 5.0"> size 12{v rSub { size 8{0y rSup} =v rSub {0 rSup size 12{"sin"&#952;}} {}</m:annotation></m:semantics></m:math>, where
<m:math><m:semantics><m:mrow><m:mrow><m:mrow><m:mrow><m:msub><m:mi>v</m:mi><m:mrow><m:mn>0</m:mn><m:mi>y</m:mi></m:mrow></m:msub><m:mo stretchy="false">=</m:mo><m:msub><m:mi>v</m:mi><m:mn>0</m:mn></m:msub></m:mrow><m:mrow><m:mrow><m:mspace width="0.25em"/><m:mtext>sin</m:mtext><m:mspace width="0.25em"/><m:mi>&#952;</m:mi></m:mrow></m:mrow></m:mrow></m:mrow><m:mrow/></m:mrow><m:annotation encoding="StarMath 5.0"> size 12{v rSub { size 8{0y rSup} =v rSub {0 rSup size 12{"sin"&#952;}} {}</m:annotation></m:semantics></m:math>, where

<m:math><m:semantics><m:mrow><m:mrow><m:msub><m:mi>v</m:mi><m:mrow><m:mn>0</m:mn><m:mi>y</m:mi></m:mrow></m:msub></m:mrow><m:mrow/></m:mrow></m:semantics></m:math> is the initial velocity of 70.0 m/s, and

Expand Down Expand Up @@ -1770,11 +1770,11 @@
<exercise id="fs-id1934878" type="problems-exercises"><problem id="fs-id2226553"><para xmlns:q="http://cnx.rice.edu/qml/1.0" id="fs-id2226554">A rugby player passes the ball 7.00 m across the field, where it is caught at the same height as it left his hand. (a) At what angle was the ball thrown if its initial speed was 12.0 m/s, assuming that the smaller of the two possible angles was used? (b) What other angle gives the same range, and why would it not be used? (c) How long did this pass take?</para></problem>
</exercise>
<exercise id="fs-id2126267" type="problems-exercises"><problem id="fs-id2889922"><para xmlns:q="http://cnx.rice.edu/qml/1.0" id="fs-id2889923">Verify the ranges for the projectiles in <link target-id="import-auto-id1904800"/>(a) for <m:math><m:semantics><m:mrow><m:mrow><m:mrow><m:mrow><m:mi>&#952;</m:mi><m:mo stretchy="false">=</m:mo><m:mtext>45&#186;</m:mtext></m:mrow></m:mrow></m:mrow><m:mrow/></m:mrow><m:annotation encoding="StarMath 5.0"> size 12{&#952;="45"&#176;} {}</m:annotation></m:semantics></m:math> and the given initial velocities.</para></problem><solution id="fs-id1903883">
<para xmlns:q="http://cnx.rice.edu/qml/1.0" id="fs-id1912801"><m:math><m:semantics><m:mrow><m:mrow><m:mtable><m:mtr><m:mrow><m:mrow><m:mrow><m:mi>R</m:mi><m:mo stretchy="false">=</m:mo><m:mfrac><m:msup><m:msub><m:mi>v</m:mi><m:mn>0</m:mn><m:mn>2</m:mn></m:msub></m:msup>
<para xmlns:q="http://cnx.rice.edu/qml/1.0" id="fs-id1912801"><m:math><m:semantics><m:mrow><m:mrow><m:mtable><m:mtr><m:mtd><m:mrow><m:mrow><m:mi>R</m:mi><m:mo stretchy="false">=</m:mo><m:mfrac><m:mmultiscripts><m:mi>v</m:mi><m:mn>0</m:mn><m:mn>2</m:mn></m:mmultiscripts>
<m:mrow>
<m:mtext>sin</m:mtext><m:msub><m:mn>2&#952;</m:mn><m:mn>0</m:mn></m:msub><m:mi>g</m:mi></m:mrow></m:mfrac></m:mrow></m:mrow><m:mrow/></m:mrow></m:mtr><m:mtr><m:mrow><m:mtext>For </m:mtext><m:mspace width="0.25em"/><m:mrow><m:mi>&#952;</m:mi><m:mo stretchy="false">=</m:mo><m:mtext>45&#186;</m:mtext></m:mrow><m:mo>,</m:mo><m:mrow/></m:mrow><m:mrow><m:mrow>
<m:mtext>sin</m:mtext><m:msub><m:mn>2&#952;</m:mn><m:mn>0</m:mn></m:msub><m:mi>g</m:mi></m:mrow></m:mfrac></m:mrow></m:mrow><m:mrow/></m:mtd></m:mtr><m:mtr><m:mtd><m:mtext>For </m:mtext><m:mspace width="0.25em"/><m:mrow><m:mi>&#952;</m:mi><m:mo stretchy="false">=</m:mo><m:mtext>45&#186;</m:mtext></m:mrow><m:mo>,</m:mo><m:mrow/></m:mtd><m:mtd><m:mrow>

<m:mi>R</m:mi><m:mo stretchy="false">=</m:mo><m:mfrac><m:msup><m:msub><m:mi>v</m:mi><m:mn>0</m:mn><m:mn>2</m:mn></m:msub></m:msup><m:mi>g</m:mi></m:mfrac></m:mrow><m:mrow/></m:mrow></m:mtr></m:mtable><m:mrow/></m:mrow></m:mrow><m:annotation encoding="StarMath 5.0">alignl { stack {
<m:mi>R</m:mi><m:mo stretchy="false">=</m:mo><m:mfrac><m:mmultiscripts><m:mi>v</m:mi><m:mn>0</m:mn><m:mn>2</m:mn></m:mmultiscripts><m:mi>g</m:mi></m:mfrac></m:mrow><m:mrow/></m:mtd></m:mtr></m:mtable><m:mrow/></m:mrow></m:mrow><m:annotation encoding="StarMath 5.0">alignl { stack {
size 12{R= { {v rSub { size 8{0} rSup { size 8{2} } } "sin"2&#952; rSub { size 8{0} } } over {g} } } {} #
"For "&#952;="45"&#176;: {} #
R= { {v rSub { size 8{0} rSup { size 8{2} } } } over {g} } {}
Expand Down
2 changes: 1 addition & 1 deletion cnxml/xml/cnxml/schema/rng/0.7/cnxml-abstract-driver.rng
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
<include href="cnxml-defs.rng"/>

<define name="mathml-math">
<externalRef href="../../../../mathml/schema/rng/2.0/mathml2.rng"/>
<externalRef href="../../../../mathml/schema/rng/3.0/mathml3.rng"/>
</define>

<define name="repository-attribute">
Expand Down
2 changes: 1 addition & 1 deletion cnxml/xml/cnxml/schema/rng/0.7/cnxml-common-jing.rng
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
</include>

<define name="mathml-math">
<externalRef href="../../../../mathml/schema/rng/2.0/mathml2.rng"/>
<externalRef href="../../../../mathml/schema/rng/3.0/mathml3.rng"/>
</define>

<include href="../../../../qml/schema/rng/1.0/qml-defs.rng">
Expand Down
1 change: 0 additions & 1 deletion cnxml/xml/cnxml/schema/rng/0.7/cnxml-defs.rng
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -938,7 +938,6 @@
<attribute name="noindex">
<choice>
<value>true</value>
<value>false</value>
</choice>
</attribute>
</optional>
Expand Down
2 changes: 1 addition & 1 deletion cnxml/xml/collxml/schema/rng/1.0/collxml-jing.rng
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
<include href="../../../../cnxml/schema/rng/0.7/cnxml-defs.rng"/>

<define name="mathml-math">
<externalRef href="../../../../mathml/schema/rng/2.0/mathml2.rng"/>
<externalRef href="../../../../mathml/schema/rng/3.0/mathml3.rng"/>
</define>

<include href="collxml-defs.rng"/>
Expand Down
2 changes: 1 addition & 1 deletion cnxml/xml/collxml/schema/rng/2.0/collxml-jing.rng
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
<include href="../../../../cnxml/schema/rng/0.7/cnxml-defs.rng"/>

<define name="mathml-math">
<externalRef href="../../../../mathml/schema/rng/2.0/mathml2.rng"/>
<externalRef href="../../../../mathml/schema/rng/3.0/mathml3.rng"/>
</define>

<include href="collxml-defs.rng"/>
Expand Down
173 changes: 0 additions & 173 deletions cnxml/xml/mathml/schema/dtd/2.0/isoamsa.ent
View file
Open in desktop

This file was deleted.

Loading