Skip to content

Commit

Permalink
Merge pull request w3c#519 from davidcarlisle/main
Browse files Browse the repository at this point in the history 
align mpadded with core
  • Loading branch information
@NSoiffer
NSoiffer authored Nov 19, 2024
2 parents b6a5700 + 40dd6ff commit 5395b72
Show file tree
Hide file tree
Showing 3 changed files with 45 additions and 111 deletions.
14 changes: 13 additions & 1 deletion src/changes.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,10 +105,22 @@ <h4 id="chg_presm">Changes to <a href="#presm"></a></h4>
<li>The deprecated element <code class="element">none</code> is
replaced by an empty <code class="element">mrow</code> throughout,
to match [[MathML-Core]].</li>
<li>The element <code class="element">mlabeledtr</code> and the associacted attributes
<li>The element <code class="element">mlabeledtr</code> and the associated attributes
<code class="attribute">side</code> and <code class="attribute">minlabelspacing</code>
are no longer specified. They are removed from the default schema but valid in
the <a href="#parsing_rnc_legacy">Legacy Schema</a>.</li>

<li>To align with MathML-Core, the special extended syntax for <code class="element">mpadded</code> length attributes
<code>( "+" | "-" )?
<em>unsigned-number</em>
( ("%" <em>pseudo-unit</em>?)
| <em>pseudo-unit</em>
| <em>unit</em>
| <em>namedspace</em>
)?</code> is no longer supported.
Most of the functionality is still available using standard CSS
length syntax. See <a href="#mpadded-lengths">Note: mpadded
lengths</a>.</li>
</ul>

</section>
Expand Down
12 changes: 6 additions & 6 deletions src/fundamentals.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -407,14 +407,14 @@ <h5 id="fund_units">Length Valued Attributes</h5>
</tbody>
</table>

<p>In addition, the attributes on <a href="#presm_mpadded">mpadded</a>
allow three <dfn>pseudo-units</dfn>, <code>height</code>,

<p>In MathML&#160;3, the attributes on <a href="#presm_mpadded">mpadded</a>
allowed three <dfn>pseudo-units</dfn>, <code>height</code>,
<code>depth</code>, and <code>width</code> (taking the place of one of the usual CSS units)
denoting the original dimensions of the content.
</p>
<p>MathML&#160;3 also allowed a deprecated usage with lengths specified as
a number without a unit. This was interpreted as a multiple of the
reference value. This form is considered invalid in MathML&#160;4.
It also allowed a deprecated usage with lengths specified as
a number without a unit which was interpreted as a multiple of the
reference value. These forms are considered invalid in MathML&#160;4.
</p>

<section>
Expand Down
130 changes: 26 additions & 104 deletions src/presentation-markup.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4408,13 +4408,7 @@ <h5 id="presm_mpaddedatt">Attributes</h5>

<tr>
<td rowspan="2" class="attname"><a class="coreyes" href="https://w3c.github.io/mathml-core/spec.html#attribute-mpadded-height">height</a></td>
<td>( "+" | "-" )?
<em>[=unsigned-number=]</em>
( ("%" <em>[=pseudo-unit=]</em>?)
| <em>[=pseudo-unit=]</em>
| <a class="intref" href="#type_unit"><em>unit</em></a>
| <em>[=namedspace=]</em>
)?</td>
<td><a class="intref" href="#type_length"><em>length</em></a></td>
<td><em>same as content</em></td>
</tr>

Expand All @@ -4427,13 +4421,7 @@ <h5 id="presm_mpaddedatt">Attributes</h5>

<tr>
<td rowspan="2" class="attname"><a class="coreyes" href="https://w3c.github.io/mathml-core/spec.html#attribute-mpadded-depth">depth</a></td>
<td>( "+" | "-" )?
<em>[=unsigned-number=]</em>
(("%" <em>[=pseudo-unit=]</em>?)
| <em>[=pseudo-unit=]</em>
| <a class="intref" href="#type_unit"><em>unit</em></a>
| <em>[=namedspace=]</em>
)?</td>
<td><a class="intref" href="#type_length"><em>length</em></a></td>
<td><em>same as content</em></td>
</tr>

Expand All @@ -4446,13 +4434,7 @@ <h5 id="presm_mpaddedatt">Attributes</h5>

