metanorma-cc 1.5.6 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d512119733aec0e381d969a3bb23f3908caaa3953cc1ed7524a9d3e727e639c0
-  data.tar.gz: f26c2d06edb3a888bc8bc2b1214e897eca07e0d3fa6acdc9ae94b745f44fc328
+  metadata.gz: a9a16aa57594eeb9bef5c56b9435acf45b50117ffb83ab9ab06cf6d66259f24b
+  data.tar.gz: 229912575e2ffcd0eb934f735a1f385379e26da956cbc570ee497101152e58ca
 SHA512:
-  metadata.gz: d5187f1fbe65adb3644ae800c8b47be62e7be2c24d8c43266ff50cc01bbb060889cea81c1bd3173d510606ca924fa9054222762d66582974b3226af256dd2078
-  data.tar.gz: 03c5867a2464256d539ef13936be713653bc512a1cdb447af78de3dc0378508e31d7ab8d52cf34acc71af9f70f6aef9614ddfe55775902bed9b923886e01c8b4
+  metadata.gz: a437b86bcf50b69dbab264452d7ca220cf6890752caafab2fa02981903b8ff96e5da5cee23e9e77c19cc35d8ba1583edfcb95dbb40aadc9824c652ac3e95e997
+  data.tar.gz: d0fbcc7e60a6238876f028dd857261e083a1aa05751b2fb7bfd0ace712bde1c859e82397f9f1639d756e8ffcb830f2b3a22ba43145199bbe67ce35a649d4522a

data/.github/workflows/rake.yml

@@ -4,7 +4,8 @@ name: rake
 
 on:
   push:
-    branches: [ master ]
+    branches: [ master, main  ]
+    tags: [ v* ]
   pull_request:
 
 jobs:
@@ -31,14 +32,32 @@ jobs:
     steps:
       - uses: actions/checkout@master
 
-      - name: Use Ruby
-        uses: ruby/setup-ruby@v1
+      - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true
 
-      - name: Update gems
-        run: bundle install --jobs 4 --retry 3
+      - uses: actions/cache@v1
+        with:
+          path: vendor/bundle
+          key: bundle-${{ matrix.os }}-${{ matrix.ruby }}-${{ hashFiles('**/*.gemspec') }}
+          restore-keys: bundle-${{ matrix.os }}-${{ matrix.ruby }}
+
+      - run: bundle config set path 'vendor/bundle'
+
+      - run: bundle install --jobs 4 --retry 3
 
-      - name: Run specs
-        run: bundle exec rake
+      - run: bundle exec rake
+
+  notify:
+    name: Trigger notify workflow
+    needs: rake
+    runs-on: ubuntu-latest
+    steps:
+      - name: Trigger notify workflow
+        uses: Sibz/github-status-action@v1
+        with:
+          authToken: ${{ secrets.GITHUB_TOKEN }}
+          context: 'tests-passed-successfully'
+          description: 'Tests passed successfully'
+          state: 'success'
+          sha: ${{ github.event.pull_request.head.sha || github.sha }}

data/README.adoc

@@ -1,18 +1,14 @@
 = metanorma-cc: Metanorma processor for CalConnect standards
 
 image:https://img.shields.io/gem/v/metanorma-cc.svg["Gem Version", link="https://rubygems.org/gems/metanorma-cc"]
-image:https://github.com/metanorma/metanorma-cc/workflows/macos/badge.svg["Build Status (macOS)", link="https://github.com/metanorma/metanorma-cc/actions?workflow=macos"]
-image:https://github.com/metanorma/metanorma-cc/workflows/ubuntu/badge.svg["Build Status (ubuntu)", link="https://github.com/metanorma/metanorma-cc/actions?workflow=ubuntu"]
-image:https://github.com/metanorma/metanorma-cc/workflows/windows/badge.svg["Build Status (Windows)", link="https://github.com/metanorma/metanorma-cc/actions?workflow=windows"]
+image:https://github.com/metanorma/metanorma-cc/workflows/rake/badge.svg["Build Status", link="https://github.com/metanorma/metanorma-cc/actions?workflow=rake"]
 image:https://codeclimate.com/github/metanorma/metanorma-cc/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/metanorma/metanorma-cc"]
 image:https://img.shields.io/github/issues-pr-raw/metanorma/metanorma-cc.svg["Pull Requests", link="https://github.com/metanorma/metanorma-cc/pulls"]
 image:https://img.shields.io/github/commits-since/metanorma/metanorma-cc/latest.svg["Commits since latest",link="https://github.com/metanorma/metanorma-cc/releases"]
 
