Skip to content

Commit 273c4e2

Browse files
committed
merge
2 parents 11ecf5c + 558c622 commit 273c4e2

6 files changed

Lines changed: 113 additions & 53 deletions

File tree

css-inline/Makefile

Lines changed: 54 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,79 @@
11
# Calling the post-processor with file-upload. Assumes the username
2-
# and password are in ~/.curl-w3.org
2+
# and password are in ~/.curl-w3.org (user = USER:PASS)
33
#
4-
# Possible other options:
5-
# -F date=YYYY-MM-DD
4+
# To set a date other than today, use: make cdate=YYYYMMDD
5+
#
6+
# To set the status, modify one of the "this version" URLs:
7+
# http://www.w3.org/TR/[YEAR]/CR-[SHORTNAME]-[CDATE]/
8+
# Or set that URL to [VERSION] and call Make as: make status=CR
9+
#
10+
#
11+
# Possible other options to add to the curl command below:
612
# -F ids=on
13+
# -F omitdchtml=on
14+
# e.g., like this: make opts="-F ids=on -F omitdchtml=on"
15+
16+
cdate ?=
17+
status ?=
18+
group ?= CSS
19+
opts ?=
20+
target ?= Overview
21+
markup ?= html
722

823
%.html: %.src.html
924
@echo "Calling post-processor to generate $@..."
10-
@curl -F file=@$< -F group=CSS -F output=html -F method=file -s -K ~/.curl-w3.org https://www.w3.org/Style/Group/process.cgi >$@
25+
@curl -K ~/.curl-w3.org -s -S -F output=html -F file=@$< \
26+
-F group=$(group) -F method=file -F date=$(cdate) -F status=$(status) \
27+
$(opts) -o $@ https://www.w3.org/Style/Group/process.cgi
1128
%.err: %.src.html
1229
@echo "Calling post-processor to check $<..."
13-
@curl -F file=@$< -F group=CSS -F output=err -F method=file -s -K ~/.curl-w3.org https://www.w3.org/Style/Group/process.cgi >$@
30+
@curl -K ~/.curl-w3.org -s -S -F output=err -F file=@$< \
31+
-F group=$(group) -F method=file -F date=$(cdate) -F status=$(status) \
32+
$(opts) -o $@ https://www.w3.org/Style/Group/process.cgi
33+
%.html: %.bs
34+
curl -s -L -F file=@$< -F time=$(cdate) -F output=html \
35+
-F paragraph=$(markup) $(opts) -o $@ http://api.csswg.org/bikeshed/
36+
%.err: %.bs
37+
curl -s -L -F file=@$< -F time=$(cdate) -F output=err \
38+
-F paragraph=$(markup) $(opts) -o $@ http://api.csswg.org/bikeshed/
1439

40+
# For Dispositions of Comments in css3-background:
41+
%.html: %.txt; awk -f issues-txt-to-html.awk $< >$@
1542

43+
# Rule to create PNG from FIG
44+
%.png: %.fig; fig2dev -L png -m 0.8 -S 4 $< $@
1645

17-
all: check Overview.html
18-
@echo Done.
46+
# Rule to create EPS from FIG
47+
%.eps: %.fig; fig2dev -m 0.8 -L eps -F -c $< $@
48+
49+
# Rule to create PNG from EPS
50+
%.png: %.eps; convert -density 96x96 $< $@
1951

20-
check: Overview.err
21-
@cat $<
22-
@grep -q '^No errors$$' $< # Force a non-zero exit code if errors
2352

53+
all: check $(target).html
54+
55+
# egrep will exit with a zero exit code if there is anything left
56+
check: $(target).err
57+
@cat $<
58+
@if egrep -qv '^(Warning:|\(Processed in .* seconds\)|No errors)' $<;\
59+
then false; else true; fi
2460

2561

2662
# A handy shortcut:
2763

28-
commit: update clean all
29-
cvs commit -m 'Generated. Do not edit!' Overview.html
64+
commit: update all
65+
hg commit -m 'Generated. Do not edit!' $(target).html || true
66+
hg push
3067

