[css-ruby] Tie inter-character and interlinear layout together

Author: frivoal

css-ruby-1/Overview.bs

@@ -676,38 +676,41 @@ White Space Collapsing</h3>
 Ruby Layout</h2>
 
 	When a ruby structure is laid out,
-	its [=base level=] is laid out on the line
+	its [=base level=] is first laid out on the line
 	exactly as if its [=ruby bases=] were a regular sequence of [=inline boxes=]
 	and the [=ruby container=] a regular [=inline box=] wrapped around it.
+	If a [=ruby container=] has any [=inter-character annotations=],
+	they are laid out into the [=base level=] as detailed in [[#inter-character-layout]].
 
 	Each [=base container=] is then sized and positioned
-	to contain exactly all of its [=ruby bases=]’ margin boxes
+	to contain exactly all of its [=ruby bases=]’ margin boxes--
+	and all their associated [=inter-character=] [=ruby annotation=] margin boxes, if any--
 	as well as the margin boxes of [=ruby bases=] and [=ruby annotations=]
 	of any descendant [=ruby containers=]
 	also participating in this [=inline formatting context=].
 	(If a [=base container=] has no [=in-flow=] content,
 	it is sized and positioned
 	as if it contained a single empty [=ruby base=].)
 
-	[=Ruby annotations=] within a level
+	[=Inter-linear=] [=ruby annotations=] within a level
 	are aligned to each other in the block axis
 	as if they were [=inline boxes=]
 	participating in the same [=inline formatting context=],
 	effectively establishing a [=line box=]
 	for that [=level=] of annotation in the [=ruby container=].
-	In the inline axis, [=ruby annotations=] are aligned
+	In the inline axis, these [=ruby annotations=] are aligned
 	with respect to their [=ruby base boxes=]
 	in accordance with their [=annotation container=]’s 'ruby-merge' value.
 
-	Each [=annotation container=] is then sized and positioned
+	Each [=interlinear=] [=annotation container=] is then sized and positioned
 	to contain exactly all of its [=ruby annotations=]’ margin boxes
 	as well as the margin boxes of [=ruby bases=] and [=ruby annotations=]
 	of any descendant [=ruby containers=]
 	also participating in this [=annotation level=]’s [=inline formatting context=].
 	(If an [=annotation container=] has no [=in-flow=] content,
 	it is sized and positioned
 	as if it contained a single empty [=ruby annotation=].)
-	[=Annotation containers=] are then stacked outward
+	These [=annotation containers=] are then stacked outward
 	over or under (depending on 'ruby-position') their corresponding [=base container=],
 	without any intervening space,
 	thus determining the block-axis positioning of the [=ruby annotations=]
@@ -1041,7 +1044,7 @@ Ruby Positioning: the 'ruby-position' property</h3>
 			If the [=writing mode=] of the enclosing [=ruby container=] is [=vertical writing mode|vertical=],
 			this value has the same effect as ''over''.
 
-			Otherwise, the ruby text becomes a <dfn dfn>inter-character annotation</dfn>.
+			Otherwise, the ruby text becomes an <dfn dfn local-lt=inter-character>inter-character annotation</dfn>.
 			The ruby text appears on the right of the base in horizontal text.
 			This forces the computed value of 'writing-mode' of the [=ruby annotation container=] to be ''vertical-rl''.