E84D [CSS21] Reverted some changes to remain exactly equal to the REC, typ… · xfq/csswg-drafts@93f2718 · GitHub
Skip to content

Commit 93f2718

Browse files
bert-githubbert-github
committed
[CSS21] Reverted some changes to remain exactly equal to the REC, typos included, apart from the red warning boxes.
1 parent a2f6f0e commit 93f2718

9 files changed

Lines changed: 45 additions & 44 deletions
10BC0

File tree

‎css21/Makefile‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ THE_WARNING = <div> \
4444
<p>The CSS Working Group is also developing \
4545
<a href=\"http://www.w3.org/TR/CSS22/\" >CSS level\&nbsp;2 \
4646
revision\&nbsp;2 (CSS\&nbsp;2.2).</a> \
47-
</DIV> \
48-
</DIV>
47+
</div> \
48+
</div>
4949

5050
# WEBROOT = /afs/w3.org/WWW
5151
WEBROOT = $(HOME)/WWW
@@ -336,7 +336,9 @@ all: build/blocks.ok $(SPECOBJS) images/pngs.ok \
336336
# $(IMAGES) issues.html errata-issues.html DOC/TODO.html
337337

338338
build/warning:
339-
echo "_THE_WARNING_" >$@
339+
echo "<!-- warning -->" >$@
340+
echo "_THE_WARNING_" >>$@
341+
echo "<!-- /warning -->" >>$@
340342

341343
#images/links.ok : $(IMAGES)
342344
# -@(cd images; for i in *.gif; do $(LN) -s $$i "`basename $$i .gif`" 2>//dev/null; done)
@@ -404,11 +406,12 @@ errata.html : errata.src
404406
extras: css2.tgz
405407

406408
# The sources are in ISO-8859-1, make them ASCII to avoid encoding problems
407-
%.pdf: %.html style/default.css; asc2xml < $< | xml2asc | prince -o $@ -
409+
%.pdf: %.html style/default.css style/prince.css
410+
asc2xml < $< | xml2asc | prince -s style/prince.css -o $@ -
408411
%.ps: %.pdf; $(PDF2PS) $< $@
409412

410-
css2.pdf: $(SPECOBJS:.html=.pdf)
411-
pdftk $+ cat output $@
413+
css2.pdf: css2.html style/default.css style/prince.css
414+
prince -s style/prince.css -o $@ $<
412415

413416
# css2.ps: build/blocks.ok $(SPECOBJS) images/pngs.ok $(IMAGES)
414417
# # Because of memory limitations in html2ps, use the
@@ -432,8 +435,7 @@ css2.ps.gz: css2.ps
432435
# $(HTML2PDF) $< $@
433436

434437
css2.html html: $(SPECOBJS)
435-
$(HTMLCAT) - $(SPECOBJS) | \
436-
$(HTMLTRIM) div navbar - $@
438+
$(HTMLCAT) - $(SPECOBJS) >$@
437439

438440
# the following requires to be on unix and have Netscape running...
439441
#css2.txt txt: css2.html
@@ -466,7 +468,7 @@ $(PROPBLKSDIR)/blocks.ok: $(PROPSRC)
466468
touch $@
467469

468470

469-
cover.srd: cover.src build/contents.srb build/minicontents.srb
471+
cover.srd: cover.src build/contents.srb build/minicontents.srb Makefile
470472
@echo "=========== making" $@
471473
$(HIPP) $(INCLUDES) $< |\
472474
$(ADDCITE) -r $(REFS) $(REFSRCS) >$@
@@ -666,8 +668,8 @@ depend:
666668
# Rules to make diff files relative to previous REC and WD.
667669
# htmldiff returns >0 if there are differences, so we ignore the exit code.
668670

669-
PREVREC = ../../../TR/1998/REC-CSS2-19980512
670-
PREVWD = ../../../TR/$(PREV_YEAR)/$(PREV_STATUS)-$(PREV_NAME)-$(PREV_DATE)
671+
PREVREC = ../../../WWW/TR/2011/REC-CSS2-20110607< EBA6 /span>
672+
PREVWD = ../../../WWW/TR/$(PREV_YEAR)/$(PREV_STATUS)-$(PREV_NAME)-$(PREV_DATE)
671673
HTMLDIFF = htmldiff -i -w '<del>' -x '</del>' -y '<ins>' -z '</ins>'
672674

