Skip to content

Commit

Permalink
Merge pull request #506 from w3c/none-none
Browse files Browse the repository at this point in the history 
deprecate none for #428
  • Loading branch information
@NSoiffer
NSoiffer committed Sep 17, 2024
2 parents 0d07768 + e6afef7 commit c1d8849
Show file tree
Hide file tree
Showing 2 changed files with 48 additions and 42 deletions.
19 changes: 11 additions & 8 deletions src/changes.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,15 +88,18 @@ <h4 id="chg_presm">Changes to <a href="#presm"></a></h4>
implementation infer the row markup if it was omitted.
</li>
<li>The use of <code class="element">malignmark</code> has been
restricted and simplified, matching the features implemented in
existing implementations.
The <code class="attribute">groupalign</code> attribute on table
elements is no longer supported.</li>
restricted and simplified, matching the features implemented in
existing implementations.
The <code class="attribute">groupalign</code> attribute on table
elements is no longer supported.</li>
<li>The deprecated <code class="element">mo</code> attributes, <code class="attribute">fence</code>
and <code class="attribute">separator</code>, have been removed
(and are also no longer listed as properties in <a href="#oper-dict"></a>).
They are still valid in the <a href="#parsing_rnc_legacy"></a> schema,
but invalid in the default schema.
and <code class="attribute">separator</code>, have been removed
(and are also no longer listed as properties in <a href="#oper-dict"></a>).
They are still valid in the <a href="#parsing_rnc_legacy"></a> schema,
but invalid in the default schema.</li>
<li>The deprecated element <code class="element">none</code> is
replaced by an empty <code class="element">mrow</code> throughout,
to match [[MathML-Core]].
</ul>

</section>
Expand Down
71 changes: 37 additions & 34 deletions src/presentation-markup.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6173,10 +6173,8 @@ <h5 id="presm_munderover_ex">Examples</h5>

<section>
<h4 id="presm_mmultiscripts">Prescripts and Tensor Indices
<code class="defn starttag">&lt;mmultiscripts&gt;</code><span>,
<code class="defn emptytag">&lt;mprescripts/&gt;</code>,
<code class="defn emptytag">&lt;none/&gt;</code></span>
<a class="coreyes" href="https://w3c.github.io/mathml-core/spec.html#prescripts-and-tensor-indices-mmultiscripts"><code class="defn starttag">&lt;munder&gt;</code></a>
<a class="coreyes" href="https://w3c.github.io/mathml-core/spec.html#prescripts-and-tensor-indices-mmultiscripts"><code class="defn starttag">&lt;mmultiscripts&gt;</code></a>,
<a class="coreyes" href="https://w3c.github.io/mathml-core/spec.html#prescripts-and-tensor-indices-mmultiscripts"><code class="defn emptytag">&lt;mprescripts/&gt;</code></a>
</h4>

<section>
Expand All @@ -6199,8 +6197,10 @@ <h5 id="presm_mmultiscripts_desc">Description</h5>
subscripts
and superscripts, attached to one base expression. It supports both
postscripts and prescripts.
Missing scripts must be represented by the empty element
<code class="element">none</code>.
Missing scripts must be represented by a valid empty element denoting the empty subterm,
such as <code class="emptytag">&lt;mrow/&gt;</code>.
(The element <code class="defn emptytag">&lt;none/&gt;</code> was used in earlier MathML releases, but was equivalent
to an empty <code class="emptytag">&lt;mrow/&gt;</code>).
All of the upper scripts should be baseline-aligned and all the lower scripts should be baseline-aligned.</p>

