8000 merge · simonwuelker/csswg-drafts@6b65425 · GitHub
Skip to content

Commit 6b65425

Browse files
committed
merge
2 parents 19fbb2a + 8bbd391 commit 6b65425

2 files changed

Lines changed: 18 additions & 17 deletions

File tree

css3-page-template/Overview.html

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@
2626

2727
<h1>CSS Pagination Templates Module Level 3</h1>
2828

29-
<h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 6 May 2012</h2>
29+
<h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 8 May 2012</h2>
3030

3131
<dl>
3232
<dt>This version:
33-
<!--<dd><a href="http://www.w3.org/TR/2012/ED-css3-page-template-20120506/">http://www.w3.org/TR/2012/ED-css3-page-template-20120506/</a>-->
33+
<!--<dd><a href="http://www.w3.org/TR/2012/ED-css3-page-template-20120508/">http://www.w3.org/TR/2012/ED-css3-page-template-20120508/</a>-->
3434

3535

3636
<dd><a
@@ -83,7 +83,7 @@ <h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 6 May 2012</h2>
8383

8484
<h2 class="no-num no-toc" id=abstract>Abstract</h2>
8585

86-
<p>The Pagination Templates module describes templates that can be defined
86+
<p>The Pagination Templates module describes templates that generate boxes
8787
in CSS to display content in a paginated view. These templates define a
8888
page containing one or more boxes with content assignments. As content
8989
overflows additional pages are generated using template selection rules
@@ -179,10 +179,10 @@ <h2 id=intro><span class=secno>1. </span>Introduction</h2>
179179
canvas. Pagination templates provide a mechanism for a &lsquo;<code
180180
class=property>paginated</code>&rsquo; experience that applies to
181181
on-screen presentation as well as printed media. Pagination templates
182-
describe the layout of pages in which content is displayed as the user
183-
moves from page to page on screen or prints the document content. When
184-
content is laid out using pagination templates, pages are generated as
185-
needed to accommodate all the content.
182+
define boxes in CSS where content is displayed as the user moves from page
183+
to page on screen or prints the document. When content is laid out using
184+
pagination templates, pages are generated as needed to accommodate all the
185+
content.
186186

187187
<div class="issue-marker wrapper">
188188
<div class=issue-marker>
@@ -234,8 +234,9 @@ <h2 id=templates-and-slots><span class=secno>2. </span>Pagination Templates
234234
and Slots</h2>
235235

236236
<p>An @template rule defines and names a pagination template. Pagination
237-
templates contain one or more slots to display content. An element can use
238-
pagination templates if its &lsquo;<code
237+
templates contain one or more slots to display content. These slots create
238+
boxes for each page generated from a pagination template. An element can
239+
use pagination templates if its &lsquo;<code
239240
class=property>overflow-style</code>&rsquo; property is set to any of the
240241
paged-* values defined in css3-gcpm. If a document defines no pagination
241242
templates, then there is an implicit pagination template with a single
@@ -253,9 +254,9 @@ <h2 id=templates-and-slots><span class=secno>2. </span>Pagination Templates
253254
paginated element's box.
254255

255256
<p>A slot is an anonymous box in a pagination template where content can be
256-
placed. In an @template rule @slot rules name and create slots. The order
257-
of @slot rules determines the order of the boxes in the pagination
258-
template.
257+
placed. In an @template rule @slot rules create slots. The order of @slot
258+
rules determines the order of the boxes in the pagination template. @slot
259+
rules can define a name for the slot.
259260

260261
<p>Slots default to displaying the content of the paginated element. Slots
261262
can instead contain generated content assigned with the content property.

css3-page-template/Overview.src.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ <h2 class="no-num no-toc">[LONGSTATUS] [DATE]</h2>
5757

5858
<h2 class="no-num no-toc" id="abstract">Abstract</h2>
5959

