Merge pull request #434 from dstorey/length-percentage

Update <length> | <percentage> to <length-percentage>
w3c · May 5, 2018 · 2767599 · 2767599
2 parents 4e877fd + 028d640
commit 2767599
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 34 deletions.
diff --git a/master/definitions.xml b/master/definitions.xml
@@ -999,6 +999,7 @@
   <symbol name='image' href='https://www.w3.org/TR/css3-values/#images'/>
   <symbol name='integer' href='https://www.w3.org/TR/css3-values/#integers'/>
   <symbol name='length' href='https://www.w3.org/TR/css3-values/#lengths'/>
+  <symbol name='length-percentage' href='https://www.w3.org/TR/css-values/#typedef-length-percentage'/>
   <symbol name='marker-ref' href='painting.html#DataTypeMarkerRef'/>
   <symbol name='number' href='https://www.w3.org/TR/css3-values/#numbers'/>
   <symbol name='paint' href='painting.html#SpecifyingPaint'/>

diff --git a/master/geometry.html b/master/geometry.html
@@ -32,7 +32,7 @@ <h2 id='CX'>Horizontal center coordinate: The
   </tr>
   <tr>
     <th>Value:</th>
-    <td><a>&lt;length&gt;</a> | <a>&lt;percentage&gt;</a></td>
+    <td><a>&lt;length-percentage&gt;</a></td>
   </tr>
   <tr>
     <th>Initial:</th>
@@ -78,7 +78,7 @@ <h2 id='CY'>Vertical center coordinate: The <span class="property">'cy'</span>
   </tr>
   <tr>
     <th>Value:</th>
-    <td><a>&lt;length&gt;</a> | <a>&lt;percentage&gt;</a></td>
+    <td><a>&lt;length-percentage&gt;</a></td>
   </tr>
   <tr>
     <th>Initial:</th>
@@ -123,7 +123,7 @@ <h2 id='R'>Radius: The <span class="property">'r'</span> property</h2>
   </tr>
   <tr>
     <th>Value:</th>
-    <td><a>&lt;length&gt;</a> | <a>&lt;percentage&gt;</a></td>
+    <td><a>&lt;length-percentage&gt;</a></td>
   </tr>
   <tr>
     <th>Initial:</th>
@@ -170,7 +170,7 @@ <h2 id='RX'>Horizontal radius: The <span class="property">'rx'</span>
   </tr>
   <tr>
     <th>Value:</th>
-    <td><a>&lt;length&gt;</a> | <a>&lt;percentage&gt;</a> | auto</td>
+    <td><a>&lt;length-percentage&gt;</a> | auto</td>
   </tr>
   <tr>
     <th>Initial:</th>
@@ -228,7 +228,7 @@ <h2 id='RY'>Vertical radius: The <span class="property">'ry'</span>
   </tr>
   <tr>
     <th>Value:</th>
-    <td><a>&lt;length&gt;</a> | <a>&lt;percentage&gt;</a> | auto</td>
+    <td><a>&lt;length-percentage&gt;</a> | auto</td>
   </tr>
   <tr>
     <th>Initial:</th>
@@ -285,7 +285,7 @@ <h2 id='X'>Horizontal coordinate: The <span class="property">'x'</span> property
   </tr>
   <tr>
     <th>Value:</th>
-    <td><a>&lt;length&gt;</a> | <a>&lt;percentage&gt;</a></td>
+    <td><a>&lt;length-percentage&gt;</a></td>
   </tr>
   <tr>
     <th>Initial:</th>
@@ -331,7 +331,7 @@ <h2 id='Y'>Vertical coordinate: The <span class="property">'y'</span>
   </tr>
   <tr>
     <th>Value:</th>
-    <td><a>&lt;length&gt;</a> | <a>&lt;percentage&gt;</a></td>
+    <td><a>&lt;length-percentage&gt;</a></td>
   </tr>
   <tr>
     <th>Initial:</th>

diff --git a/master/painting.html b/master/painting.html
@@ -762,7 +762,7 @@ <h3 id="StrokeWidth">Stroke width: the <span class="property">'stroke-width'</sp
   </tr>
   <tr>
     <th>Value:</th>
-    <td><a>&lt;percentage&gt;</a> | <a>&lt;length&gt;</a></td>
+    <td><a>&lt;length-percentage&gt;</a></td>
   </tr>
   <tr>
     <th>Initial:</th>