<tr>
<td rowspan="2" class="attname"><a class="coreyes" href="https://w3c.github.io/mathml-core/spec.html#attribute-mpadded-width">width</a></td>
<td>( "+" | "-" )?
<em>[=unsigned-number=]</em>
( ("%" <em>[=pseudo-unit=]</em>?)
| <em>[=pseudo-unit=]</em>
| <a class="intref" href="#type_unit"><em>unit</em></a>
| <em>[=namedspace=]</em>
)?</td>
<td><a class="intref" href="#type_length"><em>length</em></a></td>
<td><em>same as content</em></td>
</tr>

Expand All @@ -4465,13 +4447,7 @@ <h5 id="presm_mpaddedatt">Attributes</h5>

<tr>
<td rowspan="2" class="attname"><a class="coreyes" href="https://w3c.github.io/mathml-core/spec.html#attribute-mpadded-lspace">lspace</a></td>
<td>( "+" | "-" )?
<em>[=unsigned-number=]</em>
( ("%" <em>[=pseudo-unit=]</em>?)
| <em>[=pseudo-unit=]</em>
| <a class="intref" href="#type_unit"><em>unit</em></a>
| <em>[=namedspace=]</em>
)?</td>
<td><a class="intref" href="#type_length"><em>length</em></a></td>
<td>0em</td>
</tr>

Expand All @@ -4484,13 +4460,7 @@ <h5 id="presm_mpaddedatt">Attributes</h5>

<tr>
<td rowspan="2" class="attname"><a class="coreyes" href="https://w3c.github.io/mathml-core/spec.html#attribute-mpadded-voffset">voffset</a></td>
<td>( "+" | "-" )?
<em>[=unsigned-number=]</em>
( ("%" <em>[=pseudo-unit=]</em>?)
| <em>[=pseudo-unit=]</em>
| <a class="intref" href="#type_unit"><em>unit</em></a>
| <em>[=namedspace=]</em>
)?</td>
<td><a class="intref" href="#type_length"><em>length</em></a></td>
<td>0em</td>
</tr>

Expand All @@ -4503,16 +4473,23 @@ <h5 id="presm_mpaddedatt">Attributes</h5>

</tbody>
</table>

<p>Note: while [[MathML-Core]] supports the above attributes, it only allows the value to be a valid
<div id="mpadded-lengths" class="note" title="mpadded lengths in MathML 3">

<p>While [[MathML-Core]] supports the above attributes, it only allows the value to be a valid
<a data-cite="CSS-VALUES-3#typedef-length-percentage"><code>&lt;length-percentage&gt;</code></a>.
Increments with the optional "+" or "-" signs are not supported in MathML Core nor are pseudo-units.</p>
As described in <a class="intref" href="#type_length"><em>length</em></a> MathML 4 extends this syntax to allow
[=namedspace=].</p>
<p>MathML&#160;3 also allowed additional extensions:</p>
<ul>
<li>A leading "+" or "-" denoted a relative increment or decrement
from the default value. This is not supported however the same
fuunctionality is now available in standard CSS <a
data-cite="CSS-VALUES-3#typedef-length-percentage"><code>&lt;length-percentage&gt;</code></a>
syntax: <code>height="calc(100%+10pt)"</code>.</li>
<li>MathML&#160;3 also specified the <em>pseudo-units</em> <code>height</code>, <code>depth</code> and <code>width</code>. These are not supported in MathML&#160;4 however the main use cases are addressed using percentage values, `height="0.5height"` is equivalent to `height="50%`.</li>
</ul>
</div>

<p>The <em>[=pseudo-unit=]</em> syntax symbol is described below.
<span>Also, <code class="attribute">height</code>, <code class="attribute">depth</code> and
<code class="attribute">width</code> attributes are
referred to as size attributes, while <code class="attribute">lspace</code> and <code class="attribute">voffset</code> attributes
are position attributes.</span></p>

<p>These attributes specify the size of the bounding box of the <code class="element">mpadded</code>
element relative to the size of the bounding box of its child content, and specify
Expand All @@ -4526,71 +4503,16 @@ <h5 id="presm_mpaddedatt">Attributes</h5>
dimensions of the normal rendering of the child content using so-called [=pseudo-unit=]s,
or they can be set directly using standard units, see <a href="#fund_units"></a>.</p>

