[css2] First pass at changing "rendering" to "formatting" in select cases.

ianbjacobs · ianbjacobs · commit fb840189a297 · 1998-04-22T23:04:52.000Z
Some thoughts:

 - "aural formatting" sounds strange. I prefer "aural rendering".
 - "visual formatting" means layout. Visual formatting model ok.
 - Not all things visual are formatted (e.g., I think it sounds better
   to "render" a color, not to format it.)

 - "rendering structure" changed to "formatting structure".
   Do you want "formatting object" instead?

--HG--
extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%401521
diff --git a/css2/box.src b/css2/box.src
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html lang="en">
-<!-- $Id: box.src,v 1.12 1998-04-16 22:12:13 ijacobs Exp $ -->
+<!-- $Id: box.src,v 1.13 1998-04-22 23:03:44 ijacobs Exp $ -->
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <TITLE>Box model</TITLE>
@@ -10,7 +10,7 @@
 
 <P>The CSS box model describes the rectangular boxes that are
 generated for elements in the <a href="conform.html#doctree">document
-tree</a> and laid out according to the <a href="visuren.html">visual rendering
+tree</a> and laid out according to the <a href="visuren.html">visual formatting
 model</a>.  The <A href="page.html">page box</A> is a special kind of
 box that is described in detail in the section on <A
 href="page.html">paged media</a>.
@@ -76,7 +76,7 @@ the box has the <span class="propinst-width">'width'</span>
 or <span class="propinst-height">'height'</span> property
 set, whether the box contains text or other boxes, whether the
 box is a table, etc. Box widths and heights are discussed
-in the chapter on <a href="visudet.html">visual rendering
+in the chapter on <a href="visudet.html">visual formatting
 model details</a>.
 
 <P>The <span class="index-def" title="box::width"><a
diff --git a/css2/changes.src b/css2/changes.src
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html lang="en">
-<!-- $Id: changes.src,v 2.17 1998-04-20 23:38:07 ijacobs Exp $ -->
+<!-- $Id: changes.src,v 2.18 1998-04-22 23:03:48 ijacobs Exp $ -->
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <TITLE>Appendix B: Changes from CSS1</TITLE>
@@ -58,13 +58,13 @@ run-in</a>.
 <LI>The ability to control content <a
 href="visufx.html#overflow">overflow</a>, <a
 href="visufx.html#clipping">clipping</a>, and <a
-href="visufx.html#visibility">visibility</a> in the visual rendering
+href="visufx.html#visibility">visibility</a> in the visual formatting
 model.
 
 <LI>The ability to specify minimum and maximum <a
 href="visudet.html#min-max-widths">widths</a> and <a
 href="visudet.html#min-max-heights">heights</a> in the visual
-rendering model.
+formatting model.
 
 <LI>An extended <A HREF="selector.html">selector</A> mechanism,
 including child selectors, adjacent selectors, and attribute selectors.
diff --git a/css2/generate.src b/css2/generate.src
@@ -69,7 +69,7 @@ P.note:before { content: "Note: " }
 </pre>
 </div>
 
-<P>The rendering objects (e.g., boxes) generated by an element include
+<P>The formatting objects (e.g., boxes) generated by an element include
 generated content. So, for example, changing the above style sheet
 to:</p>
 
@@ -198,13 +198,13 @@ The former has two forms:
 'counter(<var>name</var>)' or 'counter(<var>name</var>,
 <var>style</var>)'. 
 The generated text is the value of the named
-counter at this point in the rendering structure; it
+counter at this point in the formatting structure; it
 is formatted in the indicated
 <a href="#counter-styles">style</a> ('decimal' by default).
 The latter function also has two forms:
 'counter(<var>name</var>, <var>string</var>)' or 'counter(<var>name</var>,
 <var>string</var>, <var>style</var>)'. The generated text is the value of all
-counters with the given name at this point in the rendering structure,
+counters with the given name at this point in the formatting structure,
 separated by the specified string. The counters are rendered
 in the indicated <a href="#counter-styles">style</a> ('decimal' by default).
 See the section on <a href="#counters">automatic counters and
@@ -330,26 +330,26 @@ point apply.
 
 <li><strong>A 'run-in' or 'compact' element has a :before
 pseudo-element of type 'block':</strong> the pseudo-element is
-rendered as a block above the element, and does not take part in the
+formatted as a block above the element, and does not take part in the
 computation of the element's size (for 'compact').
 
 <li><strong>A 'run-in' or 'compact' element has an :after
 pseudo-element of type 'block':</strong> both the element and its
