W3C home > Mailing lists > Public > public-html-commits@w3.org > July 2009

html5/spec get-toc.xsl,NONE,1.1 Makefile,1.15,1.16 toc-status.html,1.7,1.8 tocmix.xsl,1.7,1.8

From: Michael Smith via cvs-syncmail <cvsmail@w3.org>
Date: Mon, 27 Jul 2009 09:41:47 +0000
To: public-html-commits@w3.org
Message-Id: <E1MVMiJ-0005We-7v@lionel-hutz.w3.org>
Update of /sources/public/html5/spec
In directory hutz:/tmp/cvs-serv21210

Modified Files:
	Makefile toc-status.html tocmix.xsl 
Added Files:
	get-toc.xsl 
Log Message:
make a dynamic version of the status-annotated TOC


Index: tocmix.xsl
===================================================================
RCS file: /sources/public/html5/spec/tocmix.xsl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- tocmix.xsl	26 Jul 2009 05:19:44 -0000	1.7
+++ tocmix.xsl	27 Jul 2009 09:41:45 -0000	1.8
@@ -56,33 +56,34 @@
     <xsl:text>&#10;</xsl:text>
     <head>
       <xsl:apply-templates />
-      <style>
-        body { font-family: sans-serif; }
-        li { margin: 4px; list-style-type: none; }
-        a.status { text-decoration: none; }
-        .status { padding: 1px; border: 1px solid white; }
-        .status.UNKNOWN { background: gray; color: white; }
-        .status.TBW { background: red; color: white; }
-        .status.WIP { background: red; color: white; }
-        .status.FD { background: orange; color: black; }
-        .status.WD { background: orange; color: black; }
-        .status.CWD { background: red; color: yellow; }
-        .status.ATRISK { background: red; color: yellow; }
-        .status.LC { background: yellow; color: black; }
-        .status.CR { background: lime; color: black; }
-        .status.REC { background: green; color: white; }
-        .status.SPLITFD { background: navy; color: white; }
-        .status.SPLIT/*CR*/ { background: navy; color: white; }
-        .status.SPLITREC { background: navy; color: white; }
-        .status.ADD { background: white; color: white; }
-        a.status.ADD:hover{ background: purple; color: white; }
-      </style>
+<style>
+body { font-family: sans-serif; }
+li { margin: 4px; list-style-type: none; }
+a.status { text-decoration: none; }
+.status { padding: 1px; border: 1px solid white; }
+.status.UNKNOWN { background: gray; color: white; }
+.status.TBW { background: red; color: white; }
+.status.WIP { background: red; color: white; }
+.status.FD { background: orange; color: black; }
+.status.WD { background: orange; color: black; }
+.status.CWD { background: red; color: yellow; }
+.status.ATRISK { background: red; color: yellow; }
+.status.LC { background: yellow; color: black; }
+.status.CR { background: lime; color: black; }
+.status.REC { background: green; color: white; }
+.status.SPLITFD { background: navy; color: white; }
+.status.SPLIT/*CR*/ { background: navy; color: white; }
+.status.SPLITREC { background: navy; color: white; }
+.status.ADD { background: white; color: white; }
+a.status.ADD:hover{ background: purple; color: white; }
+</style>
       <xsl:text>&#10;</xsl:text>
     </head>
   </xsl:template>
   <xsl:template match="h:title">
     <xsl:text>&#10;</xsl:text>
     <title>Draft status by section</title>
+    <xsl:text>&#10;</xsl:text>
   </xsl:template>
   <xsl:template match="h:body">
     <xsl:text>&#10;</xsl:text>

Index: Makefile
===================================================================
RCS file: /sources/public/html5/spec/Makefile,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Makefile	25 Jul 2009 04:10:35 -0000	1.15
+++ Makefile	27 Jul 2009 09:41:44 -0000	1.16
@@ -16,11 +16,13 @@
 TIDY=tidy
 TIDYFLAGS=-asxhtml -n
 
+XSLTPROC=xsltproc
+XSLTPROCFLAGS=
+
 CURL=curl
 CURLFLAGS=-s
 PARSE=./parse.py
 PARSEFLAGS=--xml
-XSLTPROC=xsltproc
 
 ANNODB=http://www.whatwg.org/specs/web-apps/current-work/status.cgi?action=get-all-annotations
 
@@ -43,15 +45,17 @@
 	    do $(PERL) $(PERLFLAGS) -pi -e 's|</nav>|</nav><p>This is revision $(REVISION)</p>\n|' $$file; done
 
 toc-status.html: annotations.xml spec.xml tocmix.xsl
