[css2] Issues 62, 90, 104, 116, 120, 127, 134, 139

--HG--
extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%402388

Author: bert-github

css2/Makefile

@@ -1,6 +1,6 @@
 # Makefile to generate the CSS2 document based on its "source files"
 # Arnaud Le Hors - lehors@w3.org
-# $Id: Makefile,v 2.90 2005-09-13 19:29:12 bbos Exp $
+# $Id: Makefile,v 2.91 2006-01-24 06:52:08 bbos Exp $
 
 # what needs to be set for every new release:
 # Note use of full year (1998) in identifier.
@@ -58,14 +58,14 @@ fonts.src\
 text.src\
 tables.src\
 ui.src\
+aural.src\
 zindex.src\
-leftblank.src\
-aural.src
+leftblank.src
 
 
 APPSRCS = \
-sample.src\
 changes.src\
+sample.src\
 grammar.src
 
 REFSRCS = \
@@ -77,7 +77,12 @@ indexlist.src
 
 MAINSRCS = $(SRCS1)
 
-MAINOBJS = \
+REFS= \
+refs.html
+
+SPECSRCS= $(SRCS0) $(MAINSRCS) $(APPSRCS)
+
+SPECOBJS= \
 cover.html\
 about.html\
 intro.html\
@@ -97,32 +102,22 @@ fonts.html\
 text.html\
 tables.html\
 ui.html\
-zindex.html\
-leftblank.html\
-aural.html
-
-APPENDIXES= \
-sample.html\
+aural.html\
+refs.html\
 changes.html\
+sample.html\
+zindex.html\
+propidx.html\
+grammar.html\
 leftblank.html\
-grammar.html
-
-REFS= \
-refs.html
-
-INDEXES= \
-propidx.html \
 indexlist.html
 
