2.2.19

# Conflicts:
#	src/styles/d-article.css

.gitignore

@@ -38,3 +38,7 @@ jspm_packages
 # Copied fonts
 examples/fonts
 dist
+article-rendered.html
+
+# dependency graph
+rollup-grapher.html

.npmignore

@@ -0,0 +1,9 @@
+src
+build
+.editorconfig
+.eslintrc.json
+.gitignore
+.travis.yml
+rollup.config.dev.js
+rollup.config.js
+yarn-error.log

.travis.yml

@@ -2,11 +2,11 @@ language: node_js
 node_js:
   - "node" # latest version
 cache:
-  yarn: true
   directories:
     - node_modules
 script:
-  - yarn build
+  - npm run build
+  - npm test
 deploy:
   provider: releases
   api_key: $GITHUB_OAUTH_TOKEN

README.md

@@ -1,28 +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; */
+Run `npm test`. That's it.

bin/render

@@ -1,20 +0,0 @@
-#!/usr/bin/env node
-
-const fs = require('fs');
-const jsdom = require('jsdom').jsdom;
-const serialize = require('jsdom').serializeDocument;
-const program = require('commander');
-const transforms = require('../dist/transforms.js');
-
-program
-  .version('0.0.1')
-  .option('-i, --input <path>', 'path to input file.')
-  .parse(process.argv);
-
-const htmlString = fs.readFileSync(program.input, 'utf8');
-const data = {};
-const dom = jsdom(htmlString, {features: {ProcessExternalResources: false, FetchExternalResources: false, runScripts: 'dangerously'}});
-transforms.render(dom, data);
-transforms.distillify(dom, data);
-const transformedHtml = serialize(dom);
-process.stdout.write(transformedHtml);

bin/render.js

@@ -0,0 +1,35 @@
+#!/usr/bin/env node
+
+const path = require('path');
+const fs = require('fs');
+const program = require('commander');
+const jsdom = require('jsdom');
+const { JSDOM } = jsdom;
+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.')
+  .parse(process.argv);
+
+const virtualConsole = new jsdom.VirtualConsole();
+// omitJSDOMErrors as JSDOM routinely can't parse modern CSS
+virtualConsole.sendTo(console, { omitJSDOMErrors: true });
+
+const options = { runScripts: 'outside-only', QuerySelector: true, virtualConsole: virtualConsole };
+JSDOM.fromFile(program.inputPath, options).then(dom => {
+  const window = dom.window;
+  const document = window.document;
+
+  const data = new transforms.FrontMatter;
+  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.outputPath, transformedHtml);
+}).catch(console.error);

examples/article.html

@@ -1,65 +1,71 @@
 <!doctype html>
 
 <head>
-  <meta charset="utf8">
   <script src="../dist/template.v2.js"></script>
-
-  <d-front-matter>
-    <script type="text/yml">
-      title: Demo Title Attention and Augmented Recurrent Neural Networks
-      published: Jan 10, 2017
-      authors:
-      - Chris Olah:
-      - Shan Carter: http://shancarter.com
-      affiliations:
-      - Google Brain
-      - Google Brain: http://g.co/brain
-    </script>
-  </d-front-matter>
+  <meta name="viewport" content="width=device-width, initial-scale=1" >
+  <meta charset="utf8">
 </head>
 
 <body>
+  <distill-header></distill-header>
+<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.",
+    "published": "Jan 10, 2017",
+    "authors": [
+      {
+        "author":"Chris Olah",
+        "authorURL":"https://colah.github.io/",
+        "affiliation":"Google Brain",
+        "affiliationURL":"https://g.co/brain"
+      },
+      {
+        "author":"Shan Carter",
+        "authorURL":"https://shancarter.com/",
+        "affiliation":"Google Brain",
+        "affiliationURL":"https://g.co/brain"
+      },
+      {
+        "author":"Ludwig Schubert",
+        "authorURL":"https://shancarter.com/",
+        "affiliation":"Google Brain",
+        "affiliationURL":"https://g.co/brain"
+      }
+    ],
+    "katex": {
+      "delimiters": [
+        {"left": "$$", "right": "$$", "display": false}
+      ]
+    }
+  }</script>
+</d-front-matter>
+<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<d-cite key="mercier2011humans"></d-cite> 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-title>
 <d-article>
-  <d-title>
-    <h1>Attention and Augmented Recurrent Neural Networks</h1>
-    <h2>Some people want a deck</h2>
-    <d-byline></d-byline>
-  </d-title>
-  <d-abstract>
-    <p>This is the first paragraph of the article. Test a long&thinsp;&mdash;&thinsp;dash -- here it is.</p>
-  </d-abstract>
+  <a class="marker" href="#section-1" id="section-1"><span>1</span></a>
+  <h2>A Brief Survey of Techniques</h2>
+  <p>Before diving in: if you haven’t encountered t-SNE before, here’s what you need to know about the math behind it. The goal is to take a set of points in a high-dimensional space and find a faithful representation of those points in a lower-dimensional space, typically the 2D plane. The algorithm is non-linear and adapts to the underlying data, performing different transformations on different regions. Those differences can be a major source of confusion.</p>
   <p>This is the first paragraph of the article. Test a long&thinsp;&mdash;&thinsp;dash -- here it is.</p>
   <p>Test for owner's possessive. Test for "quoting a passage." And another sentence. Or two. Some flopping fins; for diving.</p>
-  <hr>
-  <div style="max-width: 800px; background-color: red; height: 100px; border-radius: 50px;"></div>
-  <p>Here's a test of an inline equation <d-math>c = a^2 + b^2</d-math>. And then there's a block equation:</p>
+  <aside>Some text in an aside, margin notes, etc...</aside>
+  <p>Here's a test of an inline equation <d-math>c = a^2 + b^2</d-math>. Also with configurable katex standards just using inline '$' signs: $$x^2$$ And then there's a block equation:</p>
   <d-math block>
-      c = \pm \sqrt{ \sum_{i=0}^{n}{a^{222} + b^2}}
+    c = \pm \sqrt{ \sum_{i=0}^{n}{a^{222} + b^2}}
   </d-math>
-  <p>
-    Math can also be quite involved:
-    <d-math block>
-      f(x) = \int_{-\infty}^\infty\hat f(\xi)\,e^{2 \pi i \xi x}\,d\xi
-    </d-math>
-    <d-math block>
-      \frac{1}{\Bigl(\sqrt{\phi \sqrt{5}}-\phi\Bigr) e^{\frac25 \pi}} = 1+\frac{e^{-2\pi}} {1+\frac{e^{-4\pi}} {1+\frac{e^{-6\pi}} {1+\frac{e^{-8\pi}} {1+\cdots} } } }
-    </d-math>
-  </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></p>
-  <p>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>
-  <table>
-    <thead>
-      <tr><th>First</th><th>Second</th><th>Third</th></tr>
-    </thead>
-    <tbody>
-      <tr><td>23</td><td>654</td><td>23</td></tr>
-      <tr><td>14</td><td>54</td><td>34</td></tr>
-      <tr><td>234</td><td>54</td><td>23</td></tr>
-    </tbody>
-  </table>
+  <p>Math can also be quite involved:</p>
+  <d-math block>
+    \frac{1}{\Bigl(\sqrt{\phi \sqrt{5}}-\phi\Bigr) e^{\frac25 \pi}} = 1+\frac{e^{-2\pi}} {1+\frac{e^{-4\pi}} {1+\frac{e^{-6\pi}} {1+\frac{e^{-8\pi}} {1+\cdots} } } }
+  </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>
-  <p>Some inline javascript:<d-code language="javascript">var x = 25;</d-code></p>
-  <p>Here's a javascript code block.</p>
+  <p>Some inline javascript:<d-code language="javascript">var x = 25;</d-code>. And here's a javascript code block.</p>
   <d-code block language="javascript">
       var x = 25;
       function(x){
@@ -75,6 +81,17 @@
           print(a, end=' ')
           a, b = b, a+b
   </d-code>
+  <p>And a table</p>
+  <table>
+      <thead>
+        <tr><th>First</th><th>Second</th><th>Third</th></tr>
+      </thead>
+      <tbody>
+        <tr><td>23</td><td>654</td><td>23</td></tr>
+        <tr><td>14</td><td>54</td><td>34</td></tr>
+        <tr><td>234</td><td>54</td><td>23</td></tr>
+      </tbody>
+    </table>
   <d-figure id="last-figure"></d-figure>
   <script>
     const figure = document.querySelector("d-figure#last-figure");
@@ -98,123 +115,19 @@
     });
   </script>
   <p>That's it for the example article!</p>
-  <aside>Some text.</aside>
+
 </d-article>
 
 <d-appendix>
-  <d-acknowledgements>
-    <h3>Contributions</h3>
-    <p>Some text describing who did what.</p>
-    <h4>Reviewers</h4>
-    <p>Some text with links describing who reviewed the article.</p>
-  </d-acknowledgements>
 
-  <d-footnote-list></d-footnote-list>
+  <h3>Contributions</h3>
+  <p>Some text describing who did what.</p>
+  <h3>Reviewers</h3>
+  <p>Some text with links describing who reviewed the article.</p>
 
-  <d-bibliography><script type="text/bibtex">
-
-      @article{gregor2015draw,
-        title={DRAW: A recurrent neural network for image generation},
-        author={Gregor, Karol and Danihelka, Ivo and Graves, Alex and Rezende, Danilo Jimenez and Wierstra, Daan},
-        journal={arXiv preprint arXiv:1502.04623},
-        year={2015},
-        url ={https://arxiv.org/pdf/1502.04623.pdf}
-      }
-      @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}
-      }
-
-      @article{dong2014image,
-        title={Image super-resolution using deep convolutional networks},
-        author={Dong, Chao and Loy, Chen Change and He, Kaiming and Tang, Xiaoou},
-        journal={arXiv preprint arXiv:1501.00092},
-        year={2014},
-        url={https://arxiv.org/pdf/1501.00092.pdf}
-      }
-
-      @article{dumoulin2016adversarially,
-        title={Adversarially Learned Inference},
-        author={Dumoulin, Vincent and Belghazi, Ishmael and Poole, Ben and Lamb, Alex and Arjovsky, Martin and Mastropietro, Olivier and Courville, Aaron},
-        journal={arXiv preprint arXiv:1606.00704},
-        year={2016},
-        url={https://arxiv.org/pdf/1606.00704.pdf}
-      }
-
-      @article{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}
-      }
-
-      @article{gauthier2014conditional,
-        title={Conditional generative adversarial nets for convolutional face generation},
-        author={Gauthier, Jon},
-        journal={Class Project for Stanford CS231N: Convolutional Neural Networks for Visual Recognition, Winter semester},
-        volume={2014},
-        year={2014},
-        url={http://www.foldl.me/uploads/papers/tr-cgans.pdf}
-      }
-
-      @article{johnson2016perceptual,
-        title={Perceptual losses for real-time style transfer and super-resolution},
-        author={Johnson, Justin and Alahi, Alexandre and Fei-Fei, Li},
-        journal={arXiv preprint arXiv:1603.08155},
-        year={2016},
-        url={https://arxiv.org/pdf/1603.08155.pdf}
-      }
-
-      @article{mordvintsev2015inceptionism,
-        title={Inceptionism: Going deeper into neural networks},
-        author={Mordvintsev, Alexander and Olah, Christopher and Tyka, Mike},
-        journal={Google Research Blog},
-        year={2015},
-        url={https://research.googleblog.com/2015/06/inceptionism-going-deeper-into-neural.html}
-      }
-
-      @misc{mordvintsev2016deepdreaming,
-        title={DeepDreaming with TensorFlow},
-        author={Mordvintsev, Alexander},
-        year={2016},
-        url={https://github.com/tensorflow/tensorflow/blob/master/tensorflow/examples/tutorials/deepdream/deepdream.ipynb},
-      }
-
-      @article{radford2015unsupervised,
-        title={Unsupervised representation learning with deep convolutional generative adversarial networks},
-        author={Radford, Alec and Metz, Luke and Chintala, Soumith},
-        journal={arXiv preprint arXiv:1511.06434},
-        year={2015},
-        url={https://arxiv.org/pdf/1511.06434.pdf}
-      }
-
-      @inproceedings{salimans2016improved,
-        title={Improved techniques for training gans},
-        author={Salimans, Tim and Goodfellow, Ian and Zaremba, Wojciech and Cheung, Vicki and Radford, Alec and Chen, Xi},
-        booktitle={Advances in Neural Information Processing Systems},
-        pages={2226--2234},
-        year={2016},
-        url={https://arxiv.org/pdf/1606.03498.pdf}
-      }
-
-      @article{shi2016deconvolution,
-        title={Is the deconvolution layer the same as a convolutional layer?},
-        author={Shi, Wenzhe and Caballero, Jose and Theis, Lucas and Huszar, Ferenc and Aitken, Andrew and Ledig, Christian and Wang, Zehan},
-        journal={arXiv preprint arXiv:1609.07009},
-        year={2016},
-        url={https://arxiv.org/pdf/1609.07009.pdf}
-      }
-
-    </script></d-bibliography>
-
-  <distill-appendix> </distill-appendix>
+  <d-bibliography src="bibliography.bib"></d-bibliography>
 </d-appendix>
+
+<distill-footer></distill-footer>
+
 </body>

examples/bibliography.bib

@@ -1,8 +1,9 @@
 @article{gregor2015draw,
   title={DRAW: A recurrent neural network for image generation},
   author={Gregor, Karol and Danihelka, Ivo and Graves, Alex and Rezende, Danilo Jimenez and Wierstra, Daan},
-  journal={arXivreprint arXiv:1502.04623},
-  year={2015}
+  journal={arXiv preprint arXiv:1502.04623},
+  year={2015},
+  url ={https://arxiv.org/pdf/1502.04623.pdf}
 }
 @article{mercier2011humans,
   title={Why do humans reason? Arguments for an argumentative theory},
@@ -12,5 +13,87 @@
   number={02},
   pages={57--74},
   year={2011},
-  publisher={Cambridge Univ Press}
+  publisher={Cambridge Univ Press},
+  doi={10.1017/S0140525X10000968}
+}
+
+@article{dong2014image,
+  title={Image super-resolution using deep convolutional networks},
+  author={Dong, Chao and Loy, Chen Change and He, Kaiming and Tang, Xiaoou},
+  journal={arXiv preprint arXiv:1501.00092},
+  year={2014},
+  url={https://arxiv.org/pdf/1501.00092.pdf}
+}
+
+@article{dumoulin2016adversarially,
+  title={Adversarially Learned Inference},
+  author={Dumoulin, Vincent and Belghazi, Ishmael and Poole, Ben and Lamb, Alex and Arjovsky, Martin and Mastropietro, Olivier and Courville, Aaron},
+  journal={arXiv preprint arXiv:1606.00704},
+  year={2016},
+  url={https://arxiv.org/pdf/1606.00704.pdf}
+}
+
+@article{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}
+}
+
+@article{gauthier2014conditional,
+  title={Conditional generative adversarial nets for convolutional face generation},
+  author={Gauthier, Jon},
+  journal={Class Project for Stanford CS231N: Convolutional Neural Networks for Visual Recognition, Winter semester},
+  volume={2014},
+  year={2014},
+  url={http://www.foldl.me/uploads/papers/tr-cgans.pdf}
+}
+
+@article{johnson2016perceptual,
+  title={Perceptual losses for real-time style transfer and super-resolution},
+  author={Johnson, Justin and Alahi, Alexandre and Fei-Fei, Li},
+  journal={arXiv preprint arXiv:1603.08155},
+  year={2016},
+  url={https://arxiv.org/pdf/1603.08155.pdf}
+}
+
+@article{mordvintsev2015inceptionism,
+  title={Inceptionism: Going deeper into neural networks},
+  author={Mordvintsev, Alexander and Olah, Christopher and Tyka, Mike},
+  journal={Google Research Blog},
+  year={2015},
+  url={https://research.googleblog.com/2015/06/inceptionism-going-deeper-into-neural.html}
+}
+
+@misc{mordvintsev2016deepdreaming,
+  title={DeepDreaming with TensorFlow},
+  author={Mordvintsev, Alexander},
+  year={2016},
+  url={https://github.com/tensorflow/tensorflow/blob/master/tensorflow/examples/tutorials/deepdream/deepdream.ipynb},
+}
+
+@article{radford2015unsupervised,
+  title={Unsupervised representation learning with deep convolutional generative adversarial networks},
+  author={Radford, Alec and Metz, Luke and Chintala, Soumith},
+  journal={arXiv preprint arXiv:1511.06434},
+  year={2015},
+  url={https://arxiv.org/pdf/1511.06434.pdf}
+}
+
+@inproceedings{salimans2016improved,
+  title={Improved techniques for training gans},
+  author={Salimans, Tim and Goodfellow, Ian and Zaremba, Wojciech and Cheung, Vicki and Radford, Alec and Chen, Xi},
+  booktitle={Advances in Neural Information Processing Systems},
+  pages={2226--2234},
+  year={2016},
+  url={https://arxiv.org/pdf/1606.03498.pdf}
+}
+
+@article{shi2016deconvolution,
+  title={Is the deconvolution layer the same as a convolutional layer?},
+  author={Shi, Wenzhe and Caballero, Jose and Theis, Lucas and Huszar, Ferenc and Aitken, Andrew and Ledig, Christian and Wang, Zehan},
+  journal={arXiv preprint arXiv:1609.07009},
+  year={2016},
+  url={https://arxiv.org/pdf/1609.07009.pdf}
 }

examples/tutorial.html

@@ -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>

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "distill-template",
-  "version": "2.0.0",
+  "version": "2.2.19",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -71,6 +71,23 @@
         }
       }
     },
+    "acorn-object-spread": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/acorn-object-spread/-/acorn-object-spread-1.0.0.tgz",
+      "integrity": "sha1-SOrQ9KjrFplaF6Dbn/xqyq2kumg=",
+      "dev": true,
+      "requires": {
+        "acorn": "3.3.0"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "3.3.0",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz",
+          "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=",
+          "dev": true
+        }
+      }
+    },
     "ajv": {
       "version": "4.11.8",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
@@ -100,8 +117,7 @@
     "amdefine": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
-      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
-      "optional": true
+      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU="
     },
     "ansi-escapes": {
       "version": "2.0.0",
@@ -852,6 +868,44 @@
         "pako": "0.2.9"
       }
     },
+    "buble": {
+      "version": "0.15.2",
+      "resolved": "https://registry.npmjs.org/buble/-/buble-0.15.2.tgz",
+      "integrity": "sha1-VH/EdIP45egXbYKqXrzLGDsC1hM=",
+      "dev": true,
+      "requires": {
+        "acorn": "3.3.0",
+        "acorn-jsx": "3.0.1",
+        "acorn-object-spread": "1.0.0",
+        "chalk": "1.1.3",
+        "magic-string": "0.14.0",
+        "minimist": "1.2.0",
+        "os-homedir": "1.0.2"
+      },
+      "dependencies": {
+        "acorn": {
+          "version": "3.3.0",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz",
+          "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=",
+          "dev": true
+        },
+        "magic-string": {
+          "version": "0.14.0",
+          "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.14.0.tgz",
+          "integrity": "sha1-VyJK7xcByu7Sc7F6OalW5ysXJGI=",
+          "dev": true,
+          "requires": {
+            "vlq": "0.2.2"
+          }
+        },
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "dev": true
+        }
+      }
+    },
     "buffer": {
       "version": "4.9.1",
       "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
@@ -1070,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",
@@ -1227,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",
@@ -1407,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",
@@ -1467,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",
@@ -2605,14 +2730,6 @@
             }
           }
         },
-        "string_decoder": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "safe-buffer": "5.0.1"
-          }
-        },
         "string-width": {
           "version": "1.0.2",
           "bundled": true,
@@ -2623,6 +2740,14 @@
             "strip-ansi": "3.0.1"
           }
         },
+        "string_decoder": {
+          "version": "1.0.1",
+          "bundled": true,
+          "dev": true,
+          "requires": {
+            "safe-buffer": "5.0.1"
+          }
+        },
         "stringstream": {
           "version": "0.0.5",
           "bundled": true,
@@ -2926,6 +3051,35 @@
       "integrity": "sha1-Dqd0NxXbjY3ixe3hd14bRayFwC8=",
       "dev": true
     },
+    "handlebars": {
+      "version": "4.0.10",
+      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.10.tgz",
+      "integrity": "sha1-PTDHGLCaPZbyPqTMH0A8TTup/08=",
+      "dev": true,
+      "requires": {
+        "async": "1.5.2",
+        "optimist": "0.6.1",
+        "source-map": "0.4.4",
+        "uglify-js": "2.8.29"
+      },
+      "dependencies": {
+        "async": {
+          "version": "1.5.2",
+          "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
+          "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
+          "dev": true
+        },
+        "source-map": {
+          "version": "0.4.4",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
+          "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
+          "dev": true,
+          "requires": {
+            "amdefine": "1.0.1"
+          }
+        }
+      }
+    },
     "har-schema": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz",
@@ -3000,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",
@@ -3181,6 +3341,11 @@
       "integrity": "sha1-y8NcYu7uc/Gat7EKgBURQBr8D5A=",
       "dev": true
     },
+    "intersection-observer": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/intersection-observer/-/intersection-observer-0.4.0.tgz",
+      "integrity": "sha512-hBECeRcNPMrQP02IlicMCDiL19KQweoWukv35juIVehB2lE+spel5UyfTux/YCkXaR8Zz0jq3xMZeWYZBAU2SA=="
+    },
     "invariant": {
       "version": "2.2.2",
       "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz",
@@ -3411,40 +3576,308 @@
       "dev": true
     },
     "jsdom": {
-      "version": "9.12.0",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-9.12.0.tgz",
-      "integrity": "sha1-6MVG//ywbADUgzyoRBD+1/igl9Q=",
+      "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": "1.5.1",
-        "request": "2.81.0",
+        "parse5": "3.0.2",
+        "pn": "1.0.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": "4.8.0",
+        "whatwg-url": "6.3.0",
         "xml-name-validator": "2.0.1"
       },
       "dependencies": {
-        "parse5": {
-          "version": "1.5.1",
-          "resolved": "https://registry.npmjs.org/parse5/-/parse5-1.5.1.tgz",
-          "integrity": "sha1-m387DeMr543CQBsXVzzK8Pb1nZQ=",
+        "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.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": "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",
@@ -3554,11 +3987,11 @@
       }
     },
     "katex": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/katex/-/katex-0.7.1.tgz",
-      "integrity": "sha1-BrtSmO+tBeHnIoA1uo4VkfMGG48=",
+      "version": "0.8.3",
+      "resolved": "https://registry.npmjs.org/katex/-/katex-0.8.3.tgz",
+      "integrity": "sha512-0VKw+G/wvgLKMy4fhhKdPGjXehYF3l3PBRdzkvBivK5wMtAH9xRHImQaGk9gaukBTdOfZ1Biq8kL5vgkUsBT0Q==",
       "requires": {
-        "match-at": "0.1.0"
+        "match-at": "0.1.1"
       }
     },
     "kind-of": {
@@ -3710,6 +4143,12 @@
       "integrity": "sha1-G7nzFO9ri63tE7VJFpsqlF62jk0=",
       "dev": true
     },
+    "lodash.sortby": {
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
+      "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=",
+      "dev": true
+    },
     "longest": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
@@ -3751,9 +4190,9 @@
       "dev": true
     },
     "match-at": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/match-at/-/match-at-0.1.0.tgz",
-      "integrity": "sha1-9WHncJ/5oQW4XMYsa47nwVvyTzE="
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/match-at/-/match-at-0.1.1.tgz",
+      "integrity": "sha512-h4Yd392z9mST+dzc+yjuybOGFNOZjmXIPKWjxBd1Bb23r4SmDOsk2NYCU2BMUBGbSpZqwVsZYNq26QS3xfaT3Q=="
     },
     "memory-fs": {
       "version": "0.4.1",
@@ -3867,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",
@@ -3879,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",
@@ -4121,6 +4561,24 @@
       "integrity": "sha1-XG2ixdflgx6P+jlklQ+NZnSskLg=",
       "dev": true
     },
