Typeset
-Typeset is an HTML pre-processor for web typography which provides typographic features used traditionally in fine printing which remain unavailable to browser layout engines. Typeset’s processing brings the following to your webpages: -
--
-
- Hanging punctuation -
- Ligatures -
- Optical margin alignment -
- Punctuation substitution -
- Small caps -
- Soft hyphen insertion -
How?
-Typeset does not require any client-side JavaScript and uses less than a kilobyte of CSS. Processed HTML & CSS works in Internet Explorer 5 and without any CSS.
+ + -Typeset can be used manually or as a plugin for Grunt and gulp. -
-npm i typesetUsage
-const typeset = require('typeset');
+
+
+
+
+
+
+
+
+
+ Typeset - An HTML pre-processor for web typography
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Typeset
+ Typeset is an HTML pre-processor for web typography which provides typographic features used
+ traditionally in fine printing which remain unavailable to browser layout engines. Typeset’s
+ processing brings the following to your webpages:
+
+
+ - Hanging punctuation
+ - Ligatures
+ - Optical margin alignment
+ - Punctuation substitution
+ - Small caps
+ - Soft hyphen insertion
+
+
+ Get the code on GitHub →
+
+
+ How?
+ Typeset does not require any client-side JavaScript and uses less than a kilobyte of CSS. Processed HTML &
+ CSS works in Internet Explorer 5 and without any CSS.
+
+ Typeset can be used manually or as a plugin for Grunt and gulp.
+
+
+
npm i typeset
+
+ Usage
+ const typeset = require('typeset');
let html = '<p>"Hello," said the fox.</p>';
let output = typeset(html);
- Then tweak Typeset.css to match the metrics of your font and include it on your page.
+
Then tweak Typeset.css to match the metrics of your font and include it on your
+ page.
+
+ Options
+ Typeset accepts an optional second argument containing configuration:
+
+ ignore <string> - Typeset will not process elements matching this CSS selector.
+
+ Example:
+ typeset(html, { ignore: '.skip' });
+
+ only <string> - Typeset will only process elements matching this CSS selector.
+ Example:
+ typeset(html, { only: '.typeset' });
+
+ disable <array> - List of Typeset features to disable. The following features may be
+ disabled:
+
+ quoteshyphenateligaturessmallCapspunctuationhangingPunctuationspaces
+
+ Example:
+ typeset(html, { disable: ['hyphenate'] });
+
+ CLI
+ npm install -g typeset
+ Compiles a file to stdout:
+ typeset-js input.html
+ Pass an output file as a second argument:
+ typeset-js input.html output.html
+ Use the --ignore option to ignore specific CSS selectors:
+
+ typeset-js input.html output.html --ignore ".skip"
+ About
+ This project started as a collection of libraries I gathered for Blot. Typeset still runs there in production. This was made possible by the work of
+ Bram Stein, Daniel Haim, and Dr. Drang. This page is set in the
+ Plex family by Mike Abbink. Thanks to Matthew Butterick and Chris Coyier for their help and feedback.
+
+ License
+ This software is dedicated to the public domain and licensed under CC0.
+
+
+
+
+ Typeset
+
+
+
+
+ Yjarni Sigurðardóttir spoke to the EFF from Iceland yesterday: “Light of my life, fire of my florins — my
+ sin, my soul. The tip of the tongue taking a trip to 118° 19′ 43.5″.”
- License
- This software is dedicated to the public domain and licensed under CC0.
+
“She’s faster than a 120′ 4″ whale.” Piña coladas were widely consumed in Götterdämmerung from
+ 1880–1912. For the low price of $20 / year from Exhibits A–E… Then the duplex came forward.
+ “Thrice the tower, he mounted the round gunrest, ‘awaking’ HTML. He can print a fixed number of dots in a
+ square inch (for instance, 600 × 600).”
-
-
-
-
-
-
- Yjarni Sigurðardóttir spoke to the EFF from Iceland yesterday: “Light of my life, fire of my florins — my sin, my soul. The tip of the tongue taking a trip to 118° 19′ 43.5″.”
-
- “She’s faster than a 120′ 4″ whale.” Piña coladas were widely consumed in Götterdämmerung from 1880–1912. For the low price of $20 / year from Exhibits A–E… Then the duplex came forward. “Thrice the tower, he mounted the round gunrest, ‘awaking’ HTML. He can print a fixed number of dots in a square inch (for instance, 600 × 600).”
-
-
-
-
-
-
-
+
+
+
+
\ No newline at end of file
diff --git a/demo/public/normalize-opentype.css b/demo/public/normalize-opentype.css
index c7b6b88..700874b 100644
--- a/demo/public/normalize-opentype.css
+++ b/demo/public/normalize-opentype.css
@@ -1 +1 @@
-/*! normalize-opentype.css v0.2.4 | MIT License | kennethormandy.com/journal/normalize-opentype-css */::-moz-selection{color:inherit;text-shadow:inherit;background-color:#accef7}::selection{color:inherit;text-shadow:inherit;background-color:#accef7}body,html,table{-webkit-font-feature-settings:"kern" 1,"liga" 1,"calt" 1,"pnum" 1,"tnum" 0,"onum" 1,"lnum" 0,"dlig" 0;-moz-font-feature-settings:"kern" 1,"liga" 1,"calt" 1,"pnum" 1,"tnum" 0,"onum" 1,"lnum" 0,"dlig" 0;font-feature-settings:"kern" 1,"liga" 1,"calt" 1,"pnum" 1,"tnum" 0,"onum" 1,"lnum" 0,"dlig" 0}h1,h2,h3{-webkit-font-feature-settings:"kern" 1,"liga" 1,"calt" 1,"pnum" 1,"tnum" 0,"onum" 1,"lnum" 0,"dlig" 1;-moz-font-feature-settings:"kern" 1,"liga" 1,"calt" 1,"pnum" 1,"tnum" 0,"onum" 1,"lnum" 0,"dlig" 1;font-feature-settings:"kern" 1,"liga" 1,"calt" 1,"pnum" 1,"tnum" 0,"onum" 1,"lnum" 0,"dlig" 1}abbr{text-transform:uppercase;-webkit-font-feature-settings:"kern" 1,"liga" 1,"calt" 1,"pnum" 1,"tnum" 0,"onum" 1,"lnum" 0,"smcp" 1,"c2sc" 1;-moz-font-feature-settings:"kern" 1,"liga" 1,"calt" 1,"pnum" 1,"tnum" 0,"onum" 1,"lnum" 0,"smcp" 1,"c2sc" 1;font-feature-settings:"kern" 1,"liga" 1,"calt" 1,"pnum" 1,"tnum" 0,"onum" 1,"lnum" 0,"smcp" 1,"c2sc" 1}time{-webkit-font-feature-settings:"kern" 1,"liga" 1,"calt" 1,"pnum" 1,"tnum" 0,"onum" 1,"lnum" 0;-moz-font-feature-settings:"kern" 1,"liga" 1,"calt" 1,"pnum" 1,"tnum" 0,"onum" 1,"lnum" 0;font-feature-settings:"kern" 1,"liga" 1,"calt" 1,"pnum" 1,"tnum" 0,"onum" 1,"lnum" 0}code,kbd,pre,samp{-webkit-font-feature-settings:"kern" 0,"liga" 0,"calt" 1,"dlig" 0,"pnum" 0,"tnum" 1,"onum" 0,"lnum" 1,"zero" 1;-moz-font-feature-settings:"kern" 0,"liga" 0,"calt" 1,"dlig" 0,"pnum" 0,"tnum" 1,"onum" 0,"lnum" 1,"zero" 1;font-feature-settings:"kern" 0,"liga" 0,"calt" 1,"dlig" 0,"pnum" 0,"tnum" 1,"onum" 0,"lnum" 1,"zero" 1}sup{-webkit-font-feature-settings:"kern" 1,"liga" 1,"calt" 1,"pnum" 1,"tnum" 0,"onum" 1,"lnum" 0,"dlig" 0,"sups" 1;-moz-font-feature-settings:"kern" 1,"liga" 1,"calt" 1,"pnum" 1,"tnum" 0,"onum" 1,"lnum" 0,"dlig" 0,"sups" 1;font-feature-settings:"kern" 1,"liga" 1,"calt" 1,"pnum" 1,"tnum" 0,"onum" 1,"lnum" 0,"dlig" 0,"sups" 1}sub{-webkit-font-feature-settings:"kern" 1,"liga" 1,"calt" 1,"pnum" 1,"tnum" 0,"onum" 1,"lnum" 0,"dlig" 0,"subs" 1;-moz-font-feature-settings:"kern" 1,"liga" 1,"calt" 1,"pnum" 1,"tnum" 0,"onum" 1,"lnum" 0,"dlig" 0,"subs" 1;font-feature-settings:"kern" 1,"liga" 1,"calt" 1,"pnum" 1,"tnum" 0,"onum" 1,"lnum" 0,"dlig" 0,"subs" 1}input[type=color],input[type=date],input[type=datetime-local],input[type=datetime],input[type=number],input[type=range],input[type=tel],input[type=week]{-webkit-font-feature-settings:"kern" 0,"liga" 1,"calt" 1,"pnum" 1,"tnum" 0,"onum" 0,"lnum" 1,"zero" 0;-moz-font-feature-settings:"kern" 0,"liga" 1,"calt" 1,"pnum" 1,"tnum" 0,"onum" 0,"lnum" 1,"zero" 0;font-feature-settings:"kern" 0,"liga" 1,"calt" 1,"pnum" 1,"tnum" 0,"onum" 0,"lnum" 1,"zero" 0}caption,tbody{-webkit-font-feature-settings:"kern" 1,"liga" 1,"calt" 1,"pnum" 0,"tnum" 1,"onum" 0,"lnum" 1,"zero" 1;-moz-font-feature-settings:"kern" 1,"liga" 1,"calt" 1,"pnum" 0,"tnum" 1,"onum" 0,"lnum" 1,"zero" 1;font-feature-settings:"kern" 1,"liga" 1,"calt" 1,"pnum" 0,"tnum" 1,"onum" 0,"lnum" 1,"zero" 1}
\ No newline at end of file
+/*! normalize-opentype.css v0.2.4 | MIT License | kennethormandy.com/journal/normalize-opentype-css */::-moz-selection{color:inherit;text-shadow:inherit;background-color:#accef7}::selection{color:inherit;text-shadow:inherit;background-color:#accef7}body,html,table{-webkit-font-feature-settings:"kern"1,"liga"1,"calt"1,"pnum"1,"tnum"0,"onum"1,"lnum"0,"dlig"0;-moz-font-feature-settings:"kern"1,"liga"1,"calt"1,"pnum"1,"tnum"0,"onum"1,"lnum"0,"dlig"0;font-feature-settings:"kern"1,"liga"1,"calt"1,"pnum"1,"tnum"0,"onum"1,"lnum"0,"dlig"0}h1,h2,h3{-webkit-font-feature-settings:"kern"1,"liga"1,"calt"1,"pnum"1,"tnum"0,"onum"1,"lnum"0,"dlig"1;-moz-font-feature-settings:"kern"1,"liga"1,"calt"1,"pnum"1,"tnum"0,"onum"1,"lnum"0,"dlig"1;font-feature-settings:"kern"1,"liga"1,"calt"1,"pnum"1,"tnum"0,"onum"1,"lnum"0,"dlig"1}abbr{text-transform:uppercase;-webkit-font-feature-settings:"kern"1,"liga"1,"calt"1,"pnum"1,"tnum"0,"onum"1,"lnum"0,"smcp"1,"c2sc"1;-moz-font-feature-settings:"kern"1,"liga"1,"calt"1,"pnum"1,"tnum"0,"onum"1,"lnum"0,"smcp"1,"c2sc"1;font-feature-settings:"kern"1,"liga"1,"calt"1,"pnum"1,"tnum"0,"onum"1,"lnum"0,"smcp"1,"c2sc"1}time{-webkit-font-feature-settings:"kern"1,"liga"1,"calt"1,"pnum"1,"tnum"0,"onum"1,"lnum"0;-moz-font-feature-settings:"kern"1,"liga"1,"calt"1,"pnum"1,"tnum"0,"onum"1,"lnum"0;font-feature-settings:"kern"1,"liga"1,"calt"1,"pnum"1,"tnum"0,"onum"1,"lnum"0}code,kbd,pre,samp{-webkit-font-feature-settings:"kern"0,"liga"0,"calt"1,"dlig"0,"pnum"0,"tnum"1,"onum"0,"lnum"1,"zero"1;-moz-font-feature-settings:"kern"0,"liga"0,"calt"1,"dlig"0,"pnum"0,"tnum"1,"onum"0,"lnum"1,"zero"1;font-feature-settings:"kern"0,"liga"0,"calt"1,"dlig"0,"pnum"0,"tnum"1,"onum"0,"lnum"1,"zero"1}sup{-webkit-font-feature-settings:"kern"1,"liga"1,"calt"1,"pnum"1,"tnum"0,"onum"1,"lnum"0,"dlig"0,"sups"1;-moz-font-feature-settings:"kern"1,"liga"1,"calt"1,"pnum"1,"tnum"0,"onum"1,"lnum"0,"dlig"0,"sups"1;font-feature-settings:"kern"1,"liga"1,"calt"1,"pnum"1,"tnum"0,"onum"1,"lnum"0,"dlig"0,"sups"1}sub{-webkit-font-feature-settings:"kern"1,"liga"1,"calt"1,"pnum"1,"tnum"0,"onum"1,"lnum"0,"dlig"0,"subs"1;-moz-font-feature-settings:"kern"1,"liga"1,"calt"1,"pnum"1,"tnum"0,"onum"1,"lnum"0,"dlig"0,"subs"1;font-feature-settings:"kern"1,"liga"1,"calt"1,"pnum"1,"tnum"0,"onum"1,"lnum"0,"dlig"0,"subs"1}input[type=color],input[type=date],input[type=datetime-local],input[type=datetime],input[type=number],input[type=range],input[type=tel],input[type=week]{-webkit-font-feature-settings:"kern"0,"liga"1,"calt"1,"pnum"1,"tnum"0,"onum"0,"lnum"1,"zero"0;-moz-font-feature-settings:"kern"0,"liga"1,"calt"1,"pnum"1,"tnum"0,"onum"0,"lnum"1,"zero"0;font-feature-settings:"kern"0,"liga"1,"calt"1,"pnum"1,"tnum"0,"onum"0,"lnum"1,"zero"0}caption,tbody{-webkit-font-feature-settings:"kern"1,"liga"1,"calt"1,"pnum"0,"tnum"1,"onum"0,"lnum"1,"zero"1;-moz-font-feature-settings:"kern"1,"liga"1,"calt"1,"pnum"0,"tnum"1,"onum"0,"lnum"1,"zero"1;font-feature-settings:"kern"1,"liga"1,"calt"1,"pnum"0,"tnum"1,"onum"0,"lnum"1,"zero"1}
\ No newline at end of file
diff --git a/demo/public/stylesheet.css b/demo/public/stylesheet.css
index c6b8ded..c4560b0 100644
--- a/demo/public/stylesheet.css
+++ b/demo/public/stylesheet.css
@@ -1 +1 @@
-html{font-size:18px;margin:0;padding:0}body{font-family:'IBM Plex Sans',sans-serif;line-height:1.615;display:flex;margin:0;padding:0;text-size-adjust:100%;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%;-webkit-tap-highlight-color:transparent;-ms-overflow-style:scrollbar;flex-wrap:wrap}article{display:block;margin:0 auto}pre{font-size:16px;background-color:rgba(0,0,0,.05)}code{font-family:'IBM Plex Mono',monospace}a{color:#00f}.button,pre{padding:1em 1.4em}.button{display:inline-block;margin-top:4rem;margin-bottom:6rem;text-decoration:none;border:1px solid;border-radius:2em}blockquote{font-family:'IBM Plex Serif',serif;font-size:1.15rem;font-weight:400;line-height:1.415;padding:1rem;margin:0;border:1px solid;border-top:0 solid;width:100%}blockquote p:last-child{margin-bottom:0}a[href^='#tab-']{display:inline-block;margin-bottom:-1px;padding:0;padding:.5em 1.4em;text-decoration:underline;color:#00f;border:1px solid transparent}.demo{display:block}@media (max-width:992px){.demo{order:-1}}a[href^='#tab-'][data-active=true]{text-decoration:none;color:inherit;border:1px solid;border-bottom:1px solid #fff}.demo p:first-child{margin-top:0}h1,h2{font-weight:400}h2{font-size:1rem;margin:2em 0 1em}.tabs{display:flex;padding-bottom:0!important}.tabs>*{max-width:12.5em;flex-basis:50% 0 0}.tabs a{cursor:pointer;text-decoration:none}.tabs a[data-active=false]{color:#999}.tabs,h1,h2{font-size:1rem;margin:0;padding:1em 0;border-bottom:1px solid}*,::after,::before{box-sizing:border-box}@media (min-width:992px){body>*{width:50%;padding:1.4em 2.8em 10em;flex-shrink:0}}@media (max-width:992px){html{padding:1rem}body>*{width:100%;flex-shrink:0}}ul{list-style:inside}li,ul{margin:0;padding:0;padding-left:1.2em}li{padding-left:1em}ul ul{margin-bottom:.5rem;padding-top:1rem}h5{font-size:13px;font-weight:700;margin:1rem 0 .25rem;text-transform:uppercase;color:grey}h5+pre{margin-top:0}pre{background-color:#f6f8fa}.hljs{display:block;overflow-x:auto;color:#333}.hljs-comment,.hljs-quote{font-style:italic;color:#998}.hljs-keyword,.hljs-selector-tag,.hljs-subst{color:#d73a49}.hljs-literal,.hljs-number,.hljs-tag .hljs-attr,.hljs-template-variable,.hljs-variable{color:teal}.hljs-doctag,.hljs-string{color:#032f62}.hljs-section,.hljs-selector-id,.hljs-title{font-weight:700;color:#900}.hljs-subst{font-weight:400}.hljs-class .hljs-title,.hljs-type{font-weight:700;color:#458}.hljs-attribute,.hljs-name,.hljs-tag{font-weight:400;color:navy}.hljs-link,.hljs-regexp{color:#009926}.hljs-bullet,.hljs-symbol{color:#990073}.hljs-built_in,.hljs-builtin-name{color:#005cc5}.hljs-meta{font-weight:700;color:#999}.hljs-deletion{background-color:#fdd}.hljs-addition{background-color:#dfd}.hljs-emphasis{font-style:italic}.hljs-strong{font-weight:700}
\ No newline at end of file
+html{font-size:18px;margin:0;padding:0}body{font-family:"IBM Plex Sans",sans-serif;line-height:1.615;display:flex;margin:0;padding:0;text-size-adjust:100%;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%;-webkit-tap-highlight-color:transparent;-ms-overflow-style:scrollbar;flex-wrap:wrap}article{display:block;margin:0 auto}pre{font-size:16px;background-color:rgba(0,0,0,.05)}code{font-family:"IBM Plex Mono",monospace}a{color:#00f}pre{padding:1em 1.4em}.button{display:inline-block;text-decoration:none;border:1px solid;border-radius:2em;height:46px;line-height:44px;font-size:1rem;padding:0 1.2rem;margin-top:2rem;margin-bottom:1rem}@media (min-width:992px){.button{margin-top:4rem;margin-bottom:6rem;padding:0 1.2rem;line-height:54px;height:56px}}blockquote{font-family:Georgia,Times,Times New Roman,serif;font-size:1rem;font-weight:400;line-height:1.615;padding:1rem;margin:0;border:1px solid;border-top:0 solid;width:100%;position:relative}blockquote:after,blockquote:before{content:"";display:block;width:1rem;height:calc(100% - 2rem);background-color:rgba(0,0,255,.1);position:absolute;top:1rem;bottom:0;z-index:-1}blockquote:before{border-right:1px solid #00f;left:0}blockquote:after{border-left:1px solid #00f;right:0}blockquote p:last-child{margin-bottom:0}a[href^="#tab-"]{display:inline-block;margin-bottom:-1px;padding:0;padding:.5em 1.4em;text-decoration:underline;color:#00f;border:1px solid transparent}.demo{display:block}@media (max-width:992px){.demo{order:-1}}a[href^="#tab-"][data-active=true]{text-decoration:none;color:inherit;border:1px solid;border-bottom:1px solid #fff}.demo p:first-child{margin-top:0}h1,h2{font-weight:400}h2{font-size:1rem;margin:2em 0 1em}.tabs{display:flex;padding-bottom:0!important}.tabs>*{max-width:12.5em;flex-basis:50% 0 0}.tabs a{cursor:pointer;text-decoration:none}.tabs a[data-active=false]{color:#999}.tabs,h1,h2{font-size:1rem;margin:0;padding:1em 0;border-bottom:1px solid}*,::after,::before{box-sizing:border-box}@media (min-width:992px){body>*{width:50%;padding:1.4em 2.8em 10em;flex-shrink:0}}@media (max-width:992px){html{padding:1rem}body>*{width:100%;flex-shrink:0}}ul{list-style:inside}li,ul{margin:0;padding:0;padding-left:1.2em}li{padding-left:1em}ul ul{margin-bottom:.5rem;padding-top:1rem}h5{font-size:13px;font-weight:700;margin:1rem 0 .25rem;text-transform:uppercase;color:grey}h5+pre{margin-top:0}pre{background-color:#f6f8fa}.hljs{display:block;overflow-x:auto;color:#333}.hljs-comment,.hljs-quote{font-style:italic;color:#998}.hljs-keyword,.hljs-selector-tag,.hljs-subst{color:#d73a49}.hljs-literal,.hljs-number,.hljs-tag .hljs-attr,.hljs-template-variable,.hljs-variable{color:teal}.hljs-doctag,.hljs-string{color:#032f62}.hljs-section,.hljs-selector-id,.hljs-title{font-weight:700;color:#900}.hljs-subst{font-weight:400}.hljs-class .hljs-title,.hljs-type{font-weight:700;color:#458}.hljs-attribute,.hljs-name,.hljs-tag{font-weight:400;color:navy}.hljs-link,.hljs-regexp{color:#009926}.hljs-bullet,.hljs-symbol{color:#990073}.hljs-built_in,.hljs-builtin-name{color:#005cc5}.hljs-meta{font-weight:700;color:#999}.hljs-deletion{background-color:#fdd}.hljs-addition{background-color:#dfd}.hljs-emphasis{font-style:italic}.hljs-strong{font-weight:700}.d-none{display:none}@media (min-width:992px){.d-md-none{display:none}.d-md-block{display:block}}
\ No newline at end of file
diff --git a/demo/source/index.html b/demo/source/index.html
index 29091d0..6e213e0 100644
--- a/demo/source/index.html
+++ b/demo/source/index.html
@@ -1,146 +1,187 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Typeset - An HTML pre-processor for web typography
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Typeset
- Typeset is an HTML pre-processor for web typography which provides typographic features used traditionally in fine printing which remain unavailable to browser layout engines. Typeset's processing brings the following to your webpages:
-
-
- - Hanging punctuation
- - Ligatures
- - Optical margin alignment
- - Punctuation substitution
- - Small caps
- - Soft hyphen insertion
-
- Get the code on GitHub →
+
+
+
+
+
+
+
- How?
- Typeset does not require any client-side JavaScript and uses less than a kilobyte of CSS. Processed HTML & CSS works in Internet Explorer 5 and without any CSS.
+
+
- Typeset can be used manually or as a plugin for Grunt and gulp.
-
- npm i typeset
- Usage
- const typeset = require('typeset');
+
+
+
+
+
+
+
+
+
+ Typeset - An HTML pre-processor for web typography
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Typeset
+ Typeset is an HTML pre-processor for web typography which provides typographic features used
+ traditionally in fine printing which remain unavailable to browser layout engines. Typeset's
+ processing brings the following to your webpages:
+
+
+ - Hanging punctuation
+ - Ligatures
+ - Optical margin alignment
+ - Punctuation substitution
+ - Small caps
+ - Soft hyphen insertion
+
+
+ Get the code on GitHub →
+
+
+ How?
+ Typeset does not require any client-side JavaScript and uses less than a kilobyte of CSS. Processed HTML &
+ CSS works in Internet Explorer 5 and without any CSS.
+
+ Typeset can be used manually or as a plugin for Grunt and gulp.
+
+
+
npm i typeset
+
+ Usage
+ const typeset = require('typeset');
let html = '"Hello," said the fox.
';
let output = typeset(html);
- Then tweak Typeset.css to match the metrics of your font and include it on your page.
-
- Options
- Typeset accepts an optional second argument containing configuration:
-
- ignore <string> - Typeset will not process elements matching this CSS selector.
-
- Example:
- typeset(html, { ignore: '.skip' });
-
- only <string> - Typeset will only process elements matching this CSS selector.
- Example:
- typeset(html, { only: '.typeset' });
-
- disable <array> - List of Typeset features to disable. The following features may be disabled:
-
- quoteshyphenateligaturessmallCapspunctuationhangingPunctuationspaces
-
- Example:
- typeset(html, { disable: ['hyphenate'] });
-
- CLI
- npm install -g typeset
- Compiles a file to stdout:
- typeset-js input.html
- Pass an output file as a second argument:
-typeset-js input.html output.html
- Use the --ignore option to ignore specific CSS selectors:
-
-typeset-js input.html output.html --ignore ".skip"
- About
- This project started as a collection of libraries I gathered for Blot. Typeset still runs there in production. This was made possible by the work of Bram Stein, Daniel Haim, and Dr. Drang. This page is set in the Plex family by Mike Abbink. Thanks to Matthew Butterick and Chris Coyier for their help and feedback.
+
Then tweak Typeset.css to match the metrics of your font and include it on your
+ page.
+
+ Options
+ Typeset accepts an optional second argument containing configuration:
+
+ ignore <string> - Typeset will not process elements matching this CSS selector.
+
+ Example:
+ typeset(html, { ignore: '.skip' });
+
+ only <string> - Typeset will only process elements matching this CSS selector.
+ Example:
+ typeset(html, { only: '.typeset' });
+
+ disable <array> - List of Typeset features to disable. The following features may be
+ disabled:
+
+ quoteshyphenateligaturessmallCapspunctuationhangingPunctuationspaces
+
+ Example:
+ typeset(html, { disable: ['hyphenate'] });
+
+ CLI
+ npm install -g typeset
+ Compiles a file to stdout:
+ typeset-js input.html
+ Pass an output file as a second argument:
+ typeset-js input.html output.html
+ Use the --ignore option to ignore specific CSS selectors:
+
+ typeset-js input.html output.html --ignore ".skip"
+ About
+ This project started as a collection of libraries I gathered for Blot. Typeset still runs there in production. This was made possible by the work of
+ Bram Stein, Daniel Haim, and Dr. Drang. This page is set in the
+ Plex family by Mike Abbink. Thanks to Matthew Butterick and Chris Coyier for their help and feedback.
+
+ License
+ This software is dedicated to the public domain and licensed under CC0.
+
+
+
+
+ Typeset
+
+
+
-
-
-
-
+
+
+
+
\ No newline at end of file
diff --git a/demo/source/normalize-opentype.css b/demo/source/normalize-opentype.css
index 76b9f45..2763c33 100644
--- a/demo/source/normalize-opentype.css
+++ b/demo/source/normalize-opentype.css
@@ -1,130 +1,83 @@
/*! normalize-opentype.css v0.2.4 | MIT License | kennethormandy.com/journal/normalize-opentype-css */
-/**
- * 1. Inherit style issues with custom selections, per robsterlini.co.uk/journal/opentype-and-selection-dont-mix
- * 2. Turn on kerning, standard ligatures, and proportional, oldstyle numerals
- * Turn off all other ligatures, tabular, lining numerals, and alternates
- Uses same settings for tables
- * 3. Hard-codes fallback text selection for issue #18, color is Chrome’s per via http://stackoverflow.com/a/16094931/864799
- */
+
::-moz-selection {
color: inherit;
- /* 1. */
text-shadow: inherit;
- /* 2. */
background-color: #ACCEF7;
- /* 3. */ }
+}
+
::selection {
color: inherit;
- /* 1. */
text-shadow: inherit;
- /* 2. */
background-color: #ACCEF7;
- /* 3. */ }
+}
-html, body, table {
- -webkit-font-feature-settings: "kern" 1, "liga" 1, "calt" 1, "pnum" 1, "tnum" 0, "onum" 1, "lnum" 0, "dlig" 0;
- -moz-font-feature-settings: "kern" 1, "liga" 1, "calt" 1, "pnum" 1, "tnum" 0, "onum" 1, "lnum" 0, "dlig" 0;
- font-feature-settings: "kern" 1, "liga" 1, "calt" 1, "pnum" 1, "tnum" 0, "onum" 1, "lnum" 0, "dlig" 0;
- /* 2. */ }
+html,
+body,
+table {
+ -webkit-font-feature-settings: "kern"1, "liga"1, "calt"1, "pnum"1, "tnum"0, "onum"1, "lnum"0, "dlig"0;
+ -moz-font-feature-settings: "kern"1, "liga"1, "calt"1, "pnum"1, "tnum"0, "onum"1, "lnum"0, "dlig"0;
+ font-feature-settings: "kern"1, "liga"1, "calt"1, "pnum"1, "tnum"0, "onum"1, "lnum"0, "dlig"0;
+}
-/* Headings
-========================================================================== */
-/**
- * 1. Turn on discretionary ligatures for larger headings
- */
-h1, h2, h3 {
- -webkit-font-feature-settings: "kern" 1, "liga" 1, "calt" 1, "pnum" 1, "tnum" 0, "onum" 1, "lnum" 0, "dlig" 1;
- -moz-font-feature-settings: "kern" 1, "liga" 1, "calt" 1, "pnum" 1, "tnum" 0, "onum" 1, "lnum" 0, "dlig" 1;
- font-feature-settings: "kern" 1, "liga" 1, "calt" 1, "pnum" 1, "tnum" 0, "onum" 1, "lnum" 0, "dlig" 1;
- /* 1. */ }
+h1,
+h2,
+h3 {
+ -webkit-font-feature-settings: "kern"1, "liga"1, "calt"1, "pnum"1, "tnum"0, "onum"1, "lnum"0, "dlig"1;
+ -moz-font-feature-settings: "kern"1, "liga"1, "calt"1, "pnum"1, "tnum"0, "onum"1, "lnum"0, "dlig"1;
+ font-feature-settings: "kern"1, "liga"1, "calt"1, "pnum"1, "tnum"0, "onum"1, "lnum"0, "dlig"1;
+}
-/* Text-level semantics
-========================================================================== */
-/**
- * 1. Change all letters to uppercase
- * 2. Turn on small caps for upper and lowercase letters
- */
abbr {
text-transform: uppercase;
- /* 1 */
- -webkit-font-feature-settings: "kern" 1, "liga" 1, "calt" 1, "pnum" 1, "tnum" 0, "onum" 1, "lnum" 0, "smcp" 1, "c2sc" 1;
- -moz-font-feature-settings: "kern" 1, "liga" 1, "calt" 1, "pnum" 1, "tnum" 0, "onum" 1, "lnum" 0, "smcp" 1, "c2sc" 1;
- font-feature-settings: "kern" 1, "liga" 1, "calt" 1, "pnum" 1, "tnum" 0, "onum" 1, "lnum" 0, "smcp" 1, "c2sc" 1;
- /* 2 */ }
+ -webkit-font-feature-settings: "kern"1, "liga"1, "calt"1, "pnum"1, "tnum"0, "onum"1, "lnum"0, "smcp"1, "c2sc"1;
+ -moz-font-feature-settings: "kern"1, "liga"1, "calt"1, "pnum"1, "tnum"0, "onum"1, "lnum"0, "smcp"1, "c2sc"1;
+ font-feature-settings: "kern"1, "liga"1, "calt"1, "pnum"1, "tnum"0, "onum"1, "lnum"0, "smcp"1, "c2sc"1;
+}
-/*
- * TODO: Turn on diagonal fractions where appropriate
- */
time {
- -webkit-font-feature-settings: "kern" 1, "liga" 1, "calt" 1, "pnum" 1, "tnum" 0, "onum" 1, "lnum" 0;
- -moz-font-feature-settings: "kern" 1, "liga" 1, "calt" 1, "pnum" 1, "tnum" 0, "onum" 1, "lnum" 0;
- font-feature-settings: "kern" 1, "liga" 1, "calt" 1, "pnum" 1, "tnum" 0, "onum" 1, "lnum" 0; }
+ -webkit-font-feature-settings: "kern"1, "liga"1, "calt"1, "pnum"1, "tnum"0, "onum"1, "lnum"0;
+ -moz-font-feature-settings: "kern"1, "liga"1, "calt"1, "pnum"1, "tnum"0, "onum"1, "lnum"0;
+ font-feature-settings: "kern"1, "liga"1, "calt"1, "pnum"1, "tnum"0, "onum"1, "lnum"0;
+}
-/*
- * 1. Turn off kerning and ligatures,
- * Turn on lining, tabular numerals, slashed zero
- */
-pre, kbd, samp, code {
- -webkit-font-feature-settings: "kern" 0, "liga" 0, "calt" 1, "dlig" 0, "pnum" 0, "tnum" 1, "onum" 0, "lnum" 1, "zero" 1;
- -moz-font-feature-settings: "kern" 0, "liga" 0, "calt" 1, "dlig" 0, "pnum" 0, "tnum" 1, "onum" 0, "lnum" 1, "zero" 1;
- font-feature-settings: "kern" 0, "liga" 0, "calt" 1, "dlig" 0, "pnum" 0, "tnum" 1, "onum" 0, "lnum" 1, "zero" 1;
- /* 1. */ }
+pre,
+kbd,
+samp,
+code {
+ -webkit-font-feature-settings: "kern"0, "liga"0, "calt"1, "dlig"0, "pnum"0, "tnum"1, "onum"0, "lnum"1, "zero"1;
+ -moz-font-feature-settings: "kern"0, "liga"0, "calt"1, "dlig"0, "pnum"0, "tnum"1, "onum"0, "lnum"1, "zero"1;
+ font-feature-settings: "kern"0, "liga"0, "calt"1, "dlig"0, "pnum"0, "tnum"1, "onum"0, "lnum"1, "zero"1;
+}
-/**
- * 1. Turn on proper supercript numerals
- */
sup {
- -webkit-font-feature-settings: "kern" 1, "liga" 1, "calt" 1, "pnum" 1, "tnum" 0, "onum" 1, "lnum" 0, "dlig" 0, "sups" 1;
- -moz-font-feature-settings: "kern" 1, "liga" 1, "calt" 1, "pnum" 1, "tnum" 0, "onum" 1, "lnum" 0, "dlig" 0, "sups" 1;
- font-feature-settings: "kern" 1, "liga" 1, "calt" 1, "pnum" 1, "tnum" 0, "onum" 1, "lnum" 0, "dlig" 0, "sups" 1;
- /* 1. */ }
+ -webkit-font-feature-settings: "kern"1, "liga"1, "calt"1, "pnum"1, "tnum"0, "onum"1, "lnum"0, "dlig"0, "sups"1;
+ -moz-font-feature-settings: "kern"1, "liga"1, "calt"1, "pnum"1, "tnum"0, "onum"1, "lnum"0, "dlig"0, "sups"1;
+ font-feature-settings: "kern"1, "liga"1, "calt"1, "pnum"1, "tnum"0, "onum"1, "lnum"0, "dlig"0, "sups"1;
+}
-/**
- * 1. Turn on proper subscript numerals
- */
sub {
- -webkit-font-feature-settings: "kern" 1, "liga" 1, "calt" 1, "pnum" 1, "tnum" 0, "onum" 1, "lnum" 0, "dlig" 0, "subs" 1;
- -moz-font-feature-settings: "kern" 1, "liga" 1, "calt" 1, "pnum" 1, "tnum" 0, "onum" 1, "lnum" 0, "dlig" 0, "subs" 1;
- font-feature-settings: "kern" 1, "liga" 1, "calt" 1, "pnum" 1, "tnum" 0, "onum" 1, "lnum" 0, "dlig" 0, "subs" 1;
- /* 1. */ }
+ -webkit-font-feature-settings: "kern"1, "liga"1, "calt"1, "pnum"1, "tnum"0, "onum"1, "lnum"0, "dlig"0, "subs"1;
+ -moz-font-feature-settings: "kern"1, "liga"1, "calt"1, "pnum"1, "tnum"0, "onum"1, "lnum"0, "dlig"0, "subs"1;
+ font-feature-settings: "kern"1, "liga"1, "calt"1, "pnum"1, "tnum"0, "onum"1, "lnum"0, "dlig"0, "subs"1;
+}
-/* Grouping content
-========================================================================== */
-/**
- * TODO: Adds proper bullets
- */
-/*
- * TODO:
- * 1. Adds counters for lists
- * 2. Use proper numerals for lists
- */
-/**
- * Adds proper small caps
- */
-/**
- * TODO: scmp, sc2c, pnum, case sensitive forms for postal codes
- */
-/* Forms
-========================================================================== */
-/**
- * 1. Turns on lining, proportional numerals without clarified zeroes
- * TODO: Additional input modes https://developer.mozilla.org/en/docs/Web/HTML/Element/Input#attr-inputmode
- */
-input[type="color"], input[type="date"], input[type="datetime"], input[type="datetime-local"], input[type="number"], input[type="range"], input[type="tel"], input[type="week"] {
- -webkit-font-feature-settings: "kern" 0, "liga" 1, "calt" 1, "pnum" 1, "tnum" 0, "onum" 0, "lnum" 1, "zero" 0;
- -moz-font-feature-settings: "kern" 0, "liga" 1, "calt" 1, "pnum" 1, "tnum" 0, "onum" 0, "lnum" 1, "zero" 0;
- font-feature-settings: "kern" 0, "liga" 1, "calt" 1, "pnum" 1, "tnum" 0, "onum" 0, "lnum" 1, "zero" 0;
- /* 1. */ }
+input[type="color"],
+input[type="date"],
+input[type="datetime"],
+input[type="datetime-local"],
+input[type="number"],
+input[type="range"],
+input[type="tel"],
+input[type="week"] {
+ -webkit-font-feature-settings: "kern"0, "liga"1, "calt"1, "pnum"1, "tnum"0, "onum"0, "lnum"1, "zero"0;
+ -moz-font-feature-settings: "kern"0, "liga"1, "calt"1, "pnum"1, "tnum"0, "onum"0, "lnum"1, "zero"0;
+ font-feature-settings: "kern"0, "liga"1, "calt"1, "pnum"1, "tnum"0, "onum"0, "lnum"1, "zero"0;
+}
-/* Localisation
-========================================================================== */
-/* Tables
-========================================================================== */
-/**
- * 1. Turns on tabular, lining numerals and slashed zero
- */
-tbody, caption {
- -webkit-font-feature-settings: "kern" 1, "liga" 1, "calt" 1, "pnum" 0, "tnum" 1, "onum" 0, "lnum" 1, "zero" 1;
- -moz-font-feature-settings: "kern" 1, "liga" 1, "calt" 1, "pnum" 0, "tnum" 1, "onum" 0, "lnum" 1, "zero" 1;
- font-feature-settings: "kern" 1, "liga" 1, "calt" 1, "pnum" 0, "tnum" 1, "onum" 0, "lnum" 1, "zero" 1;
- /* 1. */ }
\ No newline at end of file
+tbody,
+caption {
+ -webkit-font-feature-settings: "kern"1, "liga"1, "calt"1, "pnum"0, "tnum"1, "onum"0, "lnum"1, "zero"1;
+ -moz-font-feature-settings: "kern"1, "liga"1, "calt"1, "pnum"0, "tnum"1, "onum"0, "lnum"1, "zero"1;
+ font-feature-settings: "kern"1, "liga"1, "calt"1, "pnum"0, "tnum"1, "onum"0, "lnum"1, "zero"1;
+}
diff --git a/demo/source/stylesheet.css b/demo/source/stylesheet.css
index f8dbad5..121d6aa 100644
--- a/demo/source/stylesheet.css
+++ b/demo/source/stylesheet.css
@@ -5,7 +5,7 @@ html {
}
body {
- font-family: 'IBM Plex Sans', sans-serif;
+ font-family: "IBM Plex Sans", sans-serif;
line-height: 1.615;
display: flex;
margin: 0;
@@ -16,8 +16,7 @@ body {
-webkit-text-size-adjust: 100%;
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
-
- /* ! bug */
+
-ms-overflow-style: scrollbar;
flex-wrap: wrap;
}
@@ -33,48 +32,84 @@ pre {
}
code {
- font-family: 'IBM Plex Mono', monospace;
+ font-family: "IBM Plex Mono", monospace;
}
a {
color: blue;
}
-pre,
-.button {
+pre {
padding: 1em 1.4em;
}
.button {
display: inline-block;
- margin-top: 4rem;
- margin-bottom: 6rem;
text-decoration: none;
border: 1px solid;
border-radius: 2em;
+ height: 46px;
+ line-height: 44px;
+ font-size: 1rem;
+ padding: 0 1.2rem;
+ margin-top: 2rem;
+ margin-bottom: 1rem;
+}
+
+@media (min-width: 992px) {
+ .button {
+ margin-top: 4rem;
+ margin-bottom: 6rem;
+ padding: 0 1.2rem;
+ line-height: 54px;
+ height: 56px;
+ }
}
blockquote {
- font-family: 'IBM Plex Serif', serif;
- font-size: 1.15rem;
+ font-family: Georgia, Times, Times New Roman, serif;
+ font-size: 1rem;
font-weight: normal;
- line-height: 1.415;
+ line-height: 1.615;
padding: 1rem;
margin: 0;
border: 1px solid;
border-top: 0px solid;
width: 100%;
+ position: relative;
+}
+
+blockquote:before,
+blockquote:after {
+ content: "";
+ display: block;
+ width: 1rem;
+ height: calc(100% - 2rem);
+ background-color: rgba(0, 0, 255, 0.1);
+ position: absolute;
+ top: 1rem;
+ bottom: 0;
+ z-index: -1;
+}
+
+blockquote:before {
+ border-right: 1px solid blue;
+ left: 0;
+}
+blockquote:after {
+ border-left: 1px solid blue;
+ right: 0;
}
-blockquote p:last-child{
+blockquote p:last-child {
margin-bottom: 0;
}
-a[href^='#tab-'] {
+a[href^="#tab-"] {
display: inline-block;
margin-bottom: -1px;
padding: 0;
- padding: .5em 1.4em;
+ padding: 0.5em 1.4em;
text-decoration: underline;
color: blue;
border: 1px solid transparent;
@@ -90,7 +125,7 @@ a[href^='#tab-'] {
}
}
-a[href^='#tab-'][data-active='true'] {
+a[href^="#tab-"][data-active="true"] {
text-decoration: none;
color: inherit;
border: 1px solid;
@@ -125,7 +160,7 @@ h2 {
cursor: pointer;
text-decoration: none;
}
-.tabs a[data-active="false"]{
+.tabs a[data-active="false"] {
color: #999;
}
h1,
@@ -178,14 +213,14 @@ li {
}
ul ul {
- margin-bottom: .5rem;
+ margin-bottom: 0.5rem;
padding-top: 1rem;
}
h5 {
font-size: 13px;
font-weight: bold;
- margin: 1rem 0 .25rem;
+ margin: 1rem 0 0.25rem;
text-transform: uppercase;
color: grey;
}
@@ -287,4 +322,17 @@ pre {
.hljs-strong {
font-weight: bold;
-}
\ No newline at end of file
+}
+
+.d-none {
+ display: none;
+}
+
+@media (min-width: 992px) {
+ .d-md-none {
+ display: none;
+ }
+ .d-md-block {
+ display: block;
+ }
+}
diff --git a/demo/source/typeset.css b/demo/source/typeset.css
index e01ea49..77ad37f 100644
--- a/demo/source/typeset.css
+++ b/demo/source/typeset.css
@@ -1,5 +1,7 @@
/* Small caps */
-.small-caps {font-variant: small-caps;}
+.small-caps {
+ font-variant: small-caps;
+}
/* Double quote (") marks */
.pull-double {
@@ -62,4 +64,4 @@
.push-A {
margin-right: .03em;
-}
\ No newline at end of file
+}
diff --git a/package-lock.json b/package-lock.json
index 9f5c438..841c919 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4,6 +4,19 @@
"lockfileVersion": 1,
"requires": true,
"dependencies": {
+ "@npmcli/move-file": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.0.1.tgz",
+ "integrity": "sha512-Uv6h1sT+0DrblvIrolFtbvM1FgWm+/sy4B3pvLp67Zys+thcukzS5ekn7HsZFGpWP4Q3fYJCljbWQE/XivMRLw==",
+ "requires": {
+ "mkdirp": "^1.0.4"
+ }
+ },
+ "@types/json-schema": {
+ "version": "7.0.5",
+ "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.5.tgz",
+ "integrity": "sha512-7+2BITlgjgDhH0vvwZU/HZJVyk+2XUlvxXe8dFMedNX/aMkaOq++rMAFXc0tM7ij15QaWlbdQASBR9dihi+bDQ=="
+ },
"@webassemblyjs/ast": {
"version": "1.9.0",
"resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.0.tgz",
@@ -608,10 +621,11 @@
"integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug="
},
"cacache": {
- "version": "15.0.3",
- "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.0.3.tgz",
- "integrity": "sha512-bc3jKYjqv7k4pWh7I/ixIjfcjPul4V4jme/WbjvwGS5LzoPL/GzXr4C5EgPNLO/QEZl9Oi61iGitYEdwcrwLCQ==",
+ "version": "15.0.4",
+ "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.0.4.tgz",
+ "integrity": "sha512-YlnKQqTbD/6iyoJvEY3KJftjrdBYroCbxxYXzhOzsFLWlp6KX4BOlEf4mTx0cMUfVaTS3ENL2QtDWeRYoGLkkw==",
"requires": {
+ "@npmcli/move-file": "^1.0.1",
"chownr": "^2.0.0",
"fs-minipass": "^2.0.0",
"glob": "^7.1.4",
@@ -622,7 +636,6 @@
"minipass-flush": "^1.0.5",
"minipass-pipeline": "^1.2.2",
"mkdirp": "^1.0.3",
- "move-file": "^2.0.0",
"p-map": "^4.0.0",
"promise-inflight": "^1.0.1",
"rimraf": "^3.0.2",
@@ -1446,20 +1459,6 @@
"safe-buffer": "^5.1.1"
}
},
- "execa": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
- "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
- "requires": {
- "cross-spawn": "^6.0.0",
- "get-stream": "^4.0.0",
- "is-stream": "^1.1.0",
- "npm-run-path": "^2.0.0",
- "p-finally": "^1.0.0",
- "signal-exit": "^3.0.0",
- "strip-eof": "^1.0.0"
- }
- },
"exit": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
@@ -1807,14 +1806,6 @@
"resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz",
"integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE="
},
- "get-stream": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
- "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
- "requires": {
- "pump": "^3.0.0"
- }
- },
"get-value": {
"version": "2.0.6",
"resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
@@ -2146,14 +2137,9 @@
"integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="
},
"interpret": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.2.0.tgz",
- "integrity": "sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw=="
- },
- "invert-kv": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz",
- "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA=="
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz",
+ "integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA=="
},
"is-accessor-descriptor": {
"version": "0.1.6",
@@ -2288,11 +2274,6 @@
"has": "^1.0.3"
}
},
- "is-stream": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
- "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
- },
"is-symbol": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
@@ -2327,9 +2308,9 @@
"integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
},
"jest-worker": {
- "version": "26.0.0",
- "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.0.0.tgz",
- "integrity": "sha512-pPaYa2+JnwmiZjK9x7p9BoZht+47ecFCDFA/CJxspHzeDvQcfVBLWzCiWyo+EGrSiQMWZtCFo9iSvMZnAAo8vw==",
+ "version": "26.1.0",
+ "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.1.0.tgz",
+ "integrity": "sha512-Z9P5pZ6UC+kakMbNJn+tA2RdVdNX5WH1x+5UCBZ9MxIK24pjYtFt96fK+UwBTrjLYm232g1xz0L3eTh51OW+yQ==",
"requires": {
"merge-stream": "^2.0.0",
"supports-color": "^7.0.0"
@@ -2360,9 +2341,9 @@
}
},
"jshint": {
- "version": "2.11.0",
- "resolved": "https://registry.npmjs.org/jshint/-/jshint-2.11.0.tgz",
- "integrity": "sha512-ooaD/hrBPhu35xXW4gn+o3SOuzht73gdBuffgJzrZBJZPGgGiiTvJEgTyxFvBO2nz0+X1G6etF8SzUODTlLY6Q==",
+ "version": "2.11.1",
+ "resolved": "https://registry.npmjs.org/jshint/-/jshint-2.11.1.tgz",
+ "integrity": "sha512-WXWePB8ssAH3DlD05IoqolsY6arhbll/1+i2JkRPpihQAuiNaR/gSt8VKIcxpV5m6XChP0hCwESQUqpuQMA8Tg==",
"requires": {
"cli": "~1.0.0",
"console-browserify": "1.1.x",
@@ -2436,14 +2417,6 @@
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
"integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
},
- "lcid": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
- "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
- "requires": {
- "invert-kv": "^2.0.0"
- }
- },
"loader-runner": {
"version": "2.4.0",
"resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz",
@@ -2576,14 +2549,6 @@
}
}
},
- "map-age-cleaner": {
- "version": "0.1.3",
- "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
- "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==",
- "requires": {
- "p-defer": "^1.0.0"
- }
- },
"map-cache": {
"version": "0.2.2",
"resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
@@ -2607,16 +2572,6 @@
"safe-buffer": "^5.1.2"
}
},
- "mem": {
- "version": "4.3.0",
- "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz",
- "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==",
- "requires": {
- "map-age-cleaner": "^0.1.1",
- "mimic-fn": "^2.0.0",
- "p-is-promise": "^2.0.0"
- }
- },
"memory-fs": {
"version": "0.4.1",
"resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
@@ -2696,11 +2651,6 @@
}
}
},
- "mimic-fn": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
- "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="
- },
"minimalistic-assert": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
@@ -2725,9 +2675,9 @@
"integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
},
"minipass": {
- "version": "3.1.1",
- "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.1.tgz",
- "integrity": "sha512-UFqVihv6PQgwj8/yTGvl9kPz7xIAY+R5z6XYjRInD3Gk3qx6QGSD6zEcpeG4Dy/lQnv1J6zv8ejV90hyYIKf3w==",
+ "version": "3.1.3",
+ "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.3.tgz",
+ "integrity": "sha512-Mgd2GdMVzY+x3IJ+oHnVM+KG3lA5c8tnabyJKmHSaG2kAGpudxuOf8ToDkhumF7UzME7DecbQE9uOZhNm7PuJg==",
"requires": {
"yallist": "^4.0.0"
}
@@ -2749,9 +2699,9 @@
}
},
"minipass-pipeline": {
- "version": "1.2.2",
- "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.2.tgz",
- "integrity": "sha512-3JS5A2DKhD2g0Gg8x3yamO0pj7YeKGwVlDS90pF++kxptwx/F+B//roxf9SqYil5tQo65bijy+dAuAFZmYOouA==",
+ "version": "1.2.3",
+ "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.3.tgz",
+ "integrity": "sha512-cFOknTvng5vqnwOpDsZTWhNll6Jf8o2x+/diplafmxpuIymAjzoOolZG0VvQf3V2HgqzJNhnuKHYp2BqDgz8IQ==",
"requires": {
"minipass": "^3.0.0"
}
@@ -2988,21 +2938,6 @@
}
}
},
- "move-file": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/move-file/-/move-file-2.0.0.tgz",
- "integrity": "sha512-cdkdhNCgbP5dvS4tlGxZbD+nloio9GIimP57EjqFhwLcMjnU+XJKAZzlmg/TN/AK1LuNAdTSvm3CPPP4Xkv0iQ==",
- "requires": {
- "path-exists": "^4.0.0"
- },
- "dependencies": {
- "path-exists": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
- "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w=="
- }
- }
- },
"ms": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
@@ -3145,14 +3080,6 @@
"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
"integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="
},
- "npm-run-path": {
- "version": "2.0.2",
- "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
- "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
- "requires": {
- "path-key": "^2.0.0"
- }
- },
"nth-check": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
@@ -3253,31 +3180,6 @@
"resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
"integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc="
},
- "os-locale": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz",
- "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
- "requires": {
- "execa": "^1.0.0",
- "lcid": "^2.0.0",
- "mem": "^4.0.0"
- }
- },
- "p-defer": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
- "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww="
- },
- "p-finally": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
- "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4="
- },
- "p-is-promise": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz",
- "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg=="
- },
"p-limit": {
"version": "2.2.1",
"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz",
@@ -3753,11 +3655,12 @@
}
},
"schema-utils": {
- "version": "2.6.6",
- "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.6.6.tgz",
- "integrity": "sha512-wHutF/WPSbIi9x6ctjGGk2Hvl0VOz5l3EKEuKbjPlB30mKZUzb9A5k9yEXRX3pwyqVLPvpfZZEllaFq/M718hA==",
+ "version": "2.7.0",
+ "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.0.tgz",
+ "integrity": "sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==",
"requires": {
- "ajv": "^6.12.0",
+ "@types/json-schema": "^7.0.4",
+ "ajv": "^6.12.2",
"ajv-keywords": "^3.4.1"
}
},
@@ -3767,9 +3670,12 @@
"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
},
"serialize-javascript": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-3.0.0.tgz",
- "integrity": "sha512-skZcHYw2vEX4bw90nAr2iTTsz6x2SrHEnfxgKYmZlvJYBEZrvbKtobJWlQ20zczKb3bsHHXXTYt48zBA7ni9cw=="
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz",
+ "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==",
+ "requires": {
+ "randombytes": "^2.1.0"
+ }
},
"set-blocking": {
"version": "2.0.0",
@@ -3829,11 +3735,6 @@
"resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz",
"integrity": "sha1-NZbmMHp4FUT1kfN9phg2DzHbV7E="
},
- "signal-exit": {
- "version": "3.0.2",
- "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
- "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
- },
"snapdragon": {
"version": "0.8.2",
"resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
@@ -4165,11 +4066,6 @@
"ansi-regex": "^3.0.0"
}
},
- "strip-eof": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
- "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8="
- },
"strip-json-comments": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
@@ -4219,28 +4115,43 @@
}
},
"terser-webpack-plugin": {
- "version": "3.0.1",
- "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-3.0.1.tgz",
- "integrity": "sha512-eFDtq8qPUEa9hXcUzTwKXTnugIVtlqc1Z/ZVhG8LmRT3lgRY13+pQTnFLY2N7ATB6TKCHuW/IGjoAnZz9wOIqw==",
+ "version": "3.0.6",
+ "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-3.0.6.tgz",
+ "integrity": "sha512-z3HLOOPUHkCNGkeEHqqiMAIy1pjpHwS1o+i6Zn0Ws3EAvHJj46737efNNEvJ0Vx9BdDQM83d56qySDJOSORA0A==",
"requires": {
- "cacache": "^15.0.3",
+ "cacache": "^15.0.4",
"find-cache-dir": "^3.3.1",
"jest-worker": "^26.0.0",
- "p-limit": "^2.3.0",
+ "p-limit": "^3.0.1",
"schema-utils": "^2.6.6",
- "serialize-javascript": "^3.0.0",
+ "serialize-javascript": "^4.0.0",
"source-map": "^0.6.1",
- "terser": "^4.6.13",
+ "terser": "^4.8.0",
"webpack-sources": "^1.4.3"
},
"dependencies": {
+ "commander": {
+ "version": "2.20.3",
+ "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+ "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
+ },
"p-limit": {
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
- "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.0.1.tgz",
+ "integrity": "sha512-mw/p92EyOzl2MhauKodw54Rx5ZK4624rNfgNaBguFZkHzyUG9WsDzFF5/yQVEJinbJDdP4jEfMN+uBquiGnaLg==",
"requires": {
"p-try": "^2.0.0"
}
+ },
+ "terser": {
+ "version": "4.8.0",
+ "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz",
+ "integrity": "sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==",
+ "requires": {
+ "commander": "^2.20.0",
+ "source-map": "~0.6.1",
+ "source-map-support": "~0.5.12"
+ }
}
}
},
@@ -4502,9 +4413,9 @@
"integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
},
"v8-compile-cache": {
- "version": "2.0.3",
- "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.0.3.tgz",
- "integrity": "sha512-CNmdbwQMBjwr9Gsmohvm0pbL954tJrNzf6gWL3K+QMQf00PF7ERGrEiLgjuU3mKreLC2MeGhUsNV9ybTbLgd3w=="
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz",
+ "integrity": "sha512-8OQ9CL+VWyt3JStj7HX7/ciTL2V3Rl1Wf5OL+SNTm0yK1KvtReVulksyeRnCANHHuUxHlQig+JJDlUhBt1NQDQ=="
},
"vm-browserify": {
"version": "1.1.2",
@@ -4676,71 +4587,23 @@
}
},
"webpack-cli": {
- "version": "3.3.11",
- "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.11.tgz",
- "integrity": "sha512-dXlfuml7xvAFwYUPsrtQAA9e4DOe58gnzSxhgrO/ZM/gyXTBowrsYeubyN4mqGhYdpXMFNyQ6emjJS9M7OBd4g==",
- "requires": {
- "chalk": "2.4.2",
- "cross-spawn": "6.0.5",
- "enhanced-resolve": "4.1.0",
- "findup-sync": "3.0.0",
- "global-modules": "2.0.0",
- "import-local": "2.0.0",
- "interpret": "1.2.0",
- "loader-utils": "1.2.3",
- "supports-color": "6.1.0",
- "v8-compile-cache": "2.0.3",
- "yargs": "13.2.4"
+ "version": "3.3.12",
+ "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.12.tgz",
+ "integrity": "sha512-NVWBaz9k839ZH/sinurM+HcDvJOTXwSjYp1ku+5XKeOC03z8v5QitnK/x+lAxGXFyhdayoIf/GOpv85z3/xPag==",
+ "requires": {
+ "chalk": "^2.4.2",
+ "cross-spawn": "^6.0.5",
+ "enhanced-resolve": "^4.1.1",
+ "findup-sync": "^3.0.0",
+ "global-modules": "^2.0.0",
+ "import-local": "^2.0.0",
+ "interpret": "^1.4.0",
+ "loader-utils": "^1.4.0",
+ "supports-color": "^6.1.0",
+ "v8-compile-cache": "^2.1.1",
+ "yargs": "^13.3.2"
},
"dependencies": {
- "ansi-regex": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
- "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg=="
- },
- "emojis-list": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
- "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k="
- },
- "enhanced-resolve": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz",
- "integrity": "sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==",
- "requires": {
- "graceful-fs": "^4.1.2",
- "memory-fs": "^0.4.0",
- "tapable": "^1.0.0"
- }
- },
- "loader-utils": {
- "version": "1.2.3",
- "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz",
- "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==",
- "requires": {
- "big.js": "^5.2.2",
- "emojis-list": "^2.0.0",
- "json5": "^1.0.1"
- }
- },
- "string-width": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
- "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
- "requires": {
- "emoji-regex": "^7.0.1",
- "is-fullwidth-code-point": "^2.0.0",
- "strip-ansi": "^5.1.0"
- }
- },
- "strip-ansi": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
- "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
- "requires": {
- "ansi-regex": "^4.1.0"
- }
- },
"supports-color": {
"version": "6.1.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
@@ -4748,24 +4611,6 @@
"requires": {
"has-flag": "^3.0.0"
}
- },
- "yargs": {
- "version": "13.2.4",
- "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.2.4.tgz",
- "integrity": "sha512-HG/DWAJa1PAnHT9JAhNa8AbAv3FPaiLzioSjCcmuXXhP8MlpHO5vwls4g4j6n30Z74GVQj8Xa62dWVx1QCGklg==",
- "requires": {
- "cliui": "^5.0.0",
- "find-up": "^3.0.0",
- "get-caller-file": "^2.0.1",
- "os-locale": "^3.1.0",
- "require-directory": "^2.1.1",
- "require-main-filename": "^2.0.0",
- "set-blocking": "^2.0.0",
- "string-width": "^3.0.0",
- "which-module": "^2.0.0",
- "y18n": "^4.0.0",
- "yargs-parser": "^13.1.0"
- }
}
}
},
@@ -4913,15 +4758,6 @@
}
}
},
- "yargs-parser": {
- "version": "13.1.1",
- "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz",
- "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==",
- "requires": {
- "camelcase": "^5.0.0",
- "decamelize": "^1.2.0"
- }
- },
"yargs-unparser": {
"version": "1.6.0",
"resolved": "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-1.6.0.tgz",
diff --git a/package.json b/package.json
index c72ca3d..c5387fb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "typeset",
- "version": "0.2.9",
+ "version": "0.3.0",
"description": "Typesetting for the web",
"keywords": [
"typeset",
@@ -20,11 +20,9 @@
},
"license": "MIT",
"author": "David Merfield",
- "contributors": {
- "name": "Daniel Haim",
- "email": "danielhaim1@mac.com",
- "url": "https://danielhaim.com"
- },
+ "contributors": [
+ "Daniel Haim (https://danielhaim.com)"
+ ],
"main": "src/index.js",
"bin": {
"typeset-js": "src/cmd.js"
@@ -45,11 +43,11 @@
"hypher": "^0.2.5",
"cheerio": "^0.22.0",
"chai": "^4.2.0",
- "jshint": "^2.11.0",
+ "jshint": "^2.11.1",
"mocha": "^7.1.2",
- "terser-webpack-plugin": "^3.0.1",
+ "terser-webpack-plugin": "^3.0.6",
"webpack": "^4.43.0",
- "webpack-cli": "^3.3.11",
+ "webpack-cli": "^3.3.12",
"minimist": ">=1.2.2"
}
}
diff --git a/src/cmd.js b/src/cmd.js
index 471a6d8..f479426 100755
--- a/src/cmd.js
+++ b/src/cmd.js
@@ -6,10 +6,13 @@ const typeset = require("./index.js");
// Convert comma-separated string into an array of strings
function list(val) {
- return val.split(",").map(s => s.trim());
+ return val.split(",").map((s) => s.trim());
}
-// CLI
+// ################################
+// Command Line Interface (CLI)
+// ################################
+
program
.version(require("../package.json").version)
.usage("[options] [ []]")
@@ -34,7 +37,7 @@ const outputFile = program.args[1] || null;
const options = {
ignore: program.ignore || "",
only: program.only || "",
- disable: program.disable || []
+ disable: program.disable || [],
};
if (inputFile) {
@@ -44,12 +47,12 @@ if (inputFile) {
const outputHTML = typeset(data, options);
if (outputFile) {
- fs.writeFile(outputFile, outputHTML, err => {
+ fs.writeFile(outputFile, outputHTML, (err) => {
if (err) throw err;
process.exit(0);
});
} else {
- // print output to stdout by default
+ // Print output to stdout by default
console.log(outputHTML);
process.exit(0);
}
@@ -60,10 +63,10 @@ process.stdin.resume();
process.stdin.setEncoding("utf8");
// Process input from stdin
-process.stdin.on("data", data => {
+process.stdin.on("data", (data) => {
process.stdout.write(typeset(data, options));
});
-process.stdin.on("end", data => {
+process.stdin.on("end", (data) => {
process.exit(0);
});
diff --git a/src/eachTextNode.js b/src/eachTextNode.js
index 1e85a2d..b43b611 100644
--- a/src/eachTextNode.js
+++ b/src/eachTextNode.js
@@ -4,11 +4,8 @@ let escape;
if (typeof ENV !== "undefined" && ENV.browser) {
jquery = require("jquery");
- escape = text =>
- text
- .replace(/&/g, "&")
- .replace(//g, ">");
+ escape = (text) =>
+ text.replace(/&/g, "&").replace(//g, ">");
} else {
cheerio = require("cheerio");
}
@@ -29,10 +26,10 @@ module.exports = (html, doThis, options) => {
const $ =
jquery ||
cheerio.load(html, {
- decodeEntities: false
+ decodeEntities: false,
});
- const processedText = $(only).each(function() {
+ const processedText = $(only).each(function () {
findTextNodes(this);
});
@@ -41,7 +38,7 @@ module.exports = (html, doThis, options) => {
$(node)
.contents()
- .each(function() {
+ .each(function () {
const childNode = this;
if (childNode.nodeType === 3) {
diff --git a/src/hangingPunctuation.js b/src/hangingPunctuation.js
index 4b3582b..a455053 100644
--- a/src/hangingPunctuation.js
+++ b/src/hangingPunctuation.js
@@ -6,7 +6,6 @@ function push(className, content) {
return '' + (content || "") + "";
}
-
const doubleWidth = [
""",
'"',
@@ -23,18 +22,10 @@ const doubleWidth = [
"”",
"„",
"„",
- "„"
+ "„",
];
-const singleWidth = [
- "'",
- "′",
- "'",
- "‘",
- "’",
- "‘",
- "’"
-];
+const singleWidth = ["'", "′", "'", "‘", "’", "‘", "’"];
const diacriticMap = {
A: /[\u0041\u24B6\uFF21\u00C0\u00C1\u00C2\u1EA6\u1EA4\u1EAA\u1EA8\u00C3\u0100\u0102\u1EB0\u1EAE\u1EB4\u1EB2\u0226\u01E0\u00C4\u01DE\u1EA2\u00C5\u01FA\u01CD\u0200\u0202\u1EA0\u1EAC\u1EB6\u1E00\u0104\u023A\u2C6F]/g,
@@ -47,7 +38,7 @@ const diacriticMap = {
c: /[\u0063\u24D2\uFF43\u0107\u0109\u010B\u010D\u00E7\u1E09\u0188\u023C\uA73F\u2184]/g,
o: /[\u006F\u24DE\uFF4F\u00F2\u00F3\u00F4\u1ED3\u1ED1\u1ED7\u1ED5\u00F5\u1E4D\u022D\u1E4F\u014D\u1E51\u1E53\u014F\u022F\u0231\u00F6\u022B\u1ECF\u0151\u01D2\u020D\u020F\u01A1\u1EDD\u1EDB\u1EE1\u1EDF\u1EE3\u1ECD\u1ED9\u01EB\u01ED\u00F8\u01FF\u0254\uA74B\uA74D\u0275]/g,
v: /[\u0076\u24E5\uFF56\u1E7D\u1E7F\u028B\uA75F\u028C]/g,
- w: /[\u0077\u24E6\uFF57\u1E81\u1E83\u0175\u1E87\u1E85\u1E98\u1E89\u2C73]/g
+ w: /[\u0077\u24E6\uFF57\u1E81\u1E83\u0175\u1E87\u1E85\u1E98\u1E89\u2C73]/g,
};
const alignMe = "CcOoYTAVvWw".split("");
@@ -57,13 +48,9 @@ module.exports = (text, node, $) => {
// Remove consecutive double spaces then create
// array of distinct words.
- const words = text
- .split(" ")
- .join(" ")
- .split(" ");
+ const words = text.split(" ").join(" ").split(" ");
for (const i in words) {
-
// This is the code to do
// optical margin alignment.
// It's disabled for now due to accessibility issues.
diff --git a/src/hyphenate.js b/src/hyphenate.js
index 329c388..15ae8d6 100644
--- a/src/hyphenate.js
+++ b/src/hyphenate.js
@@ -4,7 +4,7 @@ const Hypher = require("hypher");
const english = require("./hypher-patterns/en-us");
const h = new Hypher(english);
-module.exports = text => {
+module.exports = (text) => {
const words = text.split(" ");
for (const i in words) {
diff --git a/src/index.js b/src/index.js
index cfd6322..bb6ce2a 100644
--- a/src/index.js
+++ b/src/index.js
@@ -5,7 +5,7 @@ const modules = {
smallCaps: require("./smallCaps"),
punctuation: require("./punctuation"),
hangingPunctuation: require("./hangingPunctuation"),
- spaces: require("./spaces")
+ spaces: require("./spaces"),
};
const eachTextNode = require("./eachTextNode");
diff --git a/src/ligatures.js b/src/ligatures.js
index 4554aea..b439751 100644
--- a/src/ligatures.js
+++ b/src/ligatures.js
@@ -1,4 +1,4 @@
-module.exports = text => {
+module.exports = (text) => {
text = text.replace(/fi/g, "fi");
text = text.replace(/fl/g, "fl");
diff --git a/src/punctuation.js b/src/punctuation.js
index 3e67f0c..fc290d7 100644
--- a/src/punctuation.js
+++ b/src/punctuation.js
@@ -1,4 +1,4 @@
-module.exports = text => {
+module.exports = (text) => {
// Dashes
text = text.replace(/--/g, "–");
text = text.replace(/ – /g, " — ");
diff --git a/src/quotes.js b/src/quotes.js
index cc94b9c..a87fc58 100644
--- a/src/quotes.js
+++ b/src/quotes.js
@@ -6,24 +6,16 @@ module.exports = (text, node, $) => {
// this only works if replace does not modify the length
// of the string it is passed. therefore the
if (
- $(node)
- .parent()
- .is("p, blockquote") &&
- $(node)
- .parent()
- .text() !== text
+ $(node).parent().is("p, blockquote") &&
+ $(node).parent().text() !== text
) {
- const parentText = replace(
- $(node)
- .parent()
- .text()
- );
+ const parentText = replace($(node).parent().text());
let start = 0;
$(node)
.parent()
.contents()
- .each(function() {
+ .each(function () {
if (this === node) return false;
start += $(this).text().length;
diff --git a/src/smallCaps.js b/src/smallCaps.js
index a417a2f..5c9375c 100644
--- a/src/smallCaps.js
+++ b/src/smallCaps.js
@@ -62,7 +62,7 @@ function removeCruft(word) {
return [leading, word, trailing];
}
-module.exports = text => {
+module.exports = (text) => {
const wordList = text.split(" ");
for (const i in wordList) {
diff --git a/src/spaces.js b/src/spaces.js
index 5c79734..733a5c3 100644
--- a/src/spaces.js
+++ b/src/spaces.js
@@ -1,5 +1,5 @@
-module.exports = text => {
- // replaces wide spaces with hair spaces
+module.exports = (text) => {
+ // Replaces wide spaces with hair spaces
text = text.replace(/ × /g, " × ");
text = text.replace(/ \/ /g, " / ");
diff --git a/test/.prettierrc b/test/.prettierrc
new file mode 100644
index 0000000..61348f1
--- /dev/null
+++ b/test/.prettierrc
@@ -0,0 +1,16 @@
+{
+ "trailingComma": "es6",
+ "tabWidth": 2,
+ "useTabs": false,
+ "singleQuote": false,
+ "printWidth": 80,
+ "bracketSpacing": true,
+ "overrides": [
+ {
+ "files": "*.js*",
+ "options": {
+ "prettier.printWidth": 80
+ }
+ }
+ ]
+}
diff --git a/test/hangingPunctuationSpec.js b/test/hangingPunctuationSpec.js
index a553d93..9515c8d 100644
--- a/test/hangingPunctuationSpec.js
+++ b/test/hangingPunctuationSpec.js
@@ -5,7 +5,7 @@ const expect = require("chai").expect;
function hang(html) {
return typeset(html, {
- enable: ["hangingPunctuation"]
+ enable: ["hangingPunctuation"],
});
}
diff --git a/test/ligaturesSpec.js b/test/ligaturesSpec.js
index 3a85b5a..aa6bd1d 100644
--- a/test/ligaturesSpec.js
+++ b/test/ligaturesSpec.js
@@ -5,7 +5,7 @@ const expect = require("chai").expect;
function lig(html) {
return typeset(html, {
- enable: ["ligatures"]
+ enable: ["ligatures"],
});
}
diff --git a/test/punctuationSpec.js b/test/punctuationSpec.js
index cddf596..8679dfb 100644
--- a/test/punctuationSpec.js
+++ b/test/punctuationSpec.js
@@ -5,7 +5,7 @@ const expect = require("chai").expect;
function punc(html) {
return typeset(html, {
- enable: ["punctuation"]
+ enable: ["punctuation"],
});
}
diff --git a/test/quotesSpec.js b/test/quotesSpec.js
index 3a30858..4c39ae2 100644
--- a/test/quotesSpec.js
+++ b/test/quotesSpec.js
@@ -5,7 +5,7 @@ const expect = require("chai").expect;
function quotes(html) {
return typeset(html, {
- enable: ["quotes"]
+ enable: ["quotes"],
});
}
@@ -33,23 +33,17 @@ describe("Quotes", () => {
it("should work with encoded single quotes", () => {
const html = "I don't nee'd to d'o.
";
- expect(quotes(html)).to.equal(
- "I don’t nee’d to d’o.
"
- );
+ expect(quotes(html)).to.equal("I don’t nee’d to d’o.
");
});
it("should work with encoded double quotes", () => {
const html =
""I don't "need" to "do" that."
";
- expect(quotes(html)).to.equal(
- "“I don’t “need” to “do” that.”
"
- );
+ expect(quotes(html)).to.equal("“I don’t “need” to “do” that.”
");
});
it("multiple differents kinds quotations marks", () => {
const html = '"She\'s faster than a 120\' 4" whale."
';
- expect(quotes(html)).to.equal(
- "“She’s faster than a 120′ 4″ whale.”
"
- );
+ expect(quotes(html)).to.equal("“She’s faster than a 120′ 4″ whale.”
");
});
});
diff --git a/test/spacesSpec.js b/test/spacesSpec.js
index 841a60f..e7cf861 100644
--- a/test/spacesSpec.js
+++ b/test/spacesSpec.js
@@ -5,7 +5,7 @@ const expect = require("chai").expect;
function spaces(html) {
return typeset(html, {
- enable: ["spaces"]
+ enable: ["spaces"],
});
}
diff --git a/webpack.config.js b/webpack.config.js
index 89649b4..14c714b 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -1,43 +1,45 @@
-const webpack = require('webpack');
-const pkg = require('./package.json');
+const webpack = require("webpack");
+const pkg = require("./package.json");
const PROD = process.env.PROD;
-const TerserPlugin = require('terser-webpack-plugin');
+const TerserPlugin = require("terser-webpack-plugin");
const banner = [
- pkg.name + ' - ' + pkg.description,
- '@version v' + pkg.version,
- '@link ' + pkg.homepage,
- '@author ' + pkg.author,
- '@license ' + pkg.license
-].join('\n');
+ pkg.name + " - " + pkg.description,
+ "@version v" + pkg.version,
+ "@link " + pkg.homepage,
+ "@author " + pkg.author,
+ "@contributors " + pkg.contributors,
+ "@license " + pkg.license,
+].join("\n");
module.exports = {
- mode: 'production',
+ mode: "production",
- entry: __dirname + '/src/index.js',
- devtool: 'source-map',
+ entry: __dirname + "/src/index.js",
+ devtool: "source-map",
output: {
library: pkg.name,
- path: __dirname + '/build',
- filename: PROD ? "typeset.min.js" : 'typeset.js'
+ path: __dirname + "/build",
+ filename: PROD ? "typeset.min.js" : "typeset.js",
},
optimization: {
minimizer: [new TerserPlugin()],
},
- externals: {
- cheerio: 'jQuery', // TODO I think there should be another way to avoid require cheerio
- jquery: 'jQuery'
- },
+ externals: {
+ cheerio: "jQuery", // TODO I think there should be another way to avoid require cheerio
+ jquery: "jQuery",
+ },
- plugins: [
+ plugins: [
new webpack.BannerPlugin(banner),
new webpack.DefinePlugin({
- 'ENV': {
- browser: true
- }
- })],
+ ENV: {
+ browser: true,
+ },
+ }),
+ ],
};