From 1b48a003ef2395f6c5b96708cb7dad7f22302685 Mon Sep 17 00:00:00 2001 From: Kevin Gibbons Date: Sat, 20 Feb 2021 17:08:03 -0800 Subject: [PATCH 1/6] move json out of main html --- .eslintrc.json | 2 ++ js/menu.js | 6 +++--- js/sdoMap.js | 14 ++++---------- src/Menu.ts | 8 +++----- src/Spec.ts | 30 +++++++++++++----------------- 5 files changed, 25 insertions(+), 35 deletions(-) diff --git a/.eslintrc.json b/.eslintrc.json index a659df68..2f20fc8d 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -37,6 +37,8 @@ "@typescript-eslint/no-unused-vars": "off" }, "globals": { + "sdoMap": "readonly", + "biblio": "readonly", "debounce": "writable", "referencePane": "writable", "sdoBox": "writable", diff --git a/js/menu.js b/js/menu.js index 3ed76d9f..d973a1c3 100644 --- a/js/menu.js +++ b/js/menu.js @@ -25,11 +25,11 @@ function Search(menu) { } Search.prototype.loadBiblio = function () { - let $biblio = document.getElementById('menu-search-biblio'); - if (!$biblio) { + if (typeof biblio === 'undefined') { + console.error('could not find biblio'); this.biblio = []; } else { - this.biblio = JSON.parse($biblio.textContent); + this.biblio = biblio; this.biblio.clauses = this.biblio.filter(e => e.type === 'clause'); this.biblio.byId = this.biblio.reduce((map, entry) => { map[entry.id] = entry; diff --git a/js/sdoMap.js b/js/sdoMap.js index b45d5135..e9464cc3 100644 --- a/js/sdoMap.js +++ b/js/sdoMap.js @@ -41,6 +41,10 @@ let sdoBox = { }; document.addEventListener('DOMContentLoaded', () => { + if (typeof sdoMap == 'undefined') { + console.error('could not find sdo map'); + return; + } sdoBox.init(); let insideTooltip = false; @@ -76,13 +80,3 @@ document.addEventListener('DOMContentLoaded', () => { }) ); }); - -let sdoMap = {}; -document.addEventListener('DOMContentLoaded', () => { - let sdoMapContainer = document.getElementById('sdo-map'); - if (sdoMapContainer == null) { - console.error('could not find SDO map container'); - } else { - sdoMap = JSON.parse(sdoMapContainer.textContent); - } -}); diff --git a/src/Menu.ts b/src/Menu.ts index a2e25ce3..0fd96199 100644 --- a/src/Menu.ts +++ b/src/Menu.ts @@ -55,12 +55,10 @@ export default class Menu { this.spec.doc.body.insertBefore(menuToggle, this.spec.doc.body.firstChild); - const biblioContainer = this.spec.doc.createElement('script'); - biblioContainer.setAttribute('type', 'application/json'); - biblioContainer.id = 'menu-search-biblio'; - biblioContainer.textContent = JSON.stringify(this.spec.biblio, (k, v) => + const json = JSON.stringify(this.spec.biblio, (k, v) => ['title', 'namespace', 'location'].includes(k) ? undefined : v ); - this.spec.doc.head.appendChild(biblioContainer); + + return `let biblio = JSON.parse(\`${json.replace(/[\\`$]/g, '\\$&')}\`);`; } } diff --git a/src/Spec.ts b/src/Spec.ts index 92a90eec..f603dc4c 100644 --- a/src/Spec.ts +++ b/src/Spec.ts @@ -423,7 +423,7 @@ export default class Spec { await walk(walker, context); - this.generateSDOMap(); + const sdoJs = this.generateSDOMap(); this.setReplacementAlgorithmOffsets(); @@ -458,20 +458,18 @@ export default class Spec { this.setCharset(); this.buildSpecWrapper(); + let tocJs = ''; if (this.opts.toc) { this.log('Building table of contents...'); - let toc: Toc | Menu; if (this.opts.oldToc) { - toc = new Toc(this); + new Toc(this).build(); } else { - toc = new Menu(this); + tocJs = new Menu(this).build(); } - - toc.build(); } - await this.buildAssets(); + await this.buildAssets(sdoJs, tocJs); return this; } @@ -556,8 +554,8 @@ export default class Spec { }); } - private async buildAssets() { - const jsContents = await concatJs(); + private async buildAssets(...extras: string[]) { + const jsContents = await concatJs(...extras); const cssContents = await utils.readFile(path.join(__dirname, '../css/elements.css')); if (this.opts.jsOut) { @@ -1050,11 +1048,8 @@ export default class Spec { } } - let sdoMapContainer = this.doc.createElement('script'); - sdoMapContainer.setAttribute('type', 'application/json'); - sdoMapContainer.id = 'sdo-map'; - sdoMapContainer.textContent = JSON.stringify(sdoMap); - this.doc.head.appendChild(sdoMapContainer); + const json = JSON.stringify(sdoMap); + return `let sdoMap = JSON.parse(\`${json.replace(/[\\`$]/g, '\\$&')}\`);`; } private setReplacementAlgorithmOffsets() { @@ -1314,11 +1309,12 @@ async function walk(walker: TreeWalker, context: Context) { } const jsDependencies = ['sdoMap.js', 'menu.js', 'listNumbers.js']; -async function concatJs() { - const dependencies = await Promise.all( +async function concatJs(...extras: string[]) { + let dependencies = await Promise.all( jsDependencies.map(dependency => utils.readFile(path.join(__dirname, '../js/' + dependency))) ); - return dependencies.reduce((js, dependency) => js + dependency, ''); + dependencies = dependencies.concat(extras); + return dependencies.reduce((js, dependency) => js + '\n' + dependency, ''); } // todo move this to utils maybe From e8db521061636d5b67bb70e15b8bb218ec1e1148 Mon Sep 17 00:00:00 2001 From: Kevin Gibbons Date: Sat, 20 Feb 2021 17:08:56 -0800 Subject: [PATCH 2/6] rebuild spec --- docs/ecmarkup.js | 24 ++++++++++++------------ docs/index.html | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/docs/ecmarkup.js b/docs/ecmarkup.js index 741b52c8..7332e24b 100644 --- a/docs/ecmarkup.js +++ b/docs/ecmarkup.js @@ -1,3 +1,4 @@ + 'use strict'; let sdoBox = { init() { @@ -41,6 +42,10 @@ let sdoBox = { }; document.addEventListener('DOMContentLoaded', () => { + if (typeof sdoMap == 'undefined') { + console.error('could not find sdo map'); + return; + } sdoBox.init(); let insideTooltip = false; @@ -77,15 +82,6 @@ document.addEventListener('DOMContentLoaded', () => { ); }); -let sdoMap = {}; -document.addEventListener('DOMContentLoaded', () => { - let sdoMapContainer = document.getElementById('sdo-map'); - if (sdoMapContainer == null) { - console.error('could not find SDO map container'); - } else { - sdoMap = JSON.parse(sdoMapContainer.textContent); - } -}); 'use strict'; function Search(menu) { this.menu = menu; @@ -113,11 +109,11 @@ function Search(menu) { } Search.prototype.loadBiblio = function () { - let $biblio = document.getElementById('menu-search-biblio'); - if (!$biblio) { + if (typeof biblio === 'undefined') { + console.error('could not find biblio'); this.biblio = []; } else { - this.biblio = JSON.parse($biblio.textContent); + this.biblio = biblio; this.biblio.clauses = this.biblio.filter(e => e.type === 'clause'); this.biblio.byId = this.biblio.reduce((map, entry) => { map[entry.id] = entry; @@ -1022,6 +1018,7 @@ document.addEventListener('DOMContentLoaded', () => { Toolbox.init(); referencePane.init(); }); + 'use strict'; let decimalBullet = Array.from({ length: 100 }, (a, i) => '' + (i + 1)); let alphaBullet = Array.from({ length: 26 }, (a, i) => String.fromCharCode('a'.charCodeAt(0) + i)); @@ -1052,3 +1049,6 @@ document.addEventListener('DOMContentLoaded', () => { addStepNumberText(ol, []); }); }); + +let sdoMap = JSON.parse(`{}`); +let biblio = JSON.parse(`[{"type":"clause","id":"intro","aoid":null,"titleHTML":"Ecmarkup","number":"","referencingIds":[],"key":"Ecmarkup"},{"type":"clause","id":"getting-started","aoid":null,"titleHTML":"Getting Started","number":"1","referencingIds":[],"key":"Getting Started"},{"type":"table","id":"build-options","node":{},"number":1,"caption":"Table 1: Build options","referencingIds":["_ref_13"],"key":"Table 1: Build options"},{"type":"table","id":"document-options","node":{},"number":2,"caption":"Table 2: Document options","referencingIds":["_ref_14"],"key":"Table 2: Document options"},{"type":"clause","id":"useful-options","aoid":null,"titleHTML":"Options","number":"2","referencingIds":[],"key":"Options"},{"type":"clause","id":"stylesheets-and-scripts","aoid":null,"titleHTML":"Stylesheets and Scripts","number":"3","referencingIds":[],"key":"Stylesheets and Scripts"},{"type":"table","id":"emd-overview","node":{},"number":4,"caption":"Table 4: Inline styles/conventions","referencingIds":["_ref_4"],"key":"Table 4: Inline styles/conventions"},{"type":"clause","id":"editorial-conventions","aoid":null,"titleHTML":"Editorial Conventions","number":"4","referencingIds":[],"key":"Editorial Conventions"},{"type":"clause","id":"metadata","aoid":null,"titleHTML":"Metadata","number":"5","referencingIds":[],"key":"Metadata"},{"type":"clause","id":"emu-intro","aoid":null,"titleHTML":"emu-intro","number":"6.1","referencingIds":["_ref_1"],"key":"emu-intro"},{"type":"clause","id":"example-normative-optional","aoid":null,"titleHTML":"Example Normative Optional Clause","number":"6.2.1","referencingIds":[],"key":"Example Normative Optional Clause"},{"type":"clause","id":"emu-clause","aoid":null,"titleHTML":"emu-clause","number":"6.2","referencingIds":["_ref_0","_ref_16"],"key":"emu-clause"},{"type":"clause","id":"emu-annex","aoid":null,"titleHTML":"emu-annex","number":"6.3","referencingIds":["_ref_2"],"key":"emu-annex"},{"type":"clause","id":"clauses","aoid":null,"titleHTML":"Clauses","number":"6","referencingIds":[],"key":"Clauses"},{"type":"step","id":"replace-me","stepNumbers":[2,1],"referencingIds":["_ref_15"],"key":"replace-me"},{"type":"op","aoid":"EmuAlg","refId":"emu-alg","referencingIds":[],"key":"EmuAlg"},{"type":"clause","id":"emu-alg","aoid":"EmuAlg","titleHTML":"emu-alg","number":"7","referencingIds":["_ref_3","_ref_20"],"key":"emu-alg"},{"type":"clause","id":"emu-eqn","aoid":null,"titleHTML":"emu-eqn","number":"8","referencingIds":["_ref_5"],"key":"emu-eqn"},{"type":"clause","id":"emu-note","aoid":null,"titleHTML":"emu-note","number":"9","referencingIds":["_ref_6","_ref_17"],"key":"emu-note"},{"type":"step","id":"example-step-label","stepNumbers":[1],"referencingIds":["_ref_19"],"key":"example-step-label"},{"type":"clause","id":"emu-xref","aoid":null,"titleHTML":"emu-xref","number":"10","referencingIds":["_ref_12"],"key":"emu-xref"},{"type":"clause","id":"emu-not-ref","aoid":null,"titleHTML":"emu-not-ref","number":"11","referencingIds":["_ref_21"],"key":"emu-not-ref"},{"type":"clause","id":"emu-figure","aoid":null,"titleHTML":"emu-figure","number":"12","referencingIds":["_ref_7"],"key":"emu-figure"},{"type":"clause","id":"emu-table","aoid":null,"titleHTML":"emu-table","number":"13","referencingIds":["_ref_8"],"key":"emu-table"},{"type":"clause","id":"emu-example","aoid":null,"titleHTML":"emu-example","number":"14","referencingIds":["_ref_9"],"key":"emu-example"},{"type":"clause","id":"emu-biblio","aoid":null,"titleHTML":"emu-biblio","number":"15","referencingIds":["_ref_18"],"key":"emu-biblio"},{"type":"production","id":"prod-WhileStatement","name":"WhileStatement","referencingIds":[],"key":"WhileStatement"},{"type":"production","id":"prod-ArgumentList","name":"ArgumentList","referencingIds":["_ref_22"],"key":"ArgumentList"},{"type":"production","id":"prod-IterationStatement","name":"IterationStatement","referencingIds":[],"key":"IterationStatement"},{"type":"production","id":"prod-Identifier","name":"Identifier","referencingIds":[],"key":"Identifier"},{"type":"production","id":"prod-SourceCharacter","name":"SourceCharacter","referencingIds":[],"key":"SourceCharacter"},{"type":"production","id":"prod-ExpressionStatement","name":"ExpressionStatement","referencingIds":["_ref_23"],"key":"ExpressionStatement"},{"type":"production","id":"prod-DecimalDigit","name":"DecimalDigit","referencingIds":[],"key":"DecimalDigit"},{"type":"production","id":"prod-StatementList","name":"StatementList","referencingIds":[],"key":"StatementList"},{"type":"clause","id":"emu-grammar","aoid":null,"titleHTML":"emu-grammar","number":"16.1","referencingIds":["_ref_10"],"key":"emu-grammar"},{"type":"clause","id":"emu-production","aoid":null,"titleHTML":"emu-production","number":"16.2","referencingIds":["_ref_11"],"key":"emu-production"},{"type":"clause","id":"emu-rhs","aoid":null,"titleHTML":"emu-rhs","number":"16.3","referencingIds":[],"key":"emu-rhs"},{"type":"clause","id":"emu-nt","aoid":null,"titleHTML":"emu-nt","number":"16.4","referencingIds":[],"key":"emu-nt"},{"type":"clause","id":"emu-t","aoid":null,"titleHTML":"emu-t","number":"16.5","referencingIds":[],"key":"emu-t"},{"type":"clause","id":"emu-gmod","aoid":null,"titleHTML":"emu-gmod","number":"16.6","referencingIds":[],"key":"emu-gmod"},{"type":"clause","id":"emu-gann","aoid":null,"titleHTML":"emu-gann","number":"16.7","referencingIds":[],"key":"emu-gann"},{"type":"clause","id":"emu-gprose","aoid":null,"titleHTML":"emu-gprose","number":"16.8","referencingIds":[],"key":"emu-gprose"},{"type":"clause","id":"emu-prodref","aoid":null,"titleHTML":"emu-prodref","number":"16.9","referencingIds":[],"key":"emu-prodref"},{"type":"clause","id":"grammar","aoid":null,"titleHTML":"Specifying Grammar","number":"16","referencingIds":[],"key":"Specifying Grammar"},{"type":"clause","id":"imports","aoid":null,"titleHTML":"Imports","number":"17","referencingIds":[],"key":"Imports"},{"type":"clause","id":"oldids","aoid":null,"titleHTML":"Old IDs","number":"18.1","referencingIds":[],"key":"Old IDs"},{"type":"clause","id":"ins-del","aoid":null,"titleHTML":"ins & del","number":"18.2","referencingIds":[],"key":"ins & del"},{"type":"clause","id":"pre-code","aoid":null,"titleHTML":"Code Listings","number":"18.3","referencingIds":[],"key":"Code Listings"},{"type":"clause","id":"css","aoid":null,"titleHTML":"Other Styles & Conventions","number":"18","referencingIds":[],"key":"Other Styles & Conventions"},{"type":"term","term":"example","refId":"emu-not-ref","referencingIds":[],"key":"example"}]`); \ No newline at end of file diff --git a/docs/index.html b/docs/index.html index a36fab4f..2c3f5557 100644 --- a/docs/index.html +++ b/docs/index.html @@ -4,7 +4,7 @@ Ecmarkup -
+

Ecmarkup

From 2bb20ec963bcbe5ec0b8a48b4e957efe53009581 Mon Sep 17 00:00:00 2001 From: Kevin Gibbons Date: Sat, 20 Feb 2021 17:12:55 -0800 Subject: [PATCH 3/6] have docs use external assets properly --- docs/index.html | 6 ++---- spec/index.html | 3 --- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/docs/index.html b/docs/index.html index 2c3f5557..531b67ca 100644 --- a/docs/index.html +++ b/docs/index.html @@ -1,10 +1,8 @@ - - - + Ecmarkup -
+

Ecmarkup

diff --git a/spec/index.html b/spec/index.html index a9915bad..9cb6cf4a 100644 --- a/spec/index.html +++ b/spec/index.html @@ -1,12 +1,9 @@ - - Ecmarkup 
 repository: https://github.com/tc39/ecmarkup
-assets: none
 copyright: false
From 8ffe7a2a59213afad1399769b479867da8454b8c Mon Sep 17 00:00:00 2001 From: Kevin Gibbons Date: Sat, 20 Feb 2021 17:39:37 -0800 Subject: [PATCH 4/6] update baselines --- test/baselines/reference/algorithm-replacements.html | 2 +- test/baselines/reference/algorithms.html | 2 +- test/baselines/reference/autolinking.html | 2 +- test/baselines/reference/boilerplate-address.html | 2 +- test/baselines/reference/boilerplate-all.html | 2 +- test/baselines/reference/boilerplate-copyright.html | 2 +- test/baselines/reference/boilerplate-license.html | 2 +- test/baselines/reference/charset-absent.html | 2 +- test/baselines/reference/charset-present.html | 2 +- test/baselines/reference/clauses.html | 2 +- test/baselines/reference/code.html | 2 +- test/baselines/reference/copyright.html | 2 +- test/baselines/reference/date.html | 2 +- test/baselines/reference/dfn.html | 2 +- test/baselines/reference/duplicate-ids.html | 2 +- test/baselines/reference/duplicate-productions.html | 2 +- test/baselines/reference/emd-in-grammar.html | 2 +- test/baselines/reference/eqn.html | 2 +- test/baselines/reference/escaping.html | 2 +- test/baselines/reference/example.html | 2 +- test/baselines/reference/figure.html | 2 +- test/baselines/reference/grammar.html | 2 +- test/baselines/reference/html-element-attributes.html | 2 +- test/baselines/reference/imports.html | 2 +- test/baselines/reference/ins-nonterminal.html | 2 +- test/baselines/reference/namespaces-productions.html | 2 +- test/baselines/reference/namespaces.html | 2 +- .../baselines/reference/nonterminal-used-before-definition.html | 2 +- test/baselines/reference/notes.html | 2 +- test/baselines/reference/oldids.html | 2 +- test/baselines/reference/proposal-copyright.html | 2 +- test/baselines/reference/shortname.html | 2 +- test/baselines/reference/step-xrefs.html | 2 +- test/baselines/reference/test.html | 2 +- test/baselines/reference/title.html | 2 +- test/baselines/reference/xref.html | 2 +- test/build.js | 2 +- 37 files changed, 37 insertions(+), 37 deletions(-) diff --git a/test/baselines/reference/algorithm-replacements.html b/test/baselines/reference/algorithm-replacements.html index ae4fd0a2..ec0a60d3 100644 --- a/test/baselines/reference/algorithm-replacements.html +++ b/test/baselines/reference/algorithm-replacements.html @@ -1,5 +1,5 @@ -
+

1 Title

diff --git a/test/baselines/reference/algorithms.html b/test/baselines/reference/algorithms.html index 807c6ca6..4fbc06ef 100644 --- a/test/baselines/reference/algorithms.html +++ b/test/baselines/reference/algorithms.html @@ -1,5 +1,5 @@ -
+
  1. Can call abstract operations in this spec: Internal();
  2. Can call abstract operations in ES6: ReturnIfAbrupt(completion);
  3. Can call abstract operations in a biblio file: Biblio();
  4. Unfound abstract operations just don't link: Unfound();
  5. Can prefix with ! and ?.
    1. Let foo be ? Internal();
    2. Let bar be ! Internal();
 diff --git a/test/baselines/reference/autolinking.html b/test/baselines/reference/autolinking.html index da7f4123..f0dc0771 100644 --- a/test/baselines/reference/autolinking.html +++ b/test/baselines/reference/autolinking.html @@ -1,5 +1,5 @@ -
+

1 Autolinking

Type, type, Type(), type()

diff --git a/test/baselines/reference/boilerplate-address.html b/test/baselines/reference/boilerplate-address.html index 283f6357..c857547d 100644 --- a/test/baselines/reference/boilerplate-address.html +++ b/test/baselines/reference/boilerplate-address.html @@ -1,5 +1,5 @@ -test title!

test title!

+test title!

test title!

A Copyright & Software License

diff --git a/test/baselines/reference/boilerplate-all.html b/test/baselines/reference/boilerplate-all.html index 145e6e0c..1a0e6bb6 100644 --- a/test/baselines/reference/boilerplate-all.html +++ b/test/baselines/reference/boilerplate-all.html @@ -1,5 +1,5 @@ -test title!

test title!

+test title!

test title!

A Copyright & Software License

diff --git a/test/baselines/reference/boilerplate-copyright.html b/test/baselines/reference/boilerplate-copyright.html index 1ff62ba2..b42bb9ca 100644 --- a/test/baselines/reference/boilerplate-copyright.html +++ b/test/baselines/reference/boilerplate-copyright.html @@ -1,5 +1,5 @@ -test title!

test title!

+test title!

test title!

A Copyright & Software License

diff --git a/test/baselines/reference/boilerplate-license.html b/test/baselines/reference/boilerplate-license.html index 3df5c5e7..bd83b651 100644 --- a/test/baselines/reference/boilerplate-license.html +++ b/test/baselines/reference/boilerplate-license.html @@ -1,5 +1,5 @@ -test title!

test title!

+test title!

test title!

A Copyright & Software License

diff --git a/test/baselines/reference/charset-absent.html b/test/baselines/reference/charset-absent.html index 3358f831..e29ee3ad 100644 --- a/test/baselines/reference/charset-absent.html +++ b/test/baselines/reference/charset-absent.html @@ -1,3 +1,3 @@ -
+
\ No newline at end of file diff --git a/test/baselines/reference/charset-present.html b/test/baselines/reference/charset-present.html index 5ee6cd29..e0aaf3aa 100644 --- a/test/baselines/reference/charset-present.html +++ b/test/baselines/reference/charset-present.html @@ -1,5 +1,5 @@ -
+
\ No newline at end of file diff --git a/test/baselines/reference/clauses.html b/test/baselines/reference/clauses.html index 3838ab22..df4bcaf6 100644 --- a/test/baselines/reference/clauses.html +++ b/test/baselines/reference/clauses.html @@ -1,5 +1,5 @@ -
+

Intro

diff --git a/test/baselines/reference/code.html b/test/baselines/reference/code.html index 3d16e674..581bb879 100644 --- a/test/baselines/reference/code.html +++ b/test/baselines/reference/code.html @@ -1,5 +1,5 @@ -
+

1 Test Clause

diff --git a/test/baselines/reference/copyright.html b/test/baselines/reference/copyright.html index 0cf2b40c..424c6891 100644 --- a/test/baselines/reference/copyright.html +++ b/test/baselines/reference/copyright.html @@ -1,5 +1,5 @@ -test title!

Draft 1 / September 26, 2014

test title!

+test title!

Draft 1 / September 26, 2014

test title!

1 Test Clause

 diff --git a/test/baselines/reference/date.html b/test/baselines/reference/date.html index 8347b2a5..ba7cf23f 100644 --- a/test/baselines/reference/date.html +++ b/test/baselines/reference/date.html @@ -1,5 +1,5 @@ -test title!

test title!

+test title!

test title!

Some body content

diff --git a/test/baselines/reference/dfn.html b/test/baselines/reference/dfn.html index dd65fc1e..b23f7e1c 100644 --- a/test/baselines/reference/dfn.html +++ b/test/baselines/reference/dfn.html @@ -1,5 +1,5 @@ -
+

Intro

Forward references to dfn work.

diff --git a/test/baselines/reference/duplicate-ids.html b/test/baselines/reference/duplicate-ids.html index 0b1e28bf..be71f3d9 100644 --- a/test/baselines/reference/duplicate-ids.html +++ b/test/baselines/reference/duplicate-ids.html @@ -1,5 +1,5 @@ -
+

1 A

diff --git a/test/baselines/reference/duplicate-productions.html b/test/baselines/reference/duplicate-productions.html index 992fd14f..f42cbaf1 100644 --- a/test/baselines/reference/duplicate-productions.html +++ b/test/baselines/reference/duplicate-productions.html @@ -1,5 +1,5 @@ -
+
Prod : GMD :: diff --git a/test/baselines/reference/emd-in-grammar.html b/test/baselines/reference/emd-in-grammar.html index 1414eb42..4e2bbf7d 100644 --- a/test/baselines/reference/emd-in-grammar.html +++ b/test/baselines/reference/emd-in-grammar.html @@ -1,5 +1,5 @@ -
+

1 Example

diff --git a/test/baselines/reference/eqn.html b/test/baselines/reference/eqn.html index 3ab85b22..2a560881 100644 --- a/test/baselines/reference/eqn.html +++ b/test/baselines/reference/eqn.html @@ -1,6 +1,6 @@ -
+

1 Header

Can refer to eqns inside paragraph text via autolinking: DateValue.

diff --git a/test/baselines/reference/escaping.html b/test/baselines/reference/escaping.html index 82e2bd1f..1b72f96f 100644 --- a/test/baselines/reference/escaping.html +++ b/test/baselines/reference/escaping.html @@ -1,5 +1,5 @@ -
+

1 blah

U+200C (ZERO WIDTH NON-JOINER) is abbreviated "<ZWNJ>"

diff --git a/test/baselines/reference/example.html b/test/baselines/reference/example.html index a8f02177..b855f291 100644 --- a/test/baselines/reference/example.html +++ b/test/baselines/reference/example.html @@ -1,5 +1,5 @@ -
+

Examples outside of clauses aren't processed specially.

This is an example. diff --git a/test/baselines/reference/figure.html b/test/baselines/reference/figure.html index 60977a06..6b1e661c 100644 --- a/test/baselines/reference/figure.html +++ b/test/baselines/reference/figure.html @@ -1,5 +1,5 @@ -
+
Figure 1
this is a figure! diff --git a/test/baselines/reference/grammar.html b/test/baselines/reference/grammar.html index 299ed671..ee27efdd 100644 --- a/test/baselines/reference/grammar.html +++ b/test/baselines/reference/grammar.html @@ -1,6 +1,6 @@ -
+
FooTerminal : diff --git a/test/baselines/reference/html-element-attributes.html b/test/baselines/reference/html-element-attributes.html index c7f95232..1d52c7f0 100644 --- a/test/baselines/reference/html-element-attributes.html +++ b/test/baselines/reference/html-element-attributes.html @@ -1,5 +1,5 @@ -
+
Content
\ No newline at end of file diff --git a/test/baselines/reference/imports.html b/test/baselines/reference/imports.html index dedac1e8..ac69cbf3 100644 --- a/test/baselines/reference/imports.html +++ b/test/baselines/reference/imports.html @@ -1,5 +1,5 @@ -
+

1 Header

text

diff --git a/test/baselines/reference/ins-nonterminal.html b/test/baselines/reference/ins-nonterminal.html index 5f75e10a..0e5a1b9c 100644 --- a/test/baselines/reference/ins-nonterminal.html +++ b/test/baselines/reference/ins-nonterminal.html @@ -1,5 +1,5 @@ -
+
A :: one of a b c d e f diff --git a/test/baselines/reference/namespaces-productions.html b/test/baselines/reference/namespaces-productions.html index 0cb374d7..65959a58 100644 --- a/test/baselines/reference/namespaces-productions.html +++ b/test/baselines/reference/namespaces-productions.html @@ -1,5 +1,5 @@ -
+

Intro

diff --git a/test/baselines/reference/namespaces.html b/test/baselines/reference/namespaces.html index e27f6aa5..2b6c2aa5 100644 --- a/test/baselines/reference/namespaces.html +++ b/test/baselines/reference/namespaces.html @@ -1,5 +1,5 @@ -
+

Intro

diff --git a/test/baselines/reference/nonterminal-used-before-definition.html b/test/baselines/reference/nonterminal-used-before-definition.html index 6b5034bc..f5ca4d73 100644 --- a/test/baselines/reference/nonterminal-used-before-definition.html +++ b/test/baselines/reference/nonterminal-used-before-definition.html @@ -1,5 +1,5 @@ -
+

1 Example SDO

diff --git a/test/baselines/reference/notes.html b/test/baselines/reference/notes.html index 37cccff7..103db3cc 100644 --- a/test/baselines/reference/notes.html +++ b/test/baselines/reference/notes.html @@ -1,5 +1,5 @@ -
+
This is a note. Since it is outside a clause it is unstyled. diff --git a/test/baselines/reference/oldids.html b/test/baselines/reference/oldids.html index e48c57b1..ee434423 100644 --- a/test/baselines/reference/oldids.html +++ b/test/baselines/reference/oldids.html @@ -1,5 +1,5 @@ -
+

1 c1

This is some content and such.

diff --git a/test/baselines/reference/proposal-copyright.html b/test/baselines/reference/proposal-copyright.html index a7df6a8a..ee74ffb8 100644 --- a/test/baselines/reference/proposal-copyright.html +++ b/test/baselines/reference/proposal-copyright.html @@ -1,5 +1,5 @@ -test title!

Stage 0 Draft / September 26, 2014

test title!

+test title!

Stage 0 Draft / September 26, 2014

test title!

A Copyright & Software License

diff --git a/test/baselines/reference/shortname.html b/test/baselines/reference/shortname.html index 7ecc7f7b..07e3276e 100644 --- a/test/baselines/reference/shortname.html +++ b/test/baselines/reference/shortname.html @@ -1,5 +1,5 @@ -test title!

Draft ECMA-000

Draft 1 / September 26, 2015

test title!

+test title!

Draft ECMA-000

Draft 1 / September 26, 2015

test title!

Some body content

\ No newline at end of file diff --git a/test/baselines/reference/step-xrefs.html b/test/baselines/reference/step-xrefs.html index 155b0714..010a318b 100644 --- a/test/baselines/reference/step-xrefs.html +++ b/test/baselines/reference/step-xrefs.html @@ -1,5 +1,5 @@ -
+

1 Title

diff --git a/test/baselines/reference/test.html b/test/baselines/reference/test.html index d00ac316..2ed33cb4 100644 --- a/test/baselines/reference/test.html +++ b/test/baselines/reference/test.html @@ -2,7 +2,7 @@ -Ecmarkup Test Document

Draft 1 / September 26, 2015

Ecmarkup Test Document

+Ecmarkup Test Document

Draft 1 / September 26, 2015

Ecmarkup Test Document

Intro

diff --git a/test/baselines/reference/title.html b/test/baselines/reference/title.html index 3213ef73..ff763b1a 100644 --- a/test/baselines/reference/title.html +++ b/test/baselines/reference/title.html @@ -1,5 +1,5 @@ -test title!

Draft 1 / September 26, 2015

test title!

+test title!

Draft 1 / September 26, 2015

test title!

Some body content

\ No newline at end of file diff --git a/test/baselines/reference/xref.html b/test/baselines/reference/xref.html index 05eecbc3..0ec1d645 100644 --- a/test/baselines/reference/xref.html +++ b/test/baselines/reference/xref.html @@ -1,5 +1,5 @@ -
+

1 Clause Title

diff --git a/test/build.js b/test/build.js index cac18689..96d4b75e 100644 --- a/test/build.js +++ b/test/build.js @@ -6,7 +6,7 @@ const build = require('../lib/ecmarkup').build; const doc = '
toc: false\ncopyright: false\nassets: none

hi

'; const out = - '\n

1 hi

'; + '\n

1 hi

'; function fetch(file) { if (file.match(/\.json$/)) { From 049383e3e7848dbfcb1edcc051fc341904ebd4b5 Mon Sep 17 00:00:00 2001 From: Kevin Gibbons Date: Sat, 20 Feb 2021 19:21:14 -0800 Subject: [PATCH 5/6] cache-bust --- docs/index.html | 2 +- src/Spec.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/index.html b/docs/index.html index 531b67ca..04260c05 100644 --- a/docs/index.html +++ b/docs/index.html @@ -2,7 +2,7 @@ Ecmarkup -
+

Ecmarkup

diff --git a/src/Spec.ts b/src/Spec.ts index f603dc4c..995f7998 100644 --- a/src/Spec.ts +++ b/src/Spec.ts @@ -585,7 +585,7 @@ export default class Spec { } if (!skipJs) { const script = this.doc.createElement('script'); - script.src = path.relative(outDir, this.opts.jsOut); + script.src = path.relative(outDir, this.opts.jsOut) + '?cache=' + sha(jsContents); script.setAttribute('defer', ''); this.doc.head.appendChild(script); } From c8f69d9bf9e83e1a58467f2900c7598b62687c4c Mon Sep 17 00:00:00 2001 From: Kevin Gibbons Date: Mon, 22 Feb 2021 20:05:58 -0800 Subject: [PATCH 6/6] rebuild spec --- docs/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/index.html b/docs/index.html index 04260c05..4b93f6c0 100644 --- a/docs/index.html +++ b/docs/index.html @@ -2,7 +2,7 @@ Ecmarkup -