+    "optimist": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
+      "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
+      "dev": true,
+      "requires": {
+        "minimist": "0.0.8",
+        "wordwrap": "0.0.3"
+      },
+      "dependencies": {
+        "wordwrap": {
+          "version": "0.0.3",
+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
+          "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=",
+          "dev": true
+        }
+      }
+    },
     "optionator": {
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
@@ -4699,13 +5157,10 @@
       }
     },
     "rollup": {
-      "version": "0.45.2",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-0.45.2.tgz",
-      "integrity": "sha512-2+bq5GQSrocdhr+M92mOQRmF1evtLRzv9NdmEC2wo7BILvTG8irHCtD0q+zg8ikNu63iJicdN5IzyxAXRTFKOQ==",
-      "dev": true,
-      "requires": {
-        "source-map-support": "0.4.15"
-      }
+      "version": "0.50.0",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-0.50.0.tgz",
+      "integrity": "sha512-7RqCBQ9iwsOBPkjYgoIaeUij606mSkDMExP0NT7QDI3bqkHYQHrQ83uoNIXwPcQm/vP2VbsUz3kiyZZ1qPlLTQ==",
+      "dev": true
     },
     "rollup-plugin-babili": {
       "version": "3.1.0",
@@ -4718,6 +5173,34 @@
         "babel-preset-babili": "0.1.4"
       }
     },
+    "rollup-plugin-buble": {
+      "version": "0.15.0",
+      "resolved": "https://registry.npmjs.org/rollup-plugin-buble/-/rollup-plugin-buble-0.15.0.tgz",
+      "integrity": "sha1-g8PonH/SJmx5GPQbo5gDE1Gcf9A=",
+      "dev": true,
+      "requires": {
+        "buble": "0.15.2",
+        "rollup-pluginutils": "1.5.2"
+      },
+      "dependencies": {
+        "estree-walker": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.2.1.tgz",
+          "integrity": "sha1-va/oCVOD2EFNXcLs9MkXO225QS4=",
+          "dev": true
+        },
+        "rollup-pluginutils": {
+          "version": "1.5.2",
+          "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-1.5.2.tgz",
+          "integrity": "sha1-HhVud4+UtyVb+hs9AXi+j1xVJAg=",
+          "dev": true,
+          "requires": {
+            "estree-walker": "0.2.1",
+            "minimatch": "3.0.4"
+          }
+        }
+      }
+    },
     "rollup-plugin-commonjs": {
       "version": "7.1.0",
       "resolved": "https://registry.npmjs.org/rollup-plugin-commonjs/-/rollup-plugin-commonjs-7.1.0.tgz",
@@ -4741,6 +5224,15 @@
         "fs-extra": "3.0.1"
       }
     },
+    "rollup-plugin-grapher": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/rollup-plugin-grapher/-/rollup-plugin-grapher-0.2.0.tgz",
+      "integrity": "sha1-FtbJZkRfV6LgjDgFiFCUuZsiyv4=",
+      "dev": true,
+      "requires": {
+        "handlebars": "4.0.10"
+      }
+    },
     "rollup-plugin-gzip": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/rollup-plugin-gzip/-/rollup-plugin-gzip-1.2.0.tgz",
@@ -4915,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",
@@ -5050,15 +5596,6 @@
         "xtend": "4.0.1"
       }
     },
-    "string_decoder": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-      "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "5.1.1"
-      }
-    },
     "string-width": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
@@ -5086,6 +5623,15 @@
         }
       }
     },