-_Formerly known as_ `asciidoctor-csd`, `metanorma-csd`.
-
 == Functionality
 
-This gem processes http://asciidoctor.org/[Asciidoctor] documents following
+This gem processes https://www.metanorma.com/[Metanorma documents] following
 the Metanorma model for generating CalConnect Standards.
 
 The gem currently inherits from the https://github.com/metanorma/metanorma-standoc
@@ -59,3 +55,6 @@ See https://www.metanorma.com/author/cc/[Author CalConnect documents with Metano
 * Example documents are avalable at the https://github.com/metanorma/mn-samples-cc[mn-samples-cc] repository.
 * Document templates are available at the https://github.com/metanorma/mn-templates-cc[mn-templates-cc] repository.
 
+== Notes
+
+Metanorma-CC was formerly published as `asciidoctor-csd` and `metanorma-csd`.

data/lib/asciidoctor/cc/cc.rng

@@ -86,7 +86,7 @@
       </element>
     </define>
     <define name="technical-committee">
-      <element name="technical-committee">
+      <element name="committee">
         <optional>
           <attribute name="type"/>
         </optional>

data/lib/asciidoctor/cc/converter.rb

@@ -4,24 +4,33 @@ require "isodoc/cc/word_convert"
 require "isodoc/cc/presentation_xml_convert"
 require "metanorma/cc"
 require "asciidoctor/standoc/converter"
-require "fileutils"
-require_relative "validate"
+require 'asciidoctor/generic/converter'
 require_relative "validate_section"
-require_relative "front"
 
 module Asciidoctor
   module CC
-
-    # A {Converter} implementation that generates CC output, and a document
-    # schema encapsulation of the document for validation
-    class Converter < Standoc::Converter
+    class Converter < Asciidoctor::Generic::Converter
       XML_ROOT_TAG = "csd-standard".freeze
       XML_NAMESPACE = "https://www.metanorma.org/ns/csd".freeze
 
       register_for "cc"
 
-      def initialize(backend, opts)
-        super
+      def configuration
+        Metanorma::CC.configuration
+      end
+
+      def metadata_committee(node, xml)
+        return unless node.attr("technical-committee")
+        xml.editorialgroup do |a|
+          a.committee node.attr("technical-committee"),
+            **attr_code(type: node.attr("technical-committee-type"))
+          i = 2
+          while node.attr("technical-committee_#{i}") do
+            a.committee node.attr("technical-committee_#{i}"),
+              **attr_code(type: node.attr("technical-committee-type_#{i}"))
+            i += 1
+          end
+        end
       end
 
       def outputs(node, ret)
@@ -35,23 +44,6 @@ module Asciidoctor
                                        nil, false, "#{@filename}.pdf")
       end
 
-      def validate(doc)
-        content_validate(doc)
-        schema_validate(formattedstr_strip(doc.dup),
-                        File.join(File.dirname(__FILE__), "cc.rng"))
-      end
-
-      def sections_cleanup(x)
-        super
-        x.xpath("//*[@inline-header]").each do |h|
-          h.delete("inline-header")
-        end
-      end
-
-      def style(n, t)
-        return
-      end
-
       def html_converter(node)
         IsoDoc::CC::HtmlConvert.new(html_extract_attributes(node))
       end

data/lib/asciidoctor/cc/isodoc.rng

@@ -24,6 +24,14 @@
     <start>
       <ref name="standard-document"/>
     </start>
+    <define name="doctype">
+      <element name="doctype">
+        <optional>
+          <attribute name="abbreviation"/>
+        </optional>
+        <ref name="DocumentType"/>
+      </element>
+    </define>
     <define name="hyperlink">
       <element name="link">
         <attribute name="target">
@@ -141,6 +149,11 @@
             <data type="boolean"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="key">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <oneOrMore>
           <ref name="dt"/>
           <ref name="dd"/>

data/lib/asciidoctor/cc/validate_section.rb

@@ -1,8 +1,9 @@
 require "nokogiri"
+require "metanorma-generic"
 
 module Asciidoctor
   module CC
-    class Converter < Standoc::Converter
+    class Converter < Asciidoctor::Generic::Converter
       def section_validate(doc)
         advisory = doc.root.at("//bibdata/ext[doctype = 'advisory']")
         symbols_validate(doc.root) unless advisory