<p>The prescripts are optional, and when present are given
Expand All @@ -6216,7 +6216,7 @@ <h5 id="presm_mmultiscripts_desc">Description</h5>
for postscripts and prescripts are <span>displayed</span> in the same order as the
directional context (i.e. left-to-right order in LTR context). If
no subscript or superscript should be rendered in a given position,
then the empty element <code class="element">none</code> should be used in
then an empty element <code class="element emptytag">&lt;mrow/&gt;</code> should be used in
that position.
<span data-diff="add">For each sub- and superscript pair,
horizontal-alignment of the elements in the pair should be
Expand Down Expand Up @@ -6264,10 +6264,10 @@ <h5 id="presm_mmultiscripts_att_ex">Examples</h5>
&lt;mmultiscripts&gt;
&lt;mi&gt; F &lt;/mi&gt;
&lt;mn&gt; 1 &lt;/mn&gt;
&lt;none/&gt;
&lt;mrow/&gt;
&lt;mprescripts/&gt;
&lt;mn&gt; 0 &lt;/mn&gt;
&lt;none/&gt;
&lt;mrow/&gt;
&lt;/mmultiscripts&gt;
&lt;mo&gt; &amp;#x2061;&lt;!--ApplyFunction--&gt; &lt;/mo&gt;
&lt;mrow&gt;
Expand All @@ -6291,13 +6291,13 @@ <h5 id="presm_mmultiscripts_att_ex">Examples</h5>
&lt;mmultiscripts&gt;
&lt;mi&gt; R &lt;/mi&gt;
&lt;mi&gt; i &lt;/mi&gt;
&lt;none/&gt;
&lt;none/&gt;
&lt;mrow/&gt;
&lt;mrow/&gt;
&lt;mi&gt; j &lt;/mi&gt;
&lt;mi&gt; k &lt;/mi&gt;
&lt;none/&gt;
&lt;mrow/&gt;
&lt;mi&gt; l &lt;/mi&gt;
&lt;none/&gt;
&lt;mrow/&gt;
&lt;/mmultiscripts&gt;
</pre>
</div>
Expand All @@ -6324,9 +6324,9 @@ <h5 id="presm_mmultiscripts_att_ex">Examples</h5>
<pre>
&lt;mstyle dir="rtl"&gt;
&lt;mmultiscripts&gt;&lt;mo&gt;&amp;#x0644;&lt;/mo&gt;
&lt;mn&gt;12&lt;/mn&gt;&lt;none/&gt;
&lt;mn&gt;12&lt;/mn&gt;&lt;mrow/&gt;
&lt;mprescripts/&gt;
&lt;none/&gt;&lt;mn&gt;5&lt;/mn&gt;
&lt;mrow/&gt;&lt;mn&gt;5&lt;/mn&gt;
&lt;/mmultiscripts&gt;
&lt;/mstyle&gt;
</pre>
Expand Down Expand Up @@ -7861,7 +7861,9 @@ <h5 id="presm_mlongdiv_desc">Description</h5>
are controlled
by the <code class="attribute">longdivstyle</code> attribute. </p>

<p>The result or divisor may be an elementary math element or may be <code class="element">none</code>.
<p>The result or divisor may be an elementary math element or may be an empty
<code class="emptytag">&lt;mrow/&gt;</code> (the specific empty element
<code class="emptytag">&lt;none/&gt;</code> used in MathML 3 is not used in this specification).
In particular, if <code class="element">msgroup</code> is used,
the elements in that group may or may not form their own mstack or be part of the
dividend's <code class="element">mstack</code>,
Expand Down Expand Up @@ -8077,7 +8079,7 @@ <h5 id="presm_msrow_desc">Description</h5>
An <code class="element">mstyle</code> is treated as if its children were
directly the children of the <code class="element">msrow</code>, but with their style affected
by the attributes of the <code class="element">mstyle</code>.
The empty element <code class="element">none</code> may be used to create an empty column.
The empty element <code class="element emptytag">&lt;mrow/&gt;</code> may be used to create an empty column.
</p>

<p>Note that a row is considered primarily as if it were a number,
Expand Down Expand Up @@ -8154,9 +8156,10 @@ <h5 id="presm_mscarries_desc">Description</h5>
</p>

<p>
Each child of <code class="element">mscarries</code> other than <code class="element">mscarry</code> or <code class="element">none</code> is
Each child of <code class="element">mscarries</code> other than <code class="element">mscarry</code> or <code class="element emptytag">&lt;mrow/&gt;</code> is
treated as if implicitly surrounded by <code class="element">mscarry</code>;
the element <code class="element">none</code> is used when no carry for a particular column is needed.
the element <code class="element emptytag">&lt;mrow/&gt;</code> is used when no carry for a particular column is needed.
The element <code class="element emptytag">&lt;none/&gt;</code> was used in earlier MathML releases, but was equivalent to an empty <code class="element emptytag">&lt;mrow/&gt;</code>.
The <code class="element">mscarries</code> element sets <code class="attribute">displaystyle</code> to <code class="attributevalue">false</code>, and increments <code class="attribute">scriptlevel</code> by 1, so the children are
typically displayed in a smaller font. (See <a href="#presm_scriptlevel"></a>.)
It also changes the default value of <code class="attribute">scriptsizemultiplier</code>.
Expand Down Expand Up @@ -8281,7 +8284,7 @@ <h5 id="presm_mscarry_desc">Description</h5>
Although it is usually implied, the element may be used explicitly to override the
<code class="attribute">location</code> and/or <code class="attribute">crossout</code> attributes of
the containing <code class="element">mscarries</code>.
It may also be useful with <code class="element">none</code> as its content in order
It may also be useful with <code class="element emptytag">&lt;mrow/&gt;</code> as its content in order
to display no actual carry, but still enable a <code class="attribute">crossout</code>
due to the enclosing <code class="element">mscarries</code> to be drawn for the given column.
</p>
Expand Down Expand Up @@ -8466,14 +8469,14 @@ <h5 id="presm_addsub">Addition and Subtraction</h5>

