[css2] Restructured visual rendering model chapters into box/flow-model/detailed-calculations/visualfx

ianbjacobs · ianbjacobs · commit 0f274f4f7504 · 1998-03-17T08:05:09.000Z
--HG--
extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%401250
diff --git a/css2/Makefile b/css2/Makefile
@@ -1,6 +1,6 @@
 # Makefile to generate the CSS2 document based on its "source files"
 # Arnaud Le Hors - lehors@w3.org
-# $Id: Makefile,v 2.18 1998-03-16 14:19:35 ijacobs Exp $
+# $Id: Makefile,v 2.19 1998-03-17 08:03:53 ijacobs Exp $
 
 # what needs to be set for every new release:
 # Note use of full year (1998) in identifier.
@@ -28,6 +28,7 @@ syndata.src\
 selector.src\
 cascade.src\
 media.src\
+box.src\
 visuren.src\
 visudet.src\
 visufx.src\
@@ -67,6 +68,7 @@ syndata.html\
 selector.html\
 cascade.html\
 media.html\
+box.html\
 visuren.html\
 visudet.html\
 visufx.html\
diff --git a/css2/Project.cfg b/css2/Project.cfg
@@ -10,7 +10,7 @@
 # value contains spaces.
 #
 # Bert Bos <bert@w3.org>
-# $Id: Project.cfg,v 2.2 1998-02-18 14:32:44 bbos Exp $
+# $Id: Project.cfg,v 2.3 1998-03-17 08:03:57 ijacobs Exp $
 
 @source-extension .src
 
@@ -38,6 +38,7 @@
 @chapter selector.html
 @chapter cascade.html
 @chapter media.html
+@chapter box.html
 @chapter visuren.html
 @chapter visudet.html
 @chapter visufx.html
diff --git a/css2/about.src b/css2/about.src
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html lang="en">
-<!-- $Id: about.src,v 2.18 1998-03-16 14:53:13 ijacobs Exp $ -->
+<!-- $Id: about.src,v 2.19 1998-03-17 08:03:59 ijacobs Exp $ -->
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <TITLE>About the CSS2 Specification</TITLE>
@@ -44,7 +44,7 @@ version of the document.
 <dd>The introduction includes a brief tutorial on CSS2 and
 a discussion of design principles behind CSS2. 
 
-<dt><strong>Sections 3 - 19: CSS2 reference manual.</strong>
+<dt><strong>Sections 3 - 20: CSS2 reference manual.</strong>
 
 <dd>The bulk of the reference manual consists of the CSS2 language
 reference. This reference defines what may go into a CSS2 style sheet
diff --git a/css2/cascade.src b/css2/cascade.src
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html lang="en">
-<!-- $Id: cascade.src,v 2.17 1998-03-17 01:30:17 ijacobs Exp $ -->
+<!-- $Id: cascade.src,v 2.18 1998-03-17 08:04:04 ijacobs Exp $ -->
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <TITLE>Assigning property values, Cascading, and Inheritance</TITLE>
@@ -428,7 +428,7 @@ equivalent to declaring all of its sub-properties to be "!important".
 
 <P> The first rule in the user's style sheet in the following example
 contains an "!important" declaration, which override the corresponding
-declaration in the authors's styles sheet.  The second declaration
+declaration in the author's styles sheet.  The second declaration
 will also win due to being marked "!important". However, the third
 rule in the user's style sheet is not "!important" and will therefore
 lose to the second rule in the author's style sheet (which happens to
diff --git a/css2/colors.src b/css2/colors.src
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html lang="en">
-<!-- $Id: colors.src,v 2.8 1998-03-14 23:31:06 ijacobs Exp $ -->
+<!-- $Id: colors.src,v 2.9 1998-03-17 08:04:08 ijacobs Exp $ -->
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <TITLE>Colors and backgrounds</TITLE>
@@ -37,12 +37,12 @@ EM { color: rgb(255,0,0) }     /* RGB range 0-255   */
 
 <P>Authors may specify the background of an element (i.e., its
 rendering surface) as either a color or an image.  In terms of the <a
-href="visuren.html#box-model">box model</a>, "background" refers to
+href="box.html#box-model">box model</a>, "background" refers to
 the background of the <a
-href="visuren.html#box-content-area">content</a> and the <a
-href="visuren.html#box-padding-area">padding</a> area. Border colors
+href="box.html#box-content-area">content</a> and the <a
+href="box.html#box-padding-area">padding</a> area. Border colors
 and styles are set with the <a
-href="visudet.html#border-properties">border properties</a>.  Margins
+href="box.html#border-properties">border properties</a>.  Margins
 are always transparent so the background of the parent box always
 shines through.
 
@@ -164,8 +164,8 @@ P { background-image: none }
 
 <P>If a background image is specified, this property specifies whether
 the image is repeated (tiled), and how.  All tiling covers the <a
