Merge branch 'develop' into gh-pages

* develop:
  v3.2.131
  Fix(release): give origin to gh-pages
  v3.2.130
  Fix(release): pull gh-pages before merge
  Fix(w3c/style): assure viewport and chaset are first (closes speced#791)
  Fix(save-html): assure viewport and chaset are first (closes speced#791)

js/ui/save-html.js

@@ -16,6 +16,22 @@ define(
             $("#toc-nav", rootEl).remove() ;
             $("body", rootEl).removeClass('toc-sidebar');
             utils.removeReSpec(rootEl);
+
+            // Move meta viewport, as it controls the rendering on mobile
+            var head = rootEl.querySelector("head");
+            var metaViewport = rootEl.querySelector("meta[name='viewport']");
+            if(metaViewport){
+                head.insertBefore(metaViewport, head.firstChild);
+            }
+
+            // Move charset to top, because it needs to be in the first 512 bytes
+            var metaCharset = rootEl.querySelector("meta[charset=utf-8], meta[content*='charset=utf-8']");
+            if(!metaCharset){
+                pubsubhub.pub("warn", "Document lacks a 'meta charset' declaration. Exporting as utf-8.");
+                metaCharset = doc.createElement("meta");
+                metaCharset.setAttribute("charset", "utf-8");
+            }
+            head.insertBefore(metaCharset, head.firstChild);
         };
 
         // Clean up markup to overcome bugs in beautifier

js/w3c/style.js

@@ -18,6 +18,11 @@ define(
         doc.body.appendChild(script);
       }
 
+      // Make a best effort to attach meta viewport at the top of the head.
+      // Other plugins might subsequently push it down, but at least we start
+      // at the right place. When ReSpec exports the HTML, it again moves the
+      // meta viewport to the top of the head - so to make sure it's the first
+      // thing the browser sees. See js/ui/save-html.js.
       function attachMetaViewport(doc){
         var meta = doc.createElement("meta");
         meta.name = "viewport";
@@ -27,7 +32,7 @@ define(
             "shrink-to-fit": "no",
         };
         meta.content = utils.toKeyValuePairs(contentProps).replace(/\"/g, "")
-        doc.head.appendChild(meta);
+        doc.head.insertBefore(meta, doc.head.firstChild);
       }
 
      function selectStyleVersion(styleVersion){

package.json

@@ -1,6 +1,6 @@
 {
   "name": "respec",
-  "version": "3.2.129",
+  "version": "3.2.131",
   "license": "W3C",
   "description": "Specification Edition Support Tool.",
   "engines": {

tools/release.js

@@ -227,6 +227,7 @@ async.task(function * () {
     yield git(`commit -am v${version}`);
     // 5. Merge to gh-pages (git checkout gh-pages; git merge develop)
     yield git(`checkout gh-pages`);
+    yield git(`pull origin gh-pages`);
     yield git(`merge develop`);
     yield git(`checkout develop`);
     // 6. Tag the release (git tag v3.x.y)