Skip to content

Commit 0ed26ac

Browse files
zcorpansvgeesus
authored andcommitted
Editorial: Use separate entry points instead of ignore3D
Fixes #217.
1 parent 01620ca commit 0ed26ac

File tree

1 file changed

+35
-19
lines changed

1 file changed

+35
-19
lines changed

geometry/Overview.bs

Lines changed: 35 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -871,13 +871,12 @@ interface from SVG. [[SVG11]]
871871

872872
<h3 id=dommatrixinit-dictionary>DOMMatrix2DInit and DOMMatrixInit dictionaries</h3>
873873

874-
<p>To <dfn dfn-for=matrix>validate and fixup</dfn> a {{DOMMatrix2DInit}} or {{DOMMatrixInit}}
875-
dictionary <var>dict</var>, given a boolean <var>ignore3D</var> (<code>false</code> if not
876-
provided), run the following steps:
874+
<p>To <dfn dfn-for=matrix>validate and fixup (2D)</dfn> a {{DOMMatrix2DInit}} or {{DOMMatrixInit}}
875+
dictionary <var>dict</var>, run the following steps:
877876

878877
<ol>
879878
<li>
880-
<p>If if at least one of the following conditions are true for <var>dict</var>, throw a
879+
<p>If if at least one of the following conditions are true for <var>dict</var>, then throw a
881880
{{TypeError}} exception and abort these steps.
882881

883882
<ul>
@@ -898,12 +897,6 @@ provided), run the following steps:
898897

899898
<li><p>{{DOMMatrix2DInit/f}} and {{DOMMatrix2DInit/m42}} are both present and
900899
[=SameValueZero=]({{DOMMatrix2DInit/f}}, {{DOMMatrix2DInit/m42}}) is <code>false</code>.
901-
902-
<li><p><var>ignore3D</var> is <code>false</code> and {{DOMMatrixInit/is2D}} is <code>true</code>
903-
and: at least one of {{DOMMatrixInit/m13}}, {{DOMMatrixInit/m14}}, {{DOMMatrixInit/m23}},
904-
{{DOMMatrixInit/m24}}, {{DOMMatrixInit/m31}}, {{DOMMatrixInit/m32}}, {{DOMMatrixInit/m34}},
905-
{{DOMMatrixInit/m43}} are present with a value other than ''0'' or ''-0'', or at least one of
906-
{{DOMMatrixInit/m33}}, {{DOMMatrixInit/m44}} are present with a value other than ''1''.
907900
</ul>
908901

909902
<li><p>If {{DOMMatrix2DInit/m11}} is not present then set it to the value of member
@@ -923,8 +916,22 @@ provided), run the following steps:
923916

924917
<li><p>If {{DOMMatrix2DInit/m42}} is not present then set it to the value of member
925918
{{DOMMatrix2DInit/f}}, or value ''0'' if {{DOMMatrix2DInit/f}} is also not present.
919+
</ol>
920+
921+
<p class=note>The [=SameValueZero=] comparison algorithm returns <code>true</code> for two ''NaN''
922+
values, and also for ''0'' and ''-0''. [[!ECMA-262]]
926923

927-
<li><p>If <var>ignore3D</var> is <code>true</code>, then return.
924+
<p>To <dfn dfn-for=matrix>validate and fixup</dfn> a {{DOMMatrixInit}} dictionary <var>dict</var>,
925+
run the following steps:
926+
927+
<ol>
928+
<li><p><a for=matrix>Validate and fixup (2D)</a> <var>dict</var>.</p>
929+
930+
<li><p>If {{DOMMatrixInit/is2D}} is <code>true</code> and: at least one of {{DOMMatrixInit/m13}},
931+
{{DOMMatrixInit/m14}}, {{DOMMatrixInit/m23}}, {{DOMMatrixInit/m24}}, {{DOMMatrixInit/m31}},
932+
{{DOMMatrixInit/m32}}, {{DOMMatrixInit/m34}}, {{DOMMatrixInit/m43}} are present with a value other
933+
than ''0'' or ''-0'', or at least one of {{DOMMatrixInit/m33}}, {{DOMMatrixInit/m44}} are present
934+
with a value other than ''1'', then throw a {{TypeError}} exception and abort these steps.
928935

