2.2.2

Merge branch 'v2' of github.com:distillpub/template into v2
2.2.1
2026-06-28 03:51:51 +08:00 · 2017-10-23 15:50:29 -07:00 · 2017-10-23 15:50:20 -07:00 · 2017-10-23 15:49:19 -07:00 · 2017-10-23 15:47:05 -07:00 · 2017-10-23 11:39:13 -07:00
57 changed files with 2239 additions and 667 deletions
@@ -0,0 +1,9 @@
+src
+build
+.editorconfig
+.eslintrc.json
+.gitignore
+.travis.yml
+rollup.config.dev.js
+rollup.config.js
+yarn-error.log
@@ -1,39 +1,25 @@
-# Distill Templates
+# Distill Template [![Build Status](https://travis-ci.org/distillpub/template.svg?branch=master)](https://travis-ci.org/distillpub/template)
+
+This is the repository for the distill web framework. If you're interesting in just using the framework to write an article for the [Distill journal](http://distill.pub), visit http://distill.pub/guide/. 
+
+The general process for using this framework is to hotlink the compiled code in your dev environment. 
+
+```html
+<script src="https://distill.pub/template.v2.js"></script>
+```
+
+You can also install it as a local dependency through npm or with [yarn](https://yarnpkg.com).
+
+```
+npm install --D distill-template
+```
+
+If you're interested in submitting pull requests or developing on the framework itself, read on.

 ## Development

-Run `yarn start` to start a watching build rollup server.
+Run `npm run start` to start a watching build rollup server. To view the sample pages in the repo, you can run `npm run serve` as a separate process which starts a static server. `npm run build` will run a one-time build.

 ## Testing

-Run `yarn test`. That's it.
-
-
-## TODO:
-
-[ ] auto detection/adding behavior
-  * title
-  * appendix
-  * footnote list ?
-[x] should work without distill-appendix
-[x] YML author without ":" should work?
-[ ] throw warning on <hr>
-[ ] h numbering:
-  h2: position relative
-  a: position: absolute;
-  right: calc(100% + 16px);
-  /* text-align: right; */
-  /* width: 80px; */
-  /* font-size: 20px; */
-  /* font-weight: 200; */
-
-
-auto-added elements:
- title in front, no h1 -> add it
- no title in front, h1 -> read and put into frontMatter
- footnote -> footnote list
- break up bib
- if citation, no bib-list -> add citation-list
- if authors, no byline -> add byline
- no appendix -> add appendix
- 
+Run `npm test`. That's it.
@@ -10,9 +10,9 @@ const transforms = require('../dist/transforms.v2.js');
 program
  .version('1.0.0')
  .description('Pre-renders distill articles for publication.')
-  .usage('-i <input path> -o <output path>')
-  .option('-i, --input_path <path>', 'path to input HTML file.')
-  .option('-o, --output_path <path>', 'path to write rendered HTML file to.')
+  .usage('-i <input_path> -o <output_path>')
+  .option('-i, --input-path <path>', 'path to input HTML file.')
+  .option('-o, --output-path <path>', 'path to write rendered HTML file to.')
  .parse(process.argv);

 const virtualConsole = new jsdom.VirtualConsole();
@@ -20,16 +20,16 @@ const virtualConsole = new jsdom.VirtualConsole();
 virtualConsole.sendTo(console, { omitJSDOMErrors: true });

 const options = { runScripts: 'outside-only', QuerySelector: true, virtualConsole: virtualConsole };
-JSDOM.fromFile(program.input, options).then(dom => {
+JSDOM.fromFile(program.inputPath, options).then(dom => {
  const window = dom.window;
  const document = window.document;

  const data = new transforms.FrontMatter;
-  data.inputHTMLPath = program.input; // may be needed to resolve relative links!
-  data.inputDirectory = path.dirname(program.input);
+  data.inputHTMLPath = program.inputPath; // may be needed to resolve relative links!
+  data.inputDirectory = path.dirname(program.inputPath);
  transforms.render(document, data);
  transforms.distillify(document, data);

  const transformedHtml = dom.serialize();
-  fs.writeFileSync(program.output, transformedHtml);
+  fs.writeFileSync(program.outputPath, transformedHtml);
 }).catch(console.error);
@@ -1,8 +1,6 @@
 <!doctype html>

 <head>
-  <meta charset="utf8">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
  <script src="../dist/template.v2.js"></script>
 </head>

@@ -10,7 +8,7 @@
 <d-front-matter>
  <script id='distill-front-matter' type="text/json">{
    "title": "Why Momentum Really Works",
-    "description": "Although extremely useful for visualizing high-dimensional data, t-SNE plots can sometimes be mysterious or misleading.",
+    "description": "Although \" extremely useful for visualizing high-dimensional data, t-SNE plots can sometimes be mysterious or misleading.",
    "published": "Jan 10, 2017",
    "authors": [
      {
@@ -39,11 +37,10 @@
    }
  }</script>
 </d-front-matter>
-<distill-header></distill-header>
-<d-abstract>
+<d-title>
  <figure style="grid-column: page; margin: 1rem 0;"><img src="momentum.png" style="width:100%; border: 1px solid rgba(0, 0, 0, 0.2);"/></figure>
  <p>We often think of Momentum as a means of dampening oscillations and speeding up the iterations, leading to faster convergence. But it has other interesting behavior. It allows a larger range of step-sizes to be used, and creates its own oscillations. What is going on?</p>
-</d-abstract>
+</d-title>
 <d-article>
  <a class="marker" href="#section-1" id="section-1"><span>1</span></a>
  <h2>A Brief Survey of Techniques</h2>
@@ -61,6 +58,7 @@
  </d-math>
  <a class="marker" href="#section-1.1" id="section-1.1"><span>1.1</span></a>
  <h3>Citations</h3>
+  <p><d-slider style="width: 200px;"></d-slider></p>
  <p>We can<d-cite key="mercier2011humans"></d-cite> also cite <d-cite key="gregor2015draw,mercier2011humans"></d-cite> external publications. <d-cite key="dong2014image,dumoulin2016guide,mordvintsev2015inceptionism"></d-cite>. We should also be testing footnotes<d-footnote>This will become a hoverable footnote. This will become a hoverable footnote. This will become a hoverable footnote. This will become a hoverable footnote. This will become a hoverable footnote. This will become a hoverable footnote. This will become a hoverable footnote. This will become a hoverable footnote.</d-footnote>. There are multiple footnotes, and they appear in the appendix<d-footnote>Given I have coded them right. Also, here's math in a footnote: <d-math>c = \sum_0^i{x}</d-math>. Also, a citation. Box-ception<d-cite key='gregor2015draw'></d-cite>!</d-footnote> as well.</p>
  <a class="marker" href="#section-2" id="section-2"><span>2</span></a>
  <h2>Displaying code snippets</h2>
@@ -125,7 +123,8 @@
  <p>Some text with links describing who reviewed the article.</p>

  <d-bibliography src="bibliography.bib"></d-bibliography>
-
 </d-appendix>

+<distill-footer></distill-footer>
+
 </body>
@@ -164,7 +164,7 @@
  }
  </script>
  <p>The citation is presented inline like this: <dt-cite key="gregor2015draw"></dt-cite> (a number that displays more information on hover). If you have an appendix, a bibliography is automatically created and populated in it.</p>
-  <p>Distill chose a numerical inline citation style to improve readability of citation dense articles and because many of the benefits of longer citations are obviated by dispalying more information on hover. However, we consider it good style to mention author last names if you discuss something at length and it fits into the flow well -- the authors are human and it's nice for them to have the community associate them with their work.</p>
+  <p>Distill chose a numerical inline citation style to improve readability of citation dense articles and because many of the benefits of longer citations are obviated by displaying more information on hover. However, we consider it good style to mention author last names if you discuss something at length and it fits into the flow well -- the authors are human and it's nice for them to have the community associate them with their work.</p>


  <hr>
@@ -1,6 +1,6 @@
 {
  "name": "distill-template",
-  "version": "2.1.0",
+  "version": "2.2.2",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
@@ -1124,8 +1124,7 @@
    "commander": {
      "version": "2.11.0",
      "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz",
-      "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==",
-      "dev": true
+      "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ=="
    },
    "concat-map": {
      "version": "0.0.1",
@@ -1281,6 +1280,67 @@
        "cssom": "0.3.2"
      }
    },
+    "d3-array": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-1.2.1.tgz",
+      "integrity": "sha512-CyINJQ0SOUHojDdFDH4JEM0552vCR1utGyLHegJHyYH0JyCpSeTPxi4OBqHMA2jJZq4NH782LtaJWBImqI/HBw=="
+    },
+    "d3-collection": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/d3-collection/-/d3-collection-1.0.4.tgz",
+      "integrity": "sha1-NC39EoN8kJdPM/HMCnha6lcNzcI="
+    },
+    "d3-color": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-1.0.3.tgz",
+      "integrity": "sha1-vHZD/KjlOoNH4vva/6I2eWtYUJs="
+    },
+    "d3-dispatch": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-1.0.3.tgz",
+      "integrity": "sha1-RuFJHqqbWMNY/OW+TovtYm54cfg="
+    },
+    "d3-drag": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/d3-drag/-/d3-drag-1.2.1.tgz",
+      "integrity": "sha512-Cg8/K2rTtzxzrb0fmnYOUeZHvwa4PHzwXOLZZPwtEs2SKLLKLXeYwZKBB+DlOxUvFmarOnmt//cU4+3US2lyyQ==",
+      "requires": {
+        "d3-dispatch": "1.0.3",
+        "d3-selection": "1.1.0"
+      }
+    },
+    "d3-format": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-1.2.0.tgz",
+      "integrity": "sha1-a0gLqohohdRlHcJIqPSsnaFtsHo="
+    },
+    "d3-interpolate": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.1.5.tgz",
+      "integrity": "sha1-aeCZ/zkhRxblY8muw+qdHqS4p58=",
+      "requires": {
+        "d3-color": "1.0.3"
+      }
+    },
+    "d3-scale": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-1.0.6.tgz",
+      "integrity": "sha1-vOGdqA06DPQiyVQ64zIghiILNO0=",
+      "requires": {
+        "d3-array": "1.2.1",
+        "d3-collection": "1.0.4",
+        "d3-color": "1.0.3",
+        "d3-format": "1.2.0",
+        "d3-interpolate": "1.1.5",
+        "d3-time": "1.0.7",
+        "d3-time-format": "2.0.5"
+      }
+    },
+    "d3-selection": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-1.1.0.tgz",
+      "integrity": "sha1-GZhoSJZIj4OcoDchI9o08dMYgJw="
+    },
    "d3-time": {
      "version": "1.0.7",
      "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-1.0.7.tgz",
@@ -1461,6 +1521,12 @@
      "integrity": "sha1-hnqksJP6oF8d4IwG9NeyH9+GmLw=",
      "dev": true
    },
+    "domexception": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/domexception/-/domexception-1.0.0.tgz",
+      "integrity": "sha512-WpwuBlZ2lQRFa4H/4w49deb9rJLot9KmqrKKjMc9qBl7CID+DdC2swoa34ccRl+anL2B6bLp6TjFdIdnzekMBQ==",
+      "dev": true
+    },
    "ecc-jsbn": {
      "version": "0.1.1",
      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
@@ -1521,6 +1587,11 @@
        "is-arrayish": "0.2.1"
      }
    },
+    "escape-html": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
+    },
    "escape-string-regexp": {
      "version": "1.0.5",
      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
@@ -3083,6 +3154,12 @@
        "sntp": "1.0.9"
      }
    },
+    "he": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz",
+      "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=",
+      "dev": true
+    },
    "hmac-drbg": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
@@ -3499,47 +3576,308 @@
      "dev": true
    },
    "jsdom": {
-      "version": "11.2.0",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-11.2.0.tgz",
-      "integrity": "sha512-+5wd6vJuh/Evw3wkmCuKXKibDd5RS7PYZjKaP4s2Hj5W7tvmbuFuaDN4erbH07VznTBFcK+lcsrGVnP6EugXow==",
+      "version": "11.3.0",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-11.3.0.tgz",
+      "integrity": "sha512-aPZTDl4MplzQhx5bLztk6nzjbEslmO3Q3+z0WpCMutL1XJDhZIRzir6R1Y8S84LgeT/7jhQvgtUMkY6oPwvlUw==",
      "dev": true,
      "requires": {
        "abab": "1.0.3",
-        "acorn": "4.0.13",
-        "acorn-globals": "3.1.0",
+        "acorn": "5.1.2",
+        "acorn-globals": "4.0.0",
        "array-equal": "1.0.0",
        "content-type-parser": "1.0.1",
        "cssom": "0.3.2",
        "cssstyle": "0.2.37",
-        "escodegen": "1.8.1",
+        "domexception": "1.0.0",
+        "escodegen": "1.9.0",
        "html-encoding-sniffer": "1.0.1",
        "nwmatcher": "1.4.1",
        "parse5": "3.0.2",
        "pn": "1.0.0",
-        "request": "2.81.0",
+        "request": "2.83.0",
        "request-promise-native": "1.0.4",
        "sax": "1.2.4",
        "symbol-tree": "3.2.2",
-        "tough-cookie": "2.3.2",
-        "webidl-conversions": "4.0.1",
+        "tough-cookie": "2.3.3",
+        "webidl-conversions": "4.0.2",
        "whatwg-encoding": "1.0.1",
-        "whatwg-url": "6.1.0",
+        "whatwg-url": "6.3.0",
        "xml-name-validator": "2.0.1"
      },
      "dependencies": {
+        "acorn": {
+          "version": "5.1.2",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.1.2.tgz",
+          "integrity": "sha512-o96FZLJBPY1lvTuJylGA9Bk3t/GKPPJG8H0ydQQl01crzwJgspa4AEIq/pVTXigmK0PHVQhiAtn8WMBLL9D2WA==",
+          "dev": true
+        },
+        "acorn-globals": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.0.0.tgz",
+          "integrity": "sha512-0ih/qJVrAalX7TjjAnQdz8u+I1QOnLvLq+9zkyqcczObOii07ukuUSd5mTgVDukhqikAs+gqTm6cMd8VFwTrwA==",
+          "dev": true,
+          "requires": {
+            "acorn": "5.1.2"
+          }
+        },
+        "ajv": {
+          "version": "5.2.3",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.2.3.tgz",
+          "integrity": "sha1-wG9Zh3jETGsWGrr+NGa4GtGBTtI=",
+          "dev": true,
+          "requires": {
+            "co": "4.6.0",
+            "fast-deep-equal": "1.0.0",
+            "json-schema-traverse": "0.3.1",
+            "json-stable-stringify": "1.0.1"
+          }
+        },
+        "assert-plus": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+          "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+          "dev": true
+        },
+        "aws-sign2": {
+          "version": "0.7.0",
+          "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+          "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
+          "dev": true
+        },
+        "boom": {
+          "version": "4.3.1",
+          "resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz",
+          "integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE=",
+          "dev": true,
+          "requires": {
+            "hoek": "4.2.0"
+          }
+        },
+        "cryptiles": {
+          "version": "3.1.2",
+          "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz",
+          "integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=",
+          "dev": true,
+          "requires": {
+            "boom": "5.2.0"
+          },
+          "dependencies": {
+            "boom": {
+              "version": "5.2.0",
+              "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz",
+              "integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==",
+              "dev": true,
+              "requires": {
+                "hoek": "4.2.0"
+              }
+            }
+          }
+        },
+        "escodegen": {
+          "version": "1.9.0",
+          "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.9.0.tgz",
+          "integrity": "sha512-v0MYvNQ32bzwoG2OSFzWAkuahDQHK92JBN0pTAALJ4RIxEZe766QJPDR8Hqy7XNUy5K3fnVL76OqYAdc4TZEIw==",
+          "dev": true,
+          "requires": {
+            "esprima": "3.1.3",
+            "estraverse": "4.2.0",
+            "esutils": "2.0.2",
+            "optionator": "0.8.2",
+            "source-map": "0.5.7"
+          }
+        },
+        "esprima": {
+          "version": "3.1.3",
+          "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
+          "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=",
+          "dev": true
+        },
+        "estraverse": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
+          "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
+          "dev": true
+        },
+        "form-data": {
+          "version": "2.3.1",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz",
+          "integrity": "sha1-b7lPvXGIUwbXPRXMSX/kzE7NRL8=",
+          "dev": true,
+          "requires": {
+            "asynckit": "0.4.0",
+            "combined-stream": "1.0.5",
+            "mime-types": "2.1.17"
+          }
+        },
+        "har-schema": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+          "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
+          "dev": true
+        },
+        "har-validator": {
+          "version": "5.0.3",
+          "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz",
+          "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
+          "dev": true,
+          "requires": {
+            "ajv": "5.2.3",
+            "har-schema": "2.0.0"
+          }
+        },
+        "hawk": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz",
+          "integrity": "sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==",
+          "dev": true,
+          "requires": {
+            "boom": "4.3.1",
+            "cryptiles": "3.1.2",
+            "hoek": "4.2.0",
+            "sntp": "2.0.2"
+          }
+        },
+        "hoek": {
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz",
+          "integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ==",
+          "dev": true
+        },
+        "http-signature": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+          "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+          "dev": true,
+          "requires": {
+            "assert-plus": "1.0.0",
+            "jsprim": "1.4.1",
+            "sshpk": "1.13.1"
+          }
+        },
+        "mime-db": {
+          "version": "1.30.0",
+          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz",
+          "integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE=",
+          "dev": true
+        },
+        "mime-types": {
+          "version": "2.1.17",
+          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz",
+          "integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=",
+          "dev": true,
+          "requires": {
+            "mime-db": "1.30.0"
+          }
+        },
+        "performance-now": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+          "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
+          "dev": true
+        },
+        "qs": {
+          "version": "6.5.1",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz",
+          "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==",
+          "dev": true
+        },
+        "request": {
+          "version": "2.83.0",
+          "resolved": "https://registry.npmjs.org/request/-/request-2.83.0.tgz",
+          "integrity": "sha512-lR3gD69osqm6EYLk9wB/G1W/laGWjzH90t1vEa2xuxHD5KUrSzp9pUSfTm+YC5Nxt2T8nMPEvKlhbQayU7bgFw==",
+          "dev": true,
+          "requires": {
+            "aws-sign2": "0.7.0",
+            "aws4": "1.6.0",
+            "caseless": "0.12.0",
+            "combined-stream": "1.0.5",
+            "extend": "3.0.1",
+            "forever-agent": "0.6.1",
+            "form-data": "2.3.1",
+            "har-validator": "5.0.3",
+            "hawk": "6.0.2",
+            "http-signature": "1.2.0",
+            "is-typedarray": "1.0.0",
+            "isstream": "0.1.2",
+            "json-stringify-safe": "5.0.1",
+            "mime-types": "2.1.17",
+            "oauth-sign": "0.8.2",
+            "performance-now": "2.1.0",
+            "qs": "6.5.1",
+            "safe-buffer": "5.1.1",
+            "stringstream": "0.0.5",
+            "tough-cookie": "2.3.3",
+            "tunnel-agent": "0.6.0",
+            "uuid": "3.1.0"
+          }
+        },
+        "sntp": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.0.2.tgz",
+          "integrity": "sha1-UGQRDwr4X3z9t9a2ekACjOUrSys=",
+          "dev": true,
+          "requires": {
+            "hoek": "4.2.0"
+          }
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "dev": true,
+          "optional": true
+        },
+        "tough-cookie": {
+          "version": "2.3.3",
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz",
+          "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=",
+          "dev": true,
+          "requires": {
+            "punycode": "1.4.1"
+          }
+        },
+        "tr46": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz",
+          "integrity": "sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=",
+          "dev": true,
+          "requires": {
+            "punycode": "2.1.0"
+          },
+          "dependencies": {
+            "punycode": {
+              "version": "2.1.0",
+              "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.0.tgz",
+              "integrity": "sha1-X4Y+3Im5bbCQdLrXlHvwkFbKTn0=",
+              "dev": true
+            }
+          }
+        },
+        "webidl-conversions": {
+          "version": "4.0.2",
+          "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz",
+          "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==",
+          "dev": true
+        },
        "whatwg-url": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.1.0.tgz",
