Skip to content

Commit 8d2b106

Browse files
fantasaifantasai
committed
Make line-breaking rules that should be language-dependent language-dependent; make spacing percentages wrt width of affected character (use 'ch' unit for constant spacing); revert to editor's draft now that we're published
1 parent 9e32b65 commit 8d2b106

2 files changed

Lines changed: 73 additions & 74 deletions

File tree

‎css3-text/Output.html‎

Lines changed: 45 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -73,28 +73,25 @@
7373
.char { border: 1px dotted gray; }
7474
tt[lang="ja"] { font-family: "MS Gothic", "Osaka", monospace }
7575
</style>
76-
<link href="http://www.w3.org/StyleSheets/TR/W3C-WD.css" rel=stylesheet
76+
<link href="http://www.w3.org/StyleSheets/TR/W3C-ED.css" rel=stylesheet
7777
type="text/css">
7878

7979
<body>
80-
<div class=head>
80+
<div class=head> <!--begin-logo-->
8181
<p><a href="http://www.w3.org/"><img alt=W3C height=48
82-
src="http://www.w3.org/Icons/w3c_home" width=72></a></p>
82+
src="http://www.w3.org/Icons/w3c_home" width=72></a> <!--end-logo-->
8383

8484
<h1>CSS Text Level 3</h1>
85-
<!--
86-
<h2 class="no-num no-toc">Editor's Draft $Date$</h2>
87-
-->
88-
89-
<h2 class="no-num no-toc" id=w3c-working-draft-5-october-2010>W3C Working
90-
Draft 5 October 2010</h2>
85+
86+
<h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 6 October 2010</h2>
9187

9288
<dl>
93-
<dt>This version:</dt>
94-
<!-- <dd><a href="http://dev.w3.org/csswg/css3-text/Overview.html">$Date$ (CVS $Revision$)</a> -->
89+
<dt>This version:
9590

96-
<dd><a
97-
href="http://www.w3.org/TR/2010/WD-css3-text-20101005/">http://www.w3.org/TR/2010/WD-css3-text-20101005/</a>
91+
<dd><a href="http://dev.w3.org/csswg/css3-text/Overview.html">$Date:
92+
2010/10/05 14:48:43 $ (CVS $Revision$)</a> --> <!--<dd><a
93+
href="http://www.w3.org/TR/2010/WD-css3-text-20101005/">http://www.w3.org/TR/2010/WD-css3-text-20101005/</a></dd> -->
94+
9895

9996
<dt>Latest version:
10097

@@ -104,7 +101,7 @@ <h2 class="no-num no-toc" id=w3c-working-draft-5-october-2010>W3C Working
104101
<dt>Previous version:
105102

106103
<dd><a
107-
href="http://www.w3.org/TR/2007/WD-css3-text-20070306/">http://www.w3.org/TR/2007/WD-css3-text-20070306/</a>
104+
href="http://www.w3.org/TR/2010/WD-css3-text-20101005/">http://www.w3.org/TR/2010/WD-css3-text-20101005/</a>
108105

109106
<dt>Editors:
110107

@@ -117,13 +114,14 @@ <h2 class="no-num no-toc" id=w3c-working-draft-5-october-2010>W3C Working
117114
<dd><a href="mailto:murakami@antenna.co.jp">Shinyu Murakami</a> (Antenna
118115
House)
119116
</dl>
120-
117+
<!--begin-copyright-->
121118
<p class=copyright><a
122-
href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright">
123-
Copyright</a> &copy; 2007 <a href="http://www.w3.org/"><abbr title="World
124-
Wide Web Consortium">W3C</abbr></a><sup>&reg;</sup> (<a
125-
href="http://www.csail.mit.edu/"><abbr title="Massachusetts Institute of
126-
Technology">MIT</abbr></a>, <a href="http://www.ercim.org/"><acronym
119+
href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright"
120+
rel=license>Copyright</a> &copy; 2010 <a
121+
href="http://www.w3.org/"><acronym title="World Wide Web
122+
Consortium">W3C</acronym></a><sup>&reg;</sup> (<a
123+
href="http://www.csail.mit.edu/"><acronym title="Massachusetts Institute
124+
of Technology">MIT</acronym></a>, <a href="http://www.ercim.eu/"><acronym
127125
title="European Research Consortium for Informatics and
128126
Mathematics">ERCIM</acronym></a>, <a
129127
href="http://www.keio.ac.jp/">Keio</a>), All Rights Reserved. W3C <a
@@ -133,7 +131,7 @@ <h2 class="no-num no-toc" id=w3c-working-draft-5-october-2010>W3C Working
133131
and <a
134132
href="http://www.w3.org/Consortium/Legal/copyright-documents">document
135133
use</a> rules apply.</p>
136-
134+
<!--end-copyright-->
137135
<hr title="Separator for header">
138136
</div>
139137

