Skip to content

Commit fba7178

Browse files
author
Sylvain Galineau
committed
[css3-animation] Merge for bugs 15249, 15338
2 parents 3e6dbe8 + 139e455 commit fba7178

6 files changed

Lines changed: 70 additions & 56 deletions

File tree

‎css3-exclusions/Exclusions.src.html‎

Lines changed: 32 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1487,13 +1487,6 @@ <h4 id="shape-inside-property">The 'shape-inside' Property</h4>
14871487
<p class="short-desc">Should we revisit the decision to not allow SVG path syntax in the shape-inside, shape-outside properties</p>
14881488
</div>
14891489
</div>
1490-
1491-
<div class="issue-marker" data-bug_id="16460" data-bug_status="NEW">
1492-
<a href="https://www.w3.org/Bugs/Public/show_bug.cgi?id=16460">Issue-16460</a>
1493-
<div class="issue-details">
1494-
<p class="short-desc">Specify overflow behavior for shape-inside</p>
1495-
</div>
1496-
</div>
14971490
</div>
14981491

14991492
<p>The values of this property have the following meanings:</p>
@@ -1537,6 +1530,30 @@ <h4 id="shape-inside-property">The 'shape-inside' Property</h4>
15371530
<img alt="Content flowing with and without a shape-inside" src="images/shape-inside-content.png"/>
15381531
<p class="caption">Effect of shape-inside on inline content.</p>
15391532
</div>
1533+
1534+
<p>Overflow content can overlap
1535+
the bottom edge of a shape-inside,
1536+
and overflow content can be displayed
1537+
below the content area defined by shape-inside.
1538+
When content overflows in the block direction,
1539+
the last line in the content area determines its width(s)
1540+
by finding the minimum shape width(s)
1541+
in the remaining area
1542+
between the line's top edge
1543+
and the shape's bottom edge.
1544+
This can result
1545+
in the line intersecting the shape's bottom edge,
1546+
or a zero-width line
1547+
if (for instance) the shape's bottom edge
1548+
is a continuous curve.
1549+
Further overflow is laid out
1550+
as if the shape-inside was set to 'auto'.</p>
1551+
1552+
<div class='figure'>
1553+
<img alt="Overflow interacting with rounded rect" style="display:inline-block;vertical-align:top" src="images/rounded-rect-overflow.png"/>
1554+
<img alt="Overflow interacting with ellipse" style="display:inline-block;vertical-align:top" src="images/ellipse-overflow.png"/>
1555+
<p class="caption">Overflow interacting with the bottom edge of shapes.</p>
1556+
</div>
15401557

15411558
<!-- End section "The shape-inside property" -->
15421559
<h4 id="shape-image-threshold-property">The 'shape-image-threshold' Property</h4>
@@ -1968,17 +1985,18 @@ <h2 class="no-num" id="change-log">Change Log</h2>
19681985

19691986
<h3>Since <a href="http://www.w3.org/TR/2012/WD-css3-exclusions-20120503/">May 3rd 2012</a></h3>
19701987
<ul>
1971-
<li>Added wrap-flow:minimum</li>
1972-
<li>Clarified processing model</li>
1973-
<li>Changed wrap-margin and wrap-padding to shape-margin and shape-padding</li>
1974-
<li>Removed wrap shorthand</li>
1988+
<li>Added overflow behavior for shape-inside.</li>
1989+
<li>Added wrap-flow:minimum.</li>
1990+
<li>Clarified processing model.</li>
1991+
<li>Changed wrap-margin and wrap-padding to shape-margin and shape-padding.</li>
1992+
<li>Removed wrap shorthand.</li>
19751993
</ul>
19761994

19771995
<h3>Since <a href="http://www.w3.org/TR/2011/WD-css3-exclusions-20111213/">December 13th 2011</a></h3>
19781996
<ul>
1979-
<li>Clarified processing model</li>
1980-
<li>Clarified interaction with floats</li>
1981-
<li>Clarified that an exclusion element establishes a new block formatting context</li>
1997+
<li>Clarified processing model.</li>
1998+
<li>Clarified interaction with floats.</li>
1999+
<li>Clarified that an exclusion element establishes a new block formatting context.</li>
19822000
</ul>
19832001

19842002
</body>

‎css3-exclusions/Overview.html‎

