isodoc 2.2.1 → 2.2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aed515059a4bfbb122ff29141ec687c3fab6fed9539fde9e2fc6d89b54ddc6ec
-  data.tar.gz: 35c681874fc12a48baa1ceffaff00680a577c90cde69c58caf896eeab8c8abb4
+  metadata.gz: 35faf26226ce9567b1cbe542ce0e2e5e9addaa4db63d88460a978b91e1aa7b1f
+  data.tar.gz: 3c6c08ee8a7b87edb3f4d17c5e1dd58e7b23081e3cce392a85404f8eafd3c280
 SHA512:
-  metadata.gz: 2313eec736db0f20d8ce87a8505e49a263d93ec67ee82d28d76f07c12388bce1ac213f380677784e1a9dacc12e78b655d39ecada99745f06e7e4a91f71124458
-  data.tar.gz: d680c24a277d386ab74cce9c87d1c0ff27087db33f4db42c973b3f51b5e098cae7a7d66aeb61dad50c36bf3ca23d7b9befe718584b3311f3f6ab971893872027
+  metadata.gz: 2c1f5785099717614434d6099c2b6f843d24cb5e7de0cd2cfbfb4da5a42039bd790d90b91f270befd4fa6002f79509007024e2baf52803a5720d7f0d75433294
+  data.tar.gz: 05203b0d0f5092a7e0ab26659d8b8f6a7b8ed9d1a2d3a6ffa0d2cd06b94748d432c264978c32bbc0af391817af0046313782dfff74f840c8b14cfcc28992b466

data/isodoc.gemspec

@@ -39,7 +39,8 @@ Gem::Specification.new do |spec|
   # spec.add_dependency "metanorma", ">= 1.2.0"
   spec.add_dependency "emf2svg"
   spec.add_dependency "mathml2asciimath"
-  spec.add_dependency "mn-requirements", "~> 0.0.1"
+  spec.add_dependency "metanorma-utils", "~> 1.3.2"
+  spec.add_dependency "mn-requirements", "~> 0.1.2"
   spec.add_dependency "relaton-cli"
   spec.add_dependency "relaton-render", "~> 0.4.0"
   spec.add_dependency "roman-numerals"
@@ -51,7 +52,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "guard", "~> 2.14"
   spec.add_development_dependency "guard-rspec", "~> 4.7"
-  spec.add_development_dependency "metanorma-iso"
+  spec.add_development_dependency "metanorma-iso", ">= 2.1.7"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rexml"
   spec.add_development_dependency "rspec", "~> 3.6"

data/lib/isodoc/convert.rb

@@ -11,7 +11,7 @@ require "mn-requirements"
 
 module IsoDoc
   class Convert < ::IsoDoc::Common
-    attr_accessor :options, :i18n, :meta, :xrefs, :reqt_models
+    attr_accessor :options, :i18n, :meta, :xrefs, :reqt_models, :requirements_processor
 
     # htmlstylesheet: Generic stylesheet for HTML
     # htmlstylesheet_override: Override stylesheet for HTML
@@ -172,6 +172,10 @@ module IsoDoc
       nil
     end
 
+    def requirements_processor
+      Metanorma::Requirements
+    end
+
     def convert1(docxml, filename, dir)
       @xrefs.parse docxml
       bibitem_lookup(docxml)
@@ -207,11 +211,9 @@ module IsoDoc
       lang = docxml&.at(ns("//bibdata/language"))&.text and @lang = lang
       script = docxml&.at(ns("//bibdata/script"))&.text and @script = script
       i18n_init(@lang, @script)