@@ -1209,7 +1209,7 @@ <h3 id="StrokeDashing">Dashing strokes: the <span class="property">'stroke-dasha
 <p>where:</p>
 
 <p class="definition"><dfn id="DataTypeDasharray" data-dfn-type="type" data-dfn-export="">&lt;dasharray&gt;</dfn> =
-[ <a>&lt;length&gt;</a> | <a>&lt;percentage&gt;</a> | <a>&lt;number&gt;</a> ]#*</p>
+[ <a>&lt;length-percentage&gt;</a> | <a>&lt;number&gt;</a> ]#*</p>
 
 <p>The <a>'stroke-dasharray'</a> property controls
 the pattern of dashes and gaps used to form the shape of
@@ -1258,7 +1258,7 @@ <h3 id="StrokeDashing">Dashing strokes: the <span class="property">'stroke-dasha
   </tr>
   <tr>
     <th>Value:</th>
-    <td><a>&lt;length&gt;</a> | <a>&lt;percentage&gt;</a></td>
+    <td><a>&lt;length-percentage&gt;</a></td>
   </tr>
   <tr>
     <th>Initial:</th>
@@ -2361,7 +2361,7 @@ <h3 id="MarkerElement">The <span class="element-name">'marker'</span> element</h
   <tr>
     <td><dfn id="MarkerWidthAttribute" data-dfn-type="element-attr" data-dfn-for="marker" data-dfn-export="">markerWidth</dfn>,
     <dfn id="MarkerHeightAttribute" data-dfn-type="element-attr" data-dfn-for="marker" data-dfn-export="">markerHeight</dfn></td>
-    <td><a>&lt;length&gt;</a> | <a>&lt;percentage&gt;</a> | <a>&lt;number&gt;</a></td>
+    <td><a>&lt;length-percentage&gt;</a> | <a>&lt;number&gt;</a></td>
     <td>3</td>
     <td>yes</td>
   </tr>
@@ -2390,13 +2390,13 @@ <h3 id="MarkerElement">The <span class="element-name">'marker'</span> element</h
   </tr>
   <tr>
     <td><dfn id="MarkerElementRefXAttribute" data-dfn-type="element-attr" data-dfn-for="marker" data-dfn-export="">refX</dfn></td>
-    <td><a>&lt;length&gt;</a> | <a>&lt;percentage&gt;</a> | <a>&lt;number&gt;</a> | left | center | right</td>
+    <td><a>&lt;length-percentage&gt;</a> | <a>&lt;number&gt;</a> | left | center | right</td>
     <td>0</td>
     <td>yes</td>
   </tr>
   <tr>
     <td><dfn id="MarkerElementRefYAttribute" data-dfn-type="element-attr" data-dfn-for="marker" data-dfn-export="">refY</dfn></td>
-    <td><a>&lt;length&gt;</a> | <a>&lt;percentage&gt;</a> | <a>&lt;number&gt;</a> | top | center | bottom</td>
+    <td>a>&lt;length-percentage&gt;</a> | <a>&lt;number&gt;</a> | top | center | bottom</td>
     <td>0</td>
     <td>yes</td>
   </tr>

diff --git a/master/propidx.html b/master/propidx.html
@@ -270,10 +270,9 @@ <h1>Property Index</h1>
         </tr>
         <tr>
           <th><a>'font-size'</a></th>
-          <td><a href="https://www.w3.org/TR/2008/REC-CSS2-20080411/fonts.html#value-def-absolute-size">          <span          class="value-inst-absolute-size noxref">&lt;absolute-size&gt;</span></a>
-          | <a href="https://www.w3.org/TR/2008/REC-CSS2-20080411/fonts.html#value-def-relative-size">          <span          class="value-inst-relative-size noxref">&lt;relative-size&gt;</span></a>
-          | <a>&lt;length&gt;</a>
-          | <a href="https://www.w3.org/TR/2008/REC-CSS2-20080411/syndata.html#value-def-percentage">          <span          class="value-inst-percentage noxref">&lt;percentage&gt;</span></a>
+          <td><a href="https://www.w3.org/TR/css-fonts-3/#absolute-size-value"><span class="value-inst-absolute-size noxref">&lt;absolute-size&gt;</span></a>
+          | <a href="https://www.w3.org/TR/css-fonts-3/#relative-size-value"><span class="value-inst-relative-size noxref">&lt;relative-size&gt;</span></a>
+          | <a>&lt;length-percentage&gt;</a>
           </td>
           <td>medium</td>
           <td><a>text content elements</a></td>