Lines changed: 32 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
<link href="http://purl.org/dc/terms/" rel=schema.DC>
1111
<meta content="CSS Exclusions and Shapes Module Level 3" name=DC.title>
1212
<meta content=text name=DC.type>
13-
<meta content=2012-09-13 name=DC.issued>
13+
<meta content=2012-10-01 name=DC.issued>
1414
<meta content="http://dev.w3.org/csswg/css3-exclusions/" name=DC.creator>
1515
<meta content=W3C name=DC.publisher>
16-
<meta content="http://www.w3.org/TR/2012/ED-css3-exclusions-20120913/"
16+
<meta content="http://www.w3.org/TR/2012/ED-css3-exclusions-20121001/"
1717
name=DC.identifier>
1818
<link href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright"
1919
rel=DC.rights>
@@ -50,15 +50,14 @@
5050

5151
<h1 id=css-exclusions-module>CSS Exclusions and Shapes Module Level 3</h1>
5252

53-
<h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 13 September
54-
2012</h2>
53+
<h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 1 October 2012</h2>
5554

5655
<dl>
5756
<dt>This version:
5857

5958
<dd><a
6059
href="http://dev.w3.org/csswg/css3-exclusions/">http://dev.w3.org/csswg/css3-exclusions/</a></dd>
61-
<!--<dd><a href="http://www.w3.org/TR/2012/ED-css3-exclusions-20120913/">http://www.w3.org/TR/2012/WD-css3-exclusions-20120913/</a></dd>-->
60+
<!--<dd><a href="http://www.w3.org/TR/2012/ED-css3-exclusions-20121001/">http://www.w3.org/TR/2012/WD-css3-exclusions-20121001/</a></dd>-->
6261

6362
<dt>Latest version:
6463

@@ -1953,14 +1952,6 @@ <h4 id=shape-inside-property><span class=secno>4.4.2. </span>The ‘<a
19531952
syntax in the shape-inside, shape-outside properties
19541953
</div>
19551954
</div>
1956-
1957-
<div class=issue-marker data-bug_id=16460 data-bug_status=NEW> <a
1958-
href="https://www.w3.org/Bugs/Public/show_bug.cgi?id=16460">Issue-16460</a>
1959-
1960-
<div class=issue-details>
1961-
<p class=short-desc>Specify overflow behavior for shape-inside
1962-
</div>
1963-
</div>
19641955
</div>
19651956

19661957
<p>The values of this property have the following meanings:
@@ -2017,6 +2008,24 @@ <h4 id=shape-inside-property><span class=secno>4.4.2. </span>The ‘<a
20172008
src="images/shape-inside-content.png">
20182009
<p class=caption>Effect of shape-inside on inline content.
20192010
</div>
2011+
2012+
<p>Overflow content can overlap the bottom edge of a shape-inside, and
2013+
overflow content can be displayed below the content area defined by
2014+
shape-inside. When content overflows in the block direction, the last line
2015+
in the content area determines its width(s) by finding the minimum shape
2016+
width(s) in the remaining area between the line's top edge and the shape's
2017+
bottom edge. This can result in the line intersecting the shape's bottom
2018+
edge, or a zero-width line if (for instance) the shape's bottom edge is a
2019+
continuous curve. Further overflow is laid out as if the shape-inside was
2020+
set to ‘<code class=property>auto</code>’.
2021+
2022+
<div class=figure> <img alt="Overflow interacting with rounded rect"
2023+
src="images/rounded-rect-overflow.png"
2024+
style="display:inline-block;vertical-align:top"> <img
2025+
alt="Overflow interacting with ellipse" src="images/ellipse-overflow.png"
2026+
style="display:inline-block;vertical-align:top">
2027+
<p class=caption>Overflow interacting with the bottom edge of shapes.
2028+
</div>
20202029
<!-- End section "The shape-inside property" -->
20212030

20222031
<h4 id=shape-image-threshold-property><span class=secno>4.4.3. </span>The
@@ -2842,26 +2851,29 @@ <h3 id=since-may-3rd-2012><span class=secno>5.7. </span>Since <a
28422851
2012</a></h3>
28432852

28442853
<ul>
2845-
<li>Added wrap-flow:minimum
2854+
<li>Added overflow behavior for shape-inside.
2855+
2856+
<li>Added wrap-flow:minimum.
28462857

2847-
<li>Clarified processing model
2858+
<li>Clarified processing model.
28482859

2849-
<li>Changed wrap-margin and wrap-padding to shape-margin and shape-padding
2860+
<li>Changed wrap-margin and wrap-padding to shape-margin and
2861+
shape-padding.
28502862

2851-
<li>Removed wrap shorthand
2863+
<li>Removed wrap shorthand.
28522864
</ul>
28532865

28542866
<h3 id=since-december-13th-2011><span class=secno>5.8. </span>Since <a
28552867
href="http://www.w3.org/TR/2011/WD-css3-exclusions-20111213/">December
28562868
13th 2011</a></h3>
28572869

