Skip to content

Commit c83f139

Browse files
fantasaifantasai
committed
--HG-- extra : rebase_source : ec741c907b3c67e8b4b31a0be637d502dfc4dabf
1 parent b6b2d9c commit c83f139

2 files changed

Lines changed: 24 additions & 24 deletions

File tree

‎css-ruby/Overview.html‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
<meta content="CSS Ruby Module Level 1" name=dcterms.title>
2323
<meta content=text name=dcterms.type>
24-
<meta content=2014-05-29 name=dcterms.date>
24+
<meta content=2014-06-26 name=dcterms.date>
2525
<meta content="Elika J. Etemad" name=dcterms.creator>
2626
<meta content="Koji Ishii" name=dcterms.creator>
2727
<meta content="Richard Ishida" name=dcterms.creator>
@@ -42,8 +42,8 @@
4242
<h1 class=p-name>CSS Ruby Module Level 1</h1>
4343

4444
<h2 class="no-num no-toc">Editor's Draft <time class=dt-updated
45-
datetime=20140529>29 May 2014</time>
46-
<!-- for HTML4 doctype: <span class="value-title" title="20140529">29 May 2014</span></span> --></h2>
45+
datetime=20140626>26 June 2014</time>
46+
<!-- for HTML4 doctype: <span class="value-title" title="20140626">26 June 2014</span></span> --></h2>
4747

4848
<dl>
4949
<dt>This version:
@@ -648,7 +648,7 @@ <h3 id=pairing><span class=secno>2.3. </span> Ruby Pairing and Annotation
648648
containers</i></a> in that segment.
649649

650650
<p>Each <a href="#ruby-annotation-container-box"><i>ruby annotation
651-
containers</i></a> in a <i>ruby segment</i> represents one <dfn id=level
651+
container</i></a> in a <i>ruby segment</i> represents one <dfn id=level
652652
title="annotation level | level">level</dfn> of annotation: the first
653653
one represents the first level of annotation, the second one represents
654654
the second level of annotation, and so on.
@@ -675,7 +675,7 @@ <h3 id=pairing><span class=secno>2.3. </span> Ruby Pairing and Annotation
675675
pair spanning annotations to multiple bases appropriately.
676676
</ol>
677677

678-
<p>A this point, ruby “columns” are defined, each represented by a
678+
<p>At this point, ruby “columns” are defined, each represented by a
679679
single <a href="#ruby-base-box"><i>ruby base</i></a> and associated with
680680
one <a href="#ruby-annotation-box"><i>ruby annotation</i></a> (possibly an
681681
empty, anonymous one) from each <a href="#level"><i>annotation
@@ -719,7 +719,7 @@ <h3 id=autohide><span class=secno>2.4. </span> Autohiding Annotations</h3>
719719

720720
<div class=example>
721721
<p>This is to allow correct inlined display of annotations for Japanese
722-
words that are a mix of kanji and hirangana. For example, the word
722+
words that are a mix of kanji and hiragana. For example, the word
723723
<i>振り仮名</i> should be inlined as
724724

725725
<p class=figure>振り仮名(ふりがな)
@@ -824,7 +824,7 @@ <h3 id=white-space><span class=secno>2.5. </span> White Space</h3>
824824
(if between <a href="#ruby-annotation-box"><i>ruby annotations</i></a>),
825825
or <a href="#ruby-container-box"><i>ruby container</i></a> (if between <a
826826
href="#ruby-segments"><i>ruby segments</i></a>). In the latter case, the
827-
text is considered part of the <i>base level</i>. Such anonynmous boxes do
827+
text is considered part of the <i>base level</i>. Such anonymous boxes do
828828
not take part in pairing. They merely ensure separation between adjacent
829829
bases/annotations.
830830

