html5/spec .cvsignore,1.1,1.2 Makefile,1.14,1.15 toc-status.html,1.3,1.4 tocmix.xsl,1.3,1.4

Update of /sources/public/html5/spec
In directory hutz:/tmp/cvs-serv17498

Modified Files:
	.cvsignore Makefile toc-status.html tocmix.xsl 
Log Message:
made some tweak's to Dan's setup for building the status-annotated TOC, and added some simple styling to it


Index: .cvsignore
===================================================================
RCS file: /sources/public/html5/spec/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- .cvsignore	18 Jul 2009 11:07:06 -0000	1.1
+++ .cvsignore	25 Jul 2009 04:10:35 -0000	1.2
@@ -1,3 +1,4 @@
 MANIFEST
 annotations.xml
 spec.xml
+tidy.log

Index: tocmix.xsl
===================================================================
RCS file: /sources/public/html5/spec/tocmix.xsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- tocmix.xsl	24 Oct 2008 08:38:50 -0000	1.3
+++ tocmix.xsl	25 Jul 2009 04:10:35 -0000	1.4
@@ -17,14 +17,15 @@
   <xsl:variable name="entry"
 		select="$AnnoDB/annotations/entry[@section=$frag]" />
 
-  <xsl:message>
-    TOC section: <xsl:value-of select="$frag"/> <xsl:value-of select="$entry"/>
-  </xsl:message>
+  <!-- * <xsl:message> -->
+    <!-- * TOC section: <xsl:value-of select="$frag"/> <xsl:value-of select="$entry"/> -->
+  <!-- * </xsl:message> -->
 
   <xsl:copy>
     <xsl:apply-templates select="@*" mode="toc"/>
     <xsl:if test="$entry">
-      <b><xsl:value-of select="$entry/@status" /></b>
+      <b class="status {$entry/@status}"><xsl:value-of select="$entry/@status" /></b>
+      <xsl:text> </xsl:text>
     </xsl:if>
     <xsl:apply-templates select="node()" mode="toc"/>
   </xsl:copy>
@@ -39,31 +40,53 @@
 <xsl:template match="h:html">
   <html>
     <xsl:apply-templates />
+    <xsl:text>&#10;</xsl:text>
   </html>
 </xsl:template>
 
 <xsl:template match="h:head">
+  <xsl:text>&#10;</xsl:text>
   <head>
     <xsl:apply-templates />
+    <style>
+      li {
+      margin: 4px;
+      }
+      .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; }
+    </style>
+    <xsl:text>&#10;</xsl:text>
   </head>
 </xsl:template>
 
 <xsl:template match="h:title">
-  <head>
-    <xsl:apply-templates />
-  </head>
+  <xsl:text>&#10;</xsl:text>
+  <title>Draft status by section</title>
 </xsl:template>
 
 <xsl:template match="h:body">
+  <xsl:text>&#10;</xsl:text>
   <body>
     <xsl:apply-templates />
+    <xsl:text>&#10;</xsl:text>
   </body>
 </xsl:template>
 
 <!-- don't pass text thru -->
-<xsl:template match="text()|@*">
-</xsl:template>
-
-
+<xsl:template match="text()|@*"></xsl:template>
 </xsl:transform>
-

Index: Makefile
===================================================================
RCS file: /sources/public/html5/spec/Makefile,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- Makefile	23 Jul 2009 04:37:40 -0000	1.14
+++ Makefile	25 Jul 2009 04:10:35 -0000	1.15
@@ -13,6 +13,9 @@
 PERL=perl
 PERLFLAGS=
 
+TIDY=tidy
+TIDYFLAGS=-asxhtml -n
+
 CURL=curl
 CURLFLAGS=-s
 PARSE=./parse.py
@@ -23,7 +26,7 @@
 
 REVISION=$(shell $(GREP) $(GREPFLAGS) 'This is .+Revision: ' Overview.html | $(PERL) $(PERLFLAGS) -pe 's/.*This is .+Revision: ([^ ]+) \$$/$$1/')
 
-all: MANIFEST
+all: MANIFEST toc-status.html
 
 debug:
 	echo $(REVISION)
@@ -38,7 +41,6 @@
 	  $(PERL) $(PERLFLAGS) -pi -e 's/^.*This is .+Revision: ([^ ]+) \$$.*$$/This is revision $(REVISION)/' spec.html
 	  for file in $$(cat MANIFEST); \
 	    do $(PERL) $(PERLFLAGS) -pi -e 's|</nav>|</nav><p>This is revision $(REVISION)</p>\n|' $$file; done
-	  #$(PERL) $(PERLFLAGS) -pi -e 's|<div class="head">|<body onload="fixBrokenLink()"><div class="head">|' $<
 
 toc-status.html: annotations.xml spec.xml tocmix.xsl
 	$(XSLTPROC) --novalid --output $@ \
@@ -49,7 +51,10 @@
 	$(CURL) --output $@ $(ANNODB)
 
 spec.xml: Overview.html
-	$(PARSE) $(PARSEFLAGS) $< > $@
+	-$(TIDY) $(TIDYFLAGS) $< > $@ 2> tidy.log
 
 clean:
 	$(RM) MANIFEST
+	$(RM) spec.xml
+	$(RM) annotations.xml
+	$(RM) tidy.log

Index: toc-status.html
===================================================================
RCS file: /sources/public/html5/spec/toc-status.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- toc-status.html	24 Oct 2008 08:38:49 -0000	1.3
+++ toc-status.html	25 Jul 2009 04:10:35 -0000	1.4
@@ -1,41 +1,72 @@
 <?xml version="1.0"?>
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://www.w3.org/1999/xhtml"><head><head/></head><body>
-<li><b>WD</b><a href="#introduction"><span class="secno">1</span>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://www.w3.org/1999/xhtml">
+<head>
+<title>Draft status by section</title><style>
+      li {
+      margin: 4px;
+      }
+      .status { 
+      padding: 1px;
[...2249 lines suppressed...]
 Localization</a></li>
-<li><a href="#declarative-2d-vector-graphics-and-animation"><span class="secno">10.2</span> Declarative 2D vector graphics and
-animation</a></li>
-<li><a href="#declarative-3d-scenes"><span class="secno">10.3</span> Declarative 3D scenes</a></li>
-<li><a href="#timers"><span class="secno">10.4</span>
-Timers</a></li>
+<li><a href="#declarative-3d-scenes"><span class="secno">13.2</span> Declarative 3D scenes</a></li>
+<li><a href="#rendering-and-the-dom"><span class="secno">13.3</span> Rendering and the DOM</a></li>
 </ol>
 </li>
-<li><a class="no-num" href="#index">Index</a></li>
-<li><b>TBW</b><a class="no-num" href="#references">References</a></li>
-<li><b>WIP</b><a class="no-num" href="#acknowledgements">Acknowledgements</a></li>
-</body></html>
+<li><b class="status TBW">TBW</b> <a class="no-num" href="#index">Index</a></li>
+<li><b class="status TBW">TBW</b> <a class="no-num" href="#references">References</a></li>
+<li><b class="status WIP">WIP</b> <a class="no-num" href="#acknowledgements">Acknowledgements</a></li>
+
+</body>
+</html>

Received on Saturday, 25 July 2009 04:10:46 UTC