-          "integrity": "sha1-X8gnm5PXVIO5ztiyYjmFSEehhXg=",
+          "version": "6.3.0",
+          "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.3.0.tgz",
+          "integrity": "sha512-rM+hE5iYKGPAOu05mIdJR47pYSR2vDzfrTEFRc/S8D3L60yW8BuXmUJ7Kog7x/DrokFN7JNaHKadpzjouKRRAw==",
          "dev": true,
          "requires": {
            "lodash.sortby": "4.7.0",
-            "tr46": "0.0.3",
-            "webidl-conversions": "4.0.1"
+            "tr46": "1.0.1",
+            "webidl-conversions": "4.0.2"
          }
        }
      }
    },
+    "jsdom-global": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/jsdom-global/-/jsdom-global-3.0.2.tgz",
+      "integrity": "sha1-a9KZwTsMRiay2iwDk81DhdYGrLk=",
+      "dev": true
+    },
    "jsdom-wc": {
      "version": "11.0.0-alpha-1",
      "resolved": "https://registry.npmjs.org/jsdom-wc/-/jsdom-wc-11.0.0-alpha-1.tgz",
@@ -3968,9 +4306,9 @@
      }
    },
    "mocha": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/mocha/-/mocha-3.5.0.tgz",
-      "integrity": "sha512-pIU2PJjrPYvYRqVpjXzj76qltO9uBYI7woYAMoxbSefsa+vqAfptjoeevd6bUgwD0mPIO+hv9f7ltvsNreL2PA==",
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-3.5.3.tgz",
+      "integrity": "sha512-/6na001MJWEtYxHOV1WLfsmR4YIynkUEhBwzsb+fk2qmQ3iqsi258l/Q2MWHJMImAcNpZ8DEdYAK72NHoIQ9Eg==",
      "dev": true,
      "requires": {
        "browser-stdout": "1.3.0",
@@ -3980,6 +4318,7 @@
        "escape-string-regexp": "1.0.5",
        "glob": "7.1.1",
        "growl": "1.9.2",
+        "he": "1.1.1",
        "json3": "3.3.2",
        "lodash.create": "3.1.1",
        "mkdirp": "0.5.1",
@@ -5068,6 +5407,60 @@
      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
      "dev": true
    },
