[css-lists] Rephrase the ::marker contents algorithm to use 'marker image' and 'marker text', and generally be more precise. Reword to define those terms and generally tighten up text.

Author: tabatkins

css-lists-3/Overview.bs

@@ -187,40 +187,34 @@ The ''::marker'' Pseudo-Element</h3>
 	</div>
 
 <h3 id='content-property'>
-Generating The ''::marker'' Boxes</h3>
+Generating Marker Contents</h3>
 
-	The ''::marker'' pseudo-element
-	generates different contents
-	(always <a>anonymous</a>)
-	according to the 'list-style-image' and 'list-style-type' properties
-	on its <a>originating element</a>,
-	depending on the first of these conditions that is true:
+	The contents of the ''::marker'' pseudo-element
+	are determined by the first of these conditions that is true:
 
 	<dl class=switch>
-		<dt>'list-style-image' is a <a>valid image</a>
+		<dt>'content' on the ''::marker'' itself is not ''content/normal''
 		<dd>
 			The contents of the ''::marker''
-			are an <a>anonymous</a> <a>inline</a> <a>replaced element</a>
-			representing the <<image>>,
-			followed by a <a>text run</a> containing a single space (U+0020 SPACE).
+			are determined as defined by the 'content' property,
+			exactly as for ''::before''.
 
-		<dt>'list-style-type' is a <<string>>
+		<dt>'list-style-image' on the [=originating element=] defines a [=marker image=]
 		<dd>
-			The contents of the ''::marker''
-			are a <a>text run</a> containing the <<string>>.
+			The ''::marker'' contains
+			an <a>anonymous</a> <a>inline</a> <a>replaced element</a>
+			representing the specified [=marker image=],
+			followed by a <a>text run</a> containing a single space (U+0020 SPACE).
 
-		<dt>'list-style-type' is a <<counter-style>>
+		<dt>'list-style-type' on the [=originating element=] defines a [=marker string=]
 		<dd>
-			The contents of the ''::marker''
-			are a <a>text run</a> containing the ''@counter-style/prefix'' of the <<counter-style>>,
-			followed by the result of <a lt="generate a counter representation">generating a counter representation</a>
-			for the <<counter-style>>
-			and the value of the <css>list-item</css> counter on the <a>originating element</a>,
-			followed by a <a>text run</a> containing the ''@counter-style/suffix'' of the <<counter-style>>.
+			The ''::marker'' contains
+			a [=text run=] containing the specified [=marker string=].
 
 		<dt>otherwise
 		<dd>
-			The ''::marker'' has no contents.
+			The ''::marker'' has no contents
+			and does not generate a box.
 	</dl>
 
 <!--
@@ -247,25 +241,22 @@ Image Markers: the 'list-style-image' property</h3>
 	Animation type: discrete
 	</pre>
 
-	The 'list-style-image' property specifies an image
-	that will be used to fill the ''::marker'' pseudo-element.
+	Specifies the <dfn>marker image</dfn>,
+	which is used to fill the [=list item’s=] [=marker=]
+	when its 'content' is ''content/normal''.
 	The values are as follows:
 
 	<dl dfn-type="value" dfn-for="list-style-image">
 		<dt><dfn><<image>></dfn>
 		<dd>
-			Specifies that the ''::marker'' for the <a>list item</a>
-			should show the specified <<image>>.
-
-			If the <<image>> ends up being an <a>invalid image</a>,
-			this value instead does nothing
-			(like ''list-style-image/none'').
+			If the <<image>> represents a [=valid image=],
+			specifies the element's <a>marker image</a> as the <<image>>.
+			Otherwise,
+			the element has no [=marker image=].
 
 		<dt><dfn>none</dfn>
 		<dd>
-			Does nothing.
-			Instead, 'list-style-type' will be consulted
-			to determine how to fill the ''::marker''.
+			The element has no <a>marker image</a>.
 	</dl>
 
 	<div class="example">
@@ -299,24 +290,36 @@ Text-based Markers: the 'list-style-type' property</h3>
 	Animation type: discrete
 	</pre>
 
-	When the value of 'list-style-image' is ''list-style-image/none''
-	or an <a>invalid image</a>,
-	the 'list-style-type' property instead specifies how to fill the ''::marker''.
+	Specifies the <dfn>marker string</dfn>,
+	which is used to fill the <a>list item</a>’s <a>marker</a>
+	when its 'content' value is ''content/normal''
+	and there is [=marker image=].
 	The values are as follows:
 
 	<dl dfn-type="value" dfn-for="list-style-type">
 		<dt><dfn><<counter-style>></dfn>
 		<dd>
-			The ''::marker''‘s contents will be generated
-			according to the rules for that <a>counter style</a>. [[!CSS-COUNTER-STYLES-3]]
+			Specifies the element’s <a>marker string</a> as
+			the value of the ''counter()/list-item'' counter
+			represented using the specified <<counter-style>>.
+
+			Specifically,
+			the <a>marker string</a> is
+			the result of <a lt="generate a counter representation">generating a counter representation</a>
+			of the ''counter()/list-item'' counter value
+			using the specified <<counter-style>>,
+			prefixed by the '@counter-style/prefix' of the <<counter-style>>,
+			and followed by the '@counter-style/suffix' of the <<counter-style>>.
+			If the specified <<counter-style>> does not exist,
+			''decimal'' is assumed.
 
 		<dt><dfn><<string>></dfn>
 		<dd>
-			The ''::marker'' will contain the <<string>>.
+			The element’s <a>marker string</a> is the specified <<string>>.
 
 		<dt><dfn>none</dfn>
 		<dd>
-			The ''::marker'' will not contain anything.
+			The element has no <a>marker string</a>.
 	</dl>
 
 	<div class='example'>