<p>If the value of a size attribute begins with a <code>+</code> or <code>-</code> sign,
it specifies an <em>increment</em> or <em>decrement</em> to the corresponding
dimension by the following length value. Otherwise the corresponding
dimension is set directly to the following length value.
Note that since a leading minus sign indicates a decrement, the size
attributes (<code class="attribute">height</code>, <code class="attribute">depth</code>, <code class="attribute">width</code>)
cannot be set directly to negative values. In addition, specifying a
decrement that would produce a net negative value for these attributes
<p>The corresponding
dimension is set to the following length value.
specifying a
length that would produce a net negative value for these attributes
has the same effect as
setting the attribute to zero. In other words, the effective
bounding box of an <code class="element">mpadded</code> element always has non-negative
dimensions. However, negative values are allowed for the relative positioning
attributes <code class="attribute">lspace</code> and <code class="attribute">voffset</code>.</p>

<p>Length values (excluding any sign) can be specified in several formats.
Each format begins with an <em>[=unsigned-number=]</em>,
which may be followed by
a <code>%</code> sign (effectively scaling the number)
and an optional <em>[=pseudo-unit=]</em>,
by a <em>[=pseudo-unit=]</em> alone,
or by a <a class="intref" href="#type_unit"><em>unit</em></a> (excepting <code>%</code>).
The possible <em>[=pseudo-unit=]s</em> are the keywords <code>height</code>,
<code>depth</code>, and <code>width</code>. They represent the length of the same-named dimension of the
<code class="element">mpadded</code> element's child content.
</p>

<p>For any of these length formats, the resulting length
is the product of the number (possibly including the <code>%</code>)
and the following <em>[=pseudo-unit=]</em>,
<a class="intref" href="#type_unit"><em>unit</em></a>,
<em>[=namedspace=]</em>
or the default value for the attribute if no such unit or space is given.</p>

<p>Some examples of attribute formats using [=pseudo-unit=]s (explicit or
default) are as follows: <code>depth="100%height"</code> and
<code>depth="1.0height"</code> both set the depth of the
<code class="element">mpadded</code> element to the height of its content.
<code>depth="105%"</code> sets the depth to 1.05 times the content's
depth, and either <code>depth="+100%"</code> or
<code>depth="200%"</code> sets the depth to twice the content's
depth.</p>

<p>The rules given above imply that all of the following attribute
settings have the same effect, which is to leave the content's
dimensions unchanged:</p>

<div class="example ">
<pre>
&lt;mpadded width="+0em"&gt; ... &lt;/mpadded&gt;
&lt;mpadded width="+0%"&gt; ... &lt;/mpadded&gt;
&lt;mpadded width="-0em"&gt; ... &lt;/mpadded&gt;
&lt;mpadded width="-0height"&gt; ... &lt;/mpadded&gt;
&lt;mpadded width="100%"&gt; ... &lt;/mpadded&gt;
&lt;mpadded width="100%width"&gt; ... &lt;/mpadded&gt;
&lt;mpadded width="1width"&gt; ... &lt;/mpadded&gt;
&lt;mpadded width="1.0width"&gt; ... &lt;/mpadded&gt;
&lt;mpadded&gt; ... &lt;/mpadded&gt;
</pre>
</div>
<p>Note that the examples in the Version 2 of the MathML specification showed
spaces within the attribute values, suggesting that this was the intended format.
Formally, spaces are not allowed within these values, but implementers may
wish to ignore such spaces to maximize backward compatibility.
</p>

</section>

<section>
Expand Down Expand Up @@ -4741,7 +4663,7 @@ <h5 id="presm_size_position_ex">Examples</h5>
<pre>
&lt;mrow&gt;
&lt;mi&gt;x&lt;/mi&gt;
&lt;mpadded width="+90%width" height="+0.3ex" depth="+0.3ex"&gt;
&lt;mpadded width="190%" height="calc(100% +0.3ex)" depth="calc(100% +0.3ex)"&gt;
&lt;mi&gt;y&lt;/mi&gt;
&lt;/mpadded&gt;
&lt;mi&gt;z&lt;/mi&gt;
Expand All @@ -4762,7 +4684,7 @@ <h5 id="presm_size_position_ex">Examples</h5>
<pre>
&lt;mrow&gt;
&lt;mi&gt;x&lt;/mi&gt;
&lt;mpadded lspace="0.3em" width="+0.6em"&gt;
&lt;mpadded lspace="0.3em" width="calc(100% +0.6em)"&gt;
&lt;mi&gt;y&lt;/mi&gt;
&lt;/mpadded&gt;
&lt;mi&gt;z&lt;/mi&gt;
Expand Down

0 comments on commit 5395b72

Please sign in to comment.