metanorma-csa 1.6.8 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a611dbc71c58150cd8102bf56cf7f71b514a94b498600dfdd7f00e273eb81a9
-  data.tar.gz: '018ce3ef9b1621ac802ac2defe1c9f8b4295a8eb945a28cc59e2509a87ab4f13'
+  metadata.gz: 03664b85f4eab48b265d24aaabc416c09d4aedcf83451a672866402d90a5c54f
+  data.tar.gz: 723c23cc0d9411ed6569c3281803574040d07fa89086f93fab1de5f79546ac9f
 SHA512:
-  metadata.gz: f6a9634bccfd8971fce8ca005e93ba9d830b0d0529159e0cb3296fcce031c164b0cd56f1bfd01d67cfdaf2d5044a34c20f47754641ddce84bba73b124f0bc3a5
-  data.tar.gz: f7ac4faaad94d9c4b9ce5ee70dcd79a06e73cfd4e5005f67d1fed6ac1d5e46489b6eff8a705f3d6933ac3ac8040f3a341274b1d4070e7f7b0a5b0543347fdbe9
+  metadata.gz: 5231750eb0d40277ebce1bb1f6c6320fd7abb04c6c303bcbdc9af67d18f851c484659cb6baf7052a383105b460303f2ffe672883d9443f0aa197c638a976d116
+  data.tar.gz: d37944dba89c7f98af07f9d77bbc0d7acbf9aa9ff325ad6e69e854ec270a22cd8acb217a0f5cd71ee98d283928faaf40f739892684a646cf68d249cef0b5b50e

data/lib/asciidoctor/csa/basicdoc.rng

@@ -596,6 +596,7 @@
       <ref name="bookmark"/>
       <ref name="image"/>
       <ref name="index"/>
+      <ref name="index-xref"/>
     </choice>
   </define>
   <define name="PureTextElement">
@@ -737,6 +738,37 @@
       </optional>
     </element>
   </define>
+  <define name="index-xref">
+    <element name="index-xref">
+      <attribute name="also">
+        <data type="boolean"/>
+      </attribute>
+      <element name="primary">
+        <oneOrMore>
+          <ref name="PureTextElement"/>
+        </oneOrMore>
+      </element>
+      <optional>
+        <element name="secondary">
+          <oneOrMore>
+            <ref name="PureTextElement"/>
+          </oneOrMore>
+        </element>
+      </optional>
+      <optional>
+        <element name="tertiary">
+          <oneOrMore>
+            <ref name="PureTextElement"/>
+          </oneOrMore>
+        </element>
+      </optional>
+      <element name="target">
+        <oneOrMore>
+          <ref name="PureTextElement"/>
+        </oneOrMore>
+      </element>
+    </element>
+  </define>
   <!-- bare ID element, used for referencing arbitrary spans of text -->
   <define name="bookmark">
     <element name="bookmark">

data/lib/asciidoctor/csa/converter.rb

@@ -1,29 +1,24 @@
 # frozen_string_literal: true
 
 require 'asciidoctor'
-require 'metanorma/csa/version'
+require 'metanorma-generic'
 require 'isodoc/csa/html_convert'
 require 'isodoc/csa/pdf_convert'
 require 'isodoc/csa/word_convert'
 require 'isodoc/csa/presentation_xml_convert'
-require 'asciidoctor/standoc/converter'
+require 'metanorma/csa'
 require 'fileutils'
-require_relative 'validate'
 
 module Asciidoctor
   module Csa
-    CSA_TYPE = 'csa'
-
-    # A {Converter} implementation that generates CSD output, and a document
-    # schema encapsulation of the document for validation
-    class Converter < Standoc::Converter
+    class Converter < ::Asciidoctor::Generic::Converter
       XML_ROOT_TAG = "csa-standard".freeze
       XML_NAMESPACE = "https://www.metanorma.org/ns/csa".freeze
 
-      register_for CSA_TYPE
+      register_for "csa"
 
-      def default_publisher
-        "Cloud Security Alliance"
+      def configuration
+        Metanorma::Csa.configuration
       end
 
       def personal_role(node, c, suffix)
@@ -47,34 +42,10 @@ module Asciidoctor
         end
       end
 
