merge

dauwhe · dauwhe · commit db91832642b1 · 2014-12-10T20:57:42.000-05:00
diff --git a/css-inline/Overview.bs b/css-inline/Overview.bs
@@ -52,7 +52,7 @@ A <dfn>dropped initial</dfn> (or “drop cap”) is a larger-than-usual letter a
   <p class="caption">Three-line drop initial with E acute. Since the cap-height of the drop initial aligns with the cap-height of the main text, the accent extends above the paragraph.</p>
 </figure>
 
-The exact size and position of a drop cap depends on the alignment of its glyph. [TK] Reference points on the drop cap must align precisely with reference points in the text. In Western scripts, the top reference points are the cap height of the initial letter and of the first line of text. The bottom reference points are the alphabetic baseline of the initial letter and the baseline of the Nth line of text. <a href="#f2">Figure 2</a> shows a simple two-line drop cap, with the relevant reference lines marked. 
+The exact size and position of a <a>dropped initial</a> depends on the alignment of its glyph. [TK] Reference points on the drop cap must align precisely with reference points in the text. In Western scripts, the top reference points are the cap height of the initial letter and of the first line of text. The bottom reference points are the alphabetic baseline of the initial letter and the baseline of the Nth line of text. <a href="#f2">Figure 2</a> shows a simple two-line drop cap, with the relevant reference lines marked. 
 
 
 
@@ -144,6 +144,9 @@ This property specifies styling for dropped, raised, and sunken initial letters.
   <dd>This optional second argument argument defines the number of lines the initial letter should sink. Values must be greater than zero. If omitted, it duplicates the first argument, floored to the nearest positive whole number.
 </dl>
 
+An <dfn>initial letter</dfn> is a box to which 'initial-letter' applies
+and is not ''initial-letter/normal'': this triggers the special layout considerations described below.
+
 <div class="example">
   Here are some examples of 'initial-letter' usage:
 
diff --git a/css-inline/Overview.html b/css-inline/Overview.html
@@ -162,7 +162,7 @@ <h4 class="heading settled" data-level=2.1.1 id=drop-initial><span class=secno>2
   <p class=caption>Three-line drop initial with E acute. Since the cap-height of the drop initial aligns with the cap-height of the main text, the accent extends above the paragraph.</p>
 </figure>
 
-<p>The exact size and position of a drop cap depends on the alignment of its glyph. [TK] Reference points on the drop cap must align precisely with reference points in the text. In Western scripts, the top reference points are the cap height of the initial letter and of the first line of text. The bottom reference points are the alphabetic baseline of the initial letter and the baseline of the Nth line of text. <a href=#f2>Figure 2</a> shows a simple two-line drop cap, with the relevant reference lines marked.</p>
+<p>The exact size and position of a <a data-link-type=dfn href=#dropped-initial>dropped initial</a> depends on the alignment of its glyph. [TK] Reference points on the drop cap must align precisely with reference points in the text. In Western scripts, the top reference points are the cap height of the initial letter and of the first line of text. The bottom reference points are the alphabetic baseline of the initial letter and the baseline of the Nth line of text. <a href=#f2>Figure 2</a> shows a simple two-line drop cap, with the relevant reference lines marked.</p>
 
 
 
@@ -243,6 +243,9 @@ <h3 class="heading settled" data-level=2.3 id=sizing-drop-initials><span class=s
   <dd>This optional second argument argument defines the number of lines the initial letter should sink. Values must be greater than zero. If omitted, it duplicates the first argument, floored to the nearest positive whole number.
 </dl>
 
+<p>An <dfn data-dfn-type=dfn data-noexport="" id=initial-letter>initial letter<a class=self-link href=#initial-letter></a></dfn> is a box to which <a class=property data-link-type=propdesc href=#propdef-initial-letter>initial-letter</a> applies
+and is not <span class=css data-link-for=initial-letter>normal</span>: this triggers the special layout considerations described below.</p>
+
 <div class=example>
   Here are some examples of <a class=property data-link-type=propdesc href=#propdef-initial-letter>initial-letter</a> usage:
 
@@ -558,4 +561,4 @@ <h3 class="no-ref heading settled" id=testing><span class=content>
 
 
 
