mike: minor build tweaks

mike: minor build tweaks

http://dev.w3.org/cvsweb/html5/markup/spec.html?r1=1.258&r2=1.259&f=h

===================================================================
RCS file: /sources/public/html5/markup/Overview.html,v
retrieving revision 1.447
retrieving revision 1.448
diff -u -d -r1.447 -r1.448
--- Overview.html 31 Jul 2010 08:13:09 -0000 1.447
+++ Overview.html 31 Jul 2010 11:32:25 -0000 1.448
@@ -141,7 +141,7 @@
 </li>
 <li> <a href="global-attributes.html#global-attributes"><span class="toc-section-number">8. </span><span class="toc-section-name">&#160;Global attributes</span></a>
 </li>
-<li> <a href="datatypes.html#datatypes"><span class="toc-section-number">9. </span><span class="toc-section-name">&#160;Datatypes</span></a>
+<li> <a href="datatypes.html#datatypes"><span class="toc-section-number">9. </span><span class="toc-section-name">&#160;Data types (common microsyntaxes)</span></a>
 </li>
 </ul>
 <ul>
@@ -637,7 +637,7 @@
 </li>
 </ul>
 </li>
-<li id="datatypes-toc"> <a href="datatypes.html#datatypes"><span class="toc-section-number">9. </span><span class="toc-section-name">&#160;Datatypes</span></a>
+<li id="datatypes-toc"> <a href="datatypes.html#datatypes"><span class="toc-section-number">9. </span><span class="toc-section-name">&#160;Data types (common microsyntaxes)</span></a>
 </li>
 </ul>
 <ul>

Index: Makefile
===================================================================
RCS file: /sources/public/html5/markup/Makefile,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -d -r1.103 -r1.104
--- Makefile 28 Jul 2010 16:07:25 -0000 1.103
+++ Makefile 31 Jul 2010 11:32:25 -0000 1.104
@@ -166,14 +166,17 @@
    | $(PERL) $(PERLFLAGS) -pi -e 's|<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">|<meta http-equiv="Content-Type" content="text/html; charset=utf-8">|' \
    > $@
 MANIFEST: MANIFEST.tmp
- for file in $(shell cat $<); \
+ @if [ -n "$(GREP) $(GREPFLAGS) UNDEFINED $<" ]; then \
+   $(GREP) $(GREPFLAGS) UNDEFINED $<; \
+ fi; \
+ for file in $(shell $(GREP) $(GREPFLAGS) -v "UNDEFINED" $<); \
    do $(TOHTML) 2>/dev/null < $$file \
    | $(PERL) $(PERLFLAGS) -pi -e 's| xmlns="http://www.w3.org/1999/xhtml"||' \
    | $(PERL) $(PERLFLAGS) -pi -e 's|<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">|<meta http-equiv="Content-Type" content="text/html; charset=utf-8">|' \
    > $$file.tmp; \
    mv $$file.tmp $$file; \
  done
- cp $< $@
+ @$(GREP) $(GREPFLAGS) -v "UNDEFINED" $< > $@
 
 spec.html: html.spec.src.html src/status.html tools/specgen.xsl tools/toc.xsl
  $(XSLTPROC) $(XSLTPROCFLAGS) \

Index: datatypes.html
===================================================================
RCS file: /sources/public/html5/markup/datatypes.html,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- datatypes.html 31 Jul 2010 08:13:11 -0000 1.58
+++ datatypes.html 31 Jul 2010 11:32:26 -0000 1.59
@@ -3,7 +3,7 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <link rel="stylesheet" href="W3C-ED.css" type="text/css">
-<title>HTML5: Datatypes</title>
+<title>HTML5: Data types (common microsyntaxes)</title>
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body>
@@ -13,14 +13,13 @@
 <span class="nav-next"><a href="references.html">references &#187;</a></span>
 </div>
 <div id="datatypes" class="section">
-        <h2>9. Datatypes <a class="hash" href="#datatypes">#</a> <a class="toc-bak" href="Overview.html#datatypes-toc">T</a>
+        <h2>9. Data types (common microsyntaxes) <a class="hash" href="#datatypes">#</a> <a class="toc-bak" href="Overview.html#datatypes-toc">T</a>
 </h2>
-        <p>This section describes datatypes that are referenced
+        <p>This section describes data types (microsyntaxes) that are referenced
               by attribute descriptions in the 
               <a href="elements.html">HTML elements</a>,
-              <a href="global-attributes.html">Global attributes</a>,
               and
