diff --git a/PUBLISHING.md b/PUBLISHING.md index 5cac37b2..cef876dc 100644 --- a/PUBLISHING.md +++ b/PUBLISHING.md @@ -1,27 +1,52 @@ # Generating a PDF from ecmarkup -In order to produce a PDF, the front matter `title`, `shortname`, `version`, and `date` are **mandatory**. If generating a final annual edition, date should reflect the date of the Ecma GA which will ratify the Standard. For example: +## Required frontmatter +- In order to produce a PDF, the front matter `title`, `shortname`, and `status` are **mandatory**. + +```yaml +title: Temporal proposal +shortname: Temporal +status: proposal +stage: 3 ``` -title: ECMAScript® 2024 Language Specification + +- If using the alternative copyright for a standard publication, `location` is also mandatory. For example: + +```yaml +title: ECMAScript® Language Specification +shortname: ECMA-262 +status: draft +boilerplate: + copyright: alternative +``` + +- If generating a version for submission to the GA, `version` and `date` are mandatory. `date` should reflect the date of the Ecma GA which will ratify the Standard. + +```yaml +title: ECMAScript® 2025 Language Specification shortname: ECMA-262 -version: 15th Edition -date: 2024-06-25 +version: 16th Edition +date: 2025-06-25 +status: standard +boilerplate: + copyright: alternative +location: https://262.ecma-international.org/16.0/ ``` To generate markup for use in PDF conversion, make sure to include the options `--assets`, `--assets-dir`, and `--printable`. If you have images and styles to include, make sure to move them into your assets directory before running `ecmarkup`. For example: ```shell -mkdir -p out && -cp -R images out && +mkdir -p out && \ +cp -R images out && \ ecmarkup --assets external --assets-dir out --printable spec.html out/index.html ``` -Then, from your spec's working directory, run [`prince`](https://www.princexml.com/) to generate your PDF. +Then, from your spec's working directory, run [`prince-books`](https://www.princexml.com/) to generate your PDF. ```shell cd path/to/spec -prince --script ./node_modules/ecmarkup/js/print.js out/index.html -o path/to/output.pdf +prince-books --script ./node_modules/ecmarkup/js/print.js out/index.html -o path/to/output.pdf ``` This has been extensively tested with Prince 15. Earlier and later editions not guaranteed. diff --git a/boilerplate/alternative-copyright.html b/boilerplate/alternative-copyright.html new file mode 100644 index 00000000..4296cb3c --- /dev/null +++ b/boilerplate/alternative-copyright.html @@ -0,0 +1,57 @@ + diff --git a/boilerplate/standard-copyright.html b/boilerplate/standard-copyright.html index 9921716f..26218838 100644 --- a/boilerplate/standard-copyright.html +++ b/boilerplate/standard-copyright.html @@ -1,18 +1,23 @@ -

© !YEAR! Ecma International

+

COPYRIGHT NOTICE

+ +

© !YEAR! Ecma International

+

By obtaining and/or copying this work, you (the licensee) agree that you have read, understood, and will comply with the following terms and conditions.

-

Permission under Ecma’s copyright to copy, modify, prepare derivative works of, and distribute this work, with or without modification, for any purpose and without fee or royalty is hereby granted, provided that you include the following on ALL copies of the work or portions thereof, including modifications:

+

This document may be copied, published and distributed to others, and certain derivative works of it may be prepared, copied, published, and distributed, in whole or in part, provided that the above copyright notice and this Copyright License and Disclaimer are included on all such copies and derivative works. The only derivative works that are permissible under this Copyright License and Disclaimer are:

+ +

(i) works which incorporate all or portion of this document for the purpose of providing commentary or explanation (such as an annotated version of the document),

+ +

(ii) works which incorporate all or portion of this document for the purpose of incorporating features that provide accessibility,

+ +

(iii) translations of this document into languages other than English and into different formats and