data/lib/isodoc/cc/base_convert.rb

@@ -3,18 +3,8 @@ require "isodoc"
 module IsoDoc
   module CC
     module BaseConvert
-      def cleanup(docxml)
-        super
-        term_cleanup(docxml)
-      end
-
-      def term_cleanup(docxml)
-        docxml.xpath("//p[@class = 'Terms']").each do |d|
-          h2 = d.at("./preceding-sibling::*[@class = 'TermNum'][1]")
-          h2.add_child(" ")
-          h2.add_child(d.remove)
-        end
-        docxml
+      def configuration
+        Metanorma::CC.configuration
       end
     end
   end

data/lib/isodoc/cc/csd.standard.xsl

@@ -853,13 +853,22 @@
 		<title-part lang="en">
 			
 			
+			
 		</title-part>
 		<title-part lang="fr">
 			
 			
+			
 		</title-part>		
 		<title-part lang="zh">第 # 部分:</title-part>
 		
+		<title-subpart lang="en">			
+			
+		</title-subpart>
+		<title-subpart lang="fr">		
+			
+		</title-subpart>
+		
 		<title-modified lang="en">modified</title-modified>
 		<title-modified lang="fr">modifiée</title-modified>
 		
@@ -1328,7 +1337,9 @@
 		
 		
 		
-		
+		<!-- <xsl:if test="$namespace = 'bipm'">
+			<fo:block>&#xA0;</fo:block>				
+		</xsl:if> -->
 		
 		<!-- $namespace = 'iso' or  -->
 		
@@ -1493,6 +1504,7 @@
 		<xsl:if test="normalize-space() != ''">
 			<fo:block xsl:use-attribute-sets="table-name-style">
 				
+				
 				<xsl:apply-templates/>				
 			</fo:block>
 		</xsl:if>
@@ -1846,6 +1858,7 @@
 				
 				
 				
+				
 				<!-- <xsl:if test="$namespace = 'bipm'">
 					<xsl:attribute name="height">8mm</xsl:attribute>
 				</xsl:if> -->
@@ -1931,7 +1944,8 @@
 				</xsl:attribute>
 			</xsl:if>
 			<xsl:call-template name="display-align"/>
-			<fo:block>								
+			<fo:block>
+								
 				<xsl:apply-templates/>
 			</fo:block>			
 		</fo:table-cell>
@@ -2143,7 +2157,11 @@
 			<xsl:apply-templates/>
 		</fo:inline>
 	</xsl:template><xsl:template match="*[local-name()='dl']">
-		<fo:block-container margin-left="0mm">
+		<fo:block-container>
+			
+				<xsl:attribute name="margin-left">0mm</xsl:attribute>
+			
+			
 			<xsl:if test="parent::*[local-name() = 'note']">
 				<xsl:attribute name="margin-left">
 					<xsl:choose>
@@ -2153,8 +2171,11 @@
 				</xsl:attribute>
 				
 			</xsl:if>
-			<fo:block-container margin-left="0mm">
-	
+			<fo:block-container>
+				
+					<xsl:attribute name="margin-left">0mm</xsl:attribute>
+				
+				
 				<xsl:variable name="parent" select="local-name(..)"/>
 				
 				<xsl:variable name="key_iso">
@@ -2168,9 +2189,12 @@
 							<fo:block margin-bottom="12pt" text-align="left">
 								
 								<xsl:variable name="title-where">
-									<xsl:call-template name="getTitle">
-										<xsl:with-param name="name" select="'title-where'"/>
-									</xsl:call-template>
+									
+									
+										<xsl:call-template name="getTitle">
+											<xsl:with-param name="name" select="'title-where'"/>
+										</xsl:call-template>
+									
 								</xsl:variable>
 								<xsl:value-of select="$title-where"/><xsl:text> </xsl:text>
 								<xsl:apply-templates select="*[local-name()='dt']/*"/>
@@ -2186,9 +2210,12 @@
 							
 							
 							<xsl:variable name="title-where">
-								<xsl:call-template name="getTitle">
-									<xsl:with-param name="name" select="'title-where'"/>
-								</xsl:call-template>
+								
+								
+									<xsl:call-template name="getTitle">
+										<xsl:with-param name="name" select="'title-where'"/>
+									</xsl:call-template>
+																
 							</xsl:variable>
 							<xsl:value-of select="$title-where"/>
 						</fo:block>
