metanorma-csa 2.7.2 → 2.7.4.pre.alpha.1

data/lib/isodoc/csa/metadata.rb

@@ -11,16 +11,6 @@ module IsoDoc
         Metanorma::Csa.configuration
       end
 
-      def title(isoxml, _out)
-        main = isoxml.at(ns("//bibdata/title[@language='en']"))
-          &.children&.to_xml
-        set(:doctitle, main)
-      end
-
-      def subtitle(_isoxml, _out)
-        nil
-      end
-
       def author(isoxml, _out)
         set(:tc, "XXXX")
         tc = isoxml.at(ns("//bibdata/contributor[role/description = 'committee']/organization/subdivision[@type = 'Technical committee']/name"))

data/lib/metanorma/csa/cleanup.rb

@@ -0,0 +1,7 @@
+module Metanorma
+  module Csa
+    class Cleanup < Metanorma::Generic::Cleanup
+      extend Forwardable
+    end
+  end
+end

data/lib/metanorma/csa/converter.rb

@@ -43,6 +43,18 @@ module Metanorma
                                      nil, false, "#{@filename}.pdf")
       end
 
+      CSA_LOG_MESSAGES = {
+        # rubocop:disable Naming/VariableNumber
+        "CSA_1": { category: "Document Attributes",
+                   error: "%s is not a recognised role",
+                   severity: 2 },
+        # rubocop:enable Naming/VariableNumber
+      }.freeze
+
+      def log_messages
+        super.merge(CSA_LOG_MESSAGES)
+      end
+
       def sections_cleanup(xml)
         super
         xml.xpath("//*[@inline-header]").each do |h|
@@ -50,21 +62,6 @@ module Metanorma
         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(_node, _text)
         nil
       end

data/lib/metanorma/csa/isodoc.rng

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-<!-- VERSION v2.1.1 -->
+<!-- VERSION v2.1.3 -->
 
   <!--
     ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437
@@ -123,6 +123,10 @@ the type attribute defaults to `review` for reviews</a:documentation>
           <a:documentation>Notes whose scope is the current block</a:documentation>
         </ref>
       </zeroOrMore>
+      <ref name="BlockSource">
+        <a:documentation>Bibliographic source for the information in the list.
+Sources are currently only rendered in metanorma-plateau</a:documentation>
+      </ref>
     </define>
     <define name="OlBody">
       <optional>
@@ -140,6 +144,10 @@ the type attribute defaults to `review` for reviews</a:documentation>
           <a:documentation>Notes whose scope is the current block</a:documentation>
         </ref>
       </zeroOrMore>
+      <ref name="BlockSource">
+        <a:documentation>Bibliographic source for the information in the list.
+Sources are currently only rendered in metanorma-plateau</a:documentation>
+      </ref>
     </define>
     <define name="OlAttributes">
       <a:documentation>NOTE: `start` attribute is not included by default, because of problems it raises with DOC output</a:documentation>
@@ -188,6 +196,10 @@ the type attribute defaults to `review` for reviews</a:documentation>
           <a:documentation>Notes whose scope is the current block</a:documentation>
         </ref>
       </zeroOrMore>
+      <ref name="BlockSource">
+        <a:documentation>Bibliographic source for the information in the list.
+Sources are currently only rendered in metanorma-plateau</a:documentation>
+      </ref>
     </define>
     <define name="dt">
       <element name="dt">
@@ -443,14 +455,7 @@ normative or informative references, some split references into sections organiz
           </ref>
         </zeroOrMore>
         <zeroOrMore>
-          <ref name="doc_bibitem">
-            <a:documentation>Bibliographic item cited in the document</a:documentation>
-          </ref>
-          <zeroOrMore>
-            <ref name="note">
-              <a:documentation>Annotation of the bibliographic item</a:documentation>
-            </ref>
-          </zeroOrMore>
+          <ref name="ReferenceEntry"/>
         </zeroOrMore>
         <zeroOrMore>
           <ref name="references">
@@ -592,18 +597,21 @@ gives an explicit page orientation</a:documentation>
         </element>
       </optional>
     </define>
-  </include>
-  <!-- end overrides -->
-  <define name="FnAttributes" combine="interleave">
-    <ref name="RequiredId"/>
-    <optional>
-      <attribute name="hiddenref">
-        <a:documentation>If true, number the footnote as normal, but suppress display of the footnote reference in the document body.
+    <define name="FnAttributes">
+      <ref name="RequiredId"/>
+      <optional>
+        <attribute name="hiddenref">
+          <a:documentation>If true, number the footnote as normal, but suppress display of the footnote reference in the document body.
 This is done if the footnote reference is already presented in some other form, e.g. within a figure image.</a:documentation>
-        <data type="boolean"/>
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <attribute name="reference">
+        <a:documentation>The number of the footnote, used to identify it visually</a:documentation>
       </attribute>
