Skip to content

Commit 2f4d0f3

Browse files
committed
[css2] Updated for URL -> URI
--HG-- extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%40560
1 parent fa12c96 commit 2f4d0f3

File tree

16 files changed

+128
-88
lines changed

16 files changed

+128
-88
lines changed

css2/DOC/todo.db

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
4 0 Make sure links to all sections of the spec have page numbers generated in the Postscript version (instead of just to anchors in the same file) Ian Ian 25 Aug 1997 5 Sep 1997 Yes, new version of html2ps does this (I believe) Used html2psrc
55
5 0 Give better explanation of meaning of percentages and when to compute them. Inside out and outside in formatting issues. San Jose ftf Howcome/Bert 26 Aug 1997 - - -
66
6 0 Replace ascii art with images. Notably, example of list items is wrong (margin applies to block, not to marker). Suggested: use OBJECT for images and then long description. San Jose ftf - 26 Aug 1997 30 Sep 1997 - Added
7-
7 0 Clarify text of fonts section re glyphs, panose. Perhaps add example. See San Jose ftf minutes for details. San Jose ftf Chris 26 Aug 1997 - - -
7+
7 0 Clarify text of fonts section re glyphs, panose. Perhaps add example. See San Jose ftf minutes for details. San Jose ftf Chris 26 Aug 1997 12 Dec 1997 - I suppose done by Dec 11
88
8 0 Positioning: add right, bottom, min, max properties San Jose ftf Hakon 26 Aug 1997 30 Sep 1997 - Added to Sep 24 spec
99
9 0 Add break-* : avoid to spec. San Jose ftf Ian 26 Aug 1997 30 Sep 1997 - Added to Sep 24 spec
1010
10 0 Add widow/orphan San Jose ftf - 26 Aug 1997 30 Sep 1997 - Added (with Bert) along with page breaking info
1111
11 0 Add language that tiling is a valid option for a printer driver (section 9.3.2) San Jose ftf - 26 Aug 1997 30 Sep 1997 - Ok (added to print.src)
12-
12 0 Make the acknowledgments appropriate Ian - 7 Sep 1997 - - -
12+
12 0 Make the acknowledgments appropriate Ian - 7 Sep 1997 12 Dec 1997 - I suppose ok by Dec 11
1313
13 2 Fix the CSS2 grammar (grammar.src) Ian - 7 Sep 1997 - Selector syntax updated (29 Sep 1997). -
1414
14 0 In cursors, rename "hand" value San Jose ftf Ian 25 Aug 1997 - -
1515
15 0 Fix percentage values for pitch-range/stress/richness Ian - 25 Aug 1997 - -
@@ -26,16 +26,16 @@
2626
26 0 7.2: add media type TV (low resolution, color, limited scrollability) H�kon - 27 Sep 1997 01 Oct 1997 - Added
2727
27 0 7.2: add media type HANDHELD (small screen, monochrome, limited scroll, limited bandwidht) H�kon - 27 Sep 1997 01 Oct 1997 - Added
2828
28 0 Ch8: change title to "Visual rendering model" ("flow" is only one of the visual formatting models) H�kon - 27 Sep 1997 02 Oct 1997 - Changed visual flow model to visual rendering model except where the flow model is explicitly discussed (in the middle of flowobj.src)
29-
29 0 Ch8: describe terminology for "rendering model" and "rendering object" H�kon - 27 Sep 1997 - - -
30-
30 0 Ch8: add "content" property to represent replaced vs. non-replaced elements H�kon - 27 Sep 1997 - - -
29+
29 0 Ch8: describe terminology for "rendering model" and "rendering object" H�kon - 27 Sep 1997 12 Dec 1997 - See processing model
30+
30 0 Ch8: add "content" property to represent replaced vs. non-replaced elements H�kon - 27 Sep 1997 12 Dec 1997 - Done in 11 Dec draft
3131
31 0 Ch8: add figure to describe the three axes: normal,abs,float/replaced,non-replaced/inline,block H�kon - 27 Sep 1997 - - -
3232
32 0 8.1: clarify that the box model is slighly different in paged media H�kon - 27 Sep 1997 02 Oct 1997 - Add link from end of introduction to box model to section on page boxes.
33-
33 0 8.2.4.1: add table values: table, row, column, row-group, column-group, cell, caption? H�kon - 27 Sep 1997 - - -
33+
33 0 8.2.4.1: add table values: table, row, column, row-group, column-group, cell, caption? H�kon - 27 Sep 1997 12 Dec 1997 - Done in 11 Dec draft
3434
34 0 Ch8: make "flow", "float" and "absolute positioning" peers (e.g. 8.2, 8.3, 8.4). H�kon - 27 Sep 1997 02 Oct 1997 - Removed section on "outside the flow" and added it to floats. Made floats, absolute, and flow all same level
3535
35 0 8.3.2:replace "box coordinate system" with "positioning block". H�kon - 27 Sep 1997 20 Oct 1997 - Done (flowobj.src and flowobj2.src)
36-
36 0 8.1.2, 8.1.3: percentage values apply to "containing block" not the "parent element". Describe "containing block" in appropriate place H�kon - 27 Sep 1997 - - -
36+
36 0 8.1.2, 8.1.3: percentage values apply to "containing block" not the "parent element". Describe "containing block" in appropriate place H�kon - 27 Sep 1997 12 Dec 1997 - Done in 11 Dec draft
3737
37 0 8.4: add numbering to headers H�kon - 27 Sep 1997 02 Oct 1997 - Added headers
38-
38 0 8.6: add text on multicolumn layout. Constrain to paged media only? Never let multicol go below window? H�kon - 27 Sep 1997 - - -
38+
38 0 8.6: add text on multicolumn layout. Constrain to paged media only? Never let multicol go below window? H�kon - 27 Sep 1997 12 Dec 1997 - No multicolumn in CSS2
3939
39 0 Ch9: change title to "visual rendering model details" H�kon - 27 Sep 1997 02 Oct 1997 - Done
4040
40 0 9.1.4.1: change syntax for min/max values on width? e.g. minmax(x,y,z)? H�kon - 27 Sep 1997 - - -
4141
41 0 9.2.3.1: change syntax for min/max values on height? e.g. minmax(x,y,z)? H�kon - 27 Sep 1997 - - -
@@ -51,12 +51,12 @@
5151
51 0 9.8: add descriprion of static vs. dynamic: at any point in time, there is always a consistent static style sheet at work H�kon - 27 Sep 1997 - - -
5252
52 0 ch9: add description of inside-out and outside-in formatting model H�kon - 27 Sep 1997 - - -
5353
53 0 10.1: change title to "the color property" H�kon - 27 Sep 1997 02 Oct 1997 Whoops: Title changed (02 Oct 1997). Title changed
54-
54 0 10.2: is "rendering surface a good term, check CSS1 H�kon - 27 Sep 1997 - Ian: The term rendering surface is used in CSS1... (20 Oct 1997). -
54+
54 0 10.2: is "rendering surface a good term, check CSS1 H�kon - 27 Sep 1997 12 Dec 1997 Ian: The term rendering surface is used in CSS1... (20 Oct 1997). Canvas defined
5555
55 0 11.2.2.1: should authors be able to redifine generic font families? H�kon - 27 Sep 1997 - Are you kidding? Readers, on the other hand - yes (but set via a preference, to keep the symmetry, not through CSS) (29 Oct 1997). -
56-
56 0 11.2.9.15, 11.2.9.16: should these go to an appendix? H�kon - 27 Sep 1997 - - -
56+
56 0 11.2.9.15, 11.2.9.16: should these go to an appendix? H�kon - 27 Sep 1997 12 Dec 1997 - I believe these have been moved!
5757
57 0 Ch11: add table for how to map generic font families in other scripts H�kon - 27 Sep 1997 - - -
5858
58 0 Ch12: reorder properties to: indentation, alignment, decoration, letter/word spacing, case, white space H�kon - 27 Sep 1997 02 Oct 1997 - Reordered
59-
59 0 12.5: H�kon - 27 Sep 1997 - - -
59+
59 0 12.5: H�kon - 27 Sep 1997 12 Dec 1997 - No resolution since no problem!
6060
60 0 12.6.2: describe 'text-shadow' property -- remove 'text-shadow-color' H�kon - 27 Sep 1997 03 Oct 1997 - text-shadow-color changed to text-shadow (but otherwise same desc.)
6161
61 0 12.9.1: make sure the generated text functionality described by Murray can handle forced line breaks H�kon - 27 Sep 1997 - - -
6262
62 0 13.1.1.4: use parent-child selectors instead of deprecated example H�kon - 27 Sep 1997 20 Oct 1997 - Fixed deprecated example. See new text.
@@ -69,20 +69,20 @@ ian 0 Add a paragraph in the section on colors that tells user agents what to do
6969
ian 0 Introduce a NOT operator? http://lists.w3.org/Archives/Member/w3c-css-wg/1997JulSep/0265.html - 21 Oct 1997 - - -
7070
ian 0 Integrate Berts i18n info http://www.w3.org/Style/Group/9707/WD-cssbidi-970705 - 21 Oct 1997 - - -
7171
ian 0 Add informative section on converting HTML relative font sizes to css? http://lists.w3.org/Archives/Member/w3c-css-wg/1997JulSep/0287.html - 21 Oct 1997 - - -
72-
ian 0 Integrate Todds base stylesheet for HTML40? http://lists.w3.org/Archives/Member/w3c-html-wg/1997OctDec/0175.html - 21 Oct 1997 - - -
72+
ian 0 Integrate Todds base stylesheet for HTML40? http://lists.w3.org/Archives/Member/w3c-html-wg/1997OctDec/0175.html - 21 Oct 1997 12 Dec 1997 - Done prior to 11 Dec draft
7373
bbos 0 How to revoke this message without being seen to have internal disputes? http://lists.w3.org/Archives/Member/w3c-css-wg/1997OctDec/0073.html - 22 Oct 1997 - - -
7474
bbos 0 Are pseudo-elts *defined* by the fictional tag seq? Or does the fictional tag seq only define the cascading/inheritance? http://www.w3.org/Style/Group/9709/css2-970924/selector.html#h-5.5.3 - 28 Oct 1997 - - -
7575
bbos 0 Is the specificty really doc-language dependent? http://www.w3.org/Style/Group/9709/css2-970924/cascade.html - 28 Oct 1997 - - -
7676
bbos 0 Draw a flow-chart of the Processing Model. Ian's new chapter on the CSS Reference Processing Model - 28 Oct 1997 - Doc tree -> Annotated Doc tree (cascade, inheritance, initial values) -> endering tree (apply formatting algorithms to resolve "auto" -> Device (28 Oct 1997). The annotated tree may have 'auto' as a value for a prop, the rendering tree can't (28 Oct 1997). -
7777
clilley 0 Check all of 'Paged media' to ensure that printing-specific text is identified as such. It was written with printing in mind, and is not always applicable (eg, for Projector and PDA media - 29 Oct 1997 - - -
78-
clilley 0 Add tty media type (already in emacs w3) http://lists.w3.org/Archives/Public/w3c-wai-hc/1997OctDec/0191.html - 29 Oct 1997 - - -
78+
clilley 0 Add tty media type (already in emacs w3) http://lists.w3.org/Archives/Public/w3c-wai-hc/1997OctDec/0191.html - 29 Oct 1997 12 Dec 1997 - Done in 11 Dec draft
7979
clilley 0 Clarify that an em unit can be used for horizontal or vertical measurement (see mail Fri Jul 18, David Perell, www-style, and also http://lists.w3.org/Archives/Member/w3c-css-wg/1997OctDec/0083.html - 29 Oct 1997 - - -
8080
clilley 0 The precise meaning of 1em, when the text of an element is rendered by more than one font and each font din't match exactly the requested size; what is the inherited value? (no easy answer) (CSS1 insistence on inheriting *the* actual rather than specified http://lists.w3.org/Archives/Public/www-style/threads.html - 29 Oct 1997 - - -
8181
clilley 0 The greek characters for kouros were bogus (latin character references) - 31 Oct 1997 - - fixed by adding correct NCRs in range 03?? (except in decimal) (31 Oct 1997).
8282
ian 0 Unify presentation of what each value means (e.g., bulleted list everywhere in the spec) http://lists.w3.org/Archives/Member/w3c-css-wg/1997OctDec/0083.html - 29 Oct 1997 - - -
8383
ian 0 make sure examples indented equally Ian - 29 Oct 1997 - - -
8484
clilley 0 Nice. It's that phrase "not relative to the document" in the existing news:Pine.A41.3.95a.971027183754.32264O-100000@sp049 - 31 Oct 1997 - - -
85-
bbos 1 Property 'alignment' should be 'text-align'. text.html#h-15.2 - 09 Nov 1997 - - -
85+
bbos 1 Property 'alignment' should be 'text-align'. text.html#h-15.2 - 09 Nov 1997 12 Dec 1997 - Fixed
8686
bbos 1 Change "URL" in to "URI" as per agreement IETF/W3C. http://lists.w3.org/Archives/Team/w3t-ui/1997NovDec/0053.html - 23 Nov 1997 - - -
8787
bbos 0 I propose we give Philippe Le Hegaret a special mention in the acks; he has helped a lot debugging the grammar and finding ambiguities in the property values. http://jigsaw.w3.org/demos/guests/css/ - 26 Nov 1997 - - -
8888
ian 0 Include the complete list of keywords in the spec. Ian - 26 Nov 1997 - - -

css2/about.src

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
22
<html lang="en">
3-
<!-- $Id: about.src,v 1.19 1997-12-05 14:01:26 howcome Exp $ -->
3+
<!-- $Id: about.src,v 1.20 1997-12-12 18:02:42 ijacobs Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<TITLE>About the CSS2 Specification</TITLE>
@@ -188,8 +188,8 @@ The following examples illustrate different value types:
188188
<EM>Value:</EM> N | NW | NE<BR>
189189
<EM>Value:</EM> [ &lt;length&gt; | thick | thin ]{1,4}<BR>
190190
<EM>Value:</EM> [&lt;family-name&gt; , ]* &lt;family-name&gt;<BR>
191-
<EM>Value:</EM> &lt;url&gt;? &lt;color&gt; [ / &lt;color&gt; ]?<BR>
192-
<EM>Value:</EM> &lt;url&gt; || &lt;color&gt;<BR>
191+
<EM>Value:</EM> &lt;uri&gt;? &lt;color&gt; [ / &lt;color&gt; ]?<BR>
192+
<EM>Value:</EM> &lt;uri&gt; || &lt;color&gt;<BR>
193193
</BLOCKQUOTE>
194194
</div>
195195

css2/aural.src

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
22
<html lang="en">
3-
<!-- $Id: aural.src,v 1.10 1997-12-09 00:07:26 ijacobs Exp $ -->
3+
<!-- $Id: aural.src,v 1.11 1997-12-12 18:02:45 ijacobs Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<TITLE>Aural style sheets</TITLE>
@@ -277,7 +277,7 @@ sound is mixed in with the speech).
277277

278278
<p>The optional 'mix' keyword means the sound inherited from the parent
279279
element's play-during property continues to play and the current
280-
element sound (pointed to by the URL) is mixed with it. If 'mix' is not
280+
element sound (pointed to by the URI) is mixed with it. If 'mix' is not
281281
specified, the sound replaces the sound of the parent element.
282282

283283
<p>The optional 'repeat' keyword means the sound will repeat if it is

css2/colors.src

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
22
<html lang="en">
3-
<!-- $Id: colors.src,v 1.20 1997-11-25 23:41:10 ian Exp $ -->
3+
<!-- $Id: colors.src,v 1.21 1997-12-12 18:02:47 ijacobs Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<TITLE>Colors and backgrounds</TITLE>
@@ -74,7 +74,7 @@ shines through.
7474

7575
<P> This property sets the background image of an element, whose
7676
location is given by a <span
77-
class="value-inst-url">&lt;url&gt;</span>. When setting a
77+
class="value-inst-uri">&lt;uri&gt;</span>. When setting a
7878
background image, one should also set a background color that will be
7979
used when the image is unavailable. When the image is available, it is
8080
overlaid on top of the background color.

css2/css.dico

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,6 +346,8 @@ UCS
346346
UL
347347
UNICODE
348348
UNICODERANGE
349+
URI
350+
URIs
349351
URL
350352
URLs
351353
Unicode
@@ -464,7 +466,7 @@ definingTTC
464466
definingTTGX
465467
definingTrueDoc
466468
definingTrueDocPFR
467-
definingURLbound
469+
definingURIbound
468470
defininginfinifont
469471
defs
470472
deg
@@ -762,6 +764,7 @@ unitsperem
762764
unscaled
763765
urange
764766
url
767+
uri
765768
uu
766769
uuml
767770
val

css2/fonts.src

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
22
<html lang="en">
3-
<!-- $Id: fonts.src,v 1.27 1997-12-09 00:07:52 ijacobs Exp $ -->
3+
<!-- $Id: fonts.src,v 1.28 1997-12-12 18:02:54 ijacobs Exp $ -->
44
<HEAD>
55
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
66
<TITLE>Fonts</TITLE>
@@ -745,7 +745,7 @@ descriptions"><em>font descriptions</em></span> to style sheets for
745745
this purpose. A font description is a set of <span
746746
class="index-def" title="font descriptors"><em>font
747747
descriptors</em></span>, individual pieces of information about a
748-
font, possibly including a URL describing the font's location on the Web.
748+
font, possibly including a URI describing the font's location on the Web.
749749

750750
<div class="note"><P>
751751
<em><strong>Note.</strong>
@@ -784,7 +784,7 @@ representation metrics contained in the font.
784784
the font description (these have the same names as the corresponding
785785
CSS font properties),
786786

787-
<li>the URL for the location of the font data,
787+
<li>the URI for the location of the font data,
788788

789789
<li>those that further characterize the font, to provide a link
790790
between the font description and the font data.
@@ -854,7 +854,7 @@ is <a href="#propdef-font-family">defined to exist</a>).
854854
class="index-inst" title="@font-face"> @font-face</span> rules in
855855
search of a font description defining Robson Celtic. This example
856856
contains a rule which matches. Although this rule doesn't contain much
857-
font data, it does have a URL where the font can be retrieved for
857+
font data, it does have a URI where the font can be retrieved for
858858
rendering this document. Downloaded fonts should not be made available
859859
to other applications. If no matching @font-face is found, the user
860860
agent will attempt the same match as a user agent implementing CSS1.
@@ -1103,20 +1103,20 @@ downloadable or locally installed.
11031103