929936
<li><p>If {{DOMMatrixInit/is2D}} is not present and at least one of {{DOMMatrixInit/m13}},
930937
{{DOMMatrixInit/m14}}, {{DOMMatrixInit/m23}}, {{DOMMatrixInit/m24}}, {{DOMMatrixInit/m31}},
@@ -935,9 +942,6 @@ provided), run the following steps:
935942
<li><p>If {{DOMMatrixInit/is2D}} is still not present, set it to <code>true</code>.
936943
</ol>
937944

938-
<p class=note>The [=SameValueZero=] comparison algorithm returns <code>true</code> for two ''NaN''
939-
values, and also for ''0'' and ''-0''. [[!ECMA-262]]
940-
941945

942946
<h3 id=dommatrix-parse algorithm>Parsing a string into an abstract matrix</h3>
943947

@@ -1078,19 +1082,31 @@ id=dom-dommatrixreadonly-frommatrix><code>fromMatrix(<var>other</var>)</code></d
10781082
id=dom-dommatrix-frommatrix><code>fromMatrix(<var>other</var>)</code></dfn> static method on
10791083
{{DOMMatrix}} must <a>create a <code>DOMMatrix</code> from the dictionary</a> <var>other</var>.
10801084

1085+
<p>To <dfn lt="create a DOMMatrixReadOnly from the 2D dictionary">create a
1086+
<code>DOMMatrixReadOnly</code> from a 2D dictionary</dfn> <var>other</var> or to <dfn lt="create a
1087+
DOMMatrix from the 2D dictionary">create a <code>DOMMatrix</code> from a 2D dictionary</dfn>
1088+
<var>other</var>, follow these steps:
1089+
1090+
<ol>
1091+
<li><a for=matrix>Validate and fixup (2D)</a> <var>other</var>.
1092+
1093+
<li><p>Return the result of invoking <a>create a 2d matrix</a> of type {{DOMMatrixReadOnly}} or
1094+
{{DOMMatrix}} as appropriate, with a sequence of numbers, the values being the 6 elements
1095+
{{DOMMatrix2DInit/m11}}, {{DOMMatrix2DInit/m12}}, {{DOMMatrix2DInit/m21}}, {{DOMMatrix2DInit/m22}},
1096+
{{DOMMatrix2DInit/m41}} and {{DOMMatrix2DInit/m42}} of <var>other</var> in the given order.
1097+
</ol>
1098+
10811099
<p>To <dfn lt="create a DOMMatrixReadOnly from the dictionary">create a
10821100
<code>DOMMatrixReadOnly</code> from a dictionary</dfn> <var>other</var> or to <dfn lt="create a
10831101
DOMMatrix from the dictionary">create a <code>DOMMatrix</code> from a dictionary</dfn>
1084-
<var>other</var>, given a boolean <var>ignore3D</var> (<code>false</code> if not provided), follow
1085-
these steps:
1102+
<var>other</var>, follow these steps:
10861103

10871104
<ol>
1088-
<li><a for=matrix>Validate and fixup</a> <var>other</var>, given <var>ignore3D</var>.
1105+
<li><a for=matrix>Validate and fixup</a> <var>other</var>.
10891106

10901107
<li>
10911108
<dl class=switch>
1092-
<dt>If <var>ignore3D</var> is <code>true</code> or if the {{DOMMatrixInit/is2D}} dictionary
1093-
member of <var>other</var> is <code>true</code>
1109+
<dt>If the {{DOMMatrixInit/is2D}} dictionary member of <var>other</var> is <code>true</code>
10941110
<dd><p>Return the result of invoking <a>create a 2d matrix</a> of type {{DOMMatrixReadOnly}} or
10951111
{{DOMMatrix}} as appropriate, with a sequence of numbers, the values being the 6 elements
10961112
{{DOMMatrix2DInit/m11}}, {{DOMMatrix2DInit/m12}}, {{DOMMatrix2DInit/m21}}, {{DOMMatrix2DInit/m22}},

0 commit comments

Comments
 (0)