Fixed a number of bugs in specbugs.py and the spec build process.

Author: msporny

Makefile.in

@@ -30,9 +30,11 @@ $(SPECS): ${SPEC_SPLIT_STAMP} ${BUILD_DIR} ${ISSUE_ANNOTATIONS} ${DIST_DIR}
 	@echo "Joining microsections into $(@F) specification..."
 	@./bin/microjoin.py -d ${BUILD_DIR} -o tempspec-$(@F) ${CONFIG_DIR}/$(subst .html,.conf,$(@F))
 	@echo "Generating final document via Anolis (this may take 2-3 minutes)..."
-	@@ANOLIS@ @ANOLIS_FLAGS@ ${BUILD_DIR}/tempspec-$(@F) $@
-	@sed -i "s/@SPEC_NAME@/$(@F)/g" $@
-	-@tidy -m -i -w 78 -ashtml $@
+	@@ANOLIS@ @ANOLIS_FLAGS@ ${BUILD_DIR}/tempspec-$(@F) ${BUILD_DIR}/anolis-$(@F)
+	@sed -i "s/@SPEC_NAME@/$(@F)/g" ${BUILD_DIR}/anolis-$(@F)
+	-@tidy -m -i -w 78 -ashtml ${BUILD_DIR}/anolis-$(@F)
+	@echo "Inserting bug identifiers into sections..."
+	@./bin/specbugs.py -s ${BUILD_DIR}/anolis-$(@F) -n "HTML+RDFa (editor: Manu Sporny)" -o $@
 	@echo "$(@F) spec written to: $@"
 
 ${SPEC_SPLIT_STAMP}: html5-hixie/source

bin/specbugs.py

@@ -1,6 +1,8 @@
 #!/usr/bin/env python
 #
-# Retrieves a bug list, parses the bug list for the 
+# Retrieves a bug list, retrieves all of the bugs in the bug list, 
+# parses an input specification and marks the specification with bug
+# identifiers associated with the W3C bug tracker.
 import sys, os, os.path
 from optparse import OptionParser
 import urllib
@@ -84,7 +86,7 @@ def addSpecBugWarnings(argv, stdout, environ):
     # Download the buglist if it doesn't already exist
     blFetcher = W3CUrlOpener()
     if(not os.path.exists(buglistFile)):
-        log("INFO: Downloading %s buglist to %s..." % (buglistFile,))
+        log("INFO: Downloading %s buglist to %s..." % (shortname, buglistFile))
         blFetcher.retrieve(quotedBugUrl, buglistFile)
 
     # Download all of the bugs in the buglist
@@ -102,7 +104,6 @@ def addSpecBugWarnings(argv, stdout, environ):
 
     # Process each of the bug reports
     for (key, value) in bugs.items():
-        log("INFO: Processing bug %s" % (key,))
         bug = None
         try:
             bug = parse(value["filename"])
@@ -144,7 +145,8 @@ def addSpecBugWarnings(argv, stdout, environ):
             log("WARNING: Bug %s does not have an associated spec section" % \
                 (bugId,))
 
-    # Process the input HTML file
+    # Process the input HTML file and mark each section identified by a
+    # bug with the relevant information
     specfile = open(options.specFile, "r")
     outfile = open(options.outFile, "w")
     activeElement = None
@@ -164,14 +166,14 @@ def addSpecBugWarnings(argv, stdout, environ):
         if(activeElement != None and 
             line.find("</%s>" % activeElement) != -1):
             outfile.write(
-                "\n<ul class=\"XXX annotation\"><li><b>Status</b>: " +
+                "\n  <p class=\"annotation\"><b>Status</b>: " +
                 "There are W3C bug tracker items associated with this " +
-                " section.</b></li>\n")
+                " section.<br/><br/>\n")
             for bug in bugsBySection[idvalue]:
-                outfile.write("<li class=\"XXX annotation\">" + 
-                    "BUG #<a href=\"%s\">%s</a>: %s</li>" % \
+                outfile.write("    <span class=\"annotation\">" + 
+                    "BUG #<a href=\"%s\">%s</a>: %s</span><br/>\n" % \
                     (bug["url"], bug["id"], bug["description"]))
-            outfile.write("</ul>")
+            outfile.write("  </p>\n")
             activeElement = None
 
     specfile.close()

configure.ac

@@ -14,7 +14,8 @@ AC_CHECK_PROGS(WGET, wget /usr/bin/wget /usr/local/bin/wget, [not found], $PATH)
 ISSUE_ANNOTATIONS=build/issue-annotations.xml
 
 # Setup the flags needed for Anolis
-ANOLIS_FLAGS="--w3c-compat-xref-a-placement --parser=lxml.html --output-encoding=us-ascii --allow-duplicate-dfns --annotations=$ISSUE_ANNOTATIONS --annotate-w3c-issues"
+#ANOLIS_FLAGS="--w3c-compat-xref-a-placement --parser=lxml.html --output-encoding=us-ascii --allow-duplicate-dfns --annotations=$ISSUE_ANNOTATIONS --annotate-w3c-issues"
+ANOLIS_FLAGS="--w3c-compat-xref-a-placement --parser=lxml.html --output-encoding=us-ascii --allow-duplicate-dfns"
 AC_SUBST(ANOLIS_FLAGS)
 
 # Generate the printable date string

headers/header-w3c-rdfa-wd.in

@@ -309,14 +309,14 @@
   </p><!-- not everyone agrees with html5 (requested before fpwd) -->
   <p>Publication as a Working Draft does not imply endorsement by the W3C Membership. 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>
   <p>
-   The publication of this document by the W3C as a W3C  Working Draft does 
-   not imply endorsement by the majority of members of the W3C HTML working 
-   group or the W3C as a whole. In particular, 
+   The publication of this document by the W3C as a W3C Working Draft does 
+   not imply endorsement by the W3C HTML Working Group or the W3C as a whole. 
+   In particular, 
   </p>
   <ul>
     <li>There are one or more alternate methods of adding data without 
      using RDFa, such as 
-     [<a href="http://www.whatwg.org/specs/web-apps/current-work/multipage/microdata.html">microdata</a>].</li>
+     [<a href="http://www.w3.org/TR/microdata/">microdata</a>].</li>
     <li>There are discussions of alternate extensibility mechanisms, 
      covered in  
      [<a href="http://www.w3.org/html/wg/tracker/issues/41">issue-41</a>],
@@ -334,10 +334,11 @@
   </p>
   <!-- UNDER NO CIRCUMSTANCES IS THE PRECEDING LIST TO BE REMOVED OR EDITED WITHOUT TALKING TO IAN FIRST --><!-- status of document, group responsible (required) -->
   <p>
-   This specification has been developed by the 
+   This specification has been jointly developed by the 
    <a href="http://www.w3.org/2001/sw/BestPractices/HTML/">RDFa Task Force</a> 
-   and is currently being published by the 
-   <a href="http://www.w3.org/html/wg/">W3C HTML Working Group</a>
+   and the <a href="http://www.w3.org/html/wg/">HTML Working Group</a> and
+   is currently being published by the 
+   <a href="http://www.w3.org/html/wg/">HTML Working Group</a>
    to further discussions there.
   </p>
   <!-- UNDER NO CIRCUMSTANCES IS THE FOLLOWING PARAGRAPH TO BE REMOVED OR EDITED WITHOUT TALKING TO IAN FIRST --><!-- UNDER NO CIRCUMSTANCES IS THE PRECEDING PARAGRAPH TO BE REMOVED OR EDITED WITHOUT TALKING TO IAN FIRST --><!-- context and rationale (required) -->