-      def metadata_id(node, xml)
-        dn = node.attr('docnumber') or return
-        docstatus = node.attr('status')
-        if docstatus
-          abbr = IsoDoc::Csa::Metadata.new('en', 'Latn', @i18n)
-            .stage_abbr(docstatus)
-          dn = "#{dn}(#{abbr})" unless abbr.empty?
-        end
-        node.attr('copyright-year') && dn += ":#{node.attr('copyright-year')}"
-        xml.docidentifier dn, **{ type: CSA_TYPE }
-        xml.docnumber { |i| i << node.attr('docnumber') }
-      end
-
       def title_validate(root)
         nil
       end
 
-      def doctype(node)
-        d = super
-        unless %w{guidance proposal standard report whitepaper charter policy
-          glossary case-study}.include? d
-          @log.add("Document Attributes", nil,
-                   "#{d} is not a legal document type: reverting to 'standard'")
-          d = 'standard'
-        end
-        d
-      end
-
       def outputs(node, ret)
         File.open(@filename + ".xml", "w:UTF-8") { |f| f.write(ret) }
           presentation_xml_converter(node).convert(@filename + ".xml")
@@ -86,12 +57,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__), 'csa.rng'))
-      end
-
       def sections_cleanup(x)
         super
         x.xpath("//*[@inline-header]").each do |h|
@@ -99,6 +64,21 @@ module Asciidoctor
         end
       end
 
+      def bibdata_validate(doc)
+        super
+        role_validate(doc)
+      end
+
+      def role_validate(doc)
+        doc&.xpath("//bibdata/contributor/role[description]")&.each do |r|
+          r["type"] == "author" or next
+          role = r.at("./description").text
+          %w{full-author contributor staff reviewer}.include?(role) or
+        @log.add("Document Attributes", nil,
+                 "#{role} is not a recognised role")
+        end
+      end
+
       def style(n, t)
         return
       end

data/lib/asciidoctor/csa/isodoc.rng

@@ -246,6 +246,9 @@
             <data type="boolean"/>
           </attribute>
         </optional>
+        <optional>
+          <ref name="colgroup"/>
+        </optional>
         <optional>
           <ref name="tname"/>
         </optional>
@@ -764,6 +767,18 @@
     </define>
   </include>
   <!-- end overrides -->
+  <define name="colgroup">
+    <element name="colgroup">
+      <oneOrMore>
+        <ref name="col"/>
+      </oneOrMore>
+    </element>
+  </define>
+  <define name="col">
+    <element name="col">
+      <attribute name="width"/>
+    </element>
+  </define>
   <define name="TextElement" combine="choice">
     <ref name="concept"/>
   </define>

data/lib/isodoc/csa/base_convert.rb

@@ -5,18 +5,8 @@ require 'isodoc'
 module IsoDoc
   module Csa
     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::Csa.configuration
       end
     end
   end

data/lib/isodoc/csa/csa.standard.xsl

@@ -658,13 +658,13 @@
 						<xsl:otherwise> <!-- for ordered lists -->
 							<xsl:choose>
 								<xsl:when test="../@type = 'arabic'">
-									<xsl:number format="a)"/>
+									<xsl:number format="a)" lang="en"/>
 								</xsl:when>
 								<xsl:when test="../@type = 'alphabet'">
 									<xsl:number format="1)"/>
 								</xsl:when>
 								<xsl:when test="../@type = 'alphabet_upper'">
-									<xsl:number format="A)"/>
+									<xsl:number format="A)" lang="en"/>
 								</xsl:when>
 								
 								<xsl:when test="../@type = 'roman'">
@@ -1447,10 +1447,12 @@
 		
 		
 		<xsl:variable name="colwidths">
-			<xsl:call-template name="calculate-column-widths">
-				<xsl:with-param name="cols-count" select="$cols-count"/>
-				<xsl:with-param name="table" select="$simple-table"/>
-			</xsl:call-template>
+			<xsl:if test="not(*[local-name()='colgroup']/*[local-name()='col'])">
+				<xsl:call-template name="calculate-column-widths">
+					<xsl:with-param name="cols-count" select="$cols-count"/>
+					<xsl:with-param name="table" select="$simple-table"/>
+				</xsl:call-template>
+			</xsl:if>
 		</xsl:variable>
 		<!-- colwidths=<xsl:copy-of select="$colwidths"/> -->
 		