673675
diffs: $(SPECOBJS)

‎css21/about.src‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ given order.
193193
exactly one of them must occur.
194194
<li>A double bar (||) separates
195195
two or more options: one or more of them must occur, in any order.
196-
<li>A double ampersand (&amp;&amp;) separates two or more components, all of which
196+
<li>A double ampersand (&&) separates two or more components, all of which
197197
must occur, in any order.
198198
<li>Brackets ([&nbsp;]) are for grouping.
199199
</ul>
@@ -202,8 +202,8 @@ must occur, in any order.
202202
ampersand is stronger than the double bar, and the double bar
203203
is stronger than the bar. Thus, the following lines are equivalent:
204204
<PRE>
205-
a b | c || d &amp;&amp; e f
206-
[ a b ] | [ c || [ d &amp;&amp; [ e f ]]]
205+
a b | c || d && e f
206+
[ a b ] | [ c || [ d && [ e f ]]]
207207
</PRE>
208208

209209
<P> Every type, keyword, or bracketed group may be followed by one of
@@ -237,7 +237,7 @@ the following modifiers:</p>
237237
<EM>Value:</EM> [&lt;family-name&gt; , ]* &lt;family-name&gt;<BR>
238238
<EM>Value:</EM> &lt;uri&gt;? &lt;color&gt; [ / &lt;color&gt; ]?<BR>
239239
<EM>Value:</EM> &lt;uri&gt; || &lt;color&gt;<BR>
240-
<EM>Value:</EM> inset? &amp;&amp; [ &lt;length&gt;{2,4} &amp;&amp; &lt;color&gt;? ]
240+
<EM>Value:</EM> inset? && [ &lt;length&gt;{2,4} && &lt;color&gt;? ]
241241
</BLOCKQUOTE>
242242

243243
<p>Component values are specified in terms of tokens, as described in <a

‎css21/changes.src‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5886,7 +5886,7 @@ not try to define what fonts are serif or sans-serif:
58865886

58875887
<p>Glyphs of serif fonts, as the term is used in CSS, <ins>tend
58885888
to</ins> have finishing strokes, flared or tapering ends, or have
5889-
actual serifed endings (including slab serifs). [&hellip;]
5889+
actual serifed endings (including slab serifs). [&hellip]
58905890

58915891
<p><strong>15.3.1.2 sans-serif</strong>
58925892

@@ -6617,7 +6617,7 @@ absolutely positioned element is, if its nearest positioned ancestor
66176617
is inline and split over multiple lines:
66186618

66196619
<blockquote>
6620-
<p>4. If the element has 'position: absolute' [&hellip;] following way;
6620+
<p>4. If the element has 'position: absolute' [&hellip] following way;
66216621
<ol>
66226622
<li>In the case that the ancestor is an <del>inline box</del>
66236623
<ins>inline-level element</ins>, the containing block <del>depends on
@@ -7204,7 +7204,7 @@ match&rdquo; in the tokenizer:
72047204
<blockquote>
72057205
<div class="example">
72067206
<p><ins>For example, the rule of the longest match means that
7207-
"<code>red--&gt;</code>" is tokenized as the IDENT "<code>red--</code>"
7207+
"<code>red--&gt</code>" is tokenized as the IDENT "<code>red--</code>"
72087208
followed by the DELIM "<code>&gt;</code>", rather than as an IDENT
72097209
followed by a CDC.</ins>
72107210
</div>

‎css21/cover.src‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
src="http://www.w3.org/Icons/w3c_home" width="72"></a>
1212

1313
<h1 id="title">Cascading Style Sheets Level 2 Revision 1 (CSS&nbsp;2.1) Specification</h1>
14-
<h2 id="W3C-doctype">W3C _THE_STATUSNAME_ _THE_DATE_, edited in place 29 March 2016 to point to new work</h2>
14+
<h2 id="W3C-doctype">W3C _THE_STATUSNAME_ _THE_DATE_, edited in place 12 April 2016 to point to new work</h2>
1515

