8000 [css-multicol-1][meta] Update other specs that refer to multi-column … · w3c/csswg-drafts@17022ef · GitHub
Skip to content

Commit 17022ef

Browse files
fantasaifantasai
committed
[css-multicol-1][meta] Update other specs that refer to multi-column elements to refer to multi-column containers. Completes fix for #1965 
1 parent 76e59ca commit 17022ef

12 files changed

Lines changed: 35 additions & 35 deletions

File tree

‎css-align-3/Overview.bs‎

Lines changed: 7 additions & 7 deletions
< 13BD /tr>
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ spec:css-inline-3; type:property;
4646
text:dominant-baseline
4747
text:alignment-baseline
4848
spec:css-multicol-1; type:dfn;
49-
text:multi-column element
49+
text:multi-column container
5050
text:column box
5151
spec:css-overflow-3; type:dfn; text:scroll container
5252
spec:css-position-3; type:property; text:left
@@ -933,7 +933,7 @@ The 'justify-content' And 'align-content' Properties</h3>
933933
<tr>
934934
<th><a>Alignment Container</a>
935935
<td>
936-
The <a>multi-column element</a>’s content box.
936+
The <a>multi-column container</a>’s content box.
937937
<tr>
938938
<th><a lt="alignment subject">Alignment Subject(s)</a>
939939
<td>
@@ -960,7 +960,7 @@ The 'justify-content' And 'align-content' Properties</h3>
960960
both are defined as described in the column-sizing rules
961961
of [[!CSS-MULTICOL-1]].
962962

963-
In the case of multi-column elements with a non-''column-width/auto'' 'column-width',
963+
In the case of multi-column containers with a non-''column-width/auto'' 'column-width',
964964
'justify-content' values other than ''justify-content/normal'' or ''justify-content/stretch''
965965
cause the columns to take their specified 'column-width'
966966
rather than stretching to fill the container.
@@ -1806,7 +1806,7 @@ Row and Column Gutters: the 'row-gap' and 'column-gap' properties</h3>
18061806
Name: row-gap, column-gap
18071807
Value: normal | <<length-percentage>>
18081808
Initial: normal
1809-
Applies to: <a>multi-column elements</a>, <a>flex containers</a>, <a>grid containers</a>
1809+
Applies to: <a>multi-column containers</a>, <a>flex containers</a>, <a>grid containers</a>
18101810
Inherited: no
18111811
Percentages: refer to corresponding dimension of the content area
18121812
Media: visual
@@ -1844,7 +1844,7 @@ Row and Column Gutters: the 'row-gap' and 'column-gap' properties</h3>
18441844

18451845
: <dfn>normal</dfn>
18461846
:: The ''gap/normal'' represents
1847-
a used value of ''1em'' on <a>multi-column elements</a>,
1847+
a used value of ''1em'' on <a>multi-column containers</a>,
18481848
and a used value of ''0px'' in all other contexts.
18491849
</dl>
18501850

@@ -1855,7 +1855,7 @@ Row and Column Gutters: the 'row-gap' and 'column-gap' properties</h3>
18551855
The exact handling of these properties varies by layout container:
18561856

18571857
<dl>
1858-
<dt id="gap-multicol"><a>multi-column elements</a>
1858+
<dt id="gap-multicol"><a>multi-column containers</a>
18591859
<dd>
18601860
'column-gap' specifes the [=gutter=] between adjacent <a>column boxes</a>.
18611861
See [[CSS-MULTICOL-1]] for details on how this affects the layout of multicol elements.
@@ -1899,7 +1899,7 @@ Gap Shorthand: the 'gap' property</h3>
18991899
Name: gap
19001900
Value: <<'row-gap'>> <<'column-gap'>>?
19011901
Initial: see individual properties
1902-
Applies to: <a>multi-column elements</a>, <a>flex containers</a>, <a>grid containers</a>
1902+
Applies to: <a>multi-column containers</a>, <a>flex containers</a>, <a>grid containers</a>
19031903
Inherited: no
19041904
Percentages: refer to corresponding dimension of the content area
19051905
Media: visual