28582870
<ul>
2859-
<li>Clarified processing model
2871+
<li>Clarified processing model.
28602872

2861-
<li>Clarified interaction with floats
2873+
<li>Clarified interaction with floats.
28622874

28632875
<li>Clarified that an exclusion element establishes a new block formatting
2864-
context
2876+
context.
28652877
</ul>
28662878
</html>
28672879
<!-- Keep this comment at the end of the file

‎css3-exclusions/images/ellipse-overflow.graffle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -680,7 +680,7 @@
680680
</dict>
681681
<dict>
682682
<key>Bounds</key>
683-
<string>{{224, 256}, {124.00000762939453, 28.75}}</string>
683+
<string>{{144.00004291534424, 256}, {287.99996948242188, 28.75}}</string>
684684
<key>Class</key>
685685
<string>ShapedGraphic</string>
686686
<key>FontInfo</key>
@@ -838,7 +838,7 @@
838838
<key>MasterSheets</key>
839839
<array/>
840840
<key>ModificationDate</key>
841-
<string>2012-09-28 00:12:28 +0000</string>
841+
<string>2012-10-01 20:14:45 +0000</string>
842842
<key>Modifier</key>
843843
<string>Alan Stearns</string>
844844
<key>NotesVisible</key>

‎css3-exclusions/images/ellipse-overflow.png‎

-53 Bytes
Loading

‎css3-regions/Overview.html‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
<link href="http://purl.org/dc/terms/" rel=schema.DC>
1111
<meta content="CSS Regions Module Level 3" name=DC.title>
1212
<meta content=text name=DC.type>
13-
<meta content=2012-09-27 name=DC.issued>
13+
<meta content=2012-10-01 name=DC.issued>
1414
<meta content="Vincent Hardy" name=DC.creator>
1515
<meta content="Alex Mogilevsky" name=DC.creator>
1616
<meta content="Alan Stearns" name=DC.creator>
1717
<meta content=W3C name=DC.publisher>
18-
<meta content="http://www.w3.org/TR/2012/ED-css3-regions-20120927/"
18+
<meta content="http://www.w3.org/TR/2012/ED-css3-regions-20121001/"
1919
name=DC.identifier>
2020
<link href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright"
2121
rel=DC.rights>
@@ -50,14 +50,13 @@
5050

5151
<h1 id=css-regions-module>CSS Regions Module Level 3</h1>
5252

53-
<h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 27 September
54-
2012</h2>
53+
<h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 1 October 2012</h2>
5554

5655
<dl>
5756
<dt>This version:
5857

5958
<dd><a
60-
href="http://www.w3.org/TR/2012/ED-css3-regions-20120927/">http://www.w3.org/csswg/css3-regions</a>
59+
href="http://www.w3.org/TR/2012/ED-css3-regions-20121001/">http://www.w3.org/csswg/css3-regions</a>
6160

6261
<dt>Latest version:
6362

@@ -974,14 +973,6 @@ <h3 id=the-flow-from-property><span class=secno>3.2. </span>The ‘<a
974973
between regions
975974
</div>
976975
</div>
977-
978-
<div class=issue-marker data-bug_id=16636 data-bug_status=NEW> <a
979-
href="https://www.w3.org/Bugs/Public/show_bug.cgi?id=16636">Issue-16636</a>
980-
981-
<div class=issue-details>
982-
<p class=short-desc>Should re-introduce region order
983-
</div>
984-
</div>
985976
</div>
986977

987978
<p><a href="#css-region" title=region>CSS Regions</a> create a new <a

‎css3-regions/Overview.src.html‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -797,13 +797,6 @@ <h3 id="the-flow-from-property">The 'flow-from' property</h3>
797797
<p class="short-desc">Specify behavior of stacking contexts that are split between regions</p>
798798
</div>
799799
</div>
800-
801-
<div class="issue-marker" data-bug_id="16636" data-bug_status="NEW">
802-
<a href="https://www.w3.org/Bugs/Public/show_bug.cgi?id=16636">Issue-16636</a>
803-
<div class="issue-details">
804-
<p class="short-desc">Should re-introduce region order</p>
805-
</div>
806-
</div>
807800
</div>
808801

809802
<p><span title="region">CSS Regions</span> create a new <a href="http://www.w3.org/TR/CSS2/visuren.html#z-index">stacking context</a>. <span title="region">CSS Regions</span> establish a new <a href="http://www.w3.org/TR/CSS2/visuren.html#block-formatting">block formatting Context</a>.</p>

0 commit comments

Comments
 (0)