<p> Below is the example shown at the start of the section:
the digits inside the <code class="element">mn</code> elements each occupy a column as does the "+".
<code class="element">none</code> is used to fill in the column under the "4" and make the "+" appear to the left of all of the operands.
<code class="element emptytag">&lt;mrow/&gt;</code> is used to fill in the column under the "4" and make the "+" appear to the left of all of the operands.
Notice that no attributes are given on <code class="element">msline</code> causing it to span all of the columns. </p>

<div class="example mathml mml4p">
<pre>
&lt;mstack&gt;
&lt;mn&gt;424&lt;/mn&gt;
&lt;msrow&gt; &lt;mo&gt;+&lt;/mo&gt; &lt;none/&gt; &lt;mn&gt;33&lt;/mn&gt; &lt;/msrow&gt;
&lt;msrow&gt; &lt;mo&gt;+&lt;/mo&gt; &lt;mrow/&gt; &lt;mn&gt;33&lt;/mn&gt; &lt;/msrow&gt;
&lt;msline/&gt;
&lt;/mstack&gt;
</pre>
Expand Down Expand Up @@ -8503,14 +8506,14 @@ <h5 id="presm_addsub">Addition and Subtraction</h5>
</blockquote>

<p>The following two examples illustrate the use of <code class="element">mscarries</code>,
<code class="element">mscarry</code> and using <code class="element">none</code> to fill in a column.
<code class="element">mscarry</code> and using <code class="element emptytag">&lt;mrow/&gt;</code> to fill in a column.
The examples also illustrate two different ways of displaying a borrow.</p>

<div class="example mathml mml4p">
<pre>
&lt;mstack&gt;
&lt;mscarries crossout='updiagonalstrike'&gt;
&lt;mn&gt;2&lt;/mn&gt; &lt;mn&gt;12&lt;/mn&gt; &lt;mscarry crossout='none'&gt; &lt;none/&gt; &lt;/mscarry&gt;
&lt;mn&gt;2&lt;/mn&gt; &lt;mn&gt;12&lt;/mn&gt; &lt;mscarry crossout='none'&gt; &lt;mrow/&gt; &lt;/mscarry&gt;
&lt;/mscarries&gt;
&lt;mn&gt;2,327&lt;/mn&gt;
&lt;msrow&gt; &lt;mo&gt;-&lt;/mo&gt; &lt;mn&gt; 1,156&lt;/mn&gt; &lt;/msrow&gt;
Expand All @@ -8527,10 +8530,10 @@ <h5 id="presm_addsub">Addition and Subtraction</h5>
<pre>
&lt;mstack&gt;
&lt;mscarries location='nw'&gt;
&lt;none/&gt;
&lt;mrow/&gt;
&lt;mscarry crossout='updiagonalstrike' location='n'&gt; &lt;mn&gt;2&lt;/mn&gt; &lt;/mscarry&gt;
&lt;mn&gt;1&lt;/mn&gt;
&lt;none/&gt;
&lt;mrow/&gt;
&lt;/mscarries&gt;
&lt;mn&gt;2,327&lt;/mn&gt;
&lt;msrow&gt; &lt;mo&gt;-&lt;/mo&gt; &lt;mn&gt; 1,156&lt;/mn&gt; &lt;/msrow&gt;
Expand All @@ -8549,14 +8552,14 @@ <h5 id="presm_addsub">Addition and Subtraction</h5>
amount that is underlined (the example is from a <a href="http://www.fritext.se/matte/grunder/posi2.html">Swedish
source</a>).
There are two things to notice:
an <code class="element">menclose</code> is used in the carry, and <code class="element">none</code> is used for
an <code class="element">menclose</code> is used in the carry, and <code class="element emptytag">&lt;mrow/&gt;</code> is used for
the empty element so that <code class="element">mscarry</code> can be used to create a crossout.</p>