+    "should": {
+      "version": "13.1.2",
+      "resolved": "https://registry.npmjs.org/should/-/should-13.1.2.tgz",
+      "integrity": "sha512-oiGqKOuE4t98vdCs4ICifvzL2u9nWMaziSXVwHOYPyqqY1gBzGZS6LvzIc5uEFN0PiS69Sbvcqyw9hbYXkF4og==",
+      "dev": true,
+      "requires": {
+        "should-equal": "2.0.0",
+        "should-format": "3.0.3",
+        "should-type": "1.4.0",
+        "should-type-adaptors": "1.0.1",
+        "should-util": "1.0.0"
+      }
+    },
+    "should-equal": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/should-equal/-/should-equal-2.0.0.tgz",
+      "integrity": "sha512-ZP36TMrK9euEuWQYBig9W55WPC7uo37qzAEmbjHz4gfyuXrEUgF8cUvQVO+w+d3OMfPvSRQJ22lSm8MQJ43LTA==",
+      "dev": true,
+      "requires": {
+        "should-type": "1.4.0"
+      }
+    },
+    "should-format": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/should-format/-/should-format-3.0.3.tgz",
+      "integrity": "sha1-m/yPdPo5IFxT04w01xcwPidxJPE=",
+      "dev": true,
+      "requires": {
+        "should-type": "1.4.0",
+        "should-type-adaptors": "1.0.1"
+      }
+    },
+    "should-type": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/should-type/-/should-type-1.4.0.tgz",
+      "integrity": "sha1-B1bYzoRt/QmEOmlHcZ36DUz/XPM=",
+      "dev": true
+    },
+    "should-type-adaptors": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/should-type-adaptors/-/should-type-adaptors-1.0.1.tgz",
+      "integrity": "sha1-7+VVPN9oz/ZuXF9RtxLcNRx3vqo=",
+      "dev": true,
+      "requires": {
+        "should-type": "1.4.0",
+        "should-util": "1.0.0"
+      }
+    },
+    "should-util": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/should-util/-/should-util-1.0.0.tgz",
+      "integrity": "sha1-yYzaN0qmsZDfi6h8mInCtNtiAGM=",
+      "dev": true
+    },
    "signal-exit": {
      "version": "3.0.2",
      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
@@ -1,6 +1,6 @@
 {
  "name": "distill-template",
-  "version": "2.1.0",
+  "version": "2.2.2",
  "description": "Template for creating Distill articles.",
  "main": "dist/template.v2.js",
  "bin": {
@@ -17,7 +17,7 @@
    "test": "mocha",
    "lint": "eslint",
    "build": "rollup -c rollup.config.js",
-    "prepublishOnly": "npm run build"
+    "prepare": "npm run build"
  },
  "repository": {
    "url": "git+https://github.com/distillpub/distill-template.git",
@@ -26,13 +26,13 @@
  "devDependencies": {
    "bibtex-parse-js": "^0.0.23",
    "chai": "^3.5.0",
-    "commander": "^2.9.0",
    "eslint": "^4.3.0",
    "eslint-config-google": "^0.9.1",
    "js-yaml": "^3.7.0",
-    "jsdom": "^11.2.0",
+    "jsdom": "11.3.0",
+    "jsdom-global": "3.0.2",
    "marked": "^0.3.6",
-    "mocha": "^3.2.0",
+    "mocha": "^3.5.3",
    "prismjs": "^1.6.0",
    "rollup": "latest",
    "rollup-plugin-babili": "^3.1.0",
@@ -46,12 +46,19 @@
    "rollup-plugin-string": "^2.0.2",
    "rollup-plugin-uglify": "^1.0.1",
    "rollup-watch": "^2.5.0",
+    "should": "^13.1.2",
    "webpack": "^2.2.1"
  },
  "dependencies": {
    "@webcomponents/webcomponentsjs": "^1.0.7",
    "assert": "^1.4.1",
+    "commander": "^2.9.0",
+    "d3-array": "^1.2.1",
+    "d3-drag": "^1.2.1",
+    "d3-scale": "^1.0.6",
+    "d3-selection": "^1.1.0",
    "d3-time-format": "^2.0.3",
+    "escape-html": "^1.0.3",
    "intersection-observer": "^0.4.0",
    "jsdom-wc": "^11.0.0-alpha-1",
    "katex": "^0.7.1"
@@ -1,46 +1,91 @@
-/* Static styles and other modules */
-import { makeStyleTag } from './styles/styles';
-makeStyleTag(document);
+import { Controller } from './controller';
+
+/* Transforms */
+import { makeStyleTag }    from './styles/styles';
+import { Polyfills, polyfills }       from './helpers/polyfills';

 /* Components */
-import { Abstract }     from './components/d-abstract';
-import { Appendix }     from './components/d-appendix';
-import { Article }      from './components/d-article';
-import { Bibliography } from './components/d-bibliography';
-import { Byline }       from './components/d-byline';
-import { Cite }         from './components/d-cite';
-import { CitationList } from './components/d-citation-list';
-import { Code }         from './components/d-code';
-import { Footnote }     from './components/d-footnote';
-import { FootnoteList } from './components/d-footnote-list';
-import { FrontMatter }  from './components/d-front-matter';
-import { Title }        from './components/d-title';
-import { DMath }        from './components/d-math';
-import { References }   from './components/d-references';
-import { TOC }          from './components/d-toc';
-import { Figure }       from './components/d-figure';
-import { Interstitial } from './components/d-interstitial';
-
-const components = [
-  Abstract, Appendix, Article, Bibliography, Byline, Cite, CitationList, Code,
-  Footnote, FootnoteList, FrontMatter, Title, DMath, References, TOC, Figure,
-  Interstitial,
-];
+import { Abstract }        from './components/d-abstract';
+import { Appendix }        from './components/d-appendix';
+import { Article }         from './components/d-article';
+import { Bibliography }    from './components/d-bibliography';
+import { Byline }          from './components/d-byline';
+import { Cite }            from './components/d-cite';
+import { CitationList }    from './components/d-citation-list';
+import { Code }            from './components/d-code';
+import { Footnote }        from './components/d-footnote';
+import { FootnoteList }    from './components/d-footnote-list';
+import { FrontMatter }     from './components/d-front-matter';
+import { Title }           from './components/d-title';
+import { DMath }           from './components/d-math';
+import { References }      from './components/d-references';
+import { TOC }             from './components/d-toc';
+import { Figure }          from './components/d-figure';
+import { Interstitial }    from './components/d-interstitial';
+import { Slider }          from './ui/d-slider';

 /* Distill website specific components */
-import { DistillHeader } from './distill-components/distill-header';
+import { DistillHeader }   from './distill-components/distill-header';
 import { DistillAppendix } from './distill-components/distill-appendix';
-import { DistillFooter } from './distill-components/distill-footer';
+import { DistillFooter }   from './distill-components/distill-footer';

-const distillComponents = [
-  DistillHeader, DistillAppendix, DistillFooter,
-];
+const distillMain = function() {

-function defineComponents() {
+  if (window.distillRunlevel < 1) {
+    throw new Error('Insufficient Runlevel for Distill Template!');
+  }
+
+  /* 1. Flag that we're being loaded */
+  if ('distillTemplateIsLoading' in window && window.distillTemplateIsLoading) {
+    throw new Error('Runlevel 1: Distill Template is getting loaded more than once, aborting!');
+  } else {
+    window.distillTemplateIsLoading = true;
+    console.info('Runlevel 1: Distill Template has started loading.');
+  }
+
+  /* 2. Add styles if they weren't added during prerendering */
+  makeStyleTag(document);
+  console.info('Runlevel 1: Static Distill styles have been added.');
+  console.info('Runlevel 1->2.');
+  window.distillRunlevel = 2;
+
+  /* 3. Register components */
+  /* Article will register controller which takes control from there */
+  const components = [
+    Abstract, Appendix, Article, Bibliography, Byline, Cite, CitationList, Code,
+    Footnote, FootnoteList, FrontMatter, Title, DMath, References, TOC, Figure,
+    Slider, Interstitial
+  ];
+
+  const distillComponents = [
+    DistillHeader, DistillAppendix, DistillFooter,
+  ];
+
+  if (window.distillRunlevel < 2) {
+    throw new Error('Insufficient Runlevel for adding custom elements!');
+  }
  const allComponents = components.concat(distillComponents);
  for (const component of allComponents) {
+    console.info('Runlevel 2: Registering custom element: ' + component.is);
    customElements.define(component.is, component);
  }
-}

-defineComponents();
+  console.info('Runlevel 2: Distill Template finished registering custom elements.');
+  console.info('Runlevel 2->3.');
+  window.distillRunlevel = 3;
+  console.info('Distill Template initialisation complete.');
+  Controller.listeners.DOMContentLoaded();
+
+};
+
+window.distillRunlevel = 0;
+/* 0. Check browser feature support; synchronously polyfill if needed */
+if (Polyfills.browserSupportsAllFeatures()) {
+  console.info('Runlevel 0: No need for polyfills.');
+  console.info('Runlevel 0->1.');
+  window.distillRunlevel = 1;
+  distillMain();
+} else {
+  console.info('Runlevel 0: Distill Template is loading polyfills.');
+  Polyfills.load(distillMain);
+}
@@ -4,18 +4,15 @@ import { body } from '../helpers/layout';
 const T = Template('d-abstract', `
 <style>
  :host {
-    display: block;
    font-size: 1.25rem;
    line-height: 1.6em;
-    padding-bottom: 1.5em;
    color: rgba(0, 0, 0, 0.7);
-    font-family: georgia, serif;
    -webkit-font-smoothing: antialiased;
  }

  ::slotted(p) {
    margin-top: 0;
-    margin-bottom: 0;
+    margin-bottom: 1em;
    grid-column: text-start / middle-end;
  }
  ${body('d-abstract')}
@@ -6,12 +6,13 @@ const T = Template('d-appendix', `

 d-appendix {
  contain: content;
-  font-size: 13px;
+  font-size: 0.8em;
  line-height: 1.7em;
+  margin-top: 60px;
  margin-bottom: 0;
-  border-top: 1px solid rgba(0,0,0,0.1);
+  border-top: 1px solid rgba(0, 0, 0, 0.1);
  color: rgba(0,0,0,0.5);
-  padding-top: 36px;
+  padding-top: 60px;
  padding-bottom: 48px;
 }

@@ -19,10 +20,28 @@ d-appendix h3 {
  grid-column: page-start / text-start;
  font-size: 15px;
  font-weight: 500;
-  margin-top: 20px;
+  margin-top: 1em;
  margin-bottom: 0;
  color: rgba(0,0,0,0.65);
-  line-height: 1em;
+}
+
+d-appendix h3 + * {
+  margin-top: 1em;
+}
+
+d-appendix ol {
+  padding: 0 0 0 15px;
+}
+
+@media (min-width: 768px) {
+  d-appendix ol {
+    padding: 0 0 0 30px;
+    margin-left: -30px;
+  }
+}
+
+d-appendix li {
+  margin-bottom: 1em;
 }

 d-appendix a {
@@ -33,6 +52,12 @@ d-appendix > * {
  grid-column: text;
 }

+d-appendix > d-footnote-list,
+d-appendix > d-citation-list,
+d-appendix > distill-appendix {
+  grid-column: screen;
+}
+
 </style>

 `, false);
@@ -14,9 +14,6 @@ export class Article extends HTMLElement {
      for (const mutation of mutations) {
        for (const addedNode of mutation.addedNodes) {
          switch (addedNode.nodeName) {
-          case 'HR':
-            console.warn('Use of <hr> tags in distill articles is discouraged as they interfere with layout! To separate sections, please just use h2 or h3 tags.');
-            break;
          case '#text': { // usually text nodes are only linebreaks.
            const text = addedNode.nodeValue;
            if (!isOnlyWhitespace.test(text)) {
@@ -34,6 +31,12 @@ export class Article extends HTMLElement {
  }

  connectedCallback() {
+    document.onreadystatechange = function () {
+      console.log("onreadystatechange:");
+      console.log(document.readyState);
+    };
+    console.info('Article tag connected, we can now listen to controller events.');
+    console.info('Runlevel 3->4.');
    for (const [functionName, callback] of Object.entries(Controller.listeners)) {
      if (typeof callback === 'function') {
        document.addEventListener(functionName, callback);
@@ -1,9 +1,18 @@
 import { parseBibtex } from '../helpers/bibtex';

 export function parseBibliography(element) {
-  if (element.firstElementChild && element.firstElementChild.tagName === 'SCRIPT') {
-    const bibtex = element.firstElementChild.textContent;
-    return parseBibtex(bibtex);
+  const scriptTag = element.firstElementChild;
+  if (scriptTag && scriptTag.tagName === 'SCRIPT') {
+    if (scriptTag.type == 'text/bibtex') {
+      const bibtex = element.firstElementChild.textContent;
+      return parseBibtex(bibtex);
+    } else if (scriptTag.type == 'text/json') {
+      return new Map(JSON.parse(scriptTag.textContent));
+    } else {
+      console.warn('Unsupported bibliography script tag type: ' + scriptTag.type);
+    }
+  } else {
+    console.warn('Bibliography did not have any script tag.');
  }
 }

@@ -1,37 +1,35 @@
-import style from '../styles/d-byline.css';
+// import style from '../styles/d-byline.css';

 export function bylineTemplate(frontMatter) {
  return `
  <div class="byline grid">
-    <div class="authors">
+    <div class="authors-affiliations grid">
      <h3>Authors</h3>
-      ${frontMatter.authors.map(author => `
-        <p>
-          ${author.personalURL
-            ? `<a class="name" href="${author.personalURL}">${author.name}</a>`
-            : `<div class="name">${author.name}</div>`
-          }
-        </pdiv>
-      `).join("")}
-    </div>
-    <div class="affiliations">
      <h3>Affiliations</h3>
      ${frontMatter.authors.map(author => `
-        <p>
-          ${author.affiliationURL
-            ? `<a class="affiliation" href="${author.affiliationURL}">${author.affiliation}</a>`
-            : `<div class="affiliation">${author.affiliation}</div>`
-          }
+        <p class="author">
+          ${author.personalURL ? `
+            <a class="name" href="${author.personalURL}">${author.name}</a>` : `
+            <div class="name">${author.name}</div>`}
        </p>
-      `).join("")}
+        <p class="affiliation">
+          ${author.affiliationURL ? `
+            <a class="affiliation" href="${author.affiliationURL}">${author.affiliation}</a>` : `
+            <div class="affiliation">${author.affiliation}</div>`}
+        </p>
+      `).join('')}
    </div>
    <div>
      <h3>Published</h3>
-      <p>${frontMatter.publishedMonth}. ${frontMatter.publishedDay} ${frontMatter.publishedYear}</p>
+      ${frontMatter.publishedDate ? `
+        <p>${frontMatter.publishedMonth} ${frontMatter.publishedDay}, ${frontMatter.publishedYear}</p> ` : `
+        <p><em>Not published yet.</em></p>`}
    </div>
    <div>
      <h3>DOI</h3>
-      <p>${frontMatter.doi}</p>
+      ${frontMatter.doi ? `
+        <p><a href="https://doi.org/${frontMatter.doi}">${frontMatter.doi}</a></p>` : `
+        <p><em>No DOI yet.</em></p>`}
    </div>
  </div>
 `;
@@ -1,68 +1,65 @@
-import { Template } from '../mixins/template';
 import { bibliography_cite } from '../helpers/citation';

-const T = Template('d-citation-list', `
-<style>
-
-:host {
+const styles = `
+d-citation-list {
  contain: content;
+  overflow: hidden;
 }
-.references {
-  font-size: 12px;
-  line-height: 20px;
+
+d-citation-list .references {
+  grid-column: text;
 }
-.title {
-  font-weight: 600;
-}
-ol {
-  padding: 0 0 0 18px;
-}
-li {
-  margin-bottom: 12px;
-}
-h3 {
-  font-size: 15px;
+
+d-citation-list .references .title {
  font-weight: 500;
-  margin-top: 20px;
-  margin-bottom: 0;
-  color: rgba(0,0,0,0.65);
-  line-height: 1em;
-}
-a {
-  color: rgba(0, 0, 0, 0.6);
 }
+`;

-</style>
-
-<h3>References</h3>
-<ol class='references' id='references-list' ></ol>
-`);
-
-export function renderCitationList(element, entries) {
+export function renderCitationList(element, entries, dom=document) {
  if (entries.size > 0) {
-    element.host.style.display = 'initial';
-    const list = element.querySelector('#references-list');
-    list.innerHTML = '';
+    element.style.display = '';
+    let list = element.querySelector('.references');
+    if (list) {
+      list.innerHTML = '';
+    } else {
+      const stylesTag = dom.createElement('style');
+      stylesTag.innerHTML = styles;
+      element.appendChild(stylesTag);
+
+      const heading = dom.createElement('h3');
+      heading.id = 'references';
+      heading.textContent = 'References';
+      element.appendChild(heading);
+
+      list = dom.createElement('ol');
+      list.id = 'references-list';
+      list.className = 'references';
+      element.appendChild(list);
+    }

    for (const [key, entry] of entries) {
-      const listItem = document.createElement('li');
+      const listItem = dom.createElement('li');
      listItem.id = key;
      listItem.innerHTML = bibliography_cite(entry);
      list.appendChild(listItem);
    }
  } else {
-    element.host.style.display = 'none';
+    element.style.display = 'none';
  }
 }

-export class CitationList extends T(HTMLElement) {
+export class CitationList extends HTMLElement {
+
+  static get is() { return 'd-citation-list'; }

  connectedCallback() {
-    this.root.host.style.display = 'none';
+    if (!this.hasAttribute('distill-prerendered')) {
+      this.style.display = 'none';
+    }
  }

  set citations(citations) {
-    renderCitationList(this.root, citations);
+    renderCitationList(this, citations);
  }

 }
@@ -4,51 +4,66 @@ import { HoverBox } from '../helpers/hover-box';

 const T = Template('d-cite', `
 <style>
-  .citation {
-    color: hsla(206, 90%, 20%, 0.7);
-  }
-  .citation-number {
-    cursor: default;
-    white-space: nowrap;
-    font-family: -apple-system, BlinkMacSystemFont, "Roboto", Helvetica, sans-serif;
-    font-size: 75%;
-    color: hsla(206, 90%, 20%, 0.7);
-    display: inline-block;
-    line-height: 1.1em;
-    text-align: center;
-    position: relative;
-    top: -2px;
-    margin: 0 2px;
-  }
-  figcaption .citation-number {
-    font-size: 11px;
-    font-weight: normal;
-    top: -2px;
-    line-height: 1em;
-  }
+
+:host {
+  display: inline-block;
+}
+
+.citation {
+  display: inline-block;
+  color: hsla(206, 90%, 20%, 0.7);
+}
+
+.citation-number {
+  cursor: default;
+  white-space: nowrap;
+  font-family: -apple-system, BlinkMacSystemFont, "Roboto", Helvetica, sans-serif;
+  font-size: 75%;
+  color: hsla(206, 90%, 20%, 0.7);
+  display: inline-block;
+  line-height: 1.1em;
+  text-align: center;
+  position: relative;
+  top: -2px;
+  margin: 0 2px;
+}
+
+figcaption .citation-number {
+  font-size: 11px;
+  font-weight: normal;
+  top: -2px;
+  line-height: 1em;
+}
+
+.container {
+  position: fixed;
+  width: 100%;
+  left: 0;
+  z-index: 10000;
+  margin-top: 2em;
+}
+
+.dt-hover-box {
+  margin: 0 auto;
+  width: 400px;
+  max-width: 700px;
+  background-color: #FFF;
+  opacity: 0.95;
+  border: 1px solid rgba(0, 0, 0, 0.25);
+  padding: 8px 16px;
+  border-radius: 3px;
+  box-shadow: 0px 2px 10px 2px rgba(0, 0, 0, 0.2);
+}
+
 </style>

-<div id="hover-box" class="dt-hover-box">
+<div class="container">
+  <div id="hover-box" class="dt-hover-box"></div>
 </div>

-<span id="citation-" class="citation">
-  <slot></slot>
-  <span class="citation-number"></span>
-</span>
+<div id="citation-" class="citation"><slot></slot><span class="citation-number"></span></div>
 `);

-export function collectCitations(dom=document) {
-  const citations = new Set();
-  const citeTags = dom.querySelectorAll('d-cite');
-  for (const tag of citeTags) {
-    const keys = tag.getAttribute('key').split(',');
-    for (const key of keys) {
-      citations.add(key);
-    }
-  }
-  return [...citations];
-}
-
 export class Cite extends T(HTMLElement) {

  /* Lifecycle */
@@ -1,6 +1,13 @@
 import Prism from 'prismjs';
 import 'prismjs/components/prism-python';
 import 'prismjs/components/prism-clike';
+import 'prismjs/components/prism-python';
+import 'prismjs/components/prism-clike';
+import 'prismjs/components/prism-lua';
+import 'prismjs/components/prism-bash';
+import 'prismjs/components/prism-go';
+import 'prismjs/components/prism-markdown';
+import 'prismjs/components/prism-julia';
 import css from 'prismjs/themes/prism.css';

 import { Template } from '../mixins/template.js';
@@ -43,7 +50,7 @@ export class Code extends Mutating(T(HTMLElement)) {
    }
    const language = Prism.languages[this.languageName];
    if (language == undefined) {
-      console.warn(`Distill does not yet support highlighting your code block in "${this.languageName}".`);
+      console.warn(`Distill does not yet support highlighting your code block in "${this.languageName}'.`);
      return;
    }

@@ -33,8 +33,7 @@ export class Figure extends HTMLElement {

  static runReadyQueue() {
    // console.log("Checking to run readyQueue, length: " + Figure.readyQueue.length + ", scrolling: " + Figure.isScrolling);
-    if (Figure.isScrolling) return;
-
+    // if (Figure.isScrolling) return;
    // console.log("Running ready Queue");
    const figure = Figure.readyQueue
      .sort((a,b) => a._seenOnScreen - b._seenOnScreen )
@@ -56,6 +55,7 @@ export class Figure extends HTMLElement {
  }

  connectedCallback() {
+    this.loadsWhileScrolling = this.hasAttribute('loadsWhileScrolling');
    Figure.marginObserver.observe(this);
    Figure.directObserver.observe(this);
  }
@@ -71,12 +71,15 @@ export class Figure extends HTMLElement {

  static get marginObserver() {
    if (!Figure._marginObserver) {
+      // if (!('IntersectionObserver' in window)) {
+      //   throw new Error('no interscetionobbserver!');
+      // }
      const viewportHeight = window.innerHeight;
      const margin = Math.floor(2 * viewportHeight);
-      Figure._marginObserver = new IntersectionObserver(
-        Figure.didObserveMarginIntersection, {
-          rootMargin: margin + 'px 0px ' + margin + 'px 0px', threshold: 0.01,
-        });
+      const options = {rootMargin: margin + 'px 0px ' + margin + 'px 0px', threshold: 0.01};
+      const callback = Figure.didObserveMarginIntersection;
+      const observer = new IntersectionObserver(callback, options);
+      Figure._marginObserver = observer;
    }
    return Figure._marginObserver;
  }
@@ -166,7 +169,6 @@ if (typeof window !== 'undefined') {
    clearTimeout(timeout);
    timeout = setTimeout(() => {
      Figure.isScrolling = false;
-      console.log('Stopped Scrolling')
      Figure.runReadyQueue();
    }, 500);
  };
@@ -2,50 +2,35 @@ import { Template } from '../mixins/template';

 const T = Template('d-footnote-list', `
 <style>
-:host {
+
+d-footnote-list {
  contain: content;
+  overflow: hidden;
 }

-* {
+d-footnote-list > * {
  grid-column: text;
 }

-ol {
-  padding: 0 0 0 18px;
-}
-li {
-  margin-bottom: 12px;
-}
-h3 {
-  font-size: 15px;
-  font-weight: 500;
-  margin-top: 20px;
-  margin-bottom: 0;
-  color: rgba(0,0,0,0.65);
-  line-height: 1em;
-}
-a {
-  color: rgba(0, 0, 0, 0.6);
-}
-
-a.footnote-backlink {
+d-footnote-list a.footnote-backlink {
  color: rgba(0,0,0,0.3);
  padding-left: 0.5em;
 }

-
 </style>

 <h3>Footnotes</h3>
 <ol></ol>
-`);
+`, false);

 export class FootnoteList extends T(HTMLElement) {

  connectedCallback() {
+    super.connectedCallback();
+
    this.list = this.root.querySelector('ol');
    // footnotes list is initially hidden
-    this.root.host.style.display = 'none';
+    this.root.style.display = 'none';
    // look through document and register existing footnotes
    // Store.subscribeTo('footnotes', (footnote) => {
    //   this.renderFootnote(footnote);
@@ -57,7 +42,7 @@ export class FootnoteList extends T(HTMLElement) {
    this.list.innerHTML = '';
    if (footnotes.length) {
      // ensure footnote list is visible
-      this.root.host.style.display = 'initial';
+      this.root.style.display = '';

      for (const footnote of footnotes) {
        // construct and append list item to show footnote
@@ -75,7 +60,7 @@ export class FootnoteList extends T(HTMLElement) {
      }
    } else {
      // ensure footnote list is invisible
-      this.shadowRoot.host.style.display = 'none';
+      this.root.style.display = 'none';
    }
  }

@@ -8,14 +8,16 @@ d-math[block] {
  display: block;
 }

+:host {
+  position: relative;
+}
+
 sup {
  line-height: 1em;
  font-size: 0.75em;
  position: relative;
-  top: 0;
+  top: -.5em;
  vertical-align: baseline;
-  position: relative;
-  top: -6px;
 }

 span {
@@ -23,13 +25,36 @@ span {
  cursor: default;
 }

+.container {
+  position: fixed;
+  width: 100%;
+  left: 0;
+  z-index: 10000;
+}
+
+.dt-hover-box {
+  margin: 0 auto;
+  width: 400px;
+  max-width: 700px;
+  background-color: #FFF;
+  opacity: 0.95;
+  border: 1px solid rgba(0, 0, 0, 0.25);
+  padding: 8px 16px;
+  border-radius: 3px;
+  box-shadow: 0px 2px 10px 2px rgba(0, 0, 0, 0.2);
+}
+
 </style>

-<div id="hover-box" class="dt-hover-box">
-  <slot id="slot"></slot>
+<div class="container">
+  <div id="hover-box" class="dt-hover-box">
+    <slot id="slot"></slot>
+  </div>
 </div>

-<sup><span id="fn-" data-hover-ref=""></span></sup>
+<sup>
+  <span id="fn-" data-hover-ref=""></span>
+</sup>

 `);

@@ -52,6 +77,7 @@ export class Footnote extends T(HTMLElement) {
  connectedCallback() {
    // listen and notify about changes to slotted content
    // const slot = this.shadowRoot.querySelector('#slot');
+    // console.warn(slot.textContent);
    // slot.addEventListener('slotchange', this.notify);

    // create numeric ID
@@ -24,21 +24,20 @@ const T = Template('d-interstitial', `

 }

-.overlay.transparent {
-  background: hsla(0, 0%, 100%, 0.7);
-  transition: background 1s;
-}
-
 .container {
  position: relative;
-  left: 25%;
-  width: 50%;
+  margin-left: auto;
+  margin-right: auto;
+  max-width: 420px;
+  padding: 2em;
 }

 h1 {
  text-decoration: underline;
  text-decoration-color: hsl(0,100%,40%);
+  -webkit-text-decoration-color: hsl(0,100%,40%);
  margin-bottom: 1em;
+  line-height: 1.5em;
 }

 input[type="password"] {
@@ -76,12 +75,31 @@ p small {
  color: #888;
 }

+.logo {
+  position: relative;
+  font-size: 1.5em;
+  margin-bottom: 3em;
+}
+
+.logo svg {
+  width: 36px;
+  position: relative;
+  top: 6px;
+  margin-right: 2px;
+}
+
+.logo svg path {
+  fill: none;
+  stroke: black;
+  stroke-width: 2px;
+}
+
 </style>

 <div class="overlay">
  <div class="container">
    <h1>This article is in review.</h1>
-    <p>Do not share this URL, or the contents of this article. Thank you!</p>
+    <p>Do not share this URL or the contents of this article. Thank you!</p>
    <input id="interstitial-password-input" type="password" name="password" autofocus/>
    <p><small>Enter the password we shared with you as part of the review process to view the article.</small></p>
  </div>
@@ -93,21 +111,23 @@ export class Interstitial extends T(HTMLElement) {
  connectedCallback() {
    const passwordInput = this.root.querySelector('#interstitial-password-input');
    passwordInput.oninput = (event) => this.passwordChanged(event);
-    setTimeout(() => {
-      this.article = document.querySelector('d-article');
-      this.article.style = 'filter: blur(15px)';
-      const overlay = this.root.querySelector('.overlay');
-      overlay.classList.add('transparent');
-    }, 500);
+    if (typeof(Storage) !== 'undefined') {
+      if (localStorage.getItem('distill-interstitial-password-correct') === 'true') {
+        console.log('Loaded that correct password was entered before; skipping interstitial.');
+        this.parentElement.removeChild(this);
+      }
+    }
  }

  passwordChanged(event) {
    const entered = event.target.value;
    if (entered === this.password) {
      console.log('Correct password entered.');
-      event.target.classList.add('right');
-      this.article.style = '';
      this.parentElement.removeChild(this);
+      if (typeof(Storage) !== 'undefined') {
+        console.log('Saved that correct password was entered.');
+        localStorage.setItem('distill-interstitial-password-correct', 'true');
+      }
    }
  }

@@ -33,15 +33,19 @@ export class DMath extends Mutating(T(HTMLElement)) {

  static set katexOptions(options) {
    DMath._katexOptions = options;
-    if (DMath.katexOptions.delimiters && !DMath.katexAdded) {
-      DMath.addKatex();
+    if (DMath.katexOptions.delimiters) {
+      if (!DMath.katexAdded) {
+        DMath.addKatex();
+      } else {
+        DMath.katexLoadedCallback();
+      }
    }
  }

  static get katexOptions() {
    if (!DMath._katexOptions) {
      DMath._katexOptions = {
-        delimiters: [ { 'left':'$', 'right':'$', 'display':true } ]
+        delimiters: [ { 'left':'$$', 'right':'$$', 'display': false } ]
      };
    }
    return DMath._katexOptions;
@@ -2,18 +2,28 @@ import { Template } from '../mixins/template';

 const T = Template('d-title', `
 <style>
+
  :host {
-    padding-top: 1rem;
+    padding: 4rem 0 1.5rem;
    contain: content;
    display: block;
  }
+
  ::slotted(h1) {
-    grid-column: text-start / span 5;
-    font-size: 50px;
-    font-weight: 700;
+    grid-column: text;
+    font-size: 60px;
+    font-weight: 600;
    line-height: 1.05em;
-    margin: 0 0 0.5rem;
+    margin: 0 0 1rem;
  }
+
+  ::slotted(p) {
+    font-weight: 300;
+    font-size: 1.5rem;
+    line-height: 1.2em;
+    grid-column: text;
+  }
+
  .status {
    margin-top: 0px;
    font-size: 12px;
@@ -31,7 +41,7 @@ const T = Template('d-title', `
  }
 </style>

-<div class="status"><span>✓ Peer Reviewed</span></div>
+<!-- <div class="status"><span>✓ Peer Reviewed</span></div> -->
 <slot></slot>
 `);

@@ -1,6 +1,6 @@
-import { FrontMatter } from './front-matter';
+import { FrontMatter, mergeFromYMLFrontmatter } from './front-matter';
 import { DMath } from './components/d-math';
-import { collectCitations } from './components/d-cite';
+import { collect_citations } from './helpers/citation.js';
 import { parseFrontmatter } from './components/d-front-matter';
 import optionalComponents from './transforms/optional-components';

@@ -42,7 +42,7 @@ export const Controller = {
      // const [citeTag, keys] = event.detail;

      // update citations
-      frontMatter.citations = collectCitations();
+      frontMatter.citations = collect_citations();
      frontMatter.citationsCollected = true;
      for (const waitingCallback of Controller.waitingOn.citations.slice()) {
        waitingCallback();
@@ -71,7 +71,9 @@ export const Controller = {
    },

    onBibliographyChanged(event) {
+      console.info('BibliographyChanged');
      const citationListTag = document.querySelector('d-citation-list');
+
      const bibliography = event.detail;

      frontMatter.bibliography = bibliography;
@@ -88,11 +90,15 @@ export const Controller = {
        return;
      }

-      const entries = new Map(frontMatter.citations.map( citationKey => {
-        return [citationKey, frontMatter.bibliography.get(citationKey)];
-      }));

-      citationListTag.citations = entries;
+      if (citationListTag.hasAttribute('distill-prerendered')) {
+        console.info('Citation list was prerendered; not updating it.');
+      } else {
+        const entries = new Map(frontMatter.citations.map( citationKey => {
+          return [citationKey, frontMatter.bibliography.get(citationKey)];
+        }));
+        citationListTag.citations = entries;
+      }
    },

    onFootnoteChanged() {
@@ -107,7 +113,7 @@ export const Controller = {

    onFrontMatterChanged(event) {
      const data = event.detail;
-      frontMatter.mergeFromYMLFrontmatter(data);
+      mergeFromYMLFrontmatter(frontMatter, data);

      const interstitial = document.querySelector('d-interstitial');
      if (interstitial) {
@@ -136,19 +142,30 @@ export const Controller = {
    },

    DOMContentLoaded() {
-      // console.debug('DOMContentLoaded.');
+      if (Controller.loaded || ['interactive', 'complete'].indexOf(document.readyState) === -1) {
+        return;
+      } else {
+        Controller.loaded = true;
+        console.log('Controller running DOMContentLoaded')
+      }

      const frontMatterTag = document.querySelector('d-front-matter');
      const data = parseFrontmatter(frontMatterTag);
      Controller.listeners.onFrontMatterChanged({detail: data});

      // console.debug('Resolving "citations" dependency due to initial DOM load.');
-      frontMatter.citations = collectCitations();
+      frontMatter.citations = collect_citations();
      frontMatter.citationsCollected = true;
      for (const waitingCallback of Controller.waitingOn.citations.slice()) {
        waitingCallback();
      }

+      if (frontMatter.bibliographyParsed) {
+        for (const waitingCallback of Controller.waitingOn.bibliography.slice()) {
+          waitingCallback();
+        }
+      }
+
      const footnotesList = document.querySelector('d-footnote-list');
      if (footnotesList) {
        const footnotes = document.querySelectorAll('d-footnote');
@@ -4,22 +4,9 @@ const styles = `
 <style>
  distill-appendix {
    contain: content;
+    overflow: hidden;
  }
-  distill-appendix h3 {
-    font-size: 15px;
-    font-weight: 500;
-    margin-top: 20px;
-    margin-bottom: 0;
-    color: rgba(0,0,0,0.65);
-    line-height: 1em;
-  }
-  distill-appendix a {
-    color: rgba(0, 0, 0, 0.6);
-  }
-  distill-appendix ol,
-  distill-appendix ul {
-    padding-left: 24px;
-  }
+
  distill-appendix .citation {
    font-size: 11px;
    line-height: 15px;
@@ -35,25 +22,47 @@ const styles = `
    white-space: pre-wrap;
    word-wrap: break-word;
  }
+
+  distill-appendix > * {
+    grid-column: text;
+  }
 </style>
 `;

 export function appendixTemplate(frontMatter) {
-  return `
-  ${styles}
+  let html = styles;

-  <h3 id="updates-and-corrections">Updates and Corrections</h3>
-  <p><a href="">View all changes</a> to this article since it was first published. If you see mistakes or want to suggest changes, please <a href="${frontMatter.githubUrl + '/issues/new'}">create an issue on GitHub</a>. </p>
+  if (typeof frontMatter.githubUrl !== 'undefined') {
+    html += `
+    <h3 id="updates-and-corrections">Updates and Corrections</h3>
+    <p>`;
+    if (frontMatter.githubCompareUpdatesUrl) {
+      html += `<a href="${frontMatter.githubCompareUpdatesUrl}">View all changes</a> to this article since it was first published.`;
+    }
+    html += `
+    If you see mistakes or want to suggest changes, please <a href="${frontMatter.githubUrl + '/issues/new'}">create an issue on GitHub</a>. </p>
+    `;
+  }

-  <h3 id="reuse">Reuse</h3>
-  <p>Diagrams and text are licensed under Creative Commons Attribution <a href="https://creativecommons.org/licenses/by/2.0/">CC-BY 2.0</a> with the <a class="github" href="${frontMatter.githubUrl}">source available on GitHub</a>, unless noted otherwise. The figures that have been reused from other sources don’t fall under this license and can be recognized by a note in their caption: “Figure from …”.</p>
+  const journal = frontMatter.journal;
+  if (typeof journal !== 'undefined' && journal.title === 'Distill') {
+    html += `
+    <h3 id="reuse">Reuse</h3>
+    <p>Diagrams and text are licensed under Creative Commons Attribution <a href="https://creativecommons.org/licenses/by/4.0/">CC-BY 4.0</a> with the <a class="github" href="${frontMatter.githubUrl}">source available on GitHub</a>, unless noted otherwise. The figures that have been reused from other sources don’t fall under this license and can be recognized by a note in their caption: “Figure from …”.</p>
+    `;
+  }

-  <h3 id="citation">Citation</h3>
-  <p>For attribution in academic contexts, please cite this work as</p>
-  <pre class="citation short">${frontMatter.concatenatedAuthors}, "${frontMatter.title}", Distill, ${frontMatter.publishedYear}.</pre>
-  <p>BibTeX citation</p>
-  <pre class="citation long">${serializeFrontmatterToBibtex(frontMatter)}</pre>
-  `;
+  if (typeof frontMatter.publishedDate !== 'undefined') {
+    html += `
+    <h3 id="citation">Citation</h3>
+    <p>For attribution in academic contexts, please cite this work as</p>
+    <pre class="citation short">${frontMatter.concatenatedAuthors}, "${frontMatter.title}", Distill, ${frontMatter.publishedYear}.</pre>
+    <p>BibTeX citation</p>
+    <pre class="citation long">${serializeFrontmatterToBibtex(frontMatter)}</pre>
+    `;
+  }
+
+  return html;
 }

 export class DistillAppendix extends HTMLElement {
@@ -5,14 +5,12 @@ const T = Template('distill-footer', `
 <style>

 :host {
-  display: block;
-  color: rgba(255, 255, 255, 0.4);
+  color: rgba(255, 255, 255, 0.5);
  font-weight: 300;
-  padding: 40px 0;
+  padding: 60px 0;
  border-top: 1px solid rgba(0, 0, 0, 0.1);
  background-color: hsl(180, 5%, 15%); /*hsl(200, 60%, 15%);*/
  text-align: left;
-
  contain: content;
 }

@@ -38,16 +36,42 @@ const T = Template('distill-footer', `
 }

 .container {
-  grid-column: left / text;
+  grid-column: text;
 }
+
+.nav {
+  font-size: 0.9em;
+  margin-top: 1.5em;
+}
+
+.nav a {
+  color: rgba(255, 255, 255, 0.8);
+  margin-right: 6px;
+  text-decoration: none;
+}
+
 </style>

 <div class='container'>
-<a href="/" class="logo">
-  ${logo}
-  Distill
-</a> is dedicated to clear explanations of machine learning
+
+  <a href="/" class="logo">
+    ${logo}
+    Distill
+  </a> is dedicated to clear explanations of machine learning
+
+  <div class="nav">
+    <a href="https://distill.pub/about/">About</a>
+    <a href="https://distill.pub/journal/">Submit</a>
+    <a href="https://distill.pub/prize/">Prize</a>
+    <a href="https://distill.pub/archive/">Archive</a>
+    <a href="https://distill.pub/rss.xml">RSS</a>
+    <a href="https://github.com/distillpub">GitHub</a>
+    <a href="https://twitter.com/distillpub">Twitter</a>
+    &nbsp;&nbsp;&nbsp;&nbsp; ISSN 2476-0757
+  </div>
+
 </div>
+
 `);

 export class DistillFooter extends T(HTMLElement) {
@@ -4,80 +4,81 @@ import logo from '../assets/distill-logo.svg';

 const T = Template('distill-header', `
 <style>
-:host {
-  box-sizing: border-box;
-  display: block;
-  top: 0;
-  left: 0;
+distill-header {
+  position: relative;
+  height: 60px;
+  background-color: hsl(200, 60%, 15%);
  width: 100%;
-  z-index: ${1e6};
+  box-sizing: border-box;
+  z-index: 2;
  color: rgba(0, 0, 0, 0.8);
  border-bottom: 1px solid rgba(0, 0, 0, 0.08);
-  contain: content;
+  box-shadow: 0 1px 6px rgba(0, 0, 0, 0.05);
 }
-
-.content > * {
-  line-height: 30px;
-  font-size: 14px;
-  padding: 3px 7px;
-  margin: 8px 0;
+distill-header .content {
+  height: 70px;
+  grid-column: page;
 }
-
-.name {
-  grid-column-end: span 8;
-  font-weight: 500;
-  border-radius: 3px;
-  font-size: 18px;
-  letter-spacing: -0.05em;
-}
-
-.content a {
-  font-size: 12px;
+distill-header a {
+  font-size: 16px;
+  height: 60px;
+  line-height: 60px;
  text-decoration: none;
-  color: black;
-  text-transform: uppercase;
+  color: rgba(255, 255, 255, 0.8);
+  padding: 22px 0;
 }
-svg {
-  display: none;
-  background-color: hsl(0, 0%, 15%);
-  padding: 8px;
-  border-radius: 6px;
+distill-header a:hover {
+  color: rgba(255, 255, 255, 1);
+}
+distill-header svg {
  width: 24px;
  position: relative;
+  top: 4px;
  margin-right: 2px;
 }
-svg path {
-  fill: white;
-  stroke: rgba(255, 255, 255, 1.0);
+@media(min-width: 1080px) {
+  distill-header {
+    height: 70px;
+  }
+  distill-header a {
+    height: 70px;
+    line-height: 70px;
+    padding: 28px 0;
+  }
+  distill-header .logo {
+  }
+}
+distill-header svg path {
+  fill: none;
+  stroke: rgba(255, 255, 255, 0.8);
  stroke-width: 3px;
 }
-.content {
-  grid-column: page;
-  grid-template-columns: repeat(12, 1fr);
-  display: grid;
-  grid-column-gap: 40px;
-}
-.logo {
-  display: none;
+distill-header .logo {
  font-size: 17px;
  font-weight: 200;
 }
-
+distill-header .nav {
+  float: right;
+  font-weight: 300;
+}
+distill-header .nav a {
+  font-size: 12px;
+  margin-left: 24px;
+  text-transform: uppercase;
+}
 </style>
-
-<div class="content grid">
+<div class="content">
  <a href="/" class="logo">
    ${logo}
-  </a>
-  <div class='name'>
    Distill
+  </a>
+  <div class="nav">
+    <a href="/about/">About</a>
+    <a href="/prize/">Prize</a>
+    <a href="/journal/">Submit</a>
  </div>
-  <a href="/faq">Latest</a>
-  <a href="/faq">About</a>
-  <a href="/faq">Prize</a>
-  <a href="/faq">Submit</a>
 </div>
-`);
+`, false);

 // <div class="nav">
 //   <a href="https://github.com/distillpub">GitHub</a>
@@ -1,4 +1,6 @@
-export default function(dom) {
+import { appendixTemplate } from '../distill-components/distill-appendix';
+
+export default function(dom, data) {

  const appendixTag = dom.querySelector('d-appendix');
  if (!appendixTag) {
@@ -9,6 +11,7 @@ export default function(dom) {
  if (!distillAppendixTag) {
    const distillAppendix = dom.createElement('distill-appendix');
    appendixTag.appendChild(distillAppendix);
+    distillAppendix.innerHTML = appendixTemplate(data);
  }

 }
@@ -1,3 +1,5 @@
+import { parseBibtex } from '../helpers/bibtex';
+import fs from 'fs';
 import { parseBibliography } from '../components/d-bibliography';

 export default function(dom, data) {
@@ -6,5 +8,18 @@ export default function(dom, data) {
    console.warn('No bibliography tag found!');
    return;
  }
+
+  const src = bibliographyTag.getAttribute('src');
+  if (src) {
+    const path = data.inputDirectory + '/' + src;
+    const text = fs.readFileSync(path, 'utf-8');
+    const bibliography = parseBibtex(text);
+    const scriptTag = dom.createElement('script');
+    scriptTag.type = 'text/json';
+    scriptTag.textContent = JSON.stringify([...bibliography]);
+    bibliographyTag.appendChild(scriptTag);
+    bibliographyTag.removeAttribute('src');
+  }
+
  data.bibliography = parseBibliography(bibliographyTag);
 }
@@ -1,5 +1,10 @@
-import { collectCitations } from '../components/d-cite';
+import { collect_citations } from '../helpers/citation.js';

 export default function(dom, data) {
-  data.citations = collectCitations(dom);
+  const citations = new Set(data.citations);
+  const newCitations = collect_citations(dom);
+  for (const citation of newCitations) {
+    citations.add(citation);
+  }
+  data.citations = Array.from(citations);
 }
@@ -1,4 +1,5 @@
 import { parseFrontmatter } from '../components/d-front-matter';
+import { mergeFromYMLFrontmatter } from '../front-matter.js';

 export default function(dom, data) {
  const frontMatterTag = dom.querySelector('d-front-matter');
@@ -7,5 +8,5 @@ export default function(dom, data) {
    return;
  }
  const extractedData = parseFrontmatter(frontMatterTag);
-  data.mergeFromYMLFrontmatter(extractedData);
+  mergeFromYMLFrontmatter(data, extractedData);
 }
@@ -1,5 +1,5 @@
 const days = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'];
-const months = ['Jan', 'Feb', 'March', 'April', 'May', 'June', 'July', 'Aug', 'Sept', 'Oct', 'Nov', 'Dec'];
+const months = ['Jan.', 'Feb.', 'March', 'April', 'May', 'June', 'July', 'Aug.', 'Sept.', 'Oct.', 'Nov.', 'Dec.'];
 const zeroPad = n => n < 10 ? '0' + n : n;

 const RFC = function(date) {
@@ -13,6 +13,23 @@ const RFC = function(date) {
  return `${day}, ${paddedDate} ${month} ${year} ${hours}:${minutes}:${seconds} Z`;
 };

+const objectFromMap = function(map) {
+  const object = Array.from(map).reduce((object, [key, value]) => (
+    Object.assign(object, { [key]: value }) // Be careful! Maps can have non-String keys; object literals can't.
+  ), {});
+  return object;
+};
+
+const mapFromObject = function(object) {
+  const map = new Map();
+  for (var property in object) {
+    if (object.hasOwnProperty(property)) {
+      map.set(property, object[property]);
+    }
+  }
+  return map;
+};
+
 class Author {

  // constructor(name='', personalURL='', affiliation='', affiliationURL='') {
@@ -42,9 +59,31 @@ class Author {
  }
 }

+export function mergeFromYMLFrontmatter(target, source) {
+  target.title = source.title;
+  if (source.published) {
+    if (source.published instanceof Date) {
+      target.publishedDate = source.published;
+    } else if (source.published.constructor === String) {
+      target.publishedDate = new Date(source.published);
+    }
+  }
+  if (source.publishedDate) {
+    if (source.publishedDate instanceof Date) {
+      target.publishedDate = source.publishedDate;
+    } else if (source.publishedDate.constructor === String) {
+      target.publishedDate = new Date(source.publishedDate);
+    }
+  }
+  target.description = source.description;
+  target.authors = source.authors.map( (authorObject) => new Author(authorObject));
+  target.katex = source.katex;
+  target.password = source.password;
+}
+
 export class FrontMatter {
  constructor() {
-    this.title = ''; // 'Attention and Augmented Recurrent Neural Networks'
+    this.title = 'unnamed article'; // 'Attention and Augmented Recurrent Neural Networks'
    this.description = ''; // 'A visual overview of neural attention...'
    this.authors = []; // Array of Author(s)

@@ -94,7 +133,6 @@ export class FrontMatter {
    //  }
    //  volume: 1,
    //  issue: 9,
-    this.publishedDate = new Date();

    this.katex = {};

@@ -105,7 +143,7 @@ export class FrontMatter {
    //  githubCompareUpdatesUrl: 'https://github.com/distillpub/post--augmented-rnns/compare/1596e094d8943d2dc0ea445d92071129c6419c59...3bd9209e0c24d020f87cf6152dcecc6017cbc193',
    //  updatedDate: 2017-03-21T07:13:16.000Z,
    //  doi: '10.23915/distill.00001',
-
+    this.publishedDate = undefined;
  }

  // Example:
@@ -118,15 +156,6 @@ export class FrontMatter {
  // - Google Brain:
  // - Google Brain: http://g.co/brain

-  mergeFromYMLFrontmatter(data) {
-    this.title = data.title;
-    this.publishedDate = new Date(data.published);
-    this.description = data.description;
-    this.authors = data.authors.map( (authorObject) => new Author(authorObject));
-    this.katex = data.katex;
-    this.password = data.password;
-  }
-
  //
  // Computed Properties
  //
@@ -147,7 +176,11 @@ export class FrontMatter {

  // 'https://github.com/distillpub/post--augmented-rnns',
  get githubUrl() {
-    return 'https://github.com/' + this.githubPath;
+    if (this.githubPath) {
+      return 'https://github.com/' + this.githubPath;
+    } else {
+      return undefined;
+    }
  }

  // TODO resolve differences in naming of URL/Url/url.
@@ -194,6 +227,22 @@ export class FrontMatter {
    return zeroPad(this.publishedDate.getDate());
  }

+  get publishedISODateOnly() {
+    return this.publishedDate.toISOString().split('T')[0];
+  }
+
+  get volume() {
+    const volume = this.publishedYear - 2015;
+    if (volume < 1) {
+      throw new Error('Invalid publish date detected during computing volume');
+    }
+    return volume;
+  }
+
+  get issue() {
+    return this.publishedDate.getMonth() + 1;
+  }
+
  // 'Olah & Carter',
  get concatenatedAuthors() {
    if (this.authors.length > 2) {
@@ -230,4 +279,42 @@ export class FrontMatter {
    }));
  }

+  set bibliography(bibliography) {
+    if (bibliography instanceof Map) {
+      this._bibliography = bibliography;
+    } else if (typeof bibliography === 'object') {
+      this._bibliography = mapFromObject(bibliography);
+    }
+  }
+
+  get bibliography() {
+    return this._bibliography;
+  }
+
+  static fromObject(source) {
+    const frontMatter = new FrontMatter();
+    Object.assign(frontMatter, source);
+    return frontMatter;
+  }
+
+  assignToObject(target) {
+    Object.assign(target, this);
+    target.bibliography = objectFromMap(this.bibliographyEntries);
+    target.url = this.url;
+    target.githubUrl = this.githubUrl;
+    target.previewURL = this.previewURL;
+    target.volume = this.volume;
+    target.issue = this.issue;
+    target.publishedDateRFC = this.publishedDateRFC;
+    target.publishedYear = this.publishedYear;
+    target.publishedMonth = this.publishedMonth;
+    target.publishedDay = this.publishedDay;
+    target.publishedMonthPadded = this.publishedMonthPadded;
+    target.publishedDayPadded = this.publishedDayPadded;
+    target.updatedDateRFC = this.updatedDateRFC;
+    target.concatenatedAuthors = this.concatenatedAuthors;
+    target.bibtexAuthors = this.bibtexAuthors;
+    target.slug = this.slug;
+  }
+
 }
@@ -13,7 +13,7 @@ export function parseBibtex(bibtex) {
  for (const entry of parsedEntries) {
    // normalize tags; note entryTags is an object, not Map
    for (const [key, value] of Object.entries(entry.entryTags)) {
-      entry.entryTags[key] = normalizeTag(value);
+      entry.entryTags[key.toLowerCase()] = normalizeTag(value);
    }
    entry.entryTags.type = entry.entryType;
    // add to bibliography
@@ -1,3 +1,15 @@
+export function collect_citations(dom=document) {
+  const citations = new Set();
+  const citeTags = dom.querySelectorAll('d-cite');
+  for (const tag of citeTags) {
+    const keys = tag.getAttribute('key').split(',');
+    for (const key of keys) {
+      citations.add(key);
+    }
+  }
+  return [...citations];
+}
+
 export function inline_cite_short(keys){
  function cite_string(key){
    if (key in data.bibliography){
@@ -104,7 +116,7 @@ function doi_string(ent, new_line){

 export function bibliography_cite(ent, fancy){
  if (ent){
-    var cite =  '<b>' + ent.title + '</b> ';
+    var cite =  '<span class="title">' + ent.title + '</span> ';
    cite += link_string(ent) + '<br>';
    cite += author_string(ent, '${L}, ${I}', ', ', ' and ');
    if (ent.year || ent.date){
@@ -1,8 +1,9 @@
-function make_hover_css(pos) {
+function make_hover_css(target_node, pos) {
  const pretty = window.innerWidth > 600;
  const padding = pretty? 18 : 12;
  const outer_padding = pretty ? 18 : 0;
-  const bbox = document.querySelector('body').getBoundingClientRect();
+  // const bbox = document.querySelector('body').getBoundingClientRect();
+  const bbox = target_node.offsetParent.getBoundingClientRect();
  let left = pos[0] - bbox.left, top = pos[1] - bbox.top;
  let width = Math.min(window.innerWidth-2*outer_padding, 648);
  left = Math.min(left, window.innerWidth-width-outer_padding);
@@ -40,7 +41,7 @@ export class HoverBox {
      this.stopTimeout();
    });
    this.div.addEventListener('mouseout', () => {
-      this.extendTimeout(250);
+      this.extendTimeout(500);
    });
    // Don't trigger body touchstart event when touching within box
    this.div.addEventListener('touchstart', (event) => {
@@ -61,7 +62,7 @@ export class HoverBox {
    });

    node.addEventListener('mouseout', () => {
-      this.extendTimeout(250);
+      this.extendTimeout(500);
    });

    node.addEventListener('touchstart', (event) => {
@@ -77,8 +78,8 @@ export class HoverBox {

  show(position) {
    this.visible = true;
-    const css = make_hover_css(position);
-    this.div.setAttribute('style', css );
+    // const css = make_hover_css(this.triggerElement, position);
+    this.div.setAttribute('style', 'display: block;' );
  }

  showAtNode(node) {
@@ -88,7 +89,7 @@ export class HoverBox {

  hide() {
    this.visible = false;
-    this.div.setAttribute('style', 'display:none');
+    this.div.setAttribute('style', 'display: none;');
    this.stopTimeout();
  }

@@ -0,0 +1,68 @@
+export function addPolyfill(polyfill, polyfillLoadedCallback) {
+  console.info('Runlevel 0: Polyfill required: ' + polyfill.name);
+  const script = document.createElement('script');
+  script.src = polyfill.url;
+  script.async = false;
+  if (polyfillLoadedCallback) {
+    script.onload = function() { polyfillLoadedCallback(polyfill); };
+  }
+  script.onerror = function() {
+    new Error('Runlevel 0: Polyfills failed to load script ' + polyfill.name);
+  };
+  document.head.appendChild(script);
+}
+
+export const polyfills = [
+  {
+    name: 'WebComponents',
+    support: function() {
+      return 'customElements' in window &&
+             'attachShadow' in Element.prototype &&
+             'getRootNode' in Element.prototype &&
+             'content' in document.createElement('template') &&
+             'Promise' in window &&
+             'from' in Array;
+    },
+    url: 'https://distill.pub/third-party/polyfills/webcomponents-lite.js'
+  }, {
+    name: 'IntersectionObserver',
+    support: function() {
+      return 'IntersectionObserver' in window &&
+             'IntersectionObserverEntry' in window;
+    },
+    url: 'https://distill.pub/third-party/polyfills/intersection-observer.js'
+  },
+];
+
+export class Polyfills {
+
+  static browserSupportsAllFeatures() {
+    return polyfills.every((poly) => poly.support());
+  }
+
+  static load(callback) {
+    // Define an intermediate callback that checks if all is loaded.
+    const polyfillLoaded = function(polyfill) {
+      polyfill.loaded = true;
+      console.info('Runlevel 0: Polyfill has finished loading: ' + polyfill.name);
+      // console.info(window[polyfill.name]);
+      if (Polyfills.neededPolyfills.every((poly) => poly.loaded)) {
+        console.info('Runlevel 0: All required polyfills have finished loading.');
+        console.info('Runlevel 0->1.');
+        window.distillRunlevel = 1;
+        callback();
+      }
+    };
+    // Add polyfill script tags
+    for (const polyfill of Polyfills.neededPolyfills) {
+      addPolyfill(polyfill, polyfillLoaded);
+    }
+  }
+
+  static get neededPolyfills() {
+    if (!Polyfills._neededPolyfills) {
+      Polyfills._neededPolyfills = polyfills.filter((poly) => !poly.support());
+    }
+    return Polyfills._neededPolyfills;
+  }
+}
@@ -51,16 +51,17 @@ d-article .marker:hover span {
 }

 d-article h2 {
-  grid-column-end: page-end;
-  font-weight: 700;
+  font-weight: 600;
  font-size: 24px;
  line-height: 1.25em;
-  margin: 0 0 1rem 0;
+  margin: 2rem 0 1.5rem 0;
+  border-bottom: 1px solid rgba(0, 0, 0, 0.1);
+  padding-bottom: 1rem;
 }

@media(min-width: 1024px) {
  d-article h2 {
-    font-size: 24px;
+    font-size: 36px;
  }
 }

@@ -70,8 +71,8 @@ d-article h3 {
  font-weight: 700;
  font-size: 18px;
  line-height: 1.4em;
-  margin-bottom: 24px;
-  margin-top: 0;
+  margin-bottom: 1em;
+  margin-top: 2em;
 }

@media(min-width: 1024px) {
@@ -95,13 +96,22 @@ d-article a {

 d-article p,
 d-article ul,
-d-article ol {
-  font-family: georgia, serif;
+d-article ol,
+d-article blockquote {
  margin-top: 0;
-  margin-bottom: 1.7em;
+  margin-bottom: 1em;
+  margin-left: 0;
+  margin-right: 0;
  -webkit-font-smoothing: antialiased;
 }

+d-article blockquote {
+  border-left: 2px solid rgba(0, 0, 0, 0.2);
+  padding-left: 2em;
+  font-style: italic;
+  color: rgba(0, 0, 0, 0.6);
+}
+
 d-article a {
  border-bottom: 1px solid rgba(0, 0, 0, 0.4);
  text-decoration: none;
@@ -133,8 +143,10 @@ d-article pre {
 }

 d-article hr {
+  grid-column: screen;
+  width: 100%;
  border: none;
-  border-bottom: 1px solid rgba(0, 0, 0, 0.2);
+  border-bottom: 1px solid rgba(0, 0, 0, 0.1);
  margin-top: 60px;
  margin-bottom: 60px;
 }
@@ -144,56 +156,12 @@ d-article section {
  margin-bottom: 60px;
 }

-/* Figure */
-
-d-article figure {
-  position: relative;
-  margin-bottom: 36px;
-}
-
-d-article figure img {
-  width: 100%;
-}
-
-d-article figure svg text,
-d-article figure svg tspan {
-}
-
-d-article figure figcaption {
-  color: rgba(0, 0, 0, 0.6);
-  font-size: 12px;
-  line-height: 1.5em;
-}
-
-@media(min-width: 1024px) {
-  d-article figure figcaption {
-    font-size: 13px;
-  }
-}
-
-d-article figure.external img {
-  background: white;
-  border: 1px solid rgba(0, 0, 0, 0.1);
-  box-shadow: 0 1px 8px rgba(0, 0, 0, 0.1);
-  padding: 18px;
-  box-sizing: border-box;
-}
-
-d-article figure figcaption a {
-  color: rgba(0, 0, 0, 0.6);
-}
-
 d-article span.equation-mimic {
  font-family: georgia;
  font-size: 115%;
  font-style: italic;
 }

-d-article figure figcaption b {
-  font-weight: 600;
-  color: rgba(0, 0, 0, 1.0);
-}
-
 d-article > d-code,
 d-article section > d-code  {
  display: block;
@@ -217,7 +185,6 @@ d-include {
 d-figure {
  contain: content;
  overflow: hidden;
-  height: 300px;
 }

 /* KaTeX */
@@ -226,3 +193,33 @@ d-figure {
  contain: content;
  display: inline-block;
 }
+
+/* Tables */
+
+d-article table {
+  border-collapse: collapse;
+  margin-bottom: 1.5rem;
+  border-bottom: 1px solid rgba(0, 0, 0, 0.2);
+}
+
+d-article table th {
+  border-bottom: 1px solid rgba(0, 0, 0, 0.2);
+}
+
+d-article table td {
+  border-bottom: 1px solid rgba(0, 0, 0, 0.05);
+}
+
+d-article table tr:last-of-type td {
+  border-bottom: none;
+}
+
+d-article table th,
+d-article table td {
+  font-size: 15px;
+  padding: 2px 8px;
+}
+
+d-article table tbody :first-child td {
+  padding-top: 2px;
+}
@@ -1,18 +1,24 @@
 d-byline {
  border-top: 1px solid rgba(0, 0, 0, 0.1);
  contain: content;
-  font-size: 0.7rem;
+  font-size: 0.8rem;
  line-height: 1.8em;
  padding: 1.5rem 0;
+  min-height: 1.8em;
 }

 d-byline .byline {
-  grid-template-columns: repeat(4, 1fr);
+  grid-template-columns: 2fr 1fr 1fr;
  grid-column: text;
 }

+d-byline .authors-affiliations {
+  grid-template-columns: 1fr 1fr;
+
+}
+
 d-byline h3 {
-  font-size: 0.55rem;
+  font-size: 0.6rem;
  font-weight: 400;
  color: rgba(0, 0, 0, 0.5);
  margin: 0;
@@ -35,9 +41,10 @@ d-article d-byline a:hover {
  border-bottom: none;
 }

-d-byline .authors p {
-  font-weight: 600;
+d-byline p.author {
+  font-weight: 500;
 }
+
 d-byline .affiliations {

 }
@@ -1,7 +1,7 @@
 span.katex-display {
  text-align: left;
  padding: 8px 0 8px 0;
-  margin: 0 0 1.7em 1em;
+  margin: 0.5em 0 0.5em 1em;
 }

 span.katex {
@@ -1,8 +1,9 @@
 html {
-  font-size: 19px;
-	line-height: 1rem;
+  font-size: 16px;
+	line-height: 1.6em;
  /* font-family: "Libre Franklin", "Helvetica Neue", sans-serif; */
-  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif;
+  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", Arial, sans-serif;
+  /*, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";*/
  text-size-adjust: 100%;
  -ms-text-size-adjust: 100%;
  -webkit-text-size-adjust: 100%;
@@ -46,9 +47,83 @@ pre {
  max-width: 100%;
 }

+p {
+  margin-top: 0;
+  margin-bottom: 1em;
+}
+
+sup, sub {
+  vertical-align: baseline;
+  position: relative;
+  top: -0.4em;
+  line-height: 1em;
+}
+
+sub {
+  top: 0.4em;
+}
+
 .kicker,
 .marker {
  font-size: 15px;
  font-weight: 600;
  color: rgba(0, 0, 0, 0.5);
 }
+
+
+/* Headline */
+
+@media(min-width: 1024px) {
+  d-title h1 span {
+    display: block;
+  }
+}
+
+/* Figure */
+
+figure {
+  position: relative;
+  margin-bottom: 2.5em;
+  margin-top: 2.5em;
+}
+
+figcaption+figure {
+
+}
+
+figure img {
+  width: 100%;
+}
+
+figure svg text,
+figure svg tspan {
+}
+
+figcaption {
+  color: rgba(0, 0, 0, 0.6);
+  font-size: 12px;
+  line-height: 1.5em;
+}
+
+@media(min-width: 1024px) {
+figcaption {
+    font-size: 13px;
+  }
+}
+
+figure.external img {
+  background: white;
+  border: 1px solid rgba(0, 0, 0, 0.1);
+  box-shadow: 0 1px 8px rgba(0, 0, 0, 0.1);
+  padding: 18px;
+  box-sizing: border-box;
+}
+
+figcaption a {
+  color: rgba(0, 0, 0, 0.6);
+}
+
+figcaption b {
+  font-weight: 600;
+  color: rgba(0, 0, 0, 1.0);
+}
@@ -1,92 +1,112 @@
@supports not (display: grid) {
+  .base-grid,
  distill-header,
  d-title,
  d-abstract,
  d-article,
  d-appendix,
+  distill-appendix,
  d-byline,
  d-footnote-list,
+  d-citation-list,
  distill-footer {
    display: block;
    padding: 8px;
  }
 }

+.base-grid,
 distill-header,
 d-title,
 d-abstract,
 d-article,
 d-appendix,
+distill-appendix,
 d-byline,
 d-footnote-list,
+d-citation-list,
 distill-footer {
  display: grid;
  justify-items: stretch;
-  grid-template-columns: [screen-start] 0.5fr [page-start kicker-start text-start gutter-start middle-start] 1fr 1fr 1fr 1fr 1fr 1fr 1fr 1fr [text-end page-end gutter-end kicker-end middle-end] 0.5fr [screen-end];
-  grid-column-gap: 30px;
+  grid-template-columns: [screen-start] 8px [page-start kicker-start text-start gutter-start middle-start] 1fr 1fr 1fr 1fr 1fr 1fr 1fr 1fr [text-end page-end gutter-end kicker-end middle-end] 8px [screen-end];
+  grid-column-gap: 8px;
+}
+
+.grid {
+  display: grid;
+  grid-column-gap: 8px;
 }

@media(min-width: 768px) {
+  .base-grid,
  distill-header,
  d-title,
  d-abstract,
  d-article,
  d-appendix,
+  distill-appendix,
  d-byline,
  d-footnote-list,
+  d-citation-list,
  distill-footer {
    grid-template-columns: [screen-start] 1fr [page-start kicker-start middle-start text-start] 45px 45px 45px 45px 45px 45px 45px 45px [ kicker-end text-end gutter-start] 45px [middle-end] 45px [page-end gutter-end] 1fr [screen-end];
-    grid-column-gap: 30px;
+    grid-column-gap: 16px;
+  }
+
+  .grid {
+    grid-column-gap: 16px;
  }
 }

@media(min-width: 1000px) {
+  .base-grid,
  distill-header,
  d-title,
  d-abstract,
  d-article,
  d-appendix,
+  distill-appendix,
  d-byline,
  d-footnote-list,
+  d-citation-list,
  distill-footer {
    grid-template-columns: [screen-start] 1fr [page-start kicker-start] 50px [middle-start] 50px [text-start kicker-end] 50px 50px 50px 50px 50px 50px 50px 50px [text-end gutter-start] 50px [middle-end] 50px [page-end gutter-end] 1fr [screen-end];
-    grid-column-gap: 30px;
+    grid-column-gap: 16px;
+  }
+
+  .grid {
+    grid-column-gap: 16px;
  }
 }

@media(min-width: 1280px) {
+  .base-grid,
  distill-header,
  d-title,
  d-abstract,
  d-article,
  d-appendix,
+  distill-appendix,
  d-byline,
  d-footnote-list,
+  d-citation-list,
  distill-footer {
    grid-template-columns: [screen-start] 1fr [page-start kicker-start] 60px [middle-start] 60px [text-start kicker-end] 60px 60px 60px 60px 60px 60px 60px 60px [text-end gutter-start] 60px [middle-end] 60px [page-end gutter-end] 1fr [screen-end];
-    grid-column-gap: 30px;
+    grid-column-gap: 32px;
+  }
+
+  .grid {
+    grid-column-gap: 32px;
  }
 }


-.grid {
-  display: grid;
-  grid-column-gap: 30px;
-}

-.col-3 {
-  display: grid;
-  grid-template-columns: repeat(3, 1fr);
-  grid-column-gap: 30px;
-}

-.col-2 {
-  display: grid;
-  grid-template-columns: repeat(2, 1fr);
-  grid-column-gap: 30px;
+.base-grid {
+  grid-column: screen;
 }

-
 /* .l-body,
 d-article > *  {
  grid-column: text;
@@ -98,20 +118,33 @@ d-figure {
  grid-column: page;
 } */

+.l-gutter {
+  grid-column: gutter;
+}
+
+.l-text,
+.l-body {
+  grid-column: text;
+}
+
+.l-page {
+  grid-column: page;
+}
+
 .l-body-outset {
-  grid-column: left-outset / right-outset;
+  grid-column: middle;
 }

 .l-page-outset {
-  grid-column: left-outset / right-outset;
+  grid-column: page;
 }

 .l-screen {
-  grid-column: start / end;
+  grid-column: screen;
 }

 .l-screen-inset {
-  grid-column: start / end;
+  grid-column: screen;
  padding-left: 16px;
  padding-left: 16px;
 }
@@ -121,18 +154,17 @@ d-figure {

 d-article aside {
  grid-column: gutter;
+  font-size: 12px;
+  line-height: 1.6em;
+  color: rgba(0, 0, 0, 0.6)
 }

@media(min-width: 768px) {
  aside {
-    grid-column: right-outset / right-page;
-    font-size: 14px;
-    line-height: 1.3;
+    grid-column: gutter;
  }

  .side {
-    margin-left: 24px;
-    float: right;
-    width: 50%;
+    grid-column: gutter;
  }
 }
@@ -17,7 +17,8 @@ export function makeStyleTag(dom) {
    styleTag.type = 'text/css';
    const cssTextTag = dom.createTextNode(styles);
    styleTag.appendChild(cssTextTag);
-    dom.head.insertBefore(styleTag, dom.head.firstChild);
+    const firstScriptTag = dom.head.querySelector('script');
+    dom.head.insertBefore(styleTag, firstScriptTag);
  }

 }
@@ -7,62 +7,112 @@ import ExtractFrontmatter from './extractors/front-matter';
 import ExtractBibliography from './extractors/bibliography';
 import ExtractCitations from './extractors/citations';

-const extractors = [
-  ExtractFrontmatter,
-  ExtractBibliography,
-  ExtractCitations,
-];
+const extractors = new Map([
+  ['ExtractFrontmatter', ExtractFrontmatter],
+  ['ExtractBibliography', ExtractBibliography],
+  ['ExtractCitations', ExtractCitations],
+]);

 /* Transforms */
 import HTML from './transforms/html';
 import Byline from './transforms/byline';
-import Polyfills from './transforms/polyfills';
 import OptionalComponents from './transforms/optional-components';
 import Mathematics from './transforms/mathematics';
 import Meta from './transforms/meta';
 import { makeStyleTag } from './styles/styles';
 import TOC from './transforms/toc';
 import Typeset from './transforms/typeset';
-import Bibliography from './transforms/bibliography';
+import Polyfills from './transforms/polyfills';
+import CitationList from './transforms/citation-list';
+import Reorder from './transforms/reorder';

-const transforms = [
-  HTML, makeStyleTag, Polyfills, OptionalComponents, TOC, Byline, Mathematics,
-  Meta, Typeset, Bibliography,
-];
+const transforms = new Map([
+  ['HTML', HTML],
+  ['makeStyleTag', makeStyleTag],
+  ['OptionalComponents', OptionalComponents],
+  ['TOC', TOC],
+  ['Byline', Byline],
+  ['Mathematics', Mathematics],
+  ['Meta', Meta],
+  ['Typeset', Typeset],
+  ['Polyfills', Polyfills],
+  ['CitationList', CitationList],
+  ['Reorder', Reorder] // keep last
+]);

 /* Distill Transforms */
 import DistillHeader from './distill-transforms/distill-header';
 import DistillAppendix from './distill-transforms/distill-appendix';
 import DistillFooter from './distill-transforms/distill-footer';

-const distillTransforms = [
-  DistillHeader, DistillAppendix, DistillFooter,
-];
+const distillTransforms = new Map([
+  ['DistillHeader', DistillHeader],
+  ['DistillAppendix', DistillAppendix],
+  ['DistillFooter', DistillFooter],
+]);

 /* Exported functions */

-export function render(dom, data) {
+export function render(dom, data, verbose=true) {
+  let frontMatter;
+  if (data instanceof FrontMatter) {
+    frontMatter = data;
+  } else {
+    frontMatter = FrontMatter.fromObject(data);
+  }
  // first, we collect static data from the dom
-  for (const extract of extractors) {
-    console.warn('Running extractor...');
-    extract(dom, data);
+  for (const [name, extract] of extractors.entries()) {
+    if (verbose) console.warn('Running extractor: ' + name);
+    extract(dom, frontMatter, verbose);
  }
  // secondly we use it to transform parts of the dom
-  for (const transform of transforms) {
-    console.warn('Running transform...');
+  for (const [name, transform] of transforms.entries()) {
+    if (verbose) console.warn('Running transform: ' + name);
    // console.warn('Running transform: ', transform);
-    transform(dom, data);
+    transform(dom, frontMatter, verbose);
  }
  dom.body.setAttribute('distill-prerendered', '');
  // the function calling us can now use the transformed dom and filled data object
-}
-
-export function distillify(dom, data) {
-  // thirdly, we can use these additional transforms when publishing on the Distill website
-  for (const transform of distillTransforms) {
-    // console.warn('Running distillify: ', transform);
-    transform(dom, data);
+  if (data instanceof FrontMatter) {
+    // frontMatter will already have needed properties
+  } else {
+    frontMatter.assignToObject(data);
  }
 }

-export { FrontMatter };
+export function distillify(dom, data, verbose=true) {
+  // thirdly, we can use these additional transforms when publishing on the Distill website
+  for (const [name, transform] of distillTransforms.entries()) {
+    if (verbose) console.warn('Running distillify: ', name);
+    transform(dom, data, verbose);
+  }
+}
+
+export function usesTemplateV2(dom) {
+  const tags = dom.querySelectorAll('script');
+  let usesV2 = undefined;
+  for (const tag of tags) {
+    const src = tag.src;
+    if (src.includes('template.v1.js')) {
+      usesV2 = false;
+    } else if (src.includes('template.v2.js')) {
+      usesV2 = true;
+    } else if (src.includes('template.')) {
+      throw new Error('Uses distill template, but unknown version?!');
+    }
+  }
+
+  if (usesV2 === undefined) {
+    throw new Error('Does not seem to use Distill template at all.');
+  } else {
+    return usesV2;
+  }
+}
+
+export { FrontMatter }; // TODO: removable?
+
+export const testing = {
+  extractors: extractors,
+  transforms: transforms,
+  distillTransforms: distillTransforms
+};
@@ -1,39 +0,0 @@
-// import { renderBibliography, templateString } from '../components/d-bibliography';
-import { parseBibtex } from '../helpers/bibtex';
-import fs from 'fs';
-
-export default function(dom, data) {
-  const bibliographyTag = dom.querySelector('d-bibliography');
-  if (!bibliographyTag) {
-    console.warn('No bibliography tag present!');
-    return;
-  }
-
-  const src = bibliographyTag.getAttribute('src');
-  if (src) {
-    const path = data.inputDirectory + '/' + src;
-    const text = fs.readFileSync(path, 'utf-8');
-    const bibliography = parseBibtex(text);
-    const scriptTag = dom.createElement('script');
-    scriptTag.type = 'text/json';
-    scriptTag.textContent = JSON.stringify([...bibliography]);
-    bibliographyTag.appendChild(scriptTag);
-    bibliographyTag.removeAttribute('src');
-  }
-  // const bibliographyEntries = new Map(data.citations.map( citationKey => {
-  //   const entry = data.bibliography.get(citationKey);
-  //   return [citationKey, entry];
-  // }));
-  //
-  // const prerenderedBibliography = dom.createElement('d-bibliography-prerendered');
-  //
-  // const template = dom.createElement('template');
-  // template.innerHTML = templateString;
-  // const clone = dom.importNode(template.content, true);
-  // prerenderedBibliography.innerHTML = template.content;
-  // renderBibliography(prerenderedBibliography, bibliographyEntries, dom);
-  //
-  // bibliographyTag.parentElement.insertBefore(bibliographyTag, prerenderedBibliography);
-  // bibliographyTag.parentElement.removeChild(bibliographyTag);
-
-}
@@ -4,6 +4,5 @@ export default function(dom, data) {
  const byline = dom.querySelector('d-byline');
  if (byline) {
    byline.innerHTML = bylineTemplate(data);
-    // byline.setAttribute('distill-prerendered', '');
  }
 }
@@ -0,0 +1,12 @@
+import { renderCitationList } from '../components/d-citation-list'; // (element, entries)
+
+export default function(dom, data) {
+  const citationListTag = dom.querySelector('d-citation-list');
+  if (citationListTag) {
+    const entries = new Map(data.citations.map( citationKey => {
+      return [citationKey, data.bibliography.get(citationKey)];
+    }));
+    renderCitationList(citationListTag, entries, dom);
+    citationListTag.setAttribute('distill-prerendered', 'true');
+  }
+}
@@ -5,6 +5,11 @@ export default function(dom, data) {
  let needsCSS = false;
  const article = dom.querySelector('d-article');

+  if (!article) {
+    console.warn("No d-article tag found!");
+    return;
+  }
+
  if (data.katex && data.katex.delimiters) {
    global.document = dom;
    renderMathInElement(article, data.katex);
@@ -1,39 +1,58 @@
+// TODO: rewrite as template to make order dependencies easier
+
 import favicon from '../assets/distill-favicon.base64';
+import escape from 'escape-html';

 export default function(dom, data) {
  let head = dom.querySelector('head');
  let appendHead = html => appendHtml(head, html);

-  function meta(name, content) {
-    if (content)
-      appendHead(`    <meta name="${name}" content="${content}" >\n`);
+  function meta(name, content, force) {
+    if (content || force)
+      appendHead(`    <meta name="${name}" content="${escape(content)}" >\n`);
  }

  appendHead(`
    <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
    <link rel="icon" type="image/png" href="data:image/png;base64,${favicon}">
    <link href="/rss.xml" rel="alternate" type="application/rss+xml" title="Articles from Distill">
-    <link rel="canonical" href="${data.url}">
-    <title>${data.title}</title>
  `);

-  appendHead(`
+  if (data.title) {
+    appendHead(`
+    <title>${escape(data.title)}</title>
+    `);
+  }
+
+  if (data.url) {
+    appendHead(`
+    <link rel="canonical" href="${data.url}">
+    `);
+  }
+
+
+  if (data.publishedDate){
+    appendHead(`
    <!--  https://schema.org/Article -->
-    <meta property="article:published" itemprop="datePublished" content="${data.publishedYear}-${data.publishedMonthPadded}-${data.publishedDayPadded}" />
-    <meta property="article:modified" itemprop="dateModified" content="${data.updatedDate}" />
-  `);
-  data.authors.forEach((a) => {
+    <meta property="description"       itemprop="description"   content="${escape(data.description)}" />
+    <meta property="article:published" itemprop="datePublished" content="${data.publishedISODateOnly}" />
+    <meta property="article:created"   itemprop="dateCreated"   content="${data.publishedISODateOnly}" />
+    <meta property="article:modified"  itemprop="dateModified"  content="${data.updatedDate.toISOString()}" />
+    `);
+  }
+
+  (data.authors || []).forEach((a) => {
    appendHtml(head, `
-      <meta property="article:author" content="${a.firstName} ${a.lastName}" />`);
+    <meta property="article:author" content="${escape(a.firstName)} ${escape(a.lastName)}" />`);
  });

  appendHead(`
    <!--  https://developers.facebook.com/docs/sharing/webmasters#markup -->
    <meta property="og:type" content="article"/>
-    <meta property="og:title" content="${data.title}"/>
-    <meta property="og:description" content="${data.description}">
+    <meta property="og:title" content="${escape(data.title)}"/>
+    <meta property="og:description" content="${escape(data.description)}">
    <meta property="og:url" content="${data.url}"/>
-    <meta property="og:image" content="${data.url}/thumbnail.jpg"/>
+    <meta property="og:image" content="${data.previewURL}"/>
    <meta property="og:locale" content="en_US" />
    <meta property="og:site_name" content="Distill" />
  `);
@@ -41,10 +60,10 @@ export default function(dom, data) {
  appendHead(`
    <!--  https://dev.twitter.com/cards/types/summary -->
    <meta name="twitter:card" content="summary_large_image">
-    <meta name="twitter:title" content="${data.title}">
-    <meta name="twitter:description" content="${data.description}">
+    <meta name="twitter:title" content="${escape(data.title)}">
+    <meta name="twitter:description" content="${escape(data.description)}">
    <meta name="twitter:url" content="${data.url}">
-    <meta name="twitter:image" content="${data.url}/thumbnail.jpg">
+    <meta name="twitter:image" content="${data.previewURL}">
    <meta name="twitter:image:width" content="560">
    <meta name="twitter:image:height" content="295">
  `);
@@ -58,16 +77,18 @@ export default function(dom, data) {
    meta('citation_fulltext_html_url', data.url);
    meta('citation_volume', data.volume);
    meta('citation_issue', data.issue);
-    meta('citation_firstpage', data.doiSuffix? `e${data.doiSuffix}` : undefined);
+    meta('citation_firstpage', data.doiSuffix ? `e${data.doiSuffix}` : undefined);
    meta('citation_doi', data.doi);

    let journal = data.journal || {};
-    meta('citation_journal_title', journal.name);
-    meta('citation_journal_abbrev', journal.nameAbbrev);
+    meta('citation_journal_title', journal.full_title || journal.title);
+    meta('citation_journal_abbrev', journal.abbrev_title);
    meta('citation_issn', journal.issn);
    meta('citation_publisher', journal.publisher);
+    meta('citation_fulltext_world_readable', '', true);

    if (data.publishedDate){
+      meta('citation_online_date', `${data.publishedYear}/${data.publishedMonthPadded}/${data.publishedDayPadded}`);
      meta('citation_publication_date', `${data.publishedYear}/${data.publishedMonthPadded}/${data.publishedDayPadded}`);
    }

@@ -75,17 +96,21 @@ export default function(dom, data) {
      meta('citation_author', `${a.lastName}, ${a.firstName}`);
      meta('citation_author_institution', a.affiliation);
    });
+  } else {
+    console.warn('No DOI suffix in data; not adding citation meta tags!');
+  }

-    if (data.citations) {
-      data.citations.forEach(key => {
-        let d = data.bibliography[key];
-        if(!d) {
-          console.warn('No bibliography data fround for ' + key);
-        } else {
-          meta('citation_reference', citation_meta_content(data.bibliography[key]) );
-        }
-      });
-    }
+  if (data.citations) {
+    data.citations.forEach(key => {
+      if (data.bibliography && data.bibliography.has(key)) {
+        const entry = data.bibliography.get(key);
+        meta('citation_reference', citation_meta_content(entry) );
+      } else {
+        console.warn('No bibliography data found for ' + key);
+      }
+    });
+  } else {
+    console.warn('No citations found; not adding any references meta tags!');
  }
 }

@@ -94,20 +119,41 @@ function appendHtml(el, html) {
 }

 function citation_meta_content(ref){
+  // Special test for arxiv
  var content = `citation_title=${ref.title};`;
-  ref.author.split(' and ').forEach(author => {
-    content += `citation_author=${author.trim()};`;
+
+  ref.author.split(' and ').forEach(name => {
+    name = name.trim();
+    let last, firsts;
+    if (name.indexOf(',') != -1){
+      last = name.split(',')[0].trim();
+      firsts = name.split(',')[1].trim();
+    } else {
+      last = name.split(' ').slice(-1)[0].trim();
+      firsts = name.split(' ').slice(0,-1).join(' ');
+    }
+    content += `citation_author=${firsts} ${last};`;
  });
+
+  if ('year' in ref) {
+    content += `citation_publication_date=${ref.year};`;
+  }
+
+  let arxiv_id_search = /https?:\/\/arxiv\.org\/pdf\/([0-9]*\.[0-9]*)\.pdf/.exec(ref.url);
+  arxiv_id_search = arxiv_id_search || /https?:\/\/arxiv\.org\/abs\/([0-9]*\.[0-9]*)/.exec(ref.url);
+  arxiv_id_search = arxiv_id_search || /arXiv preprint arXiv:([0-9]*\.[0-9]*)/.exec(ref.journal);
+  if (arxiv_id_search && arxiv_id_search[1]){
+    content += `citation_arxiv_id=${arxiv_id_search[1]};`;
+    return content; // arXiv is not considered a journal, so we don't need journal/volume/issue
+  }
  if ('journal' in ref){
-    content += `citation_journal_title=${ref.journal};`;
+    content += `citation_journal_title=${escape(ref.journal)};`;
  }
  if ('volume' in ref) {
-    content += `citation_volume=${ref.volume};`;
+    content += `citation_volume=${escape(ref.volume)};`;
  }
  if ('issue' in ref || 'number' in ref){
-    content += `citation_number=${ref.issue || ref.number};`;
+    content += `citation_number=${escape(ref.issue || ref.number)};`;
  }
-  /*content += `citation_first_page=${};`;
-  content += `citation_publication_date=${};`;*/
  return content;
 }
@@ -8,46 +8,48 @@
 // if authors, no byline -> add byline

 export default function(dom, data) {
-  const article = dom.querySelector('d-article');
-  const abstract = dom.querySelector('d-abstract');
+  const body = dom.body;
+  const article = body.querySelector('d-article');

-  let interstitial = dom.querySelector('d-interstitial');
-  if (!interstitial && data.password) {
-    interstitial = dom.createElement('d-interstitial');
-    interstitial.password = data.password;
-    dom.body.insertBefore(interstitial, article);
+  // If we don't have an article tag, something weird is going on—giving up.
+  if (!article) {
+    console.warn('No d-article tag found; skipping adding optional components!');
+    return;
  }

-  // let h1 = dom.querySelector('h1');
-  // if (h1) {
-  //   if (!data.title) {
-  //     data.title = h1.textContent;
-  //   }
-  // } else {
-  if (data.title) {
-    let headline = dom.createElement('d-title');
-    let h1 = dom.createElement('h1');
-    headline.appendChild(h1);
-    h1.textContent = data.title;
-    abstract.parentNode.insertBefore(headline, abstract);
-  }
-  // if (data.description) {
-  //   const h2 = dom.createElement('h2');
-  //   h2.textContent = data.description;
-  //   article.insertBefore(h2, h1.nextSibling);
-  // }
-  // }
-
  let byline = dom.querySelector('d-byline');
-  if (!byline && data.authors) {
-    byline = dom.createElement('d-byline');
-    article.parentNode.insertBefore(byline, article);
-    // const skipTags = ['H1', 'FIGURE', 'D-ABSTRACT'];
-    // let candidate = h1;
-    // while (skipTags.indexOf(candidate.tagName) !== -1) {
-    //   candidate = candidate.nextSibling;
-    // }
-    // article.insertBefore(byline, candidate);
+  if (!byline) {
+    if (data.authors) {
+      byline = dom.createElement('d-byline');
+      body.insertBefore(byline, article);
+    } else {
+      console.warn('No authors found in front matter; please add them before submission!');
+    }
+  }
+
+  let title = dom.querySelector('d-title');
+  if (!title) {
+    let title = dom.createElement('d-title');
+    body.insertBefore(title, byline);
+  }
+
+  let h1 = title.querySelector('h1');
+  if (!h1) {
+    h1 = dom.createElement('h1');
+    h1.textContent = data.title;
+    title.insertBefore(h1, title.firstChild);
+  }
+
+  const hasPassword = typeof data.password !== 'undefined';
+  let interstitial = body.querySelector('d-interstitial');
+  if (hasPassword && !interstitial) {
+    const inBrowser = typeof window !== 'undefined';
+    const onLocalhost = inBrowser && window.location.hostname.includes('localhost');
+    if (!inBrowser || !onLocalhost) {
+      interstitial = dom.createElement('d-interstitial');
+      interstitial.password = data.password;
+      body.insertBefore(interstitial, body.firstChild);
+    }
  }

  let appendix = dom.querySelector('d-appendix');
@@ -42,5 +42,6 @@ export default function render(dom) {
  polyfillScriptTag.id = 'polyfills';

  // insert at appropriate position--before any other script tag
-  dom.head.insertBefore(polyfillScriptTag, dom.head.firstChild);
+  const firstScriptTag = dom.head.querySelector('script');
+  dom.head.insertBefore(polyfillScriptTag, firstScriptTag);
 }
@@ -0,0 +1,17 @@
+/*
+  Try to only reorder things that MAY be user defined.
+  Try to use templates etc to define the order of our own tags.
+*/
+
+export default function render(dom) {
+  const head = dom.head;
+
+  const metaIE = head.querySelector('meta[http-equiv]');
+  head.insertBefore(metaIE, head.firstChild);
+
+  const metaViewport = head.querySelector('meta[name=viewport]');
+  head.insertBefore(metaViewport, head.firstChild);
+
+  const metaCharset = head.querySelector('meta[charset]');
+  head.insertBefore(metaCharset, head.firstChild);
+}
@@ -0,0 +1,317 @@
+import { Template } from '../mixins/template';
+import { scaleLinear } from 'd3-scale';
+import { range } from 'd3-array';
+import { drag } from 'd3-drag';
+import { select, event as currentEvent } from 'd3-selection';
+
+const T = Template('d-slider', `
+<style>
+  :host {
+    position: relative;
+    display: inline-block;
+  }
+
+  :host(:focus) {
+    outline: none;
+  }
+
+  .background {
+    padding: 9px 0;
+    color: white;
+    position: relative;
+  }
+
+  .track {
+    height: 3px;
+    width: 100%;
+    border-radius: 2px;
+    background-color: hsla(0, 0%, 0%, 0.2);
+  }
+
+  .track-fill {
+    position: absolute;
+    top: 9px;
+    height: 3px;
+    border-radius: 4px;
+    background-color: hsl(24, 100%, 50%);
+  }
+
+  .knob-container {
+    position: absolute;
+    top: 10px;
+  }
+
+  .knob {
+    position: absolute;
+    top: -6px;
+    left: -6px;
+    width: 13px;
+    height: 13px;
+    background-color: hsl(24, 100%, 50%);
+    border-radius: 50%;
+    transition-property: transform;
+    transition-duration: 0.18s;
+    transition-timing-function: ease;
+  }
+  .mousedown .knob {
+    transform: scale(1.5);
+  }
+
+  .knob-highlight {
+    position: absolute;
+    top: -6px;
+    left: -6px;
+    width: 13px;
+    height: 13px;
+    background-color: hsla(0, 0%, 0%, 0.1);
+    border-radius: 50%;
+    transition-property: transform;
+    transition-duration: 0.18s;
+    transition-timing-function: ease;
+  }
+
+  .focus .knob-highlight {
+    transform: scale(2);
+  }
+
+  .ticks {
+    position: absolute;
+    top: 16px;
+    height: 4px;
+    width: 100%;
+    z-index: -1;
+  }
+
+  .ticks .tick {
+    position: absolute;
+    height: 100%;
+    border-left: 1px solid hsla(0, 0%, 0%, 0.2);
+  }
+
+</style>
+
+  <div class="background">
+    <div class="track"></div>
+    <div class="track-fill"></div>
+    <div class="knob-container">
+      <div class="knob-highlight"></div>
+      <div class="knob"></div>
+    </div>
+    <div class="ticks"></div>
+  </div>
+`);
+
+// ARIA
+// If the slider has a visible label, it is referenced by aria-labelledby on the slider element. Otherwise, the slider element has a label provided by aria-label.
+// If the slider is vertically oriented, it has aria-orientation set to vertical. The default value of aria-orientation for a slider is horizontal.
+
+const keyCodes = {
+  left: 37,
+  up: 38,
+  right: 39,
+  down: 40,
+  pageUp: 33,
+  pageDown: 34,
+  end: 35,
+  home: 36
+};
+
+export class Slider extends T(HTMLElement) {
+
+
+  connectedCallback() {
+    this.connected = true;
+    this.setAttribute("role", "slider");
+    // Makes the element tab-able.
+    if (!this.hasAttribute("tabindex")) { this.setAttribute("tabindex", 0); }
+
+    // Keeps track of keyboard vs. mouse interactions for focus rings
+    this.mouseEvent = false;
+
+    // Handles to shadow DOM elements
+    this.knob = this.root.querySelector(".knob-container");
+    this.background = this.root.querySelector(".background");
+    this.trackFill = this.root.querySelector(".track-fill");
+    this.track = this.root.querySelector(".track");
+
+    // Default values for attributes
+    this.min = this.min ? this.min : 0;
+    this.max = this.max ? this.max : 100;
+    this.scale = scaleLinear().domain([this.min, this.max]).range([0, 1]).clamp(true);
+
+    this.origin = this.origin !== undefined ? this.origin : this.min;
+    this.step = this.step ? this.step : 1;
+    this.update(this.value ? this.value : 0);
+
+    this.ticks = this.ticks ? this.ticks : false;
+    this.renderTicks();
+
+    this.drag = drag()
+      .container(this.background)
+      .on("start", () => {
+        this.mouseEvent = true;
+        this.background.classList.add("mousedown");
+        this.changeValue = this.value;
+        this.dragUpdate();
+      })
+      .on("drag", () => {
+        this.dragUpdate();
+      })
+      .on("end", () => {
+        this.mouseEvent = false;
+        this.background.classList.remove("mousedown");
+        this.dragUpdate();
+        if (this.changeValue !== this.value) this.dispatchChange();
+        this.changeValue = this.value;
+      });
+    this.drag(select(this.background));
+
+    this.addEventListener("focusin", (e) => {
+      if(!this.mouseEvent) {
+        this.background.classList.add("focus");
+      }
+    });
+    this.addEventListener("focusout", (e) => {
+      this.background.classList.remove("focus");
+    });
+    this.addEventListener("keydown", this.onKeyDown);
+
+  }
+
+  static get observedAttributes() {return ["min", "max", "value", "step", "ticks", "origin", "tickValues", "tickLabels"]; }
+
+  attributeChangedCallback(attr, oldValue, newValue) {
+    if (attr == "min") {
+      this.min = +newValue;
+      this.setAttribute("aria-valuemin", this.min);
+    }
+    if (attr == "max") {
+      this.max = +newValue;
+      this.setAttribute("aria-valuemax", this.max);
+    }
+    if (attr == "value") {
+      this.update(+newValue);
+    }
+    if (attr == "origin") {
+      this.origin = +newValue;
+      this.update(this.value);
+    }
+    if (attr == "step") {
+      if (newValue > 0) {
+        this.step = +newValue;
+      }
+    }
+    if (attr == "ticks") {
+      this.ticks = (newValue === "" ? true : newValue);
+    }
+  }
+
+  onKeyDown(e) {
+    this.changeValue = this.value;
+    let stopPropagation = false;
+    switch (event.keyCode) {
+      case keyCodes.left:
+      case keyCodes.down:
+        this.update(this.value - this.step)
+        stopPropagation = true;
+        break;
+      case keyCodes.right:
+      case keyCodes.up:
+        this.update(this.value + this.step)
+        stopPropagation = true;
+        break;
+      case keyCodes.pageUp:
+        this.update(this.value + this.step * 10)
+        stopPropagation = true;
+        break;
+
+      case keyCodes.pageDown:
+        this.update(this.value + this.step * 10)
+        stopPropagation = true;
+        break;
+      case keyCodes.home:
+        this.update(this.min);
+        stopPropagation = true;
+        break;
+      case keyCodes.end:
+        this.update(this.max);
+        stopPropagation = true;
+        break;
+      default:
+        break;
+    }
+    if (stopPropagation) {
+      this.background.classList.add("focus");
+      e.preventDefault();
+      e.stopPropagation();
+      if (this.changeValue !== this.value) this.dispatchChange();
+    }
+  }
+
+  validateValueRange(min, max, value) {
+    return Math.max(Math.min(max, value), min)
+  }
+
+  quantizeValue(value, step) {
+    return Math.round(value / step) * step;
+  }
+
+  dragUpdate() {
+    const bbox = this.background.getBoundingClientRect();
+    const x = currentEvent.x;
+    const width = bbox.width;
+    this.update(this.scale.invert(x / width));
+  }
+
+  update(value) {
+    let v = value;
+    if (this.step !== "any") {
+      v = this.quantizeValue(value, this.step);
+    }
+    v = this.validateValueRange(this.min, this.max, v);
+    if (this.connected) {
+      this.knob.style.left = this.scale(v) * 100 + "%";
+      this.trackFill.style.width = this.scale(this.min + Math.abs(v - this.origin)) * 100 + "%";
+      this.trackFill.style.left = this.scale(Math.min(v, this.origin)) * 100 + "%";
+    }
+    if (this.value !== v) {
+      this.value = v;
+      this.setAttribute("aria-valuenow", this.value);
+      this.dispatchInput();
+    }
+  }
+
+  // Dispatches only on a committed change (basically only on mouseup).
+  dispatchChange() {
+    const e = new Event("change");
+    this.dispatchEvent(e, {});
+  }
+
+  // Dispatches on each value change.
+  dispatchInput() {
+    const e = new Event("input");
+    this.dispatchEvent(e, {});
+  }
+
+  renderTicks() {
+    const ticksContainer = this.root.querySelector(".ticks");
+    if (this.ticks !== false) {
+      let tickData = [];
+      if (this.ticks > 0) {
+        tickData = this.scale.ticks(this.ticks);
+      } else if (this.step === "any") {
+        tickData = this.scale.ticks();
+      } else {
+        tickData = range(this.min, this.max + 1e-6, this.step);
+      }
+      tickData.forEach(d => {
+        const tick = document.createElement("div");
+        tick.classList.add("tick");
+        tick.style.left = this.scale(d) * 100 + "%";
+        ticksContainer.appendChild(tick)
+      });
+    } else {
+      ticksContainer.style.display = "none";
+    }
+  }
+}
@@ -0,0 +1,3 @@
+function nodeListToArray(nodeList) {
+  return Array.prototype.slice.call(nodeList);
+}
@@ -0,0 +1 @@
+-r jsdom-global/register
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+
+<head>
+  <meta charset="utf8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <script src="https://distill.pub/template.v1.js"></script>
+</head>
+
+<body>
+
+</body>
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+
+<head>
+  <meta charset="utf8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <script src="https://distill.pub/template.v2.js"></script>
+</head>
+
+<body>
+
+</body>
@@ -1,46 +1,50 @@
+/* global it, should, describe */
+
 // Test format: https://mochajs.org/#bdd
 // Assertion format: http://chaijs.com/api/bdd/

-let expect = require('chai').expect,
-    jsdom = require("jsdom"),
-    distill = require("../dist/template.js");
+let expect = require('chai').expect;
+let jsdom = require('jsdom');
+    // let distill = require('../dist/template.v1.js');

-describe("Distill", function() {
-  describe("render", function() {
-    it("Should have a render function.", function() {
+describe.skip('Distill v1', function() {
+
+  describe('render', function() {
+    it('Should have a render function.', function() {
      expect(distill.render).to.be.an.instanceof(Function);
    });
  });
+
  //
  // html
  //
-  describe("html", function() {
-    it("Should have a html function.", function() {
+  describe.skip('html', function() {
+    it('Should have a html function.', function() {
      expect(distill.html).to.be.an.instanceof(Function);
    });
-    it("Should add a language attribute to html element, if not present.", function() {
-      var doc = jsdom.jsdom("");
+    it('Should add a language attribute to html element, if not present.', function() {
+      var doc = jsdom.jsdom('');
      let before = jsdom.serializeDocument(doc);
      distill.html(doc, {});
      let after = jsdom.serializeDocument(doc);
      expect(after).to.match(new RegExp('<html lang="en">'));
    });
-    it("Should not add a language attribute to html element, if already present.", function() {
+    it('Should not add a language attribute to html element, if already present.', function() {
      var doc = jsdom.jsdom('<html lang="ab">');
      let before = jsdom.serializeDocument(doc);
      distill.html(doc, {});
      let after = jsdom.serializeDocument(doc);
      expect(after).to.not.match(new RegExp('lang="en"'));
    });
-    it("Should add a meta charset tag, if not present.", function() {
-      var doc = jsdom.jsdom("");
+    it('Should add a meta charset tag, if not present.', function() {
+      var doc = jsdom.jsdom('');
      let before = jsdom.serializeDocument(doc);
      distill.html(doc, {});
      let after = jsdom.serializeDocument(doc);
      expect(after).to.match(new RegExp('<meta charset="utf-8">'));
    });
-    it("Should add a meta viewport tag, if not present.", function() {
-      var doc = jsdom.jsdom("");
+    it('Should add a meta viewport tag, if not present.', function() {
+      var doc = jsdom.jsdom('');
      let before = jsdom.serializeDocument(doc);
      distill.html(doc, {});
      let after = jsdom.serializeDocument(doc);
@@ -51,8 +55,8 @@ describe("Distill", function() {
  //
  // styles
  //
-  describe("styles", function() {
-    it("Should have a styles function.", function() {
+  describe.skip('styles', function() {
+    it('Should have a styles function.', function() {
      expect(distill.styles).to.be.an.instanceof(Function);
    });
  })
@@ -0,0 +1,240 @@
+/* global it, describe, before, beforeEach, after, afterEach */
+
+const jsdom = require('jsdom');
+const { JSDOM } = jsdom;
+
+const expect = require('chai').expect;
+const distill = require('../dist/transforms.v2.js');
+
+// omitJSDOMErrors as JSDOM routinely can't parse modern CSS
+const virtualConsole = new jsdom.VirtualConsole();
+virtualConsole.sendTo(console, { omitJSDOMErrors: true });
+const options = { runScripts: 'outside-only', QuerySelector: true, virtualConsole: virtualConsole };
+
+describe('Distill V2 (transforms)', function() {
+
+  it('should export its expected interface', function() {
+    expect(distill.testing).to.be.an('object');
+    expect(distill.usesTemplateV2).to.be.a('function');
+    expect(distill.render).to.be.a('function');
+    expect(distill.distillify).to.be.a('function');
+  });
+
+  describe('#usesTemplateV2()', function() {
+
+    it('should detect v1', function() {
+      const frag = JSDOM.fragment('<script src="https://distill.pub/template.v1.js"></script>');
+      expect(distill.usesTemplateV2(frag)).to.be.false;
+    });
+
+    it('should detect v2', function() {
+      const frag = JSDOM.fragment('<script src="https://distill.pub/template.v2.js"></script>');
+      expect(distill.usesTemplateV2(frag)).to.be.true;
+    });
+
+    it('should detect local scripts as well', function() {
+      const frag = JSDOM.fragment('<script src="/template.v2.js"></script>');
+      expect(distill.usesTemplateV2(frag)).to.be.true;
+    });
+
+    it('should error on unknown distill script', function() {
+      const frag = JSDOM.fragment('<script src="https://distill.pub/template.v42.js"></script>');
+      expect(()=> distill.usesTemplateV2(frag)).to.throw('unknown');
+    });
+
+    it('should error on no distill script', function() {
+      const frag = JSDOM.fragment('<script src="https://code.jquery.com/jquery-3.2.1.js"></script>');
+      expect(()=> distill.usesTemplateV2(frag)).to.throw('at all');
+    });
+
+  });
+
+  describe('#render()', function() {
+
+    describe('should extract metadata', function() {
+
+      it('should extract citations', function() {
+        const dom = new JSDOM('<d-cite key="test-citation-key">sth</d-cite>', options);
+        const data = {};
+        const extractCitations = distill.testing.extractors.get('ExtractCitations');
+        expect(extractCitations).to.be.a('function');
+        extractCitations(dom.window.document, data);
+        expect(data).to.have.property('citations');
+        const citations = data.citations;
+        expect(citations).to.be.an.instanceof(Array);
+        expect(citations).to.have.lengthOf(1);
+        const citation = citations[0];
+        expect(citation).to.equal('test-citation-key');
+      });
+
+      it('should extract bibliography', function() {
+        const dom = new JSDOM(`
+          <d-cite key="mercier2011humans">sth</d-cite>
+          <d-bibliography>
+            <script type="text/bibtex">
+            @article{mercier2011humans,
+            title={Why do humans reason? Arguments for an argumentative theory},
+            author={Mercier, Hugo and Sperber, Dan},
+            journal={Behavioral and brain sciences},
+            volume={34},
+            number={02},
+            pages={57--74},
+            year={2011},
+            publisher={Cambridge Univ Press},
+            doi={10.1017/S0140525X10000968}
+            }
+            </script>
+          </d-bibliography>
+          `, options);
+        const data = {};
+        const extractBibliography = distill.testing.extractors.get('ExtractBibliography');
+        extractBibliography(dom.window.document, data);
+        expect(data.bibliography).to.be.an.instanceof(Map);
+        const entry = data.bibliography.get('mercier2011humans');
+        expect(entry).to.be.an('object');
+        expect(entry).to.have.property('year', '2011');
+      });
+
+      it('should extract front-matter');
+
+    }); // metadata
+
+    describe('should transform the DOM', function() {
+
+      it('should add Google scholar citation information', function() {
+        const dom = new JSDOM('', options);
+        const data = {
+          authors: [
+            {firstName: 'Frank', lastName: 'Underwood', affiliation: 'Google Brain', affiliationURL: 'https://g.co/brain'},
+            {firstName: 'Shan', lastName: 'Carter', affiliation: 'Google Brain', affiliationURL: 'https://g.co/brain'},
+          ],
+          doiSuffix: 'test-doi-suffix'
+        };
+        const firstAuthorName = data.authors[0].firstName + ' ' + data.authors[0].lastName;
+        const GSfirstAuthorName = data.authors[0].lastName + ', ' + data.authors[0].firstName;
+
+        const meta = distill.testing.transforms.get('Meta');
+        expect(meta).to.be.a('function');
+
+        meta(dom.window.document, data);
+        const metaTags = dom.window.document.querySelectorAll('meta');
+        expect(metaTags).to.not.be.empty;
+
+        // Google Scholar
+        const GSAuthorTags = Array.prototype.filter.call(metaTags, (tag) => {
+          return tag.name === 'citation_author';
+        });
+        expect(GSAuthorTags).to.have.lengthOf(2);
+        const GSFirstAuthorTag = GSAuthorTags[0];
+
+        expect(GSFirstAuthorTag.content).to.equal(GSfirstAuthorName);
+
+        // Schema.org Author tags
+        const SOAuthorTags = Array.prototype.filter.call(metaTags, (tag) => {
+          return tag.getAttribute('property') === 'article:author';
+        });
+        expect(SOAuthorTags).to.have.lengthOf(2);
+        const SOFirstAuthorTag = SOAuthorTags[0];
+        expect(SOFirstAuthorTag.content).to.equal(firstAuthorName);
+
+      });
+
+      it('given already correct data, it should add Google scholar references information', function() {
+        const dom = new JSDOM('', options);
+        const data = {
+          doiSuffix: 'test-doi-suffix',
+          citations: ['test-citation-key'],
+          bibliography: new Map([[
+            'test-citation-key', {
+              title: 'Why do humans reason? Arguments for an argumentative theory',
+              author: 'Mercier, Hugo and Sperber, Dan',
+              journal: 'Behavioral and brain sciences',
+              volume: 34,
+              number: 2
+            }
+          ]])
+        };
+        const meta = distill.testing.transforms.get('Meta');
+        expect(meta).to.be.a('function');
+        meta(dom.window.document, data);
+        const metaTags = [].slice.call(dom.window.document.querySelectorAll('meta[name="citation_reference"]'));
+        expect(metaTags).to.not.be.empty;
+      });
+
+      it('given an arxiv article, it should add a special Google scholar arxiv citation', function() {
+        const dom = new JSDOM('', options);
+        const data = {
+          doiSuffix: 'test-doi-suffix',
+          citations: ['dumoulin2016guide'],
+          bibliography: new Map([[
+            'dumoulin2016guide', {
+              title: 'A guide to convolution arithmetic for deep learning',
+              author: 'Dumoulin, Vincent and Visin, Francesco',
+              journal: 'arXiv preprint arXiv:1603.07285',
+              year: '2016',
+              url: 'https://arxiv.org/pdf/1603.07285.pdf'
+            }
+          ]])
+        };
+
+        const meta = distill.testing.transforms.get('Meta');
+        expect(meta).to.be.a('function');
+        meta(dom.window.document, data);
+
+        const metaTags = [].slice.call(dom.window.document.querySelectorAll('meta[name="citation_reference"]'));
+        expect(metaTags).to.not.be.empty;
+
+        const metaTag = metaTags[0];
+        expect(metaTag).to.have.property('content');
+
+        const content = metaTag.content;
+        expect(content).to.include('citation_title');
+        expect(content).to.include('citation_author');
+        expect(content.match(/citation_author=/g).length).to.equal(2);
+        expect(content).to.include('citation_publication_date');
+        expect(content).to.include('citation_arxiv_id');
+        expect(content).to.not.include('journal');
+      });
+
+      it('given only a DOM (and publish data), it should add Google scholar references information', function() {
+        const dom = new JSDOM(`
+          <d-cite key="mercier2011humans">sth</d-cite>
+          <d-bibliography>
+            <script type="text/bibtex">
+            @article{mercier2011humans,
+            title={Why do humans reason? Arguments for an argumentative theory},
+            author={Mercier, Hugo and Sperber, Dan},
+            journal={Behavioral and brain sciences},
+            volume={34},
+            number={02},
+            pages={57--74},
+            year={2011},
+            publisher={Cambridge Univ Press},
+            doi={10.1017/S0140525X10000968}
+            }
+            </script>
+          </d-bibliography>
+          `, options);
+        const data = { publishedDate: new Date(), updatedDate: new Date() };
+        distill.render(dom.window.document, data, false);
+        const metaTags = [].slice.call(dom.window.document.querySelectorAll('meta[name="citation_reference"]'));
+        expect(metaTags).to.not.be.empty;
+      });
+
+    });
+
+  }); // render
+
+  it('should export #distillify()', function() {
+    expect(distill.distillify).to.be.a('function');
+  });
+
+  describe('#distillify()', function() {
+
+    it('should ensure existence of header');
+    it('should ensure existence of footer');
+    it('should ensure existence of distill appendix');
+
+  });
+
+}); // describe 'Transform'
Author	SHA1	Message	Date
Ludwig Schubert	19b89f39ee	2.2.2	2017-10-23 15:50:29 -07:00
Ludwig Schubert	ac5a18a7d4	Merge branch 'v2' of github.com:distillpub/template into v2	2017-10-23 15:50:20 -07:00
Ludwig Schubert	ed3aceef86	2.2.1	2017-10-23 15:49:19 -07:00
Ludwig Schubert	d39819462a	Fix ordering of some tags; date formatting	2017-10-23 15:47:05 -07:00
Shan Carter	4089ccf98f	Real fix to mobile slider bug	2017-10-23 11:39:13 -07:00
Shan Carter	f046442753	Touch events x position bug	2017-10-23 11:20:24 -07:00
Shan Carter	0ff1261b81	Merge branch 'v2' of https://github.com/distillpub/distill-template into v2	2017-10-23 11:10:44 -07:00
Shan Carter	9290b10c24	Adding slider to article example	2017-10-23 11:10:42 -07:00
Ludwig Schubert	c742b36be6	Multiple fixes to styles and polyfills	2017-10-23 11:10:03 -07:00
Ludwig Schubert	1a4cd694cd	Fix interstitial on localhost, distill-appendix crash on unpublished articles	2017-10-19 13:44:56 -07:00
Ludwig Schubert	02563c32d6	Merge branch 'v2' of github.com:distillpub/template into v2	2017-10-19 13:25:08 -07:00
Shan Carter	194bed395f	Adding origin and number of ticks	2017-10-18 15:40:37 -07:00
Ludwig Schubert	15858468d1	Merge branch 'v2' of github.com:distillpub/template into v2	2017-10-18 11:50:18 -07:00
Ludwig Schubert	68a0007503	WIP	2017-10-18 11:50:12 -07:00
Shan Carter	3e3478686e	Bigger h2	2017-10-18 09:47:36 -07:00
Shan Carter	6007a9d7ad	Fixing byline multi-line bug	2017-10-18 09:40:01 -07:00
Shan Carter	3987f71c20	Setting value updates slider	2017-10-18 09:26:11 -07:00
Ludwig Schubert	72a47b1a73	Merge should be done; adds test for Google Scholar arxiv citation style.	2017-10-17 13:56:01 -07:00
Ludwig Schubert	95d357c308	More tests, will start merging now	2017-10-17 10:49:55 -07:00
Shan Carter	5cb9b79559	Merge branch 'v2' of https://github.com/distillpub/distill-template into v2	2017-10-16 14:17:15 -07:00
Shan Carter	0dd5846703	display mode for slider	2017-10-16 14:17:07 -07:00
Ludwig Schubert	30ab1dde97	Merge branch 'v2.1' of github.com:distillpub/template into v2.1	2017-10-16 11:30:13 -07:00
Ludwig Schubert	d0bb7455dc	Add tests; test transforms usesTemplateV2	2017-10-16 11:30:07 -07:00
Shan Carter	40240bd735	Style tweaks	2017-10-16 11:28:41 -07:00
Shan Carter	dbafa7c7b8	Merge branch 'v2.1' of https://github.com/distillpub/distill-template into v2.1	2017-10-16 09:52:25 -07:00
Ludwig Schubert	1ee5c5f310	Text size and line-height bike-shedding, second time	2017-10-16 09:51:37 -07:00
Shan Carter	16ec5a0f63	Merge branch 'v2.1' of https://github.com/distillpub/distill-template into v2.1	2017-10-13 15:24:01 -07:00
Shan Carter	0e75be4272	checkpoint	2017-10-13 15:23:59 -07:00
Ludwig Schubert	44f14bffe7	Text size and line-height bike-shedding	2017-10-13 15:14:52 -07:00
Ludwig Schubert	31a3478d84	Merge branch 'v2.1' of github.com:distillpub/template into v2.1 # Conflicts: # src/styles/d-article.css	2017-10-12 17:50:37 -07:00
Shan Carter	8027f1b13a	Blockquote styles	2017-10-12 16:01:48 -07:00
Ludwig Schubert	f0a8ba4368	Merge branch 'v2.1' of github.com:distillpub/template into v2.1	2017-10-12 15:21:25 -07:00
Ludwig Schubert	1255afec2c	Minor spacing and style changes	2017-10-12 15:21:13 -07:00
Shan Carter	ed7cd834f9	Spacing issues	2017-10-12 14:21:56 -07:00
Shan Carter	f5e5acbd67	Aria updates, event normalization	2017-10-12 14:11:35 -07:00
Shan Carter	ca1096347f	Step ticks	2017-10-12 10:55:02 -07:00
Shan Carter	8553a6d7c3	String -> Number	2017-10-12 10:38:10 -07:00
Ludwig Schubert	198e273211	Merge branch 'v2.1' of github.com:distillpub/template into v2.1	2017-10-12 10:19:29 -07:00
Shan Carter	8c79954f2d	No focus ring on mouse events, but keep for keyboard	2017-10-12 10:07:09 -07:00
Ludwig Schubert	c28b4afe04	Merge branch 'v2.1' of github.com:distillpub/template into v2.1	2017-10-11 18:32:16 -07:00
Ludwig Schubert	017bb45b7c	Style fixes and cleanup for appendix	2017-10-11 18:31:49 -07:00
Shan Carter	ba58e1928c	Attributes'	2017-10-11 17:33:58 -07:00
Shan Carter	d9693db537	Updating events	2017-10-11 17:31:04 -07:00
Shan Carter	804865d0f0	slider	2017-10-11 17:27:00 -07:00
Shan Carter	489f070ea6	Slider checkpoint	2017-10-10 16:46:47 -07:00
Shan Carter	dd38b2b908	slider	2017-10-10 16:45:32 -07:00
Ludwig Schubert	7f0fb66ec5	Fix render.js crash due to renamed inputs	2017-10-10 12:50:15 -07:00
Ludwig Schubert	fe7b4748fc	Move `collect_citations` to helper file	2017-10-10 12:40:07 -07:00
Ludwig Schubert	0ab27e1382	Fix non-working hover box; now in a weird in-between state, though.	2017-10-10 12:30:36 -07:00
Ludwig Schubert	044acd8f03	Fix crash in optional components. Now does less; we should rethink this once title etc stabilize.	2017-10-10 12:29:59 -07:00
Ludwig Schubert	75e132e77f	Fix dependencies	2017-10-10 12:29:27 -07:00
Ludwig Schubert	ba4c35e5ca	Add prepare script to npm package	2017-10-09 15:12:23 -07:00
Ludwig Schubert	a65f546151	Use npmignore file instead of files array	2017-10-09 15:08:26 -07:00
Ludwig Schubert	9526d99390	Explicitly include `dist` folder in npm package	2017-10-09 15:02:03 -07:00