11041104
<!-- #include src=descriptors/src.srb -->
11051105

1106-
<p>This is a prioritized list of URLs and/or locally installed font
1107-
face names. The URL points to the font data itself. This is required
1106+
<p>This is a prioritized list of URIs and/or locally installed font
1107+
face names. The URI points to the font data itself. This is required
11081108
if the WebFont is to be retrieved. The font resource may be a subset
1109-
of the source font. The URL may be partial, in which case it is
1109+
of the source font. The URI may be partial, in which case it is
11101110
resolved relative to the location of the style sheet containing
11111111
the <span class="index-inst" title="@font-face"> @font-face</span>.
11121112

1113-
<p>The URL may have optional hints regarding the format of font
1114-
resource to be found at that URL, and this information should be used
1113+
<p>The URI may have optional hints regarding the format of font
1114+
resource to be found at that URI, and this information should be used
11151115
by clients in format negotiation with the server. As with any
11161116
hypertext reference, there may be other formats available, or the
11171117
resource may have been moved; but the client has a better idea of what
11181118
is likely to be there, in a more robust way than trying to parse
1119-
filename extensions in URLs.
1119+
filename extensions in URIs.
11201120

11211121
<p> The <span class="index-def" title="&lt;font-face-name&gt;::definition of"><a
11221122
name="value-def-font-face-name">&lt;font-face-name&gt;</a></span> is
@@ -1134,17 +1134,17 @@ Examples:
11341134

