[css-lists] fixes

Author: tabatkins

css-lists/Overview.html

@@ -243,7 +243,7 @@ <h2 class="heading settled heading" data-level=3 id=marker-content><span class=s
 
 <pre>li { list-style-image: url("http://www.example.com/ellipse.png") }</pre>	</div>
 
-<table class="definition propdef"><tr><th>Name:<td><dfn class=css-code data-dfn-type=property data-export="" id=propdef-list-style-type>list-style-type<a class=self-link href=#propdef-list-style-type></a></dfn><tr><th>Value:<td><a class="production css-code" data-link-type=type href=http://dev.w3.org/csswg/css-values-3/#string-value title="<string>">&lt;string&gt;</a> | <a class="production css-code" data-link-type=type href=http://dev.w3.org/csswg/css-counter-styles-3/#typedef-counter-style-name title="<counter-style-name>">&lt;counter-style-name&gt;</a> | <a class="production css-code" data-link-type=function href=http://dev.w3.org/csswg/css-counter-styles-3/#funcdef-symbols title=symbols()>&lt;symbols()&gt;</a> | none<tr><th>Initial:<td>disc<tr><th>Applies to:<td><a data-link-type=dfn href=#list-item title="list items">list items</a><tr><th>Inherited:<td>yes<tr><th>Media:<td>visual<tr><th>Computed value:<td>specified value<tr><th>Percentages:<td>n/a</table>
+<table class="definition propdef"><tr><th>Name:<td><dfn class=css-code data-dfn-type=property data-export="" id=propdef-list-style-type>list-style-type<a class=self-link href=#propdef-list-style-type></a></dfn><tr><th>Value:<td><a class="production css-code" data-link-type=type href=http://dev.w3.org/csswg/css-values-3/#string-value title="<string>">&lt;string&gt;</a> | <a class="production css-code" data-link-type=type href=http://dev.w3.org/csswg/css-counter-styles-3/#typedef-counter-style title="<counter-style>">&lt;counter-style&gt;</a> | none<tr><th>Initial:<td>disc<tr><th>Applies to:<td><a data-link-type=dfn href=#list-item title="list items">list items</a><tr><th>Inherited:<td>yes<tr><th>Media:<td>visual<tr><th>Computed value:<td>specified value<tr><th>Percentages:<td>n/a</table>
 <p>	When the value of <a class=property data-link-type=propdesc href=#propdef-list-style-image title=list-style-image>list-style-image</a> is <a class=css data-link-type=maybe href=#valuedef-none0 title=none>none</a>
 	or an <a href=http://www.w3.org/TR/css3-images/#invalid-image>invalid image</a>,
 	the <a class=property data-link-type=propdesc href=#propdef-list-style-type title=list-style-type>list-style-type</a> property is used to construct the default contents of a list item’s marker;
@@ -255,17 +255,12 @@ <h2 class="heading settled heading" data-level=3 id=marker-content><span class=s
 		<dd>
 			The <a class="production css-code" data-link-type=type href=http://dev.w3.org/csswg/css-values-3/#string-value title="<string>">&lt;string&gt;</a> is used as the list item’s marker’s <a data-link-type=dfn href=#default-contents title="default contents">default contents</a>.
 
-		<dt><dfn class=css-code data-dfn-for=list-style-type data-dfn-type=value data-export="" id=valuedef-counter-style-name>&lt;counter-style-name&gt;<a class=self-link href=#valuedef-counter-style-name></a></dfn>
+		<dt><dfn class=css-code data-dfn-for=list-style-type data-dfn-type=value data-export="" id=valuedef-counter-style>&lt;counter-style&gt;<a class=self-link href=#valuedef-counter-style></a></dfn>
 		<dd>
-			If there is a counter style defined matching the <a class="production css-code" data-link-type=type href=http://dev.w3.org/csswg/css-counter-styles-3/#typedef-counter-style-name title="<counter-style-name>">&lt;counter-style-name&gt;</a>,
+			If there is a counter style defined matching the <a class="production css-code" data-link-type=type href=http://dev.w3.org/csswg/css-counter-styles-3/#typedef-counter-style title="<counter-style>">&lt;counter-style&gt;</a>,
 			the list item’s marker’s <a data-link-type=dfn href=#default-contents title="default contents">default contents</a> are that counter style. <a data-biblio-type=informative data-link-type=biblio href=#css-counter-styles-3 title=css-counter-styles-3>[CSS-COUNTER-STYLES-3]</a>
 			Otherwise, the list item’s marker’s <a data-link-type=dfn href=#default-contents title="default contents">default contents</a> are <a class=css data-link-type=maybe href=#valuedef-none0 title=none>none</a>.
 
