2.6.1

Trim whitespace

.gitignore

@@ -1,44 +1,2 @@
-# Logs
-logs
-*.log
-npm-debug.log*
-
-# Runtime data
-pids
-*.pid
-*.seed
-*.pid.lock
-
-# node-waf configuration
-.lock-wscript
-
-# Compiled binary addons (http://nodejs.org/api/addons.html)
-build/Release
-
-# Dependency directories
+.DS_Store
 node_modules
-bower_components
-jspm_packages
-
-# Optional npm cache directory
-.npm
-
-# Optional eslint cache
-.eslintcache
-
-# Optional REPL history
-.node_repl_history
-
-# Output of 'npm pack'
-*.tgz
-
-# Yarn Integrity file
-.yarn-integrity
-
-# 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

AUTHORS

@@ -0,0 +1,6 @@
+# This is the list of The Distill Template authors for copyright purposes.
+#
+# This does not necessarily list everyone who has contributed code, since in
+# some cases, their employer may be the copyright holder.  To see the full list
+# of contributors, see the revision history in source control.
+Google LLC

CONTRIBUTING.md

@@ -0,0 +1,28 @@
+# How to Contribute
+
+We'd love to accept your patches and contributions to this project. There are
+just a few small guidelines you need to follow.
+
+## Contributor License Agreement
+
+Contributions to this project must be accompanied by a Contributor License
+Agreement. You (or your employer) retain the copyright to your contribution,
+this simply gives us permission to use and redistribute your contributions as
+part of the project. Head over to <https://cla.developers.google.com/> to see
+your current agreements on file or to sign a new one.
+
+You generally only need to submit a CLA once, so if you've already submitted one
+(even if it was for a different project), you probably don't need to do it
+again.
+
+## Code reviews
+
+All submissions, including submissions by project members, require review. We
+use GitHub pull requests for this purpose. Consult
+[GitHub Help](https://help.github.com/articles/about-pull-requests/) for more
+information on using pull requests.
+
+## Community Guidelines
+
+This project follows [Google's Open Source Community
+Guidelines](https://opensource.google.com/conduct/).

LICENSE

@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

README.md

@@ -1,39 +1,25 @@
-# Distill Templates
+# Distill Template
 
-## Development
+This is the repository for the Distill web framework. 
 
-Run `yarn start` to start a watching build rollup server.
-
-## Testing
-
-Run `yarn test`. That's it.
+## Contributing
 
 
-## TODO:
+To give feedback, report a bug, or request a feature, please open an issue.
 
--[ ] 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; */
+To contribute a change, [check out the contributing guide](CONTRIBUTING.md).
+
+### Local Development
+
+First, run `npm install` to install all node modules required. Then, run `npm run dev` 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.
 
 
-auto-added elements:
- title in front, no h1 -> add it
- no title in front, h1 -> read and put into frontMatter
- footnote -> footnote list
- break up bib
- if citation, no bib-list -> add citation-list
- if authors, no byline -> add byline
- no appendix -> add appendix
- 
+## Disclaimer & License
+
+_This project is research code. It is not an official product of Google or any other institution supporting Distill._
+
+Copyright 2018, The Distill Template Authors.
+
+Licensed under the Apache License, Version 2.0
+
+See the [full license](LICENSE).

bin/render.js

@@ -1,5 +1,19 @@
 #!/usr/bin/env node
 
+// Copyright 2018 The Distill Template Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 const path = require('path');
 const fs = require('fs');
 const program = require('commander');
@@ -10,9 +24,9 @@ const transforms = require('../dist/transforms.v2.js');
 program
   .version('1.0.0')
   .description('Pre-renders distill articles for publication.')
-  .usage('-i <input path> -o <output path>')
-  .option('-i, --input_path <path>', 'path to input HTML file.')
-  .option('-o, --output_path <path>', 'path to write rendered HTML file to.')
+  .usage('-i <input_path> -o <output_path>')
+  .option('-i, --input-path <path>', 'path to input HTML file.')
+  .option('-o, --output-path <path>', 'path to write rendered HTML file to.')
   .parse(process.argv);
 
 const virtualConsole = new jsdom.VirtualConsole();
@@ -20,16 +34,17 @@ const virtualConsole = new jsdom.VirtualConsole();
 virtualConsole.sendTo(console, { omitJSDOMErrors: true });
 
 const options = { runScripts: 'outside-only', QuerySelector: true, virtualConsole: virtualConsole };
-JSDOM.fromFile(program.input, options).then(dom => {
+JSDOM.fromFile(program.inputPath, options).then(dom => {
   const window = dom.window;
   const document = window.document;
+  const HTMLElement = window.HTMLElement;
 
   const data = new transforms.FrontMatter;
-  data.inputHTMLPath = program.input; // may be needed to resolve relative links!
-  data.inputDirectory = path.dirname(program.input);
+  data.inputHTMLPath = program.inputPath; // may be needed to resolve relative links!
+  data.inputDirectory = path.dirname(program.inputPath);
   transforms.render(document, data);
   transforms.distillify(document, data);
 
   const transformedHtml = dom.serialize();
-  fs.writeFileSync(program.output, transformedHtml);
+  fs.writeFileSync(program.outputPath, transformedHtml);
 }).catch(console.error);

examples/article-no-citations.html

@@ -1,3 +1,18 @@
+<!--
+  Copyright 2018 The Distill Template Authors
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
 <!doctype html>
 
 <head>

examples/article-test.html

@@ -1,3 +1,18 @@
+<!--
+  Copyright 2018 The Distill Template Authors
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
 <!DOCTYPE html><html lang="en"><head>
   <meta charset="utf8">
 

examples/article.html

@@ -1,131 +0,0 @@
-<!doctype html>
-
-<head>
-  <meta charset="utf8">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <script src="../dist/template.v2.js"></script>
-</head>
-
-<body>
-<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>
-<distill-header></distill-header>
-<d-abstract>
-  <figure style="grid-column: page; margin: 1rem 0;"><img src="momentum.png" style="width:100%; border: 1px solid rgba(0, 0, 0, 0.2);"/></figure>
-  <p>We often think of Momentum as a means of dampening oscillations and speeding up the iterations, leading to faster convergence. But it has other interesting behavior. It allows a larger range of step-sizes to be used, and creates its own oscillations. What is going on?</p>
-</d-abstract>
-<d-article>
-  <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>
-  <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}}
-  </d-math>
-  <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>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>. And here's a javascript code block.</p>
-  <d-code block language="javascript">
-      var x = 25;
-      function(x){
-        return x * x;
-      }
-  </d-code>
-  <p>We also support python.</p>
-  <d-code block language="python">
-    # Python 3: Fibonacci series up to n
-    def fib(n):
-      a, b = 0, 1
-        while a < n:
-          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");
-    const initTag = document.createElement("span");
-    initTag.textContent = "initialized!"
-    figure.appendChild(initTag);
-    figure.addEventListener("ready", function() {
-      const initTag = figure.querySelector("span");
-      initTag.textContent = "ready"
-      console.log('ready')
-    });
-    figure.addEventListener("onscreen", function() {
-      const initTag = figure.querySelector("span");
-      initTag.textContent = "onscreen"
-      console.log('onscreen')
-    });
-    figure.addEventListener("offscreen", function() {
-      const initTag = figure.querySelector("span");
-      initTag.textContent = "offscreen!"
-      console.log('offscreen')
-    });
-  </script>
-  <p>That's it for the example article!</p>
-
-</d-article>
-
-<d-appendix>
-
-  <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 src="bibliography.bib"></d-bibliography>
-
-</d-appendix>
-
-</body>

examples/bibliography.bib

@@ -97,3 +97,12 @@
   year={2016},
   url={https://arxiv.org/pdf/1609.07009.pdf}
 }
+
+@misc{openai2018charter,
+  author={OpenAI},
+  title={OpenAI Charter},
+  type={Blog},
+  number={April 9},
+  year={2018},
+  url={https://blog.openai.com/charter},
+}

examples/index.html

@@ -0,0 +1,183 @@
+<!--
+  Copyright 2018 The Distill Template Authors
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!doctype html>
+
+<head>
+  <script src="template.v2.js"></script>
+  <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/",
+        "affiliations": [{"name": "Google Brain"}]
+      },
+      {
+        "author":"Ludwig Schubert",
+        "authorURL":"https://shancarter.com/",
+        "affiliations": [{"name": "Google Brain", "url": "https://g.co/brain"}]
+      },
+      {
+        "author":"Shan Carter",
+        "authorURL":"https://shancarter.com/",
+        "affiliations": [
+          {"name": "Google Brain", "url": "https://g.co/brain"},
+          {"name": "NYT", "url": "https://nytimes.com"}
+        ]
+      }
+    ],
+    "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-byline></d-byline>
+  <d-article>
+    <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>
+    <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}}
+    </d-math>
+    <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 bibtex-key="mercier2011humans"></d-cite> also cite <d-cite
+        key="gregor2015draw,mercier2011humans,openai2018charter"></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>. And here's a javascript code block.
+    </p>
+    <d-code block language="javascript">
+      var x = 25;
+      function(x){
+      return x * x;
+      }
+    </d-code>
+    <p>We also support python.</p>
+    <d-code block language="python">
+      # Python 3: Fibonacci series up to n
+      def fib(n):
+      a, b = 0, 1
+      while a < n: 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");
+          const initTag = document.createElement("span");
+          initTag.textContent = "initialized!"
+          figure.appendChild(initTag);
+          figure.addEventListener("ready", function () {
+            const initTag = figure.querySelector("span");
+            initTag.textContent = "ready"
+            console.log('ready')
+          });
+          figure.addEventListener("onscreen", function () {
+            const initTag = figure.querySelector("span");
+            initTag.textContent = "onscreen"
+            console.log('onscreen')
+          });
+          figure.addEventListener("offscreen", function () {
+            const initTag = figure.querySelector("span");
+            initTag.textContent = "offscreen!"
+            console.log('offscreen')
+          });
+        </script>
+        <p>That's it for the example article!</p>
+
+  </d-article>
+
+  <d-appendix>
+
+    <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 src="bibliography.bib"></d-bibliography>
+  </d-appendix>
+
+  <distill-footer></distill-footer>
+
+</body>

examples/tutorial.html

