[CSS21] Reverted some changes to remain exactly equal to the REC, typ…

…os included, apart from the red warning boxes.

css21/Makefile

@@ -44,8 +44,8 @@ THE_WARNING = <div>							\
    <p>The CSS Working Group is also developing 				\
    <a href=\"http://www.w3.org/TR/CSS22/\" >CSS level\&nbsp;2		\
    revision\&nbsp;2 (CSS\&nbsp;2.2).</a>				\
-  </DIV>								\
- </DIV>
+  </div>								\
+ </div>
 
 # WEBROOT = /afs/w3.org/WWW
 WEBROOT = $(HOME)/WWW
@@ -336,7 +336,9 @@ all: build/blocks.ok $(SPECOBJS) images/pngs.ok \
 #	$(IMAGES) issues.html errata-issues.html DOC/TODO.html
 
 build/warning:
-	echo "_THE_WARNING_" >$@
+	echo "<!-- warning -->" >$@
+	echo "_THE_WARNING_" >>$@
+	echo "<!-- /warning -->" >>$@
 
 #images/links.ok : $(IMAGES)
 #	-@(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
 extras: css2.tgz
 
 # The sources are in ISO-8859-1, make them ASCII to avoid encoding problems
-%.pdf: %.html style/default.css; asc2xml < $< | xml2asc | prince -o $@ -
+%.pdf: %.html style/default.css style/prince.css
+	asc2xml < $< | xml2asc | prince -s style/prince.css -o $@ -
 %.ps: %.pdf; $(PDF2PS) $< $@
 
-css2.pdf: $(SPECOBJS:.html=.pdf)
-	pdftk $+ cat output $@
+css2.pdf: css2.html style/default.css style/prince.css
+	prince -s style/prince.css -o $@ $<
 
 # css2.ps: build/blocks.ok $(SPECOBJS) images/pngs.ok $(IMAGES)
 # # Because of memory limitations in html2ps, use the
@@ -432,8 +435,7 @@ css2.ps.gz: css2.ps
 #	$(HTML2PDF) $< $@
 
 css2.html html: $(SPECOBJS)
-	$(HTMLCAT) - $(SPECOBJS) | \
-	$(HTMLTRIM) div navbar - $@
+	$(HTMLCAT) - $(SPECOBJS) >$@
 
 # the following requires to be on unix and have Netscape running...
 #css2.txt txt: css2.html
@@ -466,7 +468,7 @@ $(PROPBLKSDIR)/blocks.ok: $(PROPSRC)
 	touch $@
 
 
-cover.srd: cover.src build/contents.srb build/minicontents.srb
+cover.srd: cover.src build/contents.srb build/minicontents.srb Makefile
 	@echo "=========== making" $@
 	$(HIPP) $(INCLUDES) $<  |\
 	$(ADDCITE) -r $(REFS) $(REFSRCS) >$@
@@ -666,8 +668,8 @@ depend:
 # Rules to make diff files relative to previous REC and WD.
 # htmldiff returns >0 if there are differences, so we ignore the exit code.
 
-PREVREC = ../../../TR/1998/REC-CSS2-19980512
-PREVWD = ../../../TR/$(PREV_YEAR)/$(PREV_STATUS)-$(PREV_NAME)-$(PREV_DATE)
+PREVREC = ../../../WWW/TR/2011/REC-CSS2-20110607
+PREVWD = ../../../WWW/TR/$(PREV_YEAR)/$(PREV_STATUS)-$(PREV_NAME)-$(PREV_DATE)
 HTMLDIFF = htmldiff -i -w '<del>' -x '</del>' -y '<ins>' -z '</ins>'
 
 diffs: $(SPECOBJS)

css21/about.src

@@ -193,7 +193,7 @@ given order.
 exactly one of them must occur.
 <li>A double bar (||) separates
 two or more options: one or more of them must occur, in any order.
-<li>A double ampersand (&amp;&amp;) separates two or more components, all of which
+<li>A double ampersand (&&) separates two or more components, all of which
 must occur, in any order.
 <li>Brackets ([&nbsp;]) are for grouping. 
 </ul>
@@ -202,8 +202,8 @@ must occur, in any order.
 ampersand is stronger than the double bar, and the double bar
 is stronger than the bar. Thus, the following lines are equivalent:
 <PRE>