-		<dt><dfn class=css-code data-dfn-for=list-style-type data-dfn-type=value data-export="" id=valuedef-symbols-function>&lt;symbols-function&gt;<a class=self-link href=#valuedef-symbols-function></a></dfn>
-		<dd>
-			The list item’s marker’s <a data-link-type=dfn href=#default-contents title="default contents">default contents</a> are the counter style
-			represented by the <a class="production css-code" data-link-type=function href=http://dev.w3.org/csswg/css-counter-styles-3/#funcdef-symbols title=symbols()>&lt;symbols()&gt;</a>. <a data-biblio-type=informative data-link-type=biblio href=#css-counter-styles-3 title=css-counter-styles-3>[CSS-COUNTER-STYLES-3]</a>
-
 		<dt><dfn class=css-code data-dfn-for=list-style-type data-dfn-type=value data-export="" id=valuedef-none1>none<a class=self-link href=#valuedef-none1></a></dfn>
 		<dd>
 			The list item’s marker’s <a data-link-type=dfn href=#default-contents title="default contents">default contents</a> are <a class=css data-link-type=maybe href=#valuedef-none0 title=none>none</a>.
@@ -792,7 +787,7 @@ <h3 class="heading settled heading" data-level=8.1 id=counter-properties><span c
 		<dt><dfn class=css-code data-dfn-for=counter-reset data-dfn-type=value data-export="" id=valuedef-custom-ident-integer0><a class="production css-code" data-link-type=type href=http://dev.w3.org/csswg/css-values-3/#identifier-value title="<custom-ident>">&lt;custom-ident&gt;</a> <a class="production css-code" data-link-type=type href=http://dev.w3.org/csswg/css-syntax-3/#typedef-integer title="<integer>">&lt;integer&gt;</a>?<a class=self-link href=#valuedef-custom-ident-integer0></a></dfn>
 		<dd>
 			The element <a data-link-type=dfn href=#create-a-new-counter title="create a new counter">creates one or more new counters</a>.
-			Each <a class="production css-code" data-link-type=type href=http://dev.w3.org/csswg/css-values-3/#identifier-value title="<custom-ident>">&lt;custom-ident&gt;</a>&gt; names a new counter to be created.
+			Each <a class="production css-code" data-link-type=type href=http://dev.w3.org/csswg/css-values-3/#identifier-value title="<custom-ident>">&lt;custom-ident&gt;</a> names a new counter to be created.
 
 <p>			If an <a class="production css-code" data-link-type=type href=http://dev.w3.org/csswg/css-syntax-3/#typedef-integer title="<integer>">&lt;integer&gt;</a> is provided after an <a class="production css-code" data-link-type=type href=http://dev.w3.org/csswg/css-values-3/#identifier-value title="<custom-ident>">&lt;custom-ident&gt;</a>,
 			the starting value of the new counter is that integer.
@@ -1089,7 +1084,7 @@ <h2 class="heading settled heading" data-level=9 id=counter-functions><span clas
 			Otherwise, the function represents the string returned when one <a data-link-type=dfn href=http://dev.w3.org/csswg/css-counter-styles-3/#generate-a-counter title="generate a counter representation">generates a counter representation</a>
 			for the value of the innermost counter of that name on the element
 			(or <span class=css data-link-type=maybe title=0>0</span> if the element has no counter of that name)
-			using the <a class="production css-code" data-link-type=type href=http://dev.w3.org/csswg/css-counter-styles-3/#typedef-counter-style title="<counter-style>">&lt;counter-style&gt;</a>&gt; specified by the second argument.
+			using the <a class="production css-code" data-link-type=type href=http://dev.w3.org/csswg/css-counter-styles-3/#typedef-counter-style title="<counter-style>">&lt;counter-style&gt;</a> specified by the second argument.
 	</ul>
 
 	<div class=example>
@@ -1492,7 +1487,7 @@ <h2 class="no-num no-ref heading settled heading" id=index><span class=content>
 <li>counter-reset, <a href=#propdef-counter-reset title="section 8.1">8.1</a>
 <li>counters(), <a href=#funcdef-counters title="section 9">9</a>
 <li>counter-set, <a href=#propdef-counter-set title="section 8.1">8.1</a>
-<li>&lt;counter-style-name&gt;, <a href=#valuedef-counter-style-name title="section 3">3</a>
+<li>&lt;counter-style&gt;, <a href=#valuedef-counter-style title="section 3">3</a>
 <li>&lt;counter-suffix&gt;, <a href=#typedef-counter-suffix title="section 6.1">6.1</a>
 <li>create a new counter, <a href=#create-a-new-counter title="section 8.2">8.2</a>
 <li>&lt;custom-ident&gt; &lt;integer&gt;?<ul><li>value for counter-reset, <a href=#valuedef-custom-ident-integer0 title="section 8.1">8.1</a>