@@ -1518,16 +1520,25 @@
 					<xsl:attribute name="border-bottom">0pt solid black</xsl:attribute> <!-- set 0pt border, because there is a separete table below for footer  -->
 				</xsl:if>
 				
-				<xsl:for-each select="xalan:nodeset($colwidths)//column">
-					<xsl:choose>
-						<xsl:when test=". = 1 or . = 0">
-							<fo:table-column column-width="proportional-column-width(2)"/>
-						</xsl:when>
-						<xsl:otherwise>
-							<fo:table-column column-width="proportional-column-width({.})"/>
-						</xsl:otherwise>
-					</xsl:choose>
-				</xsl:for-each>
+				<xsl:choose>
+					<xsl:when test="*[local-name()='colgroup']/*[local-name()='col']">
+						<xsl:for-each select="*[local-name()='colgroup']/*[local-name()='col']">
+							<fo:table-column column-width="{@width}"/>
+						</xsl:for-each>
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:for-each select="xalan:nodeset($colwidths)//column">
+							<xsl:choose>
+								<xsl:when test=". = 1 or . = 0">
+									<fo:table-column column-width="proportional-column-width(2)"/>
+								</xsl:when>
+								<xsl:otherwise>
+									<fo:table-column column-width="proportional-column-width({.})"/>
+								</xsl:otherwise>
+							</xsl:choose>
+						</xsl:for-each>
+					</xsl:otherwise>
+				</xsl:choose>
 				
 				<xsl:choose>
 					<xsl:when test="not(*[local-name()='tbody']) and *[local-name()='thead']">
@@ -1540,10 +1551,12 @@
 				
 			</fo:table>
 			
+			<xsl:variable name="colgroup" select="*[local-name()='colgroup']"/>				
 			<xsl:for-each select="*[local-name()='tbody']"><!-- select context to tbody -->
 				<xsl:call-template name="insertTableFooterInSeparateTable">
 					<xsl:with-param name="table_attributes" select="$table_attributes"/>
 					<xsl:with-param name="colwidths" select="$colwidths"/>				
+					<xsl:with-param name="colgroup" select="$colgroup"/>				
 				</xsl:call-template>
 			</xsl:for-each>
 			
@@ -1797,12 +1810,22 @@
 	</xsl:template><xsl:template name="insertTableFooterInSeparateTable">
 		<xsl:param name="table_attributes"/>
 		<xsl:param name="colwidths"/>
+		<xsl:param name="colgroup"/>
 		
 		<xsl:variable name="isNoteOrFnExist" select="../*[local-name()='note'] or ..//*[local-name()='fn'][local-name(..) != 'name']"/>
 		
 		<xsl:if test="$isNoteOrFnExist = 'true'">
 		
-			<xsl:variable name="cols-count" select="count(xalan:nodeset($colwidths)//column)"/>
+			<xsl:variable name="cols-count">
+				<xsl:choose>
+					<xsl:when test="xalan:nodeset($colgroup)//*[local-name()='col']">
+						<xsl:value-of select="count(xalan:nodeset($colgroup)//*[local-name()='col'])"/>
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:value-of select="count(xalan:nodeset($colwidths)//column)"/>
+					</xsl:otherwise>
+				</xsl:choose>
+			</xsl:variable>
 			
 			<fo:table keep-with-previous="always">
 				<xsl:for-each select="xalan:nodeset($table_attributes)/attribute">
@@ -1820,16 +1843,25 @@
 					</xsl:choose>
 				</xsl:for-each>
 				
-				<xsl:for-each select="xalan:nodeset($colwidths)//column">
-					<xsl:choose>
-						<xsl:when test=". = 1 or . = 0">
-							<fo:table-column column-width="proportional-column-width(2)"/>
-						</xsl:when>
-						<xsl:otherwise>
-							<fo:table-column column-width="proportional-column-width({.})"/>
-						</xsl:otherwise>
-					</xsl:choose>
-				</xsl:for-each>
+				<xsl:choose>
+					<xsl:when test="xalan:nodeset($colgroup)//*[local-name()='col']">
+						<xsl:for-each select="xalan:nodeset($colgroup)//*[local-name()='col']">
+							<fo:table-column column-width="{@width}"/>
+						</xsl:for-each>
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:for-each select="xalan:nodeset($colwidths)//column">
+							<xsl:choose>
+								<xsl:when test=". = 1 or . = 0">
+									<fo:table-column column-width="proportional-column-width(2)"/>
+								</xsl:when>
+								<xsl:otherwise>
+									<fo:table-column column-width="proportional-column-width({.})"/>
+								</xsl:otherwise>
+							</xsl:choose>
+						</xsl:for-each>
+					</xsl:otherwise>
+				</xsl:choose>
 				
 				<fo:table-body>
 					<fo:table-row>
