Replace 'superior parent' with 'originating element'

Author: fantasai

css3-content/Overview.html

@@ -11,7 +11,7 @@
       FIXME when publishing: copy the current default.css and link to
       "default.css" rather than "../default.css"
   -->
-  <link href="../css-module/default.css" rel=stylesheet type="text/css">
+  <link href="../default.css" rel=stylesheet type="text/css">
   <link href="http://www.w3.org/StyleSheets/TR/W3C-ED.css" rel=stylesheet
   type="text/css">
  </head>
@@ -36,16 +36,15 @@
 
    <h1>CSS Generated Content Module Level 3</h1>
 
-   <h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 9 November
-    2011</h2>
+   <h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 17 April 2012</h2>
 
    <dl>
     <dt>This version:
 
     <dd><a
      href="http://dev.w3.org/csswg/css3-content/">http://dev.w3.org/csswg/css3-content/</a></dd>
     <!--   <dd><a
-      href="2011/ED-css3-content-20111109">2011/ED-css3-content-20111109</a></dd> -->
+      href="2012/ED-css3-content-20120417">2012/ED-css3-content-20120417</a></dd> -->
 
     <dt>Latest version:
 
@@ -72,13 +71,12 @@ <h2 class="no-num no-toc" id=longstatus-date>Editor's Draft 9 November
 
    <p class=copyright><a
     href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright"
