[css2] Tantek added pre-wrap

bert-github · bert-github · commit 4d56db469c31 · 2002-10-21T14:35:19.000Z
--HG--
extra : convert_revision : svn%3A73dc7c4b-06e6-40f3-b4f7-9ed1dbc14bfc/trunk%401960
diff --git a/css2/text.src b/css2/text.src
@@ -1,11 +1,17 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
         "http://www.w3.org/TR/1998/REC-html40-19980424/loose.dtd">
 <html lang="en">
-<!-- $Id: text.src,v 2.29 2002-09-10 10:04:31 bbos Exp $ -->
+<!-- $Id: text.src,v 2.30 2002-10-21 14:35:19 bbos Exp $ -->
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <title>Text</title>
-<!-- Changed by: Tantek Celik, 23-04-2002 -->
+<!-- Changed by: Tantek Celik, 2002-10-06 -->
+<style type="text/css">
+.current,.proposed { background:#feb }
+ins.proposed { background:#bfb }
+del.proposed { background:#fbb }
+body>del,body>ins {display:block}
+</style>
 </head>
 <body>
 <h1>Text</h1>
@@ -53,6 +59,15 @@ p { text-indent: 3em }
 </pre>
 </div>
 
+<ins class="proposed">
+<p class="note">
+Note: Since the 'text-indent' property inherits, when specified on
+a block element, it will affect descendent inline-block elements. 
+For this reason, it is often wise to specify '<code>text-indent: 0</code>' 
+on elements that are specified '<code>display:inline-block</code>'.
+</p>
+</ins>
+
 <h2><a name="alignment-prop">Alignment:</a> the <span
 class="propinst-text-align">'text-align'</span> property</h2>
 
@@ -79,11 +94,11 @@ class="propinst-word-spacing">'word-spacing'</span>.)
 <div class="example"><p> 
 In this example, note that since <span
 class="propinst-text-align">'text-align'</span> is inherited, all
-block-level elements inside the DIV element with 'class=center' will
+block-level elements inside the DIV element with 'class=important' will
 have their inline content centered. 
 
 <pre>
-div.center { text-align: center }
+div.important { text-align: center }
 </pre>
 </div>
 
@@ -288,26 +303,37 @@ handled. Values have the following meanings:</p>
 <dt>normal
 <dd>This value directs user agents to collapse sequences
 of whitespace, and break lines as necessary to fill line boxes.
-Additional line breaks may be created by occurrences of "\A" in
-generated content (e.g., for the BR element in HTML).
 <dt>pre
 <dd>This value prevents user agents from collapsing sequences
 of whitespace. Lines are only broken at newlines in the source, or
 at occurrences of "\A" in generated content.
 <dt>nowrap
 <dd>This value collapses whitespace as for 'normal', but suppresses
-line breaks within text except for those created by "\A" in generated
-content (e.g., for the BR element in HTML).
-
+line breaks within text.
+<dt>pre-wrap
+<dd>This value prevents user agents from collapsing sequences
+of whitespace. Lines are broken at newlines in the source,
+at occurrences of "\A" in generated content, 
+and as necessary to fill line boxes.
+<dt><span class="proposed">pre-line | pre-lines</span>
+<dd>This value collapses whitespace as for 'normal', except 
+occurances of newlines in the source or "\A" in generated content
+do cause line breaks.
 </dl>
 
 <div class="example"><p> The following examples show what <a
 href="syndata.html#whitespace">whitespace</a> behavior is expected
-from the PRE and P elements, and the "nowrap" attribute in HTML.
+from the PRE and P elements, the "nowrap" attribute in HTML, and 
+in generated content.
 <pre>
 pre        { white-space: pre }
 p          { white-space: normal }
 td[nowrap] { white-space: nowrap }
+:before,:after { white-space: <span class="proposed">pre-line | pre-lines</span> }
+</pre>
+<p>In addition, the effect of an HTML PRE element with the <em>non-standard</em> "wrap" attribute  is demonstrated by the following example:
+<pre>
+pre[wrap]  { white-space: pre-wrap }
 </pre>
 </div>
 