60-
<p>The Pagination Templates module describes templates that can be defined in CSS to display content in a paginated view. These templates define a page containing one or more boxes with content assignments. As content overflows additional pages are generated using template selection rules until all of the content is displayed.
60+
<p>The Pagination Templates module describes templates that generate boxes in CSS to display content in a paginated view. These templates define a page containing one or more boxes with content assignments. As content overflows additional pages are generated using template selection rules until all of the content is displayed.
6161

6262
<h2 class="no-num no-toc" id="status">Status of this document</h2>
6363

@@ -76,7 +76,7 @@ <h2 id="intro">Introduction</h2>
7676

7777
<p><em>This section is not normative.</em>
7878

79-
<p>This module describes how to define pagination templates in CSS. In CSS 2.1 content displayed on-screen is assumed to be a single continuous canvas. Pagination templates provide a mechanism for a 'paginated' experience that applies to on-screen presentation as well as printed media. Pagination templates describe the layout of pages in which content is displayed as the user moves from page to page on screen or prints the document content. When content is laid out using pagination templates, pages are generated as needed to accommodate all the content.
79+
<p>This module describes how to define pagination templates in CSS. In CSS 2.1 content displayed on-screen is assumed to be a single continuous canvas. Pagination templates provide a mechanism for a 'paginated' experience that applies to on-screen presentation as well as printed media. Pagination templates define boxes in CSS where content is displayed as the user moves from page to page on screen or prints the document. When content is laid out using pagination templates, pages are generated as needed to accommodate all the content.
8080

8181
<div class="issue-marker wrapper">
8282
<div class="issue-marker"><div class="issue-details">The draft as it stands requires pagination to present the repeated template layouts. Other methods of repeating template layouts to accommodate content might be specified, but the draft would need to be reviewed to remove all reliances on paged displays.</div></div>
@@ -87,7 +87,7 @@ <h2 id="intro">Introduction</h2>
8787

8888
<p>Multiple pagination templates can be defined for a given document. A paginated element can use a single template or select from a set of templates each time a new page needs to be generated. Which template is used for a given page can be defined by a selector or by choosing a template based on available content. Elements can further constrain the applicable template set by listing a subset of templates that apply.
8989

90-
90+
9191
<h3 id="placement">Module Interactions</h3>
9292

9393
<p>This module uses named flows and region chains defined in [[CSS3-REGIONS]].
@@ -96,13 +96,13 @@ <h3 id="placement">Module Interactions</h3>
9696

9797
<h2 id="templates-and-slots">Pagination Templates and Slots</h2>
9898

99-
<p>An @template rule defines and names a pagination template. Pagination templates contai 7CA8 n one or more slots to display content. An element can use pagination templates if its 'overflow-style' property is set to any of the paged-* values defined in css3-gcpm. If a document defines no pagination templates, then there is an implicit pagination template with a single slot containing the paginated element's contents.
99+
<p>An @template rule defines and names a pagination template. Pagination templates contain one or more slots to display content. These slots create boxes for each page generated from a pagination template. An element can use pagination templates if its 'overflow-style' property is set to any of the paged-* values defined in css3-gcpm. If a document defines no pagination templates, then there is an implicit pagination template with a single slot containing the paginated element's contents.
100100

101101
<div class="issue-marker"><div class="issue-details">Instead of a dependency on GCPM, this spec could define what happens with a paginated view, without specifying how the paginated view comes into existence. What happens when you apply 'overflow-style:paged-x' to an iframe or region?</div></div>
102102

103103
<p>The box created from an @template rule defaults to the size of the paginated element's box.
104104

105-
<p>A slot is an anonymous box in a pagination template where content can be placed. In an @template rule @slot rules name and create slots. The order of @slot rules determines the order of the boxes in the pagination template.
105+
<p>A slot is an anonymous box in a pagination template where content can be placed. In an @template rule @slot rules create slots. The order of @slot rules determines the order of the boxes in the pagination template. @slot rules can define a name for the slot.
106106

107107
<p>Slots default to displaying the content of the paginated element. Slots can instead contain generated content assigned with the content property. Slots can also be assigned content from named flows.
108108

0 commit comments

Comments
 (0)