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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1337956f4900ce8051cb6e09b8a1e89bf9411a1d26d2c7d7ada475654adc04ba
-  data.tar.gz: 6013e487bba644a01d64ad805c71abc6e5f4a93d151d8f913b11fe8abf40d7eb
+  metadata.gz: 2f72d6ebbef5b1d962fda7a33dd96f28024af88c4d8ae637007cdcbe9bdd2766
+  data.tar.gz: f098590075c6aeb49dc1e769fb62435b24a0e01fc98ff6003348015fb6ff0a05
 SHA512:
-  metadata.gz: 64b4f7362641fa0ef8dbc693d84f9667f1dbbb3fde4ebd0a999ead6d3578dda4ba200e4b268d176ddd6ec078f5567a879d793a9c7d42a0298c047af58520707a
-  data.tar.gz: 493bc165e16d1b60d71f18bf7de4ee4e015df9aad081785a2122dbf0f56dac841a55c7d7af87374eb7874d6ac425922f2cb9c6d55bc421d9afb3aa8011bea163
+  metadata.gz: 5a0df16d54cc4e86d13af796805618959c5fca37204a8ab1343a0ec91498886fb9d2f51471b5b30a24bb995ca9396f68b906c502068e61691d10e3c0ed576abd
+  data.tar.gz: 2bd269fa36829be5d7ae832c5c8e299615d74f25be8b04200b528f44779f8923c344f2218abbd211af6b30c18c89b976b80b555f0a3917c26bec4051dd378fad

data/Gemfile

@@ -6,4 +6,21 @@ git_source(:github) { |repo| "https://github.com/#{repo}" }
 
 gemspec
 
+# Canonical line: the relaton 3.x prerelease monogem over the current
+# gem mains (the released generic/standoc line caps relaton at 2.x).
+gem "metanorma", github: "metanorma/metanorma", branch: "main"
+gem "metanorma-generic", github: "metanorma/metanorma-generic", branch: "main"
+gem "metanorma-standoc", github: "metanorma/metanorma-standoc", branch: "main"
+gem "metanorma-core", github: "metanorma/metanorma-core", branch: "main"
+gem "metanorma-document", github: "metanorma/metanorma-document", branch: "main"
+gem "isodoc", github: "metanorma/isodoc", branch: "main"
+gem "metanorma-mirror", github: "metanorma/metanorma-mirror", branch: "main"
+gem "metanorma-plugin-lutaml", github: "metanorma/metanorma-plugin-lutaml", branch: "main"
+gem "relaton", "~> 3.0.0.pre.alpha"
+gem "relaton-render", "~> 3.0.0.pre.alpha"
+gem "pubid", "~> 2.0.0.pre.alpha"
+gem "lutaml-model", "0.8.114" # relaton 3.x declares singular_tolerance (needs 0.8.113+)
+gem "sassc-embedded", "~> 1.80"
+gem "rake", ">= 13.0"
+
 eval_gemfile("Gemfile.devel") rescue nil

data/Gemfile.devel

@@ -0,0 +1,3 @@
+# Development-time gem overrides. The restructure-wave branch pins that
+# used to live here are merged; add temporary cross-PR pins below and
+# remove them when the branches land.

data/README.adoc

@@ -6,6 +6,9 @@ image:https://github.com/metanorma/metanorma-csa/workflows/rake/badge.svg["Build
 image:https://img.shields.io/github/issues-pr-raw/metanorma/metanorma-csa.svg["Pull Requests", link="https://github.com/metanorma/metanorma-csa/pulls"]
 image:https://img.shields.io/github/commits-since/metanorma/metanorma-csa/latest.svg["Commits since latest",link="https://github.com/metanorma/metanorma-csa/releases"]
 
+*NOTE: This gem is no longer supported. The Cloud Security Alliance is now supported by Metanorma
+as a taste, rather than as a separate flavour: see https://github.com/metanorma/metanorma-taste[]*
+
 == Functionality
 
 This gem processes https://www.metanorma.com/[Metanorma documents] following

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

@@ -1411,6 +1411,7 @@
 	<xsl:template match="mn:title[following-sibling::*[1][self::mn:fmt-title]]" mode="update_xml_step1"/>
 	<xsl:template match="mn:name[following-sibling::*[1][self::mn:fmt-name]]" mode="update_xml_step1"/>
 	<xsl:template match="mn:section-title[following-sibling::*[1][self::mn:p][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_step1"/>
+	<xsl:template match="mn:floating-title[following-sibling::*[1][self::mn:p][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_step1"/>
 	<!-- <xsl:template match="mn:preferred[following-sibling::*[not(local-name() = 'preferred')][1][local-name() = 'fmt-preferred']]" mode="update_xml_step1"/> -->
 	<xsl:template match="mn:preferred" mode="update_xml_step1"/>
 	<!-- <xsl:template match="mn:admitted[following-sibling::*[not(local-name() = 'admitted')][1][local-name() = 'fmt-admitted']]" mode="update_xml_step1"/> -->
