Skip to content

Commit 108c8bc

Browse files
committed
merge
2 parents 02123c6 + 88240e1 commit 108c8bc

407 files changed

Lines changed: 235125 additions & 2654 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

bin/css2-cvs2hg

Lines changed: 156 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,156 @@
1+
#!/bin/bash
2+
3+
4+
# NOTE: This conversion has been made and merge.
5+
# This "one-shot" script is not required anymore,
6+
# it is only kept here for historical interest.
7+
8+
9+
# This script imports 3301 revisions of CSS 2,
10+
# dated from 1997-07-21 to 2014-01-17,
11+
# from a zip archive of W3C's CVS repository into a Mercurial bundle file.
12+
#
13+
# This bundle can be imported into a clone of CSSWG's repository
14+
# (https://dvcs.w3.org/hg/csswg/) to add a 'css2' subdirectory
15+
# with all its change history:
16+
#
17+
# hg unbundle path/to/css2.hg-bundle
18+
# hg merge
19+
# hg commit -m 'Import CSS 2 from CVS, with change history'
20+
21+
# This script requires cvs2svn and hg convert
22+
# http://cvs2svn.tigris.org/
23+
# http://mercurial.selenic.com/wiki/ConvertExtension
24+
#
25+
# It expects to be in the same directory as a 'css2.zip' file
26+
# containing the 'css2-src' directory of W3C's internal CVS repository,
27+
# which itself consists of a bunch of '*,v' files.
28+
#
29+
# It will go through a multiple-step conversion, creating temporary files
30+
# in the 'tmp' subdirectory, to finally produce a ~10 MB 'css2.hg-bundle' file.
31+
32+
33+
set -e
34+
35+
cd $(dirname $0)
36+
37+
rm -rf tmp
38+
39+
mkdir -p tmp/cvs/CVSROOT
40+
41+
# Exclude:
42+
# css2-src/css2.tgz,v
43+
# css2-src/css2.ps,v
44+
# css2-src/css2.ps.gz,v
45+
# css2-src/css2.pdf,v
46+
# css2-src/css2.zip,v
47+
# css2-src/css2.txt,v
48+
# But not:
49+
# css2-src/css2.html,v
50+
unzip -q css2.zip 'css2-src/*' -x 'css2-src/css2.[^h]*' -d tmp/cvs
51+
52+
# We want the final result at http://dev.w3.org/csswg/css2/
53+
mv tmp/cvs/css2-src tmp/cvs/css2
54+
55+
# Try some surgery on a broken RCS file.
56+
# We may end up with incorrect earlier versions of bin/mkidx
57+
# but at least cvs2svn doesn't abort in the middle of the conversion
58+
patch -p 1 <<-'EOF'
59+
--- a/tmp/cvs/css2/bin/mkidx,v
60+
+++ b/tmp/cvs/css2/bin/mkidx,v
61+
@@ -509,20 +509,19 @@
62+
# class="tocline*" directs out patched html2ps to omit the bullet
63+
d85 2
64+
a86 3
65+
print OUTPUT "\n$indent[$j]<li class=\"tocline0\">$subs[$j]";
66+
if ($j < $#subs) {
67+
print OUTPUT "\n$indent[$j]<ul class=\"index\">";
68+
d88 1
69+
d90 1
70+
-d109 2
71+
-a110 2
72+
+d106 1
73+
+a106 1
74+
print OUTPUT "\n</ul>\n";
75+
-
76+
@
77+
78+
79+
2.9
80+
log
81+
@Bug: lowercase & uppercase were considered different
82+
@
83+
text
84+
@@ -851,21 +850,21 @@
85+
a91 7
86+
$buf .= "</dl>\n";
87+
88+
# Print out the full buffer
89+
open(OUTPUT, "> $indexf");
90+
print OUTPUT "<DIV class=\"noprint\"> ";
91+
foreach $letter (@@letters) {
92+
print OUTPUT " <a href=\"#$letter\">" . uc($letter) . "</a> ";
93+
-d93 2
94+
-a94 2
95+
+d93 1
96+
+a93 2
97+
print OUTPUT "</DIV>";
98+
print OUTPUT $buf;
99+
-a95 2
100+
+a93 2
101+
102+
103+
@
104+
105+
106+
1.11
107+
log
108+
@Updated to be like HTML
109+
@@ -1011,17 +1010,17 @@
110+
a85 1
111+
print OUTPUT "\n<dd> $cmt";
112+
d109 1
113+
a109 1
114+
print OUTPUT "$pre$content$post";
115+
d112 10
116+
a121 1
117+
print OUTPUT "</dl>\n";
118+
-d123 3
119+
+d123 1
120+
@
121+
122+
123+
1.5
124+
log
125+
@Fixed bug
126+
@
127+
text
128+
EOF
129+
130+
# Prefix all commit messages with "[css2] "
131+
find tmp/cvs -name '*,v' | xargs sed -i -r '/^log$/{
132+
N
133+
s/^(log\n@+)/\1\[css2\] /
134+
}'
135+
136+
cvs2svn --encoding latin1 --retain-conflicting-attic-files --trunk-only \
137+
--tmpdir=tmp/cvs2svn --svnrepos tmp/svn tmp/cvs
138+
139+
cat > tmp/authormap.txt <<-'EOF'
140+
bbos=Bert Bos <bert@w3.org>
141+
ijacobs=Ian Jacobs <ij@w3.org>
142+
ian=Ian Jacobs <ij@w3.org>
143+
howcome=Håkon Wium Lie <howcome@opera.com>
144+
fantasai=Elika Etemad <fantasai.cvs@inkedblade.net>
145+
clilley=Chris Lilley <chris@w3.org>
146+
ihickson=Ian Hickson <ian@hixie.ch>
147+
lehors=Arnaud Le Hors <lehors@w3.org>
148+
ot=Olivier Thereaux <ot@w3.org>
149+
ted=Ted Guild <ted@w3.org>
150+
mmielke=Markus Mielke <mmielke@microsoft.com>
151+
dbaron=L. David Baron <dbaron@dbaron.org>
152+
EOF
153+
154+
hg convert --authormap tmp/authormap.txt --datesort tmp/svn tmp/hg
155+
156+
hg --repository tmp/hg bundle --all css2.hg-bundle
Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
2+
<title>CSS Backgrounds and Borders Level 3 Disposition of Comments for 2014-02-04 LCWD</title>
3+
<style type="text/css">
4+
.a { background: lightgreen }
5+
.d { background: lightblue }
6+
.r { background: orange }
7+
.fo { background: red }
8+
.open { border: solid red; padding: 0.2em; }
9+
:target { box-shadow: 0.25em 0.25em 0.25em; }
10+
</style>
11+
12+
<h1>CSS Backgrounds and Borders Level 3 Disposition of Comments for 2014-02-04 LCWD</h1>
13+
14+
<p>Last call document: <a href="http://www.w3.org/TR/2014/WD-css3-background-20140204/">http://www.w3.org/TR/2014/WD-css3-background-20140204/</a>
15+
16+
<p>Editor's draft: <a href="http://dev.w3.org/csswg/css3-background/">http://dev.w3.org/csswg/css3-background/</a>
17+
18+
<p>The following color coding convention is used for comments:</p>
19+
20+
<ul>
21+
<li class="a">Accepted or Rejected and positive response
22+
<li class="r">Rejected and no response
23+
<li class="fo">Rejected and negative response
24+
<li class="d">Deferred
25+
<li class="oi">Out-of-Scope or Invalid and not verified
26+
</ul>
27+
28+
<p class=open>Open issues are marked like this</p>
29+
30+
<p>An issue can be closed as <code>Accepted</code>, <code>OutOfScope</code>,
31+
<code>Invalid</code>, <code>Rejected</code>, or <code>Retracted</code>.
32+
<code>Verified</code> indicates commentor's acceptance of the response.</p>
33+
<pre class='oi' id='issue-1'>
34+
Issue 1. <a href="#issue-1">#</a>
35+
Summary: Add start/end keywords to background-position
36+
From: i18nWG
37+
Comment: <a href="http://lists.w3.org/Archives/Public/www-style/2014Feb/0619.html">http://lists.w3.org/Archives/Public/www-style/2014Feb/0619.html</a>
38+
Response: <a href="http://lists.w3.org/Archives/Public/www-style/2014Mar/0124.html">http://lists.w3.org/Archives/Public/www-style/2014Mar/0124.html</a>
39+
Closed: OutOfScope
40+
Verified:
41+
</pre>
42+
<pre class='oi' id='issue-2'>
43+
Issue 2. <a href="#issue-2">#</a>
44+
Summary: Add logical border properties
45+
From: i18nWG
46+
Comment: <a href="http://lists.w3.org/Archives/Public/www-style/2014Feb/0620.html">http://lists.w3.org/Archives/Public/www-style/2014Feb/0620.html</a>
47+
Response: <a href="http://lists.w3.org/Archives/Public/www-style/2014Mar/0125.html">http://lists.w3.org/Archives/Public/www-style/2014Mar/0125.html</a>
48+
Closed: OutOfScope
49+
Verified:
50+
</pre>
51+
<pre class='a' id='issue-2'>
52+
Issue 2. <a href="#issue-2">#</a>
53+
Summary: Restore box-decoration-break
54+
From: i18nWG
55+
Comment: <a href="http://lists.w3.org/Archives/Public/www-style/2014Mar/0044.html">http://lists.w3.org/Archives/Public/www-style/2014Mar/0044.html</a>
56+
Response: <a href="http://lists.w3.org/Archives/Public/www-style/2014Mar/0091.html">http://lists.w3.org/Archives/Public/www-style/2014Mar/0091.html</a>
57+
Closed: Rejected
58+
Verified: <a href="http://lists.w3.org/Archives/Public/www-style/2014Mar/0102.html">http://lists.w3.org/Archives/Public/www-style/2014Mar/0102.html</a>
59+
</pre>

css-backgrounds/issues-lc-2014.txt

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
Draft: http://www.w3.org/TR/2014/WD-css3-background-20140204/
2+
Title: CSS Backgrounds and Borders Level 3
3+
4+
----
5+
Issue 1.
6+
Summary: Add start/end keywords to background-position
7+
From: i18nWG
8+
Comment: http://lists.w3.org/Archives/Public/www-style/2014Feb/0619.html
9+
Response: http://lists.w3.org/Archives/Public/www-style/2014Mar/0124.html
10+
Closed: OutOfScope
11+
Verified:
12+
----
13+
Issue 2.
14+
Summary: Add logical border properties
15+
From: i18nWG
16+
Comment: http://lists.w3.org/Archives/Public/www-style/2014Feb/0620.html
17+
Response: http://lists.w3.org/Archives/Public/www-style/2014Mar/0125.html
18+
Closed: OutOfScope
19+
Verified:
20+
----
21+
Issue 2.
22+
Summary: Restore box-decoration-break
23+
From: i18nWG
24+
Comment: http://lists.w3.org/Archives/Public/www-style/2014Mar/0044.html
25+
Response: http://lists.w3.org/Archives/Public/www-style/2014Mar/0091.html
26+
Closed: Rejected
27+
Verified: http://lists.w3.org/Archives/Public/www-style/2014Mar/0102.html
28+
----

css-box/Overview.src.html

Lines changed: 114 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -801,6 +801,11 @@ <h2>Introduction &amp; definitions</h2>
801801
the first paragraph, and so on, until the bottom (C edge) of the last
802802
paragraph becomes the bottom (foot edge) of the document.
803803

804+
<p>An element is called <dfn>orthogonal</dfn> if it either a
805+
<em>vertical</em> element with a <em>horizontal</em> <em>containing
806+
block</em> or a <em>horizontal</em> element with a <em>vertical</em>
807+
<em>containing block.</em> An <dfn>orthogonal flow</dfn> is a
808+
<em>flow</em> whose <em>flow root</em> is an orthogonal element.
804809

805810

806811
<h2>The viewport and the canvas</h2>
@@ -876,10 +881,12 @@ <h2 id=flows>Flows</h2>
876881
<!-- <li>The value of 'position' is 'absolute' or 'fixed' (see
877882
[CSS3POS]). -->
878883

879-
<li>The box is vertical and its parent is horizontal. <span
880-
class=issue>[Add link to the relevant section.]</span>
884+
<li>The box is <span>vertical</span> and its parent is
885+
<span>horizontal.</span> <span class=issue>[Add link to the relevant
886+
section.]</span>
881887

882-
<li>The box is horizontal and its parent is vertical.
888+
<li>The box is <span>horizontal</span> and its parent is
889+
<span>vertical.</span>
883890

884891
<!-- <li>The value of 'transform' is not 'none'. -->
885892

@@ -2964,9 +2971,111 @@ <h3 id=blockwidth>Block-level, non-replaced elements
29642971
calculated from their computed values, with any ''auto'' values
29652972
replaced by 0.
29662973

2967-
<p>If the computed value of the <span>block flow dimension</span> is
2974+
<div class=note>
2975+
2976+
<p>The complexity of this section comes from the fact that ''auto''
2977+
values on 'width' and 'height' are resolved differently for
2978+
<em>horizontal</em> and for <em>vertical</em> elements, and
2979+
differently for parallel flows then for <span>orthogonal
2980+
flows</span> (i.e., when the <em>containing block</em> is horizontal
2981+
and the element itself vertical, or vice-versa). In paginated
2982+
contexts, the element may further be split into boxes of unequal
2983+
sizes.
2984+
2985+
<p>The are three principles. The first is: If the element's size in
2986+
the direction of the <em title="containing block">containing
2987+
block's</em> <em>inline dimension</em> (i.e., between the <em>B
2988+
edge</em> and the <em>D edge</em>) is ''auto'', then that size is
2989+
the same as the containing block (minus the element's own margins,
2990+
padding and borders, if applicable).
2991+
2992+
<p>The second principle applies to orthogonal flows only, and only
2993+
if they are not in a paginated environment: If an element is
2994+
orthogonal and its inline dimension (i.e., the distance between its
2995+
<em>A edge</em> and <em>C edge</em>) is ''auto'', then it is treated
2996+
as a <a
2997+
href="http://www.w3.org/TR/css3-multicol/#multi-column-element"
2998+
>multi-column element</a> [[!CSS3COL]] and 'column-width', if not
2999+
already set, is set to a value derived from the containing block's
3000+
size and the <span>initial containing block</span>
3001+
3002+
<p>The last principle applies to orthogonal flows in a paginated
3003+
environment, e.g., in paged media or inside a multi-column element:
3004+
Just like in a non-paginated environment, if an element is
3005+
orthogonal and its inline dimension is ''auto'', then it is treated
3006+
as a <a
3007+
href="http://www.w3.org/TR/css3-multicol/#multi-column-element"
3008+
>multi-column element</a> [[!CSS3COL]] and 'column-width', if not
3009+
already set, is set to a certain value. But, in addition, if that
3010+
means that the first column would be so wide as stick out of the
3011+
page or column (the <a
3012+
href="http://www.w3.org/TR/css3-break/Overview.html#fragmentainer"
3013+
>“fragmentainer,”</a> see [[CSS3-BREAK]]), then that first column is
3014+
made narrower until it fits. But not narrower than
3015+
''min-content''. (If at that size it still doesn't fit, it may
3016+
instead be moved to the next page/column or, if that is not
3017+
possible, overflow.)
3018+
3019+
</div>
3020+
3021+
3022+
3023+
<p>In a paginated environment, in particular inside a page or a
3024+
column with a fixed height, it may be that such a vertical element
3025+
with ''auto'' height would be too tall and would stick out below the
3026+
page or column. In that case, it is laid out with a smaller line
3027+
length, such that it doesn't stick out. (But not smaller than
3028+
''min-content'')
3029+
3030+
<p>Whether in a paginated environment or not, such a vertical
3031+
element, including its margin, padding and border, may be too wide
3032+
for its containing block. In that case it is paginated. The
3033+
different fragments that result from that may have a different line
3034+
lengths in that case, e.g., in the case of the following figure. The
3035+
fragments each have the top and bottom margin, padding and border of
3036+
the element (although in a paginated environment, some of those
3037+
margins disappear).
3038+
3039+
<div class=figure>
3040+
<p><img src="paginated-ortho" alt="Two pages of a book">
3041+
3042+
<p class=caption>A horizontal text (represented by letters A, B, C…)
3043+
containing a section with vertical text (represented by digits 1, 2,
3044+
3…). The document is paginated and the vertical text ends up split
3045+
over two pages. Note that the fragment of vertical text on the first
3046+
page has a longer line length (<em>inline dimension</em>) than the
3047+
fragment on the second page.
3048+
</div>
3049+
3050+
<p>If the containing block is vertical, the situation is analogous,
3051+
but with width and height changing roles:
3052+
3053+
<p>The height of the element itself is either as specified, or, if
3054+
it is ''auto'', calculated from the containing block's height by
3055+
subtracting the element's own margins, padding and border. (Which of
3056+
those are subtracted is determined by 'box-sizing'.)
3057+
3058+
<p>If the element is vertical, i.e., the same as its containing
3059+
block, this height is then used as the line length (<em>inline
3060+
dimension</em>) for laying out the element. And if the element is
3061+
horizontal, i.e., orthogonal to the containing block, its width is
3062+
used as line length, or, if that width is ''auto'', ''max-content is
3063+
used instead.
3064+
3065+
<p>If such a horizontal element with ''auto'' width would stick out
3066+
of the side of a page or a fixed-length column when set with
3067+
''max-content'', it is instead laid out to a smaller width (but not
3068+
narrower than ''min-content'').
3069+
3070+
<p>If a horizontal element, including its margin, padding and
3071+
border, is too tall for its containing block, it is paginated.
3072+
</div>
3073+
3074+
3075+
3076+
<p>If the computed value of the <span>block dimension</span> is
29683077
not ''auto'', then the used value is calculated by evaluating the
2969-
computed value. Otherwise, the <span>block flow dimension</span> is
3078+
computed value. Otherwise, the <span>block dimension</span> is
29703079
the distance between two edges that are defined as follows:
29713080

29723081
<ul>

0 commit comments

Comments
 (0)