-    rel=license>Copyright</a> &copy; 2011 <a
-    href="http://www.w3.org/"><acronym
-    title="World Wide Web Consortium">W3C</acronym></a><sup>&reg;</sup> (<a
-    href="http://www.csail.mit.edu/"><acronym
-    title="Massachusetts Institute of Technology">MIT</acronym></a>, <a
-    href="http://www.ercim.eu/"><acronym
-    title="European Research Consortium for Informatics and Mathematics">ERCIM</acronym></a>,
+    rel=license>Copyright</a> &copy; 2012 <a href="http://www.w3.org/"><abbr
+    title="World Wide Web Consortium">W3C</abbr></a><sup>&reg;</sup> (<a
+    href="http://www.csail.mit.edu/"><abbr
+    title="Massachusetts Institute of Technology">MIT</abbr></a>, <a
+    href="http://www.ercim.eu/"><abbr
+    title="European Research Consortium for Informatics and Mathematics">ERCIM</abbr></a>,
     <a href="http://www.keio.ac.jp/">Keio</a>), All Rights Reserved. W3C <a
     href="http://www.w3.org/Consortium/Legal/ipr-notice#Legal_Disclaimer">liability</a>,
     <a
@@ -306,12 +304,12 @@ <h2 id=terminology><span class=secno>2. </span>Terminology</h2>
    these nested pseudo-elements, three new terms have been coined.
 
   <dl>
-   <dt><dfn id=superior-parent>superior parent</dfn>
+   <dt><dfn id=originating-element>originating element</dfn>
 
-   <dd> A pseudo-element's superior parent is the element to which it is
-    associated. e.g. the superior parent of the pseudo-element matched by
+   <dd> A pseudo-element's originating element is the element to which it is
+    associated. e.g. the originating element of the pseudo-element matched by
     &lsquo;<code class=css>::before</code>&rsquo; is the element to which it
-    is attached. Note that an element never has a superior parent, and a
+    is attached. Note that an element never has a originating element, and a
     pseudo-element always has exactly one. This term is sometimes shortened
     to "superior".
   </dl>
@@ -370,7 +368,7 @@ <h3 id=inserting-content-into-an-element-the-be><span class=secno>3.1.
 
   <p>The &lsquo;<code class=css>::before</code>&rsquo; and &lsquo;<code
    class=css>::after</code>&rsquo; pseudo-elements inherit any inheritable
-   properties from their superior parent.
+   properties from their originating element.
 
   <p>For a &lsquo;<code class=css>::before</code>&rsquo; or &lsquo;<code
    class=css>::after</code>&rsquo; pseudo-element to be generated, the
@@ -1384,9 +1382,10 @@ <h2 id=inserting-and-replacing-content-with-the><span class=secno>7.
     <p>For an element, this computes to &lsquo;<a href="#contents0"><code
      class=property>contents</code></a>&rsquo;.</p>
 
-    <p>For &lsquo;<code class=css>::alternate</code>&rsquo;, if the superior
-     parent uses the &lsquo;<code class=property>footnote</code>&rsquo;,
-     &lsquo;<code class=property>endnote</code>&rsquo;, or &lsquo;<code
+    <p>For &lsquo;<code class=css>::alternate</code>&rsquo;, if the
+     originating element uses the &lsquo;<code
+     class=property>footnote</code>&rsquo;, &lsquo;<code
+     class=property>endnote</code>&rsquo;, or &lsquo;<code
      class=property>section-note</code>&rsquo; counter in its &lsquo;<a
      href="#content"><code class=property>content</code></a>&rsquo; property
      then the computed value of &lsquo;<a href="#content"><code
@@ -1400,8 +1399,8 @@ <h2 id=inserting-and-replacing-content-with-the><span class=secno>7.
      class=css>::line-marker</code>&rsquo; this computes to &lsquo;<a
      href="#inhibit"><code class=property>inhibit</code></a>&rsquo;.</p>
 
-    <p>For &lsquo;<code class=css>::marker</code>&rsquo;, if the superior
-     parent's superior parent uses &lsquo;<code
+    <p>For &lsquo;<code class=css>::marker</code>&rsquo;, if the originating
+     element's originating element uses &lsquo;<code
      class=property>footnote</code>&rsquo; in its &lsquo;<a
      href="#content"><code class=property>content</code></a>&rsquo; property
      then &lsquo;<a href="#normal"><code
@@ -1418,8 +1417,8 @@ <h2 id=inserting-and-replacing-content-with-the><span class=secno>7.
      suffix appropriate for that list style type, otherwise &lsquo;<a
      href="#inhibit"><code class=property>inhibit</code></a>&rsquo;.</p>
 
-    <p>For &lsquo;<code class=css>::marker</code>&rsquo;, if the superior
-     parent's superior parent uses &lsquo;<code
+    <p>For &lsquo;<code class=css>::marker</code>&rsquo;, if the originating
+     element's originating element uses &lsquo;<code
      class=property>endnote</code>&rsquo; in its &lsquo;<a
      href="#content"><code class=property>content</code></a>&rsquo; property
      then &lsquo;<a href="#normal"><code
@@ -1436,8 +1435,8 @@ <h2 id=inserting-and-replacing-content-with-the><span class=secno>7.
      suffix appropriate for that list style type, otherwise &lsquo;<a
      href="#inhibit"><code class=property>inhibit</code></a>&rsquo;.</p>
 
-    <p>For &lsquo;<code class=css>::marker</code>&rsquo;, if the superior
-     parent's superior parent uses &lsquo;<code
+    <p>For &lsquo;<code class=css>::marker</code>&rsquo;, if the originating
+     element's originating element uses &lsquo;<code
      class=property>section-note</code>&rsquo; in its &lsquo;<a
      href="#content"><code class=property>content</code></a>&rsquo; property
      then &lsquo;<a href="#normal"><code
@@ -1456,7 +1455,7 @@ <h2 id=inserting-and-replacing-content-with-the><span class=secno>7.
 
     <p>Otherwise, for &lsquo;<code class=css>::marker</code>&rsquo;, if the
      computed value of &lsquo;<code class=property>display</code>&rsquo; for
-     the superior parent is &lsquo;<code
+     the originating element is &lsquo;<code
      class=property>list-item</code>&rsquo; then &lsquo;<a
      href="#normal"><code class=property>normal</code></a>&rsquo; computes to
      the computed value of the &lsquo;<code
@@ -1980,6 +1979,9 @@ <h2 class=no-num id=index>Index</h2>
    <li>open-quote, <a href="#open-quote"
     title=open-quote><strong>7.</strong></a>
 
+   <li>originating element, <a href="#originating-element"
+    title="originating element"><strong>2.</strong></a>
+
    <li>page-policy, <a href="#page-policy0"
     title=page-policy><strong>6.2.</strong></a>
 
@@ -1994,9 +1996,6 @@ <h2 class=no-num id=index>Index</h2>
 
    <li>&lt;strings&gt;, <a href="#ltstringsgt"
     title="&lt;strings&gt;"><strong>7.</strong></a>
-
-   <li>superior parent, <a href="#superior-parent"
-    title="superior parent"><strong>2.</strong></a>
   </ul>
   <!--end-index-->
 

css3-content/Overview.src.html

@@ -150,12 +150,12 @@ <h2>Terminology</h2>
 terms have been coined.</p>
 
 <dl>
-<dt><dfn>superior parent</dfn></dt>
+<dt><dfn>originating element</dfn></dt>
 <dd>
-   A pseudo-element's superior parent is the element 
-   to which it is associated. e.g. the superior parent of the
+   A pseudo-element's originating element is the element 
+   to which it is associated. e.g. the originating element of the
    pseudo-element matched by '::before' is the element to which
-   it is attached. Note that an element never has a superior parent,
+   it is attached. Note that an element never has a originating element,
    and a pseudo-element always has exactly one. This term is
    sometimes shortened to "superior".
 </dd>
@@ -211,7 +211,7 @@ <h3>Inserting content into an element: the '::before' and '::after'
 paragraph, including the initial string.</p>
 
 <p>The '::before' and '::after' pseudo-elements inherit any
-inheritable properties from their superior parent.</p>
+inheritable properties from their originating element.</p>
 
 <p>For a '::before' or '::after' pseudo-element to be generated,
 the pseudo-element must not have its 'content' property set to
@@ -961,15 +961,15 @@ <h2><a name="content-insert">Inserting and replacing content</a> with
 
 <p>For an element, this computes to 'contents'.</p>
 
-<p>For '::alternate', if the superior parent uses the 'footnote',
+<p>For '::alternate', if the originating element uses the 'footnote',
 'endnote', or 'section-note' counter in its 'content' property
 then the computed value of 'content' is 'contents', otherwise it
 computes to 'inhibit'.</p>
 
 <p>For '::before', '::after', and '::line-marker' this computes to
 'inhibit'.</p>
 
-<p>For '::marker', if the superior parent's superior parent uses
+<p>For '::marker', if the originating element's originating element uses
 'footnote' in its 'content' property then 'normal' computes to the
 computed value of the 'list-style-image' property if the
 list-style-image is not 'none', otherwise 'counter(footnote,
@@ -978,7 +978,7 @@ <h2><a name="content-insert">Inserting and replacing content</a> with
 property is not 'none' and <var>suffix</var> is the suffix appropriate for
 that list style type, otherwise 'inhibit'.</p>
 
-<p>For '::marker', if the superior parent's superior parent uses
+<p>For '::marker', if the originating element's originating element uses
 'endnote' in its 'content' property then 'normal' computes to
 the computed value of the 'list-style-image' property if the
 list-style-image is not 'none', otherwise 'counter(endnote,
@@ -987,7 +987,7 @@ <h2><a name="content-insert">Inserting and replacing content</a> with
 property is not 'none' and <var>suffix</var> is the suffix appropriate for
 that list style type, otherwise 'inhibit'.</p>
 
-<p>For '::marker', if the superior parent's superior parent uses
+<p>For '::marker', if the originating element's originating element uses
 'section-note' in its 'content' property then 'normal' computes
 to the computed value of the 'list-style-image' property if the
 list-style-image is not 'none', otherwise 'counter(section-note,
@@ -997,7 +997,7 @@ <h2><a name="content-insert">Inserting and replacing content</a> with
 that list style type, otherwise 'inhibit'.</p>
 
 <p>Otherwise, for '::marker', if the computed value of 'display'
-for the superior parent is 'list-item' then 'normal' computes to
+for the originating element is 'list-item' then 'normal' computes to
 the computed value of the 'list-style-image' property if the
 list-style-image is not 'none', otherwise 'counter(list-item,
 &lt;list-style-type&gt;) "<var>suffix</var>"' where &lt;list-style-type&gt;