<div class="example mathml mml4p">
<pre>
&lt;mstack&gt;
&lt;mscarries&gt;
&lt;mscarry crossout='updiagonalstrike'&gt;&lt;none/&gt;&lt;/mscarry&gt;
&lt;mscarry crossout='updiagonalstrike'&gt;&lt;mrow/&gt;&lt;/mscarry&gt;
&lt;menclose notation='bottom'&gt; &lt;mn&gt;10&lt;/mn&gt; &lt;/menclose&gt;
&lt;/mscarries&gt;
&lt;mn&gt;52&lt;/mn&gt;
Expand All @@ -8581,7 +8584,7 @@ <h5 id="presm_mult">Multiplication</h5>
The second <code class="element">msgroup</code> could also be removed, but <code class="element">msrow</code> would be needed for last two children.
They <code class="element">msrow</code> would need to set the
<code class="attribute">position</code> or <code class="attribute">shift</code> attributes,
or would add <code class="element">none</code> elements to pad the digits on the right.
or would add <code class="element emptytag">&lt;mrow/&gt;</code> elements to pad the digits on the right.
</p>

<div class="example mathml mml4p">
Expand Down Expand Up @@ -8613,19 +8616,19 @@ <h5 id="presm_mult">Multiplication</h5>
<div class="example mathml mml4p">
<pre>
&lt;mstack&gt;
&lt;mscarries&gt;&lt;mn&gt;1&lt;/mn&gt;&lt;mn&gt;1&lt;/mn&gt;&lt;none/&gt;&lt;/mscarries&gt;
&lt;mscarries&gt;&lt;mn&gt;1&lt;/mn&gt;&lt;mn&gt;1&lt;/mn&gt;&lt;none/&gt;&lt;/mscarries&gt;
&lt;mscarries&gt;&lt;mn&gt;1&lt;/mn&gt;&lt;mn&gt;1&lt;/mn&gt;&lt;mrow/&gt;&lt;/mscarries&gt;
&lt;mscarries&gt;&lt;mn&gt;1&lt;/mn&gt;&lt;mn&gt;1&lt;/mn&gt;&lt;mrow/&gt;&lt;/mscarries&gt;
&lt;mn&gt;1,234&lt;/mn&gt;
&lt;msrow&gt;&lt;mo&gt;&#xD7;&lt;/mo&gt;&lt;mn&gt;4,321&lt;/mn&gt;&lt;/msrow&gt;
&lt;msline/&gt;

&lt;mscarries position='2'&gt;
&lt;mn&gt;1&lt;/mn&gt;
&lt;none/&gt;
&lt;mrow/&gt;
&lt;mn&gt;1&lt;/mn&gt;
&lt;mn&gt;1&lt;/mn&gt;
&lt;mn&gt;1&lt;/mn&gt;
&lt;none/&gt;
&lt;mrow/&gt;
&lt;mn&gt;1&lt;/mn&gt;
&lt;/mscarries&gt;
&lt;msgroup shift="1"&gt;
Expand Down Expand Up @@ -8908,7 +8911,7 @@ <h5 id="presm_repeatdec">Repeating decimal</h5>
<div class="example mathml mml4p">
<pre>
&lt;mstack stackalign="right"&gt;
&lt;msrow&gt; &lt;mo&gt;.&lt;/mo&gt; &lt;none/&gt;&lt;none/&gt;&lt;none/&gt;&lt;none/&gt; &lt;mo&gt;.&lt;/mo&gt; &lt;/msrow&gt;
&lt;msrow&gt; &lt;mo&gt;.&lt;/mo&gt; &lt;mrow/&gt;&lt;mrow/&gt;&lt;mrow/&gt;&lt;mrow/&gt; &lt;mo&gt;.&lt;/mo&gt; &lt;/msrow&gt;
&lt;mn&gt; 0.142857 &lt;/mn&gt;
&lt;/mstack&gt;
</pre>
Expand Down

0 comments on commit c1d8849

Please sign in to comment.