metanorma-cc 2.1.5 → 2.1.8

data/lib/metanorma/cc/biblio.rng

@@ -225,9 +225,9 @@
         <zeroOrMore>
           <ref name="forename"/>
         </zeroOrMore>
-        <zeroOrMore>
-          <ref name="initial"/>
-        </zeroOrMore>
+        <optional>
+          <ref name="formatted-initials"/>
+        </optional>
         <ref name="surname"/>
         <zeroOrMore>
           <ref name="addition"/>
@@ -247,8 +247,8 @@
       <ref name="LocalizedString"/>
     </element>
   </define>
-  <define name="initial">
-    <element name="initial">
+  <define name="formatted-initials">
+    <element name="formatted-initials">
       <ref name="LocalizedString"/>
     </element>
   </define>
@@ -264,6 +264,9 @@
   </define>
   <define name="forename">
     <element name="forename">
+      <optional>
+        <attribute name="initial"/>
+      </optional>
       <ref name="LocalizedString"/>
     </element>
   </define>

data/lib/metanorma/cc/isodoc.rng

@@ -1285,7 +1285,12 @@
   </define>
   <define name="span">
     <element name="span">
-      <attribute name="class"/>
+      <optional>
+        <attribute name="class"/>
+      </optional>
+      <optional>
+        <attribute name="style"/>
+      </optional>
       <oneOrMore>
         <ref name="TextElement"/>
       </oneOrMore>

data/lib/metanorma/cc/reqt.rng

@@ -108,7 +108,7 @@
     </element>
   </define>
   <define name="label">
-    <element name="label">
+    <element name="identifier">
       <oneOrMore>
         <ref name="TextElement"/>
       </oneOrMore>

data/lib/metanorma/cc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module CC
-    VERSION = "2.1.5".freeze
+    VERSION = "2.1.8".freeze
   end
 end

data/lib/metanorma-cc.rb

@@ -4,8 +4,9 @@ require_relative "isodoc/cc/html_convert"
 require_relative "isodoc/cc/word_convert"
 require_relative "isodoc/cc/pdf_convert"
 require_relative "metanorma/cc/version"
+require "metanorma"
 
-if defined? Metanorma
+if defined? Metanorma::Registry
   require_relative "metanorma/cc"
   Metanorma::Registry.instance.register(Metanorma::CC::Processor)
 end

data/metanorma-cc.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
-  spec.add_dependency "metanorma-generic", "~> 2.1.1"
+  spec.add_dependency "metanorma-generic", "~> 2.2.0"
 
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-cc
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 2.1.8
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-07-18 00:00:00.000000000 Z
+date: 2022-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-generic
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -177,6 +177,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/workflows/rake.yml"
+- ".github/workflows/release.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".rubocop.yml"
@@ -190,21 +191,17 @@ files:
 - bin/setup
 - lib/isodoc/cc/base_convert.rb
 - lib/isodoc/cc/cc.standard.xsl
-- lib/isodoc/cc/html/_coverpage.css
 - lib/isodoc/cc/html/_coverpage.scss
-- lib/isodoc/cc/html/cc.css
 - lib/isodoc/cc/html/cc.scss
 - lib/isodoc/cc/html/dots-w@2x.png
 - lib/isodoc/cc/html/dots@2x.png
 - lib/isodoc/cc/html/header.html
 - lib/isodoc/cc/html/html_cc_intro.html
 - lib/isodoc/cc/html/html_cc_titlepage.html
-- lib/isodoc/cc/html/htmlstyle.css
 - lib/isodoc/cc/html/htmlstyle.scss
 - lib/isodoc/cc/html/scripts.html
 - lib/isodoc/cc/html/word_cc_intro.html
 - lib/isodoc/cc/html/word_cc_titlepage.html
-- lib/isodoc/cc/html/wordstyle.css
 - lib/isodoc/cc/html/wordstyle.scss
 - lib/isodoc/cc/html_convert.rb
 - lib/isodoc/cc/i18n-en.yaml
@@ -233,7 +230,7 @@ homepage: https://github.com/metanorma/metanorma-cc
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -248,8 +245,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: metanorma-cc lets you write CalConnect standards in AsciiDoc.
 test_files: []

data/lib/isodoc/cc/html/_coverpage.css