-    a b   |   c ||   d &amp;&amp;   e f
-  [ a b ] | [ c || [ d &amp;&amp; [ e f ]]]
+    a b   |   c ||   d &&   e f
+  [ a b ] | [ c || [ d && [ e f ]]]
 </PRE>
 
 <P> Every type, keyword, or bracketed group may be followed by one of
@@ -237,7 +237,7 @@ the following modifiers:</p>
     <EM>Value:</EM> [&lt;family-name&gt; , ]* &lt;family-name&gt;<BR>
     <EM>Value:</EM> &lt;uri&gt;? &lt;color&gt; [ / &lt;color&gt; ]?<BR>
     <EM>Value:</EM> &lt;uri&gt; || &lt;color&gt;<BR>
-    <EM>Value:</EM> inset? &amp;&amp; [ &lt;length&gt;{2,4} &amp;&amp; &lt;color&gt;? ]
+    <EM>Value:</EM> inset? && [ &lt;length&gt;{2,4} && &lt;color&gt;? ]
 </BLOCKQUOTE>
 
 <p>Component values are specified in terms of tokens, as described in <a

css21/changes.src

@@ -5886,7 +5886,7 @@ not try to define what fonts are serif or sans-serif:
 
 <p>Glyphs of serif fonts, as the term is used in CSS, <ins>tend
 to</ins> have finishing strokes, flared or tapering ends, or have
-actual serifed endings (including slab serifs). [&hellip;]
+actual serifed endings (including slab serifs). [&hellip]
 
 <p><strong>15.3.1.2 sans-serif</strong>
 
@@ -6617,7 +6617,7 @@ absolutely positioned element is, if its nearest positioned ancestor
 is inline and split over multiple lines:
 
 <blockquote>
-<p>4. If the element has 'position: absolute' [&hellip;] following way;
+<p>4. If the element has 'position: absolute' [&hellip] following way;
 <ol>
 <li>In the case that the ancestor is an <del>inline box</del>
 <ins>inline-level element</ins>, the containing block <del>depends on
@@ -7204,7 +7204,7 @@ match&rdquo; in the tokenizer:
 <blockquote>
 <div class="example">
 <p><ins>For example, the rule of the longest match means that
-"<code>red--&gt;</code>" is tokenized as the IDENT "<code>red--</code>"
+"<code>red--&gt</code>" is tokenized as the IDENT "<code>red--</code>"
 followed by the DELIM "<code>&gt;</code>", rather than as an IDENT
 followed by a CDC.</ins>
 </div>

css21/cover.src

@@ -11,7 +11,7 @@
     src="http://www.w3.org/Icons/w3c_home" width="72"></a>
 
   <h1 id="title">Cascading Style Sheets Level 2 Revision 1 (CSS&nbsp;2.1) Specification</h1>
-  <h2 id="W3C-doctype">W3C _THE_STATUSNAME_ _THE_DATE_, edited in place 29 March 2016 to point to new work</h2>
+  <h2 id="W3C-doctype">W3C _THE_STATUSNAME_ _THE_DATE_, edited in place 12 April 2016 to point to new work</h2>
 
   <dl>
   <dt>This version:
@@ -26,8 +26,8 @@
   <dd><a href="http://www.w3.org/TR/2008/REC-CSS2-20080411/">
                http://www.w3.org/TR/2008/REC-CSS2-20080411/</a>
   <dt>Latest editor's draft:
-  <dd><a href="http://dev.w3.org/csswg/css21/">
-               http://dev.w3.org/csswg/css21/</a>
+  <dd><a href="http://dev.w3.org/csswg/css2/">
+               http://dev.w3.org/csswg/css2/</a>
   <dt>Editors:
   <dd class="vcard"><a class="url fn" lang=nl href="http://www.w3.org/People/Bos/">
                Bert Bos</a>
@@ -48,11 +48,11 @@
   errata</strong></a> for this document.
 
   <p>This document is also available in these non-normative formats:
-  <a href="_THIS_VERSION_/css2.txt">plain text</a>,
-  <a href="_THIS_VERSION_/css2.tgz">gzip'ed tar file</a>,
-  <a href="_THIS_VERSION_/css2.zip">zip file</a>,
-  <a href="_THIS_VERSION_/css2.ps.gz">gzip'ed PostScript</a>,
-  <a href="_THIS_VERSION_/css2.pdf">PDF</a>.
+  <a href="css2.txt">plain text</a>,
+  <a href="css2.tgz">gzip'ed tar file</a>,
+  <a href="css2.zip">zip file</a>,
+  <a href="css2.ps.gz">gzip'ed PostScript</a>,
+  <a href="css2.pdf">PDF</a>.
   See also <a
   href="http://www.w3.org/2005/11/Translations/Query?titleMatch=CSS;lang=any;search1=Submit"><strong>
   translations</strong></a>.
@@ -63,10 +63,9 @@
   title="World Wide Web Consortium">W3C</acronym></a><sup>&reg;</sup>
   (<a href="http://www.csail.mit.edu/"><acronym title="Massachusetts
   Institute of Technology">MIT</acronym></a>, <a
-  href="http://www.ercim.eu/"><acronym title="European Research
+  href="http://www.ercim.org/"><acronym title="European Research
   Consortium for Informatics and Mathematics">ERCIM</acronym></a>, <a
-  href="http://www.keio.ac.jp/">Keio</a>, <a
-  href="http://ev.buaa.edu.cn/">Beihang</a>). W3C <a
+  href="http://www.keio.ac.jp/">Keio</a>), All Rights Reserved. W3C <a
   href="http://www.w3.org/Consortium/Legal/ipr-notice#Legal_Disclaimer">
   liability</a>, <a
   href="http://www.w3.org/Consortium/Legal/ipr-notice#W3C_Trademarks">
@@ -171,7 +170,7 @@ in <a href="changes.html">appendix&nbsp;C.</a>
 _THE_WARNING_
 
 <!--NewPage--><!-- this is for html2ps -->
-<div class="toc">
+<div class="quick toc">
 <h2><a name="minitoc">Quick Table of Contents</a></h2>
 <!-- #include src="minicontents.srb" -->
 </div>

css21/grammar.src