-:after pseudo-element are rendered as block boxes. The element
-is <em>not</em> rendered as an inline box in its own :after
+:after pseudo-element are formatted as block boxes. The element
+is <em>not</em> formatted as an inline box in its own :after
 pseudo-element. 
 
 
 <!-- [?? This could also be defined the other way round,
 but this seems easier to understand.] -->
 
 <li><strong>The element following a 'run-in' or 'compact' element has
-a :before of type 'block':</strong> the decision how to render the
+a :before of type 'block':</strong> the decision how to format the
 'run-in'/'compact' element is made with respect to the block box
 resulting from the :before pseudo-element.
 
 <li><strong>The element following a 'run-in' or 'compact' element has
-an :before of type 'inline':</strong> the decision how to render the
+an :before of type 'inline':</strong> the decision how to format the
 'run-in'/'compact' element depends on the <span
 class="propinst-display">'display'</span> value of the element to which
 the :before is attached.
@@ -376,7 +376,7 @@ P:before { content: "... " }
 &lt;P&gt;have a tail
 </pre>
 
-<p>The visual rendering will resemble:</p>
+<p>The visual formatting will resemble:</p>
 
 <pre class="none">
 Centaurs: ... have hoofs
@@ -449,7 +449,7 @@ Q :after  { content : close-quote }
 &lt;/HTML&gt;
 </PRE>
 
-<P>would allow a user agent to render:</p>
+<P>would allow a user agent to produce:</p>
 
 <PRE class="ascii-art">
 "Quote me!"
@@ -523,7 +523,7 @@ used, if the depth is 1, the second pair is used, etc. If the depth is
 greater than the number of pairs, the last pair is repeated.
 
 <p>Note that this quoting depth is independent of the nesting
-of the source document or the rendering structure.
+of the source document or the formatting structure.
 
 <p>Some typographic styles require open quotation marks to be repeated
 before every paragraph of a quote spanning several paragraphs, but
@@ -755,7 +755,7 @@ LI:before { content: counters(item, "."); counter-increment: item }
 
 <h3><a name="counter-styles">Counter styles</a></h3>
 
-<p>By default, counters are rendered with decimal numbers, but all the
+<p>By default, counters are formatted with decimal numbers, but all the
 styles available for the <span
 class="propinst-list-style-type">'list-style-type'</span> property are
 also available for counters. The notation is:</P>
diff --git a/css2/intro.src b/css2/intro.src
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html lang="en">
-<!-- $Id: intro.src,v 2.26 1998-04-16 22:13:08 ijacobs Exp $ -->
+<!-- $Id: intro.src,v 2.27 1998-04-22 23:03:54 ijacobs Exp $ -->
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <TITLE>Introduction to CSS2</TITLE>
@@ -285,26 +285,26 @@ inheritance</a>.
 <P>Part of the calculation of values depends on the formatting
 algorithm appropriate for the target <a href="media.html">media
 type</a>. For example, if the target medium is the screen, user agents
-apply the <a href="visuren.html">visual rendering model</a>. If the
+apply the <a href="visuren.html">visual formatting model</a>. If the
 destination medium is the printed page, user agents apply the <a
 href="page.html#page-model">page model</a>. If the destination medium
 is an aural rendering device (e.g., speech synthesizer), user agents
 apply the <a href="aural.html">aural rendering model</a>.
 
 <li>From the annotated document tree, generate a 
-<span class="index-def" title="rendering structure">
-<a name="rendering-structure"><dfn>rendering
-structure</dfn></a></span>.  Often, the rendering structure closely
+<span class="index-def" title="formatting structure">
+<a name="formatting-structure"><dfn>formatting
+structure</dfn></a></span>.  Often, the formatting structure closely
 resembles the document tree, but it may also differ significantly,
 notably when authors make use of pseudo-elements and generated content.
-First, the rendering structure need not be "tree-shaped" at all -- the
+First, the formatting structure need not be "tree-shaped" at all -- the
 nature of the structure depends on the implementation.  Second, the
-rendering structure may contain more or less information than the
+formatting structure may contain more or less information than the
 document tree. For instance, if an element in the document tree has a
 value of 'none' for the <span
 class="propinst-display">'display'</span> property, that element will
-generate nothing in the rendering structure.  A list element, on the
-other hand, may generate more information in the rendering structure:
+generate nothing in the formatting structure.  A list element, on the
+other hand, may generate more information in the formatting structure:
 the list element's content and list style information (e.g., a bullet
 image).
 
@@ -317,15 +317,15 @@ reparsing).
      be made specific and moved to visudet.src -->
 
 <!-- 