@@ -284,8 +283,7 @@ <h1>Property Index</h1>
         </tr>
         <tr>
           <th><a>'font-size-adjust'</a></th>
-          <td><a href="https://www.w3.org/TR/2008/REC-CSS2-20080411/syndata.html#value-def-number">          <span          class="value-inst-number noxref">&lt;number&gt;</span></a>
-          | none </td>
+          <td><a>&lt;number&gt;</a>| none</td>
           <td>none</td>
           <td><a>text content elements</a></td>
           <td>yes</td>
@@ -383,11 +381,7 @@ <h1>Property Index</h1>
         </tr>
         <tr>
           <th><a>'line-height'</a></th>
-          <td>normal |
-            <a href="https://www.w3.org/TR/2008/REC-CSS2-20080411/syndata.html#value-def-number">
-              <span class="value-inst-number noxref">&lt;number&gt;</span></a> |
-	    <a>&lt;length&gt;</a> |
-	    <a>&lt;percentage&gt;</a></td>
+          <td>normal | <a>&lt;number&gt;</a> | <a>&lt;length-percentage&gt;</a></td>
           <td>normal</td>
           <td><a>'text'</a> elements</td>
           <td>yes</td>
@@ -528,7 +522,7 @@ <h1>Property Index</h1>
         </tr>
         <tr>
           <th><a>'stroke-dashoffset'</a></th>
-          <td><a>&lt;percentage&gt;</a> | <a>&lt;length&gt;</a> </td>
+          <td><a>&lt;length-percentage&gt;</a></td>
           <td>0</td>
           <td><a>shapes</a> and <a>text content elements</a></td>
           <td>yes</td>
@@ -578,7 +572,7 @@ <h1>Property Index</h1>
         </tr>
         <tr>
           <th><a>'stroke-width'</a></th>
-          <td><a>&lt;percentage&gt;</a> | <a>&lt;length&gt;</a> </td>
+          <td><a>&lt;length-percentage&gt;</a></td>
           <td>1</td>
           <td><a>shapes</a> and <a>text content elements</a></td>
           <td>yes</td>

diff --git a/master/shapes.html b/master/shapes.html
@@ -351,7 +351,7 @@ <h2 id="LineElement">The <span class="element-name">'line'</span> element</h2>
       </tr>
       <tr>
         <td><dfn id="LineElementX1Attribute" data-dfn-type="element-attr" data-dfn-for="line" data-dfn-export="">x1</dfn>, <dfn id="LineElementY1Attribute" data-dfn-type="element-attr" data-dfn-for="line" data-dfn-export="">y1</dfn></td>
-        <td><a>&lt;length&gt;</a> | <a>&lt;percentage&gt;</a> | <a>&lt;number&gt;</a></td>
+        <td><a>&lt;length-percentage&gt;</a> | <a>&lt;number&gt;</a></td>
         <td>0</td>
         <td>yes</td>
       </tr>
@@ -370,7 +370,7 @@ <h2 id="LineElement">The <span class="element-name">'line'</span> element</h2>
       </tr>
       <tr>
         <td><dfn id="LineElementX2Attribute" data-dfn-type="element-attr" data-dfn-for="line" data-dfn-export="">x2</dfn>, <dfn id="LineElementY2Attribute" data-dfn-type="element-attr" data-dfn-for="line" data-dfn-export="">y2</dfn></td>
-        <td><a>&lt;length&gt;</a> | <a>&lt;percentage&gt;</a> | <a>&lt;number&gt;</a></td>
+        <td><a>&lt;length-percentage&gt;</a> | <a>&lt;number&gt;</a></td>
         <td>0</td>
         <td>yes</td>
       </tr>

diff --git a/master/text.html b/master/text.html
@@ -1009,7 +1009,7 @@ <h3 id="TSpanAttributes">Attributes</h3>
 	</tr>
 	<tr>
           <td><dfn id="TextElementXAttribute" data-dfn-type="element-attr" data-dfn-for="text" data-dfn-export="">x</dfn>, <dfn id="TextElementYAttribute" data-dfn-type="element-attr" data-dfn-for="text" data-dfn-export="">y</dfn></td>