1616
<dl>
1717
<dt>This version:
@@ -26,8 +26,8 @@
2626
<dd><a href="http://www.w3.org/TR/2008/REC-CSS2-20080411/">
2727
http://www.w3.org/TR/2008/REC-CSS2-20080411/</a>
2828
<dt>Latest editor's draft:
29-
<dd><a href="http://dev.w3.org/csswg/css21/">
30-
http://dev.w3.org/csswg/css21/</a>
29+
<dd><a href="http://dev.w3.org/csswg/css2/">
30+
http://dev.w3.org/csswg/css2/</a>
3131
<dt>Editors:
3232
<dd class="vcard"><a class="url fn" lang=nl href="http://www.w3.org/People/Bos/">
3333
Bert Bos</a>
@@ -48,11 +48,11 @@
4848
errata</strong></a> for this document.
4949

5050
<p>This document is also available in these non-normative formats:
51-
<a href="_THIS_VERSION_/css2.txt">plain text</a>,
52-
<a href="_THIS_VERSION_/css2.tgz">gzip'ed tar file</a>,
53-
<a href="_THIS_VERSION_/css2.zip">zip file</a>,
54-
<a href="_THIS_VERSION_/css2.ps.gz">gzip'ed PostScript</a>,
55-
<a href="_THIS_VERSION_/css2.pdf">PDF</a>.
51+
<a href="css2.txt">plain text</a>,
52+
<a href="css2.tgz">gzip'ed tar file</a>,
53+
<a href="css2.zip">zip file</a>,
54+
<a href="css2.ps.gz">gzip'ed PostScript</a>,
55+
<a href="css2.pdf">PDF</a>.
5656
See also <a
5757
href="http://www.w3.org/2005/11/Translations/Query?titleMatch=CSS;lang=any;search1=Submit"><strong>
5858
translations</strong></a>.
@@ -63,10 +63,9 @@
6363
title="World Wide Web Consortium">W3C</acronym></a><sup>&reg;</sup>
6464
(<a href="http://www.csail.mit.edu/"><acronym title="Massachusetts
6565
Institute of Technology">MIT</acronym></a>, <a
66-
href="http://www.ercim.eu/"><acronym title="European Research
66+
href="http://www.ercim.org/"><acronym title="European Research
6767
Consortium for Informatics and Mathematics">ERCIM</acronym></a>, <a
68-
href="http://www.keio.ac.jp/">Keio</a>, <a
69-
href="http://ev.buaa.edu.cn/">Beihang</a>). W3C <a
68+
href="http://www.keio.ac.jp/">Keio</a>), All Rights Reserved. W3C <a
7069
href="http://www.w3.org/Consortium/Legal/ipr-notice#Legal_Disclaimer">
7170
liability</a>, <a
7271
href="http://www.w3.org/Consortium/Legal/ipr-notice#W3C_Trademarks">
@@ -171,7 +170,7 @@ in <a href="changes.html">appendix&nbsp;C.</a>
171170
_THE_WARNING_
172171

173172
<!--NewPage--><!-- this is for html2ps -->
174-
<div class="toc">
173+
<div class="quick toc">
175174
<h2><a name="minitoc">Quick Table of Contents</a></h2>
176175
<!-- #include src="minicontents.srb" -->
177176
</div>