-<P>If an element A is an ancestor of an element D, all rendering
-objects generated for A must be above the rendering objects
-rendered for D in the tree of rendering objects. For box
-and page box rendering objects, this implies that, to 
+<P>If an element A is an ancestor of an element D, all formatting
+objects generated for A must be above the formatting objects
+rendered for D in the tree of formatting objects. For box
+and page box formatting objects, this implies that, to 
 find a containing box for an element, a user agent need only search
 upward in the tree of rendering objects (not left, right, or down).
 -->
 
-<li>Transfer the rendering structure to the target medium (e.g., print
+<li>Transfer the formatting structure to the target medium (e.g., print
 the results, display them on the screen, render them as speech,
 etc.).
 </ol>
@@ -341,7 +341,7 @@ example, [[-DOM]]).
 
 <P>For all media, the term <span class="index-def" title="canvas"> <a
 name="canvas"><dfn>canvas</dfn></a></span> describes "the space where
-the rendering structure is rendered."  The canvas is infinite for each
+the formatting structure is rendered."  The canvas is infinite for each
 dimension of the space, but rendering generally occurs within
 a finite region of the canvas, established by the user agent
 according to the target medium. For instance, user agents rendering
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.23 1998-04-17 19:10:12 ijacobs Exp $ -->
+<!-- $Id: page.src,v 2.24 1998-04-22 23:04:00 ijacobs Exp $ -->
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <TITLE>Paged media</TITLE>
@@ -15,7 +15,7 @@ displayed on computer screens, etc.) differ from
 <a href="./media.html#continuous-media-group">continuous media</a>
 in that the content of the document is split into one or more discrete
 pages. To handle page breaks, CSS2
-extends the <a href="visuren.html">visual rendering model</a>
+extends the <a href="visuren.html">visual formatting model</a>
 as follows:</p>
 
 <ol>
@@ -25,7 +25,7 @@ model</a> to allow authors to specify the size of a page, its margins,
 etc.  
 
 <li>The <span class="index-def" title="page model"><dfn>page
-model</dfn></span> extends the <a href="visuren.html">visual rendering
+model</dfn></span> extends the <a href="visuren.html">visual formatting
 model</a> to account for <a href="#page-breaks">page breaks.</a>
 </ol>
 
@@ -460,7 +460,7 @@ follows: If a block box with inline content has a <span
 class="propinst-page">'page'</span> property that is different from
 the preceding block box with inline content, then one or two
 page breaks are inserted between them, and the boxes after the break
-are rendered onto a page box of the named type. See <a
+are rendered on a page box of the named type. See <a
 href="#forced">"Forced page breaks" below.</a>
 
 <div class="example">
diff --git a/css2/sample.src b/css2/sample.src
@@ -1,6 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html lang="en">
-<!-- $Id: sample.src,v 2.15 1998-04-19 23:58:04 ijacobs Exp $ -->
+<!-- $Id: sample.src,v 2.16 1998-04-22 23:04:03 ijacobs Exp $ -->
 <HEAD>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <TITLE>Appendix A: A sample style sheet for HTML 4.0</TITLE>
@@ -9,7 +9,7 @@
 <H1 align="center">A sample style sheet for HTML 4.0</H1>
 <P><em>This appendix is informative, not normative.</em></P>
 
-<P>This style sheet describes the typical rendering of all HTML 4.0
+<P>This style sheet describes the typical formatting of all HTML 4.0
 ([[-HTML40]]) elements based on extensive research into current UA
 practice. Developers are encouraged to use it as a default style sheet
 in their implementations.
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.45 1998-04-16 22:14:28 ijacobs Exp $ -->
+<!-- $Id: selector.src,v 2.46 1998-04-22 23:04:06 ijacobs Exp $ -->
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Selectors</title>
@@ -278,7 +278,7 @@ where E2 is the subject of the selector. The selector matches if E1
 and E2 share the same parent in the document tree and E1 immediately
 precedes E2.
 
-<p>In some contexts, adjacent elements generate rendering objects
+<p>In some contexts, adjacent elements generate formatting objects
 whose presentation is handled automatically (e.g., collapsing
 vertical margins between adjacent boxes). The "+" selector
 allows authors to specify additional style to adjacent elements.
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.53 1998-04-17 21:05:43 ijacobs Exp $ -->
+<!-- $Id: syndata.src,v 2.54 1998-04-22 23:04:18 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 @@ followed by '%'.
 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
+element, or a value of the formatting context (e.g., the width of a <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
diff --git a/css2/tables.src b/css2/tables.src
diff --git a/css2/text.src b/css2/text.src
diff --git a/css2/visudet.src b/css2/visudet.src
diff --git a/css2/visuren.src b/css2/visuren.src