@@ -1425,10 +1426,10 @@
 
 	<xsl:template match="mn:term[@unnumbered = 'true'][not(.//*[starts-with(local-name(), 'fmt-')])]" mode="update_xml_step1"/>
 
-	<xsl:template match="mn:p[@type = 'section-title' or @type = 'floating-title'][preceding-sibling::*[1][self::mn:section-title]]" mode="update_xml_step1">
+	<xsl:template match="mn:p[@type = 'section-title' or @type = 'floating-title'][preceding-sibling::*[1][self::mn:section-title or self::mn:floating-title]]" mode="update_xml_step1">
 		<xsl:copy>
 			<xsl:apply-templates select="@*" mode="update_xml_step1"/>
-			<xsl:copy-of select="preceding-sibling::*[1][self::mn:section-title]/@depth"/>
+			<xsl:copy-of select="preceding-sibling::*[1][self::mn:section-title or self::mn:floating-title]/@depth"/>
 			<xsl:apply-templates select="node()" mode="update_xml_step1"/>
 		</xsl:copy>
 	</xsl:template>
@@ -2526,6 +2527,12 @@
 	<xsl:template name="refine_sourcecode-style">
 	</xsl:template> <!-- refine_sourcecode-style -->
 
+	<xsl:attribute-set name="sourcecode-number-style">
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_sourcecode-number-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="sourcecode-name-style">
 		<xsl:attribute name="font-size">11pt</xsl:attribute>
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
@@ -3913,6 +3920,12 @@
 	<xsl:template name="refine_term-name-style">
 	</xsl:template>
 
+	<xsl:attribute-set name="preferred-style">
+	</xsl:attribute-set> <!-- preferred-style -->
+
+	<xsl:template name="refine_preferred-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="preferred-block-style">
 	</xsl:attribute-set> <!-- preferred-block-style -->
 
@@ -4558,6 +4571,12 @@
 		<xsl:call-template name="setBordersTableArray"/>
 	</xsl:template> <!-- refine_table-style -->
 
+	<xsl:attribute-set name="table-number-style">
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_table-number-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="table-name-style">
 		<xsl:attribute name="role">Caption</xsl:attribute>
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
@@ -4992,7 +5011,7 @@
 
 			</fo:block>
 
-			<!-- <xsl:if test="$namespace = 'bsi' or $namespace = 'iec' or $namespace = 'iso'"> -->
+			<!-- <xsl:if test="$namespace = 'bsi' or $namespace = 'pas' or $namespace = 'iec' or $namespace = 'iso'"> -->
 			<xsl:if test="$continued = 'true'">
 
 				<!-- to prevent the error 'THead element may contain only TR elements' -->
@@ -8125,6 +8144,12 @@
 	<xsl:template name="refine_figure-style">
 	</xsl:template>
 
+	<xsl:attribute-set name="figure-number-style">
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_figure-number-style">
+	</xsl:template>
+
 	<xsl:attribute-set name="figure-name-style">
 		<xsl:attribute name="role">Caption</xsl:attribute>
 		<xsl:attribute name="font-size">11pt</xsl:attribute>
@@ -12946,10 +12971,17 @@
 			</xsl:choose>
 	</xsl:template>
 
+	<xsl:attribute-set name="clause-style">
+
+	</xsl:attribute-set>
+
+	<xsl:template name="refine_clause-style">
+	</xsl:template>
+
 	<!-- main sections -->
 	<xsl:template match="/*/mn:sections/*" name="sections_node" priority="2">
 		<xsl:call-template name="setNamedDestination"/>
-		<fo:block>
+		<fo:block role="Sect">
 			<xsl:call-template name="setId"/>
 
 			<xsl:call-template name="sections_element_style"/>
@@ -13077,6 +13109,10 @@
 		<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),' ',' ')"/>
 	</xsl:template>
 
+	<!-- for case when update_xml_step1 (common.updatexml.xsl) doesn't apply when $table_if = 'true' -->
+	<xsl:template match="mn:title[following-sibling::*[1][self::mn:fmt-title]]"/>
+	<xsl:template match="mn:name[following-sibling::*[1][self::mn:fmt-name]]"/>
+
 	<!-- insert fo:basic-link, if external-destination or internal-destination is non-empty, otherwise insert fo:inline -->
 	<xsl:template name="insert_basic_link">
 		<xsl:param name="element"/>

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.2 -->
+<!-- VERSION v2.1.3 -->
 
   <!--
     ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437
@@ -455,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">
@@ -604,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>
@@ -853,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">

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.3".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.3
+  version: 2.7.4.pre.alpha.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-09-01 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:
   - - ">="