-href="visuren.html#box-content-area">content</a> and <a
-href="visuren.html#box-padding-area">padding</a> areas of a box.
+href="box.html#box-content-area">content</a> and <a
+href="box.html#box-padding-area">padding</a> areas of a box.
 Values have the following meanings:</p>
 
 <dl>
@@ -246,7 +246,7 @@ class="value-inst-percentage"><strong>&lt;percentage&gt;</strong></span></span>
 class="value-inst-percentage"><strong>&lt;percentage&gt;</strong></span></span>
 <dd> With a value pair of '0% 0%', the upper left corner of the image
 is aligned with the upper left corner of the box's <a
-href="visuren.html#padding-edge">padding edge</a>.  A value pair of
+href="box.html#padding-edge">padding edge</a>.  A value pair of
 '100% 100%' places the lower right corner of the image in the lower
 right corner of the box. With a value pair of '14% 84%', the point
 14% across and 84% down the image is to be placed at the point 14%
diff --git a/css2/fonts.src b/css2/fonts.src
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html lang="en">
-<!-- $Id: fonts.src,v 2.24 1998-03-16 21:41:06 ijacobs Exp $ -->
+<!-- $Id: fonts.src,v 2.25 1998-03-17 08:04:16 ijacobs Exp $ -->
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <TITLE>Fonts</TITLE>
@@ -56,7 +56,7 @@ than generic default fonts.
 <P>CSS2 changes all that, and allows much greater liberty for:</p>
 
 <ul><li>stylesheet authors, to describe the fonts they want to be used
-<li>use ragents, in selecting a font when an author's requested font is not immediately
+<li>user agents, in selecting a font when an author's requested font is not immediately
 available.
 </ul>
 
diff --git a/css2/generate.src b/css2/generate.src
@@ -714,7 +714,7 @@ the alignment of the text in the marker box.
 <P>The <span class="propinst-marker-offset">'marker-offset'</span>
 property specifies the horizontal offset between a marker box and the
 associated principal box. The distance is measured between their <a
-href="visuren.html#border-edge">border edges</a>.
+href="box.html#border-edge">border edges</a>.
 
 <p class="note">[Is this offset kept constant, even if
 'overflow:visible'? I would say it gets smaller. BB]
diff --git a/css2/page.src b/css2/page.src
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html lang="en">
-<!-- $Id: page.src,v 2.14 1998-03-17 05:19:01 ijacobs Exp $ -->
+<!-- $Id: page.src,v 2.15 1998-03-17 08:04:30 ijacobs Exp $ -->
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <TITLE>Paged media</TITLE>
@@ -20,7 +20,7 @@ as follows:</p>
 
 <ol>
 <li>The <a href="#page-box">page
-box</a> extends the <a href="visuren.html#box-model">box
+box</a> extends the <a href="box.html#box-model">box
 model</a> to allow authors to specify the size of a page, its margins,
 etc.  
 
@@ -68,18 +68,18 @@ embedded areas:</p>
 name="page-area"><dfn>page area</dfn></a></span>. The page
 area includes the boxes laid out on that page.
 The edges of the page area act as a <a
-href="visudet.html#containing-block">containing block</a> for layout
+href="visuren.html#containing-block">containing block</a> for layout
 that occurs between page breaks. It also acts as the <a
-href="visudet.html#initial-containing-block">initial containing
+href="visuren.html#initial-containing-block">initial containing
 block</a>. 