@@ -4007,7 +4039,8 @@
 			<fo:table-column column-width="107mm"/>
 			<fo:table-column column-width="15mm"/>
 			<fo:table-body>
-				<fo:table-row font-family="Arial" text-align="center" font-weight="bold" background-color="black" color="white">
+				<fo:table-row text-align="center" font-weight="bold" background-color="black" color="white">
+					
 					<fo:table-cell border="1pt solid black"><fo:block>Date</fo:block></fo:table-cell>
 					<fo:table-cell border="1pt solid black"><fo:block>Type</fo:block></fo:table-cell>
 					<fo:table-cell border="1pt solid black"><fo:block>Change</fo:block></fo:table-cell>
@@ -4025,6 +4058,10 @@
 			<fo:block><xsl:apply-templates/></fo:block>
 		</fo:table-cell>
 	</xsl:template><xsl:template name="processBibitem">
+		
+		
+		<!-- end BIPM bibitem processing-->
+		
 		 
 		
 		

data/lib/isodoc/csa/html_convert.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'base_convert'
+require "isodoc/generic/html_convert"
 require_relative 'init'
 require 'isodoc'
 
@@ -8,52 +9,7 @@ module IsoDoc
   module Csa
     # A {Converter} implementation that generates CSA 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)
-        is_hans = options[:script] == 'Hans'
-        {
-          bodyfont: (is_hans ? '"SimSun",serif' : 'AzoSans,"Source Sans Pro",sans-serif'),
-          headerfont: (is_hans ? '"SimHei",sans-serif'
-                              : 'AzoSans,"Source Sans Pro",sans-serif'),
-          monospacefont: '"Source Code Pro",monospace',
-          normalfontsize: "1.2em",
-          monospacefontsize: "1.0em",
-          footnotefontsize: "0.9em",
-        }
-      end
-
-      def default_file_locations(options)
-        {
-          htmlstylesheet: html_doc_path('htmlstyle.scss'),
-          htmlcoverpage: html_doc_path('html_csa_titlepage.html'),
-          htmlintropage: html_doc_path('html_csa_intro.html'),
-          scripts: html_doc_path('scripts.html')
-        }
-      end
-
-      def googlefonts()
-        <<~HEAD.freeze
-    <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,600,600i|Space+Mono:400,700" rel="stylesheet">
-    <link href="https://fonts.googleapis.com/css?family=Rubik:300,300i,500" rel="stylesheet">
-    <link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,300i,400,700,900" rel="stylesheet">
-    <link href="https://fonts.googleapis.com/css2?family=Source+Code+Pro:ital,wght@0,300;0,600;1,300;1,600&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/csa/i18n.rb

@@ -1,9 +1,8 @@
 module IsoDoc
   module Csa
-    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::Csa.configuration
       end
     end
   end

data/lib/isodoc/csa/metadata.rb

@@ -6,9 +6,9 @@ module IsoDoc
   module Csa
     # A {Converter} implementation that generates CSA output, and a document
     # schema encapsulation of the document for validation
-    class Metadata < IsoDoc::Metadata
-      def initialize(lang, script, labels)
-        super
+    class Metadata < IsoDoc::Generic::Metadata
+      def configuration
+        Metanorma::Csa.configuration
       end
 
       def title(isoxml, _out)
@@ -27,22 +27,11 @@ module IsoDoc
         super
       end
 
-
       def docid(isoxml, _out)
         docnumber = isoxml.at(ns("//bibdata/docidentifier[@type = 'csa']"))
         set(:docnumber, docnumber&.text)
       end
 
-      def stage_abbr(status)
-        case status
-        when "working-draft" then "wd"
-        when "committee-draft" then "cd"
-        when "draft-standard" then "d"
-        else
-          ""
-        end
-      end
-
       def personal_authors(isoxml)
         persons = auth_roles(isoxml, nonauth_roles(isoxml, {}))
         set(:roles_authors_affiliations, persons)