@@ -1,255 +0,0 @@
-<!doctype html>
-<meta charset="utf-8">
-<script src="../dist/template.js"></script>
-<style>
-.fake-img {
-  background: #bbb;
-  border: 1px solid rgba(0, 0, 0, 0.1);
-  box-shadow: 0 0px 4px rgba(0, 0, 0, 0.1);
-  margin-bottom: 12px;
-}
-.fake-img p {
-  font-family: monospace;
-  color: white;
-  text-align: left;
-  margin: 12px 0;
-  text-align: center;
-  font-size: 16px;
-}
-</style>
-
-<dt-article>
-  <h1>How to Create a Distill Article</h1>
-  <h2>A collection of examples and best practices for creating interactive explanatory articles using the Distill web framework</h2>
-  <hr>
-  <h2>Getting Started</h2>
-  <p>Distill ships with a CSS framework and a collection of custom web components that make building interactive academic articles easier than with raw HTML, CSS and JavaScript. At its simplest, each distill post is just a single HTML file with one special script tag.</p>
-  <dt-code block language="html">
-    &lt;!doctype html&gt;
-    &lt;meta charset="utf-8"&gt;
-    &lt;script src="http://distill.pub/template.js"&gt;&lt;/script&gt;
-
-    &lt;dt-article&gt;
-      &lt;h1&gt;Hello World&lt;/h1&gt;
-    &lt;/dt-article&gt;
-  </dt-code>
-  <p>This script tag will modify your post in your browser, adding the distill styling and functionality. When we publish your article, we will bake in these transformations, but during development it’s handy to be able to preview it locally (It even works without a web server).</p>
-  <p>A typical distill post will be quite a bit longer than the one above. Below is a more complete example. Don’t worry if some of the tags don’t make sense, they’re all documented further in this post.</p>
-  <dt-code block language="html">
-    &lt;!doctype html&gt;
-    &lt;meta charset="utf-8"&gt;
-    &lt;script src="http://distill.pub/template.js"&gt;&lt;/script&gt;
-
-    &lt;script type="text/front-matter"&gt;
-      title: Article Title
-      description: Description of the post
-      published: Jan 10, 2017
-      authors:
-      - Chris Olah: http://colah.github.io
-      - Shan Carter: http://shancarter.com
-      affiliations:
-      - Google Brain: http://g.co/brain
-      - Google Brain: http://g.co/brain
-    &lt;/script&gt;
-
-    &lt;dt-article&gt;
-      &lt;h1&gt;Hello World&lt;/h1&gt;
-      &lt;h2&gt;A description of the article&lt;/h2&gt;
-      &lt;dt-byline&gt;&lt;/dt-byline&gt;
-      &lt;p&gt;This is the first paragraph of the article.&lt;/p&gt;
-      &lt;p&gt;We can also cite &lt;dt-cite key="gregor2015draw"&gt;&lt;/dt-cite&gt; external publications.&lt;/p&gt;
-    &lt;/dt-article&gt;
-
-    &lt;dt-appendix&gt;
-    &lt;/dt-appendix&gt;
-
-    &lt;script type="text/bibliography"&gt;
-      @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},
-        url={https://arxiv.org/pdf/1502.04623.pdf}
-      }
-    &lt;/script&gt;
-  </dt-code>
-  <!-- <hr>
-  <h2>Markdown</h2>
-  <p>Markdown is supported as an alternative to html for the <dt-code language="html">&lt;dt-article&gt;</dt-code> element. </p>
-  <dt-code block language="html">
-    &lt;!doctype html&gt;
-    &lt;meta charset="utf-8"&gt;
-    &lt;script src="../dist/template.min.js"&gt;&lt;/script&gt;
-    &lt;dt-article markdown&gt;
-      # Hello World
-
-      ## A description of the post
-
-      First paragraph of the article.
-    &lt;/dt-article&gt;
-    &lt;script type="text/bibliography"&gt;&lt;/script&gt;
-  </dt-code>
-  <p>We use <a href="https://github.com/chjj/marked">marked</a> as the rendering engine, with <a href="https://help.github.com/articles/basic-writing-and-formatting-syntax/">github flavored markdown</a> and <a href="https://daringfireball.net/projects/smartypants/">smartypants</a> enabled. In development mode the markdown is translated in the client after the dom content has loaded, but when published, the translation is precompiled.</p> -->
-
-  <hr>
-  <h2>Project Structure</h2>
-  <p>Because all the templating is delivered via a script tag, you are generally free to develop however you are most comfortable. The only requirements are that each article must be its own Github repository. The simplest setup would be a repository that contained a single HTML file, along with any additional assets, like images or javascript files. Note, in this default setup, all files in the root of the repository will be published. Note, also, in this configuration you generally will not even need to run a static local webserver. You can just open the <dt-code>index.html</dt-code> file in your browser to preview.</p>
-
-  <dt-code block language="html">
-    image.jpg
-    index.html
-    script.js
-  </dt-code>
-
-  <p>If you have a more complicated build process, or have files you don’t want published, put your output in a <dt-code>public</dt-code> folder and we will only publish its contents.</p>
-
-  <dt-code block language="html">
-    build/
-    _index.html
-    package.json
-    public/
-      index.html
-      image.jpg
-  </dt-code>
-
-  <hr>
-  <h2>Front Matter</h2>
-  <p>You’ll need to describe some data about you post — title, description, authors, etc. For this use the <dt-code language="html">&lt;script type="text/front-matter"&gt;</dt-code> tag.</p>
-  <dt-code block language="html">
-    &lt;script type="text/front-matter"&gt;
-      title: Article Title
-      description: Description of the post
-      authors:
-      - Chris Olah: http://colah.github.io
-      - Shan Carter: http://shancarter.com
-      affiliations:
-      - Google Brain: http://g.co/brain
-      - Google Brain: http://g.co/brain
-    &lt;/script&gt;
-  </dt-code>
-  <!-- <p>You can also use an external JSON file if you like. We will automatically make a request for a <dt-code>distill.json</dt-code> file if there is no <dt-code language="html">&lt;script type="text/front-matter"&gt;</dt-code> element on the page, or you can point to another file with the <dt-code>src</dt-code> attribute. In production, these files will be inlined into the document.</p>
-  <dt-code block language="html">
-    &lt;script type="text/front-matter" src="./distill.json"&gt;&lt;/script&gt;
-  </dt-code> -->
-  <hr>
-  <h2>Citations</h2>
-  <p>Bibtex is the supported way of making academic citations. You first need have a global definition of all your possible citations. For this we’ll use the <dt-code language="html">&lt;script type="text/bibliography"&gt;</dt-code> element.</p>
-  <dt-code block language="html">
-    &lt;script type="text/bibliography"&gt;
-      @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},
-        url={https://arxiv.org/pdf/1502.04623.pdf},
-      }
-    &lt;/script&gt;
-  </dt-code>
-  <p>(We strongly encourage you to populate the <dt-code>url</dt-code> bibtex field where possible so that we can provide links for citations.)</p>
-  <!-- <p>Like with the <dt-code language="html">&lt;script type="text/front-matter"&gt;</dt-code> element, you can alternatively reference an external file with the <dt-code>src</dt-code> attribute. If no <dt-code language="html">&lt;script type="text/bibliography"&gt;</dt-code> element is found on the page, a request will automatically be made for <dt-code>bibliography.bib</dt-code>. In production, these files will be inlined into the document.</p>
-  <dt-code block language="html">
-    &lt;script type="text/bibliography" src="bibliography.bib"&gt;&lt;/script&gt;
-  </dt-code> -->
-  <p>Citations are then used in the article body with the <dt-code language="html">&lt;dt-cite&gt;</dt-code> tag. The <dt-code>key</dt-code> attribute is a reference to the id provided in the bibiography. The <dt-code>key</dt-code> attribute can take multiple ids, separated by commas.</p>
-  <dt-code block language="html">
-    &lt;dt-cite key="gregor2015draw"&gt;&lt;/dt-cite&gt;
-  </dt-code>
-  <script type="text/bibliography">
-  @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},
-    url={https://arxiv.org/pdf/1502.04623.pdf},
-  }
-  </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>
-
-
-  <hr>
-  <h2>Footnotes</h2>
-  <p>Just wrap the text you would like to show up in a footnote in a <dt-code language="html">&lt;dt-fn&gt;</dt-code> tag. The number of the footnote will be automatically generated. <dt-fn>This text will be shown on hover.</dt-fn></p>
-    <dt-code block language="html">
-      &lt;dt-fn&gt;This will become a hoverable footnote.&lt;/dt-fn&gt;
-    </dt-code>
-  <dt-footnote-body ref="blah"></dt-footnote-body>
-
-  <hr>
-  <h2>Code Blocks</h2>
-  <p>Syntax highlighting is provided within <dt-code language="html">&lt;dt-code&gt;</dt-code> tags. An example of inline code snippets: <dt-code language="html">&lt;dt-code language="html"&gt;let x = 10;&lt;/dt-code&gt;</dt-code>. For larger blocks of code, add a <dt-code>block</dt-code> attribute:</p>
-  <dt-code block language="html">
-    &lt;dt-code block language="javascript"&gt;
-      var x = 25;
-      function(x){
-        return x * x;
-      }
-    &lt;/dt-code&gt;
-  </dt-code>
-
-  <!--
-  <hr>
-  <h2>Math</h2>
-   -->
-  <hr>
-  <h2>Layouts</h2>
-  <p>The main text column is referred to as the body. It is the assumed layout of any direct descendents of the <code>dt-article</code> element.</p>
-  <div class="fake-img l-body"><p>.l-body</p></div>
-  <p>For images you want to display a little larger, try these:</p>
-  <div class="fake-img l-middle"><p>.l-middle</p></div>
-  <div class="fake-img l-page"><p>.l-page</p></div>
-  <p>All of these have an <dt-code>outset</dt-code> variant if you want to poke out from the body text a little bit. For instance:</p>
-  <div class="fake-img l-body-outset"><p>.l-body-outset</p></div>
-  <div class="fake-img l-middle-outset"><p>.l-middle-outset</p></div>
-  <div class="fake-img l-page-outset"><p>.l-page-outset</p></div>
-  <p>Occasionally you’ll want to use the full browser width. For this, use <dt-code>.l-screen</dt-code>. You can also inset the element a little from the edge of the browser by using the inset variant.</p>
-  <div class="fake-img l-screen"><p>.l-screen</p></div>
-  <div class="fake-img l-screen-inset"><p>.l-screen-inset</p></div>
-  <p>Often you want to position smaller images so as not to completely interrupt the flow of your text. Or perhaps you want to put some text in the margin as an aside or to signal that it’s optional content. For these cases we’ll use the float-based layouts.</p>
-  <div class="fake-img l-body side"><p>.l-body.side</p></div>
-  <div class="fake-img l-middle side"><p>.l-middle.side</p></div>
-  <div class="fake-img l-page side"><p>.l-page.side</p></div>
-  <p>They are all floated to the right and anchored to the right-hand edge of the position you specify. By default, each will take up approximately half of the width of the standard layout position, but you can override the width with a more specific selector. </p>
-  <div class="fake-img l-gutter"><p>.l-gutter</p></div>
-  <p>The final layout is for marginalia, asides, and footnotes. It does not interrupt the normal flow of <code>.l-body</code> sized text except on mobile screen sizes.</p>
-  <p>You can also use an alternate centered layout by adding a <dt-code>centered</dt-code> class to the <dt-code>dt-article</dt-code> element.</p>
-  <dt-code block language="html">
-    &lt;dt-article class="centered"&gt;
-      &lt;h1&gt;Hello World&lt;/h1&gt;
-    &lt;/dt-article&gt;
-  </dt-code>
-  <p>You can toggle it on this article by <a onclick="document.querySelector('dt-article').classList.toggle('centered');">clicking here</a></p>
-  <section class="centered">
-
-  </section>
-
-  <hr>
-  <h2>Appendix</h2>
-
-  <p>An appendix can be added after your article, using the <dt-code language="html">&lt;dt-appendix&gt;</dt-code> tag.</p>
-
-  <dt-code block language="html">
-    &lt;dt-article&gt;
-      ...
-    &lt;/dt-article&gt;
-
-    &lt;dt-appendix&gt;
-      &lt;h3&gt;Appendix Section Title&lt;/h3&gt;
-      &lt;p&gt;section content&lt;p&gt;
-    &lt;/dt-appendix&gt;
-  </dt-code>
-
-  <p>You may wish to include the following sections in your appendix:</p>
-  <ul>
-    <li><b>Acknowledgments</b>: This is a place to recognize people and institutions. It may also be a good place to acknowledge and cite software that makes your work possible (eg. TensorFlow, OpenAI Gym).</li>
-    <li><b>Author Contributions</b>: We strongly encourage you to include an author contributions statement briefly describing what each author did.</li>
-  </ul>
-
-  <hr>
-  <h2>And You’re Off</h2>
-  <p>That should do it. If you have any questions or bugs to file, feel free to <a href="https://github.com/distillpub/template/issues/new">open an issue on GitHub</a>.</p>
-<!--
-  <hr>
-  <h2>Including External Files</h2> -->
-
-</dt-article>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "distill-template",
-  "version": "2.1.0",
+  "version": "2.6.1",
   "description": "Template for creating Distill articles.",
   "main": "dist/template.v2.js",
   "bin": {
@@ -12,12 +12,12 @@
     "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 8888",
+    "dev": "rollup -c rollup.config.dev.js -w",
+    "serve": "http-server",
     "test": "mocha",
     "lint": "eslint",
-    "build": "rollup -c rollup.config.js",
-    "prepublishOnly": "npm run build"
+    "build": "rollup -c rollup.config.prod.js",
+    "prepare": "npm run build"
   },
   "repository": {
     "url": "git+https://github.com/distillpub/distill-template.git",
@@ -26,34 +26,43 @@
   "devDependencies": {
     "bibtex-parse-js": "^0.0.23",
     "chai": "^3.5.0",
-    "commander": "^2.9.0",
-    "eslint": "^4.3.0",
+    "eslint": "^4.19.1",
     "eslint-config-google": "^0.9.1",
-    "js-yaml": "^3.7.0",
-    "jsdom": "^11.2.0",
-    "marked": "^0.3.6",
-    "mocha": "^3.2.0",
-    "prismjs": "^1.6.0",
-    "rollup": "latest",
-    "rollup-plugin-babili": "^3.1.0",
+    "http-server": "^0.11.1",
+    "js-yaml": "^3.13.1",
+    "jsdom": "11.3.0",
+    "jsdom-global": "3.0.2",
+    "marked": "^0.8.0",
+    "mocha": "^5.2.0",
+    "prismjs": "^1.19.0",
+    "rollup": "^0.50.1",
+    "rollup-plugin-babili": "^3.1.1",
     "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-gzip": "^1.4.0",
     "rollup-plugin-node-resolve": "^2.0.0",
-    "rollup-plugin-serve": "^0.1.0",
+    "rollup-plugin-serve": "^0.4.2",
     "rollup-plugin-string": "^2.0.2",
     "rollup-plugin-uglify": "^1.0.1",
     "rollup-watch": "^2.5.0",
+    "should": "^13.2.3",
+    "source-map-support": "^0.5.16",
     "webpack": "^2.2.1"
   },
   "dependencies": {
-    "@webcomponents/webcomponentsjs": "^1.0.7",
-    "assert": "^1.4.1",
-    "d3-time-format": "^2.0.3",
-    "intersection-observer": "^0.4.0",
+    "@webcomponents/webcomponentsjs": "^1.3.3",
+    "assert": "^1.5.0",
+    "commander": "^2.20.3",
+    "d3-array": "^1.2.4",
+    "d3-drag": "^1.2.5",
+    "d3-scale": "^1.0.7",
+    "d3-selection": "^1.4.1",
+    "d3-time-format": "^2.2.3",
+    "escape-html": "^1.0.3",
+    "intersection-observer": "^0.4.3",
     "jsdom-wc": "^11.0.0-alpha-1",
-    "katex": "^0.7.1"
+    "katex": "^0.8.3"
   }
 }

rollup.config.common.js

@@ -0,0 +1,81 @@
+// Copyright 2018 The Distill Template Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+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";
+import babili from "rollup-plugin-babili";
+
+// uncomment to show dependencies [1/2]
+// import rollupGrapher from 'rollup-plugin-grapher'
+
+const defaultConfig = {
+  sourcemap: true,
+  plugins: [
+    resolve({
+      jsnext: true,
+      browser: true
+    }),
+    commonjs(),
+    string({
+      include: ["**/*.txt", "**/*.svg", "**/*.html", "**/*.css", "**/*.base64"]
+    })
+  ]
+};
+
+const componentsConfig = {
+  input: "src/components.js",
+  output: [{ format: "umd", name: "dl", file: "dist/template.v2.js" }]
+};
+
+const transformsConfig = {
+  input: "src/transforms.js",
+  output: [
+    {
+      format: "umd",
+      name: "dl",
+      file: "dist/transforms.v2.js",
+      globals: { fs: "fs" }
+    }
+  ],
+  external: ["fs"]
+};
+
+Object.assign(componentsConfig, defaultConfig);
+Object.assign(transformsConfig, defaultConfig);
+
+// transpile transforms so the node render script works…
+transformsConfig.plugins.push(
+  buble({
+    target: { node: 6 }
+  })
+);
+
+componentsConfig.plugins.push(
+  babili({
+    comments: false, // means: *remove* comments
+    sourceMap: true
+  })
+);
+
+// uncomment to show dependencies [2/2]
+// transformsConfig.plugins.push(
+//   rollupGrapher({
+//     dest: '/dev/null',
+//     verbose: true
+//   })
+// );
+
+export default [componentsConfig, transformsConfig];

rollup.config.dev.js

@@ -1,56 +1,37 @@
-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';
+// Copyright 2018 The Distill Template Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
-// uncomment to show dependencies [1/2]
-// import rollupGrapher from 'rollup-plugin-grapher'
+import configs from "./rollup.config.common";
+import babili from "rollup-plugin-babili";
+import serve from "rollup-plugin-serve";
 
-const componentsConfig = {
-  input: 'src/components.js',
-  output: [{ format: 'umd', name: 'dl', file: 'dist/template.v2.js' }],
-};
+const [componentsConfig, transformsConfig] = configs;
 
