Compare commits

..

49 Commits

Author SHA1 Message Date
Shan Carter ab8ab149e6 Moving headers in appendix to text column 2018-12-27 11:44:47 -08:00
Ludwig Schubert a272efb89c 2.2.26 2018-12-17 13:28:04 -08:00
Ludwig Schubert bb19b13467 Fixes #80 by switching a div tag inside a p tag to a span tag.
Thanks, humbertaco!
2018-12-17 13:26:33 -08:00
Ludwig Schubert 7e240ddf4f Work around wrong baseline for math tags resulting from an overzealous contain optimization that became active in Chrome 71. Fixes #96. 2018-12-17 13:17:53 -08:00
Ludwig Schubert 84c400184d Render math tags in all elements under body, not just in d-article.
Should fix #97, but still in testing.
2018-12-17 13:06:18 -08:00
Ludwig Schubert d187130657 2.2.25 2018-12-17 12:59:47 -08:00
Ludwig Schubert cc6b6bf595 Fix #95 in Chrome 69+, Safari, Firefox by reverting to JS based tooltip positioning. Also DRYs some styles 2018-12-17 12:59:38 -08:00
Ludwig Schubert 9463d6e58d 2.2.24 2018-08-30 15:37:02 -07:00
Ludwig Schubert 3c2f782e74 Fix scope typo 2018-08-30 15:36:55 -07:00
Ludwig Schubert 6bd5d0bf03 2.2.23 2018-07-11 14:00:02 -07:00
Ludwig Schubert a5f663c249 Disable converting ligatures during pre-rendering due to Chrome bug 862648 2018-07-11 13:59:54 -07:00
Ludwig Schubert b854bd0124 Merge branch 'master' of github.com:distillpub/template 2018-06-22 12:02:59 -07:00
Ludwig Schubert 5217fd9943 Allow multiple affiliations for authors 2018-06-22 11:56:47 -07:00
Ludwig Schubert a6df552537 Generalize disclaimer 2018-03-30 11:09:31 -07:00
Ludwig Schubert a06cb5794c Add Apache License 2018-03-30 10:51:26 -07:00
Ludwig Schubert 7ff8796266 Improve interstitial behavior
Remove if no password during pre-render
Remove if no password during onFrontMatterChanged
Remove self if on production host
2018-03-06 16:13:05 -08:00
Ludwig Schubert 0bc2ce69da Remove hover-box padding. Add footnote-container with padding. 2018-03-06 14:31:42 -08:00
Ludwig Schubert 4fac022efc Merge pull request #74 from distillpub/hoverboxPadding
Restore padding for d-hover-box
2018-03-06 09:09:46 -08:00
Shan Carter dcf01cbc0f Update styles-layout.css 2018-02-27 16:10:15 -08:00
Arvind Satyanarayan c6cd820bc3 Restore padding for d-hover-box
Fixes #73.
2018-02-07 14:23:42 -08:00
Ludwig Schubert 6941ba780d Front matter only writes derived publish dates to data when publishedDate is available. 2017-12-05 11:42:50 -08:00
Ludwig Schubert 6f7df48fc2 2.2.19 2017-12-04 16:50:48 -08:00
Ludwig Schubert 71450e9ba8 Fix crash when a citation has no authors in Meta tags transform 2017-12-04 16:50:39 -08:00
Shan Carter 6679b120ab 2.2.18 2017-12-01 15:38:42 -08:00
Shan Carter 8bff98944a merge 2017-12-01 15:38:31 -08:00
Shan Carter b4c8fdc56a No authors bugfix 2017-12-01 15:38:04 -08:00
Ludwig Schubert c75787615e 2.2.17 2017-12-01 15:23:52 -08:00
Shan Carter c2ef8e38c3 merge 2017-12-01 15:22:27 -08:00
Ludwig Schubert bfcff784b1 2.2.14 2017-12-01 15:10:21 -08:00
Ludwig Schubert 000fa088db Special case citations without authors 2017-12-01 15:09:23 -08:00
Shan Carter f221583de8 2.2.16 2017-11-22 16:35:20 -08:00
Shan Carter cddd538f9d merge 2017-11-22 16:35:03 -08:00
Shan Carter 6f95c37c2c Update d-title.css 2017-11-22 16:33:48 -08:00
Shan Carter db3af262f2 Update d-title.css 2017-11-22 16:27:13 -08:00
Shan Carter 184e094ae9 Update d-title.css 2017-11-22 16:26:35 -08:00
Shan Carter 5ede2dd9d0 2.2.15 2017-11-22 14:43:23 -08:00
Shan Carter 2a14b4c811 2.2.14 2017-11-22 14:42:57 -08:00
Shan Carter 350b6c6f67 Update styles-base.css 2017-11-22 14:42:07 -08:00
Shan Carter 49deb31aeb 2.2.13 2017-11-21 14:56:21 -08:00
Shan Carter b5a00b7f43 Fixing wrong/old version number 2017-11-21 14:56:16 -08:00
Shan Carter 0f8f0f5962 Merge 2017-11-21 14:53:38 -08:00
Shan Carter 094f0d4c58 2.2.11 2017-11-21 14:51:44 -08:00
Shan Carter cd4594f320 Fixing NaN !== NaN problem in d-slider.js 2017-11-21 14:51:35 -08:00
Ludwig Schubert be585691c5 2.2.12 2017-11-15 11:50:01 -08:00
Ludwig Schubert b25fd66fd7 Remove stray comment in CSS 2017-11-14 22:52:36 -08:00
Ludwig Schubert 010eed6280 2.2.11 2017-11-14 12:52:42 -08:00
Ludwig Schubert 3a643ab7ad Style fixes; moving away from contain: content to avoid cutting off hover boxes. 2017-11-14 12:52:34 -08:00
Ludwig Schubert d0463ff769 2.2.10 2017-11-08 14:37:57 -08:00
Ludwig Schubert 3bccc25805 Register Controller listeners before tags customElements get registered. 2017-11-08 14:37:48 -08:00
85 changed files with 1615 additions and 162 deletions
+6
View File
@@ -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
+28
View File
@@ -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/).
Executable
+202
View File
@@ -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.
+15 -15
View File
@@ -1,25 +1,25 @@
# Distill Template [![Build Status](https://travis-ci.org/distillpub/template.svg?branch=master)](https://travis-ci.org/distillpub/template) # Distill Template
This is the repository for the distill web framework. If you're interesting in just using the framework to write an article for the [Distill journal](http://distill.pub), visit http://distill.pub/guide/. This is the repository for the Distill web framework.
The general process for using this framework is to hotlink the compiled code in your dev environment. ## Contributing
```html
<script src="https://distill.pub/template.v2.js"></script>
```
You can also install it as a local dependency through npm or with [yarn](https://yarnpkg.com). To give feedback, report a bug, or request a feature, please open an issue.
``` To contribute a change, [check out the contributing guide](CONTRIBUTING.md).
npm install --D distill-template
```
If you're interested in submitting pull requests or developing on the framework itself, read on. ### Local Development
## Development
Run `npm run start` to start a watching build rollup server. To view the sample pages in the repo, you can run `npm run serve` as a separate process which starts a static server. `npm run build` will run a one-time build. Run `npm run start` to start a watching build rollup server. To view the sample pages in the repo, you can run `npm run serve` as a separate process which starts a static server. `npm run build` will run a one-time build.
## Testing
Run `npm test`. That's it. ## 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).
+14
View File
@@ -1,5 +1,19 @@
#!/usr/bin/env node #!/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 path = require('path');
const fs = require('fs'); const fs = require('fs');
const program = require('commander'); const program = require('commander');
+15
View File
@@ -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> <!doctype html>
<head> <head>
+15
View File
@@ -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> <!DOCTYPE html><html lang="en"><head>
<meta charset="utf8"> <meta charset="utf8">
+26 -10
View File
@@ -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> <!doctype html>
<head> <head>
@@ -17,20 +32,20 @@
{ {
"author":"Chris Olah", "author":"Chris Olah",
"authorURL":"https://colah.github.io/", "authorURL":"https://colah.github.io/",
"affiliation":"Google Brain", "affiliations": [{"name": "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", "author":"Ludwig Schubert",
"authorURL":"https://shancarter.com/", "authorURL":"https://shancarter.com/",
"affiliation":"Google Brain", "affiliations": [{"name": "Google Brain", "url": "https://g.co/brain"}]
"affiliationURL":"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": { "katex": {
@@ -44,6 +59,7 @@
<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> <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> <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-title>
<d-byline></d-byline>
<d-article> <d-article>
<a class="marker" href="#section-1" id="section-1"><span>1</span></a> <a class="marker" href="#section-1" id="section-1"><span>1</span></a>
<h2>A Brief Survey of Techniques</h2> <h2>A Brief Survey of Techniques</h2>
+15
View File
@@ -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> <!doctype html>
<meta charset="utf-8"> <meta charset="utf-8">
<script src="../dist/template.js"></script> <script src="../dist/template.js"></script>
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "distill-template", "name": "distill-template",
"version": "2.2.9", "version": "2.2.26",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {
+2 -2
View File
@@ -1,6 +1,6 @@
{ {
"name": "distill-template", "name": "distill-template",
"version": "2.2.9", "version": "2.2.26",
"description": "Template for creating Distill articles.", "description": "Template for creating Distill articles.",
"main": "dist/template.v2.js", "main": "dist/template.v2.js",
"bin": { "bin": {
@@ -12,7 +12,7 @@
"url": "https://github.com/distillpub/distill-template/issues" "url": "https://github.com/distillpub/distill-template/issues"
}, },
"scripts": { "scripts": {
"start": "rollup -c rollup.config.dev.js -w", "dev": "rollup -c rollup.config.dev.js -w",
"serve": "python3 -m http.server --bind 127.0.0.1 8888", "serve": "python3 -m http.server --bind 127.0.0.1 8888",
"test": "mocha", "test": "mocha",
"lint": "eslint", "lint": "eslint",
+14
View File
@@ -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 resolve from 'rollup-plugin-node-resolve'; import resolve from 'rollup-plugin-node-resolve';
import string from 'rollup-plugin-string'; import string from 'rollup-plugin-string';
import commonjs from 'rollup-plugin-commonjs'; import commonjs from 'rollup-plugin-commonjs';
+14
View File
@@ -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 configs from './rollup.config.dev'; import configs from './rollup.config.dev';
import babili from 'rollup-plugin-babili'; import babili from 'rollup-plugin-babili';
+30 -15
View File
@@ -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 { Controller } from './controller'; import { Controller } from './controller';
/* Transforms */ /* Transforms */
@@ -50,8 +64,20 @@ const distillMain = function() {
console.info('Runlevel 1->2.'); console.info('Runlevel 1->2.');
window.distillRunlevel += 1; window.distillRunlevel += 1;
/* 3. Register components */ /* 3. Register Controller listener functions */
/* Article will register controller which takes control from there */ /* Needs to happen before components to their connected callbacks have a controller to talk to. */
for (const [functionName, callback] of Object.entries(Controller.listeners)) {
if (typeof callback === 'function') {
document.addEventListener(functionName, callback);
} else {
console.error('Runlevel 2: Controller listeners need to be functions!');
}
}
console.info('Runlevel 2: We can now listen to controller events.');
console.info('Runlevel 2->3.');
window.distillRunlevel += 1;
/* 4. Register components */
const components = [ const components = [
Abstract, Appendix, Article, Bibliography, Byline, Cite, CitationList, Code, Abstract, Appendix, Article, Bibliography, Byline, Cite, CitationList, Code,
Footnote, FootnoteList, FrontMatter, HoverBox, Title, DMath, References, TOC, Figure, Footnote, FootnoteList, FrontMatter, HoverBox, Title, DMath, References, TOC, Figure,
@@ -71,21 +97,10 @@ const distillMain = function() {
customElements.define(component.is, component); customElements.define(component.is, component);
} }
console.info('Runlevel 2: Distill Template finished registering custom elements.'); console.info('Runlevel 3: Distill Template finished registering custom elements.');
console.info('Runlevel 2->3.');
window.distillRunlevel += 1;
/* 4. Register Controller listener functions */
for (const [functionName, callback] of Object.entries(Controller.listeners)) {
if (typeof callback === 'function') {
document.addEventListener(functionName, callback);
} else {
console.error('Runlevel 3: Controller listeners need to be functions!');
}
}
console.info('Runlevel 3: We can now listen to controller events.');
console.info('Runlevel 3->4.'); console.info('Runlevel 3->4.');
window.distillRunlevel += 1; window.distillRunlevel += 1;
// If template was added after DOMContentLoaded we may have missed that event. // If template was added after DOMContentLoaded we may have missed that event.
// Controller will check for that case, so trigger the event explicitly: // Controller will check for that case, so trigger the event explicitly:
Controller.listeners.DOMContentLoaded(); Controller.listeners.DOMContentLoaded();
+14
View File
@@ -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'; import { Template } from '../mixins/template';
import { body } from '../helpers/layout'; import { body } from '../helpers/layout';
+16 -3
View File
@@ -1,11 +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 { Template } from '../mixins/template'; import { Template } from '../mixins/template';
import { body } from '../helpers/layout';
const T = Template('d-appendix', ` const T = Template('d-appendix', `
<style> <style>
d-appendix { d-appendix {
contain: content; contain: layout style;
font-size: 0.8em; font-size: 0.8em;
line-height: 1.7em; line-height: 1.7em;
margin-top: 60px; margin-top: 60px;
@@ -17,7 +30,7 @@ d-appendix {
} }
d-appendix h3 { d-appendix h3 {
grid-column: page-start / text-start; grid-column: text;
font-size: 15px; font-size: 15px;
font-weight: 500; font-weight: 500;
margin-top: 1em; margin-top: 1em;
+14
View File
@@ -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'; // import { Template } from '../mixins/template';
// import { Controller } from '../controller'; // import { Controller } from '../controller';
+14
View File
@@ -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 { parseBibtex } from '../helpers/bibtex'; import { parseBibtex } from '../helpers/bibtex';
export function parseBibliography(element) { export function parseBibliography(element) {
+18 -4
View File
@@ -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 style from '../styles/d-byline.css'; // import style from '../styles/d-byline.css';
export function bylineTemplate(frontMatter) { export function bylineTemplate(frontMatter) {
@@ -10,12 +24,12 @@ export function bylineTemplate(frontMatter) {
<p class="author"> <p class="author">
${author.personalURL ? ` ${author.personalURL ? `
<a class="name" href="${author.personalURL}">${author.name}</a>` : ` <a class="name" href="${author.personalURL}">${author.name}</a>` : `
<div class="name">${author.name}</div>`} <span class="name">${author.name}</span>`}
</p> </p>
<p class="affiliation"> <p class="affiliation">
${author.affiliationURL ? ` ${author.affiliations.map(affiliation =>
<a class="affiliation" href="${author.affiliationURL}">${author.affiliation}</a>` : ` affiliation.url ? `<a class="affiliation" href="${affiliation.url}">${affiliation.name}</a>` : `<span class="affiliation">${affiliation.name}</span>`
<div class="affiliation">${author.affiliation}</div>`} ).join(', ')}
</p> </p>
`).join('')} `).join('')}
</div> </div>
+15 -2
View File
@@ -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 { bibliography_cite } from '../helpers/citation'; import { bibliography_cite } from '../helpers/citation';
const styles = ` const styles = `
d-citation-list { d-citation-list {
contain: content; contain: layout style;
overflow: hidden;
} }
d-citation-list .references { d-citation-list .references {
+35 -5
View File
@@ -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'; import { Template } from '../mixins/template';
import { hover_cite, bibliography_cite } from '../helpers/citation'; import { hover_cite, bibliography_cite } from '../helpers/citation';
@@ -5,7 +19,7 @@ const T = Template('d-cite', `
<style> <style>
:host { :host {
display: inline-block;
} }
.citation { .citation {
@@ -34,15 +48,29 @@ figcaption .citation-number {
line-height: 1em; line-height: 1em;
} }
d-hover-box { ul {
margin-top: 1.9em; 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> </style>
<d-hover-box id="hover-box"></d-hover-box> <d-hover-box id="hover-box"></d-hover-box>
<div id="citation-" class="citation"><slot></slot><span class="citation-number"></span></div> <div id="citation-" class="citation">
<slot></slot>
<span class="citation-number"></span>
</div>
`); `);
export class Cite extends T(HTMLElement) { export class Cite extends T(HTMLElement) {
@@ -106,7 +134,9 @@ export class Cite extends T(HTMLElement) {
set entries(entries) { set entries(entries) {
if (this.hoverBox) { if (this.hoverBox) {
this.hoverBox.innerHTML = entries.map(hover_cite).join('<br><br>'); this.hoverBox.innerHTML = `<ul>
${entries.map(hover_cite).map(html => `<li>${html}</li>`).join('\n')}
</ul>`;
} }
} }
+14
View File
@@ -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'; import Prism from 'prismjs';
import 'prismjs/components/prism-python'; import 'prismjs/components/prism-python';
import 'prismjs/components/prism-clike'; import 'prismjs/components/prism-clike';
+14
View File
@@ -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 // Figure
// //
// d-figure provides a state-machine of visibility events: // d-figure provides a state-machine of visibility events:
+15 -2
View File
@@ -1,11 +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 { Template } from '../mixins/template'; import { Template } from '../mixins/template';
const T = Template('d-footnote-list', ` const T = Template('d-footnote-list', `
<style> <style>
d-footnote-list { d-footnote-list {
contain: content; contain: layout style;
overflow: hidden;
} }
d-footnote-list > * { d-footnote-list > * {
+20 -19
View File
@@ -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.js'; import { Template } from '../mixins/template.js';
const T = Template('d-footnote', ` const T = Template('d-footnote', `
@@ -8,6 +22,7 @@ d-math[block] {
} }
:host { :host {
} }
sup { sup {
@@ -23,30 +38,16 @@ span {
cursor: default; cursor: default;
} }
.container { .footnote-container {
position: absolute; padding: 10px;
width: 100%;
left: 0;
z-index: 10000;
}
.dt-hover-box {
margin: 0 auto;
width: 704px;
max-width: 100vw;
background-color: #FFF;
opacity: 0.95;
border: 1px solid rgba(0, 0, 0, 0.25);
padding: 8px 16px;
border-radius: 3px;
box-shadow: 0px 2px 10px 2px rgba(0, 0, 0, 0.2);
box-sizing: border-box;
} }
</style> </style>
<d-hover-box> <d-hover-box>
<slot id="slot"></slot> <div class="footnote-container">
<slot id="slot"></slot>
</div>
</d-hover-box> </d-hover-box>
<sup> <sup>
+38 -1
View File
@@ -1,10 +1,47 @@
// 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];
}
}
console.log(frontMatter)
return frontMatter
}
export function parseFrontmatter(element) { export function parseFrontmatter(element) {
const scriptTag = element.querySelector('script'); const scriptTag = element.querySelector('script');
if (scriptTag) { if (scriptTag) {
const type = scriptTag.getAttribute('type'); const type = scriptTag.getAttribute('type');
if (type.split('/')[1] == 'json') { if (type.split('/')[1] == 'json') {
const content = scriptTag.textContent; const content = scriptTag.textContent;
return JSON.parse(content); const parsed = JSON.parse(content);
return _moveLegacyAffiliationFormatIntoArray(parsed);
} else { } else {
console.error('Distill only supports JSON frontmatter tags anymore; no more YAML.'); console.error('Distill only supports JSON frontmatter tags anymore; no more YAML.');
} }
+26 -5
View File
@@ -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.js'; import { Template } from '../mixins/template.js';
const T = Template('d-hover-box', ` const T = Template('d-hover-box', `
@@ -6,9 +20,10 @@ const T = Template('d-hover-box', `
:host { :host {
position: absolute; position: absolute;
width: 100%; width: 100%;
left: 0; left: 0px;
z-index: 10000; z-index: 10000;
display: none; display: none;
white-space: normal
} }
.container { .container {
@@ -20,17 +35,20 @@ const T = Template('d-hover-box', `
.panel { .panel {
position: absolute; position: absolute;
font-size: 1rem;
line-height: 1.5em;
top: 0; top: 0;
left: 0; left: 0;
width: 100%; width: 100%;
border: 1px solid rgba(0, 0, 0, 0.1); border: 1px solid rgba(0, 0, 0, 0.1);
background-color: rgb(250, 250, 250); background-color: rgba(250, 250, 250, 0.95);
box-shadow: 0 0 7px rgba(0, 0, 0, 0.1); box-shadow: 0 0 7px rgba(0, 0, 0, 0.1);
border-radius: 4px; border-radius: 4px;
padding: 10px;
box-sizing: border-box; box-sizing: border-box;
}
backdrop-filter: blur(2px);
-webkit-backdrop-filter: blur(2px);
}
</style> </style>
@@ -103,11 +121,14 @@ export class HoverBox extends T(HTMLElement) {
show(position) { show(position) {
this.visible = true; this.visible = true;
this.style.display = 'block'; this.style.display = 'block';
// 10px extra offset from element
this.style.top = Math.round(position[1] + 10) + 'px';
} }
showAtNode(node) { showAtNode(node) {
// https://developer.mozilla.org/en-US/docs/Web/API/HTMLElement/offsetTop
const bbox = node.getBoundingClientRect(); const bbox = node.getBoundingClientRect();
this.show([bbox.right, bbox.bottom]); this.show([node.offsetLeft + bbox.width, node.offsetTop + bbox.height]);
} }
hide() { hide() {
+44 -8
View File
@@ -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'; import { Template } from '../mixins/template';
// This overlay is not secure. // This overlay is not secure.
// It is only meant as a social deterrent. // It is only meant as a social deterrent.
const productionHostname = 'distill.pub';
const T = Template('d-interstitial', ` const T = Template('d-interstitial', `
<style> <style>
@@ -109,13 +124,11 @@ p small {
export class Interstitial extends T(HTMLElement) { export class Interstitial extends T(HTMLElement) {
connectedCallback() { connectedCallback() {
const passwordInput = this.root.querySelector('#interstitial-password-input'); if (this.shouldRemoveSelf()) {
passwordInput.oninput = (event) => this.passwordChanged(event); this.parentElement.removeChild(this);
if (typeof(Storage) !== 'undefined') { } else {
if (localStorage.getItem('distill-interstitial-password-correct') === 'true') { const passwordInput = this.root.querySelector('#interstitial-password-input');
console.log('Loaded that correct password was entered before; skipping interstitial.'); passwordInput.oninput = (event) => this.passwordChanged(event);
this.parentElement.removeChild(this);
}
} }
} }
@@ -126,9 +139,32 @@ export class Interstitial extends T(HTMLElement) {
this.parentElement.removeChild(this); this.parentElement.removeChild(this);
if (typeof(Storage) !== 'undefined') { if (typeof(Storage) !== 'undefined') {
console.log('Saved that correct password was entered.'); console.log('Saved that correct password was entered.');
localStorage.setItem('distill-interstitial-password-correct', 'true'); 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
}
} }
+14
View File
@@ -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 */ /*global katex */
import { Mutating } from '../mixins/mutating.js'; import { Mutating } from '../mixins/mutating.js';
import { Template } from '../mixins/template.js'; import { Template } from '../mixins/template.js';
+14
View File
@@ -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'; import { Template } from '../mixins/template';
const T = Template('d-references', ` const T = Template('d-references', `
+14
View File
@@ -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 Title extends HTMLElement { export class Title extends HTMLElement {
static get is() { return 'd-title'; } static get is() { return 'd-title'; }
} }
+15 -1
View File
@@ -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 { export class TOC extends HTMLElement {
static get is() { return 'd-toc'; } static get is() { return 'd-toc'; }
@@ -20,7 +34,7 @@ export function renderTOC(element, headings) {
<style> <style>
d-toc { d-toc {
contain: content; contain: layout style;
display: block; display: block;
} }
+19 -1
View File
@@ -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 { FrontMatter, mergeFromYMLFrontmatter } from './front-matter'; import { FrontMatter, mergeFromYMLFrontmatter } from './front-matter';
import { DMath } from './components/d-math'; import { DMath } from './components/d-math';
import { collect_citations } from './helpers/citation.js'; import { collect_citations } from './helpers/citation.js';
@@ -120,7 +134,11 @@ export const Controller = {
const interstitial = document.querySelector('d-interstitial'); const interstitial = document.querySelector('d-interstitial');
if (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'); const prerendered = document.body.hasAttribute('distill-prerendered');
+15 -2
View File
@@ -1,10 +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 { serializeFrontmatterToBibtex } from '../helpers/bibtex'; import { serializeFrontmatterToBibtex } from '../helpers/bibtex';
const styles = ` const styles = `
<style> <style>
distill-appendix { distill-appendix {
contain: content; contain: layout style;
overflow: hidden;
} }
distill-appendix .citation { distill-appendix .citation {
+14
View File
@@ -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'; import { Template } from '../mixins/template';
import logo from '../assets/distill-logo.svg'; import logo from '../assets/distill-logo.svg';
+16 -6
View File
@@ -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'; import { Template } from '../mixins/template';
import logo from '../assets/distill-logo.svg'; import logo from '../assets/distill-logo.svg';
@@ -72,18 +86,14 @@ distill-header .nav a {
${logo} ${logo}
Distill Distill
</a> </a>
<div class="nav"> <nav class="nav">
<a href="/about/">About</a> <a href="/about/">About</a>
<a href="/prize/">Prize</a> <a href="/prize/">Prize</a>
<a href="/journal/">Submit</a> <a href="/journal/">Submit</a>
</div> </nav>
</div> </div>
`, false); `, false);
// <div class="nav">
// <a href="https://github.com/distillpub">GitHub</a>
// <!-- https://twitter.com/distillpub -->
// </div>
export class DistillHeader extends T(HTMLElement) { export class DistillHeader extends T(HTMLElement) {
@@ -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 { appendixTemplate } from '../distill-components/distill-appendix'; import { appendixTemplate } from '../distill-components/distill-appendix';
export default function(dom, data) { export default function(dom, data) {
+14
View File
@@ -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) { export default function(dom) {
const footerTag = dom.querySelector('distill-footer'); const footerTag = dom.querySelector('distill-footer');
if(!footerTag) { if(!footerTag) {
+14
View File
@@ -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) { export default function(dom) {
const headerTag = dom.querySelector('distill-header'); const headerTag = dom.querySelector('distill-header');
if (!headerTag) { if (!headerTag) {
+14
View File
@@ -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 { parseBibtex } from '../helpers/bibtex'; import { parseBibtex } from '../helpers/bibtex';
import fs from 'fs'; import fs from 'fs';
import { parseBibliography } from '../components/d-bibliography'; import { parseBibliography } from '../components/d-bibliography';
+14
View File
@@ -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 { collect_citations } from '../helpers/citation.js'; import { collect_citations } from '../helpers/citation.js';
export default function(dom, data) { export default function(dom, data) {
+14
View File
@@ -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 { parseFrontmatter } from '../components/d-front-matter'; import { parseFrontmatter } from '../components/d-front-matter';
import { mergeFromYMLFrontmatter } from '../front-matter.js'; import { mergeFromYMLFrontmatter } from '../front-matter.js';
+30 -9
View File
@@ -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 days = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday']; 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 zeroPad = n => n < 10 ? '0' + n : n;
@@ -44,6 +58,7 @@ class Author {
this.personalURL = object.authorURL; // 'https://colah.github.io' this.personalURL = object.authorURL; // 'https://colah.github.io'
this.affiliation = object.affiliation; // 'Google Brain' this.affiliation = object.affiliation; // 'Google Brain'
this.affiliationURL = object.affiliationURL; // 'https://g.co/brain' this.affiliationURL = object.affiliationURL; // 'https://g.co/brain'
this.affiliations = object.affiliations || []; // new-style affiliations
} }
// 'Chris' // 'Chris'
@@ -73,6 +88,8 @@ export function mergeFromYMLFrontmatter(target, source) {
target.publishedDate = source.publishedDate; target.publishedDate = source.publishedDate;
} else if (source.publishedDate.constructor === String) { } else if (source.publishedDate.constructor === String) {
target.publishedDate = new Date(source.publishedDate); 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.description = source.description;
@@ -303,15 +320,19 @@ export class FrontMatter {
target.url = this.url; target.url = this.url;
target.githubUrl = this.githubUrl; target.githubUrl = this.githubUrl;
target.previewURL = this.previewURL; target.previewURL = this.previewURL;
target.volume = this.volume; if (this.publishedDate) {
target.issue = this.issue; target.volume = this.volume;
target.publishedDateRFC = this.publishedDateRFC; target.issue = this.issue;
target.publishedYear = this.publishedYear; target.publishedDateRFC = this.publishedDateRFC;
target.publishedMonth = this.publishedMonth; target.publishedYear = this.publishedYear;
target.publishedDay = this.publishedDay; target.publishedMonth = this.publishedMonth;
target.publishedMonthPadded = this.publishedMonthPadded; target.publishedDay = this.publishedDay;
target.publishedDayPadded = this.publishedDayPadded; target.publishedMonthPadded = this.publishedMonthPadded;
target.updatedDateRFC = this.updatedDateRFC; target.publishedDayPadded = this.publishedDayPadded;
}
if (this.updatedDate) {
target.updatedDateRFC = this.updatedDateRFC;
}
target.concatenatedAuthors = this.concatenatedAuthors; target.concatenatedAuthors = this.concatenatedAuthors;
target.bibtexAuthors = this.bibtexAuthors; target.bibtexAuthors = this.bibtexAuthors;
target.slug = this.slug; target.slug = this.slug;
+14
View File
@@ -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'; import bibtexParse from 'bibtex-parse-js';
function normalizeTag(string) { function normalizeTag(string) {
+29 -5
View File
@@ -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 collect_citations(dom=document) { export function collect_citations(dom=document) {
const citations = new Set(); const citations = new Set();
const citeTags = dom.querySelectorAll('d-cite'); const citeTags = dom.querySelectorAll('d-cite');
@@ -40,6 +54,7 @@ export function inline_cite_long(keys){
} }
function author_string(ent, template, sep, finalSep){ function author_string(ent, template, sep, finalSep){
if (ent.author == null) { return ''; }
var names = ent.author.split(' and '); var names = ent.author.split(' and ');
let name_strings = names.map(name => { let name_strings = names.map(name => {
name = name.trim(); name = name.trim();
@@ -114,13 +129,22 @@ function doi_string(ent, new_line){
} }
} }
function title_string(ent) {
return '<span class="title">' + ent.title + '</span> ';
}
export function bibliography_cite(ent, fancy){ export function bibliography_cite(ent, fancy){
if (ent){ if (ent){
var cite = '<span class="title">' + ent.title + '</span> '; var cite = title_string(ent);
cite += link_string(ent) + '<br>'; cite += link_string(ent) + '<br>';
cite += author_string(ent, '${L}, ${I}', ', ', ' and '); if (ent.author) {
if (ent.year || ent.date){ cite += author_string(ent, '${L}, ${I}', ', ', ' and ');
cite += ', ' + (ent.year || ent.date) + '. '; if (ent.year || ent.date) {
cite += ', ';
}
}
if (ent.year || ent.date) {
cite += (ent.year || ent.date) + '. ';
} else { } else {
cite += '. '; cite += '. ';
} }
@@ -146,7 +170,7 @@ export function bibliography_cite(ent, fancy){
export function hover_cite(ent){ export function hover_cite(ent){
if (ent){ if (ent){
var cite = ''; var cite = '';
cite += '<b>' + ent.title + '</b>'; cite += '<strong>' + ent.title + '</strong>';
cite += link_string(ent); cite += link_string(ent);
cite += '<br>'; cite += '<br>';
+14
View File
@@ -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, // 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. // but we aren't using some of their helpers that don't work well outside a browser environment.
+14
View File
@@ -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 marginSmall = 16;
// const marginLarge = 3 * marginSmall; // const marginLarge = 3 * marginSmall;
// const margin = marginSmall + marginLarge; // const margin = marginSmall + marginLarge;
+14
View File
@@ -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 addPolyfill(polyfill, polyfillLoadedCallback) { export function addPolyfill(polyfill, polyfillLoadedCallback) {
console.info('Runlevel 0: Polyfill required: ' + polyfill.name); console.info('Runlevel 0: Polyfill required: ' + polyfill.name);
const script = document.createElement('script'); const script = document.createElement('script');
+14
View File
@@ -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) => { export const Mutating = (superclass) => {
return class extends superclass { return class extends superclass {
+14
View File
@@ -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) { export function propName(attr) {
return attr.replace(/(-[a-z])/g, (s) => s.toUpperCase().replace('-', '')); return attr.replace(/(-[a-z])/g, (s) => s.toUpperCase().replace('-', ''));
} }
+14
View File
@@ -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*/ /*global ShadyCSS*/
export const Template = (name, templateString, useShadow = true) => { export const Template = (name, templateString, useShadow = true) => {
+38 -8
View File
@@ -1,9 +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.
*/
d-article { d-article {
contain: content; contain: layout style;
overflow-x: hidden;
border-top: 1px solid rgba(0, 0, 0, 0.1); border-top: 1px solid rgba(0, 0, 0, 0.1);
padding-top: 2rem; padding-top: 2rem;
color: rgba(0, 0, 0, 0.8); color: rgba(0, 0, 0, 0.8);
overflow: hidden;
} }
d-article > * { d-article > * {
@@ -169,14 +185,29 @@ d-article span.equation-mimic {
d-article > d-code, d-article > d-code,
d-article section > d-code { d-article section > d-code {
display: block; display: block;
overflow-x: scroll;
} }
d-article > d-math[block], d-article > d-math[block],
d-article section > d-math[block] { d-article section > d-math[block] {
display: block; display: block;
overflow-x: scroll; }
@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 { d-article .citation {
@@ -190,14 +221,13 @@ d-include {
} }
d-figure { d-figure {
contain: content; contain: layout style;
overflow: hidden;
} }
/* KaTeX */ /* KaTeX */
.katex, .katex-prerendered { .katex, .katex-prerendered {
contain: content; contain: style;
display: inline-block; display: inline-block;
} }
+18 -1
View File
@@ -1,6 +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.
*/
d-byline { d-byline {
border-top: 1px solid rgba(0, 0, 0, 0.1);
contain: content; contain: content;
overflow: hidden;
border-top: 1px solid rgba(0, 0, 0, 0.1);
font-size: 0.8rem; font-size: 0.8rem;
line-height: 1.8em; line-height: 1.8em;
padding: 1.5rem 0; padding: 1.5rem 0;
+16
View File
@@ -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.
*/
span.katex-display { span.katex-display {
text-align: left; text-align: left;
padding: 8px 0 8px 0; padding: 8px 0 8px 0;
+22 -12
View File
@@ -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.
*/
d-title { d-title {
padding: 2rem 0 1.5rem; padding: 2rem 0 1.5rem;
contain: content; contain: layout style;
overflow: hidden; overflow-x: hidden;
} }
@media(min-width: 768px) { @media(min-width: 768px) {
@@ -14,29 +30,23 @@ d-title h1 {
grid-column: text; grid-column: text;
font-size: 40px; font-size: 40px;
font-weight: 700; font-weight: 700;
line-height: 1.05em; line-height: 1.1em;
margin: 0 0 1rem; margin: 0 0 0.5rem;
} }
@media(min-width: 768px) { @media(min-width: 768px) {
d-title h1 { d-title h1 {
font-size: 60px; font-size: 50px;
} }
} }
d-title p { d-title p {
font-weight: 300; font-weight: 300;
font-size: 1.2rem; font-size: 1.2rem;
line-height: 1.7em; line-height: 1.55em;
grid-column: text; grid-column: text;
} }
@media(min-width: 768px) {
d-title p {
font-size: 1.5rem;
}
}
d-title .status { d-title .status {
margin-top: 0px; margin-top: 0px;
font-size: 12px; font-size: 12px;
+19 -2
View File
@@ -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.
*/
html { html {
font-size: 14px; font-size: 14px;
line-height: 1.6em; line-height: 1.6em;
@@ -90,7 +106,7 @@ sub {
figure { figure {
position: relative; position: relative;
margin-bottom: 2.5em; margin-bottom: 2.5em;
margin-top: 2.5em; margin-top: 1.5em;
} }
figcaption+figure { figcaption+figure {
@@ -131,7 +147,8 @@ figcaption a {
color: rgba(0, 0, 0, 0.6); color: rgba(0, 0, 0, 0.6);
} }
figcaption b { figcaption b,
figcaption strong, {
font-weight: 600; font-weight: 600;
color: rgba(0, 0, 0, 1.0); color: rgba(0, 0, 0, 1.0);
} }
+17 -1
View File
@@ -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.
*/
@supports not (display: grid) { @supports not (display: grid) {
.base-grid, .base-grid,
distill-header, distill-header,
@@ -79,7 +95,7 @@ distill-footer {
} }
} }
@media(min-width: 1280px) { @media(min-width: 1180px) {
.base-grid, .base-grid,
distill-header, distill-header,
d-title, d-title,
+16
View File
@@ -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 { @media print {
@page { @page {
+14
View File
@@ -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 base from './styles-base.css'; import base from './styles-base.css';
import layout from './styles-layout.css'; import layout from './styles-layout.css';
import print from './styles-print.css'; import print from './styles-print.css';
+14
View File
@@ -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 */ /* eslint-env node, mocha */
import { FrontMatter } from './front-matter'; import { FrontMatter } from './front-matter';
+14
View File
@@ -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 = ` const html = `
<style> <style>
dt-banner { dt-banner {
+14
View File
@@ -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 { bylineTemplate } from '../components/d-byline.js'; import { bylineTemplate } from '../components/d-byline.js';
export default function(dom, data) { export default function(dom, data) {
+14
View File
@@ -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 { renderCitationList } from '../components/d-citation-list'; // (element, entries) import { renderCitationList } from '../components/d-citation-list'; // (element, entries)
export default function(dom, data) { export default function(dom, data) {
+15
View File
@@ -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) { export default function(dom, data) {
let css = ` let css = `
dt-cite { dt-cite {
@@ -95,6 +109,7 @@ export default function(dom, data) {
} }
function author_string(ent, template, sep, finalSep){ function author_string(ent, template, sep, finalSep){
if (ent.author == null) { return ''; }
var names = ent.author.split(' and '); var names = ent.author.split(' and ');
let name_strings = names.map(name => { let name_strings = names.map(name => {
name = name.trim(); name = name.trim();
+14
View File
@@ -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'; import Prism from 'prismjs';
export default function(dom, data) { export default function(dom, data) {
+14
View File
@@ -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) { export default function(dom, data) {
var fnTags = [].slice.apply(dom.querySelectorAll('dt-fn')); var fnTags = [].slice.apply(dom.querySelectorAll('dt-fn'));
+14
View File
@@ -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'; import ymlParse from 'js-yaml';
export default function(dom, data) { export default function(dom, data) {
+14
View File
@@ -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"; //import xml from "xml";
export default function(data) { export default function(data) {
+14
View File
@@ -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'; import code from './hover-box.txt';
export default function(dom) { export default function(dom) {
+14
View File
@@ -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) { export default function(dom) {
const head = dom.querySelector('head'); const head = dom.querySelector('head');
+14
View File
@@ -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'; import fetch from 'fetch';
let fetchUrl = fetch.fetchUrl; let fetchUrl = fetch.fetchUrl;
+14
View File
@@ -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'; import marked from 'marked';
marked.setOptions({ marked.setOptions({
+19 -5
View File
@@ -1,22 +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 katex from 'katex';
import { renderMathInElement } from '../helpers/katex-auto-render'; import { renderMathInElement } from '../helpers/katex-auto-render';
export default function(dom, data) { export default function(dom, data) {
let needsCSS = false; let needsCSS = false;
const article = dom.querySelector('d-article'); const body = dom.querySelector('body');
if (!article) { if (!body) {
console.warn("No d-article tag found!"); console.warn("No body tag found!");
return; return;
} }
if (data.katex && data.katex.delimiters) { if (data.katex && data.katex.delimiters) {
global.document = dom; global.document = dom;
renderMathInElement(article, data.katex); renderMathInElement(body, data.katex);
} }
// render d-math tags // render d-math tags
const mathTags = article.querySelectorAll('d-math'); const mathTags = body.querySelectorAll('d-math');
if (mathTags.length > 0) { if (mathTags.length > 0) {
needsCSS = true; needsCSS = true;
console.warn(`Prerendering ${mathTags.length} math tags...`); console.warn(`Prerendering ${mathTags.length} math tags...`);
+29 -13
View File
@@ -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.
// TODO: rewrite as template to make order dependencies easier // TODO: rewrite as template to make order dependencies easier
import favicon from '../assets/distill-favicon.base64'; import favicon from '../assets/distill-favicon.base64';
@@ -124,26 +138,28 @@ function appendHtml(el, html) {
} }
function citation_meta_content(ref){ function citation_meta_content(ref){
// Special test for arxiv
var content = `citation_title=${ref.title};`; var content = `citation_title=${ref.title};`;
ref.author.split(' and ').forEach(name => { if (ref.author && ref.author !== '') {
name = name.trim(); ref.author.split(' and ').forEach(name => {
let last, firsts; name = name.trim();
if (name.indexOf(',') != -1){ let last, firsts;
last = name.split(',')[0].trim(); if (name.indexOf(',') != -1){
firsts = name.split(',')[1].trim(); last = name.split(',')[0].trim();
} else { firsts = name.split(',')[1].trim();
last = name.split(' ').slice(-1)[0].trim(); } else {
firsts = name.split(' ').slice(0,-1).join(' '); last = name.split(' ').slice(-1)[0].trim();
} firsts = name.split(' ').slice(0,-1).join(' ');
content += `citation_author=${firsts} ${last};`; }
}); content += `citation_author=${firsts} ${last};`;
});
}
if ('year' in ref) { if ('year' in ref) {
content += `citation_publication_date=${ref.year};`; 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); 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 || /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); arxiv_id_search = arxiv_id_search || /arXiv preprint arXiv:([0-9]*\.[0-9]*)/.exec(ref.journal);
+17 -1
View File
@@ -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 // no appendix -> add appendix
// title in front, no h1 -> add it // title in front, no h1 -> add it
// no title in front, h1 -> read and put into frontMatter // no title in front, h1 -> read and put into frontMatter
@@ -29,7 +43,7 @@ export default function(dom, data) {
let title = dom.querySelector('d-title'); let title = dom.querySelector('d-title');
if (!title) { if (!title) {
let title = dom.createElement('d-title'); title = dom.createElement('d-title');
body.insertBefore(title, byline); body.insertBefore(title, byline);
} }
@@ -50,6 +64,8 @@ export default function(dom, data) {
interstitial.password = data.password; interstitial.password = data.password;
body.insertBefore(interstitial, body.firstChild); body.insertBefore(interstitial, body.firstChild);
} }
} else if (!hasPassword && interstitial) {
interstitial.parentElement.removeChild(this);
} }
let appendix = dom.querySelector('d-appendix'); let appendix = dom.querySelector('d-appendix');
+14
View File
@@ -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 webcomponentPath = 'https://distill.pub/third-party/polyfills/webcomponents-lite.js'; const webcomponentPath = 'https://distill.pub/third-party/polyfills/webcomponents-lite.js';
const intersectionObserverPath = 'https://distill.pub/third-party/polyfills/intersection-observer.js'; const intersectionObserverPath = 'https://distill.pub/third-party/polyfills/intersection-observer.js';
+14
View File
@@ -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.
/* /*
Try to only reorder things that MAY be user defined. Try to only reorder things that MAY be user defined.
Try to use templates etc to define the order of our own tags. Try to use templates etc to define the order of our own tags.
+14
View File
@@ -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'; import { renderTOC } from '../components/d-toc';
export default function(dom) { export default function(dom) {
+20 -1
View File
@@ -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) { export default function(dom) {
var textNodes = dom.createTreeWalker( var textNodes = dom.createTreeWalker(
@@ -10,12 +24,17 @@ export default function(dom) {
if (text && acceptNode(n)) { if (text && acceptNode(n)) {
text = quotes(text); text = quotes(text);
text = punctuation(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; 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) { function acceptNode(node) {
var parent = node.parentElement; var parent = node.parentElement;
var isMath = (parent && parent.getAttribute && parent.getAttribute('class')) ? parent.getAttribute('class').includes('katex') || parent.getAttribute('class').includes('MathJax') : false; var isMath = (parent && parent.getAttribute && parent.getAttribute('class')) ? parent.getAttribute('class').includes('katex') || parent.getAttribute('class').includes('MathJax') : false;
+16 -1
View File
@@ -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'; import { Template } from '../mixins/template';
import { scaleLinear } from 'd3-scale'; import { scaleLinear } from 'd3-scale';
import { range } from 'd3-array'; import { range } from 'd3-array';
@@ -181,6 +195,7 @@ export class Slider extends T(HTMLElement) {
static get observedAttributes() {return ['min', 'max', 'value', 'step', 'ticks', 'origin', 'tickValues', 'tickLabels']; } static get observedAttributes() {return ['min', 'max', 'value', 'step', 'ticks', 'origin', 'tickValues', 'tickLabels']; }
attributeChangedCallback(attr, oldValue, newValue) { attributeChangedCallback(attr, oldValue, newValue) {
if (isNaN(newValue) || newValue === undefined || newValue === null) return;
if (attr == 'min') { if (attr == 'min') {
this.min = +newValue; this.min = +newValue;
this.setAttribute('aria-valuemin', this.min); this.setAttribute('aria-valuemin', this.min);
@@ -194,7 +209,7 @@ export class Slider extends T(HTMLElement) {
} }
if (attr == 'origin') { if (attr == 'origin') {
this.origin = +newValue; this.origin = +newValue;
this.update(this.value); // this.update(this.value);
} }
if (attr == 'step') { if (attr == 'step') {
if (newValue > 0) { if (newValue > 0) {
+14
View File
@@ -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.
function nodeListToArray(nodeList) { function nodeListToArray(nodeList) {
return Array.prototype.slice.call(nodeList); return Array.prototype.slice.call(nodeList);
} }
+15
View File
@@ -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> <!DOCTYPE html>
<head> <head>
+15
View File
@@ -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> <!DOCTYPE html>
<head> <head>
+14
View File
@@ -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 it, should, describe */ /* global it, should, describe */
// Test format: https://mochajs.org/#bdd // Test format: https://mochajs.org/#bdd
+14
View File
@@ -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 it, describe, before, beforeEach, after, afterEach */ /* global it, describe, before, beforeEach, after, afterEach */
const jsdom = require('jsdom'); const jsdom = require('jsdom');