@@ -1016,7 +1016,7 @@ <h4 id=break-within><span class=secno>2.8.2. </span> Breaking within bases</h4>
10161016
of the <a href="#ruby-base-box"><i>ruby base</i></a> and all its parallel
10171017
<i>annotations</i> allow it, and there exists a <i>soft wrap
10181018
opportunity</i> <em>within</em> (i.e. not at the start or end) the content
1019-
of each base/annotation box. Since there is no structural correspondance
1019+
of each base/annotation box. Since there is no structural correspondence
10201020
between fragments of content within <a href="#ruby-base-box"><i>ruby
10211021
bases</i></a> and <i>annotations</i>, the UA may break at any set of
10221022
opportunities; but it is recommended that the UA attempt to proportionally
@@ -1094,7 +1094,7 @@ <h3 id=line-height><span class=secno>2.10. </span> Ruby box and line
10941094
<p>The ‘<code class=property>line-height</code>’ property controls
10951095
spacing between lines in CSS. When inline content on line is shorter than
10961096
the ‘<code class=property>line-height</code>’, half-leading is added
1097-
on either side of the content, as specificed in <a
1097+
on either side of the content, as specified in <a
10981098
href="http://www.w3.org/TR/CSS21/visudet.html#line-height">CSS2.1§10.8</a>.
10991099
<a href="#ref-CSS21">[CSS21]<!--{{!CSS21}}--></a>
11001100

@@ -1243,7 +1243,7 @@ <h3 id=rubypos><span class=secno>3.1. </span> Ruby positioning: the ‘<a
12431243
<dd>The ruby text appears on the right side of the base in vertical text.
12441244
<div class=figure>
12451245
<p><img
1246-
alt="Diagram of ruby glyph layout in vertical mode with ruby text apearing vertically on the right of the base"
1246+
alt="Diagram of ruby glyph layout in vertical mode with ruby text appearing vertically on the right of the base"
12471247
src="images/shinkansen-right.gif" width=33>
12481248

12491249
<p class=caption>Ruby to the right of Japanese base text in vertical
@@ -1270,7 +1270,7 @@ <h3 id=rubypos><span class=secno>3.1. </span> Ruby positioning: the ‘<a
12701270
<dd>The ruby text appears on the left side of the base in vertical text.
12711271
<div class=figure>
12721272
<p><img
1273-
alt="Diagram of ruby glyph layout in vertical mode with ruby text apearing vertically on the left of the base"
1273+
alt="Diagram of ruby glyph layout in vertical mode with ruby text appearing vertically on the left of the base"
12741274
src="images/shinkansen-left.gif">
12751275

12761276
<p class=caption>Ruby to the left of Japanese base text in vertical
@@ -2256,11 +2256,11 @@ <h3 class=no-num id=other-references> Other references</h3>
22562256

22572257
<dt id=CSS3-FLEXBOX>[CSS3-FLEXBOX]
22582258

2259-
<dd>Tab Atkins Jr.; Elika J. Etemad; Alex Mogilevsky. <a
2260-
href="http://www.w3.org/TR/2012/CR-css3-flexbox-20120918/"><cite>CSS
2261-
Flexible Box Layout Module.</cite></a> 18 September 2012. W3C Candidate
2262-
Recommendation. (Work in progress.) URL: <a
2263-
href="http://www.w3.org/TR/2012/CR-css3-flexbox-20120918/">http://www.w3.org/TR/2012/CR-css3-flexbox-20120918/</a>
2259+
<dd>Tab Atkins Jr.; fantasai; Rossen Atanassov. <a
2260+
href="http://www.w3.org/TR/2014/WD-css-flexbox-1-20140325/"><cite>CSS
2261+
Flexible Box Layout Module Level 1.</cite></a> 25 March 2014. W3C Last
2262+
Call Working Draft. (Work in progress.) URL: <a
2263+
href="http://www.w3.org/TR/2014/WD-css-flexbox-1-20140325/">http://www.w3.org/TR/2014/WD-css-flexbox-1-20140325/</a>
22642264
</dd>
22652265
<!---->
22662266

‎css-ruby/Overview.src.html‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ <h3 id="pairing">
353353
The <i>ruby base container</i> in each segment is thus associated
354354
with each of the <i>ruby annotation containers</i> in that segment.
355355