3168
update:
32-
cvs update
69+
hg pull
70+
hg update
3371

3472
clean:
35-
rm Overview.html
73+
rm -f $(target).html $(target).err
3674

3775

3876

3977
.PHONY: check commit update clean
78+
.DELETE_ON_ERROR:
79+
.PRECIOUS: %.png

css-preslev/Overview.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
rel="dcterms.rights" />
1111
<meta content="CSS Presentation Levels Module" name="dcterms.title" />
1212
<meta content="text" name="dcterms.type" />
13-
<meta content="2014-10-10" name="dcterms.date" />
13+
<meta content="2014-11-19" name="dcterms.date" />
1414
<meta content="Ian Hickson" name="dcterms.creator" />
1515
<meta content="Håkon Wium Lie" name="dcterms.creator" />
1616
<meta content="Bert Bos" name="dcterms.creator" />
1717
<meta content="W3C" name="dcterms.publisher" />
18-
<meta content="http://www.w3.org/TR/2014/NOTE-css3-preslev-20141010/"
18+
<meta content="http://www.w3.org/TR/2014/NOTE-css3-preslev-20141119/"
1919
name="dcterms.identifier" />
2020
<link href="../default.css" rel="stylesheet" title="Default"
2121
type="text/css" />
@@ -34,14 +34,14 @@
3434

3535
<h1 id="title">CSS Presentation Levels Module</h1>
3636

37-
<h2 class="no-num no-toc" id="W3C-doctype">W3C Working Group Note 10
38-
October 2014</h2>
37+
<h2 class="no-num no-toc" id="W3C-doctype">W3C Working Group Note 19
38+
November 2014</h2>
3939

4040
<dl>
4141
<dt>This version:</dt>
4242

4343
<dd><a
44-
href="http://www.w3.org/TR/2014/NOTE-css3-preslev-20141010/">http://www.w3.org/TR/2014/NOTE-css3-preslev-20141010/</a></dd>
44+
href="http://www.w3.org/TR/2014/NOTE-css3-preslev-20141119/">http://www.w3.org/TR/2014/NOTE-css3-preslev-20141119/</a></dd>
4545

4646
<dt>Latest version:</dt>
4747

@@ -51,7 +51,7 @@ <h2 class="no-num no-toc" id="W3C-doctype">W3C Working Group Note 10
5151
<dt>Previous version:</dt>
5252

5353
<dd><a
54-
href="http://www.w3.org/TR/2003/WD-css3-preslev-20030813/">http://www.w3.org/TR/2003/WD-css3-preslev-20030813/</a></dd>
54+
href="http://www.w3.org/TR/2014/NOTE-css3-preslev-20141014/">http://www.w3.org/TR/2014/NOTE-css3-preslev-20141014/</a></dd>
5555

5656
<dt>Feedback:</dt>
5757

css-preslev/Overview.src.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ <h2 id="W3C-doctype" class="no-num no-toc">[LONGSTATUS] [DATE]</h2>
3535

3636
<dt>Previous version:</dt>
3737

38-
<dd><a href="http://www.w3.org/TR/2003/WD-css3-preslev-20030813/"
39-
>http://www.w3.org/TR/2003/WD-css3-preslev-20030813/</a></dd>
38+
<dd><a href="http://www.w3.org/TR/2014/NOTE-css3-preslev-20141014/"
39+
>http://www.w3.org/TR/2014/NOTE-css3-preslev-20141014/</a></dd>
4040

4141
<dt>Feedback:
4242
<dd><a href="mailto:www-style@w3.org?subject=%5Bcss-preslev%5D%20feedback">www-style@w3.org</a>

css-regions/Makefile

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
11
# use this command line now, or a local bikeshed
22

3-
# curl http://api.csswg.org/bikeshed/ -F file=@Overview.src.html > Overview.html
3+
# curl http://api.csswg.org/bikeshed/ -F file=@Overview.src.html > Overview.html
4+
5+
%.html: %.src.html
6+
curl -s -L -F file=@$< -F time=$(cdate) -F output=html \
7+
-F paragraph=$(markup) $(opts) -o $@ http://api.csswg.org/bikeshed/
8+
%.err: %.src.html
9+
curl -s -L -F file=@$< -F time=$(cdate) -F output=err \
10+
-F paragraph=$(markup) $(opts) http://api.csswg.org/bikeshed/ >$@
11+
12+
all: check Overview.html
13+
14+
check: Overview.err
15+
@if test -s $<; then false; else true; fi
16+
@cat $<