-
    -
  1. (i) The full text of this COPYRIGHT NOTICE AND COPYRIGHT LICENSE in a location viewable to users of the redistributed or derivative work.
  2. -
  3. (ii) Any pre-existing intellectual property disclaimers, notices, or terms and conditions. If none exist, the Ecma alternative copyright notice should be included.
  4. -
  5. (iii) Notice of any changes or modifications, through a copyright statement on the document such as “This document includes material copied from or derived from [title and URI of the Ecma document]. Copyright © Ecma International.”
  6. -
+

(iv) works by making use of this specification in standard conformant products by implementing (e.g. by copy and paste wholly or partly) the functionality therein.

-

Disclaimers

+

However, the content of this document itself may not be modified in any way, including by removing the copyright notice or references to Ecma International, except as required to translate it into languages other than English or into a different format.

-

THIS WORK IS PROVIDED “AS IS,” AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.

+

The official version of an Ecma International document is the English language version on the Ecma International website. In the event of discrepancies between a translated version and the official version, the official version shall govern.

-

COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE DOCUMENT.

+

The limited permissions granted above are perpetual and will not be revoked by Ecma International or its successors or assigns.

-

The name and trademarks of copyright holders may NOT be used in advertising or publicity pertaining to the work without specific, written prior permission. Title to copyright in this work will at all times remain with copyright holders.

+

This document and the information contained herein is provided on an “AS IS” basis and ECMA INTERNATIONAL DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.

diff --git a/css/print.css b/css/print.css index 7c772636..ccce10d0 100644 --- a/css/print.css +++ b/css/print.css @@ -496,7 +496,7 @@ emu-figure img { } #toc a[href]::after { - content: leader(dotted) target-counter(attr(href), page); + content: leader(dotted) target-counter(attr(href), page); } #toc > ol.toc { @@ -548,10 +548,18 @@ a[data-print-href]::after { width: auto; } -.annex-title { +emu-annex > h1 { text-align: center; } +emu-annex > h1 span { + display: block; +} + +emu-annex > h1 .secnum { + margin: 0 0 1lh; +} + .copyright-notice { /* ecma mandated */ font-style: italic; border: 1px solid black; @@ -561,10 +569,6 @@ a[data-print-href]::after { page-break-after: always; } -.full-page-svg { - color: rgba(255, 255, 255, 0); -} - .secnum { font-family: Arial, Helvetica, sans-serif; } @@ -613,6 +617,7 @@ h1.version { } #front-cover h1.title { + display: block; font-weight: bold; font-size: 20pt; line-height: 1.2; @@ -626,15 +631,6 @@ h1.version { page: inside-cover; } -#inside-cover address { - color: black; - font-size: 12pt; - font-style: normal; - position: relative; - left: 72mm; - top: 82mm; -} - #toc { page: toc; counter-reset: page 1; @@ -648,3 +644,7 @@ h1.version { .annex-kind { font-weight: normal; } + +p.ECMAaddress { + margin: 0; +} diff --git a/js/print.js b/js/print.js index 237ddbcb..0f0cb97b 100644 --- a/js/print.js +++ b/js/print.js @@ -10,9 +10,8 @@ // Prince.trackBoxes = true; -const specContainer = document.getElementById('spec-container'); -const shortname = specContainer.querySelector('h1.shortname'); -const version = specContainer.querySelector('h1.version'); +const shortname = document.querySelector('h1.shortname'); +const version = document.querySelector('h1.version'); rearrangeTables(); @@ -21,7 +20,7 @@ PDF.pageMode = 'show-bookmarks'; PDF.duplex = 'duplex-flip-long-edge'; PDF.title = document.title; PDF.author = 'Ecma International'; -PDF.subject = shortname.innerHTML + ', ' + version.innerHTML; +PDF.subject = shortname.innerHTML + (version ? ', ' + version.innerHTML : ''); /** * Sets up table captions and figcaptions for tables, which provides for diff --git a/spec/index.html b/spec/index.html index 9e44b496..6125735e 100644 --- a/spec/index.html +++ b/spec/index.html @@ -77,7 +77,7 @@