+    "string_decoder": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+      "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "5.1.1"
+      }
+    },
     "stringstream": {
       "version": "0.0.5",
       "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",

package.json

@@ -1,19 +1,23 @@
 {
   "name": "distill-template",
-  "version": "2.0.0-alpha",
+  "version": "2.2.19",
   "description": "Template for creating Distill articles.",
-  "main": "dist/template.js",
+  "main": "dist/template.v2.js",
+  "bin": {
+    "distill-render": "./bin/render.js"
+  },
   "author": "Shan Carter",
   "homepage": "https://github.com/distillpub/distill-template#readme",
   "bugs": {
     "url": "https://github.com/distillpub/distill-template/issues"
   },
   "scripts": {
-    "start": "rollup -c rollup.config.dev.js -w",
-    "serve": "python3 -m http.server --bind 127.0.0.1",
+    "dev": "rollup -c rollup.config.dev.js -w",
+    "serve": "python3 -m http.server --bind 127.0.0.1 8888",
     "test": "mocha",
     "lint": "eslint",
-    "build": "rollup -c rollup.config.js"
+    "build": "rollup -c rollup.config.js",
+    "prepare": "npm run build"
   },
   "repository": {
     "url": "git+https://github.com/distillpub/distill-template.git",
@@ -22,32 +26,41 @@
   "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": "^9.10.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": "^0.50.0",
     "rollup-plugin-babili": "^3.1.0",
+    "rollup-plugin-buble": "^0.15.0",
     "rollup-plugin-commonjs": "^7.0.0",
     "rollup-plugin-copy": "^0.2.3",
+    "rollup-plugin-grapher": "^0.2.0",
     "rollup-plugin-gzip": "^1.2.0",
     "rollup-plugin-node-resolve": "^2.0.0",
     "rollup-plugin-serve": "^0.1.0",
     "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"
+    "katex": "^0.8.3"
   }
 }

rollup.config.dev.js

@@ -1,19 +1,24 @@
 import resolve  from 'rollup-plugin-node-resolve';
 import string   from 'rollup-plugin-string';
 import commonjs from 'rollup-plugin-commonjs';
+import buble    from 'rollup-plugin-buble';
+
+// uncomment to show dependencies [1/2]
+// import rollupGrapher from 'rollup-plugin-grapher'
 
 const componentsConfig = {
-  entry: 'src/components.js',
-  targets: [{format: 'umd', moduleName: 'dl', dest: 'dist/template.v2.js'}],
+  input: 'src/components.js',
+  output: [{ format: 'umd', name: 'dl', file: 'dist/template.v2.js' }],
 };
 
 const transformsConfig = {
-  entry: 'src/transforms.js',
-  targets: [{format: 'umd', moduleName: 'dl', dest: 'dist/transforms.v2.js'}],
+  input: 'src/transforms.js',
+  output: [{ format: 'umd', name: 'dl', file: 'dist/transforms.v2.js', globals: {fs: 'fs'} }],
+  external: ['fs']
 };
 
 const defaultConfig = {
-  sourceMap: true,
+  sourcemap: true,
   plugins: [
     resolve({
       jsnext: true,
@@ -23,12 +28,28 @@ const defaultConfig = {
       include: ['**/*.txt', '**/*.svg', '**/*.html', '**/*.css', '**/*.base64']
     }),
     commonjs(),
+
   ]
 };
 
 Object.assign(componentsConfig, defaultConfig);
 Object.assign(transformsConfig, defaultConfig);
 
+// transpile transforms so the node render script works…
+transformsConfig.plugins.push(
+  buble({
+    target: { 'node': 6 }
+  })
+);
+
+// uncomment to show dependencies [2/2]
+// transformsConfig.plugins.push(
+//   rollupGrapher({
+//     dest: '/dev/null',
+//     verbose: true
+//   })
+// );
+
 export default [
   componentsConfig,
   transformsConfig,

src/components.js

@@ -1,44 +1,107 @@
-/* Static styles and other modules */
-import './styles/styles';
+import { Controller } from './controller';
+
+/* Transforms */
+import { makeStyleTag }    from './styles/styles';
+import { Polyfills }       from './helpers/polyfills';
 
 /* Components */
-import { Abstract }         from './components/d-abstract';
-import { Acknowledgements } from './components/d-acknowledgements';
-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 { 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 { DMath }            from './components/d-math';
-import { References }       from './components/d-references';
-import { Title }            from './components/d-title';
-import { TOC }              from './components/d-toc';
-import { Figure }           from './components/d-figure';
-
-const components = [
-  Abstract, Acknowledgements, Appendix, Article, Bibliography,
-  Byline, Cite, Code, Footnote, FootnoteList, FrontMatter, DMath,
-  References, Title, TOC, Figure,
-];
+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 { HoverBox }        from './components/d-hover-box';
+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 += 1;
+
+  /* 3. Register Controller listener functions */
+  /* Needs to happen before components to their connected callbacks have a controller to talk to. */
+  for (const [functionName, callback] of Object.entries(Controller.listeners)) {
+    if (typeof callback === 'function') {
+      document.addEventListener(functionName, callback);
+    } else {
+      console.error('Runlevel 2: Controller listeners need to be functions!');
+    }
+  }
+  console.info('Runlevel 2: We can now listen to controller events.');
+  console.info('Runlevel 2->3.');
+  window.distillRunlevel += 1;
+
+  /* 4. Register components */
+  const components = [
+    Abstract, Appendix, Article, Bibliography, Byline, Cite, CitationList, Code,
+    Footnote, FootnoteList, FrontMatter, HoverBox, 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 3: Distill Template finished registering custom elements.');
+  console.info('Runlevel 3->4.');
+  window.distillRunlevel += 1;
+
+  // If template was added after DOMContentLoaded we may have missed that event.
+  // Controller will check for that case, so trigger the event explicitly:
+  Controller.listeners.DOMContentLoaded();
+
+  console.info('Runlevel 4: Distill Template initialisation complete.');
+};
+
+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);
+}

src/components/d-abstract.js

@@ -4,10 +4,16 @@ import { body } from '../helpers/layout';
 const T = Template('d-abstract', `
 <style>
   :host {
-    display: block;
-    font-size: 23px;
-    line-height: 1.7em;
-    margin-bottom: 140px;
+    font-size: 1.25rem;
+    line-height: 1.6em;
+    color: rgba(0, 0, 0, 0.7);
+    -webkit-font-smoothing: antialiased;
+  }
+
+  ::slotted(p) {
+    margin-top: 0;
+    margin-bottom: 1em;
+    grid-column: text-start / middle-end;
   }
   ${body('d-abstract')}
 </style>

src/components/d-acknowledgements.js

@@ -1,23 +0,0 @@
-import { Template } from '../mixins/template';
-
-const T = Template('d-acknowledgements', `
-<style>
-::slotted(h3) {
-  font-size: 15px;
-  font-weight: 500;
-  margin-top: 20px;
-  margin-bottom: 0;
-  color: rgba(0,0,0,0.65);
-  line-height: 1em;
-}
-::slotted(*) a {
-  color: rgba(0, 0, 0, 0.6);
-}
-</style>
-
-<slot></slot>
-`);
-
-export class Acknowledgements extends T(HTMLElement) {
-
-}

src/components/d-appendix.js

@@ -1,32 +1,65 @@
 import { Template } from '../mixins/template';
-import { body } from '../helpers/layout';
 
 const T = Template('d-appendix', `
 <style>
 
-:host {
-  box-sizing: border-box;
-  display: block;
-  width: 100%;
-
-  font-size: 13px;
+d-appendix {
+  contain: layout style;
+  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);
-  background: hsl(180, 5%, 98%);
-  padding-top: 36px;
+  padding-top: 60px;
   padding-bottom: 48px;
 }
 
-${body('.content')}
+d-appendix h3 {
+  grid-column: page-start / text-start;
+  font-size: 15px;
+  font-weight: 500;
+  margin-top: 1em;
+  margin-bottom: 0;
+  color: rgba(0,0,0,0.65);
+}
+
+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 {
+  color: rgba(0, 0, 0, 0.6);
+}
+
+d-appendix > * {
+  grid-column: text;
+}
+
+d-appendix > d-footnote-list,
+d-appendix > d-citation-list,
+d-appendix > distill-appendix {
+  grid-column: screen;
+}
 
 </style>
 
-<div class='content'>
-<slot></slot>
-</div>
-`, true);
+`, false);
 
 export class Appendix extends T(HTMLElement) {
 

src/components/d-article.js

@@ -1,21 +1,10 @@
-import { Template } from '../mixins/template';
-import { Controller } from '../controller';
-
-const T = Template('d-article', `
-<style></style>
-`, false);
-
-// export function addInferableTags(dom, frontMatter) {
-//   const title = frontMatter.title;
-//   if (title) {
-//     const titleTag = document.querySelector()
-//
-//   }
-// }
+// import { Template } from '../mixins/template';
+// import { Controller } from '../controller';
 
 const isOnlyWhitespace = /^\s*$/;
 
-export class Article extends T(HTMLElement) {
+export class Article extends HTMLElement {
+  static get is() { return 'd-article'; }
 
   constructor() {
     super();
@@ -24,9 +13,6 @@ export class Article extends T(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)) {
@@ -43,14 +29,4 @@ export class Article extends T(HTMLElement) {
     }).observe(this, {childList: true});
   }
 
-  connectedCallback() {
-    for (const [functionName, callback] of Object.entries(Controller.listeners)) {
-      if (typeof callback === 'function') {
-        document.addEventListener(functionName, callback);
-      } else {
-        console.error('Controller listeners need to be functions!');
-      }
-    }
-  }
-
 }

src/components/d-bibliography.js

@@ -1,90 +1,61 @@
-import { Template } from '../mixins/template';
 import { parseBibtex } from '../helpers/bibtex';
-import { bibliography_cite } from '../helpers/citation';
-
-export const templateString = `
-<style>
-  .references {
-    font-size: 12px;
-    line-height: 20px;
-  }
-  .title {
-    font-weight: 600;
-  }
-  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);
-  }
-</style>
-
-<h3>References</h3>
-<ol class='references' id='references-list' ></ol>
-`;
-const T = Template('d-bibliography', templateString);
 
 export function parseBibliography(element) {
-  if (element.firstElementChild && element.firstElementChild.tagName === 'SCRIPT') {
-    const bibtex = element.firstElementChild.textContent;
-    const bibliography = parseBibtex(bibtex);
-    return bibliography;
-  }
-}
-
-export function renderBibliography(element, entries) {
-  if (entries.size) {
-    element.host.style.display = 'initial';
-    let list = element.querySelector('#references-list');
-    list.innerHTML = '';
-
-    for (const [key, entry] of entries) {
-      const listItem = document.createElement('li');
-      listItem.id = key;
-      listItem.innerHTML = bibliography_cite(entry);
-      list.appendChild(listItem);
+  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 {
-    element.host.style.display = 'none';
+    console.warn('Bibliography did not have any script tag.');
   }
 }
 
-export class Bibliography extends T(HTMLElement) {
+export class Bibliography extends HTMLElement {
+
+  static get is() { return 'd-bibliography'; }
 
   constructor() {
     super();
 
     // set up mutation observer
     const options = {childList: true, characterData: true, subtree: true};
-    const observer = new MutationObserver( () => {
-      observer.disconnect();
-      this.parseIfPossible();
-      observer.observe(this, options);
+    const observer = new MutationObserver( (entries) => {
+      for (const entry of entries) {
+        if (entry.target.nodeName === 'SCRIPT' || entry.type === 'characterData') {
+          this.parseIfPossible();
+        }
+      }
     });
-    this.parseIfPossible();
-    // ...and listen for changes
     observer.observe(this, options);
   }
 
+  connectedCallback() {
+    requestAnimationFrame(() => {
+      this.parseIfPossible();
+    });
+  }
+
   parseIfPossible() {
-    if (this.firstElementChild && this.firstElementChild.tagName === 'SCRIPT') {
-      const newBibtex = this.firstElementChild.textContent;
+    const scriptTag = this.querySelector('script');
+    if (!scriptTag) return;
+    if (scriptTag.type == 'text/bibtex') {
+      const newBibtex = scriptTag.textContent;
       if (this.bibtex !== newBibtex) {
         this.bibtex = newBibtex;
         const bibliography = parseBibtex(this.bibtex);
         this.notify(bibliography);
       }
+    } else if (scriptTag.type == 'text/json') {
+      const bibliography = new Map(JSON.parse(scriptTag.textContent));
+      this.notify(bibliography);
+    } else {
+      console.warn('Unsupported bibliography script tag type: ' + scriptTag.type);
     }
   }
 
@@ -94,8 +65,25 @@ export class Bibliography extends T(HTMLElement) {
     this.dispatchEvent(event);
   }
 
-  set entries(newEntries) {
-    renderBibliography(this.root, newEntries);
+  /* observe 'src' attribute */
+
+  static get observedAttributes() {
+    return ['src'];
   }
 
+  receivedBibtex(event) {
+    const bibliography = parseBibtex(event.target.response);
+    this.notify(bibliography);
+  }
+
+  attributeChangedCallback(name, oldValue, newValue) {
+    var oReq = new XMLHttpRequest();
+    oReq.onload = (e) => this.receivedBibtex(e);
+    oReq.onerror = () => console.warn(`Could not load Bibtex! (tried ${newValue})`);
+    oReq.responseType = 'text';
+    oReq.open('GET', newValue, true);
+    oReq.send();
+  }
+
+
 }

src/components/d-byline.js

@@ -1,158 +1,46 @@
-import { Template } from '../mixins/template';
-import { page } from '../helpers/layout';
-
-const T = Template('d-byline', `
-<style>
-  :host {
-    box-sizing: border-box;
-    font-size: 13px;
-    line-height: 20px;
-    display: block;
-    border-top: 1px solid rgba(0, 0, 0, 0.1);
-    border-bottom: 1px solid rgba(0, 0, 0, 0.1);
-    color: rgba(0, 0, 0, 0.6);
-    padding-top: 20px;
-    padding-bottom: 20px;
-  }
-  ${page('.byline')}
-  d-article.centered {
-    text-align: center;
-  }
-  a,
-  d-article a {
-    color: rgba(0, 0, 0, 0.8);
-    text-decoration: none;
-    border-bottom: none;
-  }
-  d-article a:hover {
-    text-decoration: underline;
-    border-bottom: none;
-  }
-  .authors {
-    text-align: left;
-  }
-  .name {
-    font-weight: 600;
-    display: inline;
-    text-transform: uppercase;
-  }
-  .affiliation {
-    display: inline;
-  }
-  .date {
-    display: block;
-    text-align: left;
-    margin-top: 8px;
-  }
-  .year, .month {
-    display: inline;
-  }
-  .citation {
-    display: block;
-    text-align: left;
-  }
-  .citation div {
-    display: inline;
-  }
-
-  @media screen and (min-width: 768px), print {
-    d-byline {
-      border-bottom: none;
-    }
-
-    a:hover {
-      color: rgba(0, 0, 0, 0.9);
-    }
-
-    .authors {
-      display: inline-block;
-    }
-
-    .author {
-      display: inline-block;
-      margin-right: 12px;
-      /*padding-left: 20px;*/
-      /*border-left: 1px solid #ddd;*/
-    }
-
-    .affiliation {
-      display: block;
-    }
-
-    .author:last-child {
-      margin-right: 0;
-    }
-
-    .name {
-      display: block;
-    }
-
-    .date {
-
-      border-left: 1px solid rgba(0, 0, 0, 0.1);
-      padding-left: 15px;
-      margin-left: 15px;
-      margin-top: 0;
-      display: inline-block;
-    }
-    .year, .month {
-      display: block;
-    }
-
-    .citation {
-      align-self: flex-end;
-      border-left: 1px solid rgba(0, 0, 0, 0.15);
-      padding-left: 15px;
-      margin-left: 15px;
-      display: inline-block;
-    }
-    .citation div {
-      display: block;
-    }
-
-    .byline {
-      display: flex;
-      min-height: 40px;
-    }
-  }
-</style>
-
-<div class='byline'>
-</div>
-`, true);
+// import style from '../styles/d-byline.css';
 
 export function bylineTemplate(frontMatter) {
   return `
-  <div class="authors">
-    ${frontMatter.authors.map( author => `<div class="author">
-      ${author.personalURL ?
-    `<a class="name" href="${author.personalURL}">${author.name}</a>`
-    :
-    `<div class="name">${author.name}</div>`
-}
-      ${author.affiliationURL ?
-    `<a class="affiliation" href="${author.affiliationURL}">${author.affiliation}</a>`
-    :
-    `<div class="affiliation">${author.affiliation}</div>`
-}
-    </div>`).join('\n')}
+  <div class="byline grid">
+    <div class="authors-affiliations grid">
+      <h3>Authors</h3>
+      <h3>Affiliations</h3>
+      ${frontMatter.authors.map(author => `
+        <p class="author">
+          ${author.personalURL ? `
+            <a class="name" href="${author.personalURL}">${author.name}</a>` : `
+            <div class="name">${author.name}</div>`}
+        </p>
+        <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>
+      ${frontMatter.publishedDate ? `
+        <p>${frontMatter.publishedMonth} ${frontMatter.publishedDay}, ${frontMatter.publishedYear}</p> ` : `
+        <p><em>Not published yet.</em></p>`}
+    </div>
+    <div>
+      <h3>DOI</h3>
+      ${frontMatter.doi ? `
+        <p><a href="https://doi.org/${frontMatter.doi}">${frontMatter.doi}</a></p>` : `
+        <p><em>No DOI yet.</em></p>`}
+    </div>
   </div>
-  <div class="date">
-    <div class="month">${frontMatter.publishedMonth}. ${frontMatter.publishedDay}</div>
-    <div class="year">${frontMatter.publishedYear}</div>
-  </div>
-  <a class="citation" href="#citation">
-    <div>Citation:</div>
-    <div>${frontMatter.concatenatedAuthors}, ${frontMatter.publishedYear}</div>
-  </a>
-  `;
+`;
 }
 
-export class Byline extends T(HTMLElement) {
+export class Byline extends HTMLElement {
+
+  static get is() { return 'd-byline'; }
 
   set frontMatter(frontMatter) {
-    const container = this.root.querySelector('.byline');
-    container.innerHTML = bylineTemplate(frontMatter);
+    this.innerHTML = bylineTemplate(frontMatter);
   }
 
 }

src/components/d-citation-list.js

@@ -0,0 +1,64 @@
+import { bibliography_cite } from '../helpers/citation';
+
+const styles = `
+d-citation-list {
+  contain: layout style;
+}
+
+d-citation-list .references {
+  grid-column: text;
+}
+
+d-citation-list .references .title {
+  font-weight: 500;
+}
+`;
+
+export function renderCitationList(element, entries, dom=document) {
+  if (entries.size > 0) {
+    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 = dom.createElement('li');
+      listItem.id = key;
+      listItem.innerHTML = bibliography_cite(entry);
+      list.appendChild(listItem);
+    }
+  } else {
+    element.style.display = 'none';
+  }
+}
+
+export class CitationList extends HTMLElement {
+
+  static get is() { return 'd-citation-list'; }
+
+  connectedCallback() {
+    if (!this.hasAttribute('distill-prerendered')) {
+      this.style.display = 'none';
+    }
+  }
+
+  set citations(citations) {
+    renderCitationList(this, citations);
+  }
+
+}

src/components/d-cite.js

@@ -1,96 +1,86 @@
 import { Template } from '../mixins/template';
-import { hover_cite } from '../helpers/citation';
-import { HoverBox } from '../helpers/hover-box';
+import { hover_cite, bibliography_cite } from '../helpers/citation';
 
 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;
+}
+
+d-hover-box {
+  margin-top: 1.9em;
+}
+
+ul {
+  margin: 0;
+  padding: 0;
+  list-style-type: none;
+}
+
+ul li {
+  padding: 15px 10px 15px 10px;
+  border-bottom: 1px solid rgba(0,0,0,0.1)
+}
+
+ul li:last-of-type {
+  border-bottom: none;
+}
+
 </style>
 
-<div id="hover-box" class="dt-hover-box">
-</div>
+<d-hover-box id="hover-box"></d-hover-box>
 
-<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 */
 
-  // constructor() {
-  //   super();
-  //   // Cite.currentId += 1;
-  //   // this.citeId = Cite.currentId;
-  // }
-
   connectedCallback() {
-    // this.notify();
-
-    this.hoverDiv = this.root.querySelector('.dt-hover-box');
     this.outerSpan = this.root.querySelector('#citation-');
     this.innerSpan = this.root.querySelector('.citation-number');
-    // this.outerSpan.id = `citation-${this.citeId}`;
-    // this.hoverDiv.id = `dt-cite-hover-box-${this.citeId}`;
-    // console.log(this, this.hoverDiv, this.outerSpan, this.innerSpan);
-    this.hoverbox = new HoverBox(this.hoverDiv, this.outerSpan);
-
+    this.hoverBox = this.root.querySelector('d-hover-box');
+    window.customElements.whenDefined('d-hover-box').then(() => {
+      this.hoverBox.listen(this);
+    });
   }
 
-  disconnectedCallback() {
-    const options = { detail: [this, this.keys], bubbles: true };
-    const event = new CustomEvent('onCiteKeyRemoved', options);
-    document.dispatchEvent(event);
-  }
-
-  /* Observed Attributes */
-
-  // renderCitationNumbers(citations) {
-  //   const numbers = this._keys.map( (key) => {
-  //     const index = citations.indexOf(key);
-  //     return index == -1 ? '?' : index + 1 + '';
-  //   });
-  //   const text = "[" + numbers.join(", ") + "]";
-  //   this.innerSpan.textContent = text;
+  //TODO This causes an infinite loop on firefox with polyfills.
+  // This is only needed for interactive editing so no priority.
+  // disconnectedCallback() {
+    // const options = { detail: [this, this.keys], bubbles: true };
+    // const event = new CustomEvent('onCiteKeyRemoved', options);
+    // document.dispatchEvent(event);
   // }
 
-
-
   /* observe 'key' attribute */
 
   static get observedAttributes() {
@@ -124,40 +114,17 @@ export class Cite extends T(HTMLElement) {
       return index == -1 ? '?' : index + 1 + '';
     });
     const textContent = '[' + numberStrings.join(', ') + ']';
-    const innerSpan = this.root.querySelector('.citation-number');
-    innerSpan.textContent = textContent;
+    if (this.innerSpan) {
+      this.innerSpan.textContent = textContent;
+    }
   }
 
   set entries(entries) {
-    const div = this.root.querySelector('#hover-box');
-    div.innerHTML = entries.map(hover_cite).join('<br><br>');
+    if (this.hoverBox) {
+      this.hoverBox.innerHTML = `<ul>
+      ${entries.map(hover_cite).map(html => `<li>${html}</li>`).join('\n')}
+      </ul>`;
+    }
   }
 
-  // renderContent() {
-  //   const bibliography = document.querySelector('d-bibliography');
-  //   if (bibliography && bibliography.finishedLoading) {
-  //     customElements.whenDefined('d-bibliography').then( () => {
-  //       const keys = this.key.split(",");
-  //
-  //       // set up hidden hover box
-  //       const div = this.root.querySelector('.dt-hover-box');
-  //       div.innerHTML = keys.map( (key) => {
-  //         return bibliography.getEntry(key);
-  //       }).map(hover_cite).join('<br><br>');
-  //       div.id ='dt-cite-hover-box-' + this.citeId;
-  //
-  //       // set up visible citation marker
-  //       const outerSpan = this.root.querySelector('#citation-');
-  //       outerSpan.id = `citation-${this.citeId}`;
-  //       // outerSpan.setAttribute('data-hover', dataHoverString); // directly tell HoverBox instead?
-  //       const innerSpan = this.root.querySelector('.citation-number');
-  //       innerSpan.textContent = inline_cite_short(keys, bibliography);
-  //
-  //       HoverBox.get_box(div).bind(outerSpan);
-  //     });
-  //   } else {
-  //     console.error(`You used a d-cite tag (${key}) without including a d-bibliography tag in your article. We can't lookup your citation this way.`)
-  //   }
-  // }
-
 }

src/components/d-code.js

@@ -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';
@@ -20,9 +27,8 @@ code {
 
 pre code {
   display: block;
-  background: white;
-  border-left: 3px solid rgba(0, 0, 0, 0.05);
-  padding: 0 0 0 24px;
+  border-left: 2px solid rgba(0, 0, 0, .1);
+  padding: 0 0 0 36px;
 }
 
 ${css}
@@ -44,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;
     }
 

src/components/d-figure.js

@@ -17,14 +17,45 @@ export class Figure extends HTMLElement {
 
   static get is() { return 'd-figure'; }
 
+  static get readyQueue() {
+    if (!Figure._readyQueue) {
+      Figure._readyQueue = [];
+    }
+    return Figure._readyQueue;
+  }
+
+  static addToReadyQueue(figure) {
+    if (Figure.readyQueue.indexOf(figure) === -1) {
+      Figure.readyQueue.push(figure);
+      Figure.runReadyQueue();
+    }
+  }
+
+  static runReadyQueue() {
+    // console.log("Checking to run readyQueue, length: " + Figure.readyQueue.length + ", scrolling: " + Figure.isScrolling);
+    // if (Figure.isScrolling) return;
+    // console.log("Running ready Queue");
+    const figure = Figure.readyQueue
+      .sort((a,b) => a._seenOnScreen - b._seenOnScreen )
+      .filter((figure) => !figure._ready)
+      .pop();
+    if (figure) {
+      figure.ready();
+      requestAnimationFrame(Figure.runReadyQueue);
+    }
+
+  }
+
   constructor() {
     super();
+    // debugger
     this._ready = false;
     this._onscreen = false;
     this._offscreen = true;
   }
 
   connectedCallback() {
+    this.loadsWhileScrolling = this.hasAttribute('loadsWhileScrolling');
     Figure.marginObserver.observe(this);
     Figure.directObserver.observe(this);
   }
@@ -40,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;
   }
@@ -54,7 +88,7 @@ export class Figure extends HTMLElement {
     for (const entry of entries) {
       const figure = entry.target;
       if (entry.isIntersecting && !figure._ready) {
-        figure.ready();
+        Figure.addToReadyQueue(figure);
       }
     }
   }
@@ -74,7 +108,8 @@ export class Figure extends HTMLElement {
     for (const entry of entries) {
       const figure = entry.target;
       if (entry.isIntersecting) {
-        if (!figure._ready) { figure.ready(); }
+        figure._seenOnScreen = new Date();
+        // if (!figure._ready) { figure.ready(); }
         if (figure._offscreen) { figure.onscreen(); }
       } else {
         if (figure._onscreen) { figure.offscreen(); }
@@ -87,19 +122,22 @@ export class Figure extends HTMLElement {
   addEventListener(eventName, callback) {
     super.addEventListener(eventName, callback);
     // if we had already dispatched something while presumingly no one was listening, we do so again
-    setTimeout(() => {
-      if (this._ready && eventName === 'ready') {
-        this.ready();
+    // debugger
+    if (eventName === 'ready') {
+      if (Figure.readyQueue.indexOf(this) !== -1) {
+        this._ready = false;
+        Figure.runReadyQueue();
       }
-      if (this._onscreen && eventName === 'onscreen') {
-        this.onscreen();
-      }
-    }, 1);
+    }
+    if (eventName === 'onscreen') {
+      this.onscreen();
+    }
   }
 
   // Custom Events
 
   ready() {
+    // debugger
     this._ready = true;
     Figure.marginObserver.unobserve(this);
     const event = new CustomEvent('ready');
@@ -121,3 +159,19 @@ export class Figure extends HTMLElement {
   }
 
 }
+
+if (typeof window !== 'undefined') {
+
+  Figure.isScrolling = false;
+  let timeout;
+  const resetTimer = () => {
+    Figure.isScrolling = true;
+    clearTimeout(timeout);
+    timeout = setTimeout(() => {
+      Figure.isScrolling = false;
+      Figure.runReadyQueue();
+    }, 500);
+  };
+  window.addEventListener('scroll', resetTimer, true);
+
+}

src/components/d-footnote-list.js

@@ -2,42 +2,34 @@ import { Template } from '../mixins/template';
 
 const T = Template('d-footnote-list', `
 <style>
-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);
+
+d-footnote-list {
+  contain: layout style;
 }
 
-a.footnote-backlink {
+d-footnote-list > * {
+  grid-column: text;
+}
+
+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);
@@ -49,7 +41,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
@@ -67,7 +59,7 @@ export class FootnoteList extends T(HTMLElement) {
       }
     } else {
       // ensure footnote list is invisible
-      this.shadowRoot.host.style.display = 'none';
+      this.root.style.display = 'none';
     }
   }
 

src/components/d-footnote.js

@@ -1,6 +1,4 @@
 import { Template } from '../mixins/template.js';
-import { HoverBox } from '../helpers/hover-box';
-// import { Store } from './store';
 
 const T = Template('d-footnote', `
 <style>
@@ -9,13 +7,51 @@ d-math[block] {
   display: block;
 }
 
+:host {
+}
+
+sup {
+  line-height: 1em;
+  font-size: 0.75em;
+  position: relative;
+  top: -.5em;
+  vertical-align: baseline;
+}
+
+span {
+  color: hsla(206, 90%, 20%, 0.7);
+  cursor: default;
+}
+
+.container {
+  position: absolute;
+  width: 100%;
+  left: 0;
+  z-index: 10000;
+}
+
+.dt-hover-box {
+  margin: 0 auto;
+  width: 704px;
+  max-width: 100vw;
+  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);
+  box-sizing: border-box;
+}
+
 </style>
 
-<div id="hover-box" class="dt-hover-box">
+<d-hover-box>
   <slot id="slot"></slot>
-</div>
+</d-hover-box>
 
-<sup><span id="fn-" data-hover-ref="" style="cursor:pointer"></span></sup>
+<sup>
+  <span id="fn-" data-hover-ref=""></span>
+</sup>
 
 `);
 
@@ -38,24 +74,26 @@ 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);
-
+    this.hoverBox = this.root.querySelector('d-hover-box');
+    window.customElements.whenDefined('d-hover-box').then(() => {
+      this.hoverBox.listen(this);
+    });
     // create numeric ID
     Footnote.currentFootnoteId += 1;
     const IdString = Footnote.currentFootnoteId.toString();
     this.root.host.id = 'd-footnote-' + IdString;
 
     // set up hidden hover box
-    const div = this.root.querySelector('.dt-hover-box');
-    div.id = 'dt-fn-hover-box-' + IdString;
+    const id = 'dt-fn-hover-box-' + IdString;
+    this.hoverBox.id = id
 
     // set up visible footnote marker
     const span = this.root.querySelector('#fn-');
     span.setAttribute('id', 'fn-' + IdString);
-    span.setAttribute('data-hover-ref', div.id);
+    span.setAttribute('data-hover-ref', id);
     span.textContent = IdString;
-
-    this.hoverbox = new HoverBox(div, span);
   }
 
 }

src/components/d-front-matter.js

@@ -1,15 +1,17 @@
-import ymlParse from 'js-yaml';
-
 export function parseFrontmatter(element) {
   const scriptTag = element.querySelector('script');
   if (scriptTag) {
-    const yml = scriptTag.textContent;
-    const data = ymlParse.safeLoad(yml);
-    return data;
+    const type = scriptTag.getAttribute('type');
+    if (type.split('/')[1] == 'json') {
+      const content = scriptTag.textContent;
+      return JSON.parse(content);
+    } else {
+      console.error('Distill only supports JSON frontmatter tags anymore; no more YAML.');
+    }
   } else {
     console.error('You added a frontmatter tag but did not provide a script tag with front matter data in it. Please take a look at our templates.');
-    return {};
   }
+  return {};
 }
 
 export class FrontMatter extends HTMLElement {
@@ -19,10 +21,10 @@ export class FrontMatter extends HTMLElement {
   constructor() {
     super();
 
-    const options = {childList: true};
+    const options = {childList: true, characterData: true, subtree: true};
     const observer = new MutationObserver( (entries) => {
       for (const entry of entries) {
-        if (entry.target.nodeName === 'SCRIPT') {
+        if (entry.target.nodeName === 'SCRIPT' || entry.type === 'characterData') {
           const data = parseFrontmatter(this);
           this.notify(data);
         }

src/components/d-hover-box.js

@@ -0,0 +1,132 @@
+import { Template } from '../mixins/template.js';
+
+const T = Template('d-hover-box', `
+<style>
+
+:host {
+  position: absolute;
+  width: 100%;
+  left: 0;
+  z-index: 10000;
+  display: none;
+}
+
+.container {
+  position: relative;
+  width: 704px;
+  max-width: 100vw;
+  margin: 0 auto;
+}
+
+.panel {
+  position: absolute;
+  font-size: 1rem;
+  line-height: 1.5em;
+  top: 0;
+  left: 0;
+  width: 100%;
+  border: 1px solid rgba(0, 0, 0, 0.1);
+  background-color: rgb(250, 250, 250);
+  box-shadow: 0 0 7px rgba(0, 0, 0, 0.1);
+  border-radius: 4px;
+  box-sizing: border-box;
+}
+
+</style>
+
+<div class="container">
+  <div class="panel">
+    <slot></slot>
+  </div>
+</div>
+`);
+
+export class HoverBox extends T(HTMLElement) {
+
+  constructor() {
+    super();
+  }
+
+  connectedCallback() {
+
+  }
+
+  listen(element) {
+    // console.log(element)
+    this.bindDivEvents(this);
+    this.bindTriggerEvents(element);
+    // this.style.display = "block";
+  }
+
+  bindDivEvents(element) {
+    // For mice, same behavior as hovering on links
+    element.addEventListener('mouseover', () => {
+      if (!this.visible) this.showAtNode(element);
+      this.stopTimeout();
+    });
+    element.addEventListener('mouseout', () => {
+      this.extendTimeout(500);
+    });
+    // Don't trigger body touchstart event when touching within box
+    element.addEventListener('touchstart', (event) => {
+      event.stopPropagation();
+    }, {passive: true});
+    // Close box when touching outside box
+    document.body.addEventListener('touchstart', () => {
+      this.hide();
+    }, {passive: true});
+  }
+
+  bindTriggerEvents(node) {
+    node.addEventListener('mouseover', () => {
+      if (!this.visible) {
+        this.showAtNode(node);
+      }
+      this.stopTimeout();
+    });
+
+    node.addEventListener('mouseout', () => {
+      this.extendTimeout(300);
+    });
+
+    node.addEventListener('touchstart', (event) => {
+      if (this.visible) {
+        this.hide();
+      } else {
+        this.showAtNode(node);
+      }
+      // Don't trigger body touchstart event when touching link
+      event.stopPropagation();
+    }, {passive: true});
+  }
+
+  show(position) {
+    this.visible = true;
+    this.style.display = 'block';
+  }
+
+  showAtNode(node) {
+    const bbox = node.getBoundingClientRect();
+    this.show([bbox.right, bbox.bottom]);
+  }
+
+  hide() {
+    this.visible = false;
+    this.style.display = 'none';
+    this.stopTimeout();
+  }
+
+  stopTimeout() {
+    if (this.timeout) {
+      clearTimeout(this.timeout);
+    }
+  }
+
+  extendTimeout(time) {
+    this.stopTimeout();
+    this.timeout = setTimeout(() => {
+      this.hide();
+    }, time);
+  }
+
+}

src/components/d-interstitial.js

@@ -0,0 +1,134 @@
+import { Template } from '../mixins/template';
+
+// This overlay is not secure.
+// It is only meant as a social deterrent.
+
+const T = Template('d-interstitial', `
+<style>
+
+.overlay {
+  position: fixed;
+  width: 100%;
+  height: 100%;
+  top: 0;
+  left: 0;
+  background: white;
+
+  opacity: 1;
+  visibility: visible;
+
+  display: flex;
+  flex-flow: column;
+  justify-content: center;
+  z-index: 2147483647 /* MaxInt32 */
+
+}
+
+.container {
+  position: relative;
+  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"] {
+  -webkit-appearance: none;
+  -moz-appearance: none;
+  appearance: none;
+  -webkit-box-shadow: none;
+  -moz-box-shadow: none;
+  box-shadow: none;
+  -webkit-border-radius: none;
+  -moz-border-radius: none;
+  -ms-border-radius: none;
+  -o-border-radius: none;
+  border-radius: none;
+  outline: none;
+
+  font-size: 18px;
+  background: none;
+  width: 25%;
+  padding: 10px;
+  border: none;
+  border-bottom: solid 2px #999;
+  transition: border .3s;
+}
+
+input[type="password"]:focus {
+  border-bottom: solid 2px #333;
+}
+
+input[type="password"].wrong {
+  border-bottom: solid 2px hsl(0,100%,40%);
+}
+
+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>
+    <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>
+</div>
+`);
+
+export class Interstitial extends T(HTMLElement) {
+
+  connectedCallback() {
+    const passwordInput = this.root.querySelector('#interstitial-password-input');
+    passwordInput.oninput = (event) => this.passwordChanged(event);
+    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.');
+      this.parentElement.removeChild(this);
+      if (typeof(Storage) !== 'undefined') {
+        console.log('Saved that correct password was entered.');
+        localStorage.setItem('distill-interstitial-password-correct', 'true');
+      }
+    }
+  }
+
+}

src/components/d-math.js

@@ -2,59 +2,103 @@
 import { Mutating } from '../mixins/mutating.js';
 import { Template } from '../mixins/template.js';
 
-const katexJSURL = 'https://distill.pub/third-party/katex/katex.min.js';
-const katexCSSTag = '<link rel="stylesheet" href="https://distill.pub/third-party/katex/katex.min.css" crossorigin="anonymous">';
+import style from '../styles/d-math.css';
+
+// attaches renderMathInElement to window
+import { renderMathInElement } from '../helpers/katex-auto-render';
+
+export const katexJSURL = 'https://distill.pub/third-party/katex/katex.min.js';
+export const katexCSSTag = '<link rel="stylesheet" href="https://distill.pub/third-party/katex/katex.min.css" crossorigin="anonymous">';
 
 const T = Template('d-math', `
+${katexCSSTag}
 <style>
 
-d-math[block] {
+:host {
+  display: inline-block;
+  contain: content;
+}
+
+:host([block]) {
   display: block;
 }
 
+${style}
 </style>
-
-${katexCSSTag}
-
-<span id="katex-container"></span>
+<span id='katex-container'></span>
 `);
 
-
-// DMath, not Math, because that's a JS built-in
+// DMath, not Math, because that would conflict with the JS built-in
 export class DMath extends Mutating(T(HTMLElement)) {
 
+  static set katexOptions(options) {
+    DMath._katexOptions = options;
+    if (DMath.katexOptions.delimiters) {
+      if (!DMath.katexAdded) {
+        DMath.addKatex();
+      } else {
+        DMath.katexLoadedCallback();
+      }
+    }
+  }
+
+  static get katexOptions() {
+    if (!DMath._katexOptions) {
+      DMath._katexOptions = {
+        delimiters: [ { 'left':'$$', 'right':'$$', 'display': false } ]
+      };
+    }
+    return DMath._katexOptions;
+  }
+
   static katexLoadedCallback() {
+    // render all d-math tags
     const mathTags = document.querySelectorAll('d-math');
     for (const mathTag of mathTags) {
       mathTag.renderContent();
     }
+    // transform inline delimited math to d-math tags
+    if (DMath.katexOptions.delimiters) {
+      const article = document.querySelector('d-article');
+      renderMathInElement(article, DMath.katexOptions);
+    }
+  }
+
+  static addKatex() {
+    // css tag can use this convenience function
+    document.head.insertAdjacentHTML('beforeend', katexCSSTag);
+    // script tag has to be created to work properly
+    const scriptTag = document.createElement('script');
+    scriptTag.src = katexJSURL;
+    scriptTag.async = true;
+    scriptTag.onload = DMath.katexLoadedCallback;
+    scriptTag.crossorigin = 'anonymous';
+    document.head.appendChild(scriptTag);
+
+    DMath.katexAdded = true;
+  }
+
+  get options() {
+    const localOptions = { displayMode: this.hasAttribute('block') };
+    return Object.assign(localOptions, DMath.katexOptions);
   }
 
   connectedCallback() {
+    super.connectedCallback();
     if (!DMath.katexAdded) {
-      // script tag has to be created to work properly
-      const scriptTag = document.createElement('script');
-      scriptTag.src = katexJSURL;
-      scriptTag.async = true;
-      scriptTag.onload = DMath.katexLoadedCallback;
-      scriptTag.crossorigin = 'anonymous';
-      document.head.appendChild(scriptTag);
-      // css tag can use this convenience function
-      document.head.insertAdjacentHTML('beforeend', katexCSSTag);
-
-      DMath.katexAdded = true;
+      DMath.addKatex();
     }
   }
 
   renderContent() {
     if (typeof katex !== 'undefined') {
-      const options = { displayMode: this.hasAttribute('block') };
       const container = this.root.querySelector('#katex-container');
-      katex.render(this.textContent, container, options);
+      katex.render(this.textContent, container, this.options);
     }
   }
 
 }
 
 DMath.katexAdded = false;
+DMath.inlineMathRendered = false;
 window.DMath = DMath; // TODO: check if this can be removed, or if we should expose a distill global

src/components/d-title.js

@@ -1,62 +1,3 @@
-import { Template } from '../mixins/template';
-import { page } from '../helpers/layout';
-
-const T = Template('d-title', `
-<style>
-
-:host {
-  box-sizing: border-box;
-  display: block;
-  width: 100%;
-  margin-bottom: 64px;
-}
-
-
-::slotted(h1) {
-  padding-top: 16px;
-  padding-bottom: 16px;
-  margin: 0;
-  line-height: 1.3;
-  font-size: 32px;
-  font-weight: 700;
-}
-
-::slotted(h2) {
-  border-bottom: none !important;
-}
-
-@media screen and (min-width: 768px), print {
-  ::slotted(h1) {
-    font-size: 42px;
-    padding-bottom: 32px;
-  }
-}
-@media(min-width: 1024px) {
-  ::slotted(h1) {
-    padding-top: 64px;
-    padding-bottom: 32px;
-    font-size: 48px;
-  }
-}
-@media(min-width: 1280px) {
-  ::slotted(h1) {
-    padding-top: 96px;
-    padding-bottom: 32px;
-    font-size: 56px;
-  }
-}
-
-d-byline {
-  border-top: 1px solid rgba(0, 0, 0, 0.1);
-}
-
-${page('::slotted(h1), ::slotted(h2)')}
-
-</style>
-
-<slot></slot>
-`);
-
-export class Title extends T(HTMLElement) {
-
+export class Title extends HTMLElement {
+  static get is() { return 'd-title'; }
 }

src/components/d-toc.js

@@ -1,13 +1,66 @@
-import {Template} from '../mixins/template';
+export class TOC extends HTMLElement {
 
-const T = Template('d-toc', `
-<style>
-d-toc {
-  display: block;
-}
-</style>
-`, false);
+  static get is() { return 'd-toc'; }
 
-export class TOC extends T(HTMLElement) {
+  connectedCallback() {
+    if (!this.getAttribute('prerendered')) {
+      window.onload = () => {
+        const article = document.querySelector('d-article');
+        const headings = article.querySelectorAll('h2, h3');
+        renderTOC(this, headings);
+      };
+    }
+  }
 
 }
+
+export function renderTOC(element, headings) {
+
+  let ToC =`
+  <style>
+
+  d-toc {
+    contain: layout style;
+    display: block;
+  }
+
+  d-toc ul {
+    padding-left: 0;
+  }
+
+  d-toc ul > ul {
+    padding-left: 24px;
+  }
+
+  d-toc a {
+    border-bottom: none;
+    text-decoration: none;
+  }
+
+  </style>
+  <nav role="navigation" class="table-of-contents"></nav>
+  <h2>Table of contents</h2>
+  <ul>`;
+
+  for (const el of headings) {
+    // should element be included in TOC?
+    const isInTitle = el.parentElement.tagName == 'D-TITLE';
+    const isException = el.getAttribute('no-toc');
+    if (isInTitle || isException) continue;
+    // create TOC entry
+    const title = el.textContent;
+    const link = '#' + el.getAttribute('id');
+
+    let newLine = '<li>' + '<a href="' + link + '">' + title + '</a>' + '</li>';
+    if (el.tagName == 'H3') {
+      newLine = '<ul>' + newLine + '</ul>';
+    } else {
+      newLine += '<br>';
+    }
+    ToC += newLine;
+
+  }
+
+  ToC += '</ul></nav>';
+  element.innerHTML = ToC;
+}

src/controller.js

@@ -1,9 +1,15 @@
-import { FrontMatter } from './front-matter';
-import { collectCitations } from './components/d-cite';
+import { FrontMatter, mergeFromYMLFrontmatter } from './front-matter';
+import { DMath } from './components/d-math';
+import { collect_citations } from './helpers/citation.js';
 import { parseFrontmatter } from './components/d-front-matter';
+import optionalComponents from './transforms/optional-components';
 
 const frontMatter = new FrontMatter();
 
+function domContentLoaded() {
+  return ['interactive', 'complete'].indexOf(document.readyState) !== -1;
+}
+
 export const Controller = {
 
   frontMatter: frontMatter,
@@ -36,22 +42,22 @@ export const Controller = {
       citeTag.entries = entries;
     },
 
-    onCiteKeyChanged(event) {
+    onCiteKeyChanged() {
       // 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();
       }
 
       // update bibliography
-      const bibliographyTag = document.querySelector('d-bibliography');
+      const citationListTag = document.querySelector('d-citation-list');
       const bibliographyEntries = new Map(frontMatter.citations.map( citationKey => {
         return [citationKey, frontMatter.bibliography.get(citationKey)];
       }));
-      bibliographyTag.entries = bibliographyEntries;
+      citationListTag.citations = bibliographyEntries;
 
       const citeTags = document.querySelectorAll('d-cite');
       for (const citeTag of citeTags) {
@@ -69,7 +75,8 @@ export const Controller = {
     },
 
     onBibliographyChanged(event) {
-      const bibliographyTag = event.target;
+      const citationListTag = document.querySelector('d-citation-list');
+
       const bibliography = event.detail;
 
       frontMatter.bibliography = bibliography;
@@ -86,11 +93,15 @@ export const Controller = {
         return;
       }
 
-      const entries = new Map(frontMatter.citations.map( citationKey => {
-        return [citationKey, frontMatter.bibliography.get(citationKey)];
-      }));
 
-      bibliographyTag.entries = 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() {
@@ -105,33 +116,63 @@ export const Controller = {
 
     onFrontMatterChanged(event) {
       const data = event.detail;
-      frontMatter.mergeFromYMLFrontmatter(data);
+      mergeFromYMLFrontmatter(frontMatter, data);
 
-      const appendix = document.querySelector('distill-appendix');
-      if (appendix) {
-        appendix.frontMatter = frontMatter;
+      const interstitial = document.querySelector('d-interstitial');
+      if (interstitial) {
+        interstitial.password = frontMatter.password;
       }
 
-      const byline = document.querySelector('d-byline');
-      if (byline) {
-        byline.frontMatter = frontMatter;
+      const prerendered = document.body.hasAttribute('distill-prerendered');
+      if (!prerendered && domContentLoaded()) {
+        optionalComponents(document, frontMatter);
+
+        const appendix = document.querySelector('distill-appendix');
+        if (appendix) {
+          appendix.frontMatter = frontMatter;
+        }
+
+        const byline = document.querySelector('d-byline');
+        if (byline) {
+          byline.frontMatter = frontMatter;
+        }
+
+        if (data.katex) {
+          DMath.katexOptions = data.katex;
+        }
       }
+
     },
 
     DOMContentLoaded() {
-      // console.debug('DOMContentLoaded.');
+      if (Controller.loaded) {
+        console.warn('Controller received DOMContentLoaded but was already loaded!');
+        return;
+      } else if (!domContentLoaded()) {
+        console.warn('Controller received DOMContentLoaded before appropriate document.readyState!');
+        return;
+      } else {
+        Controller.loaded = true;
+        console.log('Runlevel 4: 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();
+      // Resolving "citations" dependency due to initial DOM load
+      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');

src/distill-components/distill-appendix.js

@@ -2,21 +2,10 @@ import { serializeFrontmatterToBibtex } from '../helpers/bibtex';
 
 const styles = `
 <style>
-  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 {
+    contain: layout style;
   }
+
   distill-appendix .citation {
     font-size: 11px;
     line-height: 15px;
@@ -32,25 +21,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 {

src/distill-components/distill-footer.js

@@ -5,13 +5,13 @@ 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: 2rem 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;
 }
 
 .logo svg {
@@ -36,16 +36,42 @@ const T = Template('distill-footer', `
 }
 
 .container {
-  grid-column: margin-left / body;
+  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) {

src/distill-components/distill-header.js

@@ -4,23 +4,22 @@ import logo from '../assets/distill-logo.svg';
 
 const T = Template('distill-header', `
 <style>
-:host {
-  box-sizing: border-box;
-  display: block;
-  top: 0;
-  left: 0;
-  width: 100%;
+distill-header {
+  position: relative;
   height: 60px;
-  background-color: transparent;
-  z-index: ${1e6};
+  background-color: hsl(200, 60%, 15%);
+  width: 100%;
+  box-sizing: border-box;
+  z-index: 2;
   color: rgba(0, 0, 0, 0.8);
-  /*border-bottom: 1px solid rgba(0, 0, 0, 0.08);*/
-  /*box-shadow: 0 1px 6px rgba(0, 0, 0, 0.05);*/
+  border-bottom: 1px solid rgba(0, 0, 0, 0.08);
+  box-shadow: 0 1px 6px rgba(0, 0, 0, 0.05);
 }
-.content {
+distill-header .content {
   height: 70px;
+  grid-column: page;
 }
-a {
+distill-header a {
   font-size: 16px;
   height: 60px;
   line-height: 60px;
@@ -28,82 +27,59 @@ a {
   color: rgba(255, 255, 255, 0.8);
   padding: 22px 0;
 }
-a:hover {
+distill-header a:hover {
   color: rgba(255, 255, 255, 1);
 }
-svg {
-  background-color: hsl(0, 0%, 15%);;
-  padding: 8px;
-  border-radius: 12px;
+distill-header svg {
   width: 24px;
   position: relative;
-  top: 16px;
-  left: 16px;
+  top: 4px;
   margin-right: 2px;
 }
-@media(min-width: 768px) {
-  svg {
-    top: 40px;
-    left: 40px;
-  }
-}
-
 @media(min-width: 1080px) {
-  :host {
+  distill-header {
     height: 70px;
   }
-  a {
+  distill-header a {
     height: 70px;
     line-height: 70px;
     padding: 28px 0;
   }
-  .logo {
+  distill-header .logo {
   }
 }
-svg path {
-  fill: white;
-  stroke: rgba(255, 255, 255, 1.0);
+distill-header svg path {
+  fill: none;
+  stroke: rgba(255, 255, 255, 0.8);
   stroke-width: 3px;
 }
-.logo {
+distill-header .logo {
   font-size: 17px;
   font-weight: 200;
 }
-.nav {
+distill-header .nav {
   float: right;
   font-weight: 300;
 }
-.nav a {
+distill-header .nav a {
   font-size: 12px;
   margin-left: 24px;
   text-transform: uppercase;
 }
-
-.name {
-  opacity: 0.0;
-  transition: opacity 0.5s
-}
-
-a:hover .name {
-  opacity: 1.0;
-}
 </style>
-
-<div class="content l-page">
+<div class="content">
   <a href="/" class="logo">
     ${logo}
-  </a>
-  <span class='name'>
     Distill
-  </span>
+  </a>
+  <nav class="nav">
+    <a href="/about/">About</a>
+    <a href="/prize/">Prize</a>
+    <a href="/journal/">Submit</a>
+  </nav>
 </div>
-`);
+`, false);
 
-// <div class="nav">
-//   <a href="/faq">About</a>
-//   <a href="https://github.com/distillpub">GitHub</a>
-//   <!-- https://twitter.com/distillpub -->
-// </div>
 
 export class DistillHeader extends T(HTMLElement) {
 

src/distill-transforms/distill-appendix.js

@@ -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);
   }
 
 }

src/extractors/bibliography.js

@@ -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);
 }

src/extractors/citations.js

@@ -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);
 }

src/extractors/front-matter.js

@@ -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);
-  Object.assign(data, extractedData);
+  mergeFromYMLFrontmatter(data, extractedData);
 }

src/front-matter.js

@@ -1,53 +1,108 @@
-import {timeFormat} from 'd3-time-format';
-
+const days = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'];
+const months = ['Jan.', 'Feb.', 'March', 'April', 'May', 'June', 'July', 'Aug.', 'Sept.', 'Oct.', 'Nov.', 'Dec.'];
 const zeroPad = n => n < 10 ? '0' + n : n;
-const RFC = timeFormat('%a, %d %b %Y %H:%M:%S %Z');
-const months = ['Jan', 'Feb', 'March', 'April', 'May', 'June', 'July', 'Aug', 'Sept', 'Oct', 'Nov', 'Dec'];
+
+const RFC = function(date) {
+  const day = days[date.getDay()].substring(0, 3);
+  const paddedDate = zeroPad(date.getDate());
+  const month = months[date.getMonth()].substring(0,3);
+  const year = date.getFullYear().toString();
+  const hours = date.getUTCHours().toString();
+  const minutes = date.getUTCMinutes().toString();
+  const seconds = date.getUTCSeconds().toString();
+  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='') {
-    this.name = name; // "Chris Olah"
-    this.personalURL = personalURL; // "https://colah.github.io"
-    this.affiliation = affiliation; // "Google Brain"
-    this.affiliationURL = affiliationURL; // "https://g.co/brain"
+  // constructor(name='', personalURL='', affiliation='', affiliationURL='') {
+  //   this.name = name; // 'Chris Olah'
+  //   this.personalURL = personalURL; // 'https://colah.github.io'
+  //   this.affiliation = affiliation; // 'Google Brain'
+  //   this.affiliationURL = affiliationURL; // 'https://g.co/brain'
+  // }
+
+  constructor(object) {
+    this.name = object.author; // 'Chris Olah'
+    this.personalURL = object.authorURL; // 'https://colah.github.io'
+    this.affiliation = object.affiliation; // 'Google Brain'
+    this.affiliationURL = object.affiliationURL; // 'https://g.co/brain'
   }
 
-  // "Chris"
+  // 'Chris'
   get firstName() {
     const names = this.name.split(' ');
     return names.slice(0, names.length - 1).join(' ');
   }
 
-  // "Olah"
+  // 'Olah'
   get lastName() {
     const names = this.name.split(' ');
     return names[names.length -1];
   }
 }
 
+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.description = ''; // "A visual overview of neural attention..."
+    this.title = 'unnamed article'; // 'Attention and Augmented Recurrent Neural Networks'
+    this.description = ''; // 'A visual overview of neural attention...'
     this.authors = []; // Array of Author(s)
 
     this.bibliography = new Map();
     this.bibliographyParsed = false;
     //  {
-    //    "gregor2015draw": {
-    //      "title": "DRAW: A recurrent neural network for image generation",
-    //      "author": "Gregor, Karol and Danihelka, Ivo and Graves, Alex and Rezende, Danilo Jimenez and Wierstra, Daan",
-    //      "journal": "arXiv preprint arXiv:1502.04623",
-    //      "year": "2015",
-    //      "url": "https://arxiv.org/pdf/1502.04623.pdf",
-    //      "type": "article"
+    //    'gregor2015draw': {
+    //      'title': 'DRAW: A recurrent neural network for image generation',
+    //      'author': 'Gregor, Karol and Danihelka, Ivo and Graves, Alex and Rezende, Danilo Jimenez and Wierstra, Daan',
+    //      'journal': 'arXiv preprint arXiv:1502.04623',
+    //      'year': '2015',
+    //      'url': 'https://arxiv.org/pdf/1502.04623.pdf',
+    //      'type': 'article'
     //    },
     //  }
 
     // Citation keys should be listed in the order that they are appear in the document.
     // Each key refers to a key in the bibliography dictionary.
-    this.citations = []; // [ "gregor2015draw", "mercier2011humans" ]
+    this.citations = []; // [ 'gregor2015draw', 'mercier2011humans' ]
     this.citationsCollected = false;
 
     //
@@ -65,20 +120,21 @@ export class FrontMatter {
     //
     this.journal = {};
     //  journal: {
-    //    "title": "Distill",
-    //    "full_title": "Distill",
-    //    "abbrev_title": "Distill",
-    //    "url": "http://distill.pub",
-    //    "doi": "10.23915/distill",
-    //    "publisherName": "Distill Working Group",
-    //    "publisherEmail": "admin@distill.pub",
-    //    "issn": "2476-0757",
-    //    "editors": [...],
-    //    "committee": [...]
+    //    'title': 'Distill',
+    //    'full_title': 'Distill',
+    //    'abbrev_title': 'Distill',
+    //    'url': 'http://distill.pub',
+    //    'doi': '10.23915/distill',
+    //    'publisherName': 'Distill Working Group',
+    //    'publisherEmail': 'admin@distill.pub',
+    //    'issn': '2476-0757',
+    //    'editors': [...],
+    //    'committee': [...]
     //  }
     //  volume: 1,
     //  issue: 9,
-    this.publishedDate = new Date();
+
+    this.katex = {};
 
     //
     // Assigned from publishing process
@@ -87,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:
@@ -100,44 +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;
-    const zipped = data.authors.map( (author, index) => [author, data.affiliations[index]]);
-    this.authors = zipped.map( ([authorEntry, affiliationEntry]) => {
-      const author = new Author();
-
-      // try to get name and personal url
-      switch (typeof authorEntry) {
-      case 'object':
-        author.name = Object.keys(authorEntry)[0];
-        author.personalURL = authorEntry[author.name];
-        break;
-      case 'string':
-        author.name = authorEntry;
-        break;
-      default:
-        throw new Error('Invalid type in frontmatter author field: ' + authorEntry);
-      }
-
-      // try to get affiliation name and affiliation url
-      switch (typeof affiliationEntry) {
-      case 'object':
-        author.affiliation = Object.keys(affiliationEntry)[0];
-        author.affiliationURL = affiliationEntry[author.affiliation];
-        break;
-      case 'string':
-        author.affiliation = affiliationEntry;
-        break;
-      default:
-        throw new Error('Invalid type in frontmatter affiliation field: ' + affiliationEntry);
-      }
-
-      return author;
-    });
-  }
-
   //
   // Computed Properties
   //
@@ -158,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.
@@ -205,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) {
@@ -241,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;
+  }
+
 }

src/helpers/bibtex.js

@@ -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
@@ -28,6 +28,7 @@ export function serializeFrontmatterToBibtex(frontMatter) {
   title = {${frontMatter.title}},
   journal = {${frontMatter.journal.title}},
   year = {${frontMatter.publishedYear}},
-  note = {${frontMatter.url}}
+  note = {${frontMatter.url}},
+  doi = {${frontMatter.doi}}
 }`;
 }

src/helpers/citation.js

@@ -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){
@@ -28,6 +40,7 @@ export function inline_cite_long(keys){
 }
 
 function author_string(ent, template, sep, finalSep){
+  if (ent.author == null) { return ''; }
   var names = ent.author.split(' and ');
   let name_strings = names.map(name => {
     name = name.trim();
@@ -102,13 +115,22 @@ function doi_string(ent, new_line){
   }
 }
 
+function title_string(ent) {
+  return '<span class="title">' + ent.title + '</span> ';
+}
+
 export function bibliography_cite(ent, fancy){
   if (ent){
-    var cite =  '<b>' + ent.title + '</b> ';
+    var cite = title_string(ent);
     cite += link_string(ent) + '<br>';
-    cite += author_string(ent, '${L}, ${I}', ', ', ' and ');
-    if (ent.year || ent.date){
-      cite += ', ' + (ent.year || ent.date) + '. ';
+    if (ent.author) {
+      cite += author_string(ent, '${L}, ${I}', ', ', ' and ');
+      if (ent.year || ent.date) {
+        cite += ', ';
+      }
+    }
+    if (ent.year || ent.date) {
+      cite += (ent.year || ent.date) + '. ';
     } else {
       cite += '. ';
     }
@@ -134,7 +156,7 @@ export function bibliography_cite(ent, fancy){
 export function hover_cite(ent){
   if (ent){
     var cite = '';
-    cite += '<b>' + ent.title + '</b>';
+    cite += '<strong>' + ent.title + '</strong>';
     cite += link_string(ent);
     cite += '<br>';
 

src/helpers/hover-box.js

@@ -1,108 +0,0 @@
-function make_hover_css(pos) {
-  const pretty = window.innerWidth > 600;
-  const padding = pretty? 18 : 12;
-  const outer_padding = pretty ? 18 : 0;
-  const bbox = document.querySelector('body').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);
-  width = width - 2 * padding;
-  return (`position: absolute;
-     background-color: #FFF;
-     opacity: 0.95;
-     max-width: ${width}px;
-     top: ${top}px;
-     left: ${left}px;
-     border: 1px solid rgba(0, 0, 0, 0.25);
-     padding: ${padding}px;
-     border-radius: ${pretty? 3 : 0}px;
-     box-shadow: 0px 2px 10px 2px rgba(0, 0, 0, 0.2);
-     z-index: ${1e6};`);
-}
-
-export class HoverBox {
-
-  constructor(contentHTML, triggerElement) {
-    this.visible = false;
-    // div hold teh contents of the box that will become visible
-    this.div = contentHTML;
-    this.bindDivEvents(this.div);
-    // triggerElement holds the element that needs to be hovered etc to show contents
-    this.triggerElement = triggerElement;
-    this.bindTriggerEvents(this.triggerElement);
-    this.hide();
-  }
-
-  bindDivEvents(node) {
-    // For mice, same behavior as hovering on links
-    this.div.addEventListener('mouseover', () => {
-      if (!this.visible) this.showAtNode(node);
-      this.stopTimeout();
-    });
-    this.div.addEventListener('mouseout', () => {
-      this.extendTimeout(250);
-    });
-    // Don't trigger body touchstart event when touching within box
-    this.div.addEventListener('touchstart', (event) => {
-      event.stopPropagation();
-    }, {passive: true});
-    // Close box when touching outside box
-    document.body.addEventListener('touchstart', () => {
-      this.hide();
-    }, {passive: true});
-  }
-
-  bindTriggerEvents(node) {
-    node.addEventListener('mouseover', () => {
-      if (!this.visible) {
-        this.showAtNode(node);
-      }
-      this.stopTimeout();
-    });
-
-    node.addEventListener('mouseout', () => {
-      this.extendTimeout(250);
-    });
-
-    node.addEventListener('touchstart', (event) => {
-      if (this.visible) {
-        this.hide();
-      } else {
-        this.showAtNode(node);
-      }
-      // Don't trigger body touchstart event when touching link
-      event.stopPropagation();
-    }, {passive: true});
-  }
-
-  show(position) {
-    this.visible = true;
-    const css = make_hover_css(position);
-    this.div.setAttribute('style', css );
-  }
-
-  showAtNode(node) {
-    const bbox = node.getBoundingClientRect();
-    this.show([bbox.right, bbox.bottom]);
-  }
-
-  hide() {
-    this.visible = false;
-    this.div.setAttribute('style', 'display:none');
-    this.stopTimeout();
-  }
-
-  stopTimeout() {
-    if (this.timeout) {
-      clearTimeout(this.timeout);
-    }
-  }
-
-  extendTimeout(time) {
-    this.stopTimeout();
-    this.timeout = setTimeout(() => {
-      this.hide();
-    }, time);
-  }
-
-}

src/helpers/katex-auto-render.js

@@ -0,0 +1,204 @@
+// This is a straight concatenation of code from KaTeX's contrib folder,
+// but we aren't using some of their helpers that don't work well outside a browser environment.
+
+/*global katex */
+
+const findEndOfMath = function(delimiter, text, startIndex) {
+  // Adapted from
+  // https://github.com/Khan/perseus/blob/master/src/perseus-markdown.jsx
+  let index = startIndex;
+  let braceLevel = 0;
+
+  const delimLength = delimiter.length;
+
+  while (index < text.length) {
+    const character = text[index];
+
+    if (braceLevel <= 0 &&
+      text.slice(index, index + delimLength) === delimiter) {
+      return index;
+    } else if (character === '\\') {
+      index++;
+    } else if (character === '{') {
+      braceLevel++;
+    } else if (character === '}') {
+      braceLevel--;
+    }
+
+    index++;
+  }
+
+  return -1;
+};
+
+const splitAtDelimiters = function(startData, leftDelim, rightDelim, display) {
+  const finalData = [];
+
+  for (let i = 0; i < startData.length; i++) {
+    if (startData[i].type === 'text') {
+      const text = startData[i].data;
+
+      let lookingForLeft = true;
+      let currIndex = 0;
+      let nextIndex;
+
+      nextIndex = text.indexOf(leftDelim);
+      if (nextIndex !== -1) {
+        currIndex = nextIndex;
+        finalData.push({
+          type: 'text',
+          data: text.slice(0, currIndex),
+        });
+        lookingForLeft = false;
+      }
+
+      while (true) { // eslint-disable-line no-constant-condition
+        if (lookingForLeft) {
+          nextIndex = text.indexOf(leftDelim, currIndex);
+          if (nextIndex === -1) {
+            break;
+          }
+
+          finalData.push({
+            type: 'text',
+            data: text.slice(currIndex, nextIndex),
+          });
+
+          currIndex = nextIndex;
+        } else {
+          nextIndex = findEndOfMath(
+            rightDelim,
+            text,
+            currIndex + leftDelim.length);
+          if (nextIndex === -1) {
+            break;
+          }
+
+          finalData.push({
+            type: 'math',
+            data: text.slice(
+              currIndex + leftDelim.length,
+              nextIndex),
+            rawData: text.slice(
+              currIndex,
+              nextIndex + rightDelim.length),
+            display: display,
+          });
+
+          currIndex = nextIndex + rightDelim.length;
+        }
+
+        lookingForLeft = !lookingForLeft;
+      }
+
+      finalData.push({
+        type: 'text',
+        data: text.slice(currIndex),
+      });
+    } else {
+      finalData.push(startData[i]);
+    }
+  }
+
+  return finalData;
+};
+
+
+const splitWithDelimiters = function(text, delimiters) {
+  let data = [{type: 'text', data: text}];
+  for (let i = 0; i < delimiters.length; i++) {
+    const delimiter = delimiters[i];
+    data = splitAtDelimiters(
+      data, delimiter.left, delimiter.right,
+      delimiter.display || false);
+  }
+  return data;
+};
+
+/* Note: optionsCopy is mutated by this method. If it is ever exposed in the
+ * API, we should copy it before mutating.
+ */
+const renderMathInText = function(text, optionsCopy) {
+  const data = splitWithDelimiters(text, optionsCopy.delimiters);
+  const fragment = document.createDocumentFragment();
+
+  for (let i = 0; i < data.length; i++) {
+    if (data[i].type === 'text') {
+      fragment.appendChild(document.createTextNode(data[i].data));
+    } else {
+      const tag = document.createElement('d-math');
+      const math = data[i].data;
+      // Override any display mode defined in the settings with that
+      // defined by the text itself
+      optionsCopy.displayMode = data[i].display;
+      try {
+        tag.textContent = math;
+        if (optionsCopy.displayMode) {
+          tag.setAttribute('block', '');
+        }
+      } catch (e) {
+        if (!(e instanceof katex.ParseError)) {
+          throw e;
+        }
+        optionsCopy.errorCallback(
+          'KaTeX auto-render: Failed to parse `' + data[i].data +
+          '` with ',
+          e
+        );
+        fragment.appendChild(document.createTextNode(data[i].rawData));
+        continue;
+      }
+      fragment.appendChild(tag);
+    }
+  }
+
+  return fragment;
+};
+
+const renderElem = function(elem, optionsCopy) {
+  for (let i = 0; i < elem.childNodes.length; i++) {
+    const childNode = elem.childNodes[i];
+    if (childNode.nodeType === 3) {
+      // Text node
+      const frag = renderMathInText(childNode.textContent, optionsCopy);
+      i += frag.childNodes.length - 1;
+      elem.replaceChild(frag, childNode);
+    } else if (childNode.nodeType === 1) {
+      // Element node
+      const shouldRender = optionsCopy.ignoredTags.indexOf(
+        childNode.nodeName.toLowerCase()) === -1;
+
+      if (shouldRender) {
+        renderElem(childNode, optionsCopy);
+      }
+    }
+    // Otherwise, it's something else, and ignore it.
+  }
+};
+
+const defaultAutoRenderOptions = {
+  delimiters: [
+    {left: '$$', right: '$$', display: true},
+    {left: '\\[', right: '\\]', display: true},
+    {left: '\\(', right: '\\)', display: false},
+    // LaTeX uses this, but it ruins the display of normal `$` in text:
+    // {left: '$', right: '$', display: false},
+  ],
+
+  ignoredTags: [
+    'script', 'noscript', 'style', 'textarea', 'pre', 'code', 'svg',
+  ],
+
+  errorCallback: function(msg, err) {
+    console.error(msg, err);
+  },
+};
+
+export const renderMathInElement = function(elem, options) {
+  if (!elem) {
+    throw new Error('No element provided to render');
+  }
+
+  const optionsCopy = Object.assign({}, defaultAutoRenderOptions, options);
+  renderElem(elem, optionsCopy);
+};

src/helpers/layout.js

@@ -13,14 +13,14 @@
 
 export function body(selector) {
   return `${selector} {
-      grid-column: margin-left / body;
+      grid-column: left / text;
     }
   `;
 }
 
 export function page(selector) {
   return `${selector} {
-      grid-column: margin-left / page;
+      grid-column: left / page;
     }
   `;
 }

src/helpers/polyfills.js

@@ -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;
+  }
+}

src/styles/d-article.css

@@ -0,0 +1,246 @@
+d-article {
+  contain: layout style;
+  overflow-x: hidden;
+  border-top: 1px solid rgba(0, 0, 0, 0.1);
+  padding-top: 2rem;
+  color: rgba(0, 0, 0, 0.8);
+}
+
+d-article > * {
+  grid-column: text;
+}
+
+@media(min-width: 768px) {
+  d-article {
+    font-size: 16px;
+  }
+}
+
+@media(min-width: 1024px) {
+  d-article {
+    font-size: 1.06rem;
+    line-height: 1.7em;
+  }
+}
+
+
+/* H2 */
+
+
+d-article .marker {
+  text-decoration: none;
+  border: none;
+  counter-reset: section;
+  grid-column: kicker;
+  line-height: 1.7em;
+}
+
+d-article .marker:hover {
+  border: none;
+}
+
+d-article .marker span {
+  padding: 0 3px 4px;
+  border-bottom: 1px solid rgba(0, 0, 0, 0.2);
+  position: relative;
+  top: 4px;
+}
+
+d-article .marker:hover span {
+  color: rgba(0, 0, 0, 0.7);
+  border-bottom: 1px solid rgba(0, 0, 0, 0.7);
+}
+
+d-article h2 {
+  font-weight: 600;
+  font-size: 24px;
+  line-height: 1.25em;
+  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: 36px;
+  }
+}
+
+/* H3 */
+
+d-article h3 {
+  font-weight: 700;
+  font-size: 18px;
+  line-height: 1.4em;
+  margin-bottom: 1em;
+  margin-top: 2em;
+}
+
+@media(min-width: 1024px) {
+  d-article h3 {
+    font-size: 20px;
+  }
+}
+
+/* H4 */
+
+d-article h4 {
+  font-weight: 600;
+  text-transform: uppercase;
+  font-size: 14px;
+  line-height: 1.4em;
+}
+
+d-article a {
+  color: inherit;
+}
+
+d-article p,
+d-article ul,
+d-article ol,
+d-article blockquote {
+  margin-top: 0;
+  margin-bottom: 1em;
+  margin-left: 0;
+  margin-right: 0;
+}
+
+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;
+}
+
+d-article a:hover {
+  border-bottom: 1px solid rgba(0, 0, 0, 0.8);
+}
+
+d-article .link {
+  text-decoration: underline;
+  cursor: pointer;
+}
+
+d-article ul,
+d-article ol {
+  padding-left: 24px;
+}
+
+d-article li {
+  margin-bottom: 1em;
+  margin-left: 0;
+  padding-left: 0;
+}
+
+d-article li:last-child {
+  margin-bottom: 0;
+}
+
+d-article pre {
+  font-size: 14px;
+  margin-bottom: 20px;
+}
+
+d-article hr {
+  grid-column: screen;
+  width: 100%;
+  border: none;
+  border-bottom: 1px solid rgba(0, 0, 0, 0.1);
+  margin-top: 60px;
+  margin-bottom: 60px;
+}
+
+d-article section {
+  margin-top: 60px;
+  margin-bottom: 60px;
+}
+
+d-article span.equation-mimic {
+  font-family: georgia;
+  font-size: 115%;
+  font-style: italic;
+}
+
+d-article > d-code,
+d-article section > d-code  {
+  display: block;
+}
+
+d-article > d-math[block],
+d-article section > d-math[block]  {
+  display: block;
+}
+
+@media (max-width: 768px) {
+  d-article > d-code,
+  d-article section > d-code,
+  d-article > d-math[block],
+  d-article section > d-math[block] {
+      overflow-x: scroll;
+      -ms-overflow-style: none;  // IE 10+
+      overflow: -moz-scrollbars-none;  // Firefox
+  }
+
+  d-article > d-code::-webkit-scrollbar,
+  d-article section > d-code::-webkit-scrollbar,
+  d-article > d-math[block]::-webkit-scrollbar,
+  d-article section > d-math[block]::-webkit-scrollbar {
+    display: none;  // Safari and Chrome
+  }
+}
+
+d-article .citation {
+  color: #668;
+  cursor: pointer;
+}
+
+d-include {
+  width: auto;
+  display: block;
+}
+
+d-figure {
+  contain: layout style;
+}
+
+/* KaTeX */
+
+.katex, .katex-prerendered {
+  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;
+}

src/styles/d-byline.css

@@ -0,0 +1,65 @@
+d-byline {
+  contain: content;
+  overflow: hidden;
+  border-top: 1px solid rgba(0, 0, 0, 0.1);
+  font-size: 0.8rem;
+  line-height: 1.8em;
+  padding: 1.5rem 0;
+  min-height: 1.8em;
+}
+
+
+d-byline .byline {
+  grid-template-columns: 1fr 1fr;
+  grid-column: text;
+}
+
+@media(min-width: 768px) {
+  d-byline .byline {
+    grid-template-columns: 1fr 1fr 1fr 1fr;
+  }
+}
+
+d-byline .authors-affiliations {
+  grid-column-end: span 2;
+  grid-template-columns: 1fr 1fr;
+  margin-bottom: 1em;
+}
+
+@media(min-width: 768px) {
+  d-byline .authors-affiliations {
+    margin-bottom: 0;
+  }
+}
+
+d-byline h3 {
+  font-size: 0.6rem;
+  font-weight: 400;
+  color: rgba(0, 0, 0, 0.5);
+  margin: 0;
+  text-transform: uppercase;
+}
+
+d-byline p {
+  margin: 0;
+}
+
+d-byline a,
+d-article d-byline a {
+  color: rgba(0, 0, 0, 0.8);
+  text-decoration: none;
+  border-bottom: none;
+}
+
+d-article d-byline a:hover {
+  text-decoration: underline;
+  border-bottom: none;
+}
+
+d-byline p.author {
+  font-weight: 500;
+}
+
+d-byline .affiliations {
+
+}

src/styles/d-math.css

@@ -0,0 +1,11 @@
+span.katex-display {
+  text-align: left;
+  padding: 8px 0 8px 0;
+  margin: 0.5em 0 0.5em 1em;
+}
+
+span.katex {
+  -webkit-font-smoothing: antialiased;
+  color: rgba(0, 0, 0, 0.8);
+  font-size: 1.18em;
+}

src/styles/d-title.css

@@ -0,0 +1,49 @@
+d-title {
+  padding: 2rem 0 1.5rem;
+  contain: layout style;
+  overflow-x: hidden;
+}
+
+@media(min-width: 768px) {
+  d-title {
+    padding: 4rem 0 1.5rem;
+  }
+}
+
+d-title h1 {
+  grid-column: text;
+  font-size: 40px;
+  font-weight: 700;
+  line-height: 1.1em;
+  margin: 0 0 0.5rem;
+}
+
+@media(min-width: 768px) {
+  d-title h1 {
+    font-size: 50px;
+  }
+}
+
+d-title p {
+  font-weight: 300;
+  font-size: 1.2rem;
+  line-height: 1.55em;
+  grid-column: text;
+}
+
+d-title .status {
+  margin-top: 0px;
+  font-size: 12px;
+  color: #009688;
+  opacity: 0.8;
+  grid-column: kicker;
+}
+
+d-title .status span {
+  line-height: 1;
+  display: inline-block;
+  padding: 6px 0;
+  border-bottom: 1px solid #80cbc4;
+  font-size: 11px;
+  text-transform: uppercase;
+}

src/styles/styles-article.css

@@ -1,201 +0,0 @@
-
-d-article {
-  color: rgba(0, 0, 0, 0.8);
-  padding-top: 0;
-  padding-bottom: 72px;
-  overflow: hidden;
-  font-size: 14px;
-  line-height: 1.6em;
-  /*border-top: 1px solid rgba(0, 0, 0, 0.2);*/
-}
-@media(min-width: 768px) {
-  d-article {
-    font-size: 16px;
-  }
-}
-@media(min-width: 1024px) {
-  d-article {
-    font-size: 18px;
-  }
-}
-
-/* H2 */
-
-d-article h2 {
-  font-weight: 600;
-  font-size: 26px;
-  line-height: 1.25em;
-  margin-top: 16px;
-  margin-bottom: 24px;
-  padding-bottom: 24px;
-  border-bottom: 1px solid rgba(0, 0, 0, 0.1);
-}
-@media(min-width: 1024px) {
-  d-article h2 {
-    margin-top: 2em;
-    font-size: 32px;
-  }
-}
-d-article h1 + h2 {
-  font-weight: 300;
-  font-size: 20px;
-  line-height: 1.4em;
-  margin-top: 8px;
-  font-style: normal;
-}
-@media(min-width: 1080px) {
-  .centered h1 + h2 {
-    text-align: center;
-  }
-  d-article h1 + h2 {
-    margin-top: 12px;
-    font-size: 32px;
-  }
-}
-
-/* H3 */
-
-d-article h3 {
-  font-weight: 600;
-  font-size: 20px;
-  line-height: 1.4em;
-  margin-top: 36px;
-  margin-bottom: 18px;
-}
-d-article h1 + h3 {
-  margin-top: 48px;
-}
-@media(min-width: 1024px) {
-  d-article h3 {
-    font-size: 26px;
-  }
-}
-
-/* H4 */
-
-d-article h4 {
-  font-weight: 600;
-  text-transform: uppercase;
-  font-size: 14px;
-  line-height: 1.4em;
-}
-d-article a {
-  color: inherit;
-}
-d-article p,
-d-article ul,
-d-article ol {
-  margin-bottom: 24px;
-}
-d-article p b,
-d-article ul b,
-d-article ol b {
-  -webkit-font-smoothing: antialiased;
-}
-d-article a {
-  border-bottom: 1px solid rgba(0, 0, 0, 0.4);
-  text-decoration: none;
-}
-d-article a:hover {
-  border-bottom: 1px solid rgba(0, 0, 0, 0.8);
-}
-d-article .link {
-  text-decoration: underline;
-  cursor: pointer;
-}
-d-article ul,
-d-article ol {
-  padding-left: 24px;
-}
-d-article li {
-  margin-bottom: 24px;
-  margin-left: 0;
-  padding-left: 0;
-}
-d-article pre {
-  font-size: 14px;
-  margin-bottom: 20px;
-}
-d-article hr {
-  border: none;
-  border-bottom: 1px solid rgba(0, 0, 0, 0.2);
-  margin-top: 60px;
-  margin-bottom: 60px;
-}
-d-article section {
-  margin-top: 60px;
-  margin-bottom: 60px;
-}
-
-/* Figure */
-
-d-article figure {
-  position: relative;
-  margin-top: 30px;
-  margin-bottom: 30px;
-}
-@media(min-width: 1024px) {
-  d-article figure {
-    margin-top: 48px;
-    margin-bottom: 48px;
-  }
-}
-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 figure figcaption::before {
-  position: relative;
-  display: block;
-  top: -20px;
-  content: "";
-  width: 25px;
-  border-top: 1px solid rgba(0, 0, 0, 0.3);
-}*/
-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;
-}
-d-article > d-math[block],
-d-article section > d-math[block]  {
-  display: block;
-}
-d-article .citation {
-  color: #668;
-  cursor: pointer;
-}
-d-include {
-  width: auto;
-  display: block;
-}

src/styles/styles-base.css

@@ -1,12 +1,20 @@
 html {
-  font-size: 20px;
-	line-height: 1rem;
-	font-family: "Libre Franklin", "Helvetica Neue", sans-serif;
+  font-size: 14px;
+	line-height: 1.6em;
+  /* font-family: "Libre Franklin", "Helvetica Neue", 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%;
 }
 
+@media(min-width: 768px) {
+  html {
+    font-size: 16px;
+  }
+}
+
 body {
   margin: 0;
 }
@@ -44,3 +52,87 @@ pre {
   overflow: auto;
   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: 1.5em;
+}
+
+figcaption+figure {
+
+}
+
+figure img {
+  width: 100%;
+}
+
+figure svg text,
+figure svg tspan {
+}
+
+figcaption,
+.figcaption {
+  color: rgba(0, 0, 0, 0.6);
+  font-size: 12px;
+  line-height: 1.5em;
+}
+
+@media(min-width: 1024px) {
+figcaption,
+.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,
+figcaption strong, {
+  font-weight: 600;
+  color: rgba(0, 0, 0, 1.0);
+}

src/styles/styles-layout.css

@@ -1,76 +1,150 @@
 @supports not (display: grid) {
-  d-article,
+  .base-grid,
+  distill-header,
   d-title,
-  d-byline,
+  d-abstract,
+  d-article,
   d-appendix,
+  distill-appendix,
+  d-byline,
+  d-footnote-list,
+  d-citation-list,
   distill-footer {
     display: block;
     padding: 8px;
   }
 }
 
-d-article,
+.base-grid,
+distill-header,
 d-title,
-d-byline,
+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: [start] 8px [margin-left-outset] 8px [margin-left] 1fr [body] 0px [page] 8px [body-outset] 0px [page-outset] 8px [end];
+  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) {
-
-  d-article,
+  .base-grid,
+  distill-header,
   d-title,
-  d-byline,
+  d-abstract,
+  d-article,
   d-appendix,
+  distill-appendix,
+  d-byline,
+  d-footnote-list,
+  d-citation-list,
   distill-footer {
-    grid-template-columns: [start] 32px [margin-left-outset] 32px [margin-left] 3fr [body] 32px [body-outset] 1fr [page] 32px [page-outset] 32px [end];
+    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: 16px;
+  }
+
+  .grid {
+    grid-column-gap: 16px;
   }
 }
 
-@media(min-width: 1024px) {
-  d-article,
+@media(min-width: 1000px) {
+  .base-grid,
+  distill-header,
   d-title,
-  d-byline,
+  d-abstract,
+  d-article,
   d-appendix,
+  distill-appendix,
+  d-byline,
+  d-footnote-list,
+  d-citation-list,
   distill-footer {
-    grid-template-columns: [start] 1fr [margin-left-outset] 32px [margin-left] 672px [body] 32px [body-outset] 224px [page] 32px [page-outset] 1fr [end];
+    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: 16px;
+  }
+
+  .grid {
+    grid-column-gap: 16px;
   }
 }
 
-d-appendix,
-d-article > d-title,
-d-article > d-title > d-byline,
-d-article > distill-footer {
-  grid-column: start / end;
+@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: 32px;
+  }
+
+  .grid {
+    grid-column-gap: 32px;
+  }
 }
 
-.l-body,
-d-article > * {
-  grid-column: margin-left / body;
+
+
+
+.base-grid {
+  grid-column: screen;
+}
+
+/* .l-body,
+d-article > *  {
+  grid-column: text;
 }
 
 .l-page,
+d-title > *,
 d-figure {
-  grid-column: margin-left / page;
+  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: margin-left-outset / body-outset;
+  grid-column: middle;
 }
 
 .l-page-outset {
-  grid-column: margin-left-outset / page-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;
 }
@@ -78,254 +152,19 @@ d-figure {
 
 /* Aside */
 
-aside {
-  grid-column: margin-left / body;
+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: body-outset / page;
-    font-size: 14px;
-    line-height: 1.3;
+    grid-column: gutter;
+  }
+
+  .side {
+    grid-column: gutter;
   }
 }
-/*
-.l-body,
-.l-page,
-.l-middle,
-d-article > div,
-d-article > p,
-d-article > h1,
-d-article > h2,
-d-article > h3,
-d-article > h4,
-d-article > figure,
-d-article > ul,
-d-article > d-abstract,
-d-article > d-code,
-d-article > d-math,
-d-article > table,
-d-article section > div,
-d-article section > p,
-d-article section > h1,
-d-article section > h2,
-d-article section > h3,
-d-article section > h4,
-d-article section > figure,
-d-article section > ul,
-d-article section > d-abstract,
-d-article section > d-code,
-d-article section > d-math,
-d-article section > table {
-  width: calc(100% - 32px);
-  margin-left: 16px;
-  margin-right: 16px;
-  box-sizing: border-box;
-}
-
-.l-body-outset,
-.l-page-outset,
-.l-middle-outset {
-  width: calc(100% - 16px);
-  margin-left: 8px;
-  margin-right: 8px;
-}
-
-.l-screen {
-  margin-left: 0px;
-  margin-right: 0px;
-  width: 100%;
-  background-color: #F8F8FC;
-  border-top: 1px solid #E8E8EC;
-  border-bottom: 1px solid #E8E8EC;
-}
-
-@media(min-width: 768px) {
-  .l-body,
-  d-article > div,
-  d-article > p,
-  d-article > h1,
-  d-article > h2,
-  d-article > h3,
-  d-article > h4,
-  d-article > figure,
-  d-article > ul,
-  d-article > d-abstract,
-  d-article > d-code,
-  d-article > d-math,
-  d-article > d-math,
-  d-article section > div,
-  d-article section > p,
-  d-article section > h1,
-  d-article section > h2,
-  d-article section > h3,
-  d-article section > h4,
-  d-article section > figure,
-  d-article section > ul,
-  d-article section > d-abstract,
-  d-article section > d-code,
-  d-article section > d-math,
-  d-article section > table {
-    margin-left: 64px;
-    width: calc((100% - 2 * 64px - 3 * 16px)/4*3 + 2*16px );
-  }
-
-  .l-body-outset {
-    margin-left: 32px;
-    width: calc((100% - 2 * 64px - 3 * 16px)/4*3 + 2*16px + 64px );;
-  }
-
-  .l-middle,
-  .l-middle-outset,
-  .l-page {
-    margin-left: 64px;
-    margin-right: 64px;
-    width: calc(100% - 2*64px);
-  }
-
-  .l-page-outset {
-    margin-left: 32px;
-    margin-right: 32px;
-    width: calc(100% - 64px);
-  }
-
-  .margin {
-    font-size: 14px;
-    line-height: normal;
-    clear: both;
-    float: right;
-    margin-top: 0;
-    margin-left: 0;
-    margin-right: 64px;
-    width: calc((100% - 2 * 64px - 3 * 16px)/4);
-  }
-}
-
-@media(min-width: 1024px) {
-  .l-body,
-  d-article > div,
-  d-article > p,
-  d-article > h2,
-  d-article > h3,
-  d-article > h4,
-  d-article > figure,
-  d-article > ul,
-  d-article > d-abstract,
-  d-article > d-code,
-  d-article > d-math,
-  d-article > table,
-  d-article section > div,
-  d-article section > p,
-  d-article section > h2,
-  d-article section > h3,
-  d-article section > h4,
-  d-article section > figure,
-  d-article section > ul,
-  d-article section > d-abstract,
-  d-article section > d-code,
-  d-article section > d-math,
-  d-article section > table {
-    margin-left: calc(50% - (1024px - 2*64px) / 2);
-    width: 668px;
-  }
-
-  .l-body-outset {
-    margin-left: calc((50% - (1024px - 2*64px) / 2) - 32px);
-    width: calc(668px + 64px)
-  }
-
-  .l-middle,
-  .l-middle-outset,
-  .l-page {
-    margin-left: calc(50% - (1024px - 2*64px) / 2);
-    width: calc(100% - 2* (50% - (1024px - 2*64px) / 2));
-  }
-
-  .l-page-outset {
-    margin-left: calc((50% - (1024px - 2*64px) / 2) - 32px);
-    width: calc(100% - 2* (50% - (1024px - 2*64px) / 2) + 64px);
-  }
-
-  .margin {
-    font-size: 14px;
-    line-height: normal;
-    clear: both;
-    float: right;
-    margin-top: 0;
-    margin-left: 0;
-    margin-right: calc(50% - (1024px - 2*64px) / 2);
-    width: 206px;
-  }
-
-
-  /* Side */
-
-  /*
-  .side.l-body,
-  d-article .side.l-body {
-    clear: both;
-    float: right;
-    margin-top: 0;
-    margin-left: 48px;
-    margin-right: calc((100vw - 984px + 648px) / 2);
-    width: calc(648px / 2 - 24px - 84px);
-  }
-  .side.l-body-outset,
-  d-article .side.l-body-outset {
-    clear: both;
-    float: right;
-    margin-top: 0;
-    margin-left: 48px;
-    margin-right: calc((100vw - 984px + 648px - 48px) / 2);
-    width: calc(648px / 2 - 48px + 24px);
-  }
-  .side.l-middle,
-  d-article .side.l-middle {
-    clear: both;
-    float: right;
-    width: calc(456px - 84px);
-    margin-left: 48px;
-    margin-right: calc((100vw - 984px) / 2 + 168px);
-  }
-  .side.l-middle-outset,
-  d-article .side.l-middle-outset {
-    clear: both;
-    float: right;
-    width: 456px;
-    margin-left: 48px;
-    margin-right: calc((100vw - 984px) / 2 + 168px);
-  }
-  .side.l-page,
-  d-article .side.l-page {
-    clear: both;
-    float: right;
-    margin-left: 48px;
-    width: calc(624px - 84px);
-    margin-right: calc((100vw - 984px) / 2);
-  }
-  .side.l-page-outset,
-  d-article .side.l-page-outset {
-    clear: both;
-    float: right;
-    width: 624px;
-    margin-right: calc((100vw - 984px) / 2);
-  }
-}*/
-
-/* Rows and Columns */
-
-.row {
-  display: flex;
-}
-.column {
-  flex: 1;
-  box-sizing: border-box;
-  margin-right: 24px;
-  margin-left: 24px;
-}
-.row > .column:first-of-type {
-  margin-left: 0;
-}
-.row > .column:last-of-type {
-  margin-right: 0;
-}

src/styles/styles.js

@@ -1,9 +1,25 @@
 import base from './styles-base.css';
 import layout from './styles-layout.css';
-import article from './styles-article.css';
 import print from './styles-print.css';
+import byline from './d-byline.css';
+import article from './d-article.css';
+import title from './d-title.css';
+import math from './d-math.css';
 
-let s = document.createElement('style');
-s.textContent =  base + layout + print + article;
-document.querySelector('head').appendChild(s);
-export default s;
+export const styles = base + layout + title + byline + article + math + print;
+
+export function makeStyleTag(dom) {
+
+  const styleTagId = 'distill-prerendered-styles';
+  const prerenderedTag = dom.getElementById(styleTagId);
+  if (!prerenderedTag) {
+    const styleTag = dom.createElement('style');
+    styleTag.id = styleTagId;
+    styleTag.type = 'text/css';
+    const cssTextTag = dom.createTextNode(styles);
+    styleTag.appendChild(cssTextTag);
+    const firstScriptTag = dom.head.querySelector('script');
+    dom.head.insertBefore(styleTag, firstScriptTag);
+  }
+
+}

src/transforms.js

@@ -1,53 +1,118 @@
 /* eslint-env node, mocha */
 
+import { FrontMatter } from './front-matter';
+
 /* Extractors */
 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 Polyfills from './transforms/polyfills';
+import Byline from './transforms/byline';
+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, Polyfills, 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) {
-    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) {
-    transform(dom, data);
+  for (const [name, transform] of transforms.entries()) {
+    if (verbose) console.warn('Running transform: ' + name);
+    // console.warn('Running transform: ', transform);
+    transform(dom, frontMatter, verbose);
   }
+  dom.body.setAttribute('distill-prerendered', '');
   // the function calling us can now use the transformed dom and filled data object
+  if (data instanceof FrontMatter) {
+    // frontMatter will already have needed properties
+  } else {
+    frontMatter.assignToObject(data);
+  }
 }
 
-export function distillify(dom, data) {
-  // thirdly, we optionally use these additional transforms when publishing on the Distill website
-  for (const transform of distillTransforms) {
-    transform(dom, data);
+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
+};

src/transforms/bibliography.js

@@ -1,27 +0,0 @@
-import { renderBibliography, templateString } from '../components/d-bibliography';
-
-export default function(dom, data) {
-  const bibliographyTag = dom.querySelector('d-bibliography');
-  if (!bibliographyTag) {
-    console.warn('No bibliography tag found!');
-    return;
-  }
-
-  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);
-
-}

src/transforms/byline.js

@@ -1,155 +1,8 @@
-import mustache from 'mustache';
-
-const html = `
-<style>
-  dt-byline {
-    font-size: 12px;
-    line-height: 18px;
-    display: block;
-    border-top: 1px solid rgba(0, 0, 0, 0.1);
-    border-bottom: 1px solid rgba(0, 0, 0, 0.1);
-    color: rgba(0, 0, 0, 0.5);
-    padding-top: 12px;
-    padding-bottom: 12px;
-    min-height: 90px;
-
-  }
-  dt-article.centered dt-byline {
-    text-align: center;
-
-  }
-  dt-byline a,
-  dt-article dt-byline a {
-    text-decoration: none;
-    border-bottom: none;
-  }
-  dt-article dt-byline a:hover {
-    text-decoration: underline;
-    border-bottom: none;
-  }
-  dt-byline .authors {
-    text-align: left;
-  }
-  dt-byline .name {
-    display: inline;
-    text-transform: uppercase;
-  }
-  dt-byline .affiliation {
-    display: inline;
-  }
-  dt-byline .date {
-    display: block;
-    text-align: left;
-  }
-  dt-byline .year, dt-byline .month {
-    display: inline;
-  }
-  dt-byline .citation {
-    display: block;
-    text-align: left;
-  }
-  dt-byline .citation div {
-    display: inline;
-  }
-
-  @media(min-width: 768px) {
-    dt-byline {
-    }
-  }
-
-  @media(min-width: 1080px) {
-    dt-byline {
-      border-bottom: none;
-      margin-bottom: 70px;
-    }
-
-    dt-byline a:hover {
-      color: rgba(0, 0, 0, 0.9);
-    }
-
-    dt-byline .authors {
-      display: inline-block;
-    }
-
-    dt-byline .author {
-      display: inline-block;
-      margin-right: 12px;
-      /*padding-left: 20px;*/
-      /*border-left: 1px solid #ddd;*/
-    }
-
-    dt-byline .affiliation {
-      display: block;
-    }
-
-    dt-byline .author:last-child {
-      margin-right: 0;
-    }
-
-    dt-byline .name {
-      display: block;
-    }
-
-    dt-byline .date {
-      border-left: 1px solid rgba(0, 0, 0, 0.1);
-      padding-left: 15px;
-      margin-left: 15px;
-      display: inline-block;
-    }
-    dt-byline .year, dt-byline .month {
-      display: block;
-    }
-
-    dt-byline .citation {
-      border-left: 1px solid rgba(0, 0, 0, 0.15);
-      padding-left: 15px;
-      margin-left: 15px;
-      display: inline-block;
-    }
-    dt-byline .citation div {
-      display: block;
-    }
-  }
-</style>
-
-`;
-
-const template = `
-<div class="byline">
-  <div class="authors">
-  {{#authors}}
-    <div class="author">
-      {{#personalURL}}
-        <a class="name" href="{{personalURL}}">{{name}}</a>
-      {{/personalURL}}
-      {{^personalURL}}
-        <div class="name">{{name}}</div>
-      {{/personalURL}}
-      {{#affiliation}}
-        {{#affiliationURL}}
-          <a class="affiliation" href="{{affiliationURL}}">{{affiliation}}</a>
-        {{/affiliationURL}}
-        {{^affiliationURL}}
-          <div class="affiliation">{{affiliation}}</div>
-        {{/affiliationURL}}
-      {{/affiliation}}
-    </div>
-    {{/authors}}
-  </div>
-  <div class="date">
-    <div class="month">{{publishedMonth}}. {{publishedDay}}</div>
-    <div class="year">{{publishedYear}}</div>
-  </div>
-  <a class="citation" href="#citation">
-    <div>Citation:</div>
-    <div>{{concatenatedAuthors}}, {{publishedYear}}</div>
-  </a>
-</div>
-`;
+import { bylineTemplate } from '../components/d-byline.js';
 
 export default function(dom, data) {
-  let el = dom.querySelector('dt-byline');
-  if (el) {
-    el.innerHTML = html + mustache.render(template, data);
+  const byline = dom.querySelector('d-byline');
+  if (byline) {
+    byline.innerHTML = bylineTemplate(data);
   }
 }

src/transforms/citation-list.js

@@ -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');
+  }
+}

src/transforms/citation.js

@@ -95,6 +95,7 @@ export default function(dom, data) {
   }
 
   function author_string(ent, template, sep, finalSep){
+    if (ent.author == null) { return ''; }
     var names = ent.author.split(' and ');
     let name_strings = names.map(name => {
       name = name.trim();

src/transforms/helpers/bibtex.js

@@ -1,33 +0,0 @@
-import bibtexParse from 'bibtex-parse-js';
-
-function normalizeTag(string) {
-  return string
-    .replace(/[\t\n ]+/g, ' ')
-    .replace(/{\\["^`.'acu~Hvs]( )?([a-zA-Z])}/g, (full, x, char) => char)
-    .replace(/{\\([a-zA-Z])}/g, (full, char) => char);
-}
-
-export function parseBibtex(bibtex) {
-  const bibliography = new Map();
-  const parsedEntries = bibtexParse.toJSON(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.type = entry.entryType;
-    // add to bibliography
-    bibliography.set(entry.citationKey, entry.entryTags);
-  }
-  return bibliography;
-}
-
-export function serializeFrontmatterToBibtex(frontMatter) {
-  return `@article{${frontMatter.slug},
-  author = {${frontMatter.bibtexAuthors}},
-  title = {${frontMatter.title}},
-  journal = {${frontMatter.journal.title}},
-  year = {${frontMatter.publishedYear}},
-  note = {${frontMatter.url}}
-}`;
-}

src/transforms/helpers/citation.js

@@ -1,165 +0,0 @@
-export function inline_cite_short(keys){
-  function cite_string(key){
-    if (key in data.bibliography){
-      var n = data.citations.indexOf(key)+1;
-      return ''+n;
-    } else {
-      return '?';
-    }
-  }
-  return '['+keys.map(cite_string).join(', ')+']';
-}
-
-export function inline_cite_long(keys){
-  function cite_string(key){
-    if (key in data.bibliography){
-      var ent = data.bibliography[key];
-      var names = ent.author.split(' and ');
-      names = names.map(name => name.split(',')[0].trim());
-      var year = ent.year;
-      if (names.length == 1) return names[0] + ', ' + year;
-      if (names.length == 2) return names[0] + ' & ' + names[1] + ', ' + year;
-      if (names.length  > 2) return names[0] + ', et al., ' + year;
-    } else {
-      return '?';
-    }
-  }
-  return keys.map(cite_string).join(', ');
-}
-
-function author_string(ent, template, sep, finalSep){
-  var names = ent.author.split(' and ');
-  let name_strings = names.map(name => {
-    name = name.trim();
-    if (name.indexOf(',') != -1){
-      var last = name.split(',')[0].trim();
-      var firsts = name.split(',')[1];
-    } else {
-      var last = name.split(' ').slice(-1)[0].trim();
-      var firsts = name.split(' ').slice(0,-1).join(' ');
-    }
-    var initials = '';
-    if (firsts != undefined) {
-      initials = firsts.trim().split(' ').map(s => s.trim()[0]);
-      initials = initials.join('.')+'.';
-    }
-    return template.replace('${F}', firsts)
-      .replace('${L}', last)
-      .replace('${I}', initials);
-  });
-  if (names.length > 1) {
-    var str = name_strings.slice(0, names.length-1).join(sep);
-    str += (finalSep || sep) + name_strings[names.length-1];
-    return str;
-  } else {
-    return name_strings[0];
-  }
-}
-
-function venue_string(ent) {
-  var cite = (ent.journal || ent.booktitle || '');
-  if ('volume' in ent){
-    var issue = ent.issue || ent.number;
-    issue = (issue != undefined)? '('+issue+')' : '';
-    cite += ', Vol ' + ent.volume + issue;
-  }
-  if ('pages' in ent){
-    cite += ', pp. ' + ent.pages;
-  }
-  if (cite != '') cite += '. ';
-  if ('publisher' in ent){
-    cite += ent.publisher;
-    if (cite[cite.length-1] != '.') cite += '.';
-  }
-  return cite;
-}
-
-function link_string(ent){
-  if ('url' in ent){
-    var url = ent.url;
-    var arxiv_match = (/arxiv\.org\/abs\/([0-9\.]*)/).exec(url);
-    if (arxiv_match != null){
-      url = `http://arxiv.org/pdf/${arxiv_match[1]}.pdf`;
-    }
-
-    if (url.slice(-4) == '.pdf'){
-      var label = 'PDF';
-    } else if (url.slice(-5) == '.html') {
-      var label = 'HTML';
-    }
-    return ` &ensp;<a href="${url}">[${label||'link'}]</a>`;
-  }/* else if ("doi" in ent){
-    return ` &ensp;<a href="https://doi.org/${ent.doi}" >[DOI]</a>`;
-  }*/ else {
-    return '';
-  }
-}
-function doi_string(ent, new_line){
-  if ('doi' in ent) {
-    return `${new_line?'<br>':''} <a href="https://doi.org/${ent.doi}" style="text-decoration:inherit;">DOI: ${ent.doi}</a>`;
-  } else {
-    return '';
-  }
-}
-
-export function bibliography_cite(ent, fancy){
-  if (ent){
-    var cite =  '<b>' + ent.title + '</b> ';
-    cite += link_string(ent) + '<br>';
-    cite += author_string(ent, '${L}, ${I}', ', ', ' and ');
-    if (ent.year || ent.date){
-      cite += ', ' + (ent.year || ent.date) + '. ';
-    } else {
-      cite += '. ';
-    }
-    cite += venue_string(ent);
-    cite += doi_string(ent);
-    return cite;
-    /*var cite =  author_string(ent, "${L}, ${I}", ", ", " and ");
-    if (ent.year || ent.date){
-      cite += ", " + (ent.year || ent.date) + ". "
-    } else {
-      cite += ". "
-    }
-    cite += "<b>" + ent.title + "</b>. ";
-    cite += venue_string(ent);
-    cite += doi_string(ent);
-    cite += link_string(ent);
-    return cite*/
-  } else {
-    return '?';
-  }
-}
-
-export function hover_cite(ent){
-  if (ent){
-    var cite = '';
-    cite += '<b>' + ent.title + '</b>';
-    cite += link_string(ent);
-    cite += '<br>';
-
-    var a_str = author_string(ent, '${I} ${L}', ', ') + '.';
-    var v_str = venue_string(ent).trim() + ' ' + ent.year + '. ' + doi_string(ent, true);
-
-    if ((a_str+v_str).length < Math.min(40, ent.title.length)) {
-      cite += a_str + ' ' + v_str;
-    } else {
-      cite += a_str + '<br>' + v_str;
-    }
-    return cite;
-  } else {
-    return '?';
-  }
-}
-
-
-//https://scholar.google.com/scholar?q=allintitle%3ADocument+author%3Aolah
-function get_GS_URL(ent){
-  if (ent){
-    var names = ent.author.split(' and ');
-    names = names.map(name => name.split(',')[0].trim());
-    var title = ent.title.split(' ');//.replace(/[,:]/, "")
-    var url = 'http://search.labs.crossref.org/dois?';//""https://scholar.google.com/scholar?"
-    url += uris({q: names.join(' ') + ' ' + title.join(' ')});
-  }
-}

src/transforms/helpers/hover-box.js

@@ -1,108 +0,0 @@
-function make_hover_css(pos) {
-  const pretty = window.innerWidth > 600;
-  const padding = pretty? 18 : 12;
-  const outer_padding = pretty ? 18 : 0;
-  const bbox = document.querySelector('body').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);
-  width = width - 2 * padding;
-  return (`position: absolute;
-     background-color: #FFF;
-     opacity: 0.95;
-     max-width: ${width}px;
-     top: ${top}px;
-     left: ${left}px;
-     border: 1px solid rgba(0, 0, 0, 0.25);
-     padding: ${padding}px;
-     border-radius: ${pretty? 3 : 0}px;
-     box-shadow: 0px 2px 10px 2px rgba(0, 0, 0, 0.2);
-     z-index: ${1e6};`);
-}
-
-export class HoverBox {
-
-  constructor(contentHTML, triggerElement) {
-    this.visible = false;
-    // div hold teh contents of the box that will become visible
-    this.div = contentHTML;
-    this.bindDivEvents(this.div);
-    // triggerElement holds the element that needs to be hovered etc to show contents
-    this.triggerElement = triggerElement;
-    this.bindTriggerEvents(this.triggerElement);
-    this.hide();
-  }
-
-  bindDivEvents(node) {
-    // For mice, same behavior as hovering on links
-    this.div.addEventListener('mouseover', () => {
-      if (!this.visible) this.showAtNode(node);
-      this.stopTimeout();
-    });
-    this.div.addEventListener('mouseout', () => {
-      this.extendTimeout(250);
-    });
-    // Don't trigger body touchstart event when touching within box
-    this.div.addEventListener('touchstart', (event) => {
-      event.stopPropagation();
-    }, {passive: true});
-    // Close box when touching outside box
-    document.body.addEventListener('touchstart', () => {
-      this.hide();
-    }, {passive: true});
-  }
-
-  bindTriggerEvents(node) {
-    node.addEventListener('mouseover', () => {
-      if (!this.visible) {
-        this.showAtNode(node);
-      }
-      this.stopTimeout();
-    });
-
-    node.addEventListener('mouseout', () => {
-      this.extendTimeout(250);
-    });
-
-    node.addEventListener('touchstart', (event) => {
-      if (this.visible) {
-        this.hide();
-      } else {
-        this.showAtNode(node);
-      }
-      // Don't trigger body touchstart event when touching link
-      event.stopPropagation();
-    }, {passive: true});
-  }
-
-  show(position) {
-    this.visible = true;
-    const css = make_hover_css(position);
-    this.div.setAttribute('style', css );
-  }
-
-  showAtNode(node) {
-    const bbox = node.getBoundingClientRect();
-    this.show([bbox.right, bbox.bottom]);
-  }
-
-  hide() {
-    this.visible = false;
-    this.div.setAttribute('style', 'display:none');
-    this.stopTimeout();
-  }
-
-  stopTimeout() {
-    if (this.timeout) {
-      clearTimeout(this.timeout);
-    }
-  }
-
-  extendTimeout(time) {
-    this.stopTimeout();
-    this.timeout = setTimeout(() => {
-      this.hide();
-    }, time);
-  }
-
-}

src/transforms/helpers/layout.js

@@ -1,33 +0,0 @@
-// const marginSmall = 16;
-// const marginLarge = 3 * marginSmall;
-// const margin = marginSmall + marginLarge;
-// const gutter = marginSmall;
-// const outsetAmount = margin / 2;
-// const numCols = 4;
-// const numGutters = numCols - 1;
-// const columnWidth = (768 - 2 * marginLarge - numGutters * gutter) / numCols;
-//
-// const screenwidth = 768;
-// const pageWidth = screenwidth - 2 * marginLarge;
-// const bodyWidth = pageWidth - columnWidth - gutter;
-
-export function body(selector) {
-  return `${selector} {
-      grid-column: margin-left / body;
-    }
-  `;
-}
-
-export function page(selector) {
-  return `${selector} {
-      grid-column: margin-left / page;
-    }
-  `;
-}
-
-export function screen(selector) {
-  return `${selector} {
-    grid-column: start / end;
-  }
-  `;
-}

src/transforms/helpers0/bibtex.js

@@ -1,33 +0,0 @@
-import bibtexParse from 'bibtex-parse-js';
-
-function normalizeTag(string) {
-  return string
-    .replace(/[\t\n ]+/g, ' ')
-    .replace(/{\\["^`.'acu~Hvs]( )?([a-zA-Z])}/g, (full, x, char) => char)
-    .replace(/{\\([a-zA-Z])}/g, (full, char) => char);
-}
-
-export function parseBibtex(bibtex) {
-  const bibliography = new Map();
-  const parsedEntries = bibtexParse.toJSON(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.type = entry.entryType;
-    // add to bibliography
-    bibliography.set(entry.citationKey, entry.entryTags);
-  }
-  return bibliography;
-}
-
-export function serializeFrontmatterToBibtex(frontMatter) {
-  return `@article{${frontMatter.slug},
-  author = {${frontMatter.bibtexAuthors}},
-  title = {${frontMatter.title}},
-  journal = {${frontMatter.journal.title}},
-  year = {${frontMatter.publishedYear}},
-  note = {${frontMatter.url}}
-}`;
-}

src/transforms/helpers0/citation.js

@@ -1,165 +0,0 @@
-export function inline_cite_short(keys){
-  function cite_string(key){
-    if (key in data.bibliography){
-      var n = data.citations.indexOf(key)+1;
-      return ''+n;
-    } else {
-      return '?';
-    }
-  }
-  return '['+keys.map(cite_string).join(', ')+']';
-}
-
-export function inline_cite_long(keys){
-  function cite_string(key){
-    if (key in data.bibliography){
-      var ent = data.bibliography[key];
-      var names = ent.author.split(' and ');
-      names = names.map(name => name.split(',')[0].trim());
-      var year = ent.year;
-      if (names.length == 1) return names[0] + ', ' + year;
-      if (names.length == 2) return names[0] + ' & ' + names[1] + ', ' + year;
-      if (names.length  > 2) return names[0] + ', et al., ' + year;
-    } else {
-      return '?';
-    }
-  }
-  return keys.map(cite_string).join(', ');
-}
-
-function author_string(ent, template, sep, finalSep){
-  var names = ent.author.split(' and ');
-  let name_strings = names.map(name => {
-    name = name.trim();
-    if (name.indexOf(',') != -1){
-      var last = name.split(',')[0].trim();
-      var firsts = name.split(',')[1];
-    } else {
-      var last = name.split(' ').slice(-1)[0].trim();
-      var firsts = name.split(' ').slice(0,-1).join(' ');
-    }
-    var initials = '';
-    if (firsts != undefined) {
-      initials = firsts.trim().split(' ').map(s => s.trim()[0]);
-      initials = initials.join('.')+'.';
-    }
-    return template.replace('${F}', firsts)
-      .replace('${L}', last)
-      .replace('${I}', initials);
-  });
-  if (names.length > 1) {
-    var str = name_strings.slice(0, names.length-1).join(sep);
-    str += (finalSep || sep) + name_strings[names.length-1];
-    return str;
-  } else {
-    return name_strings[0];
-  }
-}
-
-function venue_string(ent) {
-  var cite = (ent.journal || ent.booktitle || '');
-  if ('volume' in ent){
-    var issue = ent.issue || ent.number;
-    issue = (issue != undefined)? '('+issue+')' : '';
-    cite += ', Vol ' + ent.volume + issue;
-  }
-  if ('pages' in ent){
-    cite += ', pp. ' + ent.pages;
-  }
-  if (cite != '') cite += '. ';
-  if ('publisher' in ent){
-    cite += ent.publisher;
-    if (cite[cite.length-1] != '.') cite += '.';
-  }
-  return cite;
-}
-
-function link_string(ent){
-  if ('url' in ent){
-    var url = ent.url;
-    var arxiv_match = (/arxiv\.org\/abs\/([0-9\.]*)/).exec(url);
-    if (arxiv_match != null){
-      url = `http://arxiv.org/pdf/${arxiv_match[1]}.pdf`;
-    }
-
-    if (url.slice(-4) == '.pdf'){
-      var label = 'PDF';
-    } else if (url.slice(-5) == '.html') {
-      var label = 'HTML';
-    }
-    return ` &ensp;<a href="${url}">[${label||'link'}]</a>`;
-  }/* else if ("doi" in ent){
-    return ` &ensp;<a href="https://doi.org/${ent.doi}" >[DOI]</a>`;
-  }*/ else {
-    return '';
-  }
-}
-function doi_string(ent, new_line){
-  if ('doi' in ent) {
-    return `${new_line?'<br>':''} <a href="https://doi.org/${ent.doi}" style="text-decoration:inherit;">DOI: ${ent.doi}</a>`;
-  } else {
-    return '';
-  }
-}
-
-export function bibliography_cite(ent, fancy){
-  if (ent){
-    var cite =  '<b>' + ent.title + '</b> ';
-    cite += link_string(ent) + '<br>';
-    cite += author_string(ent, '${L}, ${I}', ', ', ' and ');
-    if (ent.year || ent.date){
-      cite += ', ' + (ent.year || ent.date) + '. ';
-    } else {
-      cite += '. ';
-    }
-    cite += venue_string(ent);
-    cite += doi_string(ent);
-    return cite;
-    /*var cite =  author_string(ent, "${L}, ${I}", ", ", " and ");
-    if (ent.year || ent.date){
-      cite += ", " + (ent.year || ent.date) + ". "
-    } else {
-      cite += ". "
-    }
-    cite += "<b>" + ent.title + "</b>. ";
-    cite += venue_string(ent);
-    cite += doi_string(ent);
-    cite += link_string(ent);
-    return cite*/
-  } else {
-    return '?';
-  }
-}
-
-export function hover_cite(ent){
-  if (ent){
-    var cite = '';
-    cite += '<b>' + ent.title + '</b>';
-    cite += link_string(ent);
-    cite += '<br>';
-
-    var a_str = author_string(ent, '${I} ${L}', ', ') + '.';
-    var v_str = venue_string(ent).trim() + ' ' + ent.year + '. ' + doi_string(ent, true);
-
-    if ((a_str+v_str).length < Math.min(40, ent.title.length)) {
-      cite += a_str + ' ' + v_str;
-    } else {
-      cite += a_str + '<br>' + v_str;
-    }
-    return cite;
-  } else {
-    return '?';
-  }
-}
-
-
-//https://scholar.google.com/scholar?q=allintitle%3ADocument+author%3Aolah
-function get_GS_URL(ent){
-  if (ent){
-    var names = ent.author.split(' and ');
-    names = names.map(name => name.split(',')[0].trim());
-    var title = ent.title.split(' ');//.replace(/[,:]/, "")
-    var url = 'http://search.labs.crossref.org/dois?';//""https://scholar.google.com/scholar?"
-    url += uris({q: names.join(' ') + ' ' + title.join(' ')});
-  }
-}

src/transforms/helpers0/hover-box.js

@@ -1,108 +0,0 @@
-function make_hover_css(pos) {
-  const pretty = window.innerWidth > 600;
-  const padding = pretty? 18 : 12;
-  const outer_padding = pretty ? 18 : 0;
-  const bbox = document.querySelector('body').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);
-  width = width - 2 * padding;
-  return (`position: absolute;
-     background-color: #FFF;
-     opacity: 0.95;
-     max-width: ${width}px;
-     top: ${top}px;
-     left: ${left}px;
-     border: 1px solid rgba(0, 0, 0, 0.25);
-     padding: ${padding}px;
-     border-radius: ${pretty? 3 : 0}px;
-     box-shadow: 0px 2px 10px 2px rgba(0, 0, 0, 0.2);
-     z-index: ${1e6};`);
-}
-
-export class HoverBox {
-
-  constructor(contentHTML, triggerElement) {
-    this.visible = false;
-    // div hold teh contents of the box that will become visible
-    this.div = contentHTML;
-    this.bindDivEvents(this.div);
-    // triggerElement holds the element that needs to be hovered etc to show contents
-    this.triggerElement = triggerElement;
-    this.bindTriggerEvents(this.triggerElement);
-    this.hide();
-  }
-
-  bindDivEvents(node) {
-    // For mice, same behavior as hovering on links
-    this.div.addEventListener('mouseover', () => {
-      if (!this.visible) this.showAtNode(node);
-      this.stopTimeout();
-    });
-    this.div.addEventListener('mouseout', () => {
-      this.extendTimeout(250);
-    });
-    // Don't trigger body touchstart event when touching within box
-    this.div.addEventListener('touchstart', (event) => {
-      event.stopPropagation();
-    }, {passive: true});
-    // Close box when touching outside box
-    document.body.addEventListener('touchstart', () => {
-      this.hide();
-    }, {passive: true});
-  }
-
-  bindTriggerEvents(node) {
-    node.addEventListener('mouseover', () => {
-      if (!this.visible) {
-        this.showAtNode(node);
-      }
-      this.stopTimeout();
-    });
-
-    node.addEventListener('mouseout', () => {
-      this.extendTimeout(250);
-    });
-
-    node.addEventListener('touchstart', (event) => {
-      if (this.visible) {
-        this.hide();
-      } else {
-        this.showAtNode(node);
-      }
-      // Don't trigger body touchstart event when touching link
-      event.stopPropagation();
-    }, {passive: true});
-  }
-
-  show(position) {
-    this.visible = true;
-    const css = make_hover_css(position);
-    this.div.setAttribute('style', css );
-  }
-
-  showAtNode(node) {
-    const bbox = node.getBoundingClientRect();
-    this.show([bbox.right, bbox.bottom]);
-  }
-
-  hide() {
-    this.visible = false;
-    this.div.setAttribute('style', 'display:none');
-    this.stopTimeout();
-  }
-
-  stopTimeout() {
-    if (this.timeout) {
-      clearTimeout(this.timeout);
-    }
-  }
-
-  extendTimeout(time) {
-    this.stopTimeout();
-    this.timeout = setTimeout(() => {
-      this.hide();
-    }, time);
-  }
-
-}

src/transforms/helpers0/layout.js

@@ -1,33 +0,0 @@
-// const marginSmall = 16;
-// const marginLarge = 3 * marginSmall;
-// const margin = marginSmall + marginLarge;
-// const gutter = marginSmall;
-// const outsetAmount = margin / 2;
-// const numCols = 4;
-// const numGutters = numCols - 1;
-// const columnWidth = (768 - 2 * marginLarge - numGutters * gutter) / numCols;
-//
-// const screenwidth = 768;
-// const pageWidth = screenwidth - 2 * marginLarge;
-// const bodyWidth = pageWidth - columnWidth - gutter;
-
-export function body(selector) {
-  return `${selector} {
-      grid-column: margin-left / body;
-    }
-  `;
-}
-
-export function page(selector) {
-  return `${selector} {
-      grid-column: margin-left / page;
-    }
-  `;
-}
-
-export function screen(selector) {
-  return `${selector} {
-    grid-column: start / end;
-  }
-  `;
-}

src/transforms/helpers1/bibtex.js

@@ -1,33 +0,0 @@
-import bibtexParse from 'bibtex-parse-js';
-
-function normalizeTag(string) {
-  return string
-    .replace(/[\t\n ]+/g, ' ')
-    .replace(/{\\["^`.'acu~Hvs]( )?([a-zA-Z])}/g, (full, x, char) => char)
-    .replace(/{\\([a-zA-Z])}/g, (full, char) => char);
-}
-
-export function parseBibtex(bibtex) {
-  const bibliography = new Map();
-  const parsedEntries = bibtexParse.toJSON(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.type = entry.entryType;
-    // add to bibliography
-    bibliography.set(entry.citationKey, entry.entryTags);
-  }
-  return bibliography;
-}
-
-export function serializeFrontmatterToBibtex(frontMatter) {
-  return `@article{${frontMatter.slug},
-  author = {${frontMatter.bibtexAuthors}},
-  title = {${frontMatter.title}},
-  journal = {${frontMatter.journal.title}},
-  year = {${frontMatter.publishedYear}},
-  note = {${frontMatter.url}}
-}`;
-}

src/transforms/helpers1/citation.js

@@ -1,165 +0,0 @@
-export function inline_cite_short(keys){
-  function cite_string(key){
-    if (key in data.bibliography){
-      var n = data.citations.indexOf(key)+1;
-      return ''+n;
-    } else {
-      return '?';
-    }
-  }
-  return '['+keys.map(cite_string).join(', ')+']';
-}
-
-export function inline_cite_long(keys){
-  function cite_string(key){
-    if (key in data.bibliography){
-      var ent = data.bibliography[key];
-      var names = ent.author.split(' and ');
-      names = names.map(name => name.split(',')[0].trim());
-      var year = ent.year;
-      if (names.length == 1) return names[0] + ', ' + year;
-      if (names.length == 2) return names[0] + ' & ' + names[1] + ', ' + year;
-      if (names.length  > 2) return names[0] + ', et al., ' + year;
-    } else {
-      return '?';
-    }
-  }
-  return keys.map(cite_string).join(', ');
-}
-
-function author_string(ent, template, sep, finalSep){
-  var names = ent.author.split(' and ');
-  let name_strings = names.map(name => {
-    name = name.trim();
-    if (name.indexOf(',') != -1){
-      var last = name.split(',')[0].trim();
-      var firsts = name.split(',')[1];
-    } else {
-      var last = name.split(' ').slice(-1)[0].trim();
-      var firsts = name.split(' ').slice(0,-1).join(' ');
-    }
-    var initials = '';
-    if (firsts != undefined) {
-      initials = firsts.trim().split(' ').map(s => s.trim()[0]);
-      initials = initials.join('.')+'.';
-    }
-    return template.replace('${F}', firsts)
-      .replace('${L}', last)
-      .replace('${I}', initials);
-  });
-  if (names.length > 1) {
-    var str = name_strings.slice(0, names.length-1).join(sep);
-    str += (finalSep || sep) + name_strings[names.length-1];
-    return str;
-  } else {
-    return name_strings[0];
-  }
-}
-
-function venue_string(ent) {
-  var cite = (ent.journal || ent.booktitle || '');
-  if ('volume' in ent){
-    var issue = ent.issue || ent.number;
-    issue = (issue != undefined)? '('+issue+')' : '';
-    cite += ', Vol ' + ent.volume + issue;
-  }
-  if ('pages' in ent){
-    cite += ', pp. ' + ent.pages;
-  }
-  if (cite != '') cite += '. ';
-  if ('publisher' in ent){
-    cite += ent.publisher;
-    if (cite[cite.length-1] != '.') cite += '.';
-  }
-  return cite;
-}
-
-function link_string(ent){
-  if ('url' in ent){
-    var url = ent.url;
-    var arxiv_match = (/arxiv\.org\/abs\/([0-9\.]*)/).exec(url);
-    if (arxiv_match != null){
-      url = `http://arxiv.org/pdf/${arxiv_match[1]}.pdf`;
-    }
-
-    if (url.slice(-4) == '.pdf'){
-      var label = 'PDF';
-    } else if (url.slice(-5) == '.html') {
-      var label = 'HTML';
-    }
-    return ` &ensp;<a href="${url}">[${label||'link'}]</a>`;
-  }/* else if ("doi" in ent){
-    return ` &ensp;<a href="https://doi.org/${ent.doi}" >[DOI]</a>`;
-  }*/ else {
-    return '';
-  }
-}
-function doi_string(ent, new_line){
-  if ('doi' in ent) {
-    return `${new_line?'<br>':''} <a href="https://doi.org/${ent.doi}" style="text-decoration:inherit;">DOI: ${ent.doi}</a>`;
-  } else {
-    return '';
-  }
-}
-
-export function bibliography_cite(ent, fancy){
-  if (ent){
-    var cite =  '<b>' + ent.title + '</b> ';
-    cite += link_string(ent) + '<br>';
-    cite += author_string(ent, '${L}, ${I}', ', ', ' and ');
-    if (ent.year || ent.date){
-      cite += ', ' + (ent.year || ent.date) + '. ';
-    } else {
-      cite += '. ';
-    }
-    cite += venue_string(ent);
-    cite += doi_string(ent);
-    return cite;
-    /*var cite =  author_string(ent, "${L}, ${I}", ", ", " and ");
-    if (ent.year || ent.date){
-      cite += ", " + (ent.year || ent.date) + ". "
-    } else {
-      cite += ". "
-    }
-    cite += "<b>" + ent.title + "</b>. ";
-    cite += venue_string(ent);
-    cite += doi_string(ent);
-    cite += link_string(ent);
-    return cite*/
-  } else {
-    return '?';
-  }
-}
-
-export function hover_cite(ent){
-  if (ent){
-    var cite = '';
-    cite += '<b>' + ent.title + '</b>';
-    cite += link_string(ent);
-    cite += '<br>';
-
-    var a_str = author_string(ent, '${I} ${L}', ', ') + '.';
-    var v_str = venue_string(ent).trim() + ' ' + ent.year + '. ' + doi_string(ent, true);
-
-    if ((a_str+v_str).length < Math.min(40, ent.title.length)) {
-      cite += a_str + ' ' + v_str;
-    } else {
-      cite += a_str + '<br>' + v_str;
-    }
-    return cite;
-  } else {
-    return '?';
-  }
-}
-
-
-//https://scholar.google.com/scholar?q=allintitle%3ADocument+author%3Aolah
-function get_GS_URL(ent){
-  if (ent){
-    var names = ent.author.split(' and ');
-    names = names.map(name => name.split(',')[0].trim());
-    var title = ent.title.split(' ');//.replace(/[,:]/, "")
-    var url = 'http://search.labs.crossref.org/dois?';//""https://scholar.google.com/scholar?"
-    url += uris({q: names.join(' ') + ' ' + title.join(' ')});
-  }
-}

src/transforms/helpers1/hover-box.js

@@ -1,108 +0,0 @@
-function make_hover_css(pos) {
-  const pretty = window.innerWidth > 600;
-  const padding = pretty? 18 : 12;
-  const outer_padding = pretty ? 18 : 0;
-  const bbox = document.querySelector('body').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);
-  width = width - 2 * padding;
-  return (`position: absolute;
-     background-color: #FFF;
-     opacity: 0.95;
-     max-width: ${width}px;
-     top: ${top}px;
-     left: ${left}px;
-     border: 1px solid rgba(0, 0, 0, 0.25);
-     padding: ${padding}px;
-     border-radius: ${pretty? 3 : 0}px;
-     box-shadow: 0px 2px 10px 2px rgba(0, 0, 0, 0.2);
-     z-index: ${1e6};`);
-}
-
-export class HoverBox {
-
-  constructor(contentHTML, triggerElement) {
-    this.visible = false;
-    // div hold teh contents of the box that will become visible
-    this.div = contentHTML;
-    this.bindDivEvents(this.div);
-    // triggerElement holds the element that needs to be hovered etc to show contents
-    this.triggerElement = triggerElement;
-    this.bindTriggerEvents(this.triggerElement);
-    this.hide();
-  }
-
-  bindDivEvents(node) {
-    // For mice, same behavior as hovering on links
-    this.div.addEventListener('mouseover', () => {
-      if (!this.visible) this.showAtNode(node);
-      this.stopTimeout();
-    });
-    this.div.addEventListener('mouseout', () => {
-      this.extendTimeout(250);
-    });
-    // Don't trigger body touchstart event when touching within box
-    this.div.addEventListener('touchstart', (event) => {
-      event.stopPropagation();
-    }, {passive: true});
-    // Close box when touching outside box
-    document.body.addEventListener('touchstart', () => {
-      this.hide();
-    }, {passive: true});
-  }
-
-  bindTriggerEvents(node) {
-    node.addEventListener('mouseover', () => {
-      if (!this.visible) {
-        this.showAtNode(node);
-      }
-      this.stopTimeout();
-    });
-
-    node.addEventListener('mouseout', () => {
-      this.extendTimeout(250);
-    });
-
-    node.addEventListener('touchstart', (event) => {
-      if (this.visible) {
-        this.hide();
-      } else {
-        this.showAtNode(node);
-      }
-      // Don't trigger body touchstart event when touching link
-      event.stopPropagation();
-    }, {passive: true});
-  }
-
-  show(position) {
-    this.visible = true;
-    const css = make_hover_css(position);
-    this.div.setAttribute('style', css );
-  }
-
-  showAtNode(node) {
-    const bbox = node.getBoundingClientRect();
-    this.show([bbox.right, bbox.bottom]);
-  }
-
-  hide() {
-    this.visible = false;
-    this.div.setAttribute('style', 'display:none');
-    this.stopTimeout();
-  }
-
-  stopTimeout() {
-    if (this.timeout) {
-      clearTimeout(this.timeout);
-    }
-  }
-
-  extendTimeout(time) {
-    this.stopTimeout();
-    this.timeout = setTimeout(() => {
-      this.hide();
-    }, time);
-  }
-
-}

src/transforms/helpers1/layout.js

@@ -1,33 +0,0 @@
-// const marginSmall = 16;
-// const marginLarge = 3 * marginSmall;
-// const margin = marginSmall + marginLarge;
-// const gutter = marginSmall;
-// const outsetAmount = margin / 2;
-// const numCols = 4;
-// const numGutters = numCols - 1;
-// const columnWidth = (768 - 2 * marginLarge - numGutters * gutter) / numCols;
-//
-// const screenwidth = 768;
-// const pageWidth = screenwidth - 2 * marginLarge;
-// const bodyWidth = pageWidth - columnWidth - gutter;
-
-export function body(selector) {
-  return `${selector} {
-      grid-column: margin-left / body;
-    }
-  `;
-}
-
-export function page(selector) {
-  return `${selector} {
-      grid-column: margin-left / page;
-    }
-  `;
-}
-
-export function screen(selector) {
-  return `${selector} {
-    grid-column: start / end;
-  }
-  `;
-}

src/transforms/mathematics.js

@@ -0,0 +1,39 @@
+import katex from 'katex';
+import { renderMathInElement } from '../helpers/katex-auto-render';
+
+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);
+  }
+
+  // render d-math tags
+  const mathTags = article.querySelectorAll('d-math');
+  if (mathTags.length > 0) {
+    needsCSS = true;
+    console.warn(`Prerendering ${mathTags.length} math tags...`);
+    for (const mathTag of mathTags) {
+      const localOptions = { displayMode: mathTag.hasAttribute('block') };
+      const options = Object.assign(localOptions, data.katex);
+      const html = katex.renderToString(mathTag.textContent, options);
+      const container = dom.createElement('span');
+      container.innerHTML = html;
+      mathTag.parentElement.insertBefore(container, mathTag);
+      mathTag.parentElement.removeChild(mathTag);
+    }
+  }
+
+  if (needsCSS) {
+    const katexCSSTag = '<link rel="stylesheet" href="https://distill.pub/third-party/katex/katex.min.css" crossorigin="anonymous">';
+    dom.head.insertAdjacentHTML('beforeend', katexCSSTag);
+  }
+
+}

src/transforms/meta.js

@@ -1,39 +1,63 @@
+// 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}" />
+    `);
+  }
+
+  if (data.updatedDate) {
+    appendHead(`
+    <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 +65,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 +82,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 +101,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!');
   }
 }
 
@@ -95,19 +125,42 @@ function appendHtml(el, html) {
 
 function citation_meta_content(ref){
   var content = `citation_title=${ref.title};`;
-  ref.author.split(' and ').forEach(author => {
-    content += `citation_author=${author.trim()};`;
-  });
+
+  if (ref.author && ref.author !== '') {
+    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};`;
+  }
+
+  // Special test for arxiv
+  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;
 }

src/transforms/optional-components.js

@@ -0,0 +1,73 @@
+// no appendix -> add appendix
+// 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
+
+export default function(dom, data) {
+  const body = dom.body;
+  const article = body.querySelector('d-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 byline = dom.querySelector('d-byline');
+  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');
+  if (!appendix) {
+    appendix = dom.createElement('d-appendix');
+    dom.body.appendChild(appendix);
+  }
+
+  let footnoteList = dom.querySelector('d-footnote-list');
+  if (!footnoteList) {
+    footnoteList = dom.createElement('d-footnote-list');
+    appendix.appendChild(footnoteList);
+  }
+
+  let citationList = dom.querySelector('d-citation-list');
+  if (!citationList) {
+    citationList = dom.createElement('d-citation-list');
+    appendix.appendChild(citationList);
+  }
+
+}

src/transforms/polyfills.js

@@ -1,52 +1,78 @@
 const webcomponentPath = 'https://distill.pub/third-party/polyfills/webcomponents-lite.js';
 const intersectionObserverPath = 'https://distill.pub/third-party/polyfills/intersection-observer.js';
 
-const template = `
-if ('IntersectionObserver' in window &&
-  'IntersectionObserverEntry' in window &&
-  'intersectionRatio' in IntersectionObserverEntry.prototype) {
-    // Platform supports IntersectionObserver natively! :-)
-    if (!('isIntersecting' in IntersectionObserverEntry.prototype)) {
-      Object.defineProperty(IntersectionObserverEntry.prototype,
-        'isIntersecting', {
-        get: function () {
-          return this.intersectionRatio > 0;
-        }
-      });
-    }
-} else {
-  // Platform does not support webcomponents--loading polyfills synchronously.
-  const scriptTag = document.createElement('script');
-  scriptTag.src = '${intersectionObserverPath}';
-  scriptTag.async = false;
-  document.currentScript.parentNode.insertBefore(scriptTag, document.currentScript.nextSibling);
-}
+// const template = `
+// if ('IntersectionObserver' in window &&
+//   'IntersectionObserverEntry' in window &&
+//   'intersectionRatio' in IntersectionObserverEntry.prototype) {
+//     // Platform supports IntersectionObserver natively! :-)
+//     if (!('isIntersecting' in IntersectionObserverEntry.prototype)) {
+//       Object.defineProperty(IntersectionObserverEntry.prototype,
+//         'isIntersecting', {
+//         get: function () {
+//           return this.intersectionRatio > 0;
+//         }
+//       });
+//     }
+// } else {
+//   // Platform does not support webcomponents--loading polyfills synchronously.
+//   const scriptTag = document.createElement('script');
+//   scriptTag.src = '${intersectionObserverPath}';
+//   scriptTag.async = false;
+//   document.currentScript.parentNode.insertBefore(scriptTag, document.currentScript.nextSibling);
+// }
+//
+// if ('registerElement' in document &&
+//     'import' in document.createElement('link') &&
+//     'content' in document.createElement('template')) {
+//   // Platform supports webcomponents natively! :-)
+// } else {
+//   // Platform does not support webcomponents--loading polyfills synchronously.
+//   const scriptTag = document.createElement('script');
+//   scriptTag.src = '${webcomponentPath}';
+//   scriptTag.async = false;
+//   document.currentScript.parentNode.insertBefore(scriptTag, document.currentScript.nextSibling);
+// }
+//
+//
+// `;
 
-if ('registerElement' in document &&
-    'import' in document.createElement('link') &&
-    'content' in document.createElement('template')) {
-  // Platform supports webcomponents natively! :-)
-} else {
-  // Platform does not support webcomponents--loading polyfills synchronously.
-  const scriptTag = document.createElement('script');
-  scriptTag.src = '${webcomponentPath}';
-  scriptTag.async = false;
-  document.currentScript.parentNode.insertBefore(scriptTag, document.currentScript.nextSibling);
-}
+
+const addBackIn = `
+window.addEventListener('WebComponentsReady', function() {
+  console.warn('WebComponentsReady');
+  const loaderTag = document.createElement('script');
+  loaderTag.src = 'https://distill.pub/template.v2.js';
+  document.head.insertBefore(loaderTag, document.head.firstChild);
+});
 `;
 
 export default function render(dom) {
+  // pull out template script tag
+  const templateTag = dom.querySelector('script[src*="template.v2.js"]');
+  if (templateTag) {
+    templateTag.parentNode.removeChild(templateTag);
+  } else {
+    console.info('FYI: Did not find template tag when trying to remove it. You may not have added it. Be aware that our polyfills will add it.')
+  }
+
+  // add loader
+  const loaderTag = dom.createElement('script');
+  loaderTag.src = 'https://cdnjs.cloudflare.com/ajax/libs/webcomponentsjs/1.0.17/webcomponents-loader.js';
+  dom.head.insertBefore(loaderTag, dom.head.firstChild);
+
+  // add loader event listener to add tempalrte back in
+  const addTag = dom.createElement('script');
+  addTag.innerHTML = addBackIn;
+  dom.head.insertBefore(addTag, dom.head.firstChild);
+
+
   // create polyfill script tag
-  const polyfillScriptTag = dom.createElement('script');
-  polyfillScriptTag.innerHTML = template;
-  polyfillScriptTag.id = 'polyfills';
+  // const polyfillScriptTag = dom.createElement('script');
+  // polyfillScriptTag.innerHTML = template;
+  // polyfillScriptTag.id = 'polyfills';
 
   // insert at appropriate position--before any other script tag
-  const head = dom.querySelector('head');
-  const firstScriptTag = dom.querySelector('script');
-  if (firstScriptTag) {
-    head.insertBefore(polyfillScriptTag, firstScriptTag);
-  } else {
-    head.appendChild(polyfillScriptTag);
-  }
+  // const firstScriptTag = dom.head.querySelector('script');
+  // dom.head.insertBefore(polyfillScriptTag, firstScriptTag);
 }

src/transforms/reorder.js

@@ -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);
+}

src/transforms/styles-article.css

@@ -1,269 +0,0 @@
-dt-article {
-  display: block;
-  color: rgba(0, 0, 0, 0.8);
-  font: 17px/1.55em -apple-system, BlinkMacSystemFont, "Roboto", sans-serif;
-  padding-bottom: 72px;
-  overflow: hidden;
-  background: white;
-  min-height: calc(100vh - 70px - 182px);
-}
-
-@media(min-width: 1024px) {
-  dt-article {
-    font-size: 20px;
-  }
-}
-
-/* H1 */
-
-dt-article h1 {
-  margin-top: 18px;
-  font-weight: 400;
-  font-size: 40px;
-  line-height: 1em;
-  font-family: HoeflerText-Regular, Cochin, Georgia, serif;
-}
-@media(min-width: 768px) {
-  dt-article h1 {
-    font-size: 46px;
-    margin-top: 48px;
-    margin-bottom: 12px;
-  }
-}
-
-@media(min-width: 1080px) {
-  .centered h1 {
-    text-align: center;
-  }
-
-  dt-article h1 {
-    font-size: 50px;
-    letter-spacing: -0.02em;
-  }
-
-  dt-article > h1:first-of-type,
-  dt-article section > h1:first-of-type {
-    margin-top: 80px;
-  }
-}
-
-
-@media(min-width: 1200px) {
-  dt-article h1 {
-    font-size: 56px;
-  }
-
-  dt-article > h1:first-of-type {
-    margin-top: 100px;
-  }
-}
-
-/* H2 */
-
-dt-article h2 {
-  font-family: HoeflerText-Regular, Cochin, Georgia, serif;
-  font-weight: 400;
-  font-size: 26px;
-  line-height: 1.25em;
-  margin-top: 36px;
-  margin-bottom: 24px;
-}
-
-@media(min-width: 1024px) {
-  dt-article h2 {
-    margin-top: 48px;
-    font-size: 30px;
-  }
-}
-
-dt-article h1 + h2 {
-  font-weight: 300;
-  font-size: 20px;
-  line-height: 1.4em;
-  margin-top: 8px;
-  font-style: normal;
-}
-
-
-@media(min-width: 1080px) {
-  .centered h1 + h2 {
-    text-align: center;
-  }
-  dt-article h1 + h2 {
-    margin-top: 12px;
-    font-size: 24px;
-  }
-}
-
-/* H3 */
-
-dt-article h3 {
-  font-family: HoeflerText-Regular, Georgia, serif;
-  font-weight: 400;
-  font-size: 20px;
-  line-height: 1.4em;
-  margin-top: 36px;
-  margin-bottom: 18px;
-  font-style: italic;
-}
-
-dt-article h1 + h3 {
-  margin-top: 48px;
-}
-
-@media(min-width: 1024px) {
-  dt-article h3 {
-    font-size: 26px;
-  }
-}
-
-/* H4 */
-
-dt-article h4 {
-  font-weight: 600;
-  text-transform: uppercase;
-  font-size: 14px;
-  line-height: 1.4em;
-}
-
-dt-article a {
-  color: inherit;
-}
-
-dt-article p,
-dt-article ul,
-dt-article ol {
-  margin-bottom: 24px;
-  font-family: Georgia, serif;
-}
-
-dt-article p b,
-dt-article ul b,
-dt-article ol b {
-  -webkit-font-smoothing: antialiased;
-}
-
-dt-article a {
-  border-bottom: 1px solid rgba(0, 0, 0, 0.4);
-  text-decoration: none;
-}
-
-dt-article a:hover {
-  border-bottom: 1px solid rgba(0, 0, 0, 0.8);
-}
-
-dt-article .link {
-  text-decoration: underline;
-  cursor: pointer;
-}
-
-dt-article ul,
-dt-article ol {
-  padding-left: 24px;
-}
-
-dt-article li {
-  margin-bottom: 24px;
-  margin-left: 0;
-  padding-left: 0;
-}
-
-dt-article pre {
-  font-size: 14px;
-  margin-bottom: 20px;
-}
-
-
-dt-article hr {
-  border: none;
-  border-bottom: 1px solid rgba(0, 0, 0, 0.2);
-  margin-top: 60px;
-  margin-bottom: 60px;
-}
-
-dt-article section {
-  margin-top: 60px;
-  margin-bottom: 60px;
-}
-
-
-/* Figure */
-
-dt-article figure {
-  position: relative;
-  margin-top: 30px;
-  margin-bottom: 30px;
-}
-
-@media(min-width: 1024px) {
-  dt-article figure {
-    margin-top: 48px;
-    margin-bottom: 48px;
-  }
-}
-
-dt-article figure img {
-  width: 100%;
-}
-
-dt-article figure svg text,
-dt-article figure svg tspan {
-}
-
-dt-article figure figcaption {
-  color: rgba(0, 0, 0, 0.6);
-  font-size: 12px;
-  line-height: 1.5em;
-}
-@media(min-width: 1024px) {
-  dt-article figure figcaption {
-    font-size: 13px;
-  }
-}
-
-dt-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;
-}
-
-dt-article figure figcaption a {
-  color: rgba(0, 0, 0, 0.6);
-}
-
-/*dt-article figure figcaption::before {
-  position: relative;
-  display: block;
-  top: -20px;
-  content: "";
-  width: 25px;
-  border-top: 1px solid rgba(0, 0, 0, 0.3);
-}*/
-
-dt-article span.equation-mimic {
-  font-family: georgia;
-  font-size: 115%;
-  font-style: italic;
-}
-
-dt-article figure figcaption b {
-  font-weight: 600;
-  color: rgba(0, 0, 0, 1.0);
-}
-
-dt-article > dt-code,
-dt-article section > dt-code  {
-  display: block;
-}
-
-dt-article .citation {
-  color: #668;
-  cursor: pointer;
-}
-
-dt-include {
-  width: auto;
-  display: block;
-}

src/transforms/styles-base.css

@@ -1,67 +0,0 @@
-html {
-  font: 400 16px/1.55em -apple-system, BlinkMacSystemFont, "Roboto", Helvetica, sans-serif;
-  /*background-color: hsl(223, 9%, 25%);*/
-  -ms-text-size-adjust: 100%;
-  -webkit-text-size-adjust: 100%;
-  text-size-adjust: 100%;
-}
-body {
-  margin: 0;
-  /*background-color: hsl(223, 9%, 25%);*/
-}
-
-a {
-  color: #004276;
-}
-
-figure {
-  margin: 0;
-}
-
-h1 {
-  font-family: Cochin, Georgia, serif;
-}
-
-/*
-html, body, div, span, applet, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-a, abbr, acronym, address, big, cite, code,
-del, dfn, em, img, ins, kbd, q, s, samp,
-small, strike, strong, sub, sup, tt, var,
-b, u, i, center,
-dl, dt, dd, ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, embed,
-figure, figcaption, footer, header, hgroup,
-menu, nav, output, ruby, section, summary,
-time, mark, audio, video {
-	margin: 0;
-	padding: 0;
-	border: 0;
-	font-size: 100%;
-	font: inherit;
-	vertical-align: baseline;
-}
-article, aside, details, figcaption, figure,
-footer, header, hgroup, menu, nav, section {
-	display: block;
-}
-body {
-	line-height: 1;
-}
-ol, ul {
-	list-style: none;
-}
-blockquote, q {
-	quotes: none;
-}
-blockquote:before, blockquote:after,
-q:before, q:after {
-	content: '';
-	content: none;
-}
-table {
-	border-collapse: collapse;
-	border-spacing: 0;
-}*/

src/transforms/styles-code.css

@@ -1,147 +0,0 @@
-/**
- * prism.js default theme for JavaScript, CSS and HTML
- * Based on dabblet (http://dabblet.com)
- * @author Lea Verou
- */
-
-code {
-  white-space: nowrap;
-  background: rgba(0, 0, 0, 0.04);
-  border-radius: 2px;
-  padding: 4px 7px;
-  font-size: 15px;
-  color: rgba(0, 0, 0, 0.6);
-}
-
-pre code {
-  display: block;
-  background: white;
-  border-left: 3px solid rgba(0, 0, 0, 0.05);
-  padding: 0 0 0 24px;
-}
-
-
-code[class*="language-"],
-pre[class*="language-"] {
-  text-shadow: 0 1px white;
-  font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
-  text-align: left;
-  white-space: pre;
-  word-spacing: normal;
-  word-break: normal;
-  word-wrap: normal;
-  line-height: 1.5;
-
-  -moz-tab-size: 4;
-  -o-tab-size: 4;
-  tab-size: 4;
-
-  -webkit-hyphens: none;
-  -moz-hyphens: none;
-  -ms-hyphens: none;
-  hyphens: none;
-}
-
-pre[class*="language-"]::-moz-selection, pre[class*="language-"] ::-moz-selection,
-code[class*="language-"]::-moz-selection, code[class*="language-"] ::-moz-selection {
-  text-shadow: none;
-  background: #b3d4fc;
-}
-
-pre[class*="language-"]::selection, pre[class*="language-"] ::selection,
-code[class*="language-"]::selection, code[class*="language-"] ::selection {
-  text-shadow: none;
-  background: #b3d4fc;
-}
-
-@media print {
-  code[class*="language-"],
-  pre[class*="language-"] {
-  text-shadow: none;
-  }
-}
-
-/* Code blocks */
-pre[class*="language-"] {
-  overflow: auto;
-}
-
-:not(pre) > code[class*="language-"],
-pre[class*="language-"] {
-}
-
-/* Inline code */
-:not(pre) > code[class*="language-"] {
-  white-space: normal;
-}
-
-.token.comment,
-.token.prolog,
-.token.doctype,
-.token.cdata {
-  color: slategray;
-}
-
-.token.punctuation {
-  color: #999;
-}
-
-.namespace {
-  opacity: .7;
-}
-
-.token.property,
-.token.tag,
-.token.boolean,
-.token.number,
-.token.constant,
-.token.symbol,
-.token.deleted {
-  color: #905;
-}
-
-.token.selector,
-.token.attr-name,
-.token.string,
-.token.char,
-.token.builtin,
-.token.inserted {
-  color: #690;
-}
-
-.token.operator,
-.token.entity,
-.token.url,
-.language-css .token.string,
-.style .token.string {
-  color: #a67f59;
-  background: hsla(0, 0%, 100%, .5);
-}
-
-.token.atrule,
-.token.attr-value,
-.token.keyword {
-  color: #07a;
-}
-
-.token.function {
-  color: #DD4A68;
-}
-
-.token.regex,
-.token.important,
-.token.variable {
-  color: #e90;
-}
-
-.token.important,
-.token.bold {
-  font-weight: bold;
-}
-.token.italic {
-  font-style: italic;
-}
-
-.token.entity {
-  cursor: help;
-}

src/transforms/styles-layout.css

@@ -1,353 +0,0 @@
-/*
-  Column: 60px
-  Gutter: 24px
-
-  Body: 648px
-    - 8 columns
-    - 7 gutters
-  Middle: 816px
-  Page: 984px
-    - 12 columns
-    - 11 gutters
-*/
-
-.l-body,
-.l-body-outset,
-.l-page,
-.l-page-outset,
-.l-middle,
-.l-middle-outset,
-dt-article > div,
-dt-article > p,
-dt-article > h1,
-dt-article > h2,
-dt-article > h3,
-dt-article > h4,
-dt-article > figure,
-dt-article > ul,
-dt-article > dt-byline,
-dt-article > dt-code,
-dt-article section > div,
-dt-article section > p,
-dt-article section > h1,
-dt-article section > h2,
-dt-article section > h3,
-dt-article section > h4,
-dt-article section > figure,
-dt-article section > ul,
-dt-article section > dt-byline,
-dt-article section > dt-code {
-  width: auto;
-  margin-left: 24px;
-  margin-right: 24px;
-  box-sizing: border-box;
-}
-
-@media(min-width: 768px) {
-  .l-body,
-  .l-body-outset,
-  .l-page,
-  .l-page-outset,
-  .l-middle,
-  .l-middle-outset,
-  dt-article > div,
-  dt-article > p,
-  dt-article > h1,
-  dt-article > h2,
-  dt-article > h3,
-  dt-article > h4,
-  dt-article > figure,
-  dt-article > ul,
-  dt-article > dt-byline,
-  dt-article > dt-code,
-  dt-article section > div,
-  dt-article section > p,
-  dt-article section > h1,
-  dt-article section > h2,
-  dt-article section > h3,
-  dt-article section > h4,
-  dt-article section > figure,
-  dt-article section > ul,
-  dt-article section > dt-byline,
-  dt-article section > dt-code {
-    margin-left: 72px;
-    margin-right: 72px;
-  }
-}
-
-@media(min-width: 1080px) {
-  .l-body,
-  dt-article > div,
-  dt-article > p,
-  dt-article > h2,
-  dt-article > h3,
-  dt-article > h4,
-  dt-article > figure,
-  dt-article > ul,
-  dt-article > dt-byline,
-  dt-article > dt-code,
-  dt-article section > div,
-  dt-article section > p,
-  dt-article section > h2,
-  dt-article section > h3,
-  dt-article section > h4,
-  dt-article section > figure,
-  dt-article section > ul,
-  dt-article section > dt-byline,
-  dt-article section > dt-code {
-    margin-left: calc(50% - 984px / 2);
-    width: 648px;
-  }
-  .l-body-outset,
-  dt-article .l-body-outset {
-    margin-left: calc(50% - 984px / 2 - 96px/2);
-    width: calc(648px + 96px);
-  }
-  .l-middle,
-  dt-article .l-middle {
-    width: 816px;
-    margin-left: calc(50% - 984px / 2);
-    margin-right: auto;
-  }
-  .l-middle-outset,
-  dt-article .l-middle-outset {
-    width: calc(816px + 96px);
-    margin-left: calc(50% - 984px / 2 - 48px);
-    margin-right: auto;
-  }
-  dt-article > h1,
-  dt-article section > h1,
-  .l-page,
-  dt-article .l-page,
-  dt-article.centered .l-page {
-    width: 984px;
-    margin-left: auto;
-    margin-right: auto;
-  }
-  .l-page-outset,
-  dt-article .l-page-outset,
-  dt-article.centered .l-page-outset {
-    width: 1080px;
-    margin-left: auto;
-    margin-right: auto;
-  }
-  .l-screen,
-  dt-article .l-screen,
-  dt-article.centered .l-screen {
-    margin-left: auto;
-    margin-right: auto;
-    width: auto;
-  }
-  .l-screen-inset,
-  dt-article .l-screen-inset,
-  dt-article.centered .l-screen-inset {
-    margin-left: 24px;
-    margin-right: 24px;
-    width: auto;
-  }
-  .l-gutter,
-  dt-article .l-gutter {
-    clear: both;
-    float: right;
-    margin-top: 0;
-    margin-left: 24px;
-    margin-right: calc((100vw - 984px) / 2 + 168px);
-    width: calc((984px - 648px) / 2 - 24px);
-  }
-
-  /* Side */
-  .side.l-body,
-  dt-article .side.l-body {
-    clear: both;
-    float: right;
-    margin-top: 0;
-    margin-left: 48px;
-    margin-right: calc((100vw - 984px + 648px) / 2);
-    width: calc(648px / 2 - 24px - 84px);
-  }
-  .side.l-body-outset,
-  dt-article .side.l-body-outset {
-    clear: both;
-    float: right;
-    margin-top: 0;
-    margin-left: 48px;
-    margin-right: calc((100vw - 984px + 648px - 48px) / 2);
-    width: calc(648px / 2 - 48px + 24px);
-  }
-  .side.l-middle,
-  dt-article .side.l-middle {
-    clear: both;
-    float: right;
-    width: calc(456px - 84px);
-    margin-left: 48px;
-    margin-right: calc((100vw - 984px) / 2 + 168px);
-  }
-  .side.l-middle-outset,
-  dt-article .side.l-middle-outset {
-    clear: both;
-    float: right;
-    width: 456px;
-    margin-left: 48px;
-    margin-right: calc((100vw - 984px) / 2 + 168px);
-  }
-  .side.l-page,
-  dt-article .side.l-page {
-    clear: both;
-    float: right;
-    margin-left: 48px;
-    width: calc(624px - 84px);
-    margin-right: calc((100vw - 984px) / 2);
-  }
-  .side.l-page-outset,
-  dt-article .side.l-page-outset {
-    clear: both;
-    float: right;
-    width: 624px;
-    margin-right: calc((100vw - 984px) / 2);
-  }
-}
-
-/* Centered */
-
-@media(min-width: 1080px) {
-  .centered .l-body,
-  .centered.l-body,
-  dt-article.centered > div,
-  dt-article.centered > p,
-  dt-article.centered > h2,
-  dt-article.centered > h3,
-  dt-article.centered > h4,
-  dt-article.centered > figure,
-  dt-article.centered > ul,
-  dt-article.centered > dt-byline,
-  dt-article.centered > dt-code,
-  dt-article.centered section > div,
-  dt-article.centered section > p,
-  dt-article.centered section > h2,
-  dt-article.centered section > h3,
-  dt-article.centered section > h4,
-  dt-article.centered section > figure,
-  dt-article.centered section > ul,
-  dt-article.centered section > dt-byline,
-  dt-article.centered section > dt-code,
-  dt-article section.centered > div,
-  dt-article section.centered > p,
-  dt-article section.centered > h2,
-  dt-article section.centered > h3,
-  dt-article section.centered > h4,
-  dt-article section.centered > figure,
-  dt-article section.centered > ul,
-  dt-article section.centered > dt-byline,
-  dt-article section.centered > dt-code {
-    margin-left: auto;
-    margin-right: auto;
-    width: 648px;
-  }
-  .centered .l-body-outset,
-  .centered.l-body-outset,
-  dt-article.centered .l-body-outset {
-    margin-left: auto;
-    margin-right: auto;
-    width: calc(648px + 96px);
-  }
-  dt-article.centered > h1,
-  dt-article.centered section > h1,
-  dt-article section.centered > h1,
-  .centered .l-middle,
-  .centered.l-middle,
-  dt-article.centered .l-middle {
-    width: 816px;
-    margin-left: auto;
-    margin-right: auto;
-  }
-
-  .centered .l-middle-outset,
-  .centered.l-middle-outset,
-  dt-article.centered .l-middle-outset {
-    width: calc(816px + 96px);
-    margin-left: auto;
-    margin-right: auto;
-  }
-
-  /* page and screen are already centered */
-
-  /* Side */
-
-  .centered .side.l-body,
-  .centered dt-article .side.l-body {
-    clear: both;
-    float: right;
-    margin-top: 0;
-    margin-left: 48px;
-    margin-right: calc((100vw - 648px) / 2);
-    width: calc(4 * 60px + 3 * 24px);
-  }
-  .centered .side.l-body-outset,
-  .centered dt-article .side.l-body-outset {
-    clear: both;
-    float: right;
-    margin-top: 0;
-    margin-left: 48px;
-    margin-right: calc((100vw - 648px) / 2);
-    width: calc(4 * 60px + 3 * 24px);
-  }
-  .centered .side.l-middle,
-  .centered dt-article .side.l-middle {
-    clear: both;
-    float: right;
-    width: 396px;
-    margin-left: 48px;
-    margin-right: calc((100vw - 984px) / 2 + 168px / 2);
-  }
-  .centered .side.l-middle-outset,
-  .centered dt-article .side.l-middle-outset {
-    clear: both;
-    float: right;
-    width: 456px;
-    margin-left: 48px;
-    margin-right: calc((100vw - 984px) / 2 + 168px);
-  }
-  .centered .side.l-page,
-  .centered dt-article .side.l-page {
-    clear: both;
-    float: right;
-    width: 480px;
-    margin-right: calc((100vw - 984px) / 2);
-  }
-  .centered .side.l-page-outset,
-  .centered dt-article .side.l-page-outset {
-    clear: both;
-    float: right;
-    width: 480px;
-    margin-right: calc((100vw - 984px) / 2);
-  }
-  .centered .l-gutter,
-  .centered.l-gutter,
-  dt-article.centered .l-gutter {
-    clear: both;
-    float: right;
-    margin-top: 0;
-    margin-left: 24px;
-    margin-right: calc((100vw - 984px) / 2);
-    width: calc((984px - 648px) / 2 - 24px);
-  }
-
-}
-
-/* Rows and Columns */
-
-.row {
-  display: flex;
-}
-.column {
-  flex: 1;
-  box-sizing: border-box;
-  margin-right: 24px;
-  margin-left: 24px;
-}
-.row > .column:first-of-type {
-  margin-left: 0;
-}
-.row > .column:last-of-type {
-  margin-right: 0;
-}

src/transforms/styles-print.css

@@ -1,20 +0,0 @@
-
-@media print {
-  @page {
-    size: 8in 11in;
-  }
-  html {
-  }
-  p, code {
-    page-break-inside: avoid;
-  }
-  h2, h3 {
-    page-break-after: avoid;
-  }
-  dt-header {
-    visibility: hidden;
-  }
-  dt-footer {
-    display: none!important;
-  }
-}

src/transforms/styles.js

@@ -1,11 +0,0 @@
-import base from './styles-base.css';
-import layout from './styles-layout.css';
-import article from './styles-article.css';
-import code from './styles-code.css';
-import print from './styles-print.css';
-
-export default function(dom) {
-  let s = dom.createElement('style');
-  s.textContent = base + layout + article + code + print;
-  dom.querySelector('head').appendChild(s);
-}

src/transforms/toc.js

@@ -0,0 +1,11 @@
+import { renderTOC } from '../components/d-toc';
+
+export default function(dom) {
+  const article = dom.querySelector('d-article');
+  const toc = dom.querySelector('d-toc');
+  if (toc) {
+    const headings = article.querySelectorAll('h2, h3');
+    renderTOC(toc, headings);
+    toc.setAttribute('prerendered', 'true');
+  }
+}

src/transforms/typeset.js

@@ -53,7 +53,7 @@ function punctuation(text){
 
   // Dashes
   text = text.replace(/--/g, '\u2014');
-  text = text.replace(/ \u2014 /g,'\u2009\u2014\u2009'); //this has thin spaces
+  text = text.replace(/\s*\u2014\s*/g,'\u2009\u2014\u2009'); //this has thin spaces
 
   // Elipses
   text = text.replace(/\.\.\./g,'…');

src/ui/d-slider.js

@@ -0,0 +1,318 @@
+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', () => {
+      if(!this.mouseEvent) {
+        this.background.classList.add('focus');
+      }
+    });
+    this.addEventListener('focusout', () => {
+      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 (isNaN(newValue) || newValue === undefined || newValue === null) return;
+    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(event) {
+    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');
+      event.preventDefault();
+      event.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';
+    }
+  }
+}

test/helpers.js

@@ -0,0 +1,3 @@
+function nodeListToArray(nodeList) {
+  return Array.prototype.slice.call(nodeList);
+}

test/mocha.opts

@@ -0,0 +1 @@
+-r jsdom-global/register

test/scaffolds/usesV1.html

@@ -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>

test/scaffolds/usesV2.html

@@ -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>

test/template_v1.js

@@ -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);
     });
   })

test/transforms.js

@@ -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'