css-shapes-2/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ PROCESSCGI=https://www.w3.org/Style/Group/process.cgi
2828
CURL=curl
2929
CURLFLAGS=
3030

31+
# need to bikeshed and remove this
32+
3133
# if you want to set a publication date other than today's date,
3234
# invoke make like this: "make PUBDATE=2008-03-19"
3335
PUBMSG=

css-template/Overview.src.html

Lines changed: 35 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -115,11 +115,11 @@ <h2 class="no-num no-toc" id=abstract>Abstract</h2>
115115
possible break points (see the 'break-*' properties from
116116
[[CSS3-BREAK]]).
117117

118-
<p>The <a href="#region-based">'@region'
119-
rule</a> [[!CSS3-REGIONS]] allows to select
118+
<p>The '@region'
119+
rule [[!CSS3-REGIONS]] allows to select
120120
(parts of) elements based on whether they fall in a certain slot or
121121
not, and thus style content differently in different slots
122-
(region-based styling).
122+
(<em>region-based styling</em>).
123123

124124
<!--=================================================================-->
125125

@@ -208,18 +208,19 @@ <h3>Summary and use cases</h3>
208208

209209
<li><p>Complex forms, where the alignment of labels and form fields may
210210
be easier with the properties of this module than with the properties
211-
for tables and margins.
211+
for tables, floats and margins.
212212

213213
<li><p>GUIs, where buttons, toolbars, labels, icons, etc., are aligned in
214214
complex ways and have to stay aligned (and not wrap, for example) when
215215
the window is resized.
216216

217217
<li><p>Paged displays (e.g., printed media) where each page
218-
is divided in fixed areas for different kinds of content.
218+
is divided into fixed areas for different kinds of content.
219219

220220
<li><p>Complex pages with multiple regions, where the style
221221
of the text does not only depend on the type of element it comes from,
222-
but also on the region it is displayed in.
222+
but also on the region it is displayed in (<em>region-based
223+
styling</em>).
223224

224225
<li>Paged displays with complex running headers and footers, e.g.,
225226
running headers that are in between parts of the page content, rather
@@ -374,7 +375,7 @@ <h3>Summary and use cases</h3>
374375
<p>That is not needed for the grid template, but, on the other hand,
375376
if we want the template to fit its contents, we would need to say so:
376377

377-
<pre>.group {grid: "a b c"; width: auto}</pre>
378+
<pre>.group {grid: "a b c"; width: fit-content}</pre>
378379

379380
<p>(See [[!CSS3BOX]] for the definition of the 'width' property.) The
380381
columns of the template are by default all the same size. The columns
@@ -415,8 +416,8 @@ <h3>Summary and use cases</h3>
415416

416417
<p>(However, setting 'display' to 'grid' on the grid element creates a
417418
different kind of grid, that <em>does</em> grow, see <a
418-
href="#absolute">Elements with 'display' set to ''grid'' or
419-
''inline-grid''”</a> below.)
419+
href="#absolute">Comparison with 'display: grid' and 'display:
420+
inline-grid'”</a> below.)
420421

421422
<p>In both models, elements can have borders, but only in the table
422423
model can borders be collapsed, which makes setting borders easier in
@@ -2228,7 +2229,7 @@ <h2 id=flow>Flowing content into slots: 'flow'</h2>
22282229
</pre>
22292230