‎css-break-3/Overview.bs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ Fragmentation Model and Terminology</h2>
8383
<dt><dfn>fragmentation context</dfn></dt>
8484
<dd>
8585
An ordered series of <a>fragmentainers</a>,
86-
such as created by a <a href="https://www.w3.org/TR/css3-multicol/">multi-column element</a>,
86+
such as created by a <a href="https://www.w3.org/TR/css3-multicol/">multi-column container</a>,
8787
a chain of <a href="https://www.w3.org/TR/css3-regions">CSS regions</a>,
8888
or a <a href="https://www.w3.org/TR/css3-page/">paged media display</a>.
8989
A given fragmentation context can only have one block flow direction
@@ -204,9 +204,9 @@ Nested Fragmentation Flows</h3>
204204
</div>
205205

206206
<div class="note">
207-
Note that when a multi-column element breaks across pages,
207+
Note that when a multi-column container breaks across pages,
208208
it generates a new row of columns on the next page for the rest of its content,
209-
so that a page break within a multi-column element
209+
so that a page break within a multi-column container
210210
is always both a page break and a column break.
211211
</div>
212212

@@ -1049,7 +1049,7 @@ Joining Boxes for ''slice''</h4>
10491049
<dt>For boxes broken across columns</dt>
10501050
<dd>
10511051
Fragments are connected as if the column boxes were glued together
1052-
in the <a>block flow direction</a> of the multi-column element.
1052+
in the <a>block flow direction</a> of the multi-column container.
10531053
</dd>
10541054

10551055
<dt>For boxes broken across pages</dt>

‎css-flexbox-1/Overview.bs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3047,7 +3047,7 @@ Fragmenting Flex Layout</h2>
30473047
<li>
30483048
When a <a>multi-line</a> column flex container breaks,
30493049
each fragment has its own "stack" of flex lines,
3050-
just like each fragment of a multi-column element
3050+
just like each fragment of a multi-column container
30513051
has its own row of column boxes.
30523052

30533053
<li>

‎css-grid-1/Overview.bs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3621,7 +3621,7 @@ Grid Sizing Algorithm</h3>
36213621
depends on the <a>block size</a> of its <a>grid area</a>.
36223622
Examples include wrapped column <a>flex containers</a> (''flex-flow: column wrap''),
36233623
<a>orthogonal flows</a> ('writing-mode'),
3624-
and <a spec=css-multicol>multi-column elements</a>.
3624+
and <a spec=css-multicol>multi-column containers</a>.
36253625
</div>
36263626

36273627
<li>

‎css-grid-2/Overview.bs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,7 @@ Subgrid Sizing Algorithm</h3>
441441
depends on the <a>block size</a> of its <a>grid area</a>.
442442
Examples include wrapped column <a>flex containers</a> (''flex-flow: column wrap''),
443443
<a>orthogonal flows</a> ('writing-mode'),
444-
and <a spec=css-multicol>multi-column elements</a>.
444+
and <a spec=css-multicol>multi-column containers</a>.
445445
</div>
446446

447447
<li>

‎css-multicol-2/Overview.bs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Abstract: This is a delta specification over CSS Multi-column Level 1.
1414
its content will be integrated into this specification,
1515
which will then replace it.
1616
Until then, CSS Multi-column Level 2 only contains additions and extensions to level 1
17-
Ignored Terms: column-width, column-count, columns, column-gap, column-rule-color, column-rule-style, column-rule-width, column-rule, column-fill, multi-column element
17+
Ignored Terms: column-width, column-count, columns, column-gap, column-rule-color, column-rule-style, column-rule-width, column-rule, column-fill, multi-column container
1818
<!-- remove line above once this is no longer a delta spec -->
1919
Ignored Vars: column-gap, column-width
2020
</pre>
@@ -180,7 +180,7 @@ Spanning columns</h2>
180180
<dd>
181181
The number of columns spanned by the element
182182
depends on its <a>min-content</a> <a>outer size</a>
183-
in the inline direction of the <a>multi-column element</a>.
183+
in the inline direction of the <a>multi-column container</a>.
184184
If it is smaller than the used value of 'column-width',
185185
this is the same as if ''column-span: none'' had been specified.
186186
Otherwise, the number of columns spanned is the smallest positive integer <var>n</var>

