isodoc 2.2.0 → 2.2.3

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

@@ -60,6 +60,15 @@ table: Table
 requirement: Requirement
 recommendation: Recommendation
 permission: Permission
+# OGC
+recommendationtest: Recommendation test
+requirementtest: Requirement test
+permissiontest: Permission test
+recommendationclass: Recommendations class
+requirementclass: Requirements class
+permissionclass: Permissions class
+abstracttest: Abstract test
+conformanceclass: Conformance class
 key: Key
 example: EXAMPLE
 example_xref: Example
@@ -92,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

@@ -92,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

@@ -90,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

@@ -97,8 +97,6 @@ month_october: Октябрь
 month_november: Ноябрь
 month_december: Декабрь
 obligation: Обязательство
-subject: Тема
-inherits: Наследует
 admonition: {
   danger: Опасность,
   warning: Предупреждение,

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

@@ -87,8 +87,6 @@ month_october: 十月
 month_november: 十一月
 month_december: 十二月
 obligation: 义务
-subject: 主体
-inherits: 继承自
 admonition: {
   danger: 危险,
   warning: 警告,

data/lib/relaton/render/general.rb

@@ -1,11 +1,15 @@
 require "relaton-render"
+require "metanorma-utils"
 
 module Relaton
   module Render
     module IsoDoc
       class General < ::Relaton::Render::General
+        Hash.include Metanorma::Utils::Hash
+
         def config_loc
-          YAML.load_file(File.join(File.dirname(__FILE__), "config.yml"))
+          YAML.load_file(File.join(File.dirname(__FILE__),
+                                   "config.yml"))
         end
 
         def read_config
@@ -15,21 +19,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.0
+  version: 2.2.3
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-08 00:00:00.000000000 Z
+date: 2022-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.7
 - !ruby/object:Gem::Dependency
   name: liquid
   requirement: !ruby/object:Gem::Requirement
@@ -110,6 +110,20 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: metanorma-utils
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.4.0
+- !ruby/object:Gem::Dependency
+  name: mn2pdf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -122,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mn-requirements
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: relaton-cli
   requirement: !ruby/object:Gem::Requirement
@@ -140,16 +168,16 @@ dependencies:
   name: relaton-render
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: roman-numerals
   requirement: !ruby/object:Gem::Requirement
@@ -262,20 +290,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.7'
-- !ruby/object:Gem::Dependency
-  name: metanorma-iso
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !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
@@ -448,6 +454,7 @@ files:
 - lib/isodoc/html_function/postprocess.rb
 - lib/isodoc/html_function/postprocess_footnotes.rb
 - lib/isodoc/i18n.rb
+- lib/isodoc/init.rb
 - lib/isodoc/metadata.rb
 - lib/isodoc/metadata_contributor.rb
 - lib/isodoc/metadata_date.rb
@@ -457,6 +464,7 @@ files:
 - lib/isodoc/presentation_function/image.rb
 - lib/isodoc/presentation_function/inline.rb
 - lib/isodoc/presentation_function/math.rb
+- lib/isodoc/presentation_function/refs.rb
 - lib/isodoc/presentation_function/section.rb
 - lib/isodoc/presentation_function/terms.rb
 - lib/isodoc/presentation_function/xrefs.rb
@@ -489,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
@@ -504,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; }