@@ -2199,9 +2226,12 @@
 							
 							
 							<xsl:variable name="title-key">
-								<xsl:call-template name="getTitle">
-									<xsl:with-param name="name" select="'title-key'"/>
-								</xsl:call-template>
+								
+								
+									<xsl:call-template name="getTitle">
+										<xsl:with-param name="name" select="'title-key'"/>
+									</xsl:call-template>
+								
 							</xsl:variable>
 							<xsl:value-of select="$title-key"/>
 						</fo:block>
@@ -2774,7 +2804,18 @@
 				<xsl:with-param name="previousRow" select="$newRow"/>
 		</xsl:apply-templates>
 	</xsl:template><xsl:template name="getLang">
-		<xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/>
+		<xsl:variable name="language_current" select="normalize-space(//*[local-name()='bibdata']//*[local-name()='language'][@current = 'true'])"/>
+		<xsl:variable name="language">
+			<xsl:choose>
+				<xsl:when test="$language_current != ''">
+					<xsl:value-of select="$language_current"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:value-of select="//*[local-name()='bibdata']//*[local-name()='language']"/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+		
 		<xsl:choose>
 			<xsl:when test="$language = 'English'">en</xsl:when>
 			<xsl:otherwise><xsl:value-of select="$language"/></xsl:otherwise>
@@ -2809,6 +2850,7 @@
 		<xsl:value-of select="substring($str, 2)"/>		
 	</xsl:template><xsl:template match="mathml:math">
 		<fo:inline font-family="STIX Two Math"> <!--  -->
+			
 			<xsl:variable name="mathml">
 				<xsl:apply-templates select="." mode="mathml"/>
 			</xsl:variable>
@@ -2891,10 +2933,14 @@
 		</fo:inline>		
 	</xsl:template><xsl:template match="*[local-name() = 'modification']">
 		<xsl:variable name="title-modified">
-			<xsl:call-template name="getTitle">
-				<xsl:with-param name="name" select="'title-modified'"/>
-			</xsl:call-template>
+			
+			
+				<xsl:call-template name="getTitle">
+					<xsl:with-param name="name" select="'title-modified'"/>
+				</xsl:call-template>
+			
 		</xsl:variable>
+		
 		<xsl:choose>
 			<xsl:when test="$lang = 'zh'"><xsl:text>、</xsl:text><xsl:value-of select="$title-modified"/><xsl:text>—</xsl:text></xsl:when>
 			<xsl:otherwise><xsl:text>, </xsl:text><xsl:value-of select="$title-modified"/><xsl:text> — </xsl:text></xsl:otherwise>
@@ -3619,9 +3665,14 @@
 			
 				<fo:inline>
 					
-					<xsl:call-template name="getTitle">
-						<xsl:with-param name="name" select="'title-source'"/>
-					</xsl:call-template>
+					
+					
+					
+						<xsl:call-template name="getTitle">
+							<xsl:with-param name="name" select="'title-source'"/>
+						</xsl:call-template>
+					
+					
 					<xsl:text>: </xsl:text>
 				</fo:inline>
 			
@@ -3774,9 +3825,12 @@
 		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'deprecates']">
 		<xsl:variable name="title-deprecated">
-			<xsl:call-template name="getTitle">
-				<xsl:with-param name="name" select="'title-deprecated'"/>
-			</xsl:call-template>
+			
+			
+				<xsl:call-template name="getTitle">
+					<xsl:with-param name="name" select="'title-deprecated'"/>
+				</xsl:call-template>
+			
 		</xsl:variable>
 		<fo:block xsl:use-attribute-sets="deprecates-style">
 			<xsl:value-of select="$title-deprecated"/>: <xsl:apply-templates/>
@@ -4142,13 +4196,22 @@
 	</xsl:template><xsl:template name="split">
 		<xsl:param name="pText" select="."/>
 		<xsl:param name="sep" select="','"/>
+		<xsl:param name="normalize-space" select="'true'"/>
 		<xsl:if test="string-length($pText) &gt;0">
 		<item>