-<h2 class="no-num heading settled" id=references><span class=content>References</span><a class=self-link href=#references></a></h2><h3 class="no-num heading settled" id=normative><span class=content>Normative References</span><a class=self-link href=#normative></a></h3><dl><dt id=biblio-rfc2119 title=rfc2119><a class=self-link href=#biblio-rfc2119></a>[rfc2119]<dd>S. Bradner. <a href=https://tools.ietf.org/html/rfc2119>Key words for use in RFCs to Indicate Requirement Levels</a>. March 1997. Best Current Practice. URL: <a href=https://tools.ietf.org/html/rfc2119>https://tools.ietf.org/html/rfc2119</a></dl><h3 class="no-num heading settled" id=informative><span class=content>Informative References</span><a class=self-link href=#informative></a></h3><dl><dt id=biblio-css2 title=CSS2><a class=self-link href=#biblio-css2></a>[CSS2]<dd>Bert Bos; et al. <a href=http://www.w3.org/TR/CSS2>Cascading Style Sheets Level 2 Revision 1 (CSS 2.1) Specification</a>. 7 June 2011. REC. URL: <a href=http://www.w3.org/TR/CSS2>http://www.w3.org/TR/CSS2</a><dt id=biblio-css21 title=CSS21><a class=self-link href=#biblio-css21></a>[CSS21]<dd>Bert Bos; et al. <a href=http://www.w3.org/TR/2011/REC-CSS2-20110607>Cascading Style Sheets Level 2 Revision 1 (CSS 2.1) Specification</a>. 7 June 2011. W3C Recommendation. URL: <a href=http://www.w3.org/TR/2011/REC-CSS2-20110607>http://www.w3.org/TR/2011/REC-CSS2-20110607</a><dt id=biblio-css3-line-grid title=CSS3-LINE-GRID><a class=self-link href=#biblio-css3-line-grid></a>[CSS3-LINE-GRID]<dd>Koji Ishii. <a href=http://dev.w3.org/csswg/css-line-grid/>CSS Line Grid Module</a>. Proposal for a CSS module. (Retrieved 26 October 2011) URL: <a href=http://dev.w3.org/csswg/css-line-grid/>http://dev.w3.org/csswg/css-line-grid/</a><dt id=biblio-css3-writing-modes title=CSS3-WRITING-MODES><a class=self-link href=#biblio-css3-writing-modes></a>[CSS3-WRITING-MODES]<dd>Elika J. Etemad; Koji Ishii. <a href=http://www.w3.org/TR/2012/WD-css3-writing-modes-20121115/>CSS Writing Modes Module Level 3</a>. 15 November 2012. W3C Working Draft. (Work in progress.) URL: <a href=http://www.w3.org/TR/2012/WD-css3-writing-modes-20121115/>http://www.w3.org/TR/2012/WD-css3-writing-modes-20121115/</a><dt id=biblio-css3text title=CSS3TEXT><a class=self-link href=#biblio-css3text></a>[CSS3TEXT]<dd>Elika J. Etemad; Koji Ishii. <a href=http://www.w3.org/TR/2012/WD-css3-text-20121113/>CSS Text Module Level 3</a>. 13 November 2012. W3C Working Draft. (Work in progress.) URL: <a href=http://www.w3.org/TR/2012/WD-css3-text-20121113/>http://www.w3.org/TR/2012/WD-css3-text-20121113/</a><dt id=biblio-select title=SELECT><a class=self-link href=#biblio-select></a>[SELECT]<dd>Tantek Çelik; et al. <a href=http://www.w3.org/TR/2011/REC-css3-selectors-20110929/>Selectors Level 3</a>. 29 September 2011. W3C Recommendation. URL: <a href=http://www.w3.org/TR/2011/REC-css3-selectors-20110929/>http://www.w3.org/TR/2011/REC-css3-selectors-20110929/</a></dl><h2 class="no-num heading settled" id=index><span class=content>Index</span><a class=self-link href=#index></a></h2><ul class=indexlist><li>dropped initial, <a href=#dropped-initial title="section 2.1.1">2.1.1</a><li>initial-letter, <a href=#propdef-initial-letter title="section 2.3">2.3</a><li>initial-letter-align, <a href=#propdef-initial-letter-align title="section 2.4">2.4</a><li>&lt;integer&gt;, <a href=#typedef-integer title="section 2.3">2.3</a><li>normal, <a href=#normal title="section 2.3">2.3</a><li>&lt;number&gt;, <a href=#typedef-number title="section 2.3">2.3</a><li>raised initial, <a href=#raised-initial title="section 2.1.3">2.1.3</a><li>sunken initial, <a href=#sunken-initial title="section 2.1.2">2.1.2</a></ul><h2 class="no-num heading settled" id=property-index><span class=content>Property Index</span><a class=self-link href=#property-index></a></h2><table class="proptable data"><thead><tr><th scope=col>Name<th scope=col>Value<th scope=col>Initial<th scope=col>Applies to<th scope=col>Inh.<th scope=col>%ages<th scope=col>Media<th scope=col>Animatable<th scope=col>Computed value<tbody><tr><th scope=row><a class=css data-link-type=property href=#propdef-initial-letter>initial-letter</a><td>normal | [&lt;integer&gt; &lt;number&gt;?]<td>normal<td>::first-letter pseudo-elements and inline-level first child of a block container<td>no<td>N/A<td>visual<td>no<td>as specified<tr><th scope=row><a class=css data-link-type=property href=#propdef-initial-letter-align>initial-letter-align</a><td>[ auto | alphabetic | hanging | ideographic ]<td>auto<td>::first-letter pseudo elements and inline level first child of a block container<td>no<td>N/A<td>visual<td>no<td>???</table><h2 class="no-num heading settled" id=issues-index><span class=content>Issues Index</span><a class=self-link href=#issues-index></a></h2><div style=counter-reset:issue><div class=issue>This section is being rewritten. Refer to <a href=http://www.w3.org/TR/CSS21/visudet.html#line-height>section 10.8</a> of <a data-biblio-type=informative data-link-type=biblio href=#biblio-css21 title=CSS21>[CSS21]</a> for the normative CSS definition or the <a href=http://www.w3.org/TR/2002/WD-css3-linebox-20020515/>2002 Working Draft</a> if you want pretty pictures. (But ignore the old text, half of it’s wrong. We’re not specifying which half, that’s to be determined.)<a href=#issue-469c7c8c> ↵ </a></div><div class=issue>The editors would appreciate any examples of drop initials in non-western scripts, especially Arabic and Indic scripts.<a href=#issue-f90429eb> ↵ </a></div><div class=issue>Add pictures.<a href=#issue-2e07b898> ↵ </a></div><div class=issue>Define interaction with Ruby. Easiest is to make it not apply to/within ruby.<a href=#issue-664624cd> ↵ </a></div><div class=issue>Input from those knowledgeable about non-Western  typographic traditions would be very helpful in describing the appropriate alignments. More values may be required for this property.<a href=#issue-209367a3> ↵ </a></div><div class=issue>Handle glyph ink above cap height of font.<a href=#issue-f77cbeb9> ↵ </a></div><div class=issue>Is this the behavior we want? What if the float is on the same line as the initial letter?<a href=#issue-2ad0a0cb> ↵ </a></div></div>
+<h2 class="no-num heading settled" id=references><span class=content>References</span><a class=self-link href=#references></a></h2><h3 class="no-num heading settled" id=normative><span class=content>Normative References</span><a class=self-link href=#normative></a></h3><dl><dt id=biblio-rfc2119 title=rfc2119><a class=self-link href=#biblio-rfc2119></a>[rfc2119]<dd>S. Bradner. <a href=https://tools.ietf.org/html/rfc2119>Key words for use in RFCs to Indicate Requirement Levels</a>. March 1997. Best Current Practice. URL: <a href=https://tools.ietf.org/html/rfc2119>https://tools.ietf.org/html/rfc2119</a></dl><h3 class="no-num heading settled" id=informative><span class=content>Informative References</span><a class=self-link href=#informative></a></h3><dl><dt id=biblio-css2 title=CSS2><a class=self-link href=#biblio-css2></a>[CSS2]<dd>Bert Bos; et al. <a href=http://www.w3.org/TR/CSS2>Cascading Style Sheets Level 2 Revision 1 (CSS 2.1) Specification</a>. 7 June 2011. REC. URL: <a href=http://www.w3.org/TR/CSS2>http://www.w3.org/TR/CSS2</a><dt id=biblio-css21 title=CSS21><a class=self-link href=#biblio-css21></a>[CSS21]<dd>Bert Bos; et al. <a href=http://www.w3.org/TR/2011/REC-CSS2-20110607>Cascading Style Sheets Level 2 Revision 1 (CSS 2.1) Specification</a>. 7 June 2011. W3C Recommendation. URL: <a href=http://www.w3.org/TR/2011/REC-CSS2-20110607>http://www.w3.org/TR/2011/REC-CSS2-20110607</a><dt id=biblio-css3-line-grid title=CSS3-LINE-GRID><a class=self-link href=#biblio-css3-line-grid></a>[CSS3-LINE-GRID]<dd>Koji Ishii. <a href=http://dev.w3.org/csswg/css-line-grid/>CSS Line Grid Module</a>. Proposal for a CSS module. (Retrieved 26 October 2011) URL: <a href=http://dev.w3.org/csswg/css-line-grid/>http://dev.w3.org/csswg/css-line-grid/</a><dt id=biblio-css3-writing-modes title=CSS3-WRITING-MODES><a class=self-link href=#biblio-css3-writing-modes></a>[CSS3-WRITING-MODES]<dd>Elika J. Etemad; Koji Ishii. <a href=http://www.w3.org/TR/2012/WD-css3-writing-modes-20121115/>CSS Writing Modes Module Level 3</a>. 15 November 2012. W3C Working Draft. (Work in progress.) URL: <a href=http://www.w3.org/TR/2012/WD-css3-writing-modes-20121115/>http://www.w3.org/TR/2012/WD-css3-writing-modes-20121115/</a><dt id=biblio-css3text title=CSS3TEXT><a class=self-link href=#biblio-css3text></a>[CSS3TEXT]<dd>Elika J. Etemad; Koji Ishii. <a href=http://www.w3.org/TR/2012/WD-css3-text-20121113/>CSS Text Module Level 3</a>. 13 November 2012. W3C Working Draft. (Work in progress.) URL: <a href=http://www.w3.org/TR/2012/WD-css3-text-20121113/>http://www.w3.org/TR/2012/WD-css3-text-20121113/</a><dt id=biblio-select title=SELECT><a class=self-link href=#biblio-select></a>[SELECT]<dd>Tantek Çelik; et al. <a href=http://www.w3.org/TR/2011/REC-css3-selectors-20110929/>Selectors Level 3</a>. 29 September 2011. W3C Recommendation. URL: <a href=http://www.w3.org/TR/2011/REC-css3-selectors-20110929/>http://www.w3.org/TR/2011/REC-css3-selectors-20110929/</a></dl><h2 class="no-num heading settled" id=index><span class=content>Index</span><a class=self-link href=#index></a></h2><ul class=indexlist><li>dropped initial, <a href=#dropped-initial title="section 2.1.1">2.1.1</a><li>initial-letter, <a href=#propdef-initial-letter title="section 2.3">2.3</a><li>initial letter, <a href=#initial-letter title="section 2.3">2.3</a><li>initial-letter-align, <a href=#propdef-initial-letter-align title="section 2.4">2.4</a><li>&lt;integer&gt;, <a href=#typedef-integer title="section 2.3">2.3</a><li>normal, <a href=#normal title="section 2.3">2.3</a><li>&lt;number&gt;, <a href=#typedef-number title="section 2.3">2.3</a><li>raised initial, <a href=#raised-initial title="section 2.1.3">2.1.3</a><li>sunken initial, <a href=#sunken-initial title="section 2.1.2">2.1.2</a></ul><h2 class="no-num heading settled" id=property-index><span class=content>Property Index</span><a class=self-link href=#property-index></a></h2><table class="proptable data"><thead><tr><th scope=col>Name<th scope=col>Value<th scope=col>Initial<th scope=col>Applies to<th scope=col>Inh.<th scope=col>%ages<th scope=col>Media<th scope=col>Animatable<th scope=col>Computed value<tbody><tr><th scope=row><a class=css data-link-type=property href=#propdef-initial-letter>initial-letter</a><td>normal | [&lt;integer&gt; &lt;number&gt;?]<td>normal<td>::first-letter pseudo-elements and inline-level first child of a block container<td>no<td>N/A<td>visual<td>no<td>as specified<tr><th scope=row><a class=css data-link-type=property href=#propdef-initial-letter-align>initial-letter-align</a><td>[ auto | alphabetic | hanging | ideographic ]<td>auto<td>::first-letter pseudo elements and inline level first child of a block container<td>no<td>N/A<td>visual<td>no<td>???</table><h2 class="no-num heading settled" id=issues-index><span class=content>Issues Index</span><a class=self-link href=#issues-index></a></h2><div style=counter-reset:issue><div class=issue>This section is being rewritten. Refer to <a href=http://www.w3.org/TR/CSS21/visudet.html#line-height>section 10.8</a> of <a data-biblio-type=informative data-link-type=biblio href=#biblio-css21 title=CSS21>[CSS21]</a> for the normative CSS definition or the <a href=http://www.w3.org/TR/2002/WD-css3-linebox-20020515/>2002 Working Draft</a> if you want pretty pictures. (But ignore the old text, half of it’s wrong. We’re not specifying which half, that’s to be determined.)<a href=#issue-469c7c8c> ↵ </a></div><div class=issue>The editors would appreciate any examples of drop initials in non-western scripts, especially Arabic and Indic scripts.<a href=#issue-f90429eb> ↵ </a></div><div class=issue>Add pictures.<a href=#issue-2e07b898> ↵ </a></div><div class=issue>Define interaction with Ruby. Easiest is to make it not apply to/within ruby.<a href=#issue-664624cd> ↵ </a></div><div class=issue>Input from those knowledgeable about non-Western  typographic traditions would be very helpful in describing the appropriate alignments. More values may be required for this property.<a href=#issue-209367a3> ↵ </a></div><div class=issue>Handle glyph ink above cap height of font.<a href=#issue-f77cbeb9> ↵ </a></div><div class=issue>Is this the behavior we want? What if the float is on the same line as the initial letter?<a href=#issue-2ad0a0cb> ↵ </a></div></div>
