whatwg · UnicornRiley · Feb 26, 2018 · Feb 26, 2018 · Feb 26, 2018 · Feb 17, 2018
diff --git a/.gitattributes b/.gitattributes
@@ -1,4 +1,5 @@
 source      text eol=lf diff=html linguist-language=HTML
+*.wattsi    text eol=lf diff=html linguist-language=HTML
 
 *.css       text eol=lf
 *.html      text eol=lf

diff --git a/.travis.yml b/.travis.yml
@@ -7,6 +7,7 @@ env:
     - secure: "qI0QEOmT3P3x9MfWwY0F43CxV8MRvuYDUtGRXIXs1Utpk/1wJv4zsebyHabuusEai9QakRo1kexwAuAcbyeiFTXKwn8DKIId2BDx14/fzmHSsyj86W1Tao5HAoD4NDQReI+c3LX5ipDtInlBXip0NgMMmQiT4+IzVkf9itAewCg="
     - ENCRYPTION_LABEL="1536cf00117f"
 script:
+  - shellcheck review-draft.sh
   - cd .. &&
     git clone https://github.com/whatwg/html-build.git html-build &&
     bash html-build/ci-deploy/outside-container.sh

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -12,6 +12,8 @@ We'd be happy to mentor you through this process. If you're interested and need
 
 In short, change `source` and submit your patch, with a [good commit message](https://github.com/erlang/otp/wiki/Writing-good-commit-messages). Try to follow the source formatting rules below.
 
+Note that `source` is written in a dialect of HTML, which is eventually compiled into the deployed standard by a tool called [Wattsi](https://github.com/whatwg/wattsi). Documentation for this dialect can be found [in the Wattsi repository](https://github.com/whatwg/wattsi/blob/master/Syntax.md).
+
 Please add your name to the Acknowledgments section (search for `<!-- ACKS`) in your first pull request, even for trivial fixes. The names are sorted lexicographically.
 
 To preview your changes locally, follow the instructions in the [html-build repository](https://github.com/whatwg/html-build).
@@ -20,7 +22,7 @@ To preview your changes locally, follow the instructions in the [html-build repo
 
 In addition to generating the [singlepage](https://html.spec.whatwg.org/) and [multipage](https://html.spec.whatwg.org/multipage/) specifications, we also generate an [edition for developers](https://html.spec.whatwg.org/dev/). This is meant to exclude content that is of interest only to implementers. We can always use community help in properly enforcing this distinction, especially since for a long period the developer's edition was not working and so we made a lot of changes without properly considering their impact on it.
 
-To mark an element as being omitted from the developer's edition, use a `w-nodev` attribute. Similarly, to mark something up as being omitted from the singlepage and multipage versions, use a `w-nohtml` attribute. This may require introducing container `<div>`s or `<span>`s; that's fine. Note that Web IDL blocks (`<pre class="idl">`) are automatically omitted by the build process, and so don't need `w-nodev` attributes.
+To mark an element as being omitted from the developer's edition, use a `w-nodev` attribute. To only include it in the developer's edition, use a `w-dev` attribute. This may require introducing container `<div>`s or `<span>`s; that's fine. Note that Web IDL blocks (`<pre class="idl">`) are automatically omitted by the build process, and so don't need `w-nodev` attributes. (There also exist `w-nohtml`, `w-nosnap`, and `w-noreview` attributes which exclude information from the Living Standard, the Commit Snapshot, and the Review Draft respectively. Day-to-day changes will not require them.)
 
 Another interesting feature is the `subdfn` attribute. This is useful for when something is defined inside text that is not present in the developer's edition (such as a Web IDL block). In that case, we can use the `subdfn` attribute on something which has a matching `data-x` attribute, to indicate the definition of the term for the purposes of the developer's edition.
 

diff --git a/Makefile b/Makefile
@@ -0,0 +1,5 @@
+default:
+	@echo "Please see CONTRIBUTING.md for instructions on building HTML."
+
+review: source
+	@./review-draft.sh
diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@ We appreciate all contributions, see the [guidelines for contributing](CONTRIBUT
 
 ### Tests
 
-Tests are in the `html/` directory of the [web-platform-tests repository](https://github.com/w3c/web-platform-tests).
+Tests are in the `html/` directory of the [web-platform-tests repository](https://github.com/web-platform-tests/wpt).
 
 ### Blame
 

diff --git a/demos/canvas/blue-robot/index-idle.html b/demos/canvas/blue-robot/index-idle.html
@@ -157,7 +157,7 @@
    if (!animating) {
      animating = true;
      paint();
-     // but tick every 150ms, so that we don't slow down when we don't paint
+     // but tick every 100ms, so that we don't slow down when we don't paint
      interval = setInterval(function () {
        var dx = blueRobot.tick();
        landscape.advance(dx);

diff --git a/demos/canvas/blue-robot/index.html b/demos/canvas/blue-robot/index.html
@@ -146,7 +146,7 @@
    requestAnimationFrame(paint);
  }
  paint();
- // but tick every 150ms, so that we don't slow down when we don't paint
+ // but tick every 100ms, so that we don't slow down when we don't paint
  setInterval(function () {
    var dx = blueRobot.tick();
    landscape.advance(dx);

diff --git a/dev/styles.css b/dev/styles.css
@@ -63,7 +63,7 @@ body {
   line-height: 1.45em;
   font-family: "Droid Serif", Georgia, serif;
   color: #222;
-  width: 760px;
+  max-width: 760px;
   margin: 4em auto;
   padding: 0 1em;
 }
@@ -199,7 +199,7 @@ p {
 
 p, ul, ol, dl {
   margin-bottom: 1em;
-  width: 520px;
+  max-width: 520px;
 }
 
 hr {
@@ -306,7 +306,7 @@ var > var::after {
   (http://developers.whatwg.org/introduction.html#typographic-conventions)
 */
 .note, .example, .XXX, .warning, pre {
-  width: 580px;
+  max-width: 580px;
 }
 
 .note {
@@ -353,11 +353,14 @@ var > var::after {
 /* Header */
 
 header#head {
-  position: relative;
+  display: flex;
+  --logo-width: 100px;
+  --logo-margin: 20px;
+  margin-left: calc(-1 * (var(--logo-width) + var(--logo-margin)));
 }
 
 header#head hgroup {
-  width: 580px;
+  flex: 1;
 }
 
 header#head h1 {
@@ -390,26 +393,18 @@ header#head h2 {
 }
 
 header#head .logo {
-  position: absolute;
-  left: -120px;
+  margin-right: var(--logo-margin);
 }
 
 /* Search bar */
 
-#search {
-  position: absolute;
-  top: 0;
-  right: 0;
-}
-
 #search, #search input {
   width: 150px;
 }
 
 #search ol {
   z-index: 1;
   position: absolute;
-  right: 0;
   width: 25em;
   list-style: none;
   background-color: #eee;
@@ -521,6 +516,12 @@ html:not(.index) ol.toc ol {
 
 /* RESPONSIVE STYLES */
 
+@media screen and (max-width: 1000px) {
+  header#head {
+    margin-left: 0;
+  }
+}
+
 @media screen and (max-width: 767px) {
   body {
     font-size: 110%;
@@ -532,6 +533,7 @@ html:not(.index) ol.toc ol {
 
   header#head {
     text-align: center;
+    display: block;
   }
 
   header#head .logo {
@@ -550,7 +552,7 @@ html:not(.index) ol.toc ol {
   }
 
   .note, .example, .XXX, .warning, pre {
-    width: 560px;
+    max-width: 560px;
   }
 
   pre {
@@ -565,9 +567,14 @@ html:not(.index) ol.toc ol {
     margin-left: 0.5em;
   }
 
+  h2 .secno {
+    position: static;
+    display: inline;
+  }
+
  .status {
-    left: auto;
-    right: -8.9em;
+    position: static;
+    margin: 0;
   }
 
   /* Search */
@@ -626,3 +633,60 @@ ul.domTree li:not(:last-child)::after {
   content: '';
   border-width: 0.1em;
 }
+
+/* SYNTAX HIGHLIGHTING */
+
+
+/* for output from https://github.com/tabatkins/highlighter */
+c-[a] { color: #990055 } /* Keyword.Declaration */
+c-[b] { color: #990055 } /* Keyword.Type */
+c-[c] { color: #708090 } /* Comment */
+c-[d] { color: #708090 } /* Comment.Multiline */
+c-[e] { color: #0077aa } /* Name.Attribute */
+c-[f] { color: #669900 } /* Name.Tag */
+c-[g] { color: #222222 } /* Name.Variable */
+c-[k] { color: #990055 } /* Keyword */
+c-[l] { color: #000000 } /* Literal */
+c-[m] { color: #000000 } /* Literal.Number */
+c-[n] { color: #0077aa } /* Name */
+c-[o] { color: #999999 } /* Operator */
+c-[p] { color: #999999 } /* Punctuation */
+c-[s] { color: #a67f59 } /* Literal.String */
+c-[t] { color: #a67f59 } /* Literal.String.Single */
+c-[u] { color: #a67f59 } /* Literal.String.Double */
+c-[cp] { color: #708090 } /* Comment.Preproc */
+c-[c1] { color: #708090 } /* Comment.Single */
+c-[cs] { color: #708090 } /* Comment.Special */
+c-[kc] { color: #990055 } /* Keyword.Constant */
+c-[kn] { color: #990055 } /* Keyword.Namespace */
+c-[kp] { color: #990055 } /* Keyword.Pseudo */
+c-[kr] { color: #990055 } /* Keyword.Reserved */
+c-[ld] { color: #000000 } /* Literal.Date */
+c-[nc] { color: #0077aa } /* Name.Class */
+c-[no] { color: #0077aa } /* Name.Constant */
+c-[nd] { color: #0077aa } /* Name.Decorator */
+c-[ni] { color: #0077aa } /* Name.Entity */
+c-[ne] { color: #0077aa } /* Name.Exception */
+c-[nf] { color: #0077aa } /* Name.Function */
+c-[nl] { color: #0077aa } /* Name.Label */
+c-[nn] { color: #0077aa } /* Name.Namespace */
+c-[py] { color: #0077aa } /* Name.Property */
+c-[ow] { color: #999999 } /* Operator.Word */
+c-[mb] { color: #000000 } /* Literal.Number.Bin */
+c-[mf] { color: #000000 } /* Literal.Number.Float */
+c-[mh] { color: #000000 } /* Literal.Number.Hex */
+c-[mi] { color: #000000 } /* Literal.Number.Integer */
+c-[mo] { color: #000000 } /* Literal.Number.Oct */
+c-[sb] { color: #a67f59 } /* Literal.String.Backtick */
+c-[sc] { color: #a67f59 } /* Literal.String.Char */
+c-[sd] { color: #a67f59 } /* Literal.String.Doc */
+c-[se] { color: #a67f59 } /* Literal.String.Escape */
+c-[sh] { color: #a67f59 } /* Literal.String.Heredoc */
+c-[si] { color: #a67f59 } /* Literal.String.Interpol */
+c-[sx] { color: #a67f59 } /* Literal.String.Other */
+c-[sr] { color: #a67f59 } /* Literal.String.Regex */
+c-[ss] { color: #a67f59 } /* Literal.String.Symbol */
+c-[vc] { color: #0077aa } /* Name.Variable.Class */
+c-[vg] { color: #0077aa } /* Name.Variable.Global */
+c-[vi] { color: #0077aa } /* Name.Variable.Instance */
+c-[il] { color: #000000 } /* Literal.Number.Integer.Long */
diff --git a/review-draft.sh b/review-draft.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+set -o errexit
+set -o nounset
+
+# This is based on a script named review.sh over at
+# https://github.com/whatwg/whatwg.org/tree/master/resources.whatwg.org/build
+#
+# Please see https://github.com/whatwg/meta/blob/master/MAINTAINERS.md for information on creating
+# and announcing Review Drafts.
+
+INPUT="source"
+
+mkdir -p "review-drafts"
+REVIEW_DRAFT="review-drafts/$(date +'%Y-%m').wattsi"
+
+# Note that %B in date is locale-specific. Let's hope for English.
+sed -e 's/^  <title w-nodev>HTML Standard<\/title>$/  <title w-nodev>HTML Standard Review Draft '"$(date +'%B %Y')"'<\/title>/' \
+    -e 's/^    <h2 w-nohtml w-nosnap id="living-standard" class="no-num no-toc">Review Draft &mdash; Published <span class="pubdate">\[DATE: 01 Jan 1901\]<\/span><\/h2>$/    <h2 w-nohtml w-nosnap id="living-standard" class="no-num no-toc">Review Draft \&mdash; Published '"$(date +'%d %B %Y')"'<\/h2>/' \
+    -e 's/<span class="pubyear">\[DATE: 1901\]<\/span>/'"$(date +'%Y')"'/' \
+    < "$INPUT" > "$REVIEW_DRAFT"
+echo "Created Review Draft at $REVIEW_DRAFT"
+echo "Please verify that only three lines changed relative to $INPUT:"
+diff -up "$INPUT" "$REVIEW_DRAFT" || exit 0