-			<xsl:value-of select="normalize-space(substring-before(concat($pText, ','), $sep))"/>
+			<xsl:choose>
+				<xsl:when test="$normalize-space = 'true'">
+					<xsl:value-of select="normalize-space(substring-before(concat($pText, $sep), $sep))"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:value-of select="substring-before(concat($pText, $sep), $sep)"/>
+				</xsl:otherwise>
+			</xsl:choose>
 		</item>
 		<xsl:call-template name="split">
 			<xsl:with-param name="pText" select="substring-after($pText, $sep)"/>
 			<xsl:with-param name="sep" select="$sep"/>
+			<xsl:with-param name="normalize-space" select="$normalize-space"/>
 		</xsl:call-template>
 		</xsl:if>
 	</xsl:template><xsl:template name="getDocumentId">		
@@ -4214,4 +4277,23 @@
 				<xsl:with-param name="letter-spacing" select="$letter-spacing"/>
 			</xsl:call-template>
 		</xsl:if>
+	</xsl:template><xsl:template name="repeat">
+		<xsl:param name="char" select="'*'"/>
+		<xsl:param name="count"/>
+		<xsl:if test="$count &gt; 0">
+			<xsl:value-of select="$char"/>
+			<xsl:call-template name="repeat">
+				<xsl:with-param name="char" select="$char"/>
+				<xsl:with-param name="count" select="$count - 1"/>
+			</xsl:call-template>
+		</xsl:if>
+	</xsl:template><xsl:template name="getLocalizedString">
+		<xsl:param name="key"/>		
+		
+		<xsl:variable name="curr_lang">
+			<xsl:call-template name="getLang"/>
+		</xsl:variable>
+		
+		<xsl:value-of select="/*/*[local-name() = 'localized-strings']/*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
+		
 	</xsl:template></xsl:stylesheet>

data/lib/isodoc/cc/html_convert.rb

@@ -1,4 +1,5 @@
 require_relative "base_convert"
+require "isodoc/generic/html_convert"
 require_relative "init"
 require "isodoc"
 
@@ -6,44 +7,7 @@ module IsoDoc
   module CC
     # A {Converter} implementation that generates CC output, and a document
     # schema encapsulation of the document for validation
-    class HtmlConvert < IsoDoc::HtmlConvert
-      def initialize(options)
-        @libdir = File.dirname(__FILE__)
-        super
-      end
-
-      def default_fonts(options)
-        {
-          bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' : '"Source Sans Pro",sans-serif'),
-          headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' : '"Source Sans Pro",sans-serif'),
-          monospacefont: '"Source Code Pro",monospace'
-        }
-      end
-
-      def default_file_locations(options)
-        {
-          htmlstylesheet: html_doc_path("htmlstyle.scss"),
-          htmlcoverpage: html_doc_path("html_cc_titlepage.html"),
-          htmlintropage: html_doc_path("html_cc_intro.html"),
-          scripts: html_doc_path("scripts.html"),
-        }
-      end
-
-      def googlefonts()
-        <<~HEAD.freeze
-    <link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,400i,700&display=swap" rel="stylesheet">
-    <link href="https://fonts.googleapis.com/css2?family=Source+Code+Pro:ital,wght@0,400;0,700;1,400;1,700&display=swap" rel="stylesheet">
-        HEAD
-      end
-
-      def make_body(xml, docxml)
-        body_attr = { lang: "EN-US", link: "blue", vlink: "#954F72", "xml:lang": "EN-US", class: "container" }
-        xml.body **body_attr do |body|
-          make_body1(body, docxml)
-          make_body2(body, docxml)
-          make_body3(body, docxml)
-        end
-      end
+    class HtmlConvert < IsoDoc::Generic::HtmlConvert
 
       include BaseConvert
       include Init

data/lib/isodoc/cc/i18n.rb

@@ -1,9 +1,8 @@
 module IsoDoc
   module CC
-    class I18n < IsoDoc::I18n
-      def load_yaml1(lang, script)
-        y = YAML.load_file(File.join(File.dirname(__FILE__), "i18n-en.yaml"))
-        super.merge(y)
+    class I18n < IsoDoc::Generic::I18n
+      def configuration
+        Metanorma::CC.configuration
       end
     end
   end

data/lib/isodoc/cc/init.rb

@@ -11,7 +11,8 @@ module IsoDoc
       end
 
       def xref_init(lang, script, klass, i18n, options)
-        @xrefs = Xref.new(lang, script, HtmlConvert.new(language: lang, script: script), i18n, options)
+        html = HtmlConvert.new(language: lang, script: script)
+        @xrefs = Xref.new(lang, script, html, i18n, options)
       end
 
       def i18n_init(lang, script, i18nyaml = nil)