@@ -210,7 +208,11 @@ <h2 class="no-num no-toc" id=status>Status of This Document</h2>
210208
its CR period: the &lsquo;<a href="#text-outline0"><code
211209
class=property>text-outline</code></a>&rsquo; property, the &lsquo;<code
212210
class=css>unrestricted</code>&rsquo; value of &lsquo;<a
213-
href="#text-wrap0"><code class=property>text-wrap</code></a>&rsquo;
211+
href="#text-wrap0"><code class=property>text-wrap</code></a>&rsquo;, the
212+
&lsquo;<a href="#hanging-punctuation0"><code
213+
class=property>hanging-punctuation</code></a>&rsquo; and &lsquo;<a
214+
href="#punctuation-trim0"><code
215+
class=property>punctuation-trim</code></a>&rsquo; properties
214216

215217
<h2 class="no-num no-toc" id=contents>Table of Contents</h2>
216218
<!--begin-toc-->
@@ -1152,31 +1154,35 @@ <h3 id=line-break><span class=secno>5.1. </span> Line Breaking Restrictions
11521154

11531155
<li>breaks before the KATAKANA-HIRAGANA PROLONGED SOUND MARK (U+30FC)
11541156

1155-
<li>breaks before the hyphens (U+2010, U+2013, U+301C, U+30A0)
1157+
<li>
11561158
</ul>
1159+
Additionally, if the language is known to be Chinese or Japanese, breaks
1160+
before hyphens (U+2010, U+2013, U+301C, U+30A0) may be allowed in
1161+
&lsquo;<code class=css>normal</code>&rsquo;.
11571162

11581163
<li>Following breaks be forbidden in normal and strict line breaking and
11591164
allowed in newspaper:
11601165
<ul>
1161-
<li>breaks before Japanese iteration marks (U+3005, U+303B, U+309D,
1162-
U+309E, U+30FD, U+30FE)
1163-
1164-
<li>breaks before the middle dots (U+003A, U+003B, U+30FB, U+FF1A,
1165-
U+FF1B, U+FF65)
1166-
1167-
<li>breaks before the dividing punctuation marks (U+0021, U+003F,
1168-
U+203C, U+2047, U+2048, U+2049, U+FF01, U+FF1F)
1166+
<li>breaks before iteration marks (U+3005, U+303B, U+309D, U+309E,
1167+
U+30FD, U+30FE)
11691168