@@ -72,10 +61,6 @@ module IsoDoc
         end
         persons
       end
-
-      def unpublished(status)
-        !%w(published withdrawn).include? status.downcase
-      end
     end
   end
 end

data/lib/isodoc/csa/presentation_xml_convert.rb

@@ -1,9 +1,10 @@
 require_relative "init"
+require "metanorma-generic"
 require "isodoc"
 
 module IsoDoc
   module Csa
-    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/csa/word_convert.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'base_convert'
+require "isodoc/generic/word_convert"
 require_relative 'init'
 require 'isodoc'
 
@@ -9,35 +10,6 @@ module IsoDoc
     # A {Converter} implementation that generates CSA 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)
-        is_hans = options[:script] == 'Hans'
-        {
-          bodyfont: (is_hans ? '"SimSun",serif' : 'AzoSans,Arial,sans-serif'),
-          headerfont: (is_hans ? '"SimHei",sans-serif' : 'AzoSans,Arial,sans-serif'),
-          monospacefont: '"Source Code Pro","Courier New",monospace',
-          normalfontsize: "10.5pt",
-          footnotefontsize: "10.0pt",
-          monospacefontsize: "10.0pt",
-          smallerfontsize: "10.0pt",
-        }
-      end
-
-      def default_file_locations(options)
-        {
-          wordstylesheet: html_doc_path('wordstyle.scss'),
-          standardstylesheet: html_doc_path('csa.scss'),
-          header: html_doc_path('header.html'),
-          wordcoverpage: html_doc_path('word_csa_titlepage.html'),
-          wordintropage: html_doc_path('word_csa_intro.html'),
-          ulstyle: 'l3',
-          olstyle: 'l2'
-        }
-      end
 
       include BaseConvert
       include Init

data/lib/isodoc/csa/xref.rb

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

data/lib/metanorma/csa.rb

@@ -1,7 +1,32 @@
-require_relative 'csa/processor'
+require "metanorma"
+require "metanorma-generic"
+require_relative './csa/processor'
 
 module Metanorma
   module Csa
+     class Configuration < Metanorma::Generic::Configuration
+      def initialize(*args)
+        super
+      end
+    end
 
+    class << self
+      extend Forwardable
+
+      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::Csa::Processor)
+

data/lib/metanorma/csa/processor.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'metanorma/processor'
-require 'asciidoctor/csa/converter'
 
 module Metanorma
   module Csa
@@ -10,7 +9,7 @@ module Metanorma
       def initialize
         @short = :csa
         @input_format = :asciidoc
-        @asciidoctor_backend = Asciidoctor::Csa::CSA_TYPE.to_sym
+        @asciidoctor_backend = :csa
       end
 
       def output_formats

data/lib/metanorma/csa/version.rb

@@ -2,6 +2,6 @@
 
 module Metanorma
   module Csa
-    VERSION = '1.6.8'
+    VERSION = '1.7.0'
   end
 end

data/metanorma-csa.gemspec

@@ -28,16 +28,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
 
-  spec.add_dependency "htmlentities", "~> 4.3.4"
-  spec.add_dependency "image_size"
-  spec.add_dependency "mime-types"
-  #spec.add_dependency "nokogiri"
-  spec.add_dependency "ruby-jing"
-  spec.add_dependency "thread_safe"
-  spec.add_dependency "uuidtools"
-
-  spec.add_dependency "metanorma-standoc", "~> 1.6.0"
-  spec.add_dependency "isodoc", "~> 1.3.0"
+  spec.add_dependency "metanorma-generic", "~> 1.8.0"
 
   spec.add_development_dependency "byebug", "~> 9.1"
   spec.add_development_dependency "sassc", "2.4.0"

data/metanorma.yml