data/lib/isodoc/cc/metadata.rb

@@ -3,9 +3,11 @@ require "metanorma/cc"
 
 module IsoDoc
   module CC
-    # A {Converter} implementation that generates CC output, and a document
-    # schema encapsulation of the document for validation
-    class Metadata < IsoDoc::Metadata
+    class Metadata < IsoDoc::Generic::Metadata
+      def configuration
+        Metanorma::CC.configuration
+      end
+
       def initialize(lang, script, labels)
         super
         set(:tc, "XXXX")
@@ -21,7 +23,7 @@ module IsoDoc
       end
 
       def author(isoxml, _out)
-        tc = isoxml.at(ns("//bibdata/ext/editorialgroup/technical-committee"))
+        tc = isoxml.at(ns("//bibdata/ext/editorialgroup/committee"))
         set(:tc, tc.text) if tc
         super
       end
@@ -38,24 +40,6 @@ module IsoDoc
         set(:roles_authors_affiliations, persons)
         super
       end
-
-      def docid(isoxml, _out)
-        docnumber = isoxml.at(ns("//bibdata/docidentifier"))
-        prefix = "CC"
-        if docnumber.nil?
-          set(:docnumber, prefix)
-        else
-          set(:docnumber, docnumber.text)
-        end
-      end
-
-      def stage_abbr(status)
-        ::Metanorma::CC::DOCSTATUS[status] || ""
-      end
-
-      def unpublished(status)
-        !%w(published withdrawn).include? status.downcase
-      end
     end
   end
 end

data/lib/isodoc/cc/pdf_convert.rb

@@ -1,4 +1,5 @@
 require_relative "base_convert"
+require "metanorma-generic"
 require "isodoc"
 
 module IsoDoc

data/lib/isodoc/cc/presentation_xml_convert.rb

@@ -1,9 +1,10 @@
 require_relative "init"
+require "metanorma-generic"
 require "isodoc"
 
 module IsoDoc
   module CC
-    class PresentationXMLConvert < IsoDoc::PresentationXMLConvert
+    class PresentationXMLConvert < IsoDoc::Generic::PresentationXMLConvert
       def annex1(f)
         lbl = @xrefs.anchor(f['id'], :label)
         if t = f.at(ns("./title"))

data/lib/isodoc/cc/word_convert.rb

@@ -1,4 +1,5 @@
 require_relative "base_convert"
+require "isodoc/generic/word_convert"
 require_relative "init"
 require "isodoc"
 
@@ -6,31 +7,7 @@ module IsoDoc
   module CC
     # A {Converter} implementation that generates CSD output, and a document
     # schema encapsulation of the document for validation
-    class WordConvert < IsoDoc::WordConvert
-      def initialize(options)
-        @libdir = File.dirname(__FILE__)
-        super
-      end
-
-      def default_fonts(options)
-        {
-          bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' : '"Source Sans Pro","Arial",sans-serif'),
-          headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' : '"Source Sans Pro","Arial",sans-serif'),
-          monospacefont: '"Source Code Pro","Courier New",monospace'
-        }
-      end
-
-      def default_file_locations(options)
-        {
-          wordstylesheet: html_doc_path("wordstyle.scss"),
-          standardstylesheet: html_doc_path("cc.scss"),
-          header: html_doc_path("header.html"),
-          wordcoverpage: html_doc_path("word_cc_titlepage.html"),
-          wordintropage: html_doc_path("word_cc_intro.html"),
-          ulstyle: "l3",
-          olstyle: "l2",
-        }
-      end
+    class WordConvert < IsoDoc::Generic::WordConvert
 
       include BaseConvert
       include Init

data/lib/isodoc/cc/xref.rb

@@ -1,6 +1,6 @@
 module IsoDoc
   module CC
-    class Xref < IsoDoc::Xref
+    class Xref < IsoDoc::Generic::Xref
     end
   end
 end

data/lib/metanorma/cc.rb

@@ -1,29 +1,32 @@
+require "metanorma"
+require "metanorma-generic"
 require_relative "./cc/processor"
 
 module Metanorma
   module CC
+    class Configuration < Metanorma::Generic::Configuration
+      def initialize(*args)
+        super
+      end
+    end
 