-SPECSRCS= $(SRCS0) $(MAINSRCS) $(APPSRCS)
-SPECOBJS= $(MAINOBJS) $(APPENDIXES) $(REFS)
-
 #IMAGES = images/*.gif images/*.png
 IMAGES = images/*.png images/*.jpg
 LONGDESCS = images/longdesc/*.html
 STYLESHEETS= style/*.css
 
-ALLOBJS= $(SPECOBJS) $(INDEXES) $(IMAGES) $(LONGDESCS) $(STYLESHEETS)
+ALLOBJS= $(SPECOBJS) $(IMAGES) $(LONGDESCS) $(STYLESHEETS)
 
 PROPSRC= properties/properties.db
 PROPSAMPLE= properties/sample.db
@@ -290,7 +285,7 @@ LN= ln
 #	$(RM) $@
 #	fig2dev -L eps $< | $(PSTOPNM) | $(PNMTOPNG_PIPE) >$@
 
-all: build/blocks.ok $(SPECOBJS) $(INDEXES) images/pngs.ok \
+all: build/blocks.ok $(SPECOBJS) images/pngs.ok \
 	$(IMAGES)
 #	$(IMAGES) issues.html errata-issues.html DOC/TODO.html
 
@@ -348,13 +343,13 @@ errata.html : errata.src
 
 #### Special section to build PS file and single plain text file
 
-css2.ps ps: build/blocks.ok $(SPECOBJS) $(INDEXES) images/pngs.ok $(IMAGES)
+css2.ps ps: build/blocks.ok $(SPECOBJS) images/pngs.ok $(IMAGES)
 # Because of memory limitations in html2ps, use the
 # automagic feature that any *.gif files are not
 # converted to ps if there's a *.ps file in the same
 # directory.
 	-@(cd images; for i in *.idraw; do $(LN) -s $$i "`basename $$i .idraw`.ps"; done)
-	$(HTML2PS) $(SPECOBJS) $(INDEXES) > $@
+	$(HTML2PS) $(SPECOBJS) > $@
 
 css2.ps.gz: css2.ps
 	gzip <$< >$@
@@ -363,8 +358,8 @@ css2.ps.gz: css2.ps
 css2.pdf: css2.ps
 	$(DISTILL) css2.ps
 
-css2.html html: $(SPECOBJS) $(INDEXES)
-	$(HTMLCAT) - $(SPECOBJS) $(INDEXES) | \
+css2.html html: $(SPECOBJS)
+	$(HTMLCAT) - $(SPECOBJS) | \
 	$(HTMLTRIM) div navbar - $@
 
 # the following requires to be on unix and have Netscape running...
@@ -479,11 +474,9 @@ propidx.srd:: build/propidx.srb #propidx.src
 
 check: checkdoc checkspaces checkprops checkrefs checkspell checksample checklnx checkx
 
-FILES= $(MAINOBJS) $(APPENDIXES) $(REFS) $(INDEXES)
-
 checkdoc: all
 	-@echo "# Begin checking sgml."
-	@for i in $(FILES) $(LONGDESCS); \
+	@for i in $(SPECOBJS) $(LONGDESCS); \
 	do echo checking $$i...; \
            $(NSGMLS) -s -c sgml/HTML4.cat $(HTMLDECL) $$i; done;
 	-@echo "# End checking sgml."
@@ -522,7 +515,7 @@ checksample: sample.src $(PROPSRC)
 checklnx: all
 	-@echo "# Begin checking links."
 	-@$(RM) linklint
-	$(LINKLINT) -doc linklint $(FILES)
+	$(LINKLINT) -doc linklint $(SPECOBJS)
 	-@echo "# End checking links."
 
 ### check property instances
@@ -572,9 +565,8 @@ log:
 	done; rm /tmp/log
 
 clean:
-	$(RM) $(SPECOBJS) $(INDEXES) $(PROPBLKSDIR)/* \
+	$(RM) $(SPECOBJS) $(PROPBLKSDIR)/* \
 	$(SPECOBJS:.html=.srd) $(SPECOBJS:.html=.subtoc) \
-        $(INDEXES:.html=.srd) \
         build/* css2.* linklint images/links.ok images/pngs.ok
 
 realclean: clean
@@ -589,11 +581,11 @@ PREVREC = ../../../TR/1998/REC-CSS2-19980512
 PREVWD = ../../../TR/$(PREV_YEAR)/$(PREV_STATUS)-$(PERMANENT_NAME)-$(PREV_DATE)
 HTMLDIFF = htmldiff -i -w '<del>' -x '</del>' -y '<ins>' -z '</ins>'
 
-diffs: $(SPECOBJS) $(INDEXES)
+diffs: $(SPECOBJS)
 	-(cd diffs-rec;\
-	 make PREV=../$(PREVREC) HTMLDIFF="$(HTMLDIFF)" $(SPECOBJS) $(INDEXES))
+	 make PREV=../$(PREVREC) HTMLDIFF="$(HTMLDIFF)" $(SPECOBJS)
 	-(cd diffs-wd;\
-	 make PREV=../$(PREVWD) HTMLDIFF="$(HTMLDIFF)" $(SPECOBJS) $(INDEXES))
+	 make PREV=../$(PREVWD) HTMLDIFF="$(HTMLDIFF)" $(SPECOBJS)
 
 
 .PHONY: all install install-all clean realclean checkx diffs

css2/about.src

@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC '-//W3C//DTD HTML 4.01//EN'>
 
 <html lang="en">
-<!-- $Id: about.src,v 2.67 2005-10-18 18:52:03 bbos Exp $ -->
+<!-- $Id: about.src,v 2.68 2006-01-24 06:50:24 bbos Exp $ -->
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <TITLE>About the CSS&nbsp;2.1 Specification</TITLE>
@@ -58,12 +58,16 @@ are worthwhile.
 <p>CSS&nbsp;2.1 is derived from and is intended to replace CSS2. Some
 parts of CSS2 are unchanged in CSS&nbsp;2.1, some parts have been
 altered, and some parts removed. The removed portions may be used in a
-future CSS3 specification. Implementations may refer to CSS2 for the
-definitions of features that have been removed, but for other features
-CSS&nbsp;2.1 is the normative reference.
+future CSS3 specification. Future specs should refer to CSS&nbsp;2.1
+(unless they need features from CSS2 which have been dropped in
+CSS&nbsp;2.1, and then they should only reference CSS2 for those
+features, or preferably reference such feature(s) in the respective
+CSS3 Module that includes those feature(s)).
 
 <h2>Reading the specification</h2>
 
+<p>This section is non-normative.
+
 <P>This specification has been written with two types of readers in
 mind: CSS authors and CSS implementors. We hope the specification will
 provide authors with the tools they need to write efficient,
@@ -89,6 +93,8 @@ version of the document.
 
 <h2>How the specification is organized</h2>
 
+<p>This section is non-normative.
+
 <P>The specification is organized into the following sections:
 
 <dl>
@@ -360,6 +366,8 @@ the long description is denoted by a "[D]" after the image.
 
 <H2>Acknowledgments</H2> 
 
+<p>This section is non-normative.
+
 <p>CSS 2.1 is based on CSS2. See the <a
 href="http://www.w3.org/TR/REC-CSS2/about.html#q15">acknowledgments
 section of CSS2</a> for the people that contributed to CSS2.

css2/box.src

@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC '-//W3C//DTD HTML 4.01//EN'>
 
 <html lang="en">
-<!-- $Id: box.src,v 1.62 2005-10-20 03:14:37 bbos Exp $ -->
+<!-- $Id: box.src,v 1.63 2006-01-24 06:50:24 bbos Exp $ -->
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <TITLE>Box model</TITLE>
@@ -347,12 +347,12 @@ its first in-flow block-level child's top margin if the element has no
 top border, no top padding, and the child has no <a
 href="visuren.html#clearance">clearance.</a></p>
 
-The bottom margin of an in-flow block-level element with
-a <span class="propinst-height">'height'</span> of 'auto'
-and <span class="propinst-min-height">'min-height'</span> less than
-the element's used height
-and <span class="propinst-max-height">'max-height'</span> greater than
-the element's used height is adjoining to its last in-flow block-level
+<p>The bottom margin of an in-flow block-level element with a <span
+class="propinst-height">'height'</span> of 'auto' and <span
+class="propinst-min-height">'min-height'</span> less than the
+element's used height and <span
+class="propinst-max-height">'max-height'</span> greater than the
+element's used height is adjoining to its last in-flow block-level
 child's bottom margin if the element has no bottom padding or border.
 
 <p>An element's own margins are adjoining if the <span

css2/changes.src

@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html lang="en">
-<!-- $Id: changes.src,v 2.49 2005-09-13 19:16:22 bbos Exp $ -->
+<!-- $Id: changes.src,v 2.50 2006-01-24 06:50:24 bbos Exp $ -->
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <TITLE>Changes</TITLE>
@@ -30,10 +30,9 @@ The 'display' property</a></h3>
 <h3 id="s-12-2a"><a href="generate.html#content">Section 12.2 The
 'content' property</a></h3>
 
-<p>New 'content' value 'normal'. (Because ':before {content: ""}'
-generates a box, while ':before {content: normal}' does not. It is
-called 'normal' and not 'none', because 'content: normal' will mean
-other things for other kinds of elements in CSS3.)
+<p>New 'content' values 'none' and 'normal'. (The values 'none' and
+'normal' are equivalent in CSS&nbsp;2.1, but may have different
+functions in CSS3.)
 
 <h3 id="s-18-1"><a href="ui.html#propdef-cursor">Section 18.1 Cursors:
 the 'cursor' property</a></h3>

css2/conform.src

@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html lang="en">
-<!-- $Id: conform.src,v 2.69 2005-10-18 18:52:03 bbos Exp $ -->
+<!-- $Id: conform.src,v 2.70 2006-01-24 06:50:24 bbos Exp $ -->
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <TITLE>Conformance: requirements and recommendations</TITLE>
@@ -40,6 +40,9 @@ on conformance. (For example, 'aural' is marked as non-normative, so
 UAs do not need to support it; the system colors are normative, so UAs
 must support them.)
 
+<p>All sections of this specification, including appendices, are
+normative unless otherwise noted.
+
 <p><a href="about.html#notes-and-examples">Examples and notes</a>
 are not normative.
 

css2/cover.src

@@ -96,9 +96,11 @@ that are implemented interoperably at the date of publication of the Recommendat
 <p>CSS&nbsp;2.1 is derived from and is intended to replace CSS2. Some
 parts of CSS2 are unchanged in CSS&nbsp;2.1, some parts have been
 altered, and some parts removed. The removed portions may be used in a
-future CSS3 specification. Implementations may refer to CSS2 for the
-definitions of features that have been removed, but for other features
-CSS&nbsp;2.1 is the normative reference.
+future CSS3 specification. Future specs should refer to CSS&nbsp;2.1
+(unless they need features from CSS2 which have been dropped in
+CSS&nbsp;2.1, and then they should only reference CSS2 for those
+features, or preferably reference such feature(s) in the respective
+CSS3 Module that includes those feature(s)).
 
 <h2 id=status>Status of this document</h2>
 

css2/grammar.src

@@ -1,13 +1,12 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html lang="en">
-<!-- $Id: grammar.src,v 2.43 2005-08-27 09:25:58 ihickson Exp $ -->
+<!-- $Id: grammar.src,v 2.44 2006-01-24 06:50:24 bbos Exp $ -->
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <TITLE>Grammar of CSS&nbsp;2.1</TITLE>
 </HEAD>
 <BODY>
 <H1>Grammar of CSS&nbsp;2.1</H1>
-<P><em>This appendix is normative.</em>
 
 <P>The grammar below defines the syntax of CSS&nbsp;2.1. It is in some sense,
 however, a superset of CSS&nbsp;2.1 as this specification imposes additional