-          <td>[ [ <a>&lt;length&gt;</a> | <a>&lt;percentage&gt;</a> | <a>&lt;number&gt;</a> ]+ ]#</td>
+          <td>[ [ <a>&lt;length-percentage&gt;</a> | <a>&lt;number&gt;</a> ]+ ]#</td>
           <td>0 for <a>'text'</a>;<br/> (none) for <a>'tspan'</a></td>
           <td>yes</td>
 	</tr>
@@ -1076,7 +1076,7 @@ <h3 id="TSpanAttributes">Attributes</h3>
 	</tr>
 	<tr>
           <td><dfn id="TextElementDXAttribute" data-dfn-type="element-attr" data-dfn-for="text" data-dfn-export="">dx</dfn>, <dfn id="TextElementDYAttribute" data-dfn-type="element-attr" data-dfn-for="text" data-dfn-export="">dy</dfn></td>
-          <td>[ [ <a>&lt;length&gt;</a> | <a>&lt;percentage&gt;</a> | <a>&lt;number&gt;</a> ]+ ]#</td>
+          <td>[ [ <a>&lt;length-percentage&gt;</a> | <a>&lt;number&gt;</a> ]+ ]#</td>
           <td>(none)</td>
           <td>yes</td>
 	</tr>
@@ -1206,7 +1206,7 @@ <h3 id="TSpanAttributes">Attributes</h3>
 	</tr>
 	<tr>
           <td><dfn id="TextElementTextLengthAttribute" data-dfn-type="element-attr" data-dfn-for="text" data-dfn-export="">textLength</dfn></td>
-          <td><a>&lt;length&gt;</a> | <a>&lt;percentage&gt;</a> | <a>&lt;number&gt;</a></td>
+          <td><a>&lt;length-percentage&gt;</a> | <a>&lt;number&gt;</a></td>
           <td>See below</td>
           <td>yes</td>
 	</tr>
@@ -1987,7 +1987,7 @@ <h3 id='InlineSize'>The <span class="property">'inline-size'</span> property</h3
     </tr>
     <tr>
       <th>Value:</th>
-      <td><a>&lt;length&gt;</a> | <a>&lt;percentage&gt;</a> | <a>&lt;number&gt;</a></td>
+      <td><a>&lt;length-percentage&gt;</a> | <a>&lt;number&gt;</a></td>
     </tr>
     <tr>
       <th>Initial:</th>
@@ -2472,7 +2472,7 @@ <h3 id='TextShapeMargin'>The <span class="property">'shape-margin'</span> proper
     </tr>
     <tr>
       <th>Value:</th>
-      <td><a>&lt;length&gt;</a> | <a>&lt;percentage&gt;</a></td>
+      <td><a>&lt;length-percentage&gt;</a></td>
     </tr>
     <tr>
       <th>Initial:</th>
@@ -4179,7 +4179,7 @@ <h3 id="TextPathAttributes">Attributes</h3>
       </p>
 
       <dl class="attrdef-svg2">
-	<dt>Value</dt>                <dd><a>&lt;length&gt;</a> | <a>&lt;percentage&gt;</a> | <a>&lt;number&gt;</a></dd>
+	<dt>Value</dt>                <dd><a>&lt;length-percentage&gt;</a> | <a>&lt;number&gt;</a></dd>
 	<dt><a>Initial value</a></dt>  <dd>0</dd>
 	<dt><a>Animatable</a></dt>    <dd>yes</dd>
       </dl>

diff --git a/master/types.html b/master/types.html
@@ -131,6 +131,8 @@ <h2 id="syntax">Attribute syntax</h2>
   table's Value column.</li>
   <li>Replace all instances of <a>&lt;length&gt;</a> in <var>grammar</var> with
   [<a>&lt;length&gt;</a> | <a>&lt;number&gt;</a>].</li>
+  <li>Replace all instances of <a>&lt;length-percentage&gt;</a> in <var>grammar</var> with
+    [<a>&lt;length-percentage&gt;</a> | <a>&lt;number&gt;</a>].</li>
   <li>Replace all instances of <a>&lt;angle&gt;</a> in <var>grammar</var> with
   [<a>&lt;angle&gt;</a> | <a>&lt;number&gt;</a>].</li>
   <li>Return the result of