-    DOCSUFFIX = {
-      "standard" => "",
-      "directive" => "DIR",
-      "guide" => "Guide",
-      "specification" => "S",
-      "report" => "R",
-      "amendment" => "Amd",
-      "technical-corrigendum" => "Cor",
-      "administrative" => "A",
-      "advisory" => "Adv",
-    }
+    class << self
+      extend Forwardable
 
-    DOCSTATUS = {
-      "working-draft" => "WD",
-      "committee-draft" => "CD",
-      "draft-standard" => "DS",
-      "final-draft" => "FDS",
-      "published" => "",
-      "cancelled" => "",
-      "withdrawn" => "",
-    }
+      attr_accessor :configuration
 
+      Configuration::CONFIG_ATTRS.each do |attr_name|
+        def_delegator :@configuration, attr_name
+      end
+
+      def configure
+        self.configuration ||= Configuration.new
+        yield(configuration)
+      end
+    end
+
+    configure {}
   end
 end
+Metanorma::Registry.instance.register(Metanorma::CC::Processor)
+

data/lib/metanorma/cc/processor.rb

@@ -10,7 +10,7 @@ module Metanorma
       }
     end
 
-    class Processor < Metanorma::Processor
+    class Processor < Metanorma::Generic::Processor
 
       def initialize
         @short = [:csd, :cc]

data/lib/metanorma/cc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module CC
-    VERSION = "1.5.6"
+    VERSION = "1.6.0"
   end
 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.4.0")
 
-  spec.add_dependency "metanorma-standoc", "~> 1.6.0"
+  spec.add_dependency "metanorma-generic", "~> 1.7.0"
   spec.add_dependency "isodoc", "~> 1.2.0"
 
   spec.add_development_dependency "byebug", "~> 9.1"

data/metanorma.yml

@@ -0,0 +1,52 @@
+metanorma_name: cc
+organization_name_short: CalConnect
+organization_name_long: CalConnect
+document_namespace: https://www.metanorma.org/ns/csd
+xml_root_tag: csd-standard
+html_bodyfont: '"Source Sans Pro",sans-serif'
+html_headerfont: '"Source Sans Pro",sans-serif'
+html_monospacefont: '"Source Code Pro",monospace'
+validate_rng_file: lib/asciidoctor/cc/cc.rng
+htmlcoverpage: lib/isodoc/cc/html/html_cc_titlepage.html
+htmlintropage: lib/isodoc/cc/html/html_cc_intro.html
+htmlstylesheet: lib/isodoc/cc/html/htmlstyle.scss
+scripts: lib/isodoc/cc/html/scripts.html
+i18nyaml: lib/isodoc/cc/i18n-en.yaml
+word_bodyfont: '"Source Sans Pro","Arial",sans-serif'
+word_headerfont: '"Source Sans Pro","Arial",sans-serif'
+word_monospacefont: '"Source Code Pro","Courier New",monospace'
+standardstylesheet: lib/isodoc/cc/html/cc.scss
+header: lib/isodoc/cc/html/header.html
+wordcoverpage: lib/isodoc/cc/html/word_cc_titlepage.html
+wordintropage: lib/isodoc/cc/html/word_cc_intro.html
+wordstylesheet: lib/isodoc/cc/html/wordstyle.scss
+webfont:
+  - "https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,400i,700"
+  - "https://fonts.googleapis.com/css2?family=Source+Code+Pro:ital,wght@0,400;0,700;1,400;1,700"
+docid_template: "CC{% if doctype_abbr %}/{{ doctype_abbr }}{%endif%}{% if stageabbr %}/{{ stageabbr }}{%endif%} {{ docnumeric }}{% if docyear %}:{{docyear}}{%endif%}"
+doctypes:
+  standard: 
+  directive: DIR
+  guide: Guide
+  specification: S
+  report: R
+  amendment: Amd
+  technical-corrigendum: Cor
+  administrative: A
+  advisory: Adv
+default_doctype: standard
+published_stages:
+  - published
+  - cancelled
+  - withdrawn
+default_stage: published
+stage_abbreviations:
+  working-draft: WD
+  committee-draft: CD
+  draft-standard: DS
+  final-draft: FDS
+  published:
+  cancelled:
+  withdrawn:
+logo_path: ""
+

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-cc
 version: !ruby/object:Gem::Version