-<li>The margin area (see the <a href="visuren.html#box-margin-area">
+<li>The margin area (see the <a href="box.html#box-margin-area">
 margin area</a> of the box model).
 </ul>
 
 <div class="note"><P> 
 <em><strong>Note.</strong> In CSS2, the <a
-href="./visudet.html#border-properties">border properties</a> and <a
-href="./visudet.html#padding-properties">padding properties</a> 
+href="./box.html#border-properties">border properties</a> and <a
+href="./box.html#padding-properties">padding properties</a> 
 do not apply to pages; they may in the future.
 </em>
 </div>
@@ -112,7 +112,7 @@ For example, the following @page rule sets the margins of the page to 2cm.
 
 <h3><a name="page-margins">Page margins</a></h3>
 
-<P>The <a href="visudet.html#margin-properties">margin properties</a>
+<P>The <a href="box.html#margin-properties">margin properties</a>
 (<span class="propinst-margin-top">'margin-top'</span>, <span
 class="propinst-margin-right">'margin-right'</span>, <span
 class="propinst-margin-bottom">'margin-bottom'</span>, <span
@@ -191,7 +191,7 @@ target size so if the target sheet dimensions are
 property create an absolute page box. If only one length value is
 specified, it sets both the width and height of the page box (i.e.,
 the box is a square). Since the page box is the <a
-href="visudet.html#initial-containing-block">initial containing
+href="visuren.html#initial-containing-block">initial containing
 block</a>, percentage values are not allowed for the <span
 class="propinst-size">'size'</span> property.
 
diff --git a/css2/selector.src b/css2/selector.src
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.0 Transitional//EN'>
 <html lang="en">
-<!-- $Id: selector.src,v 2.30 1998-03-17 01:30:23 ijacobs Exp $ -->
+<!-- $Id: selector.src,v 2.31 1998-03-17 08:04:36 ijacobs Exp $ -->
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Selectors</title>
@@ -1111,9 +1111,9 @@ class="propinst-vertical-align">'vertical-align'</span> (only if
 'float' is 'none'), <span
 class="propinst-text-transform">'text-transform',</span> <span
 class="propinst-line-height">'line-height',</span> <a
-href="visudet.html#margin-properties">margin properties,</a> <a
-href="visudet.html#padding-properties">padding properties,</a> <a
-href="visudet.html#border-properties">border properties,</a> <span
+href="box.html#margin-properties">margin properties,</a> <a
+href="box.html#padding-properties">padding properties,</a> <a
+href="box.html#border-properties">border properties,</a> <span
 class="propinst-float">'float',</span> and <span
 class="propinst-clear">'clear'.</span></p>
 
diff --git a/css2/syndata.src b/css2/syndata.src
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html lang="en">
-<!-- $Id: syndata.src,v 2.39 1998-03-17 05:19:08 ijacobs Exp $ -->
+<!-- $Id: syndata.src,v 2.40 1998-03-17 08:04:41 ijacobs Exp $ -->
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <TITLE>CSS2 syntax and basic data types</TITLE>
@@ -755,7 +755,7 @@ example a length. Each property that allows percentages also defines
 the value to which the percentage refers. The value may be that of
 another property for the same element, a property for an ancestor
 element, or a value of the rendering context (e.g., the width of a <a
-href="visudet.html#containing-block">containing block</a>). When a
+href="visuren.html#containing-block">containing block</a>). When a
 percentage value is set for a property of the <a
 href="conform.html#root">root</a> element and the percentage is
 defined as referring to the inherited value of some property, the
diff --git a/css2/tables.src b/css2/tables.src
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html lang="en">
-<!-- $Id: tables.src,v 2.21 1998-03-17 05:19:17 ijacobs Exp $ -->
+<!-- $Id: tables.src,v 2.22 1998-03-17 08:04:47 ijacobs Exp $ -->
 <head>
 <meta http-equiv="Content-Type" content="text/html;charset=ISO-8859-1">
 <title>Tables</title>
@@ -531,7 +531,7 @@ margin, as a result of a negative 'margin-left' property.
 
 <P>Like other elements of the <a
 href="conform.html#doclanguage">document language</a>, table elements
-generate rectangular <a href="visuren.html#box-dimensions">boxes</a>
+generate rectangular <a href="box.html#box-dimensions">boxes</a>
 with content, padding, border, and margin areas.
 
 <h3><a name="spanning-props">Row and column spans:</a> <span
@@ -924,7 +924,7 @@ cells, by lowering the bottom.</p>
 
 <p>Cells that are smaller than the height of the row will get extra
 padding added at their top or bottom. As a result, the <a
-href="visuren.html#box-padding-area">padding area</a> at the top and
+href="box.html#box-padding-area">padding area</a> at the top and
 bottom of each cell box after positioning must be at least as large as
 the <span class="propinst-padding">'padding'</span> property
 specifies. <!--The height of the row must be as small as possible without
diff --git a/css2/ui.src b/css2/ui.src
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html lang="en">
-<!-- $Id: ui.src,v 2.8 1998-03-17 01:19:15 ijacobs Exp $ -->
+<!-- $Id: ui.src,v 2.9 1998-03-17 08:04:52 ijacobs Exp $ -->
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <TITLE>User interface</TITLE>
@@ -201,12 +201,12 @@ the element, i.e., the outline is always on top, and doesn't influence
 the position or size of the element, or of any other elements.
 
 <p>The outline is drawn just outside the <a
-href="visuren.html#border-edge">border edge</a>.
+href="box.html#border-edge">border edge</a>.
 
 <p>Outlines may be non-rectangular. For example, if the element is
 broken across several lines, the outline is the minimum outline that
 encloses all the element's boxes. In contrast to <a
-href="visudet.html#border-properties">borders</a>, the outline is not
+href="box.html#border-properties">borders</a>, the outline is not
 open at the line box's end or start, but is always fully connected.
 
 <p>The <span class="propinst-outline-width">'outline-width'</span>
diff --git a/css2/visudet.src b/css2/visudet.src
diff --git a/css2/visufx.src b/css2/visufx.src
diff --git a/css2/visuren.src b/css2/visuren.src