22302231
<p>would repeat the H1 at the top of all three
2231-
columns. With <a href="#region-based" >region-based styling,</a> the
2232+
columns. With <em>region-based styling,</em> the
22322233
three instances could even be styled differently, e.g., with generated
22332234
content: ''@region ::slot(b) { H1::before {content: "cont'd "} }''
22342235
</div>
@@ -2352,8 +2353,8 @@ <h3 id=slot-pseudo>The ''::slot()'' pseudo-element</h3>
23522353
than what corresponds to the ''contents'' keyword. (I.e., not to the
23532354
content that is flowed into the slot via the 'flow' property or
23542355
because the slot is the <span>default slot.</span> See <a
2355-
href="#region-based" >“Styling the contents of slots with
2356-
''@region''”</a> for how to style that part of the content.)
2356+
href="#region-based" >“Styling the contents of slots</a> for how to
2357+
style that part of the content.)
23572358

23582359
<ul>
23592360
<li>'color'
@@ -2520,22 +2521,25 @@ <h3 id=content>Slots and the 'content' property</h3>
25202521

25212522
<!--=================================================================-->
25222523

2523-
<h2 id=region-based>Styling the contents of slots with
2524-
''@region''</h2>
2524+
<h2 id=region-based>Styling the contents of slots</h2>
25252525

2526-
<p>The '<span class=index>@region</span>' at-rule [[!CSS3-REGIONS]]
2527-
provides a way to select an element, or a part of an element, based on
2528-
the <em class=index>region</em> it
2529-
is rendered in. For this purpose, a <em>slot</em> is a particular kind
2530-
of <em>region.</em>
2526+
<p><dfn>Region-based styling</dfn> refers to style rules that are
2527+
attached to parts of a document that do not correspond to an element,
2528+
but to an area of the canvas. In level 2, there were only two such
2529+
regions, the pseudo-elements ''first-line'' and ''first-letter.'' This
2530+
module adds <span class=index>slots.</span>
2531+
2532+
<p>A slot may contain parts of multiple elements and the style rules
2533+
for those elements and for the slot are cascaded together in a
2534+
specific way, defined below.
25312535

25322536
<div class=example>
25332537
<p>For example, with a style sheet like this
25342538

25352539
<pre>
25362540
BODY { grid: "a ." 10em ". b"; chains: a b }
25372541
P { flow: a; color: blue }
2538-
@region BODY::slot(b) { P { color: orange } }
2542+
BODY::slot(b) P { color: orange }
25392543
</pre>
25402544

25412545
<p>and a document fragment like this:
@@ -2551,20 +2555,21 @@ <h2 id=region-based>Styling the contents of slots with
25512555
<p>The three paragraphs will be rendered inside slot a and, if there
25522556
is more content than fits in that slot, the rest will be rendered in
25532557
slot b. Ps are blue by the second line in the style sheet, but the
2554-
''@region'' rule says that any part of a P that is inside slot b will
2558+
third line says that any part of a P that is inside slot b will
25552559
be orange.
25562560
</div>
25572561

2558-
<p class=note>Note that ''@region BODY::slot(b) { P {…} }'' cannot be
2559-
replaced by ''BODY::slot(b) P {…}'', because pseudo-elements can only
2560-
occur as the last component in a selector. Compare also ''@region
2561-
::first-line { em {…} }'', which is a valid way to style (the part of)
2562-
an EM that occurs on a first line, vs ''::first-line em {…}'' which is
2563-
an invalid selector.
2562+
<p>In CSS level 2, pseudo-elements could only occur at the end of a
2563+
selector. Thus an attempt to select 'P::first-line EM' fails. That
2564+
restriction does not apply to the <span class=index>'::slot()'
2565+
pseudo-element,</span> as shown in the example above.
2566+
2567+
<p>To resolve which style rules apply to an element or part of an
2568+
element that is inside a slot…
25642569

2565-
<p>To select a slot for use in an '@region' rule, the selector after
2566-
the ''@region'' keyword must be a selector that ends with the
2567-
pseudo-element '::slot(<var>X</var>)'.
2570+
<p class=issue>Fix. Can we use a fictional tag sequence as in level 2?
2571+
Only for inherited properties, maybe. Or only for a restricted set of
2572+
properties, e.g., only those that apply to first-letter.
25682573

25692574
<p class=issue>See <a href="#select-after-pseudo">“Style the contents
25702575
of slots (region-based styling)”</a> below for a discussion of

0 commit comments

Comments
 (0)