html5/markup/tools generate-spec-source.xsl,1.292,1.293 specgen.xsl,1.88,1.89

Update of /sources/public/html5/markup/tools
In directory hutz:/tmp/cvs-serv559/tools

Modified Files:
	generate-spec-source.xsl specgen.xsl 
Log Message:
various editorial updates


Index: generate-spec-source.xsl
===================================================================
RCS file: /sources/public/html5/markup/tools/generate-spec-source.xsl,v
retrieving revision 1.292
retrieving revision 1.293
diff -u -d -r1.292 -r1.293
--- generate-spec-source.xsl	12 Aug 2010 19:55:38 -0000	1.292
+++ generate-spec-source.xsl	28 Aug 2010 23:53:04 -0000	1.293
@@ -3175,7 +3175,7 @@
       select="translate($interface,
       'ABCDEFGHIJKLMNOPQRSTUVWXYZ',
       'abcdefghijklmnopqrstuvwxyz')"/>
-    <xsl:param name="base">../spec-multipage/</xsl:param>
+    <xsl:param name="base">../html5-spec/</xsl:param>
     <xsl:variable name="filename">
       <xsl:call-template name="get-spec-filename">
         <xsl:with-param name="ref" select="concat('#',$lowercase-interface)"/>

Index: specgen.xsl
===================================================================
RCS file: /sources/public/html5/markup/tools/specgen.xsl,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -d -r1.88 -r1.89
--- specgen.xsl	12 Aug 2010 19:55:38 -0000	1.88
+++ specgen.xsl	28 Aug 2010 23:53:04 -0000	1.89
@@ -320,7 +320,7 @@
     </div>
     <div class='head'>
       <xsl:choose>
-      <xsl:when test="$site = 'W3C'">
+      <xsl:when test="$site = 'W3C' and not($maturity = 'ED')">
         <div><a href="http://www.w3.org/"><img height="48" width="72" alt="W3C" src="http://www.w3.org/Icons/w3c_home"/></a></div>
       </xsl:when>
       <xsl:when test="$site = 'whatwg'">
@@ -332,7 +332,10 @@
         <h3 id="subtitle"><xsl:value-of select='key("elements","subtitle")'/></h3>
       </xsl:if>
       <h2>
-      <xsl:if test="$site = 'W3C'">W3C </xsl:if>
+        <xsl:choose>
+          <xsl:when test="$maturity = 'ED'">Unofficial </xsl:when>
+          <xsl:otherwise>W3C </xsl:otherwise>
+        </xsl:choose>
         <xsl:choose>
           <xsl:when test='
             $maturity="WD"
@@ -354,7 +357,7 @@
       </h2>
 
       <dl>
-        <xsl:if test="$site = 'W3C'">
+        <xsl:if test="$site = 'W3C' and not($maturity = 'ED')">
         <xsl:choose>
           <xsl:when test='$source and $maturity="ED"'>
             <dt>Latest Editor’s Draft:</dt>
@@ -397,6 +400,9 @@
         <xsl:if test="$person-nodeset">
           <dt>Editor<xsl:if test='count($person-nodeset) &gt; 1'>s</xsl:if>:</dt>
           <xsl:for-each select='$person-nodeset'>
+            <xsl:choose>
+              <xsl:when test="h:span[contains(@class, 'affiliation') = 'W3C']"/>
+              <xsl:otherwise>
             <dd>
               <xsl:choose>
                 <xsl:when test='h:*[contains(@class,"homepage")]'>
@@ -416,6 +422,8 @@
                 <xsl:text>&gt;</xsl:text>
               </xsl:if>
             </dd>
+              </xsl:otherwise>
+            </xsl:choose>
           </xsl:for-each>
         </xsl:if>
       </dl>
@@ -440,15 +448,20 @@
               Copyright © <xsl:value-of select="date:year()"/>
               <xsl:text> </xsl:text>
               <xsl:for-each select='$person-nodeset'>
-                <span>
-                  <xsl:value-of select='h:span[@class = "name"]'/>
-                </span>
-                <xsl:if test="not(position() = last())">
-                  <xsl:text>, </xsl:text>
-                </xsl:if>
+                <xsl:choose>
+                  <xsl:when test="h:span[contains(@class, 'affiliation') = 'W3C']"/>
+                  <xsl:otherwise>
+                    <span>
+                      <xsl:value-of select='h:span[@class = "name"]'/>
+                    </span>
+                    <xsl:if test="not(position() = last())">
+                      <xsl:text>, </xsl:text>
+                    </xsl:if>
+                  </xsl:otherwise>
+                </xsl:choose>
               </xsl:for-each>
             </p>
-            <xsl:if test="not($site = 'W3C')">
+            <xsl:if test="$maturity = 'ED'">
             <p class="copyright">
               Permission is hereby granted, free of charge, to any
               person obtaining a copy of this document (the “Document”), to deal
@@ -571,7 +584,7 @@
       <a href="{$source}">online</a>
     </xsl:variable>
     <xsl:text>&#10;    </xsl:text>
-    <xsl:if test="$site = 'W3C'">
+    <xsl:if test="$site = 'W3C' and not($maturity = 'ED')">
     <p>
       <em>
         This section describes the status of this document at the time of
@@ -598,7 +611,7 @@
       (<a href='{$comments-archive}'>archived</a>).
     </p>
     <xsl:text>&#10;    </xsl:text>
-    <xsl:if test="$site = 'W3C'">
+    <xsl:if test="$site = 'W3C' and not($maturity = 'ED')">
     <p>
       This document
       <xsl:choose>

Received on Saturday, 28 August 2010 23:53:07 UTC