1170-
<li>breaks before the inseparatable characters (U+2014, U+2025, U+2026,
1169+
<li>breaks before inseparatable characters (U+2014, U+2025, U+2026,
11711170
U+3033, U+3034, U+3035)
1171+
</ul>
1172+
If the language is known to be Chinese or Japanese, then additionally the
1173+
following breaks may be allowed in &lsquo;<code
1174+
class=css>newspaper</code>&rsquo;:
1175+
<ul>
1176+
<li>breaks before middle dots (U+003A, U+003B, U+30FB, U+FF1A, U+FF1B,
1177+
U+FF65)
11721178

1173-
<li>breaks before the iteration marks (U+3005, U+303B, U+309D, U+309E,
1174-
U+30FD, U+30FE)
1179+
<li>breaks before dividing punctuation marks (U+0021, U+003F, U+203C,
1180+
U+2047, U+2048, U+2049, U+FF01, U+FF1F)
11751181

1176-
<li>breaks before the postfixes (U+0025, U+00A2, U+00B0, U+2030, U+2032,
1182+
<li>breaks before postfixes (U+0025, U+00A2, U+00B0, U+2030, U+2032,
11771183
U+2033, U+2103, U+FF05, U+FFE0)
11781184

1179-
<li>breaks after the prefixes (U+0024, U+00A3, U+00A5, U+20AC, U+2116,
1185+
<li>breaks after prefixes (U+0024, U+00A3, U+00A5, U+20AC, U+2116,
11801186
U+FF04, U+FFE1, U+FFE5)
11811187
</ul>
11821188
</ul>
@@ -2407,8 +2413,9 @@ <h2 id=spacing><span class=secno>8. </span> Spacing</h2>
24072413
class=value-inst-percentage>&lt;percentage&gt;</span></a></code></dfn>
24082414

24092415
<dd>Specifies extra spacing <em>in addition to</em> the normal spacing.
2410-
Percentages are with respect to the width of a space (U+0020). Values may
2411-
be negative, but there may be implementation-dependent limits.
2416+
Percentages are with respect to the width of the affected character.
2417+
Values may be negative, but there may be implementation-dependent limits.
2418+
24122419
</dl>
24132420

24142421
<h3 id=word-spacing><span class=secno>8.1. </span> Word Spacing: the

‎css3-text/Overview.src.html‎

Lines changed: 28 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -73,54 +73,39 @@
7373
tt[lang="ja"] { font-family: "MS Gothic", "Osaka", monospace }
7474
</style>
7575

76-
<link rel="stylesheet" type="text/css" href="http://www.w3.org/StyleSheets/TR/W3C-WD.css">
76+
<link rel="stylesheet" type="text/css" href="http://www.w3.org/StyleSheets/TR/W3C-ED.css">
7777
</head>
7878

7979
<body>
8080

8181
<div class="head">
8282

83-
<p><a href="http://www.w3.org/"><img height="48" width="72" alt="W3C" src="http://www.w3.org/Icons/w3c_home"></a></p>
83+
<!--logo-->
8484

8585
<h1>CSS Text Level 3</h1>
8686

87-
<!--
88-
<h2 class="no-num no-toc">Editor's Draft $Date$</h2>
89-
-->
90-
<h2 class="no-num no-toc">W3C Working Draft 5 October 2010</h2>
87+
<h2 class="no-num no-toc">[LONGSTATUS] [DATE]</h2>
9188

9289
<dl>
9390
<dt>This version:</dt>
94-
<!-- <dd><a href="http://dev.w3.org/csswg/css3-text/Overview.html">$Date$ (CVS $Revision$)</a> -->
95-
<dd><a
96-
href="http://www.w3.org/TR/2010/WD-css3-text-20101005/">http://www.w3.org/TR/2010/WD-css3-text-20101005/</a></dd>
91+
<dd><a href="http://dev.w3.org/csswg/css3-text/Overview.html">$Date$ (CVS $Revision$)</a> -->
92+
<!--<dd><a
93+
href="http://www.w3.org/TR/2010/WD-css3-text-20101005/">http://www.w3.org/TR/2010/WD-css3-text-20101005/</a></dd> -->
9794
<dt>Latest version:</dt>
9895
<dd><a
9996
href="http://www.w3.org/TR/css3-text/">http://www.w3.org/TR/css3-text/</a></dd>
10097
<dt>Previous version:</dt>
10198
<dd><a
102-
href="http://www.w3.org/TR/2007/WD-css3-text-20070306/">http://www.w3.org/TR/2007/WD-css3-text-20070306/</a></dd>
99+
href="http://www.w3.org/TR/2010/WD-css3-text-20101005/">http://www.w3.org/TR/2010/WD-css3-text-20101005/</a></dd>
103100
<dt>Editors:</dt>
104101
<dd><a href="http://fantasai.inkedblade.net/contact">Elika J. Etemad</a> (Invited Expert)</dd>
105102
<dd><a href="mailto:kojiishi@gluesoft.co.jp">Koji Ishii</a> (Antenna House)</dd>
106103
<dd><a href="mailto:murakami@antenna.co.jp">Shinyu Murakami</a> (Antenna House)</dd>
107104
</dl>
108105

109-
<p class="copyright"><a
110-
href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright">
111-
Copyright</a> &copy; 2007 <a href="http://www.w3.org/"><abbr title="World
112-
Wide Web Consortium">W3C</abbr></a><sup>&reg;</sup> (<a
113-
href="http://www.csail.mit.edu/"><abbr title="Massachusetts Institute of
114-
Technology">MIT</abbr></a>, <a href="http://www.ercim.org/"><acronym
115-
title="European Research Consortium for Informatics and
116-
Mathematics">ERCIM</acronym></a>, <a
117-
href="http://www.keio.ac.jp/">Keio</a>), All Rights Reserved. W3C <a
118-
href="http://www.w3.org/Consortium/Legal/ipr-notice#Legal_Disclaimer">liability</a>,
119-
<a
120-
href="http://www.w3.org/Consortium/Legal/ipr-notice#W3C_Trademarks">trademark</a>
121-
and <a
122-
href="http://www.w3.org/Consortium/Legal/copyright-documents">document
123-
use</a> rules apply.</p>
106+
<!--begin-copyright-->
107+
<p>[Here will be included the file "../copyright.inc"]</p>
108+
<!--end-copyright-->
124109

125110
<hr title="Separator for header">
126111
</div>
@@ -193,7 +178,7 @@ <h2 class="no-num no-toc" id="status">Status of This Document</h2>
193178

194179
<p>The following features are at risk and may be cut from the spec during
195180
its CR period: the 'text-outline' property, the ''unrestricted'' value
196-
of 'text-wrap'</p>
181+
of 'text-wrap', the 'hanging-punctuation' and 'punctuation-trim' properties</p>
197182

198183
<h2 class="no-num no-toc" id="contents">Table of Contents</h2>
199184

@@ -791,17 +776,23 @@ <h3 id="line-break">
791776
<ul>
792777
<li>breaks before Japanese small kana
793778
<li>breaks before the KATAKANA-HIRAGANA PROLONGED SOUND MARK (U+30FC)
794-
<li>breaks before the hyphens (U+2010, U+2013, U+301C, U+30A0)
779+
<li>
795780
</ul>
781+
Additionally, if the language is known to be Chinese or Japanese,
782+
breaks before hyphens (U+2010, U+2013, U+301C, U+30A0) may be allowed
783+
in ''normal''.
796784
<li>Following breaks be forbidden in normal and strict line breaking and allowed in newspaper:
797785
<ul>
798-
<li>breaks before Japanese iteration marks (U+3005, U+303B, U+309D, U+309E, U+30FD, U+30FE)
799-
<li>breaks before the middle dots (U+003A, U+003B, U+30FB, U+FF1A, U+FF1B, U+FF65)</li>
800-
<li>breaks before the dividing punctuation marks (U+0021, U+003F, U+203C, U+2047, U+2048, U+2049, U+FF01, U+FF1F)</li>
801-
<li>breaks before the inseparatable characters (U+2014, U+2025, U+2026, U+3033, U+3034, U+3035)</li>
802-
<li>breaks before the iteration marks (U+3005, U+303B, U+309D, U+309E, U+30FD, U+30FE)</li>
803-
<li>breaks before the postfixes (U+0025, U+00A2, U+00B0, U+2030, U+2032, U+2033, U+2103, U+FF05, U+FFE0)</li>
804-
<li>breaks after the prefixes (U+0024, U+00A3, U+00A5, U+20AC, U+2116, U+FF04, U+FFE1, U+FFE5)</li>
786+
<li>breaks before iteration marks (U+3005, U+303B, U+309D, U+309E, U+30FD, U+30FE)</li>
787+
<li>breaks before inseparatable characters (U+2014, U+2025, U+2026, U+3033, U+3034, U+3035)</li>
788+
</ul>
789+
If the language is known to be Chinese or Japanese, then additionally
790+
the following breaks may be allowed in ''newspaper'':
791+
<ul>
792+
<li>breaks before middle dots (U+003A, U+003B, U+30FB, U+FF1A, U+FF1B, U+FF65)</li>
793+
<li>breaks before dividing punctuation marks (U+0021, U+003F, U+203C, U+2047, U+2048, U+2049, U+FF01, U+FF1F)</li>
794+
<li>breaks before postfixes (U+0025, U+00A2, U+00B0, U+2030, U+2032, U+2033, U+2103, U+FF05, U+FFE0)</li>
795+
<li>breaks after prefixes (U+0024, U+00A3, U+00A5, U+20AC, U+2116, U+FF04, U+FFE1, U+FFE5)</li>
805796
</ul>
806797
</ul>
807798

@@ -1751,8 +1742,9 @@ <h2 id="spacing">
17511742
<a class="noxref" href="http://www.w3.org/TR/CSS21/syndata.html#value-def-percentage"><span
17521743
class="value-inst-percentage">&lt;percentage&gt;</span></a></code></dfn></dt>
17531744
<dd>Specifies extra spacing <em>in addition to</em> the normal spacing.
1754-
Percentages are with respect to the width of a space (U+0020). Values
1755-
may be negative, but there may be implementation-dependent limits.
1745+
Percentages are with respect to the width of the affected character.
1746+
Values may be negative, but there may be implementation-dependent
1747+
limits.
17561748
</dd>
17571749
</dl>
17581750

0 commit comments

Comments
 (0)