[css-ruby] Clean up / fix errors in intra-ruby white space rules.

--HG--
extra : rebase_source : 1f4e9c65cec99fb9cb0387d7c2df02c09d750b3e

Author: fantasai

css-ruby/Overview.html

@@ -351,14 +351,8 @@ <h3 class="heading settled heading" data-level=2.2 id=box-fixup><span class=secn
 	Missing parts of the structure are implied through the anonymous box generation rules
 	<a href=http://www.w3.org/TR/CSS21/tables.html#anonymous-boxes>similar to those used to normalize tables</a>. <a data-biblio-type=normative data-link-type=biblio href=#biblio-css21 title=biblio-css21>[CSS21]</a>
 
-	<dl>
-		<style scoped>
-			dt { counter-increment: box-fixup; }
-			dt::before { content: counter(box-fixup) ". "; }
-		</style>
-
-		<dt id=anon-gen-inlinize><a class=self-link href=#anon-gen-inlinize></a>Inlinize Block-level Boxes
-		<dd>
+	<ol>
+		<li id=anon-gen-inlinize><a class=self-link href=#anon-gen-inlinize></a><strong>Inlinize block-level boxes:</strong>
 			Any in-flow block-level boxes directly contained by a
 			<a data-link-type=dfn href=#ruby-container title="ruby container">ruby container</a>,
 			<a data-link-type=dfn href=#ruby-base-container-box title="ruby base container">ruby base container</a>,
@@ -374,32 +368,34 @@ <h3 class="heading settled heading" data-level=2.2 id=box-fixup><span class=secn
 			This computation occurs after any intermediary anonymous-box fixup
 			(such as that required by internal table elements).
 
-		<dt id=anony-gen-trim-space><a class=self-link href=#anony-gen-trim-space></a>Trim leading/trailing white space
-		<dd>
+		<li id=anony-gen-trim-space><a class=self-link href=#anony-gen-trim-space></a><strong>Trim leading/trailing white space:</strong>
 			Any white space within a ruby structure is discarded
 			at the beginning and end of
 			a <a data-link-type=dfn href=#ruby-container title="ruby container">ruby container</a>, <a data-link-type=dfn href=#ruby-annotation-container-box title="ruby annotation container">ruby annotation container</a>, or <a data-link-type=dfn href=#ruby-base-container-box title="ruby base container">ruby base container</a>.
 
-		<dt id=anon-gen-bare-inlines><a class=self-link href=#anon-gen-bare-inlines></a>Wrap misparented inline-level content
-		<dd>
+		<li id=anon-gen-bare-inlines><a class=self-link href=#anon-gen-bare-inlines></a><strong>Wrap misparented inline-level content:</strong>
 			Any consecutive sequence of text and inline-level boxes
 			directly parented by a <a data-link-type=dfn href=#ruby-container title="ruby container">ruby container</a> or <a data-link-type=dfn href=#ruby-base-container-box title="ruby base container">ruby base container</a>
 			is wrapped in an anonymous <a data-link-type=dfn href=#ruby-base-box title="ruby base">ruby base</a>.
 			Similarly, any consecutive sequence of text and inline-level boxes
 			directly parented by a <a data-link-type=dfn href=#ruby-annotation-container-box title="ruby annotation container">ruby annotation container</a>
 			is wrapped in an anonymous <a data-link-type=dfn href=#ruby-annotation-box title="ruby annotation">ruby annotation</a>.
 