-const transformsConfig = {
-  input: 'src/transforms.js',
-  output: [{ format: 'umd', name: 'dl', file: 'dist/transforms.v2.js', globals: {fs: 'fs'} }],
-  external: ['fs']
-};
-
-const defaultConfig = {
-  sourcemap: true,
-  plugins: [
-    resolve({
-      jsnext: true,
-      browser: true,
-    }),
-    string({
-      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 }
+componentsConfig.plugins.push(
+  babili({
+    comments: false, // means: *remove* comments
+    sourceMap: true
+  }),
+  serve({
+    open: true,
+    openPage: "/examples/index.html",
+    contentBase: ["dist", "examples"],
+    headers: {
+      "Access-Control-Allow-Origin": "*"
+    },
+    port: 8088
   })
 );
 
-// uncomment to show dependencies [2/2]
-// transformsConfig.plugins.push(
-//   rollupGrapher({
-//     dest: '/dev/null',
-//     verbose: true
-//   })
-// );
-
-export default [
-  componentsConfig,
-  transformsConfig,
-];
+export default [componentsConfig, transformsConfig];

rollup.config.js

@@ -1,14 +0,0 @@
-import configs from './rollup.config.dev';
-import babili  from 'rollup-plugin-babili';
-
-const [componentsConfig, transformsConfig] = configs;
-
-componentsConfig.plugins.push(babili({
-  comments: false, // means: *remove* comments
-  sourceMap: true,
-}));
-
-export default [
-  componentsConfig,
-  transformsConfig,
-];

rollup.config.prod.js

@@ -0,0 +1,17 @@
+// Copyright 2018 The Distill Template Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import configs from "./rollup.config.common";
+
+export default configs;

src/components.js

@@ -1,46 +1,130 @@
-/* Static styles and other modules */
-import { makeStyleTag } from './styles/styles';
-makeStyleTag(document);
+// Copyright 2018 The Distill Template Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { Controller } from './controller';
+import { domContentLoaded } from './helpers/domContentLoaded.js';
+
+/* Transforms */
+import { makeStyleTag }    from './styles/styles';
+import { Polyfills }       from './helpers/polyfills';
 
 /* Components */
-import { Abstract }     from './components/d-abstract';
-import { Appendix }     from './components/d-appendix';
-import { Article }      from './components/d-article';
-import { Bibliography } from './components/d-bibliography';
-import { Byline }       from './components/d-byline';
-import { Cite }         from './components/d-cite';
-import { CitationList } from './components/d-citation-list';
-import { Code }         from './components/d-code';
-import { Footnote }     from './components/d-footnote';
-import { FootnoteList } from './components/d-footnote-list';
-import { FrontMatter }  from './components/d-front-matter';
-import { Title }        from './components/d-title';
-import { DMath }        from './components/d-math';
-import { References }   from './components/d-references';
-import { TOC }          from './components/d-toc';
-import { Figure }       from './components/d-figure';
-import { Interstitial } from './components/d-interstitial';
-
-const components = [
-  Abstract, Appendix, Article, Bibliography, Byline, Cite, CitationList, Code,
-  Footnote, FootnoteList, FrontMatter, Title, DMath, References, TOC, Figure,
-  Interstitial,
-];
+import { Abstract }        from './components/d-abstract';
+import { Appendix }        from './components/d-appendix';
+import { Article }         from './components/d-article';
+import { Bibliography }    from './components/d-bibliography';
+import { Byline }          from './components/d-byline';
+import { Cite }            from './components/d-cite';
+import { CitationList }    from './components/d-citation-list';
+import { Code }            from './components/d-code';
+import { Footnote }        from './components/d-footnote';
+import { FootnoteList }    from './components/d-footnote-list';
+import { FrontMatter }     from './components/d-front-matter';
+import { 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,
-];
+let templateIsLoading = false;
+let runlevel = 0;
+const initialize = function() {
+  if (window.distill.runlevel < 1) {
+    throw new Error("Insufficient Runlevel for Distill Template!");
+  }
 
-function defineComponents() {
+  /* 1. Flag that we're being loaded */
+  if ("distill" in window && window.distill.templateIsLoading) {
+    throw new Error(
+      "Runlevel 1: Distill Template is getting loaded more than once, aborting!"
+    );
+  } else {
+    window.distill.templateIsLoading = true;
+    console.debug("Runlevel 1: Distill Template has started loading.");
+  }
+
+  /* 2. Add styles if they weren't added during prerendering */
+  makeStyleTag(document);
+  console.debug("Runlevel 1: Static Distill styles have been added.");
+  console.debug("Runlevel 1->2.");
+  window.distill.runlevel += 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.debug("Runlevel 2: We can now listen to controller events.");
+  console.debug("Runlevel 2->3.");
+  window.distill.runlevel += 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.distill.runlevel < 2) {
+    throw new Error("Insufficient Runlevel for adding custom elements!");
+  }
   const allComponents = components.concat(distillComponents);
   for (const component of allComponents) {
+    console.debug("Runlevel 2: Registering custom element: " + component.is);
     customElements.define(component.is, component);
   }
-}
 
-defineComponents();
+  console.debug(
+    "Runlevel 3: Distill Template finished registering custom elements."
+  );
+  console.debug("Runlevel 3->4.");
+  window.distill.runlevel += 1;
+
+  // If template was added after DOMContentLoaded we may have missed that event.
+  // Controller will check for that case, so trigger the event explicitly:
+  if (domContentLoaded()) {
+    Controller.listeners.DOMContentLoaded();
+  }
+
+  console.debug("Runlevel 4: Distill Template initialisation complete.");
+  window.distill.templateIsLoading = false;
+  window.distill.templateHasLoaded = true;
+};
+
+window.distill = { runlevel, initialize, templateIsLoading };
+
+/* 0. Check browser feature support; synchronously polyfill if needed */
+if (Polyfills.browserSupportsAllFeatures()) {
+  console.debug("Runlevel 0: No need for polyfills.");
+  console.debug("Runlevel 0->1.");
+  window.distill.runlevel += 1;
+  window.distill.initialize();
+} else {
+  console.debug("Runlevel 0: Distill Template is loading polyfills.");
+  Polyfills.load(window.distill.initialize);
+}

src/components/d-abstract.js

@@ -1,21 +1,32 @@
+// Copyright 2018 The Distill Template Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 import { Template } from '../mixins/template';
 import { body } from '../helpers/layout';
 
 const T = Template('d-abstract', `
 <style>
   :host {
-    display: block;
     font-size: 1.25rem;
     line-height: 1.6em;
-    padding-bottom: 1.5em;
     color: rgba(0, 0, 0, 0.7);
-    font-family: georgia, serif;
     -webkit-font-smoothing: antialiased;
   }
 
   ::slotted(p) {
     margin-top: 0;
-    margin-bottom: 0;
+    margin-bottom: 1em;
     grid-column: text-start / middle-end;
   }
   ${body('d-abstract')}

src/components/d-appendix.js

@@ -1,17 +1,31 @@
+// Copyright 2018 The Distill Template Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 import { Template } from '../mixins/template';
-import { body } from '../helpers/layout';
 
 const T = Template('d-appendix', `
 <style>
 
 d-appendix {
-  contain: content;
-  font-size: 13px;
+  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);
-  padding-top: 36px;
+  padding-top: 60px;
   padding-bottom: 48px;
 }
 
@@ -19,10 +33,28 @@ d-appendix h3 {
   grid-column: page-start / text-start;
   font-size: 15px;
   font-weight: 500;
-  margin-top: 20px;
+  margin-top: 1em;
   margin-bottom: 0;
   color: rgba(0,0,0,0.65);
-  line-height: 1em;
+}
+
+d-appendix h3 + * {
+  margin-top: 1em;
+}
+
+d-appendix ol {
+  padding: 0 0 0 15px;
+}
+
+@media (min-width: 768px) {
+  d-appendix ol {
+    padding: 0 0 0 30px;
+    margin-left: -30px;
+  }
+}
+
+d-appendix li {
+  margin-bottom: 1em;
 }
 
 d-appendix a {
@@ -33,6 +65,12 @@ d-appendix > * {
   grid-column: text;
 }
 
+d-appendix > d-footnote-list,
+d-appendix > d-citation-list,
+d-appendix > distill-appendix {
+  grid-column: screen;
+}
+
 </style>
 
 `, false);

src/components/d-article.js

@@ -1,6 +1,19 @@
-import { Template } from '../mixins/template';
-import { Controller } from '../controller';
-import style from '../styles/d-article.css';
+// Copyright 2018 The Distill Template Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// import { Template } from '../mixins/template';
+// import { Controller } from '../controller';
 
 const isOnlyWhitespace = /^\s*$/;
 
@@ -14,9 +27,6 @@ export class Article extends HTMLElement {
       for (const mutation of mutations) {
         for (const addedNode of mutation.addedNodes) {
           switch (addedNode.nodeName) {
-          case 'HR':
-            console.warn('Use of <hr> tags in distill articles is discouraged as they interfere with layout! To separate sections, please just use h2 or h3 tags.');
-            break;
           case '#text': { // usually text nodes are only linebreaks.
             const text = addedNode.nodeValue;
             if (!isOnlyWhitespace.test(text)) {
@@ -33,14 +43,4 @@ export class Article extends 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,9 +1,32 @@
+// Copyright 2018 The Distill Template Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 import { parseBibtex } from '../helpers/bibtex';
 
 export function parseBibliography(element) {
-  if (element.firstElementChild && element.firstElementChild.tagName === 'SCRIPT') {
-    const bibtex = element.firstElementChild.textContent;
-    return parseBibtex(bibtex);
+  const scriptTag = element.firstElementChild;
+  if (scriptTag && scriptTag.tagName === 'SCRIPT') {
+    if (scriptTag.type == 'text/bibtex') {
+      const bibtex = element.firstElementChild.textContent;
+      return parseBibtex(bibtex);
+    } else if (scriptTag.type == 'text/json') {
+      return new Map(JSON.parse(scriptTag.textContent));
+    } else {
+      console.warn('Unsupported bibliography script tag type: ' + scriptTag.type);
+    }
+  } else {
+    console.warn('Bibliography did not have any script tag.');
   }
 }
 
@@ -26,6 +49,12 @@ export class Bibliography extends HTMLElement {
     observer.observe(this, options);
   }
 
+  connectedCallback() {
+    requestAnimationFrame(() => {
+      this.parseIfPossible();
+    });
+  }
+
   parseIfPossible() {
     const scriptTag = this.querySelector('script');
     if (!scriptTag) return;

src/components/d-byline.js

@@ -1,37 +1,49 @@
-import style from '../styles/d-byline.css';
+// Copyright 2018 The Distill Template Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// import style from '../styles/d-byline.css';
 
 export function bylineTemplate(frontMatter) {
   return `
   <div class="byline grid">
-    <div class="authors">
+    <div class="authors-affiliations grid">
       <h3>Authors</h3>
-      ${frontMatter.authors.map(author => `
-        <p>
-          ${author.personalURL
-            ? `<a class="name" href="${author.personalURL}">${author.name}</a>`
-            : `<div class="name">${author.name}</div>`
-          }
-        </pdiv>
-      `).join("")}
-    </div>
-    <div class="affiliations">
       <h3>Affiliations</h3>
       ${frontMatter.authors.map(author => `
-        <p>
-          ${author.affiliationURL
-            ? `<a class="affiliation" href="${author.affiliationURL}">${author.affiliation}</a>`
-            : `<div class="affiliation">${author.affiliation}</div>`
-          }
+        <p class="author">
+          ${author.personalURL ? `
+            <a class="name" href="${author.personalURL}">${author.name}</a>` : `
+            <span class="name">${author.name}</span>`}
         </p>
-      `).join("")}
+        <p class="affiliation">
+        ${author.affiliations.map(affiliation =>
+          affiliation.url ? `<a class="affiliation" href="${affiliation.url}">${affiliation.name}</a>` : `<span class="affiliation">${affiliation.name}</span>`
+        ).join(', ')}
+        </p>
+      `).join('')}
     </div>
     <div>
       <h3>Published</h3>
-      <p>${frontMatter.publishedMonth}. ${frontMatter.publishedDay} ${frontMatter.publishedYear}</p>
+      ${frontMatter.publishedDate ? `
+        <p>${frontMatter.publishedMonth} ${frontMatter.publishedDay}, ${frontMatter.publishedYear}</p> ` : `
+        <p><em>Not published yet.</em></p>`}
     </div>
     <div>
       <h3>DOI</h3>
-      <p>${frontMatter.doi}</p>
+      ${frontMatter.doi ? `
+        <p><a href="https://doi.org/${frontMatter.doi}">${frontMatter.doi}</a></p>` : `
+        <p><em>No DOI yet.</em></p>`}
     </div>
   </div>
 `;

src/components/d-citation-list.js

@@ -1,68 +1,78 @@
-import { Template } from '../mixins/template';
+// Copyright 2018 The Distill Template Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 import { bibliography_cite } from '../helpers/citation';
 
-const T = Template('d-citation-list', `
-<style>
+const styles = `
+d-citation-list {
+  contain: style;
+}
 
-:host {
-  contain: content;
+d-citation-list .references {
+  grid-column: text;
 }
-.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;
+
+d-citation-list .references .title {
   font-weight: 500;
-  margin-top: 20px;
-  margin-bottom: 0;
-  color: rgba(0,0,0,0.65);
-  line-height: 1em;
-}
-a {
-  color: rgba(0, 0, 0, 0.6);
 }
+`;
 
-</style>
-
-<h3>References</h3>
-<ol class='references' id='references-list' ></ol>
-`);
-
-export function renderCitationList(element, entries) {
+export function renderCitationList(element, entries, dom=document) {
   if (entries.size > 0) {
-    element.host.style.display = 'initial';
-    const list = element.querySelector('#references-list');
-    list.innerHTML = '';
+    element.style.display = '';
+    let list = element.querySelector('.references');
+    if (list) {
+      list.innerHTML = '';
+    } else {
+      const stylesTag = dom.createElement('style');
+      stylesTag.innerHTML = styles;
+      element.appendChild(stylesTag);
+
+      const heading = dom.createElement('h3');
+      heading.id = 'references';
+      heading.textContent = 'References';
+      element.appendChild(heading);
+
+      list = dom.createElement('ol');
+      list.id = 'references-list';
+      list.className = 'references';
+      element.appendChild(list);
+    }
 
     for (const [key, entry] of entries) {
-      const listItem = document.createElement('li');
+      const listItem = dom.createElement('li');
       listItem.id = key;
       listItem.innerHTML = bibliography_cite(entry);
       list.appendChild(listItem);
     }
   } else {
-    element.host.style.display = 'none';
+    element.style.display = 'none';
   }
 }
 
-export class CitationList extends T(HTMLElement) {
+export class CitationList extends HTMLElement {
+
+  static get is() { return 'd-citation-list'; }
 
   connectedCallback() {
-    this.root.host.style.display = 'none';
+    if (!this.hasAttribute('distill-prerendered')) {
+      this.style.display = 'none';
+    }
   }
 
   set citations(citations) {
-    renderCitationList(this.root, citations);
+    renderCitationList(this, citations);
   }
 
 }

src/components/d-cite.js

@@ -1,162 +1,175 @@
-import { Template } from '../mixins/template';
-import { hover_cite, bibliography_cite } from '../helpers/citation';
-import { HoverBox } from '../helpers/hover-box';
+// Copyright 2018 The Distill Template Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
-const T = Template('d-cite', `
+import { Template } from "../mixins/template";
+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;
-  }
-</style>
 
-<div id="hover-box" class="dt-hover-box">
-</div>
-
-<span id="citation-" class="citation">
-  <slot></slot>
-  <span class="citation-number"></span>
-</span>
-`);
-
-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];
+:host {
+  display: inline-block;
 }
 
+.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;
+}
+
+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>
+
+<d-hover-box id="hover-box"></d-hover-box>
+
+<div id="citation-" class="citation">
+  <span class="citation-number"></span>
+</div>
+`
+);
+
 export class Cite extends T(HTMLElement) {
-
   /* Lifecycle */
-
-  // constructor() {
-  //   super();
-  //   // Cite.currentId += 1;
-  //   // this.citeId = Cite.currentId;
-  // }
+  constructor() {
+    super();
+    this._numbers = [];
+    this._entries = [];
+  }
 
   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.outerSpan = this.root.querySelector("#citation-");
+    this.innerSpan = this.root.querySelector(".citation-number");
+    this.hoverBox = this.root.querySelector("d-hover-box");
+    window.customElements.whenDefined("d-hover-box").then(() => {
+      this.hoverBox.listen(this);
+    });
+    // in case this component got connected after values were set
+    if (this.numbers) {
+      this.displayNumbers(this.numbers);
+    }
+    if (this.entries) {
+      this.displayEntries(this.entries);
+    }
   }
 
-  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() {
-    return ['key'];
+    return ["key", "bibtex-key"];
   }
 
   attributeChangedCallback(name, oldValue, newValue) {
-    const eventName = oldValue ? 'onCiteKeyChanged' : 'onCiteKeyCreated';
-    const keys = newValue.split(',');
+    const eventName = oldValue ? "onCiteKeyChanged" : "onCiteKeyCreated";
+    const keys = newValue.split(",").map(k => k.trim());
     const options = { detail: [this, keys], bubbles: true };
     const event = new CustomEvent(eventName, options);
     document.dispatchEvent(event);
   }
 
   set key(value) {
-    this.setAttribute('key', value);
+    this.setAttribute("key", value);
   }
 
   get key() {
-    return this.getAttribute('key');
+    return this.getAttribute("key") || this.getAttribute("bibtex-key");
   }
 
   get keys() {
-    return this.getAttribute('key').split(',');
+    const result = this.key.split(",");
+    console.log(result);
+    return result;
   }
 
   /* Setters & Rendering */
 
   set numbers(numbers) {
-    const numberStrings = numbers.map( index => {
-      return index == -1 ? '?' : index + 1 + '';
+    this._numbers = numbers;
+    this.displayNumbers(numbers);
+  }
+
+  get numbers() {
+    return this._numbers;
+  }
+
+  displayNumbers(numbers) {
+    if (!this.innerSpan) return;
+    const numberStrings = numbers.map(index => {
+      return index == -1 ? "?" : index + 1 + "";
     });
-    const textContent = '[' + numberStrings.join(', ') + ']';
-    const innerSpan = this.root.querySelector('.citation-number');
-    innerSpan.textContent = textContent;
+    const textContent = "[" + numberStrings.join(", ") + "]";
+    this.innerSpan.textContent = textContent;
   }
 
   set entries(entries) {
-    const div = this.root.querySelector('#hover-box');
-    div.innerHTML = entries.map(hover_cite).join('<br><br>');
+    this._entries = entries;
+    this.displayEntries(entries);
   }
 
-  // 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.`)
-  //   }
-  // }
+  get entries() {
+    return this._entries;
+  }
 
+  displayEntries(entries) {
+    if (!this.hoverBox) return;
+    this.hoverBox.innerHTML = `<ul>
+      ${entries
+        .map(hover_cite)
+        .map(html => `<li>${html}</li>`)
+        .join("\n")}
+    </ul>`;
+  }
 }

src/components/d-code.js

@@ -1,6 +1,27 @@
+// Copyright 2018 The Distill Template Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 import Prism from 'prismjs';
 import 'prismjs/components/prism-python';
 import 'prismjs/components/prism-clike';
+import 'prismjs/components/prism-python';
+import 'prismjs/components/prism-clike';
+import 'prismjs/components/prism-lua';
+import 'prismjs/components/prism-bash';
+import 'prismjs/components/prism-go';
+import 'prismjs/components/prism-markdown';
+import 'prismjs/components/prism-julia';
 import css from 'prismjs/themes/prism.css';
 
 import { Template } from '../mixins/template.js';
@@ -43,7 +64,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

@@ -1,3 +1,17 @@
+// Copyright 2018 The Distill Template Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 // Figure
 //
 // d-figure provides a state-machine of visibility events:
@@ -33,8 +47,7 @@ export class Figure extends HTMLElement {
 
   static runReadyQueue() {
     // console.log("Checking to run readyQueue, length: " + Figure.readyQueue.length + ", scrolling: " + Figure.isScrolling);
-    if (Figure.isScrolling) return;
-
+    // if (Figure.isScrolling) return;
     // console.log("Running ready Queue");
     const figure = Figure.readyQueue
       .sort((a,b) => a._seenOnScreen - b._seenOnScreen )
@@ -56,6 +69,7 @@ export class Figure extends HTMLElement {
   }
 
   connectedCallback() {
+    this.loadsWhileScrolling = this.hasAttribute('loadsWhileScrolling');
     Figure.marginObserver.observe(this);
     Figure.directObserver.observe(this);
   }
@@ -71,12 +85,15 @@ export class Figure extends HTMLElement {
 
   static get marginObserver() {
     if (!Figure._marginObserver) {
+      // if (!('IntersectionObserver' in window)) {
+      //   throw new Error('no interscetionobbserver!');
+      // }
       const viewportHeight = window.innerHeight;
       const margin = Math.floor(2 * viewportHeight);
-      Figure._marginObserver = new IntersectionObserver(
-        Figure.didObserveMarginIntersection, {
-          rootMargin: margin + 'px 0px ' + margin + 'px 0px', threshold: 0.01,
-        });
+      const options = {rootMargin: margin + 'px 0px ' + margin + 'px 0px', threshold: 0.01};
+      const callback = Figure.didObserveMarginIntersection;
+      const observer = new IntersectionObserver(callback, options);
+      Figure._marginObserver = observer;
     }
     return Figure._marginObserver;
   }
@@ -166,7 +183,6 @@ if (typeof window !== 'undefined') {
     clearTimeout(timeout);
     timeout = setTimeout(() => {
       Figure.isScrolling = false;
-      console.log('Stopped Scrolling')
       Figure.runReadyQueue();
     }, 500);
   };

src/components/d-footnote-list.js

@@ -1,51 +1,49 @@
+// Copyright 2018 The Distill Template Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 import { Template } from '../mixins/template';
 
 const T = Template('d-footnote-list', `
 <style>
-:host {
-  contain: content;
+
+d-footnote-list {
+  contain: layout style;
 }
 
-* {
+d-footnote-list > * {
   grid-column: text;
 }
 
-ol {
-  padding: 0 0 0 18px;
-}
-li {
-  margin-bottom: 12px;
-}
-h3 {
-  font-size: 15px;
-  font-weight: 500;
-  margin-top: 20px;
-  margin-bottom: 0;
-  color: rgba(0,0,0,0.65);
-  line-height: 1em;
-}
-a {
-  color: rgba(0, 0, 0, 0.6);
-}
-
-a.footnote-backlink {
+d-footnote-list a.footnote-backlink {
   color: rgba(0,0,0,0.3);
   padding-left: 0.5em;
 }
 
-
 </style>
 
 <h3>Footnotes</h3>
 <ol></ol>
-`);
+`, false);
 
 export class FootnoteList extends T(HTMLElement) {
 
   connectedCallback() {
+    super.connectedCallback();
+
     this.list = this.root.querySelector('ol');
     // footnotes list is initially hidden
-    this.root.host.style.display = 'none';
+    this.root.style.display = 'none';
     // look through document and register existing footnotes
     // Store.subscribeTo('footnotes', (footnote) => {
     //   this.renderFootnote(footnote);
@@ -57,7 +55,7 @@ export class FootnoteList extends T(HTMLElement) {
     this.list.innerHTML = '';
     if (footnotes.length) {
       // ensure footnote list is visible
-      this.root.host.style.display = 'initial';
+      this.root.style.display = '';
 
       for (const footnote of footnotes) {
         // construct and append list item to show footnote
@@ -75,7 +73,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,5 +1,18 @@
+// Copyright 2018 The Distill Template Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 import { Template } from '../mixins/template.js';
-import { HoverBox } from '../helpers/hover-box';
 
 const T = Template('d-footnote', `
 <style>
@@ -8,14 +21,16 @@ d-math[block] {
   display: block;
 }
 
+:host {
+
+}
+
 sup {
   line-height: 1em;
   font-size: 0.75em;
   position: relative;
-  top: 0;
+  top: -.5em;
   vertical-align: baseline;
-  position: relative;
-  top: -6px;
 }
 
 span {
@@ -23,13 +38,21 @@ span {
   cursor: default;
 }
 
+.footnote-container {
+  padding: 10px;
+}
+
 </style>
 
-<div id="hover-box" class="dt-hover-box">
-  <slot id="slot"></slot>
-</div>
+<d-hover-box>
+  <div class="footnote-container">
+    <slot id="slot"></slot>
+  </div>
+</d-hover-box>
 
-<sup><span id="fn-" data-hover-ref=""></span></sup>
+<sup>
+  <span id="fn-" data-hover-ref=""></span>
+</sup>
 
 `);
 
@@ -52,24 +75,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,10 +1,46 @@
+// Copyright 2018 The Distill Template Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+export function _moveLegacyAffiliationFormatIntoArray(frontMatter) {
+  // authors used to have propoerties "affiliation" and "affiliationURL".
+  // We now encourage using an array for affiliations containing objects with
+  // properties "name" and "url".
+  for (let author of frontMatter.authors) {
+    const hasOldStyle = Boolean(author.affiliation)
+    const hasNewStyle = Boolean(author.affiliations)
+    if (!hasOldStyle) continue;
+    if (hasNewStyle) {
+      console.warn(`Author ${author.author} has both old-style ("affiliation" & "affiliationURL") and new style ("affiliations") affiliation information!`)
+    } else {
+      let newAffiliation = {
+        "name": author.affiliation
+      }
+      if (author.affiliationURL) newAffiliation.url = author.affiliationURL;
+      author.affiliations = [newAffiliation];
+    }
+  }
+  return frontMatter
+}
+
 export function parseFrontmatter(element) {
-  const scriptTag = element.querySelector('script');
+  const scriptTag = element.firstElementChild;
   if (scriptTag) {
     const type = scriptTag.getAttribute('type');
     if (type.split('/')[1] == 'json') {
       const content = scriptTag.textContent;
-      return JSON.parse(content);
+      const parsed = JSON.parse(content);
+      return _moveLegacyAffiliationFormatIntoArray(parsed);
     } else {
       console.error('Distill only supports JSON frontmatter tags anymore; no more YAML.');
     }

src/components/d-hover-box.js

@@ -0,0 +1,153 @@
+// Copyright 2018 The Distill Template Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { Template } from '../mixins/template.js';
+
+const T = Template('d-hover-box', `
+<style>
+
+:host {
+  position: absolute;
+  width: 100%;
+  left: 0px;
+  z-index: 10000;
+  display: none;
+  white-space: normal
+}
+
+.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: rgba(250, 250, 250, 0.95);
+  box-shadow: 0 0 7px rgba(0, 0, 0, 0.1);
+  border-radius: 4px;
+  box-sizing: border-box;
+
+  backdrop-filter: blur(2px);
+  -webkit-backdrop-filter: blur(2px);
+}
+
+</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';
+    // 10px extra offset from element
+    this.style.top = Math.round(position[1] + 10) + 'px';
+  }
+
+  showAtNode(node) {
+    // https://developer.mozilla.org/en-US/docs/Web/API/HTMLElement/offsetTop
+    const bbox = node.getBoundingClientRect();
+    this.show([node.offsetLeft + bbox.width, node.offsetTop + bbox.height]);
+  }
+
+  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

@@ -1,8 +1,23 @@
+// Copyright 2018 The Distill Template Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 import { Template } from '../mixins/template';
 
 // This overlay is not secure.
 // It is only meant as a social deterrent.
 
+const productionHostname = 'distill.pub';
 const T = Template('d-interstitial', `
 <style>
 
@@ -24,21 +39,20 @@ const T = Template('d-interstitial', `
 
 }
 
-.overlay.transparent {
-  background: hsla(0, 0%, 100%, 0.7);
-  transition: background 1s;
-}
-
 .container {
   position: relative;
-  left: 25%;
-  width: 50%;
+  margin-left: auto;
+  margin-right: auto;
+  max-width: 420px;
+  padding: 2em;
 }
 
 h1 {
   text-decoration: underline;
   text-decoration-color: hsl(0,100%,40%);
+  -webkit-text-decoration-color: hsl(0,100%,40%);
   margin-bottom: 1em;
+  line-height: 1.5em;
 }
 
 input[type="password"] {
@@ -76,12 +90,31 @@ p small {
   color: #888;
 }
 
+.logo {
+  position: relative;
+  font-size: 1.5em;
+  margin-bottom: 3em;
+}
+
+.logo svg {
+  width: 36px;
+  position: relative;
+  top: 6px;
+  margin-right: 2px;
+}
+
+.logo svg path {
+  fill: none;
+  stroke: black;
+  stroke-width: 2px;
+}
+
 </style>
 
 <div class="overlay">
   <div class="container">
     <h1>This article is in review.</h1>
-    <p>Do not share this URL, or the contents of this article. Thank you!</p>
+    <p>Do not share this URL or the contents of this article. Thank you!</p>
     <input id="interstitial-password-input" type="password" name="password" autofocus/>
     <p><small>Enter the password we shared with you as part of the review process to view the article.</small></p>
   </div>
@@ -91,24 +124,47 @@ p small {
 export class Interstitial extends T(HTMLElement) {
 
   connectedCallback() {
-    const passwordInput = this.root.querySelector('#interstitial-password-input');
-    passwordInput.oninput = (event) => this.passwordChanged(event);
-    setTimeout(() => {
-      this.article = document.querySelector('d-article');
-      this.article.style = 'filter: blur(15px)';
-      const overlay = this.root.querySelector('.overlay');
-      overlay.classList.add('transparent');
-    }, 500);
+    if (this.shouldRemoveSelf()) {
+      this.parentElement.removeChild(this);
+    } else {
+      const passwordInput = this.root.querySelector('#interstitial-password-input');
+      passwordInput.oninput = (event) => this.passwordChanged(event);
+    }
   }
 
   passwordChanged(event) {
     const entered = event.target.value;
     if (entered === this.password) {
       console.log('Correct password entered.');
-      event.target.classList.add('right');
-      this.article.style = '';
       this.parentElement.removeChild(this);
+      if (typeof(Storage) !== 'undefined') {
+        console.log('Saved that correct password was entered.');
+        localStorage.setItem(this.localStorageIdentifier(), 'true');
+      }
     }
   }
 
+  shouldRemoveSelf() {
+    // should never be visible in production
+    if (window && window.location.hostname === productionHostname) {
+      console.warn('Interstitial found on production, hiding it.');
+      return true
+    }
+    // should only have to enter password once
+    if (typeof(Storage) !== 'undefined') {
+      if (localStorage.getItem(this.localStorageIdentifier()) === 'true') {
+        console.log('Loaded that correct password was entered before; skipping interstitial.');
+        return true;
+      }
+    }
+    // otherwise, leave visible
+    return false;
+  }
+
+  localStorageIdentifier() {
+    const prefix = 'distill-drafts'
+    const suffix = 'interstitial-password-correct';
+    return prefix + (window ? window.location.pathname : '-') + suffix
+  }
+
 }

src/components/d-math.js

@@ -1,3 +1,17 @@
+// Copyright 2018 The Distill Template Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 /*global katex */
 import { Mutating } from '../mixins/mutating.js';
 import { Template } from '../mixins/template.js';
@@ -16,7 +30,7 @@ ${katexCSSTag}
 
 :host {
   display: inline-block;
-  contain: content;
+  contain: style;
 }
 
 :host([block]) {
@@ -33,15 +47,19 @@ export class DMath extends Mutating(T(HTMLElement)) {
 
   static set katexOptions(options) {
     DMath._katexOptions = options;
-    if (DMath.katexOptions.delimiters && !DMath.katexAdded) {
-      DMath.addKatex();
+    if (DMath.katexOptions.delimiters) {
+      if (!DMath.katexAdded) {
+        DMath.addKatex();
+      } else {
+        DMath.katexLoadedCallback();
+      }
     }
   }
 
   static get katexOptions() {
     if (!DMath._katexOptions) {
       DMath._katexOptions = {
-        delimiters: [ { 'left':'$', 'right':'$', 'display':true } ]
+        delimiters: [ { 'left':'$$', 'right':'$$', 'display': false } ]
       };
     }
     return DMath._katexOptions;
@@ -55,8 +73,7 @@ export class DMath extends Mutating(T(HTMLElement)) {
     }
     // transform inline delimited math to d-math tags
     if (DMath.katexOptions.delimiters) {
-      const article = document.querySelector('d-article');
-      renderMathInElement(article, DMath.katexOptions);
+      renderMathInElement(document.body, DMath.katexOptions);
     }
   }
 

src/components/d-references.js

@@ -1,3 +1,17 @@
+// Copyright 2018 The Distill Template Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 import { Template } from '../mixins/template';
 
 const T = Template('d-references', `

src/components/d-title.js

@@ -1,40 +1,17 @@
-import { Template } from '../mixins/template';
-
-const T = Template('d-title', `
-<style>
-  :host {
-    padding-top: 1rem;
-    contain: content;
-    display: block;
-  }
-  ::slotted(h1) {
-    grid-column: text-start / span 5;
-    font-size: 50px;
-    font-weight: 700;
-    line-height: 1.05em;
-    margin: 0 0 0.5rem;
-  }
-  .status {
-    margin-top: 0px;
-    font-size: 12px;
-    color: #009688;
-    opacity: 0.8;
-    grid-column: kicker;
-  }
-  .status span {
-    line-height: 1;
-    display: inline-block;
-    padding: 6px 0;
-    border-bottom: 1px solid #80cbc4;
-    font-size: 11px;
-    text-transform: uppercase;
-  }
-</style>
-
-<div class="status"><span>✓ Peer Reviewed</span></div>
-<slot></slot>
-`);
-
-export class Title extends T(HTMLElement) {
+// Copyright 2018 The Distill Template Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
 
+export class Title extends HTMLElement {
+  static get is() { return 'd-title'; }
 }

src/components/d-toc.js

@@ -1,3 +1,17 @@
+// Copyright 2018 The Distill Template Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 export class TOC extends HTMLElement {
 
   static get is() { return 'd-toc'; }
@@ -20,7 +34,7 @@ export function renderTOC(element, headings) {
   <style>
 
   d-toc {
-    contain: content;
+    contain: layout style;
     display: block;
   }
 

src/controller.js

@@ -1,69 +1,88 @@
-import { FrontMatter } from './front-matter';
-import { DMath } from './components/d-math';
-import { collectCitations } from './components/d-cite';
-import { parseFrontmatter } from './components/d-front-matter';
-import optionalComponents from './transforms/optional-components';
+// Copyright 2018 The Distill Template Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { FrontMatter, mergeFromYMLFrontmatter } from "./front-matter";
+import { DMath } from "./components/d-math";
+import { collect_citations } from "./helpers/citation.js";
+import { domContentLoaded } from "./helpers/domContentLoaded.js";
+import { parseFrontmatter } from "./components/d-front-matter";
+import optionalComponents from "./transforms/optional-components";
 
 const frontMatter = new FrontMatter();
 
 export const Controller = {
-
   frontMatter: frontMatter,
   waitingOn: {
     bibliography: [],
-    citations: [],
+    citations: []
   },
   listeners: {
-
     onCiteKeyCreated(event) {
       const [citeTag, keys] = event.detail;
 
       // ensure we have citations
       if (!frontMatter.citationsCollected) {
         // console.debug('onCiteKeyCreated, but unresolved dependency ("citations"). Enqueing.');
-        Controller.waitingOn.citations.push(() => Controller.listeners.onCiteKeyCreated(event));
+        Controller.waitingOn.citations.push(() =>
+          Controller.listeners.onCiteKeyCreated(event)
+        );
         return;
       }
 
       // ensure we have a loaded bibliography
       if (!frontMatter.bibliographyParsed) {
         // console.debug('onCiteKeyCreated, but unresolved dependency ("bibliography"). Enqueing.');
-        Controller.waitingOn.bibliography.push(() => Controller.listeners.onCiteKeyCreated(event));
+        Controller.waitingOn.bibliography.push(() =>
+          Controller.listeners.onCiteKeyCreated(event)
+        );
         return;
       }
 
-      const numbers = keys.map( key => frontMatter.citations.indexOf(key) );
+      const numbers = keys.map(key => frontMatter.citations.indexOf(key));
       citeTag.numbers = numbers;
-      const entries = keys.map( key => frontMatter.bibliography.get(key) );
+      const entries = keys.map(key => frontMatter.bibliography.get(key));
       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 citationListTag = document.querySelector('d-citation-list');
-      const bibliographyEntries = new Map(frontMatter.citations.map( citationKey => {
-        return [citationKey, frontMatter.bibliography.get(citationKey)];
-      }));
+      const citationListTag = document.querySelector("d-citation-list");
+      const bibliographyEntries = new Map(
+        frontMatter.citations.map(citationKey => {
+          return [citationKey, frontMatter.bibliography.get(citationKey)];
+        })
+      );
       citationListTag.citations = bibliographyEntries;
 
-      const citeTags = document.querySelectorAll('d-cite');
+      const citeTags = document.querySelectorAll("d-cite");
       for (const citeTag of citeTags) {
+        console.log(citeTag);
         const keys = citeTag.keys;
-        const numbers = keys.map( key => frontMatter.citations.indexOf(key) );
+        const numbers = keys.map(key => frontMatter.citations.indexOf(key));
         citeTag.numbers = numbers;
-        const entries = keys.map( key => frontMatter.bibliography.get(key) );
+        const entries = keys.map(key => frontMatter.bibliography.get(key));
         citeTag.entries = entries;
       }
-
     },
 
     onCiteKeyRemoved(event) {
@@ -71,7 +90,8 @@ export const Controller = {
     },
 
     onBibliographyChanged(event) {
-      const citationListTag = document.querySelector('d-citation-list');
+      const citationListTag = document.querySelector("d-citation-list");
+
       const bibliography = event.detail;
 
       frontMatter.bibliography = bibliography;
@@ -82,48 +102,60 @@ export const Controller = {
 
       // ensure we have citations
       if (!frontMatter.citationsCollected) {
-        Controller.waitingOn.citations.push( function() {
-          Controller.listeners.onBibliographyChanged({target: event.target, detail: event.detail});
+        Controller.waitingOn.citations.push(function() {
+          Controller.listeners.onBibliographyChanged({
+            target: event.target,
+            detail: event.detail
+          });
         });
         return;
       }
 
-      const entries = new Map(frontMatter.citations.map( citationKey => {
-        return [citationKey, frontMatter.bibliography.get(citationKey)];
-      }));
-
-      citationListTag.citations = entries;
+      if (citationListTag.hasAttribute("distill-prerendered")) {
+        console.debug("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() {
       // const footnote = event.detail;
       //TODO: optimize to only update current footnote
-      const footnotesList = document.querySelector('d-footnote-list');
+      const footnotesList = document.querySelector("d-footnote-list");
       if (footnotesList) {
-        const footnotes = document.querySelectorAll('d-footnote');
+        const footnotes = document.querySelectorAll("d-footnote");
         footnotesList.footnotes = footnotes;
       }
     },
 
     onFrontMatterChanged(event) {
       const data = event.detail;
-      frontMatter.mergeFromYMLFrontmatter(data);
+      mergeFromYMLFrontmatter(frontMatter, data);
 
-      const interstitial = document.querySelector('d-interstitial');
+      const interstitial = document.querySelector("d-interstitial");
       if (interstitial) {
-        interstitial.password = frontMatter.password;
+        if (typeof frontMatter.password !== "undefined") {
+          interstitial.password = frontMatter.password;
+        } else {
+          interstitial.parentElement.removeChild(interstitial);
+        }
       }
 
-      const prerendered = document.body.hasAttribute('distill-prerendered');
-      if (!prerendered) {
+      const prerendered = document.body.hasAttribute("distill-prerendered");
+      if (!prerendered && domContentLoaded()) {
         optionalComponents(document, frontMatter);
 
-        const appendix = document.querySelector('distill-appendix');
+        const appendix = document.querySelector("distill-appendix");
         if (appendix) {
           appendix.frontMatter = frontMatter;
         }
 
-        const byline = document.querySelector('d-byline');
+        const byline = document.querySelector("d-byline");
         if (byline) {
           byline.frontMatter = frontMatter;
         }
@@ -132,30 +164,50 @@ export const Controller = {
           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 at document.readyState: " +
+            document.readyState +
+            "!"
+        );
+        return;
+      } else {
+        Controller.loaded = true;
+        console.debug("Runlevel 4: Controller running DOMContentLoaded");
+      }
 
-      const frontMatterTag = document.querySelector('d-front-matter');
-      const data = parseFrontmatter(frontMatterTag);
-      Controller.listeners.onFrontMatterChanged({detail: data});
+      const frontMatterTag = document.querySelector("d-front-matter");
+      if (frontMatterTag) {
+        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();
       }
 
-      const footnotesList = document.querySelector('d-footnote-list');
+      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');
+        const footnotes = document.querySelectorAll("d-footnote");
         footnotesList.footnotes = footnotes;
       }
     }
-
-  }, // listeners
-
+  } // listeners
 }; // Controller

src/distill-components/distill-appendix.js

@@ -1,25 +1,25 @@
+// Copyright 2018 The Distill Template Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 import { serializeFrontmatterToBibtex } from '../helpers/bibtex';
 
 const styles = `
 <style>
   distill-appendix {
-    contain: content;
-  }
-  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;
+    contain: layout style;
   }
+
   distill-appendix .citation {
     font-size: 11px;
     line-height: 15px;
@@ -35,25 +35,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-template.js

@@ -0,0 +1,74 @@
+import logo from '../assets/distill-logo.svg';
+
+export const footerTemplate = `
+<style>
+
+:host {
+  color: rgba(255, 255, 255, 0.5);
+  font-weight: 300;
+  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;
+}
+
+.footer-container .logo svg {
+  width: 24px;
+  position: relative;
+  top: 4px;
+  margin-right: 2px;
+}
+
+.footer-container .logo svg path {
+  fill: none;
+  stroke: rgba(255, 255, 255, 0.8);
+  stroke-width: 3px;
+}
+
+.footer-container .logo {
+  font-size: 17px;
+  font-weight: 200;
+  color: rgba(255, 255, 255, 0.8);
+  text-decoration: none;
+  margin-right: 6px;
+}
+
+.footer-container {
+  grid-column: text;
+}
+
+.footer-container .nav {
+  font-size: 0.9em;
+  margin-top: 1.5em;
+}
+
+.footer-container .nav a {
+  color: rgba(255, 255, 255, 0.8);
+  margin-right: 6px;
+  text-decoration: none;
+}
+
+</style>
+
+<div class='footer-container'>
+
+  <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>
+
+`;

src/distill-components/distill-footer.js

@@ -1,54 +1,22 @@
+// Copyright 2018 The Distill Template Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 import { Template } from '../mixins/template';
-import logo from '../assets/distill-logo.svg';
 
-const T = Template('distill-footer', `
-<style>
+import {footerTemplate} from './distill-footer-template';
 
-:host {
-  display: block;
-  color: rgba(255, 255, 255, 0.4);
-  font-weight: 300;
-  padding: 40px 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 {
-  width: 24px;
-  position: relative;
-  top: 4px;
-  margin-right: 2px;
-}
-
-.logo svg path {
-  fill: none;
-  stroke: rgba(255, 255, 255, 0.8);
-  stroke-width: 3px;
-}
-
-.logo {
-  font-size: 17px;
-  font-weight: 200;
-  color: rgba(255, 255, 255, 0.8);
-  text-decoration: none;
-  margin-right: 6px;
-}
-
-.container {
-  grid-column: left / text;
-}
-</style>
-
-<div class='container'>
-<a href="/" class="logo">
-  ${logo}
-  Distill
-</a> is dedicated to clear explanations of machine learning
-</div>
-`);
+const T = Template('distill-footer', footerTemplate);
 
 export class DistillFooter extends T(HTMLElement) {
 

src/distill-components/distill-header-template.js

@@ -0,0 +1,79 @@
+import logo from '../assets/distill-logo.svg';
+
+export const headerTemplate = `
+<style>
+distill-header {
+  position: relative;
+  height: 60px;
+  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);
+}
+distill-header .content {
+  height: 70px;
+  grid-column: page;
+}
+distill-header a {
+  font-size: 16px;
+  height: 60px;
+  line-height: 60px;
+  text-decoration: none;
+  color: rgba(255, 255, 255, 0.8);
+  padding: 22px 0;
+}
+distill-header a:hover {
+  color: rgba(255, 255, 255, 1);
+}
+distill-header svg {
+  width: 24px;
+  position: relative;
+  top: 4px;
+  margin-right: 2px;
+}
+@media(min-width: 1080px) {
+  distill-header {
+    height: 70px;
+  }
+  distill-header a {
+    height: 70px;
+    line-height: 70px;
+    padding: 28px 0;
+  }
+  distill-header .logo {
+  }
+}
+distill-header svg path {
+  fill: none;
+  stroke: rgba(255, 255, 255, 0.8);
+  stroke-width: 3px;
+}
+distill-header .logo {
+  font-size: 17px;
+  font-weight: 200;
+}
+distill-header .nav {
+  float: right;
+  font-weight: 300;
+}
+distill-header .nav a {
+  font-size: 12px;
+  margin-left: 24px;
+  text-transform: uppercase;
+}
+</style>
+<div class="content">
+  <a href="/" class="logo">
+    ${logo}
+    Distill
+  </a>
+  <nav class="nav">
+    <a href="/about/">About</a>
+    <a href="/prize/">Prize</a>
+    <a href="/journal/">Submit</a>
+  </nav>
+</div>
+`;

src/distill-components/distill-header.js

@@ -1,88 +1,22 @@
+// Copyright 2018 The Distill Template Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 import { Template } from '../mixins/template';
 
-import logo from '../assets/distill-logo.svg';
+import {headerTemplate} from './distill-header-template';
 
-const T = Template('distill-header', `
-<style>
-:host {
-  box-sizing: border-box;
-  display: block;
-  top: 0;
-  left: 0;
-  width: 100%;
-  z-index: ${1e6};
-  color: rgba(0, 0, 0, 0.8);
-  border-bottom: 1px solid rgba(0, 0, 0, 0.08);
-  contain: content;
-}
-
-.content > * {
-  line-height: 30px;
-  font-size: 14px;
-  padding: 3px 7px;
-  margin: 8px 0;
-}
-
-.name {
-  grid-column-end: span 8;
-  font-weight: 500;
-  border-radius: 3px;
-  font-size: 18px;
-  letter-spacing: -0.05em;
-}
-
-.content a {
-  font-size: 12px;
-  text-decoration: none;
-  color: black;
-  text-transform: uppercase;
-}
-svg {
-  display: none;
-  background-color: hsl(0, 0%, 15%);
-  padding: 8px;
-  border-radius: 6px;
-  width: 24px;
-  position: relative;
-  margin-right: 2px;
-}
-svg path {
-  fill: white;
-  stroke: rgba(255, 255, 255, 1.0);
-  stroke-width: 3px;
-}
-.content {
-  grid-column: page;
-  grid-template-columns: repeat(12, 1fr);
-  display: grid;
-  grid-column-gap: 40px;
-}
-.logo {
-  display: none;
-  font-size: 17px;
-  font-weight: 200;
-}
-
-</style>
-
-<div class="content grid">
-  <a href="/" class="logo">
-    ${logo}
-  </a>
-  <div class='name'>
-    Distill
-  </div>
-  <a href="/faq">Latest</a>
-  <a href="/faq">About</a>
-  <a href="/faq">Prize</a>
-  <a href="/faq">Submit</a>
-</div>
-`);
-
-// <div class="nav">
-//   <a href="https://github.com/distillpub">GitHub</a>
-//   <!-- https://twitter.com/distillpub -->
-// </div>
+const T = Template('distill-header', headerTemplate, false);
 
 export class DistillHeader extends T(HTMLElement) {
 

src/distill-transforms/distill-appendix.js

@@ -1,4 +1,20 @@
-export default function(dom) {
+// Copyright 2018 The Distill Template Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { appendixTemplate } from '../distill-components/distill-appendix';
+
+export default function(dom, data) {
 
   const appendixTag = dom.querySelector('d-appendix');
   if (!appendixTag) {
@@ -9,6 +25,7 @@ export default function(dom) {
   if (!distillAppendixTag) {
     const distillAppendix = dom.createElement('distill-appendix');
     appendixTag.appendChild(distillAppendix);
+    distillAppendix.innerHTML = appendixTemplate(data);
   }
 
 }

src/distill-transforms/distill-footer.js

@@ -1,7 +1,24 @@
+// Copyright 2018 The Distill Template Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { footerTemplate } from '../distill-components/distill-footer-template';
+
 export default function(dom) {
   const footerTag = dom.querySelector('distill-footer');
   if(!footerTag) {
     const footer = dom.createElement('distill-footer');
+    footer.innerHTML = footerTemplate;
     const body = dom.querySelector('body');
     body.appendChild(footer);
   }

src/distill-transforms/distill-header.js

@@ -1,7 +1,26 @@
-export default function(dom) {
+// Copyright 2018 The Distill Template Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+
+import { headerTemplate } from '../distill-components/distill-header-template';
+
+export default function(dom, data) {
   const headerTag = dom.querySelector('distill-header');
   if (!headerTag) {
     const header = dom.createElement('distill-header');
+    header.innerHTML = headerTemplate;
+    header.setAttribute('distill-prerendered', "");
     const body = dom.querySelector('body');
     body.insertBefore(header, body.firstChild);
   }

src/extractors/bibliography.js

@@ -1,3 +1,19 @@
+// Copyright 2018 The Distill Template Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { parseBibtex } from '../helpers/bibtex';
+import fs from 'fs';
 import { parseBibliography } from '../components/d-bibliography';
 
 export default function(dom, data) {
@@ -6,5 +22,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,24 @@
-import { collectCitations } from '../components/d-cite';
+// Copyright 2018 The Distill Template Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+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,19 @@
+// Copyright 2018 The Distill Template Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 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 +22,5 @@ export default function(dom, data) {
     return;
   }
   const extractedData = parseFrontmatter(frontMatterTag);
-  data.mergeFromYMLFrontmatter(extractedData);
+  mergeFromYMLFrontmatter(data, extractedData);
 }

src/front-matter.js

@@ -1,5 +1,19 @@
+// Copyright 2018 The Distill Template Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 const days = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'];
-const months = ['Jan', 'Feb', 'March', 'April', 'May', 'June', 'July', 'Aug', 'Sept', 'Oct', 'Nov', 'Dec'];
+const months = ['Jan.', 'Feb.', 'March', 'April', 'May', 'June', 'July', 'Aug.', 'Sept.', 'Oct.', 'Nov.', 'Dec.'];
 const zeroPad = n => n < 10 ? '0' + n : n;
 
 const RFC = function(date) {
@@ -13,6 +27,23 @@ const RFC = function(date) {
   return `${day}, ${paddedDate} ${month} ${year} ${hours}:${minutes}:${seconds} Z`;
 };
 
+const objectFromMap = function(map) {
+  const object = Array.from(map).reduce((object, [key, value]) => (
+    Object.assign(object, { [key]: value }) // Be careful! Maps can have non-String keys; object literals can't.
+  ), {});
+  return object;
+};
+
+const mapFromObject = function(object) {
+  const map = new Map();
+  for (var property in object) {
+    if (object.hasOwnProperty(property)) {
+      map.set(property, object[property]);
+    }
+  }
+  return map;
+};
+
 class Author {
 
   // constructor(name='', personalURL='', affiliation='', affiliationURL='') {
@@ -27,6 +58,7 @@ class Author {
     this.personalURL = object.authorURL; // 'https://colah.github.io'
     this.affiliation = object.affiliation; // 'Google Brain'
     this.affiliationURL = object.affiliationURL; // 'https://g.co/brain'
+    this.affiliations = object.affiliations || []; // new-style affiliations
   }
 
   // 'Chris'
@@ -42,9 +74,36 @@ class Author {
   }
 }
 
+export function mergeFromYMLFrontmatter(target, source) {
+  target.title = source.title;
+  if (source.published) {
+    if (source.published instanceof Date) {
+      target.publishedDate = source.published;
+    } else if (source.published.constructor === String) {
+      target.publishedDate = new Date(source.published);
+    }
+  }
+  if (source.publishedDate) {
+    if (source.publishedDate instanceof Date) {
+      target.publishedDate = source.publishedDate;
+    } else if (source.publishedDate.constructor === String) {
+      target.publishedDate = new Date(source.publishedDate);
+    } else {
+      console.error('Don\'t know what to do with published date: ' + source.publishedDate);
+    }
+  }
+  target.description = source.description;
+  target.authors = source.authors.map( (authorObject) => new Author(authorObject));
+  target.katex = source.katex;
+  target.password = source.password;
+  if (source.doi) {
+    target.doi = source.doi;
+  }
+}
+
 export class FrontMatter {
   constructor() {
-    this.title = ''; // 'Attention and Augmented Recurrent Neural Networks'
+    this.title = 'unnamed article'; // 'Attention and Augmented Recurrent Neural Networks'
     this.description = ''; // 'A visual overview of neural attention...'
     this.authors = []; // Array of Author(s)
 
@@ -94,7 +153,6 @@ export class FrontMatter {
     //  }
     //  volume: 1,
     //  issue: 9,
-    this.publishedDate = new Date();
 
     this.katex = {};
 
@@ -105,7 +163,8 @@ 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.doi = undefined;
+    this.publishedDate = undefined;
   }
 
   // Example:
@@ -118,15 +177,6 @@ export class FrontMatter {
   // - Google Brain:
   // - Google Brain: http://g.co/brain
 
-  mergeFromYMLFrontmatter(data) {
-    this.title = data.title;
-    this.publishedDate = new Date(data.published);
-    this.description = data.description;
-    this.authors = data.authors.map( (authorObject) => new Author(authorObject));
-    this.katex = data.katex;
-    this.password = data.password;
-  }
-
   //
   // Computed Properties
   //
@@ -147,7 +197,11 @@ export class FrontMatter {
 
   // 'https://github.com/distillpub/post--augmented-rnns',
   get githubUrl() {
-    return 'https://github.com/' + this.githubPath;
+    if (this.githubPath) {
+      return 'https://github.com/' + this.githubPath;
+    } else {
+      return undefined;
+    }
   }
 
   // TODO resolve differences in naming of URL/Url/url.
@@ -194,6 +248,22 @@ export class FrontMatter {
     return zeroPad(this.publishedDate.getDate());
   }
 
+  get publishedISODateOnly() {
+    return this.publishedDate.toISOString().split('T')[0];
+  }
+
+  get volume() {
+    const volume = this.publishedYear - 2015;
+    if (volume < 1) {
+      throw new Error('Invalid publish date detected during computing volume');
+    }
+    return volume;
+  }
+
+  get issue() {
+    return this.publishedDate.getMonth() + 1;
+  }
+
   // 'Olah & Carter',
   get concatenatedAuthors() {
     if (this.authors.length > 2) {
@@ -230,4 +300,47 @@ 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.doi = this.doi;
+    target.githubUrl = this.githubUrl;
+    target.previewURL = this.previewURL;
+    if (this.publishedDate) {
+      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;
+    }
+    if (this.updatedDate) {
+      target.updatedDateRFC = this.updatedDateRFC;
+    }
+    target.concatenatedAuthors = this.concatenatedAuthors;
+    target.bibtexAuthors = this.bibtexAuthors;
+    target.slug = this.slug;
+  }
+
 }

src/helpers/bibtex.js

@@ -1,3 +1,17 @@
+// Copyright 2018 The Distill Template Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 import bibtexParse from 'bibtex-parse-js';
 
 function normalizeTag(string) {
@@ -13,7 +27,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 +42,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,55 +1,98 @@
-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 '?';
+// Copyright 2018 The Distill Template Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+export function collect_citations(dom = document) {
+  const citations = new Set();
+  const citeTags = dom.querySelectorAll("d-cite");
+  for (const tag of citeTags) {
+    const keyString = tag.getAttribute("key") || tag.getAttribute("bibtex-key");
+    const keys = keyString.split(",").map(k => k.trim());
+    for (const key of keys) {
+      citations.add(key);
     }
   }
-  return '['+keys.map(cite_string).join(', ')+']';
+  return [...citations];
 }
 
-export function inline_cite_long(keys){
-  function cite_string(key){
-    if (key in data.bibliography){
+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 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;
+      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 "?";
     }
   }
-  return keys.map(cite_string).join(', ');
+  return keys.map(cite_string).join(", ");
 }
 
-function author_string(ent, template, sep, finalSep){
-  var names = ent.author.split(' and ');
+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();
-    if (name.indexOf(',') != -1){
-      var last = name.split(',')[0].trim();
-      var firsts = name.split(',')[1];
+    if (name.indexOf(",") != -1) {
+      var last = name.split(",")[0].trim();
+      var firsts = name.split(",")[1];
+    } else if (name.indexOf(" ") != -1) {
+      var last = name
+        .split(" ")
+        .slice(-1)[0]
+        .trim();
+      var firsts = name
+        .split(" ")
+        .slice(0, -1)
+        .join(" ");
     } else {
-      var last = name.split(' ').slice(-1)[0].trim();
-      var firsts = name.split(' ').slice(0,-1).join(' ');
+      var last = name.trim();
     }
-    var initials = '';
+    var initials = "";
     if (firsts != undefined) {
-      initials = firsts.trim().split(' ').map(s => s.trim()[0]);
-      initials = initials.join('.')+'.';
+      initials = firsts
+        .trim()
+        .split(" ")
+        .map(s => s.trim()[0]);
+      initials = initials.join(".") + ".";
     }
-    return template.replace('${F}', firsts)
-      .replace('${L}', last)
-      .replace('${I}', initials);
+    return template
+      .replace("${F}", firsts)
+      .replace("${L}", last)
+      .replace("${I}", initials)
+      .trim(); // in case one of first or last was empty
   });
   if (names.length > 1) {
-    var str = name_strings.slice(0, names.length-1).join(sep);
-    str += (finalSep || sep) + name_strings[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];
@@ -57,60 +100,71 @@ function author_string(ent, template, sep, finalSep){
 }
 
 function venue_string(ent) {
-  var cite = (ent.journal || ent.booktitle || '');
-  if ('volume' in 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;
+    issue = issue != undefined ? "(" + issue + ")" : "";
+    cite += ", Vol " + ent.volume + issue;
   }
-  if ('pages' in ent){
-    cite += ', pp. ' + ent.pages;
+  if ("pages" in ent) {
+    cite += ", pp. " + ent.pages;
   }
-  if (cite != '') cite += '. ';
-  if ('publisher' in ent){
+  if (cite != "") cite += ". ";
+  if ("publisher" in ent) {
     cite += ent.publisher;
-    if (cite[cite.length-1] != '.') cite += '.';
+    if (cite[cite.length - 1] != ".") cite += ".";
   }
   return cite;
 }
 
-function link_string(ent){
-  if ('url' in ent){
+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){
+    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';
+    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="${url}">[${label || "link"}]</a>`;
+  } /* else if ("doi" in ent){
     return ` &ensp;<a href="https://doi.org/${ent.doi}" >[DOI]</a>`;
   }*/ else {
-    return '';
+    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>`;
+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 '';
+    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) + '. ';
+function title_string(ent) {
+  return '<span class="title">' + ent.title + "</span> ";
+}
+
+export function bibliography_cite(ent, fancy) {
+  if (ent) {
+    var cite = title_string(ent);
+    cite += link_string(ent) + "<br>";
+    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 += '. ';
+      cite += ". ";
     }
     cite += venue_string(ent);
     cite += doi_string(ent);
@@ -127,39 +181,39 @@ export function bibliography_cite(ent, fancy){
     cite += link_string(ent);
     return cite*/
   } else {
-    return '?';
+    return "?";
   }
 }
 
-export function hover_cite(ent){
-  if (ent){
-    var cite = '';
-    cite += '<b>' + ent.title + '</b>';
+export function hover_cite(ent) {
+  if (ent) {
+    var cite = "";
+    cite += "<strong>" + ent.title + "</strong>";
     cite += link_string(ent);
-    cite += '<br>';
+    cite += "<br>";
 
-    var a_str = author_string(ent, '${I} ${L}', ', ') + '.';
-    var v_str = venue_string(ent).trim() + ' ' + ent.year + '. ' + doi_string(ent, true);
+    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;
+    if ((a_str + v_str).length < Math.min(40, ent.title.length)) {
+      cite += a_str + " " + v_str;
     } else {
-      cite += a_str + '<br>' + v_str;
+      cite += a_str + "<br>" + v_str;
     }
     return cite;
   } else {
-    return '?';
+    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(' ')});
+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/helpers/domContentLoaded.js

@@ -0,0 +1,3 @@
+export function domContentLoaded() {
+  return ['interactive', 'complete'].indexOf(document.readyState) !== -1;
+}

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

@@ -1,3 +1,17 @@
+// Copyright 2018 The Distill Template Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 // 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.
 
@@ -14,14 +28,16 @@ const findEndOfMath = function(delimiter, text, startIndex) {
   while (index < text.length) {
     const character = text[index];
 
-    if (braceLevel <= 0 &&
-      text.slice(index, index + delimLength) === delimiter) {
+    if (
+      braceLevel <= 0 &&
+      text.slice(index, index + delimLength) === delimiter
+    ) {
       return index;
-    } else if (character === '\\') {
+    } else if (character === "\\") {
       index++;
-    } else if (character === '{') {
+    } else if (character === "{") {
       braceLevel++;
-    } else if (character === '}') {
+    } else if (character === "}") {
       braceLevel--;
     }
 
@@ -35,7 +51,7 @@ const splitAtDelimiters = function(startData, leftDelim, rightDelim, display) {
   const finalData = [];
 
   for (let i = 0; i < startData.length; i++) {
-    if (startData[i].type === 'text') {
+    if (startData[i].type === "text") {
       const text = startData[i].data;
 
       let lookingForLeft = true;
@@ -46,13 +62,14 @@ const splitAtDelimiters = function(startData, leftDelim, rightDelim, display) {
       if (nextIndex !== -1) {
         currIndex = nextIndex;
         finalData.push({
-          type: 'text',
-          data: text.slice(0, currIndex),
+          type: "text",
+          data: text.slice(0, currIndex)
         });
         lookingForLeft = false;
       }
 
-      while (true) { // eslint-disable-line no-constant-condition
+      while (true) {
+        // eslint-disable-line no-constant-condition
         if (lookingForLeft) {
           nextIndex = text.indexOf(leftDelim, currIndex);
           if (nextIndex === -1) {
@@ -60,8 +77,8 @@ const splitAtDelimiters = function(startData, leftDelim, rightDelim, display) {
           }
 
           finalData.push({
-            type: 'text',
-            data: text.slice(currIndex, nextIndex),
+            type: "text",
+            data: text.slice(currIndex, nextIndex)
           });
 
           currIndex = nextIndex;
@@ -69,20 +86,17 @@ const splitAtDelimiters = function(startData, leftDelim, rightDelim, display) {
           nextIndex = findEndOfMath(
             rightDelim,
             text,
-            currIndex + leftDelim.length);
+            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,
+            type: "math",
+            data: text.slice(currIndex + leftDelim.length, nextIndex),
+            rawData: text.slice(currIndex, nextIndex + rightDelim.length),
+            display: display
           });
 
           currIndex = nextIndex + rightDelim.length;
@@ -92,8 +106,8 @@ const splitAtDelimiters = function(startData, leftDelim, rightDelim, display) {
       }
 
       finalData.push({
-        type: 'text',
-        data: text.slice(currIndex),
+        type: "text",
+        data: text.slice(currIndex)
       });
     } else {
       finalData.push(startData[i]);
@@ -103,14 +117,16 @@ const splitAtDelimiters = function(startData, leftDelim, rightDelim, display) {
   return finalData;
 };
 
-
 const splitWithDelimiters = function(text, delimiters) {
-  let data = [{type: 'text', data: text}];
+  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);
+      data,
+      delimiter.left,
+      delimiter.right,
+      delimiter.display || false
+    );
   }
   return data;
 };
@@ -123,10 +139,10 @@ const renderMathInText = function(text, optionsCopy) {
   const fragment = document.createDocumentFragment();
 
   for (let i = 0; i < data.length; i++) {
-    if (data[i].type === 'text') {
+    if (data[i].type === "text") {
       fragment.appendChild(document.createTextNode(data[i].data));
     } else {
-      const tag = document.createElement('d-math');
+      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
@@ -134,15 +150,14 @@ const renderMathInText = function(text, optionsCopy) {
       try {
         tag.textContent = math;
         if (optionsCopy.displayMode) {
-          tag.setAttribute('block', '');
+          tag.setAttribute("block", "");
         }
       } catch (e) {
         if (!(e instanceof katex.ParseError)) {
           throw e;
         }
         optionsCopy.errorCallback(
-          'KaTeX auto-render: Failed to parse `' + data[i].data +
-          '` with ',
+          "KaTeX auto-render: Failed to parse `" + data[i].data + "` with ",
           e
         );
         fragment.appendChild(document.createTextNode(data[i].rawData));
@@ -160,13 +175,17 @@ const renderElem = function(elem, optionsCopy) {
     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);
+      const text = childNode.textContent;
+      if (optionsCopy.mightHaveMath(text)) {
+        const frag = renderMathInText(text, 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;
+      const shouldRender =
+        optionsCopy.ignoredTags.indexOf(childNode.nodeName.toLowerCase()) ===
+        -1;
 
       if (shouldRender) {
         renderElem(childNode, optionsCopy);
@@ -178,27 +197,40 @@ const renderElem = function(elem, optionsCopy) {
 
 const defaultAutoRenderOptions = {
   delimiters: [
-    {left: '$$', right: '$$', display: true},
-    {left: '\\[', right: '\\]', display: true},
-    {left: '\\(', right: '\\)', display: false},
+    { 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',
+    "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');
+    throw new Error("No element provided to render");
   }
 
   const optionsCopy = Object.assign({}, defaultAutoRenderOptions, options);
+  const delimiterStrings = optionsCopy.delimiters.flatMap(d => [
+    d.left,
+    d.right
+  ]);
+  const mightHaveMath = text =>
+    delimiterStrings.some(d => text.indexOf(d) !== -1);
+  optionsCopy.mightHaveMath = mightHaveMath;
   renderElem(elem, optionsCopy);
 };

src/helpers/layout.js

@@ -1,3 +1,17 @@
+// Copyright 2018 The Distill Template Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 // const marginSmall = 16;
 // const marginLarge = 3 * marginSmall;
 // const margin = marginSmall + marginLarge;

src/helpers/polyfills.js

@@ -0,0 +1,82 @@
+// Copyright 2018 The Distill Template Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+export function addPolyfill(polyfill, polyfillLoadedCallback) {
+  console.debug('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.debug('Runlevel 0: Polyfill has finished loading: ' + polyfill.name);
+      // console.debug(window[polyfill.name]);
+      if (Polyfills.neededPolyfills.every((poly) => poly.loaded)) {
+        console.debug('Runlevel 0: All required polyfills have finished loading.');
+        console.debug('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/mixins/mutating.js

@@ -1,3 +1,17 @@
+// Copyright 2018 The Distill Template Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 export const Mutating = (superclass) => {
   return class extends superclass {
 

src/mixins/properties.js

@@ -1,3 +1,17 @@
+// Copyright 2018 The Distill Template Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 export function propName(attr) {
   return attr.replace(/(-[a-z])/g, (s) => s.toUpperCase().replace('-', ''));
 }

src/mixins/template.js

@@ -1,3 +1,17 @@
+// Copyright 2018 The Distill Template Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 /*global ShadyCSS*/
 
 export const Template = (name, templateString, useShadow = true) => {
@@ -26,6 +40,9 @@ export const Template = (name, templateString, useShadow = true) => {
       }
 
       connectedCallback() {
+        if (this.hasAttribute('distill-prerendered')) {
+          return;
+        }
         if (useShadow) {
           if ('ShadyCSS' in window) {
             ShadyCSS.styleElement(this);

src/styles/d-article.css

@@ -1,5 +1,22 @@
+/*
+ * Copyright 2018 The Distill Template Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 d-article {
-  contain: content;
+  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);
@@ -17,7 +34,7 @@ d-article > * {
 
 @media(min-width: 1024px) {
   d-article {
-    font-size: 1rem;
+    font-size: 1.06rem;
     line-height: 1.7em;
   }
 }
@@ -51,16 +68,17 @@ d-article .marker:hover span {
 }
 
 d-article h2 {
-  grid-column-end: page-end;
-  font-weight: 700;
+  font-weight: 600;
   font-size: 24px;
   line-height: 1.25em;
-  margin: 0 0 1rem 0;
+  margin: 2rem 0 1.5rem 0;
+  border-bottom: 1px solid rgba(0, 0, 0, 0.1);
+  padding-bottom: 1rem;
 }
 
 @media(min-width: 1024px) {
   d-article h2 {
-    font-size: 24px;
+    font-size: 36px;
   }
 }
 
@@ -70,8 +88,8 @@ d-article h3 {
   font-weight: 700;
   font-size: 18px;
   line-height: 1.4em;
-  margin-bottom: 24px;
-  margin-top: 0;
+  margin-bottom: 1em;
+  margin-top: 2em;
 }
 
 @media(min-width: 1024px) {
@@ -95,11 +113,19 @@ d-article a {
 
 d-article p,
 d-article ul,
-d-article ol {
-  font-family: georgia, serif;
+d-article ol,
+d-article blockquote {
   margin-top: 0;
-  margin-bottom: 1.7em;
-  -webkit-font-smoothing: antialiased;
+  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 {
@@ -122,19 +148,25 @@ d-article ol {
 }
 
 d-article li {
-  margin-bottom: 24px;
+  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.2);
+  border-bottom: 1px solid rgba(0, 0, 0, 0.1);
   margin-top: 60px;
   margin-bottom: 60px;
 }
@@ -144,56 +176,12 @@ d-article section {
   margin-bottom: 60px;
 }
 
-/* Figure */
-
-d-article figure {
-  position: relative;
-  margin-bottom: 36px;
-}
-
-d-article figure img {
-  width: 100%;
-}
-
-d-article figure svg text,
-d-article figure svg tspan {
-}
-
-d-article figure figcaption {
-  color: rgba(0, 0, 0, 0.6);
-  font-size: 12px;
-  line-height: 1.5em;
-}
-
-@media(min-width: 1024px) {
-  d-article figure figcaption {
-    font-size: 13px;
-  }
-}
-
-d-article figure.external img {
-  background: white;
-  border: 1px solid rgba(0, 0, 0, 0.1);
-  box-shadow: 0 1px 8px rgba(0, 0, 0, 0.1);
-  padding: 18px;
-  box-sizing: border-box;
-}
-
-d-article figure figcaption a {
-  color: rgba(0, 0, 0, 0.6);
-}
-
 d-article span.equation-mimic {
   font-family: georgia;
   font-size: 115%;
   font-style: italic;
 }
 
-d-article figure figcaption b {
-  font-weight: 600;
-  color: rgba(0, 0, 0, 1.0);
-}
-
 d-article > d-code,
 d-article section > d-code  {
   display: block;
@@ -204,6 +192,24 @@ 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;
@@ -215,14 +221,42 @@ d-include {
 }
 
 d-figure {
-  contain: content;
-  overflow: hidden;
-  height: 300px;
+  contain: layout style;
 }
 
 /* KaTeX */
 
 .katex, .katex-prerendered {
-  contain: content;
+  contain: style;
   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

@@ -1,18 +1,55 @@
+/*
+ * Copyright 2018 The Distill Template Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 d-byline {
+  contain: style;
+  overflow: hidden;
   border-top: 1px solid rgba(0, 0, 0, 0.1);
-  contain: content;
-  font-size: 0.7rem;
+  font-size: 0.8rem;
   line-height: 1.8em;
   padding: 1.5rem 0;
+  min-height: 1.8em;
 }
 
+
 d-byline .byline {
-  grid-template-columns: repeat(4, 1fr);
+  grid-template-columns: 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.55rem;
+  font-size: 0.6rem;
   font-weight: 400;
   color: rgba(0, 0, 0, 0.5);
   margin: 0;
@@ -35,9 +72,10 @@ d-article d-byline a:hover {
   border-bottom: none;
 }
 
-d-byline .authors p {
-  font-weight: 600;
+d-byline p.author {
+  font-weight: 500;
 }
+
 d-byline .affiliations {
 
 }

src/styles/d-math.css

@@ -1,7 +1,23 @@
+/*
+ * Copyright 2018 The Distill Template Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 span.katex-display {
   text-align: left;
   padding: 8px 0 8px 0;
-  margin: 0 0 1.7em 1em;
+  margin: 0.5em 0 0.5em 1em;
 }
 
 span.katex {

src/styles/d-title.css

@@ -0,0 +1,65 @@
+/*
+ * Copyright 2018 The Distill Template Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+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-base.css

@@ -1,13 +1,36 @@
+/*
+ * Copyright 2018 The Distill Template Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 html {
-  font-size: 19px;
-	line-height: 1rem;
+  font-size: 14px;
+	line-height: 1.6em;
   /* font-family: "Libre Franklin", "Helvetica Neue", sans-serif; */
-  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif;
+  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Fira Sans", "Droid Sans", "Helvetica Neue", Arial, sans-serif;
+  /*, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";*/
   text-size-adjust: 100%;
   -ms-text-size-adjust: 100%;
   -webkit-text-size-adjust: 100%;
 }
 
+@media(min-width: 768px) {
+  html {
+    font-size: 16px;
+  }
+}
+
 body {
   margin: 0;
 }
@@ -46,9 +69,86 @@ pre {
   max-width: 100%;
 }
 
+p {
+  margin-top: 0;
+  margin-bottom: 1em;
+}
+
+sup, sub {
+  vertical-align: baseline;
+  position: relative;
+  top: -0.4em;
+  line-height: 1em;
+}
+
+sub {
+  top: 0.4em;
+}
+
 .kicker,
 .marker {
   font-size: 15px;
   font-weight: 600;
   color: rgba(0, 0, 0, 0.5);
 }
+
+
+/* Headline */
+
+@media(min-width: 1024px) {
+  d-title h1 span {
+    display: block;
+  }
+}
+
+/* Figure */
+
+figure {
+  position: relative;
+  margin-bottom: 2.5em;
+  margin-top: 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,92 +1,128 @@
+/*
+ * Copyright 2018 The Distill Template Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 @supports not (display: grid) {
+  .base-grid,
   distill-header,
   d-title,
   d-abstract,
   d-article,
   d-appendix,
+  distill-appendix,
   d-byline,
   d-footnote-list,
+  d-citation-list,
   distill-footer {
     display: block;
     padding: 8px;
   }
 }
 
+.base-grid,
 distill-header,
 d-title,
 d-abstract,
 d-article,
 d-appendix,
+distill-appendix,
 d-byline,
 d-footnote-list,
+d-citation-list,
 distill-footer {
   display: grid;
   justify-items: stretch;
-  grid-template-columns: [screen-start] 0.5fr [page-start kicker-start text-start gutter-start middle-start] 1fr 1fr 1fr 1fr 1fr 1fr 1fr 1fr [text-end page-end gutter-end kicker-end middle-end] 0.5fr [screen-end];
-  grid-column-gap: 30px;
+  grid-template-columns: [screen-start] 8px [page-start kicker-start text-start gutter-start middle-start] 1fr 1fr 1fr 1fr 1fr 1fr 1fr 1fr [text-end page-end gutter-end kicker-end middle-end] 8px [screen-end];
+  grid-column-gap: 8px;
+}
+
+.grid {
+  display: grid;
+  grid-column-gap: 8px;
 }
 
 @media(min-width: 768px) {
+  .base-grid,
   distill-header,
   d-title,
   d-abstract,
   d-article,
   d-appendix,
+  distill-appendix,
   d-byline,
   d-footnote-list,
+  d-citation-list,
   distill-footer {
     grid-template-columns: [screen-start] 1fr [page-start kicker-start middle-start text-start] 45px 45px 45px 45px 45px 45px 45px 45px [ kicker-end text-end gutter-start] 45px [middle-end] 45px [page-end gutter-end] 1fr [screen-end];
-    grid-column-gap: 30px;
+    grid-column-gap: 16px;
+  }
+
+  .grid {
+    grid-column-gap: 16px;
   }
 }
 
 @media(min-width: 1000px) {
+  .base-grid,
   distill-header,
   d-title,
   d-abstract,
   d-article,
   d-appendix,
+  distill-appendix,
   d-byline,
   d-footnote-list,
+  d-citation-list,
   distill-footer {
     grid-template-columns: [screen-start] 1fr [page-start kicker-start] 50px [middle-start] 50px [text-start kicker-end] 50px 50px 50px 50px 50px 50px 50px 50px [text-end gutter-start] 50px [middle-end] 50px [page-end gutter-end] 1fr [screen-end];
-    grid-column-gap: 30px;
+    grid-column-gap: 16px;
+  }
+
+  .grid {
+    grid-column-gap: 16px;
   }
 }
 
-@media(min-width: 1280px) {
+@media(min-width: 1180px) {
+  .base-grid,
   distill-header,
   d-title,
   d-abstract,
   d-article,
   d-appendix,
+  distill-appendix,
   d-byline,
   d-footnote-list,
+  d-citation-list,
   distill-footer {
     grid-template-columns: [screen-start] 1fr [page-start kicker-start] 60px [middle-start] 60px [text-start kicker-end] 60px 60px 60px 60px 60px 60px 60px 60px [text-end gutter-start] 60px [middle-end] 60px [page-end gutter-end] 1fr [screen-end];
-    grid-column-gap: 30px;
+    grid-column-gap: 32px;
+  }
+
+  .grid {
+    grid-column-gap: 32px;
   }
 }
 
 
-.grid {
-  display: grid;
-  grid-column-gap: 30px;
-}
 
-.col-3 {
-  display: grid;
-  grid-template-columns: repeat(3, 1fr);
-  grid-column-gap: 30px;
-}
 
-.col-2 {
-  display: grid;
-  grid-template-columns: repeat(2, 1fr);
-  grid-column-gap: 30px;
+.base-grid {
+  grid-column: screen;
 }
 
-
 /* .l-body,
 d-article > *  {
   grid-column: text;
@@ -98,20 +134,33 @@ d-figure {
   grid-column: page;
 } */
 
+.l-gutter {
+  grid-column: gutter;
+}
+
+.l-text,
+.l-body {
+  grid-column: text;
+}
+
+.l-page {
+  grid-column: page;
+}
+
 .l-body-outset {
-  grid-column: left-outset / right-outset;
+  grid-column: middle;
 }
 
 .l-page-outset {
-  grid-column: left-outset / right-outset;
+  grid-column: page;
 }
 
 .l-screen {
-  grid-column: start / end;
+  grid-column: screen;
 }
 
 .l-screen-inset {
-  grid-column: start / end;
+  grid-column: screen;
   padding-left: 16px;
   padding-left: 16px;
 }
@@ -121,18 +170,17 @@ d-figure {
 
 d-article aside {
   grid-column: gutter;
+  font-size: 12px;
+  line-height: 1.6em;
+  color: rgba(0, 0, 0, 0.6)
 }
 
 @media(min-width: 768px) {
   aside {
-    grid-column: right-outset / right-page;
-    font-size: 14px;
-    line-height: 1.3;
+    grid-column: gutter;
   }
 
   .side {
-    margin-left: 24px;
-    float: right;
-    width: 50%;
+    grid-column: gutter;
   }
 }

src/styles/styles-print.css

@@ -1,3 +1,19 @@
+/*
+ * Copyright 2018 The Distill Template Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 @media print {
 
   @page {

src/styles/styles.js

@@ -1,11 +1,26 @@
+// Copyright 2018 The Distill Template Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 import base from './styles-base.css';
 import layout from './styles-layout.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';
 
-export const styles = base + layout + byline + article + math + print;
+export const styles = base + layout + title + byline + article + math + print;
 
 export function makeStyleTag(dom) {
 
@@ -17,7 +32,8 @@ export function makeStyleTag(dom) {
     styleTag.type = 'text/css';
     const cssTextTag = dom.createTextNode(styles);
     styleTag.appendChild(cssTextTag);
-    dom.head.insertBefore(styleTag, dom.head.firstChild);
+    const firstScriptTag = dom.head.querySelector('script');
+    dom.head.insertBefore(styleTag, firstScriptTag);
   }
 
 }

src/transforms.js

@@ -1,3 +1,17 @@
+// Copyright 2018 The Distill Template Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 /* eslint-env node, mocha */
 
 import { FrontMatter } from './front-matter';
@@ -7,62 +21,112 @@ import ExtractFrontmatter from './extractors/front-matter';
 import ExtractBibliography from './extractors/bibliography';
 import ExtractCitations from './extractors/citations';
 
-const extractors = [
-  ExtractFrontmatter,
-  ExtractBibliography,
-  ExtractCitations,
-];
+const extractors = new Map([
+  ['ExtractFrontmatter', ExtractFrontmatter],
+  ['ExtractBibliography', ExtractBibliography],
+  ['ExtractCitations', ExtractCitations],
+]);
 
 /* Transforms */
 import HTML from './transforms/html';
 import Byline from './transforms/byline';
-import Polyfills from './transforms/polyfills';
 import OptionalComponents from './transforms/optional-components';
 import Mathematics from './transforms/mathematics';
 import Meta from './transforms/meta';
 import { makeStyleTag } from './styles/styles';
 import TOC from './transforms/toc';
 import Typeset from './transforms/typeset';
-import Bibliography from './transforms/bibliography';
+import Polyfills from './transforms/polyfills';
+import CitationList from './transforms/citation-list';
+import Reorder from './transforms/reorder';
 
-const transforms = [
-  HTML, makeStyleTag, Polyfills, OptionalComponents, TOC, Byline, Mathematics,
-  Meta, Typeset, Bibliography,
-];
+const transforms = new Map([
+  ['HTML', HTML],
+  ['makeStyleTag', makeStyleTag],
+  ['OptionalComponents', OptionalComponents],
+  ['TOC', TOC],
+  ['Byline', Byline],
+  ['Mathematics', Mathematics],
+  ['Meta', Meta],
+  ['Typeset', Typeset],
+  ['Polyfills', Polyfills],
+  ['CitationList', CitationList],
+  ['Reorder', Reorder] // keep last
+]);
 
 /* Distill Transforms */
 import DistillHeader from './distill-transforms/distill-header';
 import DistillAppendix from './distill-transforms/distill-appendix';
 import DistillFooter from './distill-transforms/distill-footer';
 
-const distillTransforms = [
-  DistillHeader, DistillAppendix, DistillFooter,
-];
+const distillTransforms = new Map([
+  ['DistillHeader', DistillHeader],
+  ['DistillAppendix', DistillAppendix],
+  ['DistillFooter', DistillFooter],
+]);
 
 /* Exported functions */
 
-export function render(dom, data) {
+export function render(dom, data, verbose=true) {
+  let frontMatter;
+  if (data instanceof FrontMatter) {
+    frontMatter = data;
+  } else {
+    frontMatter = FrontMatter.fromObject(data);
+  }
   // first, we collect static data from the dom
-  for (const extract of extractors) {
-    console.warn('Running extractor...');
-    extract(dom, data);
+  for (const [name, extract] of extractors.entries()) {
+    if (verbose) console.warn('Running extractor: ' + name);
+    extract(dom, frontMatter, verbose);
   }
   // secondly we use it to transform parts of the dom
-  for (const transform of transforms) {
-    console.warn('Running transform...');
+  for (const [name, transform] of transforms.entries()) {
+    if (verbose) console.warn('Running transform: ' + name);
     // console.warn('Running transform: ', transform);
-    transform(dom, data);
+    transform(dom, frontMatter, verbose);
   }
   dom.body.setAttribute('distill-prerendered', '');
   // the function calling us can now use the transformed dom and filled data object
-}
-
-export function distillify(dom, data) {
-  // thirdly, we can use these additional transforms when publishing on the Distill website
-  for (const transform of distillTransforms) {
-    // console.warn('Running distillify: ', transform);
-    transform(dom, data);
+  if (data instanceof FrontMatter) {
+    // frontMatter will already have needed properties
+  } else {
+    frontMatter.assignToObject(data);
   }
 }
 
-export { FrontMatter };
+export function distillify(dom, data, verbose=true) {
+  // thirdly, we can use these additional transforms when publishing on the Distill website
+  for (const [name, transform] of distillTransforms.entries()) {
+    if (verbose) console.warn('Running distillify: ', name);
+    transform(dom, data, verbose);
+  }
+}
+
+export function usesTemplateV2(dom) {
+  const tags = dom.querySelectorAll('script');
+  let usesV2 = undefined;
+  for (const tag of tags) {
+    const src = tag.src;
+    if (src.includes('template.v1.js')) {
+      usesV2 = false;
+    } else if (src.includes('template.v2.js')) {
+      usesV2 = true;
+    } else if (src.includes('template.')) {
+      throw new Error('Uses distill template, but unknown version?!');
+    }
+  }
+
+  if (usesV2 === undefined) {
+    throw new Error('Does not seem to use Distill template at all.');
+  } else {
+    return usesV2;
+  }
+}
+
+export { FrontMatter }; // TODO: removable?
+
+export const testing = {
+  extractors: extractors,
+  transforms: transforms,
+  distillTransforms: distillTransforms
+};

src/transforms/banner.js

@@ -1,3 +1,17 @@
+// Copyright 2018 The Distill Template Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 const html = `
 <style>
   dt-banner {

src/transforms/bibliography.js

@@ -1,39 +0,0 @@
-// import { renderBibliography, templateString } from '../components/d-bibliography';
-import { parseBibtex } from '../helpers/bibtex';
-import fs from 'fs';
-
-export default function(dom, data) {
-  const bibliographyTag = dom.querySelector('d-bibliography');
-  if (!bibliographyTag) {
-    console.warn('No bibliography tag present!');
-    return;
-  }
-
-  const src = bibliographyTag.getAttribute('src');
-  if (src) {
-    const path = data.inputDirectory + '/' + src;
-    const text = fs.readFileSync(path, 'utf-8');
-    const bibliography = parseBibtex(text);
-    const scriptTag = dom.createElement('script');
-    scriptTag.type = 'text/json';
-    scriptTag.textContent = JSON.stringify([...bibliography]);
-    bibliographyTag.appendChild(scriptTag);
-    bibliographyTag.removeAttribute('src');
-  }
-  // const bibliographyEntries = new Map(data.citations.map( citationKey => {
-  //   const entry = data.bibliography.get(citationKey);
-  //   return [citationKey, entry];
-  // }));
-  //
-  // const prerenderedBibliography = dom.createElement('d-bibliography-prerendered');
-  //
-  // const template = dom.createElement('template');
-  // template.innerHTML = templateString;
-  // const clone = dom.importNode(template.content, true);
-  // prerenderedBibliography.innerHTML = template.content;
-  // renderBibliography(prerenderedBibliography, bibliographyEntries, dom);
-  //
-  // bibliographyTag.parentElement.insertBefore(bibliographyTag, prerenderedBibliography);
-  // bibliographyTag.parentElement.removeChild(bibliographyTag);
-
-}

src/transforms/byline.js

@@ -1,9 +1,22 @@
+// Copyright 2018 The Distill Template Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 import { bylineTemplate } from '../components/d-byline.js';
 
 export default function(dom, data) {
   const byline = dom.querySelector('d-byline');
   if (byline) {
     byline.innerHTML = bylineTemplate(data);
-    // byline.setAttribute('distill-prerendered', '');
   }
 }

src/transforms/citation-list.js

@@ -0,0 +1,26 @@
+// Copyright 2018 The Distill Template Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+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

@@ -1,3 +1,17 @@
+// Copyright 2018 The Distill Template Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 export default function(dom, data) {
   let css = `
     dt-cite {
@@ -95,6 +109,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/code.js

@@ -1,3 +1,17 @@
+// Copyright 2018 The Distill Template Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 import Prism from 'prismjs';
 
 export default function(dom, data) {

src/transforms/footnote.js

@@ -1,3 +1,17 @@
+// Copyright 2018 The Distill Template Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 export default function(dom, data) {
 
   var fnTags = [].slice.apply(dom.querySelectorAll('dt-fn'));

src/transforms/front-matter.js

@@ -1,3 +1,17 @@
+// Copyright 2018 The Distill Template Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 import ymlParse from 'js-yaml';
 
 export default function(dom, data) {

src/transforms/generate-crossref.js

@@ -1,3 +1,17 @@
+// Copyright 2018 The Distill Template Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 //import xml from "xml";
 
 export default function(data) {

src/transforms/hover-box-include.js

@@ -1,3 +1,17 @@
+// Copyright 2018 The Distill Template Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 import code from './hover-box.txt';
 
 export default function(dom) {

src/transforms/html.js

@@ -1,3 +1,17 @@
+// Copyright 2018 The Distill Template Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 export default function(dom) {
 
   const head = dom.querySelector('head');

src/transforms/include.js

@@ -1,3 +1,17 @@
+// Copyright 2018 The Distill Template Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 import fetch from 'fetch';
 let fetchUrl = fetch.fetchUrl;
 

src/transforms/markdown.js

@@ -1,3 +1,17 @@
+// Copyright 2018 The Distill Template Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 import marked from 'marked';
 
 marked.setOptions({

src/transforms/mathematics.js

@@ -1,17 +1,36 @@
+// Copyright 2018 The Distill Template Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 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');
+  const body = dom.querySelector('body');
+
+  if (!body) {
+    console.warn("No body tag found!");
+    return;
+  }
 
   if (data.katex && data.katex.delimiters) {
     global.document = dom;
-    renderMathInElement(article, data.katex);
+    renderMathInElement(body, data.katex);
   }
 
   // render d-math tags
-  const mathTags = article.querySelectorAll('d-math');
+  const mathTags = body.querySelectorAll('d-math');
   if (mathTags.length > 0) {
     needsCSS = true;
     console.warn(`Prerendering ${mathTags.length} math tags...`);

src/transforms/meta.js

@@ -1,39 +1,77 @@
+// Copyright 2018 The Distill Template Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// 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 +79,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 +96,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 +115,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 +139,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

@@ -1,3 +1,17 @@
+// Copyright 2018 The Distill Template Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 // no appendix -> add appendix
 // title in front, no h1 -> add it
 // no title in front, h1 -> read and put into frontMatter
@@ -8,46 +22,50 @@
 // if authors, no byline -> add byline
 
 export default function(dom, data) {
-  const article = dom.querySelector('d-article');
-  const abstract = dom.querySelector('d-abstract');
+  const body = dom.body;
+  const article = body.querySelector('d-article');
 
-  let interstitial = dom.querySelector('d-interstitial');
-  if (!interstitial && data.password) {
-    interstitial = dom.createElement('d-interstitial');
-    interstitial.password = data.password;
-    dom.body.insertBefore(interstitial, article);
+  // If we don't have an article tag, something weird is going on—giving up.
+  if (!article) {
+    console.warn('No d-article tag found; skipping adding optional components!');
+    return;
   }
 
-  // let h1 = dom.querySelector('h1');
-  // if (h1) {
-  //   if (!data.title) {
-  //     data.title = h1.textContent;
-  //   }
-  // } else {
-  if (data.title) {
-    let headline = dom.createElement('d-title');
-    let h1 = dom.createElement('h1');
-    headline.appendChild(h1);
-    h1.textContent = data.title;
-    abstract.parentNode.insertBefore(headline, abstract);
-  }
-  // if (data.description) {
-  //   const h2 = dom.createElement('h2');
-  //   h2.textContent = data.description;
-  //   article.insertBefore(h2, h1.nextSibling);
-  // }
-  // }
-
   let byline = dom.querySelector('d-byline');
-  if (!byline && data.authors) {
-    byline = dom.createElement('d-byline');
-    article.parentNode.insertBefore(byline, article);
-    // const skipTags = ['H1', 'FIGURE', 'D-ABSTRACT'];
-    // let candidate = h1;
-    // while (skipTags.indexOf(candidate.tagName) !== -1) {
-    //   candidate = candidate.nextSibling;
-    // }
-    // article.insertBefore(byline, candidate);
+  if (!byline) {
+    if (data.authors) {
+      byline = dom.createElement('d-byline');
+      body.insertBefore(byline, article);
+    } else {
+      console.warn('No authors found in front matter; please add them before submission!');
+    }
+  }
+
+  let title = dom.querySelector('d-title');
+  if (!title) {
+    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);
+    }
+  } else if (!hasPassword && interstitial) {
+    interstitial.parentElement.removeChild(this);
   }
 
   let appendix = dom.querySelector('d-appendix');

src/transforms/polyfills.js

@@ -1,46 +1,92 @@
+// Copyright 2018 The Distill Template Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 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.debug('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
-  dom.head.insertBefore(polyfillScriptTag, dom.head.firstChild);
+  // const firstScriptTag = dom.head.querySelector('script');
+  // dom.head.insertBefore(polyfillScriptTag, firstScriptTag);
 }

src/transforms/reorder.js

@@ -0,0 +1,31 @@
+// Copyright 2018 The Distill Template Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+/*
+  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/toc.js

@@ -1,3 +1,17 @@
+// Copyright 2018 The Distill Template Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 import { renderTOC } from '../components/d-toc';
 
 export default function(dom) {

src/transforms/typeset.js

@@ -1,3 +1,17 @@
+// Copyright 2018 The Distill Template Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 export default function(dom) {
 
   var textNodes = dom.createTreeWalker(
@@ -10,12 +24,17 @@ export default function(dom) {
     if (text && acceptNode(n)) {
       text = quotes(text);
       text = punctuation(text);
-      text = ligatures(text);
+      // TODO: Add back support for ligatures once their uppercased versions don't hang Chrome search anymore
+      // see: https://bugs.chromium.org/p/chromium/issues/detail?id=862648
+      // text = ligatures(text);
       n.nodeValue = text;
     }
   }
 }
 
+// 2018-07-11 shancarter@ and ludwigschubert@ no longer know what this was meant to accomplish
+// if it was trying to not replace text in any child nodes of those listed here,
+// then it does not accomplish that.
 function acceptNode(node) {
   var parent = node.parentElement;
   var isMath = (parent && parent.getAttribute && parent.getAttribute('class')) ? parent.getAttribute('class').includes('katex') || parent.getAttribute('class').includes('MathJax') : false;

src/ui/d-slider.js

@@ -0,0 +1,332 @@
+// Copyright 2018 The Distill Template Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+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,17 @@
+// Copyright 2018 The Distill Template Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+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,26 @@
+<!--
+  Copyright 2018 The Distill Template Authors
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!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,26 @@
+<!--
+  Copyright 2018 The Distill Template Authors
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!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

@@ -0,0 +1,77 @@
+// Copyright 2018 The Distill Template Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+/* global it, should, describe */
+
+// Test format: https://mochajs.org/#bdd
+// Assertion format: http://chaijs.com/api/bdd/
+
+let expect = require('chai').expect;
+let jsdom = require('jsdom');
+    // let distill = require('../dist/template.v1.js');
+
+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.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('');
+      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() {
+      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('');
+      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('');
+      let before = jsdom.serializeDocument(doc);
+      distill.html(doc, {});
+      let after = jsdom.serializeDocument(doc);
+      expect(after).to.match(new RegExp('<meta name="viewport" content="width=device-width, initial-scale=1">'));
+    });
+  });
+
+  //
+  // styles
+  //
+  describe.skip('styles', function() {
+    it('Should have a styles function.', function() {
+      expect(distill.styles).to.be.an.instanceof(Function);
+    });
+  })
+});

test/test.js

@@ -1,59 +0,0 @@
-// 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");
-
-describe("Distill", 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() {
-      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("");
-      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() {
-      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("");
-      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("");
-      let before = jsdom.serializeDocument(doc);
-      distill.html(doc, {});
-      let after = jsdom.serializeDocument(doc);
-      expect(after).to.match(new RegExp('<meta name="viewport" content="width=device-width, initial-scale=1">'));
-    });
-  });
-
-  //
-  // styles
-  //
-  describe("styles", function() {
-    it("Should have a styles function.", function() {
-      expect(distill.styles).to.be.an.instanceof(Function);
-    });
-  })
-});

test/transforms.js

@@ -0,0 +1,297 @@
+// Copyright 2018 The Distill Template Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+/* 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'