Mercurial > drafts / changeset

     1.1 --- a/css-ruby/Overview.html	Wed Sep 11 14:31:24 2013 -0700
     1.2 +++ b/css-ruby/Overview.html	Wed Sep 11 14:47:38 2013 -0700
     1.3 @@ -1418,12 +1418,12 @@
     1.4      <tr>
     1.5       <th><a href="#values">Value</a>:
     1.6  
     1.7 -     <td>auto | start | center | distribute-letter | distribute-space
     1.8 +     <td>start | center | space-between | space-around
     1.9  
    1.10      <tr>
    1.11       <th>Initial:
    1.12  
    1.13 -     <td>auto
    1.14 +     <td>space-around
    1.15  
    1.16      <tr>
    1.17       <th>Applies to:
    1.18 @@ -1476,7 +1476,7 @@
    1.19        alt="Diagram of glyph layout in left aligned ruby when ruby text is longer than base"
    1.20        height=91 src="images/ra-l-rb.gif" width=145>
    1.21  
    1.22 -     <p class=caption>‘<code class=css>start</code>’ ruby alignment
    1.23 +     <p class=caption>‘<code class=css>start</code>’ ruby distribution
    1.24      </div>
    1.25  
    1.26     <dt><dfn id=center title="ruby-align:center">‘<code
    1.27 @@ -1490,7 +1490,7 @@
    1.28        alt="Diagram of glyph layout in center aligned ruby when ruby text is longer than base"
    1.29        height=91 src="images/ra-c-rb.gif" width=145>
    1.30  
    1.31 -     <p class=caption>‘<code class=css>center</code>’ ruby alignment
    1.32 +     <p class=caption>‘<code class=css>center</code>’ ruby distribution
    1.33      </div>
    1.34  
    1.35     <dt><dfn id=space-between title="ruby-align:space-between">‘<code
    1.36 @@ -1498,7 +1498,10 @@
    1.37  
    1.38     <dd>
    1.39      <p>The ruby content expands as defined for normal text justification (as
    1.40 -     defined by ‘<code class=property>text-justify</code>’),
    1.41 +     defined by ‘<code class=property>text-justify</code>’), except that
    1.42 +     if there are no <a
    1.43 +     href="http://www.w3.org/TR/css3-text/#expansion-opportunity"><i>expansion
    1.44 +     opportunities</i></a> the content is centered.
    1.45  
    1.46      <div class=figure>
    1.47       <p><img
    1.48 @@ -1508,7 +1511,7 @@
    1.49        height=91 src="images/ra-dl-rb.gif" width=145>
    1.50  
    1.51       <p class=caption>‘<code class=css>space-between</code>’ ruby
    1.52 -      alignment
    1.53 +      distribution
    1.54      </div>
    1.55  
    1.56     <dt><dfn id=space-around title="ruby-align:space-around">‘<code
    1.57 @@ -1522,13 +1525,12 @@
    1.58       after the ruby content.
    1.59  
    1.60      <div class=example>
    1.61 -     <p>Since a typical implementation will by default define expansion
    1.62 -      opportunities between every adjacent pair of CJK <i>characters</i> and
    1.63 -      not between adjacent pairs of Latin <i>characters</i>, this should
    1.64 +     <p>Since a typical implementation will by default define <i>expansion
    1.65 +      opportunities</i> between every adjacent pair of CJK <i>characters</i>
    1.66 +      and not between adjacent pairs of Latin <i>characters</i>, this should
    1.67        result in the behavior recommended by <a href="#JLREQ"
    1.68 -      rel=biblioentry>[JLREQ]<!--{{JLREQ}}--></a>: for wide-cell ruby to be
    1.69 -      aligned in the ‘<code class=property>distribute-space</code>’
    1.70 -      mode...
    1.71 +      rel=biblioentry>[JLREQ]<!--{{JLREQ}}--></a>: for wide-cell ruby content
    1.72 +      to be distributed...
    1.73  
    1.74       <div class=figure>
    1.75        <p><img
    1.76 @@ -1538,11 +1540,10 @@
    1.77         height=91 src="images/ra-ds-rb.gif" width=145>
    1.78  
    1.79        <p class=caption>Wide-cell text in ‘<code
    1.80 -       class=css>space-around</code>’ ruby alignment is distributed
    1.81 +       class=css>space-around</code>’ ruby distribution is spaced apart
    1.82       </div>
    1.83  
    1.84 -     <p>... and narrow-cell glyph ruby to be aligned in the ‘<code
    1.85 -      class=property>center</code>’ mode.
    1.86 +     <p>... and narrow-cell glyph ruby to be centered.
    1.87  
    1.88       <div class=figure>
    1.89        <p><img
    1.90 @@ -1552,7 +1553,7 @@
    1.91         height=91 src="images/ra-c-rb-h.gif" width=145>
    1.92  
    1.93        <p class=caption>Narrow-width ruby text in ‘<code
    1.94 -       class=css>space-around</code>’ ruby alignment is centered
    1.95 +       class=css>space-around</code>’ ruby distribution is centered
    1.96       </div>
    1.97      </div>
    1.98    </dl>
    1.99 @@ -2404,9 +2405,9 @@
   1.100      <tr>
   1.101       <th><a class=property href="#ruby-align">ruby-align</a>
   1.102  
   1.103 -     <td>auto | start | center | distribute-letter | distribute-space
   1.104 -
   1.105 -     <td>auto
   1.106 +     <td>start | center | space-between | space-around
   1.107 +
   1.108 +     <td>space-around
   1.109  
   1.110       <td>ruby bases, ruby annotations, ruby base containers, ruby annotation
   1.111        containers

     2.1 --- a/css-ruby/Overview.src.html	Wed Sep 11 14:31:24 2013 -0700
     2.2 +++ b/css-ruby/Overview.src.html	Wed Sep 11 14:47:38 2013 -0700
     2.3 @@ -975,11 +975,10 @@
     2.4  			<td><dfn>ruby-align</dfn>
     2.5  		<tr>
     2.6  			<th><a href="#values">Value</a>:
     2.7 -			<td>auto | start | center |
     2.8 -				distribute-letter | distribute-space
     2.9 +			<td>start | center | space-between | space-around
    2.10  		<tr>
    2.11  			<th>Initial:
    2.12 -			<td>auto
    2.13 +			<td>space-around
    2.14  		<tr>
    2.15  			<th>Applies to:
    2.16  			<td>ruby bases, ruby annotations, ruby base containers, ruby annotation containers
    2.17 @@ -1012,7 +1011,7 @@
    2.18  					width="145" height="91"
    2.19  					alt="Diagram of glyph layout in left aligned ruby when ruby text is longer than base"
    2.20  					src="images/ra-l-rb.gif" />
    2.21 -				<p class="caption">''start'' ruby alignment
    2.22 +				<p class="caption">''start'' ruby distribution
    2.23  			</div>
    2.24  		</dd>
    2.25  
    2.26 @@ -1024,7 +1023,7 @@
    2.27  					src="images/ra-c.gif" /><img width="145" height="91"
    2.28  					alt="Diagram of glyph layout in center aligned ruby when ruby text is longer than base"
    2.29  					src="images/ra-c-rb.gif" />
    2.30 -				<p class="caption">''center'' ruby alignment
    2.31 +				<p class="caption">''center'' ruby distribution
    2.32  			</div>
    2.33  		</dd>
    2.34  
    2.35 @@ -1032,13 +1031,15 @@
    2.36  		<dd>
    2.37  			<p>The ruby content expands as defined for normal text justification
    2.38  				(as defined by 'text-justify'),
    2.39 +				except that if there are no <a href="http://www.w3.org/TR/css3-text/#expansion-opportunity"><i>expansion opportunities</i></a>
    2.40 +				the content is centered.
    2.41  			<div class="figure">
    2.42  				<p><img width="145" height="91"
    2.43  				alt="Diagram of glyph layout in distribute-letter aligned ruby when ruby text is shorter than base"
    2.44  				src="images/ra-dl.gif" /><img width="145" height="91"
    2.45  				alt="Diagram of glyph layout in distribute-letter aligned ruby when ruby text is longer than base"
    2.46  				src="images/ra-dl-rb.gif" />
    2.47 -				<p class="caption">''space-between'' ruby alignment
    2.48 +				<p class="caption">''space-between'' ruby distribution
    2.49  			</div>
    2.50  		</dd>
    2.51  
    2.52 @@ -1048,20 +1049,20 @@
    2.53  			except that there exists an extra <a href="http://www.w3.org/TR/css3-text/#expansion-opportunity"><i>expansion opportunity</i></a>
    2.54  			whose space is distributed half before and half after the ruby content.
    2.55  			<div class="example">
    2.56 -				<p>Since a typical implementation will by default define expansion opportunities
    2.57 +				<p>Since a typical implementation will by default define <i>expansion opportunities</i>
    2.58  					between every adjacent pair of CJK <i>characters</i>
    2.59  					and not between adjacent pairs of Latin <i>characters</i>,
    2.60  					this should result in the behavior recommended by [[JLREQ]]:
    2.61 -					for wide-cell ruby to be aligned in the 'distribute-space' mode...
    2.62 +					for wide-cell ruby content to be distributed...
    2.63  				<div class="figure">
    2.64  					<p><img width="145" height="91"
    2.65  					alt="Diagram of glyph layout in auto aligned ruby when ruby text is shorter than base"
    2.66  					src="images/ra-ds.gif" /><img width="145" height="91"
    2.67  					alt="Diagram of glyph layout in auto aligned ruby when ruby text is longer than base"
    2.68  					src="images/ra-ds-rb.gif" />
    2.69 -					<p class="caption">Wide-cell text in ''space-around'' ruby alignment is distributed
    2.70 +					<p class="caption">Wide-cell text in ''space-around'' ruby distribution is spaced apart
    2.71  				</div>
    2.72 -				<p>... and narrow-cell glyph ruby to be aligned in the 'center' mode.
    2.73 +				<p>... and narrow-cell glyph ruby to be centered.
    2.74  				<div class="figure">
    2.75  					<p><img
    2.76  					alt="Diagram of glyph layout in auto aligned ruby when halfwidth ruby text is shorter than base"
    2.77 @@ -1070,7 +1071,7 @@
    2.78  					alt="Diagram of character layout in auto aligned ruby when ruby text is longer than narrow-width base"
    2.79  					width="145" height="91"
    2.80  					src="images/ra-c-rb-h.gif" />
    2.81 -					<p class="caption">Narrow-width ruby text in ''space-around'' ruby alignment is centered
    2.82 +					<p class="caption">Narrow-width ruby text in ''space-around'' ruby distribution is centered
    2.83  				</div>
    2.84  			</div>
    2.85  		</dd>