@@ -1520,14 +1515,13 @@ <h2 class="no-num no-ref heading settled heading" id=index><span class=content>
 <li>value for counter-set, counter-increment, <a href=#valuedef-none title="section 8.1">8.1</a>
 </ul><li>outside, <a href=#list-style-position-outside title="section 4">4</a>
 <li>&lt;string&gt;, <a href=#valuedef-string title="section 3">3</a>
-<li>&lt;symbols-function&gt;, <a href=#valuedef-symbols-function title="section 3">3</a>
 </ul></div>
 
 <h2 class="no-num no-ref heading settled heading" id=property-index><span class=content>
 Property index</span><a class=self-link href=#property-index></a></h2>
 <div data-fill-with=property-index><table class="proptable data"><thead><tr><th scope=col>Name<th scope=col>Value<th scope=col>Initial<th scope=col>Applies to<th scope=col>Inh.<th scope=col>%ages<th scope=col>Media<th scope=col>Computed value<tbody>
 <tr><th scope=row><a data-property="">list-style-image</a><td>&lt;image&gt; | none<td>none<td>list items<td>yes<td>n/a<td>visual<td>computed value fo the &lt;image&gt;, or none
-<tr><th scope=row><a data-property="">list-style-type</a><td>&lt;string&gt; | &lt;counter-style-name&gt; | &lt;symbols()&gt; | none<td>disc<td>list items<td>yes<td>n/a<td>visual<td>specified value
+<tr><th scope=row><a data-property="">list-style-type</a><td>&lt;string&gt; | &lt;counter-style&gt; | none<td>disc<td>list items<td>yes<td>n/a<td>visual<td>specified value
 <tr><th scope=row><a data-property="">list-style-position</a><td>inside | outside<td>outside<td>list items<td>yes<td>n/a<td>visual<td>specified value (but see prose)
 <tr><th scope=row><a data-property="">list-style</a><td>&lt;‘list-style-type’&gt; || &lt;‘list-style-position’&gt; || &lt;‘list-style-image’&gt;<td>see individual properties<td>list items<td>see individual properties<td>see individual properties<td>visual<td>see individual properties
 <tr><th scope=row><a data-property="">marker-side</a><td>list-item | list-container<td>list-item<td>list items<td>yes<td>n/a<td>visual<td>specified value

css-lists/Overview.src.html

@@ -136,7 +136,7 @@ <h2 id='marker-content'>
 
 	<pre class="propdef">
 	Name: list-style-type
-	Value: <<string>> | <<counter-style-name>> | <<symbols()>> | none
+	Value: <<string>> | <<counter-style>> | none
 	Initial: disc
 	Applies to: <a>list items</a>
 	Inherited: yes
@@ -156,17 +156,12 @@ <h2 id='marker-content'>
 		<dd>
 			The <<string>> is used as the list item's marker's <i>default contents</i>.
 
-		<dt><dfn>&lt;counter-style-name></dfn>
+		<dt><dfn>&lt;counter-style></dfn>
 		<dd>
-			If there is a counter style defined matching the <<counter-style-name>>,
+			If there is a counter style defined matching the <<counter-style>>,
 			the list item's marker's <i>default contents</i> are that counter style. [[CSS-COUNTER-STYLES-3]]
 			Otherwise, the list item's marker's <i>default contents</i> are ''none''.
 
-		<dt><dfn>&lt;symbols-function></dfn>
-		<dd>
-			The list item's marker's <i>default contents</i> are the counter style
-			represented by the <<symbols()>>. [[CSS-COUNTER-STYLES-3]]
-
 		<dt><dfn>none</dfn>
 		<dd>
 			The list item's marker's <i>default contents</i> are ''none''.
@@ -780,7 +775,7 @@ <h3 id='counter-properties'>
 		<dt><dfn><<custom-ident>> <<integer>>?</dfn>
 		<dd>
 			The element <i title="create a new counter">creates one or more new counters</i>.
-			Each <<custom-ident>>> names a new counter to be created.
+			Each <<custom-ident>> names a new counter to be created.
 
 			If an <<integer>> is provided after an <<custom-ident>>,
 			the starting value of the new counter is that integer.
@@ -1116,7 +1111,7 @@ <h2 id='counter-functions'>
 			Otherwise, the function represents the string returned when one <a title="generate a counter representation">generates a counter representation</a>
 			for the value of the innermost counter of that name on the element
 			(or ''0'' if the element has no counter of that name)
-			using the <<counter-style>>> specified by the second argument.
+			using the <<counter-style>> specified by the second argument.
 	</ul>
 
 	<div class="example">