@@ -0,0 +1,60 @@
+metanorma_name: csa
+organization_name_short: CSA
+organization_name_long: Cloud Security Alliance
+document_namespace: https://www.metanorma.org/ns/csa
+xml_root_tag: csa-standard
+html_bodyfont: 'AzoSans,"Source Sans Pro",sans-serif'
+html_headerfont: 'AzoSans,"Source Sans Pro",sans-serif'
+html_monospacefont: '"Source Code Pro",monospace'
+validate_rng_file: lib/asciidoctor/csa/csa.rng
+htmlcoverpage: lib/isodoc/csa/html/html_csa_titlepage.html
+htmlintropage: lib/isodoc/csa/html/html_csa_intro.html
+htmlstylesheet: lib/isodoc/csa/html/htmlstyle.scss
+html_normalfontsize: "1.2em"
+html_monospacefontsize: "1.0em"
+html_footnotefontsize: "0.9em"
+scripts: lib/isodoc/csa/html/scripts.html
+i18nyaml: lib/isodoc/csa/i18n-en.yaml
+word_bodyfont: 'AzoSans,Arial,sans-serif'
+word_headerfont: 'AzoSans,Arial,sans-serif'
+word_monospacefont: '"Source Code Pro","Courier New",monospace'
+word_normalfontsize: "10.5pt"
+word_smallerfontsize: "10.0pt"
+word_monospacefontsize: "10.0pt"
+word_footnotefontsize: "10.0pt"
+standardstylesheet: lib/isodoc/csa/html/csa.scss
+header: lib/isodoc/csa/html/header.html
+wordcoverpage: lib/isodoc/csa/html/word_csa_titlepage.html
+wordintropage: lib/isodoc/csa/html/word_csa_intro.html
+wordstylesheet: lib/isodoc/csa/html/wordstyle.scss
+webfont:
+  - "https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,600,600i|Space+Mono:400,700"
+  - "https://fonts.googleapis.com/css?family=Rubik:300,300i,500"
+  - "https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,300i,400,700,900"
+  - "https://fonts.googleapis.com/css2?family=Source+Code+Pro:ital,wght@0,300;0,600;1,300;1,600&display=swap"
+docid_template: "{{ docnumeric }}{% if stageabbr %}({{ stageabbr }}){%endif%}{% if docyear %}:{{docyear}}{%endif%}"
+doctypes:
+  standard:
+  guidance:
+  proposal:
+  report:
+  whitepaper:
+  charter:
+  policy:
+  glossary:
+  case-study:
+default_doctype: standard
+published_stages:
+  - published
+  - withdrawn
+default_stage: published
+stage_abbreviations:
+  proposal:
+  working-draft: wd
+  committee-draft: cd
+  draft-standard: d
+  final-draft: 
+  published:
+  withdrawn:
+logo_path: ""
+

metadata

@@ -1,127 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-csa
 version: !ruby/object:Gem::Version
-  version: 1.6.8
+  version: 1.7.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-30 00:00:00.000000000 Z
+date: 2020-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: htmlentities
+  name: metanorma-generic
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.3.4
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.3.4
-- !ruby/object:Gem::Dependency
-  name: image_size
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: mime-types
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: ruby-jing
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: thread_safe
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: uuidtools
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: metanorma-standoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.6.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.6.0
-- !ruby/object:Gem::Dependency
-  name: isodoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.3.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -294,7 +196,6 @@ files:
 - lib/asciidoctor/csa/csa.rng
 - lib/asciidoctor/csa/isodoc.rng
 - lib/asciidoctor/csa/reqt.rng
-- lib/asciidoctor/csa/validate.rb
 - lib/isodoc/csa/base_convert.rb
 - lib/isodoc/csa/csa.standard.xsl
 - lib/isodoc/csa/html/csa-logo-white.png
@@ -328,6 +229,7 @@ files:
 - lib/metanorma/csa/processor.rb
 - lib/metanorma/csa/version.rb
 - metanorma-csa.gemspec
+- metanorma.yml
 homepage: https://github.com/metanorma/metanorma-csa
 licenses:
 - BSD-2-Clause

data/lib/asciidoctor/csa/validate.rb

@@ -1,33 +0,0 @@
-module Asciidoctor
-  module Csa
-    class Converter < Standoc::Converter
-      def content_validate(doc)
-        super
-        bibdata_validate(doc.root)
-      end
-
-      def bibdata_validate(doc)
-        stage_validate(doc)
-        role_validate(doc)
-      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
-
-      def role_validate(doc)
-        doc&.xpath("//bibdata/contributor/role[description]")&.each do |r|
-          r["type"] == "author" or next
-          role = r.at("./description").text
-          %w{full-author contributor staff reviewer}.include?(role) or
-        @log.add("Document Attributes", nil,
-                 "#{role} is not a recognised role")
-        end
-      end
-    end
-  end
-end