-	$(XSLTPROC) --novalid --output $@ \
+	$(XSLTPROC) $(XSLTPROCFLAGS) \
+	  --novalid --output $@ \
 		--stringparam Annotations annotations.xml \
 		tocmix.xsl spec.xml
 
 annotations.xml:
 	$(CURL) --output $@ $(ANNODB)
 
-spec.xml: Overview.html
-	-$(TIDY) $(TIDYFLAGS) $< > $@ 2> tidy.log
+spec.xml: Overview.html get-toc.xsl
+	-$(TIDY) $(TIDYFLAGS) $< 2> tidy.log \
+	  | $(XSLTPROC) $(XSLTPROCFLAGS) get-toc.xsl - > $@
 
 clean:
 	$(RM) MANIFEST

--- NEW FILE: get-toc.xsl ---
<xsl:stylesheet
  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
  xmlns:h="http://www.w3.org/1999/xhtml"
  xmlns="http://www.w3.org/1999/xhtml"
  version='1.0'>
  <xsl:output method="xml"/>
  <xsl:template match="h:html">
    <xsl:processing-instruction name="xml-stylesheet">href="tocmix.xsl" type="text/xml"</xsl:processing-instruction>
    <xsl:text>&#10;</xsl:text>
    <html>
      <xsl:apply-templates />
    </html>
  </xsl:template>
  <xsl:template match="h:head">
    <head>
      <xsl:text>&#10;</xsl:text>
      <title>oops</title>
      <xsl:text>&#10;</xsl:text>
    </head>
  </xsl:template>
  <xsl:template match="h:body">
    <body>
      <xsl:text>&#10;</xsl:text>
      <xsl:for-each select="h:ol[@class='toc']">
        <xsl:copy>
          <xsl:apply-templates select="@* | node()"/>
        </xsl:copy>
      </xsl:for-each>
      <xsl:text>&#10;</xsl:text>
    </body>
  </xsl:template>
  <xsl:template match="node() | @*">
    <xsl:copy>
      <xsl:apply-templates select="@* | node()"/>
    </xsl:copy>
  </xsl:template>
</xsl:stylesheet>

Index: toc-status.html
===================================================================
RCS file: /sources/public/html5/spec/toc-status.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- toc-status.html	26 Jul 2009 05:19:44 -0000	1.7
+++ toc-status.html	27 Jul 2009 09:41:45 -0000	1.8
@@ -1,27 +1,28 @@
 <?xml version="1.0"?>
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://www.w3.org/1999/xhtml">
 <head>
-<title>Draft status by section</title><style>
-        body { font-family: sans-serif; }
-        li { margin: 4px; list-style-type: none; }
-        a.status { text-decoration: none; }
-        .status { padding: 1px; border: 1px solid white; }
-        .status.UNKNOWN { background: gray; color: white; }
-        .status.TBW { background: red; color: white; }
-        .status.WIP { background: red; color: white; }
-        .status.FD { background: orange; color: black; }
-        .status.WD { background: orange; color: black; }
-        .status.CWD { background: red; color: yellow; }
-        .status.ATRISK { background: red; color: yellow; }
-        .status.LC { background: yellow; color: black; }
-        .status.CR { background: lime; color: black; }
-        .status.REC { background: green; color: white; }
-        .status.SPLITFD { background: navy; color: white; }
-        .status.SPLIT/*CR*/ { background: navy; color: white; }
-        .status.SPLITREC { background: navy; color: white; }
-        .status.ADD { background: white; color: white; }
-        a.status.ADD:hover{ background: purple; color: white; }
-      </style>
+<title>Draft status by section</title>
+<style>
+body { font-family: sans-serif; }
+li { margin: 4px; list-style-type: none; }
+a.status { text-decoration: none; }
+.status { padding: 1px; border: 1px solid white; }
+.status.UNKNOWN { background: gray; color: white; }
+.status.TBW { background: red; color: white; }
+.status.WIP { background: red; color: white; }
+.status.FD { background: orange; color: black; }
+.status.WD { background: orange; color: black; }
+.status.CWD { background: red; color: yellow; }
+.status.ATRISK { background: red; color: yellow; }
+.status.LC { background: yellow; color: black; }
+.status.CR { background: lime; color: black; }
+.status.REC { background: green; color: white; }
+.status.SPLITFD { background: navy; color: white; }
+.status.SPLIT/*CR*/ { background: navy; color: white; }
+.status.SPLITREC { background: navy; color: white; }
+.status.ADD { background: white; color: white; }
+a.status.ADD:hover{ background: purple; color: white; }
+</style>
 </head>
 <body>
 <li><a href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=introduction" class="status WD">WD</a> <a href="../spec/#introduction">1
@@ -136,29 +137,29 @@
 </li>
 <li><a href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=urls" class="status WD">WD</a> <a href="../spec/#urls">2.5 URLs</a>
 <ol>