11351135
<dl>
11361136

1137-
<dt><tt>src: url(http://foo/bar)</tt> <dd>a full URL and no
1137+
<dt><tt>src: url(http://foo/bar)</tt> <dd>a full URI and no
11381138
information about the font format(s) available there
11391139

11401140
<dt><tt>src: local(BT Century 751 No. 2 Semi Bold Italic)</tt>
11411141
<dd>references a particular face of a locally installed font
11421142

1143-
<dt><tt>src: url(../fonts/bar) format(truedoc)</tt> <dd>a partial URL
1143+
<dt><tt>src: url(../fonts/bar) format(truedoc)</tt> <dd>a partial URI
11441144
which has a font available in TrueDoc format
11451145

11461146
<dt><tt>src: url(http://cgi-bin/bar?stuff) format(opentype,
1147-
intellifont)</tt> <dd>a full URL, in this case to a script, which
1147+
intellifont)</tt> <dd>a full URI, in this case to a script, which
11481148
can generate two different formats - OpenType and Intellifont
11491149

11501150
<dt><tt>src: local(T-26 Typeka Mix), url(http://site/magda-extra)
@@ -1312,7 +1312,7 @@ or intelligent matching.
13121312
<p>The font descriptors may either be within the font definition in
13131313
the stylesheet, or may be provided within a separate <span
13141314
class="index-def" title="font definition resource"><em>font definition
1315-
resource</em></span> identified by a URL. The latter approach can
1315+
resource</em></span> identified by a URI. The latter approach can
13161316
reduce network traffic when multiple stylesheets reference the same
13171317
fonts.
13181318

@@ -1929,7 +1929,7 @@ the CSS2 properties for each character.
19291929
<div class="example"><P>
19301930

19311931
The following example defines a specific font face, Alabama
1932-
Italic. A panose font description and source URL for retrieving a
1932+
Italic. A panose font description and source URI for retrieving a
19331933
truetype server font are also provided. Font-weight, and font-style
19341934
descriptors are provided to describe the font. The declaration says
19351935
that the weight will also match any request in the
@@ -1949,11 +1949,11 @@ name is Alabama Italic.</P>
19491949
</div>
19501950

19511951
<div class="example"><P>
1952-
The next example defines a family of fonts. A single URL is provided
1952+
The next example defines a family of fonts. A single URI is provided
19531953
for retrieving the font data. This data file will contain multiple
19541954
styles and weights of the named font. Once one of these
19551955
@font-face definitions has been dereferenced, the data will
1956-
be in the UA cache for other faces that use the same URL.</P>
1956+
be in the UA cache for other faces that use the same URI.</P>
19571957

19581958
<PRE>&lt;STYLE&gt;
19591959
@font-face {

css2/generate.src

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ BODY:after {
8080
<!-- #include src=properties/content.srb -->
8181

8282
<p>The value of the <span class="propinst-content">'content'</span>
83-
property is a sequence of strings, URLs, and counters. The various
83+
property is a sequence of strings, URIs, and counters. The various
8484
parts are laid out as inline boxes inside the element.</p>
8585

8686
<P>The values have the following meanings:

0 commit comments

Comments
 (0)