-		<dt id=anon-gen-discard-space><a class=self-link href=#anon-gen-discard-space></a>Remove inter-level white space
-		<dd>
-			Any anonymous <a data-link-type=dfn href=#ruby-base-box title="ruby base">ruby base</a> containing only white space that
-			both immediately follows a box of type A
-			and is immediately followed by at box of its corresponding type B
-			as defined in the table below
-			is removed, as if it had <a class=css data-link-type=propdesc href=#propdef-display title=display>display: none</a>.
+<p>However, if the anonymous box so constructed contains only <i data-link-type=dfn title="white space">white space</i>,
+			it is considered <dfn data-dfn-type=dfn data-noexport="" id=intra-ruby-white-space>intra-ruby white space<a class=self-link href=#intra-ruby-white-space></a></dfn>
+			and is either discarded as <a data-link-type=dfn href=#inter-level-white-space title="inter-level white space">inter-level white space</a>
+			or preserved as <a data-link-type=dfn href=#intra-level-white-space title="intra-level white space">intra-level white space</a>
+			as described below.</p>
+
+		<li id=anon-gen-discard-space><a class=self-link href=#anon-gen-discard-space></a><strong>Remove inter-level white space:</strong>
+			Any <a data-link-type=dfn href=#intra-ruby-white-space title="intra-ruby white space">intra-ruby white space</a>
+			whose immediately adjacent siblings match one of the patterns below
+			is <dfn data-dfn-type=dfn data-noexport="" id=inter-level-white-space>inter-level white space<a class=self-link href=#inter-level-white-space></a></dfn>
+			and is removed, as if it had <a class=css data-link-type=propdesc href=#propdef-display title=display>display: none</a>.
 			<table class=data>
 			<thead>
-				<tr><th>A
-				    <th>B
+				<tr><th>Previous box
+				    <th>Next box
 			<tbody>
 				<tr><td><a data-link-type=dfn href=#ruby-base-box title="ruby base">ruby base</a> or <a data-link-type=dfn href=#ruby-base-container-box title="ruby base container">ruby base container</a>
 				    <td><a data-link-type=dfn href=#ruby-annotation-box title="ruby annotation">ruby annotation</a> or <a data-link-type=dfn href=#ruby-annotation-container-box title="ruby annotation container">ruby annotation container</a>
@@ -411,28 +407,36 @@ <h3 class="heading settled heading" data-level=2.2 id=box-fixup><span class=secn
 				    <td><a data-link-type=dfn href=#ruby-annotation-box title="ruby annotation">ruby annotation</a>
 			</table>
 