@@ -1,327 +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; }
-
-.coverpage {
-  text-align: center;
-  padding-left: 1.5em; }
-
-.wrapper-top {
-  background-color: #0e1a85;
-  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAQAAAAEACAYAAABccqhmAAAACXBIWXMAABYlAAAWJQFJUiTwAAADwUlEQVR4nO3YgQ2AMAwDwcAiWZ1NizrH30lIeIEq9nPOGSDqPgC7+93v/suy3Mmvhx+6VAAIcwFAmc4nyzYAIMgGAGEuACirdyBZtgEASTYACHMBQFm9A8myDQBIsgFAmAsAyuodSJZtAECSDQDCXABQVu9AsmwDAJJsABDmAoCyegeSZRsAkGQDgDAXAJTVO5As2wCAJBsAhLkAoKzegWTZBgAk2QAgzAUAZfUOJMs2ACDJBgBhLgAoq3cgWbYBAEk2AAhzAUBZvQPJsg0ASLIBQJgLAMrqHUiWbQBAkg0AwlwAUFbvQLJsAwCSbAAQ5gKAsnoHkmUbAJBkA4AwFwCU1TuQLNsAgCQbAIS5AKCs3oFk2QYAJNkAIMwFAGX1DiTLNgAgyQYAYS4AKKt3IFm2AQBJNgAIcwFAWb0DybINAEiyAUCYCwDK6h1Ilm0AQJINAMJcAFBW70CybAMAkmwAEOYCgLJ6B5JlGwCQZAOAMBcAlNU7kCzbAIAkGwCEuQCgrN6BZNkGACTZACDMBQBl9Q4kyzYAIMkGAGEuACirdyBZtgEASTYACHMBQFm9A8myDQBIsgFAmAsAyuodSJZtAECSDQDCXABQVu9AsmwDAJJsABDmAoCyegeSZRsAkGQDgDAXAJTVO5As2wCAJBsAhLkAoKzegWTZBgAk2QAgzAUAZfUOJMs2ACDJBgBhLgAoq3cgWbYBAEk2AAhzAUBZvQPJsg0ASLIBQJgLAMrqHUiWbQBAkg0AwlwAUFbvQLJsAwCSbAAQ5gKAsnoHkmUbAJBkA4AwFwCU1TuQLNsAgCQbAIS5AKCs3oFk2QYAJNkAIMwFAGX1DiTLNgAgyQYAYS4AKKt3IFm2AQBJNgAIcwFAWb0DybINAEiyAUCYCwDK6h1Ilm0AQJINAMJcAFBW70CybAMAkmwAEOYCgLJ6B5JlGwCQZAOAMBcAlNU7kCzbAIAkGwCEuQCgrN6BZNkGACTZACDMBQBl9Q4kyzYAIMkGAGEuACirdyBZtgEASTYACHMBQFm9A8myDQBIsgFAmAsAyuodSJZtAECSDQDCXABQVu9AsmwDAJJsABDmAoCyegeSZRsAkGQDgDAXAJTVO5As2wCAJBsAhLkAoKzegWTZBgAk2QAgzAUAZfUOJMs2ACDJBgBhLgAoq3cgWbYBAEk2AAhzAUBZvQPJsg0ASLIBQJgLAMrqHUiWbQBAkg0AwlwAUFbvQLJsAwCSbAAQ5gKAsnoHkmUbAJBkA4AwFwCU1TuQLNsAgCQbAFTNzA9ggAr9aahO8QAAAABJRU5ErkJggg==");
-  color: #ffffff;
-  padding: 2em 0; }
-
-.doc-number {
-  font-size: 0.5em;
-  font-family: {{bodyfont}}; }
-
-.coverpage-maturity {
-  font-family: {{bodyfont}};
-  font-weight: 400;
-  font-size: 1em;
-  margin: 0 0 2em 0;
-  text-transform: uppercase; }
-
-.coverpage-title {
-  padding-bottom: 0.5em;
-  font-family: {{headerfont}};
-  font-size: 1.2em;
-  line-height: 1.2em;
-  font-weight: 600;
-  padding-left: 1em;
-  padding-right: 1em; }
-
-.title-section1 {
-  padding: 0 2em 0 3em; }
-
-.prefatory-section {
-  padding: 0 3em 0 6em; }
-
-.zzSTDTitle1, .MsoCommentText {
-  display: none; }
-
-.coverpage-logo span, .coverpage-tc-name span {
-  font-family: {{bodyfont}};
-  text-transform: uppercase;
-  font-weight: 600; }
-
-.coverpage-tc-name {
-  font-size: 1.2em;
-  line-height: 1.2em;
-  margin: 0.25em 0; }
-
-.coverpage-contributors {
-  margin-top: 1em;
-  line-height: 1.5em;
-  font-weight: 300; }
-  .coverpage-contributors .role {
-    font-variant-caps: all-small-caps;
-    background: #f7f7f7;
-    border-radius: 5px;
-    padding: 0.1em 0.5em;
-    margin-left: 1em;
-    color: #485094;
-    font-size: 0.9em;
-    font-weight: 900; }
-  .coverpage-contributors .person {
-    display: block;
-    font-weight: 300; }
-
-.coverpage-doc-identity {
-  font-size: 2em;
-  line-height: 2em; }
-
-.coverpage-title .title-second {
-  display: none; }
-
-.coverpage-stage-block {
-  font-family: {{bodyfont}};
-  font-weight: 700;
-  font-size: 1.25em;
-  margin: 2em 0em 2em 0em;
-  text-transform: uppercase; }
-
-.coverpage-warning {
-  border-top: solid 1px #f36f36;
-  border-bottom: solid 1px #f36f36;
-  margin: 1em 2em;
-  color: #485094;
-  padding: 1em; }
-  .coverpage-warning .title {
-    color: #f36f36;
-    font-family: {{headerfont}};
-    font-weight: 700;
-    text-transform: uppercase;
-    font-size: 1.2em; }
-
-.copyright {
-  padding: 1em;
-  font-size: 0.9em;
-  text-align: left; }
-  .copyright .name, .copyright .address {
-    color: #485094; }