356-
<p>Each <i>ruby annotation containers</i> in a <i>ruby segment</i>
356+
<p>Each <i>ruby annotation container</i> in a <i>ruby segment</i>
357357
represents one <dfn title="annotation level | level">level</dfn> of annotation:
358358
the first one represents the first level of annotation,
359359
the second one represents the second level of annotation,
@@ -376,7 +376,7 @@ <h3 id="pairing">
376376
appropriately.
377377
</ol>
378378

379-
<p>A this point, ruby “columns” are defined,
379+
<p>At this point, ruby “columns” are defined,
380380
each represented by a single <i>ruby base</i>
381381
and associated with one <i>ruby annotation</i> (possibly an empty, anonymous one)
382382
from each <i>annotation level</i>.
@@ -413,7 +413,7 @@ <h3 id="autohide">
413413

414414
<div class="example">
415415
<p>This is to allow correct inlined display of annotations
416-
for Japanese words that are a mix of kanji and hirangana.
416+
for Japanese words that are a mix of kanji and hiragana.
417417
For example, the word <i>振り仮名</i> should be inlined as
418418
<p class="figure">振り仮名(ふりがな)
419419
<p>and therefore marked up as
@@ -484,7 +484,7 @@ <h3 id="white-space">
484484
<i>ruby annotation container</i> (if between <i>ruby annotations</i>),
485485
or <i>ruby container</i> (if between <i>ruby segments</i>).
486486
In the latter case, the text is considered part of the <i>base level</i>.
487-
Such anonynmous boxes do not take part in pairing.
487+
Such anonymous boxes do not take part in pairing.
488488
They merely ensure separation between adjacent bases/annotations.
489489

490490
<p class="issue">Specify how these anonymous white space boxes impact layout.
@@ -642,7 +642,7 @@ <h4 id="break-within">
642642
of the <i>ruby base</i> and all its parallel <i>annotations</i> allow it,
643643
and there exists a <i>soft wrap opportunity</i> <em>within</em> (i.e. not at the start or end)
644644
the content of each base/annotation box.
645-
Since there is no structural correspondance between fragments of content
645+
Since there is no structural correspondence between fragments of content
646646
within <i>ruby bases</i> and <i>annotations</i>,
647647
the UA may break at any set of opportunities;
648648
but it is recommended that the UA attempt to proportionally balance
@@ -723,7 +723,7 @@ <h3 id="line-height">
723723
<p>The 'line-height' property controls spacing between lines in CSS.
724724
When inline content on line is shorter than the 'line-height',
725725
half-leading is added on either side of the content,
726-
as specificed in <a href="http://www.w3.org/TR/CSS21/visudet.html#line-height">CSS2.1&sect;10.8</a>. [[!CSS21]]
726+
as specified in <a href="http://www.w3.org/TR/CSS21/visudet.html#line-height">CSS2.1&sect;10.8</a>. [[!CSS21]]
727727

728728
<p>In order to ensure consistent spacing of lines,
729729
documents with ruby typically ensure that the 'line-height' is large enough
@@ -831,7 +831,7 @@ <h3 id="rubypos">
831831
<dd>The ruby text appears on the right side of the base in vertical text.
832832
<div class="figure">
833833
<p><img src="images/shinkansen-right.gif" width="33"
834-
alt="Diagram of ruby glyph layout in vertical mode with ruby text apearing vertically on the right of the base">
834+
alt="Diagram of ruby glyph layout in vertical mode with ruby text appearing vertically on the right of the base">
835835
<p class="caption">Ruby to the right of Japanese base text in vertical layout
836836
</div>
837837
</dd>
@@ -853,7 +853,7 @@ <h3 id="rubypos">
853853

854854
<div class="figure">
855855
<p><img src="images/shinkansen-left.gif"
856-
alt="Diagram of ruby glyph layout in vertical mode with ruby text apearing vertically on the left of the base">
856+
alt="Diagram of ruby glyph layout in vertical mode with ruby text appearing vertically on the left of the base">
857857
<p class="caption">Ruby to the left of Japanese base text in vertical layout
858858
</div>
859859
</dd>

0 commit comments

Comments
 (0)