‎css21/grammar.src‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ badstring1 \"([^\n\r\f\\"]|\\{nl}|{escape})*\\?
160160
badstring2 \'([^\n\r\f\\']|\\{nl}|{escape})*\\?
161161
badcomment1 \/\*[^*]*\*+([^/*][^*]*\*+)*
162162
badcomment2 \/\*[^*]*(\*+[^/*][^*]*)*
163-
baduri1 url\({w}([!#$%&amp;*-\[\]-~]|{nonascii}|{escape})*{w}
163+
baduri1 url\({w}([!#$%&*-\[\]-~]|{nonascii}|{escape})*{w}
164164
baduri2 url\({w}{string}{w}
165165
baduri3 url\({w}{badstring}
166166
comment \/\*[^*]*\*+([^/*][^*]*\*+)*\/

‎css21/refs.src‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ Available at <a href="http://www.w3.org/TR/2003/REC-SVG11-20030114/">
223223
http://www.w3.org/TR/2003/REC-SVG11-20030114</a>
224224

225225
<dt><strong><a name="ref-WCAG20"
226-
class="informref">[WCAG20]</a></strong>
226+
class="informref">[WVAG20]</a></strong>
227227
<dd>"Web Content Accessibility Guidelines (WCAG) 2.0", Ben Caldwell,
228228
Michael Cooper, Loretta Guarino Reid, Gregg Vanderheiden, 11 December 2008.<BR>
229229
Available at: <a href="http://www.w3.org/TR/2008/REC-WCAG20-20081211/">

‎css21/selector.src‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1119,7 +1119,7 @@ element may occur inside a
11191119
block-level descendant in the same flow (i.e., a block-level
11201120
descendant that is not positioned and not a float). E.g., the first
11211121
line of the DIV in <code>&lt;DIV>&lt;P>This
1122-
line...&lt;/P>&lt;/DIV></code> is the first line of the P (assuming
1122+
line...&lt;/P>&lt/DIV></code> is the first line of the P (assuming
11231123
that both P and DIV are block-level).
11241124

11251125
<p>The first line of a table-cell or inline-block cannot be the first
@@ -1129,7 +1129,7 @@ etcetera&lt;/DIV&gt;</code> the first formatted line of the DIV is not
11291129
the line "Hello".
11301130

11311131
<p class="note">Note that the first line of the P in this fragment:
1132-
<code>&lt;p&gt;&lt;br&gt;First...</code> does not contain any letters
1132+
<code>&lt;p&gt&lt;br&gt;First...</code> does not contain any letters
11331133
(assuming the default style for BR in HTML 4). The word "First" is
11341134
not on the first formatted line.
11351135

@@ -1321,7 +1321,7 @@ letter "H". In fact, the DIV does not have a first letter.
13211321

13221322
<p>The first letter must occur on the <a
13231323
href="#first-formatted- 5488 line">first formatted line.</a> For example, in
1324-
this fragment: <code>&lt;p&gt;&lt;br&gt;First...</code> the first line
1324+
this fragment: <code>&lt;p&gt&lt;br&gt;First...</code> the first line
13251325
does not contain any letters and ':first-letter' does not match anything
13261326
(assuming the default style for BR in HTML 4). In particular, it
13271327
does not match the "F" of "First."

‎css21/syndata.src‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ the above rules, and neither a single nor a double quote</var>
112112
<tr><td>badcomment1 </td><td><code>\/\*[^*]*\*+([^/*][^*]*\*+)*</code></td></tr>
113113
<tr><td>badcomment2 </td><td><code>\/\*[^*]*(\*+[^/*][^*]*)*</code></td></tr>
114114
<tr><td>baduri </td><td><code><var>{baduri1}</var>|<var>{baduri2}</var>|<var>{baduri3}</var></code></td></tr>
115-
<tr><td>baduri1 </td><td><code>url\(<var>{w}</var>([!#$%&amp;*-~]|<var>{nonascii}</var>|<var>{escape}</var>)*<var>{w}</var></code></td></tr>
115+
<tr><td>baduri1 </td><td><code>url\(<var>{w}</var>([!#$%&*-~]|<var>{nonascii}</var>|<var>{escape}</var>)*<var>{w}</var></code></td></tr>
116116
<tr><td>baduri2 </td><td><code>url\(<var>{w}</var><var>{string}</var><var>{w}</var></code></td></tr>
117117
<tr><td>baduri3 </td><td><code>url\(<var>{w}</var><var>{badstring}</var></code></td></tr>
118118
<tr><td>nl </td><td><code>\n|\r\n|\r|\f</code></td></tr>
@@ -121,7 +121,7 @@ the above rules, and neither a single nor a double quote</var>
121121

122122
<div class="example">
123123
<p>For example, the rule of the longest match means that
124-
"<code>red--&gt;</code>" is tokenized as the IDENT "<code>red--</code>"
124+
"<code>red--&gt</code>" is tokenized as the IDENT "<code>red--</code>"
125125
followed by the DELIM "<code>&gt;</code>", rather than as an IDENT
126126
followed by a CDC.
127127
</div>

‎css21/visudet.src‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -681,7 +681,7 @@ algorithm is as follows:
681681

682682
<p>Select from the table the resolved height and width values for the
683683
appropriate constraint violation. Take the <var>max-width</var> and
684-
<var>max-height</var> as max(min, max) so that <var>min</var> &#8804;
684+
<var>max-height</var> as max(min, max) so that <var>min</var> &#8804
685685
<var>max</var> holds true.
686686
In this table <var>w</var> and <var>h</var> stand for the results of
687687
the width and height computations ignoring the <span
@@ -712,14 +712,14 @@ results in this situation.
712712
<td><var>max-width</var></td>
713713

714714
<td><var>max(max-width&nbsp;*&nbsp;h/w, min-height)</var></td></tr>
715-
<tr><td><var>w&nbsp;&lt;&nbsp;min-width</var></td>
715+
<tr><td><var>w&nbsp;<&nbsp;min-width</var></td>
716716
<td><var>min-width</var></td>
717717
<td><var>min(min-width&nbsp;*&nbsp;h/w, max-height)</var></td></tr>
718718

719719
<tr><td><var>h&nbsp;>&nbsp;max-height</var></td>
720720
<td><var>max(max-height&nbsp;*&nbsp;w/h, min-width)</var></td>
721721
<td><var>max-height</var></td></tr>
722-
<tr><td><var>h&nbsp;&lt;&nbsp;min-height</var></td>
722+
<tr><td><var>h&nbsp;<&nbsp;min-height</var></td>
723723

724724
<td><var>min(min-height&nbsp;*&nbsp;w/h, max-width)</var></td>
725725
<td><var>min-height</var></td></tr>
@@ -731,19 +731,19 @@ results in this situation.
731731

732732
<td><var>max(min-width, max-height&nbsp;*&nbsp;w/h)</var></td>
733733
<td><var>max-height</var></td></tr>
734-
<tr><td>(<var>w&nbsp;&lt;&nbsp;min-width</var>) and (<var>h&nbsp;&lt;&nbsp;min-height</var>), where (<var>min-width/w&nbsp;&#8804;&nbsp;min-height/h</var>)</td>
734+
<tr><td>(<var>w&nbsp;<&nbsp;min-width</var>) and (<var>h&nbsp;<&nbsp;min-height</var>), where (<var>min-width/w&nbsp;&#8804;&nbsp;min-height/h</var>)</td>
735735

736736
<td><var>min(max-width, min-height&nbsp;*&nbsp;w/h)</var></td>
737737
<td><var>min-height</var></td></tr>
738-
<tr><td>(<var>w&nbsp;&lt;&nbsp;min-width</var>) and (<var>h&nbsp;&lt;&nbsp;min-height</var>), where (<var>min-width/w&nbsp;>&nbsp;min-height/h</var>)</td>
738+
<tr><td>(<var>w&nbsp;<&nbsp;min-width</var>) and (<var>h&nbsp;<&nbsp;min-height</var>), where (<var>min-width/w&nbsp;>&nbsp;min-height/h</var>)</td>
739739

740740
<td><var>min-width</var></td>
741741
<td><var>min(max-height, min-width&nbsp;*&nbsp;h/w)</var></td></tr>
742-
<tr><td>(<var>w&nbsp;&lt;&nbsp;min-width</var>) and (<var>h&nbsp;>&nbsp;max-height</var>)</td>
742+
<tr><td>(<var>w&nbsp;<&nbsp;min-width</var>) and (<var>h&nbsp;>&nbsp;max-height</var>)</td>
743743

744744
<td><var>min-width</var></td>
745745
<td><var>max-height</var></td></tr>
746-
<tr><td>(<var>w&nbsp;>&nbsp;max-width</var>) and (<var>h&nbsp;&lt;&nbsp;min-height</var>)</td>
746+
<tr><td>(<var>w&nbsp;>&nbsp;max-width</var>) and (<var>h&nbsp;<&nbsp;min-height</var>)</td>
747747

748748
<td><var>max-width</var></td>
749749
<td><var>min-height</var></td></tr>

0 commit comments

Comments
 (0)