-      @reqt_models = Metanorma::Requirements
-        .new({
-               default: "default", lang: lang, script: script,
-               labels: @i18n.get
-             })
+      @reqt_models = requirements_processor
+        .new({ default: "default", lang: lang, script: script,
+               labels: @i18n.get })
     end
 
     def convert(input_filename, file = nil, debug = false,

data/lib/isodoc/function/table.rb

@@ -43,7 +43,7 @@ module IsoDoc
         width = node["width"] ? "width:#{node['width']};" : nil
         attr_code(
           id: node["id"],
-          class: "MsoISOTable",
+          class: node["class"] || "MsoISOTable",
           style: "border-width:1px;border-spacing:0;"\
                  "#{width}#{keep_style(node)}",
           title: node["alt"],

data/lib/isodoc/presentation_function/refs.rb

@@ -81,14 +81,13 @@ module IsoDoc
     end
 
     def bibliography_bibitem_number1(bibitem, idx)
-      if mn = bibitem.at(ns(".//docidentifier[@type = 'metanorma']"))
-        /^\[?\d\]?$/.match?(mn&.text) and
-          idx = mn.text.sub(/^\[/, "").sub(/\]$/, "").to_i
-      end
+      ins = bibitem.at(ns(".//docidentifier")).previous_element
+      mn = bibitem.at(ns(".//docidentifier[@type = 'metanorma']")) and
+        /^\[?\d+\]?$/.match?(mn.text) and
+        mn.remove # ignore numbers already inserted
       unless bibliography_bibitem_number_skip(bibitem)
-
         idx += 1
-        bibitem.at(ns(".//docidentifier")).previous =
+        ins.next =
           "<docidentifier type='metanorma-ordinal'>[#{idx}]</docidentifier>"
       end
       idx

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "2.2.1".freeze
+  VERSION = "2.2.2.2".freeze
 end

data/lib/isodoc/xref/xref_gen_seq.rb

@@ -111,7 +111,7 @@ module IsoDoc
       def reqt2class_label(block, model)
         model.req_class_paths.each do |n|
           v1 = ns("/#{n[:xpath]}").sub(%r{^/}, "")
-          block.at("./self::#{v1}") and return [n[:klass], @labels[n[:label]]]
+          block.at("./self::#{v1}") and return [n[:klass], n[:label]]
         end
         [nil, nil]
       end
@@ -119,7 +119,7 @@ module IsoDoc
       def reqt2class_nested_label(block, model)
         model.req_nested_class_paths.each do |n|
           v1 = ns("/#{n[:xpath]}").sub(%r{^/}, "")
-          block.at("./self::#{v1}") and return [n[:klass], @labels[n[:label]]]
+          block.at("./self::#{v1}") and return [n[:klass], n[:label]]
         end
         [nil, nil]
       end

data/lib/isodoc/xref.rb

@@ -24,7 +24,7 @@ module IsoDoc
       @i18n = i18n
       @labels = @i18n.get
       @klass.i18n = @i18n
-      @reqt_models = Metanorma::Requirements
+      @reqt_models = @klass.requirements_processor
         .new({
                default: "default", lang: lang, script: script,
                labels: @i18n.get

data/lib/isodoc-yaml/i18n-ar.yaml

@@ -54,14 +54,6 @@ table: جدول
 requirement: مطلب
 recommendation: توصية
 permission: إذن
-recommendationtest: اختبار التوصية
-requirementtest: اختبار المتطلبات
-permissiontest: اختبار الإذن
-recommendationclass: فئة التوصيات
-requirementclass: فئة المتطلبات
-permissionclass: فئة الأذونات
-abstracttest: اختبار تجريدي
-conformanceclass: فئة المطابقة
 key: مفتاح
 example: مثال
 example_xref: مثال
@@ -94,8 +86,6 @@ month_october: أكتوبر
 month_november: نوفمبر
 month_december: ديسمبر
 obligation: التزام
-subject: موضوع
-inherits: يرث
 admonition:
   danger: خطر
   warning: تحذير

data/lib/isodoc-yaml/i18n-de.yaml

@@ -60,14 +60,6 @@ table: Tabelle
 requirement: Anforderung
 recommendation: Empfehlung
 permission: Erlaubnis
-recommendationtest: Empfehlungstest
-requirementtest: Anforderungstest
-permissiontest: Berechtigungstest
-recommendationclass: Empfehlungsklasse
-requirementclass: Anforderungsklasse
-permissionclass: Berechtigungsklasse
-abstracttest: Abstrakter Test
-conformanceclass: Konformitätsklasse
 key: Taste
 example: BEISPIEL
 example_xref: Beispiel
@@ -100,8 +92,6 @@ month_october: Oktober
 month_november: November
 month_december: Dezember
 obligation: Verbindlichkeit
-subject: Thema
-inherits: Erbt
 admonition: {
   danger: Gefahr,
   warning: Warnung,

data/lib/isodoc-yaml/i18n-en.yaml

@@ -101,8 +101,6 @@ month_october: October
 month_november: November
 month_december: December
 obligation: Obligation
-subject: Subject
-inherits: Inherits
 admonition: {
   danger: Danger,
   warning: Warning,

data/lib/isodoc-yaml/i18n-es.yaml

@@ -60,14 +60,6 @@ table: Tabla
 requirement: Requerimiento
 recommendation: Recomendación
 permission: Permiso
-recommendationtest: Prueba de recomendación
-requirementtest: Prueba de requerimiento
-permissiontest: Prueba de permiso
-recommendationclass: Clase de recomendaciones
-requirementclass: Clase de requerimientos
-permissionclass: Clase de permisos
-abstracttest: Prueba abstracta
-conformanceclass: Clase de conformidad
 key: Clave
 example: EJEMPLO
 example_xref: Ejemplo
@@ -100,8 +92,6 @@ month_october: Octubre
 month_november: Noviembre
 month_december: Diciembre
 obligation: Obligación
-subject: Tema
-inherits: Hereda
 admonition: {
   danger: Peligro,
   warning: Advertencia,

data/lib/isodoc-yaml/i18n-fr.yaml

@@ -57,14 +57,6 @@ table: Tableau
 requirement: Exigence
 recommendation: Recommandation
 permission: Autorisation
-recommendationtest: Test de recommendation
-requirementtest: Test d’exigence
-permissiontest: Test d’autorisation
-recommendationclass: Classe de recommendations
-requirementclass: Classe d’exigences
-permissionclass: Classe d’autorisations
-abstracttest: Test abstrait
-conformanceclass: Classe de confirmité
 key: Légende
 example: EXEMPLE
 example_xref: Exemple
@@ -98,8 +90,6 @@ month_october: Octobre
 month_november: Novembre
 month_december: Décembre
 obligation: Obligation
-subject: Sujet
-inherits: Hérite
 admonition: {
   danger: Danger,
   warning: Avertissement,

data/lib/isodoc-yaml/i18n-ru.yaml

@@ -65,14 +65,6 @@ table: Таблица
 requirement: Требование
 recommendation: Рекомендация
 permission: Разрешение
-recommendationtest: Проверка рекомендации
-requirementtest: Проверка требований
-permissiontest: Проверка разрешения
-recommendationclass: Класс рекомендаций
-requirementclass: Класс требований
-permissionclass: Класс разрешений
-abstracttest: Абстрактная проверка
-conformanceclass: Класс соответствия
 key: Условные обозначения
 example: ПРИМЕР
 example_xref: Пример
@@ -105,8 +97,6 @@ month_october: Октябрь
 month_november: Ноябрь
 month_december: Декабрь
 obligation: Обязательство
-subject: Тема
-inherits: Наследует
 admonition: {
   danger: Опасность,
   warning: Предупреждение,

data/lib/isodoc-yaml/i18n-zh-Hans.yaml

@@ -55,14 +55,6 @@ table: 表
 requirement: 要求
 recommendation: 建议
 permission: 容許
-recommendationtest: 推荐测试
-requirementtest: 需求测试
-permissiontest: 权限测试
-recommendationclass: 推荐类
-requirementclass: 需求类
-permissionclass: 权限类
-abstracttest: 抽象测试
-conformanceclass: 一致性等级
 key: 说明
 example: 示例
 example_xref: 示例
@@ -95,8 +87,6 @@ month_october: 十月
 month_november: 十一月
 month_december: 十二月
 obligation: 义务
-subject: 主体
-inherits: 继承自
 admonition: {
   danger: 危险,
   warning: 警告,

data/lib/relaton/render/general.rb

@@ -1,4 +1,5 @@
 require "relaton-render"
+require "metanorma-utils"
 
 module Relaton
   module Render
@@ -15,21 +16,3 @@ module Relaton
     end
   end
 end
-
-class ::Hash
-  def deep_merge(second)
-    merger = proc { |_, v1, v2|
-      if Hash === v1 && Hash === v2
-        v1.merge(v2, &merger)
-      elsif Array === v1 && Array === v2
-        v1 | v2
-      elsif [:undefined, nil,
-             :nil].include?(v2)
-        v1
-      else
-        v2
-      end
-    }
-    merge(second.to_h, &merger)
-  end
-end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2.2
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-23 00:00:00.000000000 Z
+date: 2022-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath
@@ -108,20 +108,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: metanorma-utils
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.2
 - !ruby/object:Gem::Dependency
   name: mn-requirements
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: relaton-cli
   requirement: !ruby/object:Gem::Requirement
@@ -268,14 +282,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.7
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -398,23 +412,15 @@ files:
 - lib/isodoc-yaml/i18n-ru.yaml
 - lib/isodoc-yaml/i18n-zh-Hans.yaml
 - lib/isodoc.rb
-- lib/isodoc/base_style/all.css
 - lib/isodoc/base_style/all.scss
 - lib/isodoc/base_style/bands.scss
-- lib/isodoc/base_style/blocks.css
 - lib/isodoc/base_style/blocks.scss
-- lib/isodoc/base_style/coverpage.css
 - lib/isodoc/base_style/coverpage.scss
-- lib/isodoc/base_style/defaults.css
 - lib/isodoc/base_style/defaults.scss
-- lib/isodoc/base_style/metanorma_word.css
 - lib/isodoc/base_style/metanorma_word.scss
-- lib/isodoc/base_style/nav.css
 - lib/isodoc/base_style/nav.scss
-- lib/isodoc/base_style/reset.css
 - lib/isodoc/base_style/reset.scss
 - lib/isodoc/base_style/scripts.html
-- lib/isodoc/base_style/typography.css
 - lib/isodoc/base_style/typography.scss
 - lib/isodoc/class_utils.rb
 - lib/isodoc/common.rb
@@ -491,7 +497,7 @@ homepage: https://github.com/metanorma/isodoc
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -506,8 +512,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.16
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: Convert documents in IsoDoc into Word and HTML in AsciiDoc.
 test_files: []

data/lib/isodoc/base_style/all.css

@@ -1,227 +0,0 @@
-html, body, div, span, applet, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-a, abbr, acronym, address, big, cite, code,
-del, dfn, em, img, ins, kbd, q, s, samp,
-small, strike, strong, sub, sup, tt, var,
-b, u, i, center,
-ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, embed,
-figure, figcaption, footer, header, hgroup,
-menu, output, ruby, section, summary,
-time, mark, audio, video {
-  margin: 0;
-  padding: 0; }
-
-html, body, div, span, applet, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-a, abbr, acronym, address, big, cite, code,
-del, dfn, em, img, ins, kbd, q, s, samp,
-small, strike, strong, sub, sup, tt, var,
-b, u, i, center,
-dl, dt, dd, ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, embed,
-figure, figcaption, footer, header, hgroup,
-menu, nav, output, ruby, section, summary,
-time, mark, audio, video {
-  border: 0;
-  font-size: 100%; }
-
-html, body, div, span, applet, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-a, abbr, acronym, address, big, cite, code,
-del, dfn, em, img, ins, kbd, q, s, samp,
-small, strike, strong, tt, var,
-b, u, i, center,
-dl, dd, ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, embed,
-figure, figcaption, footer, header, hgroup,
-menu, nav, output, ruby, section, summary,
-time, mark, audio, video {
-  vertical-align: baseline; }
-
-html, body, div, span, applet, object, iframe,
-p, blockquote,
-a, abbr, acronym, address, big, cite,
-del, dfn, em, img, ins, q, s,
-small, strike, strong, sub, sup, var,
-b, u, i, center,
-dl, dt, dd, ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, embed,
-figure, figcaption, footer, header, hgroup,
-menu, nav, output, ruby, section, summary,
-time, mark, audio, video {
-  font-family: {{bodyfont}}; }
-
-code, pre, tt, kbd, samp {
-  font-family: {{monospacefont}};
-  font-variant-ligatures: none; }
-
-code *, pre *, tt *, kbd *, samp * {
-  font-family: {{monospacefont}} !important;
-  font-variant-ligatures: none; }
-
-p code, dt code, li code, label code, legend code, caption code, th code, td code,
-p tt, dt tt, li tt, label tt, legend tt, caption tt, th tt, td tt,
-p kbd, dt kbd, li kbd, label kbd, legend kbd, caption kbd, th kbd, td kbd,
-p samp, dt samp, li samp, label samp, legend samp, caption samp, th samp, td samp {
-  font-size: {{monospacefontsize}}; }
-
-article, aside, details, figcaption, figure,
-footer, header, hgroup, menu, nav, section {
-  display: block; }
-
-table {
-  border-collapse: collapse;
-  border-spacing: 0; }
-
-h1, h2, h3, h4, h5, h6 {
-  font-family: {{headerfont}}; }
-
-.h1, .h2, .h3, .h4, .h5, .h6 {
-  font-family: {{headerfont}}; }
-
-blockquote, q {
-  quotes: none; }
-  blockquote:before, blockquote:after, q:before, q:after {
-    content: '';
-    content: none; }
-
-.h2Annex {
-  font-family: {{headerfont}}; }
-
-dl {
-  display: grid;
-  grid-template-columns: max-content auto; }
-  dl dt p, dl dd p {
-    margin-top: 0; }
-  dl dt {
-    grid-column-start: 1; }
-  dl dd {
-    grid-column-start: 2; }
-
-b, strong {
-  font-weight: bold; }
-
-div.document-stage-band, div.document-type-band {
-  background-color: #333333; }
-
-a.FootnoteRef + a.FootnoteRef:before {
-  content: ", ";
-  vertical-align: super; }
-
-.addition {
-  color: blue; }
-
-.deletion {
-  color: red;
-  text-decoration: line-through; }
-
-#standard-band {
-  background-color: #0AC442; }
-
-#standard {
-  border-bottom: solid 3px #0AC442; }
-
-#directive-band {
-  background-color: #540D6E; }
-
-#directive {
-  border-bottom: solid 3px #540D6E; }
-
-#guide-band {
-  background-color: #D183C9; }
-
-#guide {
-  border-bottom: solid 3px #D183C9; }
-
-#specification-band {
-  background-color: #65AFFF; }
-
-#specification {
-  border-bottom: solid 3px #65AFFF; }
-
-#report-band {
-  background-color: #3A405A; }
-
-#report {
-  border-bottom: solid 3px #3A405A; }
-
-#amendment-band {
-  background-color: #F26430; }
-
-#amendment {
-  border-bottom: solid 3px #F26430; }
-
-#corrigendum-band {
-  background-color: #C84630; }
-
-#corrigendum {
-  border-bottom: solid 3px #C84630; }
-
-#administrative-band {
-  background-color: #BFAE48; }
-
-#administrative {
-  border-bottom: solid 3px #BFAE48; }
-
-#advisory-band {
-  background-color: #BD9391; }
-
-#advisory {
-  border-bottom: solid 3px #BD9391; }
-
-#proposal-band {
-  background-color: #39A0ED; }
-
-#proposal {
-  border-bottom: solid 3px #39A0ED; }
-
-#working-draft-band {
-  background-color: #2D7393; }
-
-#working-draft {
-  border-bottom: solid 3px #2D7393; }
-
-#committee-draft-band {
-  background-color: #2A6B7C; }
-
-#committee-draft {
-  border-bottom: solid 3px #2A6B7C; }
-
-#draft-standard-band {
-  background-color: #1C7F7A; }
-
-#draft-standard {
-  border-bottom: solid 3px #1C7F7A; }
-
-#final-draft-band {
-  background-color: #53C170; }
-
-#final-draft {
-  border-bottom: solid 3px #53C170; }
-
-#published-band {
-  background-color: #069E2D; }
-
-#published {
-  border-bottom: solid 3px #069E2D; }
-
-#withdrawn-band {
-  background-color: #004E64; }
-
-#withdrawn {
-  border-bottom: solid 3px #004E64; }
-
-#cancelled-band {
-  background-color: #2E382E; }
-
-#cancelled {
-  border-bottom: solid 3px #2E382E; }

data/lib/isodoc/base_style/metanorma_word.css

@@ -1,47 +0,0 @@
-div.table_container {
-  margin-bottom: 14pt; }
-
-ol {
-  margin-bottom: 0cm; }
-
-ul {
-  margin-bottom: 0cm; }
-
-table.MsoISOTable tr {
-  page-break-inside: avoid; }
-
-td {
-  page-break-inside: avoid; }
-
-tr {
-  page-break-after: avoid; }
-
-table.MsoISOTableBig tr {
-  page-break-inside: auto; }
-
-table.MsoISOTableBig td {
-  page-break-inside: auto; }
-
-span.stem {
-  font-family: "Cambria Math",serif;
-  mso-ascii-font-family: "Cambria Math";
-  font-style: italic; }
-
-dt {
-  page-break-inside: avoid;
-  page-break-after: avoid; }
-
-br.section {
-  page-break-before: always;
-  mso-break-type: section-break; }
-
-br.pagebreak {
-  page-break-before: always;
-  mso-special-character: line-break; }
-
-span.addition {
-  color: blue; }
-
-span.deletion {
-  color: red;
-  text-decoration: line-through; }

data/lib/isodoc/base_style/reset.css

@@ -1,125 +0,0 @@
-html, body, div, span, applet, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-a, abbr, acronym, address, big, cite, code,
-del, dfn, em, img, ins, kbd, q, s, samp,
-small, strike, strong, sub, sup, tt, var,
-b, u, i, center,
-ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, embed,
-figure, figcaption, footer, header, hgroup,
-menu, output, ruby, section, summary,
-time, mark, audio, video {
-  margin: 0;
-  padding: 0; }
-
-html, body, div, span, applet, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-a, abbr, acronym, address, big, cite, code,
-del, dfn, em, img, ins, kbd, q, s, samp,
-small, strike, strong, sub, sup, tt, var,
-b, u, i, center,
-dl, dt, dd, ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, embed,
-figure, figcaption, footer, header, hgroup,
-menu, nav, output, ruby, section, summary,
-time, mark, audio, video {
-  border: 0;
-  font-size: 100%; }
-
-html, body, div, span, applet, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-a, abbr, acronym, address, big, cite, code,
-del, dfn, em, img, ins, kbd, q, s, samp,
-small, strike, strong, tt, var,
-b, u, i, center,
-dl, dd, ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, embed,
-figure, figcaption, footer, header, hgroup,
-menu, nav, output, ruby, section, summary,
-time, mark, audio, video {
-  vertical-align: baseline; }
-
-html, body, div, span, applet, object, iframe,
-p, blockquote,
-a, abbr, acronym, address, big, cite,
-del, dfn, em, img, ins, q, s,
-small, strike, strong, sub, sup, var,
-b, u, i, center,
-dl, dt, dd, ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td,
-article, aside, canvas, details, embed,
-figure, figcaption, footer, header, hgroup,
-menu, nav, output, ruby, section, summary,
-time, mark, audio, video {
-  font-family: {{bodyfont}}; }
-
-code, pre, tt, kbd, samp {
-  font-family: {{monospacefont}};
-  font-variant-ligatures: none; }
-
-code *, pre *, tt *, kbd *, samp * {
-  font-family: {{monospacefont}} !important;
-  font-variant-ligatures: none; }
-
-p code, dt code, li code, label code, legend code, caption code, th code, td code,
-p tt, dt tt, li tt, label tt, legend tt, caption tt, th tt, td tt,
-p kbd, dt kbd, li kbd, label kbd, legend kbd, caption kbd, th kbd, td kbd,
-p samp, dt samp, li samp, label samp, legend samp, caption samp, th samp, td samp {
-  font-size: {{monospacefontsize}}; }
-
-article, aside, details, figcaption, figure,
-footer, header, hgroup, menu, nav, section {
-  display: block; }
-
-table {
-  border-collapse: collapse;
-  border-spacing: 0; }
-
-h1, h2, h3, h4, h5, h6 {
-  font-family: {{headerfont}}; }
-
-.h1, .h2, .h3, .h4, .h5, .h6 {
-  font-family: {{headerfont}}; }
-
-blockquote, q {
-  quotes: none; }
-  blockquote:before, blockquote:after, q:before, q:after {
-    content: '';
-    content: none; }
-
-.h2Annex {
-  font-family: {{headerfont}}; }
-
-dl {
-  display: grid;
-  grid-template-columns: max-content auto; }
-  dl dt p, dl dd p {
-    margin-top: 0; }
-  dl dt {
-    grid-column-start: 1; }
-  dl dd {
-    grid-column-start: 2; }
-
-b, strong {
-  font-weight: bold; }
-
-div.document-stage-band, div.document-type-band {
-  background-color: #333333; }
-
-a.FootnoteRef + a.FootnoteRef:before {
-  content: ", ";
-  vertical-align: super; }
-
-.addition {
-  color: blue; }
-
-.deletion {
-  color: red;
-  text-decoration: line-through; }