- From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
- Date: Tue, 02 Feb 2010 17:04:56 +0000
- To: public-html-commits@w3.org
Update of /sources/public/html5/markup/tools
In directory hutz:/tmp/cvs-serv29618/tools
Modified Files:
chunker.xsl generate-spec-source.xsl specgen.xsl toc.xsl
Log Message:
added figcaption and summary; made tweaks to build files so that we can generate a WHATWG copy
Index: generate-spec-source.xsl
===================================================================
RCS file: /sources/public/html5/markup/tools/generate-spec-source.xsl,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -d -r1.225 -r1.226
--- generate-spec-source.xsl 1 Feb 2010 11:33:27 -0000 1.225
+++ generate-spec-source.xsl 2 Feb 2010 17:04:54 -0000 1.226
@@ -706,8 +706,9 @@
<xsl:text> </xsl:text>
<h2>Acknowledgments</h2>
<xsl:text> </xsl:text>
- <p>This document incorporates a modified version of a
- RELAX NG schema for HTML 5 from the <a
+ <p>Parts of this document were programatically
+ generated from a modified version of a
+ RELAX NG schema for HTML5 from the <a
href="http://syntax.whattf.org/relaxng/"
>syntax.whattf.org source repository</a>,
distributed with the following copyright notice and
Index: specgen.xsl
===================================================================
RCS file: /sources/public/html5/markup/tools/specgen.xsl,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- specgen.xsl 30 Jan 2010 05:50:00 -0000 1.45
+++ specgen.xsl 2 Feb 2010 17:04:54 -0000 1.46
@@ -11,6 +11,7 @@
indent="yes"/>
<xsl:include href="toc.xsl"/>
<xsl:include href="chunker.xsl"/>
+ <xsl:param name="site">W3C</xsl:param>
<xsl:param name="chunk" select="0"/>
<xsl:param name="TOC-file"/>
<xsl:param name="aria" select="0"/>
@@ -67,6 +68,17 @@
<link rel='stylesheet' href='http://www.w3.org/StyleSheets/TR/W3C-{$maturity}' type='text/css'/>
</xsl:otherwise>
</xsl:choose>
+ <xsl:if test="$site='whatwg'">
+ <style>
+body {
+background-image: url(http://www.whatwg.org/images/WD);
+background-repeat: repeat-y;
+}
+h1, h2, h3, .section-title-ref {
+color: #3C790A;
+}
+ </style>
+ </xsl:if>
<xsl:text> </xsl:text>
</head>
</xsl:template>
@@ -105,11 +117,19 @@
</xsl:template>
<xsl:template name='top'>
<div class='head'>
+ <xsl:choose>
+ <xsl:when test="$site = 'W3C'">
<div><a href="http://www.w3.org/"><img src="http://www.w3.org/Icons/w3c_home" width="72" height="48" alt="W3C"></img></a></div>
+ </xsl:when>
+ <xsl:when test="$site = 'whatwg'">
+ <div><a href="http://www.whatwg.org/"><img src="http://www.whatwg.org/images/logo"></img></a></div>
+ </xsl:when>
+ </xsl:choose>
<h1><xsl:value-of select='/*/h:head/h:title'/></h1>
<xsl:if test='//*[@id="subtitle"]'>
<h3 id="subtitle"><xsl:value-of select='//*[@id="subtitle"]'/></h3>
</xsl:if>
+ <xsl:if test="$site = 'W3C'">
<h2>
W3C
<xsl:choose>
@@ -131,8 +151,10 @@
<xsl:call-template name='date'/>
</em>
</h2>
+ </xsl:if>
<dl>
+ <xsl:if test="$site = 'W3C'">
<xsl:choose>
<xsl:when test='$source and $maturity="ED"'>
<dt>Latest Editor’s Draft:</dt>
@@ -164,6 +186,8 @@
<dd><a href='{.}'><xsl:value-of select='.'/></a></dd>
</xsl:for-each>
</xsl:if>
+ </xsl:if>
+
<xsl:if test="$person-nodeset">
<dt>Editor<xsl:if test='count($person-nodeset) > 1'>s</xsl:if>:</dt>
<xsl:for-each select='$person-nodeset'>
@@ -200,7 +224,42 @@
</xsl:otherwise>
</xsl:choose>
</p>
- <p class="copyright"><a href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright">Copyright</a> © <xsl:value-of select="date:year()"/><xsl:text> </xsl:text><a href="http://www.w3.org/"><abbr title="World Wide Web Consortium">W3C</abbr></a><sup>®</sup> (<a href="http://www.csail.mit.edu/"><abbr title="Massachusetts Institute of Technology">MIT</abbr></a>, <a href="http://www.ercim.org/"><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 href="http://www.w3.org/Consortium/Legal/ipr-notice#W3C_Trademarks">trademark</a> and <a href="http://www.w3.org/Consortium/Legal/copyright-documents">document use</a> rules apply.</p>
+ <xsl:choose>
+ <xsl:when test="$site = 'W3C'">
+ <p class="copyright"><a href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright">Copyright</a> © <xsl:value-of select="date:year()"/><xsl:text> </xsl:text><a href="http://www.w3.org/"><abbr title="World Wide Web Consortium">W3C</abbr></a><sup>®</sup> (<a href="http://www.csail.mit.edu/"><abbr title="Massachusetts Institute of Technology">MIT</abbr></a>, <a href="http://www.ercim.org/"><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 href="http://www.w3.org/Consortium/Legal/ipr-notice#W3C_Trademarks">trademark</a> and <a href="http://www.w3.org/Consortium/Legal/copyright-documents">document use</a> rules apply.</p>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:if test="$person-nodeset">
+ <div class="main-license">
+ <p class="copyright">
+ 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:for-each>
+ </p>
+ <p class="copyright">
+ Permission is hereby granted, free of charge, to any
+ person obtaining a copy of this document (the “Document”), to deal
+ in the Document without restriction, including without limitation
+ the rights to use, copy, modify, merge, publish, distribute,
+ sublicense, and/or sell copies of the Document, and to permit
+ persons to whom the Document is furnished to do so, subject to the
+ following conditions:
+ </p>
+ <p class="copyright">
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Document.
+ </p>
+ </div>
+ </xsl:if>
+ </xsl:otherwise>
+ </xsl:choose>
</div>
<hr/>
</xsl:template>
@@ -305,6 +364,7 @@
<a href="{$source}">online</a>
</xsl:variable>
<xsl:text> </xsl:text>
+ <xsl:if test="$site = 'W3C'">
<p>
<em>
This section describes the status of this document at the time of
@@ -315,6 +375,7 @@
</em>
</p>
<xsl:text> </xsl:text>
+ </xsl:if>
<p>
<xsl:if test='$maturity!="REC" and $maturity!="WG-NOTE"'>
This document is the <xsl:call-template name='date'/><xsl:text> </xsl:text>
@@ -330,6 +391,7 @@
(<a href='{$comments-archive}'>archived</a>).
</p>
<xsl:text> </xsl:text>
+ <xsl:if test="$site = 'W3C'">
<p>
This document
<xsl:choose>
@@ -346,8 +408,11 @@
in the W3C <xsl:copy-of select="$domain"/>.
</p>
<xsl:text> </xsl:text>
+ </xsl:if>
<xsl:copy-of select="document('../src/status.html')"/>
<xsl:text> </xsl:text>
+ <xsl:choose>
+ <xsl:when test="$site = 'W3C'">
<p>
<xsl:choose>
<xsl:when test='$maturity="REC"'>
@@ -396,6 +461,13 @@
</p>
<xsl:text> </xsl:text>
</xsl:if>
+ </xsl:when>
+ <xsl:otherwise>
+ <p>This is a draft document and may be updated, replaced or
+ obsoleted by other documents at any time. It is inappropriate to
+ cite this document as other than work in progress.</p>
+ </xsl:otherwise>
+ </xsl:choose>
</xsl:template>
<xsl:template match='processing-instruction("sref")'>
<xsl:variable name='id' select='string(.)'/>
Index: toc.xsl
===================================================================
RCS file: /sources/public/html5/markup/tools/toc.xsl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- toc.xsl 2 Feb 2010 05:22:35 -0000 1.8
+++ toc.xsl 2 Feb 2010 17:04:54 -0000 1.9
@@ -128,6 +128,7 @@
or @id="ruby"
or @id="section"
or @id="source"
+ or @id="summary"
or @id="time"
or @id="video"
'>
Index: chunker.xsl
===================================================================
RCS file: /sources/public/html5/markup/tools/chunker.xsl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- chunker.xsl 20 Aug 2009 09:22:47 -0000 1.5
+++ chunker.xsl 2 Feb 2010 17:04:54 -0000 1.6
@@ -70,6 +70,17 @@
<xsl:text> </xsl:text>
<xsl:copy-of select="."/>
</xsl:for-each>
+ <xsl:if test="$site='whatwg'">
+ <style>
+body {
+background-image: url(http://www.whatwg.org/images/WD);
+background-repeat: repeat-y;
+}
+h1, h2, h3, .section-title-ref {
+color: #3C790A;
+}
+ </style>
+ </xsl:if>
<!-- * <xsl:call-template name="head.nav.links"> -->
<!-- * <xsl:with-param name="title" select="$title"/> -->
<!-- * <xsl:with-param name="prev" select="$prev"/> -->
Received on Tuesday, 2 February 2010 17:05:05 UTC