-		<dt id=anon-gen-interpret-space><a class=self-link href=#anon-gen-interpret-space></a>Interpret intra-level white space
-		<dd>
-			<ul>
-				<li>Any anonymous <a data-link-type=dfn href=#ruby-base-box title="ruby base">ruby base</a> containing only white space that
-				both immediately follows a <a data-link-type=dfn href=#ruby-annotation-box title="ruby annotation">ruby annotation</a> or <a data-link-type=dfn href=#ruby-annotation-container-box title="ruby annotation container">ruby annotation container</a>
-				and is immediately followed by a <a data-link-type=dfn href=#ruby-base-box title="ruby base">ruby base</a> or <a data-link-type=dfn href=#ruby-base-container-box title="ruby base container">ruby base container</a>
-				is labelled as <dfn data-dfn-type=dfn data-noexport="" id=inter-segment-white-space>inter-segment white space<a class=self-link href=#inter-segment-white-space></a></dfn>
-				(and treated specially for pairing and layout, see below).
-
-				<li>Any anonymous <a data-link-type=dfn href=#ruby-base-box title="ruby base">ruby base</a> containing only white space that is
-				both immediately follows and is immediately followed by a <a data-link-type=dfn href=#ruby-base-box title="ruby base">ruby base</a>
-				is labelled as <dfn data-dfn-type=dfn data-noexport="" id=inter-base-white-space>inter-base white space<a class=self-link href=#inter-base-white-space></a></dfn>
-				(and treated specially for pairing and layout, see below).
-
-				<li>Any anonymous <a data-link-type=dfn href=#ruby-annotation-box title="ruby annotation">ruby annotation</a> containing only white space that is
-				both immediately follows and is immediately followed by a <a data-link-type=dfn href=#ruby-annotation-box title="ruby annotation">ruby annotation</a>
-				is labelled as <dfn data-dfn-type=dfn data-noexport="" id=inter-annotation-white-space>inter-annotation white space<a class=self-link href=#inter-annotation-white-space></a></dfn>
-				(and treated specially for pairing and layout, see below).
-			</ul>
-
-		<dt id=anon-gen-anon-containers><a class=self-link href=#anon-gen-anon-containers></a>Generate anonymous level containers
-		<dd>
+		<li id=anon-gen-interpret-space><a class=self-link href=#anon-gen-interpret-space></a><strong>Interpret intra-level white space:</strong>
+			Any <a data-link-type=dfn href=#intra-ruby-white-space title="intra-ruby white space">intra-ruby white space</a>
+			whose immediately adjacent siblings match one of the patterns below
+			is assigned the box type and subtype defined in the table below:
+			<table class=data>
+			<colgroup span=2></colgroup>
+			<colgroup span=2></colgroup>
+			<thead>
+				<tr><th>Previous box
+				    <th>Next box
+				    <th>Box type
+				    <th>Subtype
+			<tbody>
+				<tr><td><a data-link-type=dfn href=#ruby-base-box title="ruby base">ruby base</a>
+				    <td><a data-link-type=dfn href=#ruby-base-box title="ruby base">ruby base</a>
+				    <td><a data-link-type=dfn href=#ruby-base-box title="ruby base">ruby base</a>
+				    <td><dfn data-dfn-type=dfn data-noexport="" id=inter-base-white-space>inter-base white space<a class=self-link href=#inter-base-white-space></a></dfn>
+				<tr><td><a data-link-type=dfn href=#ruby-annotation-box title="ruby annotation">ruby annotation</a>
+				    <td><a data-link-type=dfn href=#ruby-annotation-box title="ruby annotation">ruby annotation</a>
+				    <td><a data-link-type=dfn href=#ruby-annotation-box title="ruby annotation">ruby annotation</a>
+				    <td><dfn data-dfn-type=dfn data-noexport="" id=inter-annotation-white-space>inter-annotation white space<a class=self-link href=#inter-annotation-white-space></a></dfn>
+				<tr><td><a data-link-type=dfn href=#ruby-annotation-box title="ruby annotation">ruby annotation</a> or <a data-link-type=dfn href=#ruby-annotation-container-box title="ruby annotation container">ruby annotation container</a>
+				    <td><a data-link-type=dfn href=#ruby-base-box title="ruby base">ruby base</a> or <a data-link-type=dfn href=#ruby-base-container-box title="ruby base container">ruby base container</a>
+				    <td><a data-link-type=dfn href=#ruby-base-box title="ruby base">ruby base</a>
+				    <td><dfn data-dfn-type=dfn data-noexport="" id=inter-segment-white-space>inter-segment white space<a class=self-link href=#inter-segment-white-space></a></dfn>
+			</table>
+			The <dfn data-dfn-type=dfn data-noexport="" id=intra-level-white-space>intra-level white space<a class=self-link href=#intra-level-white-space></a></dfn> boxes defined above are
+			treated specially for pairing and layout. See below.
+
+		<li id=anon-gen-anon-containers><a class=self-link href=#anon-gen-anon-containers></a><strong>Generate anonymous level containers:</strong>
 			Any consecutive sequence of <a data-link-type=dfn href=#ruby-base-box title="ruby bases">ruby bases</a> and <a data-link-type=dfn href=#inter-base-white-space title="inter-base white space">inter-base white space</a>
 			(and not <a data-link-type=dfn href=#inter-segment-white-space title="inter-segment white space">inter-segment white space</a>)
 			not parented by a <a data-link-type=dfn href=#ruby-base-container-box title="ruby base container">ruby base container</a>
@@ -441,19 +445,17 @@ <h3 class="heading settled heading" data-level=2.2 id=box-fixup><span class=secn
 			not parented by a <a data-link-type=dfn href=#ruby-annotation-container-box title="ruby annotation container">ruby annotation container</a>
 			is wrapped in an anonymous <a data-link-type=dfn href=#ruby-annotation-container-box title="ruby annotation container">ruby annotation container</a>.
 
-		<dt id=anon-gen-anon-ruby><a class=self-link href=#anon-gen-anon-ruby></a>Generate anonymous ruby containers
-		<dd>
+		<li id=anon-gen-anon-ruby><a class=self-link href=#anon-gen-anon-ruby></a><strong>Generate anonymous ruby containers</strong>:
 			A sequence of <a data-link-type=dfn href=#ruby-base-container-box title="ruby base containers">ruby base containers</a>, <a data-link-type=dfn href=#ruby-annotation-container-box title="ruby annotation containers">ruby annotation containers</a>, and/or <a data-link-type=dfn href=#inter-segment-white-space title="inter-segment white space">inter-segment white space</a>
 			not parented by a <a data-link-type=dfn href=#ruby-container title="ruby container">ruby container</a>
 			is wrapped in an anonymous <a data-link-type=dfn href=#ruby-container title="ruby container">ruby container</a>.
 
-		<dt id=anon-gen-unbreak><a class=self-link href=#anon-gen-unbreak></a>Suppress line breaks
-		<dd>
+		<li id=anon-gen-unbreak><a class=self-link href=#anon-gen-unbreak></a><strong>Suppress line breaks:</strong>
 			Convert all forced line breaks inside <a data-link-type=dfn href=#ruby-annotation-box title="ruby annotations">ruby annotations</a> (regardless of <a class=property data-link-type=propdesc href=http://dev.w3.org/csswg/css-text-3/#propdef-white-space title=white-space>white-space</a> value)
 			as defined for <i data-link-type=dfn title=collapsible>collapsible</i> segment breaks in <a href=http://www.w3.org/TR/css-text-3/#line-break-transform>CSS Text Level 3 § 4.1.2</a>.
 			<p class=issue id=issue-8af70305><a class=self-link href=#issue-8af70305></a>The goal of this is to simplify the layout model by suppressing any line breaks within ruby annotations.
 			Alternatively we could try to define some kind of acceptable behavior for them.
-	</dl>
+	</ol>
 
 	<p class=issue id=issue-f2086090><a class=self-link href=#issue-f2086090></a>Make this into an example:
 		<img src=http://lists.w3.org/Archives/Public/www-archive/2014Jun/att-0027/PastedGraphic-1.png style="display: block; width: 100%">
@@ -462,7 +464,9 @@ <h3 class="heading settled heading" data-level=2.2 id=box-fixup><span class=secn
 	and the UA can start to associate bases with their annotations.
 
 	<p class=note>
-	Note that the UA is not required to create any of these anonymous boxes in its internal structures,
+	Note that the UA is not required to create any of these anonymous boxes
+	(or the anonymous empty <a data-link-type=dfn href=#intra-level-white-space title="intra-level white space">intra-level white space</a> boxes in the pairing section)
+	in its internal structures,
 	as long as pairing and layout behaves as if they existed.
 
 <h4 class="heading settled heading" data-level=2.2.1 id=block-ruby><span class=secno>2.2.1 </span><span class=content>
@@ -1525,7 +1529,10 @@ <h2 class="no-num no-ref heading settled heading" id=index><span class=content>
 <li>inter-annotation white space, <a href=#inter-annotation-white-space title="section 2.2">2.2</a>
 <li>inter-base white space, <a href=#inter-base-white-space title="section 2.2">2.2</a>
 <li>inter-character, <a href=#valdef-ruby-position.inter-character title="section 3.1">3.1</a>
+<li>inter-level white space, <a href=#inter-level-white-space title="section 2.2">2.2</a>
 <li>inter-segment white space, <a href=#inter-segment-white-space title="section 2.2">2.2</a>
+<li>intra-level white space, <a href=#intra-level-white-space title="section 2.2">2.2</a>
+<li>intra-ruby white space, <a href=#intra-ruby-white-space title="section 2.2">2.2</a>
 <li>left, <a href=#valdef-ruby-position.left title="section 3.1">3.1</a>
 <li>level, <a href=#annotation-level title="section 2.3">2.3</a>
 <li>over, <a href=#valdef-ruby-position.over title="section 3.1">3.1</a>