-              <a href="forms-attributes.html">Forms attributes</a>
+              <a href="global-attributes.html">Global attributes</a>
               sections.</p>
         <div id="data-string-def" class="section">
     <h2 class="common-subhead">9.1. <dfn id="data-string">String</dfn> <a class="hash" href="#data-string-def">#</a>

Index: input.file.html
===================================================================
RCS file: /sources/public/html5/markup/input.file.html,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- input.file.html 31 Jul 2010 08:13:12 -0000 1.63
+++ input.file.html 31 Jul 2010 11:32:26 -0000 1.64
@@ -98,7 +98,7 @@
             <dt>
 <a class="spec-link" title="Read about this attribute in the HTML5 spec" href="http://dev.w3.org/html5/spec-author-view/number-state.html#attr-input-accept">&#9432;</a>
 <span class="attribute-name">accept</span> = <span class="attr-values">
-      <a href="datatypes.html#form.data.mimetypelist">list of mime types</a>
+      <a href="datatypes.html#form.data.mimetypelist">list of MIME types</a>
     </span> 
 <a class="hash" id="input.file.attrs.accept" title="input.file.attrs.accept" href="input.file.html#input.file.attrs.accept">#</a>
 </dt>

Index: spec.html
===================================================================
RCS file: /sources/public/html5/markup/spec.html,v
retrieving revision 1.258
retrieving revision 1.259
diff -u -d -r1.258 -r1.259
--- spec.html 31 Jul 2010 08:13:14 -0000 1.258
+++ spec.html 31 Jul 2010 11:32:26 -0000 1.259
@@ -140,7 +140,7 @@
 </li>
 <li> <a href="#global-attributes"><span class="toc-section-number">8. </span><span class="toc-section-name">&#160;Global attributes</span></a>
 </li>
-<li> <a href="#datatypes"><span class="toc-section-number">9. </span><span class="toc-section-name">&#160;Datatypes</span></a>
+<li> <a href="#datatypes"><span class="toc-section-number">9. </span><span class="toc-section-name">&#160;Data types (common microsyntaxes)</span></a>
 </li>
 </ul>
 <ul>
@@ -636,7 +636,7 @@
 </li>
 </ul>
 </li>
-<li id="datatypes-toc"> <a href="#datatypes"><span class="toc-section-number">9. </span><span class="toc-section-name">&#160;Datatypes</span></a>
+<li id="datatypes-toc"> <a href="#datatypes"><span class="toc-section-number">9. </span><span class="toc-section-name">&#160;Data types (common microsyntaxes)</span></a>
 </li>
 </ul>
 <ul>
@@ -11272,7 +11272,7 @@
             <dt>
 <a class="spec-link" title="Read about this attribute in the HTML5 spec" href="http://dev.w3.org/html5/spec-author-view/number-state.html#attr-input-accept">&#9432;</a>
 <span class="attribute-name">accept</span> = <span class="attr-values">
-      <a href="#form.data.mimetypelist">list of mime types</a>
+      <a href="#form.data.mimetypelist">list of MIME types</a>
     </span> 
 <a class="hash" id="input.file.attrs.accept" title="input.file.attrs.accept" href="#input.file.attrs.accept">#</a>
 </dt>
@@ -23340,14 +23340,13 @@
 </div>
 </div>
     <div id="datatypes" class="section">
-        <h2>9. Datatypes <a class="hash" href="#datatypes">#</a> <a class="toc-bak" href="#datatypes-toc">T</a>
+        <h2>9. Data types (common microsyntaxes) <a class="hash" href="#datatypes">#</a> <a class="toc-bak" href="#datatypes-toc">T</a>
 </h2>
-        <p>This section describes datatypes that are referenced
+        <p>This section describes data types (microsyntaxes) that are referenced
               by attribute descriptions in the 
               <a href="#elements">HTML elements</a>,
-              <a href="#global-attributes">Global attributes</a>,
               and
-              <a href="#forms-attributes">Forms attributes</a>
+              <a href="#global-attributes">Global attributes</a>
               sections.</p>
         <div id="data-string-def" class="section">
     <h2 class="common-subhead">9.1. <dfn id="data-string">String</dfn> <a class="hash" href="#data-string-def">#</a>

Index: TODO
===================================================================
RCS file: /sources/public/html5/markup/TODO,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- TODO 5 Feb 2010 09:28:04 -0000 1.6
+++ TODO 31 Jul 2010 11:32:26 -0000 1.7
@@ -8,7 +8,4 @@
   some other example :) also show an equivalent example that uses
   entities instead
 
-- Add links to DOM interfaces.
 - Add a Usage section, with links to tutorials elsewhere.
-- Make the Examples section a set of links to examples in
-  third-party documents.

Received on Saturday, 31 July 2010 11:33:15 UTC