-  version: 1.5.6
+  version: 1.6.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-25 00:00:00.000000000 Z
+date: 2020-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: metanorma-standoc
+  name: metanorma-generic
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: isodoc
   requirement: !ruby/object:Gem::Requirement
@@ -210,10 +210,8 @@ files:
 - lib/asciidoctor/cc/boilerplate.xml
 - lib/asciidoctor/cc/cc.rng
 - lib/asciidoctor/cc/converter.rb
-- lib/asciidoctor/cc/front.rb
 - lib/asciidoctor/cc/isodoc.rng
 - lib/asciidoctor/cc/reqt.rng
-- lib/asciidoctor/cc/validate.rb
 - lib/asciidoctor/cc/validate_section.rb
 - lib/isodoc/cc/base_convert.rb
 - lib/isodoc/cc/csd.standard.xsl
@@ -247,6 +245,7 @@ files:
 - lib/metanorma/cc/processor.rb
 - lib/metanorma/cc/version.rb
 - metanorma-cc.gemspec
+- metanorma.yml
 homepage: https://github.com/metanorma/metanorma-cc
 licenses:
 - BSD-2-Clause

data/lib/asciidoctor/cc/front.rb

@@ -1,67 +0,0 @@
-require "asciidoctor"
-require "asciidoctor/standoc/converter"
-require "fileutils"
-
-module Asciidoctor
-  module CC
-    class Converter < Standoc::Converter
-      def default_publisher
-        "CalConnect"
-      end
-
-      def metadata_committee(node, xml)
-        return unless node.attr("technical-committee")
-        xml.editorialgroup do |a|
-          a.technical_committee node.attr("technical-committee"),
-            **attr_code(type: node.attr("technical-committee-type"))
-          i = 2
-          while node.attr("technical-committee_#{i}") do
-            a.technical_committee node.attr("technical-committee_#{i}"),
-              **attr_code(type: node.attr("technical-committee-type_#{i}"))
-            i += 1
-          end
-        end
-      end
-
-      def metadata_status(node, xml)
-        status = node.attr("status")
-        unless status && ::Metanorma::CC::DOCSTATUS.keys.include?(status)
-          @log.add("Document Attributes", nil, "#{status} is not a legal status")
-        end
-        super
-      end
-
-      def prefix_id(node)
-        prefix = "CC"
-        typesuffix = ::Metanorma::CC::DOCSUFFIX[doctype(node)] || ""
-        prefix += "/#{typesuffix}" unless typesuffix.empty?
-        status = ::Metanorma::CC::DOCSTATUS[node.attr("status")] || ""
-        prefix += "/#{status}" unless status.empty?
-        prefix
-      end
-
-      def metadata_id(node, xml)
-        id = node.attr("docnumber") || "???"
-        prefix = prefix_id(node)
-        id = "#{prefix} #{id}"
-        year = node.attr("copyright-year")
-        id += ":#{year}" if year
-        xml.docidentifier id, **{type: "CalConnect"}
-        xml.docnumber node.attr("docnumber")
-      end
-
-      @log_doctype = false
-
-      def doctype(node)
-        d = super
-        unless ::Metanorma::CC::DOCSUFFIX.keys.include?(d) && !@log_doctype
-          @log.add("Document Attributes", nil,
-                   "#{d} is not a legal document type: reverting to 'standard'")
-          @log_doctype = true
-          d = "standard"
-        end
-        d
-      end
-    end
-  end
-end

data/lib/asciidoctor/cc/validate.rb

@@ -1,29 +0,0 @@
-module Asciidoctor
-  module CC
-    class Converter < Standoc::Converter
-      def content_validate(doc)
-        super
-        bibdata_validate(doc.root)
-      end
-
-      def bibdata_validate(doc)
-        doctype_validate(doc)
-        stage_validate(doc)
-      end
-
-      def doctype_validate(xmldoc)
-        doctype = xmldoc&.at("//bibdata/ext/doctype")&.text
-        %w(directive guide specification standard report administrative amendment
-        technical-corrigendum advisory).include?(doctype) or
-        @log.add("Document Attributes", nil, "#{doctype} is not a recognised document type")
-      end
-
-      def stage_validate(xmldoc)
-        stage = xmldoc&.at("//bibdata/status/stage")&.text
-        %w(proposal working-draft committee-draft draft-standard final-draft
-        published withdrawn).include?(stage) or
-        @log.add("Document Attributes", nil, "#{stage} is not a recognised status")
-      end
-    end
-  end
-end