-    </optional>
-  </define>
+    </define>
+  </include>
+  <!-- end overrides -->
   <define name="TdAttributes" combine="interleave">
     <ref name="RequiredId"/>
     <optional>
@@ -841,6 +849,17 @@ titlecase, or lowercase</a:documentation>
       <value>informative</value>
     </choice>
   </define>
+  <define name="ReferenceEntry">
+    <a:documentation>Entry in bibliography</a:documentation>
+    <ref name="doc_bibitem">
+      <a:documentation>Bibliographic item cited in the document</a:documentation>
+    </ref>
+    <zeroOrMore>
+      <ref name="note">
+        <a:documentation>Annotation of the bibliographic item</a:documentation>
+      </ref>
+    </zeroOrMore>
+  </define>
   <define name="doc_bibitem">
     <a:documentation>Standardisation document representation of bibliographic entry</a:documentation>
     <element name="bibitem">
@@ -871,6 +890,12 @@ titlecase, or lowercase</a:documentation>
       </oneOrMore>
     </element>
   </define>
+  <define name="ParagraphFnBody" combine="interleave">
+    <ref name="BlockSource">
+      <a:documentation>Bibliographic source for the information in the paragraph
+parargaph sources are currently only rendered in metanorma-plateau</a:documentation>
+    </ref>
+  </define>
   <define name="BasicBlock" combine="choice">
     <ref name="columnbreak"/>
   </define>

data/lib/metanorma/csa/validate.rb

@@ -0,0 +1,22 @@
+require "nokogiri"
+require "metanorma-generic"
+
+module Metanorma
+  module Csa
+    class Validate < Metanorma::Generic::Validate
+      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("CSA_1", nil, params: [role])
+        end
+      end
+    end
+  end
+end

data/lib/metanorma/csa/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Csa
-    VERSION = "2.7.2".freeze
+    VERSION = "2.7.4.pre.alpha.1".freeze
   end
 end

data/lib/metanorma-csa.rb

@@ -1,5 +1,7 @@
 require "asciidoctor" unless defined? Asciidoctor::Converter
 require_relative "metanorma/csa/converter"
+require_relative "metanorma/csa/cleanup"
+require_relative "metanorma/csa/validate"
 require_relative "isodoc/csa/html_convert"
 require_relative "isodoc/csa/pdf_convert"
 require_relative "isodoc/csa/word_convert"

data/metanorma-csa.gemspec

@@ -27,12 +27,11 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-  spec.required_ruby_version = Gem::Requirement.new(">= 3.1.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 3.3.0")
 
-  spec.add_dependency "metanorma-generic", "~> 3.1.0"
+  spec.add_dependency "metanorma-generic", "~> 3.5"
 
   spec.add_development_dependency "debug"
-  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 "rake", "~> 13.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-csa
 version: !ruby/object:Gem::Version
-  version: 2.7.2
+  version: 2.7.4.pre.alpha.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-08-18 00:00:00.000000000 Z
+date: 2026-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-generic
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '3.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: equivalent-xml
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -209,12 +195,12 @@ files:
 - ".rubocop.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
+- Gemfile.devel
 - LICENSE
 - README.adoc
 - lib/isodoc/csa/base_convert.rb
 - lib/isodoc/csa/csa.standard.xsl
 - lib/isodoc/csa/html/csa-logo-white.png
-- lib/isodoc/csa/html/csa.css
 - lib/isodoc/csa/html/csa.png
 - lib/isodoc/csa/html/csa.scss
 - lib/isodoc/csa/html/dots-w@2x.png
@@ -222,11 +208,9 @@ files:
 - lib/isodoc/csa/html/header.html
 - lib/isodoc/csa/html/html_csa_intro.html
 - lib/isodoc/csa/html/html_csa_titlepage.html
-- lib/isodoc/csa/html/htmlstyle.css
 - lib/isodoc/csa/html/htmlstyle.scss
 - lib/isodoc/csa/html/word_csa_intro.html
 - lib/isodoc/csa/html/word_csa_titlepage.html
-- lib/isodoc/csa/html/wordstyle.css
 - lib/isodoc/csa/html/wordstyle.scss
 - lib/isodoc/csa/html_convert.rb
 - lib/isodoc/csa/i18n-en.yaml
@@ -243,12 +227,14 @@ files:
 - lib/metanorma/csa/biblio-standoc.rng
 - lib/metanorma/csa/biblio.rng
 - lib/metanorma/csa/boilerplate.adoc
+- lib/metanorma/csa/cleanup.rb
 - lib/metanorma/csa/converter.rb
 - lib/metanorma/csa/csa.rng
 - lib/metanorma/csa/isodoc.rng
 - lib/metanorma/csa/processor.rb
 - lib/metanorma/csa/relaton-csa.rng
 - lib/metanorma/csa/reqt.rng
+- lib/metanorma/csa/validate.rb
 - lib/metanorma/csa/version.rb
 - metanorma-csa.gemspec
 - metanorma.yml
@@ -264,7 +250,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.1.0
+      version: 3.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="