@@ -160,7 +160,7 @@ badstring1      \"([^\n\r\f\\"]|\\{nl}|{escape})*\\?
 badstring2      \'([^\n\r\f\\']|\\{nl}|{escape})*\\?
 badcomment1     \/\*[^*]*\*+([^/*][^*]*\*+)*
 badcomment2     \/\*[^*]*(\*+[^/*][^*]*)*
-baduri1         url\({w}([!#$%&*-\[\]-~]|{nonascii}|{escape})*{w}
+baduri1         url\({w}([!#$%&*-\[\]-~]|{nonascii}|{escape})*{w}
 baduri2         url\({w}{string}{w}
 baduri3         url\({w}{badstring}
 comment		\/\*[^*]*\*+([^/*][^*]*\*+)*\/

css21/refs.src

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

css21/selector.src

@@ -1119,7 +1119,7 @@ element may occur inside a
 block-level descendant in the same flow (i.e., a block-level
 descendant that is not positioned and not a float). E.g., the first
 line of the DIV in <code>&lt;DIV>&lt;P>This
-line...&lt;/P>&lt;/DIV></code> is the first line of the P (assuming
+line...&lt;/P>&lt/DIV></code> is the first line of the P (assuming
 that both P and DIV are block-level).
 
 <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
 the line "Hello".
 
 <p class="note">Note that the first line of the P in this fragment:
-<code>&lt;p&gt;&lt;br&gt;First...</code> does not contain any letters
+<code>&lt;p&gt&lt;br&gt;First...</code> does not contain any letters
 (assuming the default style for BR in HTML 4). The word "First" is
 not on the first formatted line.
 
@@ -1321,7 +1321,7 @@ letter "H". In fact, the DIV does not have a first letter.
 
 <p>The first letter must occur on the <a
 href="#first-formatted-line">first formatted line.</a> For example, in
-this fragment: <code>&lt;p&gt;&lt;br&gt;First...</code> the first line
+this fragment: <code>&lt;p&gt&lt;br&gt;First...</code> the first line
 does not contain any letters and ':first-letter' does not match anything
 (assuming the default style for BR in HTML 4). In particular, it
 does not match the "F" of "First."

css21/syndata.src

@@ -112,7 +112,7 @@ the above rules, and neither a single nor a double quote</var>
 <tr><td>badcomment1 </td><td><code>\/\*[^*]*\*+([^/*][^*]*\*+)*</code></td></tr>
 <tr><td>badcomment2 </td><td><code>\/\*[^*]*(\*+[^/*][^*]*)*</code></td></tr>
 <tr><td>baduri      </td><td><code><var>{baduri1}</var>|<var>{baduri2}</var>|<var>{baduri3}</var></code></td></tr>
-<tr><td>baduri1     </td><td><code>url\(<var>{w}</var>([!#$%&amp;*-~]|<var>{nonascii}</var>|<var>{escape}</var>)*<var>{w}</var></code></td></tr>
+<tr><td>baduri1     </td><td><code>url\(<var>{w}</var>([!#$%&*-~]|<var>{nonascii}</var>|<var>{escape}</var>)*<var>{w}</var></code></td></tr>
 <tr><td>baduri2     </td><td><code>url\(<var>{w}</var><var>{string}</var><var>{w}</var></code></td></tr>
 <tr><td>baduri3     </td><td><code>url\(<var>{w}</var><var>{badstring}</var></code></td></tr>
 <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>
 
 <div class="example">
 <p>For example, the rule of the longest match means that
-"<code>red--&gt;</code>" is tokenized as the IDENT "<code>red--</code>"
+"<code>red--&gt</code>" is tokenized as the IDENT "<code>red--</code>"
 followed by the DELIM "<code>&gt;</code>", rather than as an IDENT
 followed by a CDC.
 </div>

css21/visudet.src

@@ -681,7 +681,7 @@ algorithm is as follows:
 
 <p>Select from the table the resolved height and width values for the
 appropriate constraint violation. Take the <var>max-width</var> and
-<var>max-height</var> as max(min, max) so that <var>min</var> &#8804;
+<var>max-height</var> as max(min, max) so that <var>min</var> &#8804
 <var>max</var> holds true.
 In this table <var>w</var> and <var>h</var> stand for the results of
 the width and height computations ignoring the <span
@@ -712,14 +712,14 @@ results in this situation.
       <td><var>max-width</var></td>
 
       <td><var>max(max-width&nbsp;*&nbsp;h/w, min-height)</var></td></tr>
-  <tr><td><var>w&nbsp;&lt;&nbsp;min-width</var></td>
+  <tr><td><var>w&nbsp;<&nbsp;min-width</var></td>
       <td><var>min-width</var></td>
       <td><var>min(min-width&nbsp;*&nbsp;h/w, max-height)</var></td></tr>
 
   <tr><td><var>h&nbsp;>&nbsp;max-height</var></td>
       <td><var>max(max-height&nbsp;*&nbsp;w/h, min-width)</var></td>
       <td><var>max-height</var></td></tr>
-  <tr><td><var>h&nbsp;&lt;&nbsp;min-height</var></td>
+  <tr><td><var>h&nbsp;<&nbsp;min-height</var></td>
 
       <td><var>min(min-height&nbsp;*&nbsp;w/h, max-width)</var></td>
       <td><var>min-height</var></td></tr>
@@ -731,19 +731,19 @@ results in this situation.
 
       <td><var>max(min-width, max-height&nbsp;*&nbsp;w/h)</var></td>
       <td><var>max-height</var></td></tr>
-  <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>
+  <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>
 
       <td><var>min(max-width, min-height&nbsp;*&nbsp;w/h)</var></td>
       <td><var>min-height</var></td></tr>
-  <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>
+  <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>
 
       <td><var>min-width</var></td>
       <td><var>min(max-height, min-width&nbsp;*&nbsp;h/w)</var></td></tr>
-  <tr><td>(<var>w&nbsp;&lt;&nbsp;min-width</var>) and (<var>h&nbsp;>&nbsp;max-height</var>)</td>
+  <tr><td>(<var>w&nbsp;<&nbsp;min-width</var>) and (<var>h&nbsp;>&nbsp;max-height</var>)</td>
 
       <td><var>min-width</var></td>
       <td><var>max-height</var></td></tr>
-  <tr><td>(<var>w&nbsp;>&nbsp;max-width</var>) and (<var>h&nbsp;&lt;&nbsp;min-height</var>)</td>
+  <tr><td>(<var>w&nbsp;>&nbsp;max-width</var>) and (<var>h&nbsp;<&nbsp;min-height</var>)</td>
 
       <td><var>max-width</var></td>
       <td><var>min-height</var></td></tr>