-<li><a href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=terminology-0" class="status SPLITREC">SPLITREC</a> <a href="../spec/#terminology-0">2.5.1
+<li><a href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=terminology-0" class="status WD">WD</a> <a href="../spec/#terminology-0">2.5.1
 Terminology</a></li>
 <li><a href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=dynamic-changes-to-base-urls" class="status CR">CR</a> <a href="../spec/#dynamic-changes-to-base-urls">2.5.2 Dynamic changes to base URLs</a></li>
-<li><a href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=interfaces-for-url-manipulation" class="status ADD">ADD</a> <a href="../spec/#interfaces-for-url-manipulation">2.5.3 Interfaces for URL manipulation</a></li>
+<li><a href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=interfaces-for-url-manipulation" class="status LC">LC</a> <a href="../spec/#interfaces-for-url-manipulation">2.5.3 Interfaces for URL manipulation</a></li>
 </ol>
 </li>
 <li><a href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=fetching-resources" class="status WD">WD</a> <a href="../spec/#fetching-resources">2.6
 Fetching resources</a>
 <ol>
-<li><a href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=concept-http-equivalent" class="status ADD">ADD</a> <a href="../spec/#concept-http-equivalent">2.6.1 Protocol concepts</a></li>
-<li><a href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=encrypted-http-and-related-security-concerns" class="status ADD">ADD</a> <a href="../spec/#encrypted-http-and-related-security-concerns">2.6.2 Encrypted HTTP and related security
+<li><a href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=concept-http-equivalent" class="status WD">WD</a> <a href="../spec/#concept-http-equivalent">2.6.1 Protocol concepts</a></li>
+<li><a href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=encrypted-http-and-related-security-concerns" class="status WD">WD</a> <a href="../spec/#encrypted-http-and-related-security-concerns">2.6.2 Encrypted HTTP and related security
 concerns</a></li>
-<li><a href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=content-type-sniffing" class="status SPLITREC">SPLITREC</a> <a href="../spec/#content-type-sniffing">2.6.3 Determining the type of a resource</a></li>
+<li><a href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=content-type-sniffing" class="status WD">WD</a> <a href="../spec/#content-type-sniffing">2.6.3 Determining the type of a resource</a></li>
 </ol>
 </li>
-<li><a href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=character-encodings-0" class="status ADD">ADD</a> <a href="../spec/#character-encodings-0">2.7
+<li><a href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=character-encodings-0" class="status WD">WD</a> <a href="../spec/#character-encodings-0">2.7
 Character encodings</a></li>
 <li><a href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=common-dom-interfaces" class="status WD">WD</a> <a href="../spec/#common-dom-interfaces">2.8
 Common DOM interfaces</a>
 <ol>
 <li><a href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=reflecting-content-attributes-in-dom-attributes" class="status ADD">ADD</a> <a href="../spec/#reflecting-content-attributes-in-dom-attributes">2.8.1 Reflecting content attributes in DOM
 attributes</a></li>
-<li><a href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=collections" class="status ADD">ADD</a> <a href="../spec/#collections">2.8.2
+<li><a href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=collections" class="status WD">WD</a> <a href="../spec/#collections">2.8.2
 Collections</a>
 <ol>
 <li><a href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=htmlcollection" class="status ADD">ADD</a> <a href="../spec/#htmlcollection">2.8.2.1
@@ -254,7 +255,7 @@
 <li><a href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=paragraphs" class="status ADD">ADD</a> <a href="../spec/#paragraphs">3.5
 Paragraphs</a></li>
 <li><a href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=apis-in-html-documents" class="status CR">CR</a> <a href="../spec/#apis-in-html-documents">3.6 APIs in HTML documents</a></li>
-<li><a href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=interactions-with-xpath-and-xslt" class="status UNKNOWN">UNKNOWN</a> <a href="../spec/#interactions-with-xpath-and-xslt">3.7 Interactions with XPath and XSLT</a></li>
+<li><a href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=interactions-with-xpath-and-xslt" class="status CWD">CWD</a> <a href="../spec/#interactions-with-xpath-and-xslt">3.7 Interactions with XPath and XSLT</a></li>
 <li><a href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=dynamic-markup-insertion" class="status ADD">ADD</a> <a href="../spec/#dynamic-markup-insertion">3.8 Dynamic markup insertion</a>
 <ol>
 <li><a href="http://www.whatwg.org/specs/web-apps/current-work/edit-section.html?section=controlling-the-input-stream" class="status LC">LC</a> <a href="../spec/#controlling-the-input-stream">3.8.1 Controlling the input stream</a></li>
Received on Monday, 27 July 2009 09:41:56 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Monday, 27 July 2009 09:41:58 GMT