‎css-overflow-4/Overview.bs‎

Lines changed: 1 addition & 1 deletion
562
Original file line numberDiff line numberDiff line change
@@ -559,7 +559,7 @@ the ''continue/fragments'' value of the 'continue' property.
559559
other box-level fixup.</span>
560560
Additionally, if the <a>fragment box</a> is also
561561
a multi-column box (as defined in [[!CSS3COL]]
-
<span class="issue">though it defines <i>multi-column element</i></span>)
562+
<span class="issue">though it defines <i>multi-column container</i></span>)
563563
any content that would lead to the creation of <a>overflow columns</a> [[!CSS3COL]]
564564
instead is flown into an additional fragment box.
565565
However, fragment boxes may themselves be broken

‎css-position-3/Overview.bs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1138,7 +1138,7 @@ The values of this property have the following meanings:
11381138
Use the container as the <span>containing box</span>.<br>
11391139
In the case of multi-column layout the individual column defines the containing
11401140
block even though the individual column is not an actual element "block box". If
1141-
not inside a multi-column element then this value computes to ''position-reference/auto''.
1141+
not inside a multi-column container then this value computes to ''position-reference/auto''.
11421142
</dd>
11431143
<dt><dfn>root</dfn></dt>
11441144
<dd>

‎css-regions-1/Overview.bs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ Regions flow breaking rules</h3>
314314
Breaking a <a>named flow</a> across a <a>region chain</a>
315315
is similar to breaking a document's content across pages
316316
(see [[CSS3PAGE]])
317-
or a multi-column element's content across column boxes
317+
or a multi-column container's content across column boxes
318318
(see [[CSS3COL]]).
319319
One difference is that page boxes are generated
320320
based on the available content
@@ -1498,7 +1498,7 @@ Multi-column regions</h2>
14981498
In particular,
14991499
when computing the
15001500
<a href="#rfcb-flow-fragment-height-resolution">flow fragment height</a>
1501-
of a multi-column element
1501+
of a multi-column container
15021502
that is associated with a <em><a>named flow</a></em>,
15031503
the 'column-fill'
15041504
[[!CSS3COL]]

‎css-sizing-3/Overview.bs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -709,16 +709,16 @@ New Column Sizing Values: the ''column-width/min-content'', ''column-width/max-c
709709
<!--
710710
<dt><dfn>stretch</dfn>
711711
<dd>Specifies the optimal column width as the <a>stretch-fit inline size</a>
712-
of the multi-column element.
712+
of the multi-column container.
713713
-->
714714

715715
<dt><dfn>min-content</dfn>
716716
<dd>Specifies the optimal column width as the <a>min-content inline size</a>
717-
of the multi-column element's contents.
717+
of the multi-column container's contents.
718718

719719
<dt><dfn>max-content</dfn>
720720
<dd>Specifies the optimal column width as the <a>max-content inline size</a>
721-
of the multi-column element's contents.
721+
of the multi-column container's contents.
722722
<!--
723723
<dt><dfn>fit-content</dfn>
724724
<dd>Specifies the optimal column width as
@@ -731,7 +731,7 @@ New Column Sizing Values: the ''column-width/min-content'', ''column-width/max-c
731731
</dl>
732732

733733
Note: The column width never varies by column.
734-
When the column width is informed by the multi-column element's contents
734+
When the column width is informed by the multi-column container's contents
735735
(as in the keywords above),
736736
all of its contents are taken under consideration
737737
and the calculated width is shared by all the columns.

0 commit comments

Comments
 (0)