Options

`--no-toc``toc`Emit table of contents. Boolean, default true. `--printable``printable`Make the output suitable for printing. Boolean, default false. `--load-biblio``extraBiblios`Extra biblio.json file(s) to load. This should contain either an object as exported by `--write-biblio` or an array of such objects. - `boilerplate`An object with `address` and/or `copyright` and/or `license` fields containing paths to files containing the corresponding content for populating an element with class "copyright-and-software-license" (or if not found, an appended with that id) when `copyright` is true. Absent fields are assumed to reference files in a "boilerplate" directory sibling of the directory containing the ecmarkup executable. + `boilerplate`An object with `address` and/or `copyright` and/or `license` fields containing paths to files containing the corresponding content for populating an element with class "copyright-and-software-license" (or if not found, an appended with that id) when `copyright` is true or set to `alternative`. Absent fields are assumed to reference files in a "boilerplate" directory sibling of the directory containing the ecmarkup executable. `--mark-effects``markEffects`Propagate and render effects like "user code". diff --git a/src/Spec.ts b/src/Spec.ts index 931bb567..b5a8c354 100644 --- a/src/Spec.ts +++ b/src/Spec.ts @@ -597,10 +597,6 @@ export default class Spec { if (metadataEle) { this.doc.querySelector('emu-intro')!.appendChild(metadataEle); } - const scopeEle = document.getElementById('scope') ?? document.getElementById('sec-scope'); - if (scopeEle) { - scopeEle.before(this.doc.querySelector('h1.title')!.cloneNode(true)); - } // front cover const frontCover = document.createElement('div'); @@ -608,16 +604,13 @@ export default class Spec { frontCover.classList.add('full-page-svg'); frontCover.setAttribute('id', 'front-cover'); - const shortNameNode = this.doc.querySelector('h1.shortname'); - if (shortNameNode != null) { - frontCover.appendChild(shortNameNode.cloneNode(true)); - } const versionNode = this.doc.querySelector('h1.version'); if (versionNode != null) { - frontCover.appendChild(versionNode.cloneNode(true)); + frontCover.append(versionNode); } - // we know title exists because we enforce it in the constructor when using --printable - frontCover.appendChild(this.doc.querySelector('title')!.cloneNode(true)); + // we know title & shortname exist because we enforce it in the constructor when using --printable + frontCover.append(this.doc.querySelector('h1.title') ?? ''); + frontCover.append(this.doc.querySelector('h1.shortname') ?? ''); wrapper.before(frontCover); // inside cover @@ -625,8 +618,6 @@ export default class Spec { insideCover.classList.add('full-page-svg'); insideCover.setAttribute('id', 'inside-cover'); - insideCover.innerHTML = - '

Ecma International
Rue du Rhone 114 CH-1204 Geneva
Tel: +41 22 849 6000
Fax: +41 22 849 6001
Web: https://www.ecma-international.org
Ecma is the registered trademark of Ecma International.

'; frontCover.after(insideCover); } @@ -646,7 +637,18 @@ export default class Spec { if (this.opts.printable) { this.log('Applying tweaks for printable document...'); // The logo is present in ecma-262. We could consider removing it from the document instead of having this tweak. - document.getElementById('ecma-logo')?.remove(); + const logo = document.getElementById('ecma-logo'); + if (logo) { + if (logo.parentElement && logo.parentElement.tagName === 'P') { + logo.parentElement.remove(); + } else { + logo.remove(); + } + } + + this.doc + .querySelector('#spec-container > emu-clause:first-of-type') + ?.before(this.doc.querySelector('h1.title')!.cloneNode(true)); } else { // apparently including this confuses Prince, even when it's `display: none` this.log('Building shortcuts help dialog...'); @@ -1425,28 +1427,30 @@ ${this.opts.multipage ? `
  • Navigate to/from multipagem { - if (last) return false; - if (node.nodeName === 'EMU-CLAUSE' || node.nodeName === 'EMU-ANNEX') { - last = node as HTMLElement; - return false; - } - }); + } - if (last && last.parentNode) { - last.parentNode.insertBefore(copyrightClause, last.nextSibling); - } else { - this.doc.body.appendChild(copyrightClause); + const licenseClause = this.buildLicenseBoilerplate(); + let last: HTMLElement | undefined; + utils.domWalkBackward(this.doc.body, node => { + if (last) return false; + if (node.nodeName === 'EMU-CLAUSE' || node.nodeName === 'EMU-ANNEX') { + last = node as HTMLElement; + return false; } + }); + + if (last && last.parentNode) { + last.parentNode.insertBefore(licenseClause, last.nextSibling); + } else { + this.doc.body.appendChild(licenseClause); } } } @@ -1474,8 +1478,12 @@ ${this.opts.multipage ? `
  • Navigate to/from multipagemNavigate to/from multipagemCopyright Notice +${copyright}`; + } + + return copyrightElement; + } + + private buildLicenseBoilerplate() { + let addressFile: string | undefined; let licenseFile: string | undefined; if (this.opts.boilerplate) { if (this.opts.boilerplate.address) { addressFile = path.join(process.cwd(), this.opts.boilerplate.address); } - if (this.opts.boilerplate.copyright) { - copyrightFile = path.join(process.cwd(), this.opts.boilerplate.copyright); - } if (this.opts.boilerplate.license) { licenseFile = path.join(process.cwd(), this.opts.boilerplate.license); } @@ -1576,42 +1615,43 @@ ${this.opts.multipage ? `
  • Navigate to/from multipagemCopyright & Software License + licenseClause.setAttribute('back-matter', ''); + + // Printed document has "Software license" as last section, web version has "Copyright and Software license" + if (this.opts.printable) { + licenseClause.innerHTML = ` +

    Software License

    ${address} -

    Copyright Notice

    - ${copyright.replace('!YEAR!', '' + this.opts.date!.getFullYear())} -

    Software License

    ${license} - `; + `; + } else { + licenseClause.innerHTML = ` +

    Copyright & Software License

    + ${address} + ${this.buildCopyrightBoilerplate().outerHTML} +

    Software License

    + ${license} + `; + } - return copyrightClause; + return licenseClause; } private generateSDOMap() { diff --git a/test/baselines/generated-reference/assets-inline.html b/test/baselines/generated-reference/assets-inline.html index 7b2cb7ba..aaa052a7 100644 --- a/test/baselines/generated-reference/assets-inline.html +++ b/test/baselines/generated-reference/assets-inline.html @@ -3552,7 +3552,7 @@ } #toc a[href]::after { - content: leader(dotted) target-counter(attr(href), page); + content: leader(dotted) target-counter(attr(href), page); } #toc > ol.toc { @@ -3604,10 +3604,18 @@ width: auto; } -.annex-title { +emu-annex > h1 { text-align: center; } +emu-annex > h1 span { + display: block; +} + +emu-annex > h1 .secnum { + margin: 0 0 1lh; +} + .copyright-notice { /* ecma mandated */ font-style: italic; border: 1px solid black; @@ -3617,10 +3625,6 @@ page-break-after: always; } -.full-page-svg { - color: rgba(255, 255, 255, 0); -} - .secnum { font-family: Arial, Helvetica, sans-serif; } @@ -3669,6 +3673,7 @@ } #front-cover h1.title { + display: block; font-weight: bold; font-size: 20pt; line-height: 1.2; @@ -3682,15 +3687,6 @@ page: inside-cover; } -#inside-cover address { - color: black; - font-size: 12pt; - font-style: normal; - position: relative; - left: 72mm; - top: 82mm; -} - #toc { page: toc; counter-reset: page 1; @@ -3705,6 +3701,10 @@ font-weight: normal; } +p.ECMAaddress { + margin: 0; +} + }
    • Toggle shortcuts help?
    • @@ -3721,14 +3721,14 @@

      Intro

      This is a section.

      - -

      Copyright & Software License

      - -

      Copyright Notice

      -

      © 1997 Ecma

      - -

      Software License

      -

      All Software contained in this document ("Software") is protected by copyright and is being made available under the "BSD License", included below. This Software may be subject to third party rights (rights from parties other than Ecma International), including patent rights, and no licenses under such third party rights are granted under this license even if the third party concerned is a member of Ecma International. SEE THE ECMA CODE OF CONDUCT IN PATENT MATTERS AVAILABLE AT https://ecma-international.org/memento/codeofconduct.htm FOR INFORMATION REGARDING THE LICENSING OF PATENT CLAIMS THAT ARE REQUIRED TO IMPLEMENT ECMA INTERNATIONAL STANDARDS.

      + +

      Copyright & Software License

      + + +

      Software License

      +

      All Software contained in this document ("Software") is protected by copyright and is being made available under the "BSD License", included below. This Software may be subject to third party rights (rights from parties other than Ecma International), including patent rights, and no licenses under such third party rights are granted under this license even if the third party concerned is a member of Ecma International. SEE THE ECMA CODE OF CONDUCT IN PATENT MATTERS AVAILABLE AT https://ecma-international.org/memento/codeofconduct.htm FOR INFORMATION REGARDING THE LICENSING OF PATENT CLAIMS THAT ARE REQUIRED TO IMPLEMENT ECMA INTERNATIONAL STANDARDS.

      Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

      @@ -3740,4 +3740,4 @@

      Software License

      THIS SOFTWARE IS PROVIDED BY THE ECMA INTERNATIONAL "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL ECMA INTERNATIONAL BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

      -
    \ No newline at end of file + \ No newline at end of file diff --git a/test/baselines/generated-reference/boilerplate-address.html b/test/baselines/generated-reference/boilerplate-address.html index 4e8585eb..06a1791d 100644 --- a/test/baselines/generated-reference/boilerplate-address.html +++ b/test/baselines/generated-reference/boilerplate-address.html @@ -9,17 +9,17 @@
  • Jump to nth pin1-9
  • test title!

    - -

    Copyright & Software License

    -

    Tet Corporation

    + +

    Copyright & Software License

    +

    Tet Corporation

    2 Hammarskjöld Plaza

    New York City, New York

    Tel: 123-456-7890

    Fax: 123-456-7890

    Web: http://www.tet-corporation.com/

    -

    Copyright Notice

    -

    © 2018 Ecma International

    + +

    Software License

    +

    All Software contained in this document ("Software") is protected by copyright and is being made available under the "BSD License", included below. This Software may be subject to third party rights (rights from parties other than Ecma International), including patent rights, and no licenses under such third party rights are granted under this license even if the third party concerned is a member of Ecma International. SEE THE ECMA CODE OF CONDUCT IN PATENT MATTERS AVAILABLE AT https://ecma-international.org/memento/codeofconduct.htm FOR INFORMATION REGARDING THE LICENSING OF PATENT CLAIMS THAT ARE REQUIRED TO IMPLEMENT ECMA INTERNATIONAL STANDARDS.

    Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

    @@ -42,4 +42,4 @@

    Software License

    THIS SOFTWARE IS PROVIDED BY THE ECMA INTERNATIONAL "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL ECMA INTERNATIONAL BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

    -
    \ No newline at end of file + \ No newline at end of file diff --git a/test/baselines/generated-reference/boilerplate-all.html b/test/baselines/generated-reference/boilerplate-all.html index 02dab6ed..1efda115 100644 --- a/test/baselines/generated-reference/boilerplate-all.html +++ b/test/baselines/generated-reference/boilerplate-all.html @@ -9,23 +9,23 @@
  • Jump to nth pin1-9
  • test title!

    - -

    Copyright & Software License

    -

    Tet Corporation

    + +

    Copyright & Software License

    +

    Tet Corporation

    2 Hammarskjöld Plaza

    New York City, New York

    Tel: 123-456-7890

    Fax: 123-456-7890

    Web: http://www.tet-corporation.com/

    -

    Copyright Notice

    -

    © 2018 Rick Waldron, Mid-World

    - -

    Software License

    -

    Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

    + +

    Software License

    +

    Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

    The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

    -
    \ No newline at end of file + \ No newline at end of file diff --git a/test/baselines/generated-reference/boilerplate-copyright.html b/test/baselines/generated-reference/boilerplate-copyright.html index 1dc6d586..5df120ab 100644 --- a/test/baselines/generated-reference/boilerplate-copyright.html +++ b/test/baselines/generated-reference/boilerplate-copyright.html @@ -9,20 +9,20 @@
  • Jump to nth pin1-9
  • test title!

    - -

    Copyright & Software License

    -

    Ecma International

    + +

    Copyright & Software License

    +

    Ecma International

    Rue du Rhone 114

    CH-1204 Geneva

    Tel: +41 22 849 6000

    Fax: +41 22 849 6001

    Web: https://ecma-international.org/

    -

    Copyright Notice

    -

    © 2018 Rick Waldron, Mid-World

    - -

    Software License

    -

    All Software contained in this document ("Software") is protected by copyright and is being made available under the "BSD License", included below. This Software may be subject to third party rights (rights from parties other than Ecma International), including patent rights, and no licenses under such third party rights are granted under this license even if the third party concerned is a member of Ecma International. SEE THE ECMA CODE OF CONDUCT IN PATENT MATTERS AVAILABLE AT https://ecma-international.org/memento/codeofconduct.htm FOR INFORMATION REGARDING THE LICENSING OF PATENT CLAIMS THAT ARE REQUIRED TO IMPLEMENT ECMA INTERNATIONAL STANDARDS.

    + +

    Software License

    +

    All Software contained in this document ("Software") is protected by copyright and is being made available under the "BSD License", included below. This Software may be subject to third party rights (rights from parties other than Ecma International), including patent rights, and no licenses under such third party rights are granted under this license even if the third party concerned is a member of Ecma International. SEE THE ECMA CODE OF CONDUCT IN PATENT MATTERS AVAILABLE AT https://ecma-international.org/memento/codeofconduct.htm FOR INFORMATION REGARDING THE LICENSING OF PATENT CLAIMS THAT ARE REQUIRED TO IMPLEMENT ECMA INTERNATIONAL STANDARDS.

    Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

    @@ -34,4 +34,4 @@

    Software License

    THIS SOFTWARE IS PROVIDED BY THE ECMA INTERNATIONAL "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL ECMA INTERNATIONAL BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

    -
    \ No newline at end of file + \ No newline at end of file diff --git a/test/baselines/generated-reference/boilerplate-license.html b/test/baselines/generated-reference/boilerplate-license.html index d48fde59..56e488cc 100644 --- a/test/baselines/generated-reference/boilerplate-license.html +++ b/test/baselines/generated-reference/boilerplate-license.html @@ -9,17 +9,17 @@
  • Jump to nth pin1-9
  • test title!

    - -

    Copyright & Software License

    -

    Ecma International

    + +

    Copyright & Software License

    +

    Ecma International

    Rue du Rhone 114

    CH-1204 Geneva

    Tel: +41 22 849 6000

    Fax: +41 22 849 6001

    Web: https://ecma-international.org/

    -

    Copyright Notice

    -

    © 2018 Ecma International

    + +

    Software License

    +

    Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

    The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

    -
    \ No newline at end of file + \ No newline at end of file diff --git a/test/baselines/generated-reference/clauses.html b/test/baselines/generated-reference/clauses.html index 15058e57..09d01cc2 100644 --- a/test/baselines/generated-reference/clauses.html +++ b/test/baselines/generated-reference/clauses.html @@ -1,5 +1,5 @@ -Test Doc
    Test Doc

    Ecma International
    Rue du Rhone 114 CH-1204 Geneva
    Tel: +41 22 849 6000
    Fax: +41 22 849 6001
    Web: https://www.ecma-international.org
    Ecma is the registered trademark of Ecma International.

    Test Doc

    +Test Doc

    Test Doc

    Intro

    @@ -7,7 +7,7 @@

    Sub Intro

    - +

    Test Doc

    1 Clause Foo(a, b)

    diff --git a/test/baselines/generated-reference/copyright.html b/test/baselines/generated-reference/copyright.html index b12116d6..c0257426 100644 --- a/test/baselines/generated-reference/copyright.html +++ b/test/baselines/generated-reference/copyright.html @@ -10,17 +10,17 @@

    Draft 1 / September 26, 2014

    test title!

    1 Test Clause

    -
    -

    Copyright & Software License

    -

    Ecma International

    + +

    Copyright & Software License

    +

    Ecma International

    Rue du Rhone 114

    CH-1204 Geneva

    Tel: +41 22 849 6000

    Fax: +41 22 849 6001

    Web: https://ecma-international.org/

    -

    Copyright Notice

    -

    © 2014 Ecma International

    + +

    Software License

    +

    All Software contained in this document ("Software") is protected by copyright and is being made available under the "BSD License", included below. This Software may be subject to third party rights (rights from parties other than Ecma International), including patent rights, and no licenses under such third party rights are granted under this license even if the third party concerned is a member of Ecma International. SEE THE ECMA CODE OF CONDUCT IN PATENT MATTERS AVAILABLE AT https://ecma-international.org/memento/codeofconduct.htm FOR INFORMATION REGARDING THE LICENSING OF PATENT CLAIMS THAT ARE REQUIRED TO IMPLEMENT ECMA INTERNATIONAL STANDARDS.

    Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

    @@ -43,5 +43,5 @@

    Software License

    THIS SOFTWARE IS PROVIDED BY THE ECMA INTERNATIONAL "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL ECMA INTERNATIONAL BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

    -
    +
    \ No newline at end of file diff --git a/test/baselines/generated-reference/proposal-copyright.html b/test/baselines/generated-reference/proposal-copyright.html index b91a397d..6c166b69 100644 --- a/test/baselines/generated-reference/proposal-copyright.html +++ b/test/baselines/generated-reference/proposal-copyright.html @@ -9,14 +9,14 @@
  • Jump to nth pin1-9
  • Stage 0 Draft / September 26, 2014

    test title!

    - -

    Copyright & Software License

    - -

    Copyright Notice

    -

    © 2014 Brian Terlson, Ecma International

    - -

    Software License

    -

    All Software contained in this document ("Software") is protected by copyright and is being made available under the "BSD License", included below. This Software may be subject to third party rights (rights from parties other than Ecma International), including patent rights, and no licenses under such third party rights are granted under this license even if the third party concerned is a member of Ecma International. SEE THE ECMA CODE OF CONDUCT IN PATENT MATTERS AVAILABLE AT https://ecma-international.org/memento/codeofconduct.htm FOR INFORMATION REGARDING THE LICENSING OF PATENT CLAIMS THAT ARE REQUIRED TO IMPLEMENT ECMA INTERNATIONAL STANDARDS.

    + +

    Copyright & Software License

    + + +

    Software License

    +

    All Software contained in this document ("Software") is protected by copyright and is being made available under the "BSD License", included below. This Software may be subject to third party rights (rights from parties other than Ecma International), including patent rights, and no licenses under such third party rights are granted under this license even if the third party concerned is a member of Ecma International. SEE THE ECMA CODE OF CONDUCT IN PATENT MATTERS AVAILABLE AT https://ecma-international.org/memento/codeofconduct.htm FOR INFORMATION REGARDING THE LICENSING OF PATENT CLAIMS THAT ARE REQUIRED TO IMPLEMENT ECMA INTERNATIONAL STANDARDS.

    Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

    @@ -28,4 +28,4 @@

    Software License

    THIS SOFTWARE IS PROVIDED BY THE ECMA INTERNATIONAL "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL ECMA INTERNATIONAL BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

    -
    \ No newline at end of file + \ No newline at end of file