metanorma-cc 2.7.6 → 2.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4662f3f4ff7fd19ca9150317a73031cbb093c447f03b567969e482f8833e7152
-  data.tar.gz: f0e2648e3d1687b5b5ceeba1dadbb10bf4114bd4fc9fc2d2e25c1fb2ef895620
+  metadata.gz: 39f7f56986336d5d0d1686b3d064a42fa036cfbcd3092f0754de1dad6ae6d6a2
+  data.tar.gz: 7b31ed6ca15cd68378dd6f86e9e5266371859b31e4fb937a2a41fed053f245de
 SHA512:
-  metadata.gz: bf2d8066850d5520f259936ce4ddc650baec6d4c1284dfa021b647b4a1193e3c521b2650c8c7a9742d70de28aa159c9695a2c26c6ce863db852e40dfd7eff5f5
-  data.tar.gz: aa919eac7f006ab1afbb18734a1ab12c687161ee941c1b81072fca6615084430c9778f8296ecb1c7f258713ac92b00c7c779104d5d2377f3def87dda1963f90f
+  metadata.gz: 1264e161162c40337eb9a6297571c07a7b1e679e04097c48d57bcc83bd9c84684c42079f38ca926460205d8b6e46030b8ca3a6ef1fd8ea164ea59b4d66900a26
+  data.tar.gz: f593c52e867d623d558c45035fe757c195f31516873adac7783e6c337c63e4942d32649188d4c7f7e9d8ca1404bf2dc8299aedcb14f0c85fa3676d731dc8683b

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

@@ -308,7 +308,7 @@
 						<fo:block> </fo:block>
 						<fo:block margin-bottom="12pt"> </fo:block>
 						<fo:block-container font-size="16pt" text-align="center" border="0.5pt solid black" margin-bottom="12pt" margin-left="-1mm" margin-right="-1mm">
-							<fo:block-container margin-left="0mm" margin-right="0mm">
+							<fo:block-container xsl:use-attribute-sets="reset-margins-style">
 								<fo:block padding-top="1mm">
 									<xsl:call-template name="capitalizeWords">
 										<!-- ex: final-draft -->
@@ -324,7 +324,7 @@
 						</fo:block-container>
 						<fo:block margin-bottom="10pt"> </fo:block>
 						<fo:block-container font-size="10pt" border="0.5pt solid black" margin-bottom="12pt" margin-left="-1mm" margin-right="-1mm">
-							<fo:block-container margin-left="0mm" margin-right="0mm">
+							<fo:block-container xsl:use-attribute-sets="reset-margins-style">
 								<fo:block text-align="center" font-weight="bold" padding-top="1mm" margin-bottom="6pt">Warning for drafts</fo:block>
 								<fo:block margin-left="2mm" margin-right="2mm">
 									<fo:block margin-bottom="6pt">This document is not a CalConnect Standard. It is distributed for review and comment, and is subject to change without notice and may not be referred to as a Standard. Recipients of this draft are invited to submit, with their comments, notification of any relevant patent rights of which they are aware and to provide supporting documentation.</fo:block>
@@ -550,16 +550,6 @@
 			<xsl:call-template name="getLevel"/>
 		</xsl:variable>
 
-		<xsl:variable name="font-size">
-			<xsl:choose>
-				<xsl:when test="ancestor::mn:preface">13pt</xsl:when>
-				<xsl:when test="$level = 1">13pt</xsl:when>
-				<xsl:when test="$level = 2">12pt</xsl:when>
-				<xsl:when test="$level &gt;= 3">11pt</xsl:when>
-				<xsl:otherwise>16pt</xsl:otherwise>
-			</xsl:choose>
-		</xsl:variable>
-
 		<xsl:variable name="element-name">
 			<xsl:choose>
 				<xsl:when test="../@inline-header = 'true'">fo:inline</xsl:when>
@@ -567,18 +557,13 @@
 			</xsl:choose>
 		</xsl:variable>
 
-		<xsl:variable name="color" select="'rgb(14, 26, 133)'"/>
+		<xsl:variable name="title_styles">
+			<styles xsl:use-attribute-sets="title-style"><xsl:call-template name="refine_title-style"/></styles>
+		</xsl:variable>
 
 		<xsl:element name="{$element-name}">
-			<xsl:attribute name="font-size"><xsl:value-of select="$font-size"/></xsl:attribute>
-			<xsl:attribute name="font-weight">bold</xsl:attribute>
-			<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
-			<xsl:attribute name="keep-with-next">always</xsl:attribute>
-			<xsl:attribute name="color"><xsl:value-of select="$color"/></xsl:attribute>
-			<xsl:if test="ancestor::mn:sections">
-				<xsl:attribute name="margin-top">13.5pt</xsl:attribute>
-			</xsl:if>
-			<xsl:attribute name="role">H<xsl:value-of select="$level"/></xsl:attribute>
+			<xsl:copy-of select="xalan:nodeset($title_styles)/styles/@*"/>
+
 			<xsl:apply-templates/>
 			<xsl:apply-templates select="following-sibling::*[1][self::mn:variant-title][@type = 'sub']" mode="subtitle"/>
 		</xsl:element>
@@ -597,17 +582,16 @@
 				<xsl:otherwise>fo:block</xsl:otherwise>
 			</xsl:choose>
 		</xsl:variable>
-		<xsl:element name="{$element-name}">
 
-			<xsl:call-template name="setBlockAttributes"/>
+		<xsl:variable name="p_styles">
+			<styles xsl:use-attribute-sets="p-style">
+				<xsl:call-template name="refine_p-style"><xsl:with-param name="element-name" select="$element-name"/></xsl:call-template>
+			</styles>
+		</xsl:variable>
+
+		<xsl:element name="{$element-name}">
+			<xsl:copy-of select="xalan:nodeset($p_styles)/styles/@*"/>
 
-			<xsl:attribute name="margin-bottom">
-				<xsl:choose>
-					<xsl:when test="ancestor::mn:li">0pt</xsl:when>
-					<xsl:otherwise>12pt</xsl:otherwise>
-				</xsl:choose>
-			</xsl:attribute>
-			<xsl:attribute name="line-height">115%</xsl:attribute>
 			<xsl:apply-templates>
 				<xsl:with-param name="split_keep-within-line" select="$split_keep-within-line"/>
 			</xsl:apply-templates>
@@ -2655,6 +2639,10 @@
 		</xsl:element>
 	</xsl:template>
 
+	<!-- show sourcecode's name 'before' or 'after' source code -->
+	<xsl:variable name="sourcecode-name-position"><xsl:text>after</xsl:text>
+	</xsl:variable>
+
 	<xsl:template match="mn:sourcecode" name="sourcecode">
 
 		<xsl:variable name="sourcecode_attributes">
@@ -2678,7 +2666,12 @@
 
 					<xsl:call-template name="refine_sourcecode-container-style"/>
 
-					<fo:block-container margin-left="0mm" role="SKIP">
+					<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
+
+						<!-- <xsl:if test="$namespace = 'rsd'"> -->
+						<xsl:if test="$sourcecode-name-position = 'before'">
+							<xsl:apply-templates select="mn:fmt-name"/> <!-- show sourcecode's name BEFORE content -->
+						</xsl:if>
 
 						<fo:block xsl:use-attribute-sets="sourcecode-style">
 
@@ -2700,7 +2693,16 @@
 						</fo:block>
 
 						<xsl:apply-templates select="mn:dl"/> <!-- Key table -->
-						<xsl:apply-templates select="mn:fmt-name"/> <!-- show sourcecode's name AFTER content -->
+
+						<!-- <xsl:choose>
+							<xsl:when test="$namespace = 'rsd'"></xsl:when>
+							<xsl:otherwise>
+								<xsl:apply-templates select="mn:fmt-name" />  --><!-- show sourcecode's name AFTER content -->
+							<!-- </xsl:otherwise>
+						</xsl:choose> -->
+						<xsl:if test="$sourcecode-name-position = 'after'">
+							<xsl:apply-templates select="mn:fmt-name"/> <!-- show sourcecode's name AFTER content -->
+						</xsl:if>
 
 					</fo:block-container>
 				</fo:block-container>
@@ -8466,6 +8468,10 @@
 	<!-- image    -->
 	<!-- ====== -->
 
+	<!-- show figure's name 'before' or 'after' image -->
+	<xsl:variable name="figure-name-position"><xsl:text>after</xsl:text>
+	</xsl:variable>
+
 	<xsl:template match="mn:figure" name="figure">
 		<xsl:variable name="isAdded" select="@added"/>
 		<xsl:variable name="isDeleted" select="@deleted"/>
@@ -8478,6 +8484,10 @@
 				<xsl:with-param name="isDeleted" select="$isDeleted"/>
 			</xsl:call-template>
 
+			<xsl:if test="$figure-name-position = 'before'"> <!-- show figure's name BEFORE image -->
+				<xsl:apply-templates select="mn:fmt-name"/>
+			</xsl:if>
+
 			<!-- Example: Dimensions in millimeters -->
 			<xsl:apply-templates select="mn:note[@type = 'units']"/>
 
@@ -8498,7 +8508,16 @@
 			<xsl:if test="normalize-space($show_figure_key_in_block_container) = 'true'">
 				<xsl:call-template name="showFigureKey"/>
 			</xsl:if>
-			<xsl:apply-templates select="mn:fmt-name"/> <!-- show figure's name AFTER image -->
+
+			<!-- <xsl:choose>
+				<xsl:when test="$namespace = 'bsi' or $namespace = 'pas' or $namespace = 'rsd'"></xsl:when>
+				<xsl:otherwise>
+					<xsl:apply-templates select="mn:fmt-name" /> --> <!-- show figure's name AFTER image -->
+				<!-- </xsl:otherwise>
+			</xsl:choose> -->
+			<xsl:if test="$figure-name-position = 'after'">
+				<xsl:apply-templates select="mn:fmt-name"/> <!-- show figure's name AFTER image -->
+			</xsl:if>
 
 		</fo:block-container>
 	</xsl:template>
@@ -10577,7 +10596,6 @@
 	</xsl:attribute-set>
 
 	<xsl:template name="refine_references-non-normative-title-style">
-
 	</xsl:template>
 
 	<!-- bibitem in Normative References (references/@normative="true") -->
@@ -12640,7 +12658,7 @@
 	<!-- ===================================== -->
 
 	<xsl:attribute-set name="annex-title-style">
-	</xsl:attribute-set>
+	</xsl:attribute-set> <!-- annex-title-style -->
 
 	<xsl:template name="refine_annex-title-style">
 	</xsl:template>
@@ -12651,6 +12669,53 @@
 	<xsl:template name="refine_p-zzSTDTitle1-style">
 	</xsl:template>
 
+	<xsl:attribute-set name="p-style">
+		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
+		<xsl:attribute name="line-height">115%</xsl:attribute>
+	</xsl:attribute-set> <!-- p-style -->
+
+	<xsl:template name="refine_p-style">
+		<xsl:param name="element-name"/>
+		<xsl:param name="margin"/>
+		<xsl:call-template name="setBlockAttributes"/>
+
+		<xsl:if test="ancestor::mn:li">
+			<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
+		</xsl:if>
+		<!-- $namespace = 'csd' -->
+
+	</xsl:template> <!-- refine_p-style -->
+
+	<xsl:attribute-set name="title-style">
+		<!-- Note: font-size for level 1 title -->
+		<xsl:attribute name="font-size">13pt</xsl:attribute>
+		<xsl:attribute name="font-weight">bold</xsl:attribute>
+		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
+		<xsl:attribute name="keep-with-next">always</xsl:attribute>
+		<xsl:attribute name="color">rgb(14, 26, 133)</xsl:attribute>
+	</xsl:attribute-set> <!-- title-style -->
+
+	<xsl:template name="refine_title-style">
+		<xsl:param name="element-name"/>
+		<xsl:variable name="level">
+			<xsl:call-template name="getLevel"/>
+		</xsl:variable>
+		<xsl:if test="$level = 2">
+			<xsl:attribute name="font-size">12pt</xsl:attribute>
+		</xsl:if>
+		<xsl:if test="$level &gt;= 3">
+			<xsl:attribute name="font-size">11pt</xsl:attribute>
+		</xsl:if>
+		<xsl:if test="ancestor::mn:preface">
+			<xsl:attribute name="font-size">13pt</xsl:attribute>
+		</xsl:if>
+		<xsl:if test="ancestor::mn:sections">
+			<xsl:attribute name="margin-top">13.5pt</xsl:attribute>
+		</xsl:if>
+		<!-- $namespace = 'csd' -->
+		<xsl:attribute name="role">H<xsl:value-of select="$level"/></xsl:attribute>
+	</xsl:template> <!-- refine_title-style -->
+
 	<xsl:template name="processPrefaceSectionsDefault">
 		<xsl:for-each select="/*/mn:preface/*[not(self::mn:note or self::mn:admonition)]">
 			<xsl:sort select="@displayorder" data-type="number"/>
@@ -12989,6 +13054,12 @@
 			</xsl:choose>
 	</xsl:template>
 
+	<xsl:attribute-set name="reset-margins-style">
+		<xsl:attribute name="margin-left">0mm</xsl:attribute>
+		<xsl:attribute name="margin-right">0mm</xsl:attribute>
+		<xsl:attribute name="role">SKIP</xsl:attribute>
+	</xsl:attribute-set>
+
 	<xsl:attribute-set name="clause-style">
 
 	</xsl:attribute-set>
@@ -14004,8 +14075,9 @@
 
 	<xsl:template name="setTextAlignment">
 		<xsl:param name="default">left</xsl:param>
+		<xsl:param name="skip_default">false</xsl:param>
 		<xsl:variable name="align" select="normalize-space(@align)"/>
-		<xsl:attribute name="text-align">
+		<xsl:variable name="text_align">
 			<xsl:choose>
 				<xsl:when test="$lang = 'ar' and $align = 'left'">start</xsl:when>
 				<xsl:when test="$lang = 'ar' and $align = 'right'">end</xsl:when>
@@ -14013,9 +14085,13 @@
 				<xsl:when test="$align != '' and not($align = 'indent')"><xsl:value-of select="$align"/></xsl:when>
 				<xsl:when test="ancestor::mn:td/@align"><xsl:value-of select="ancestor::mn:td/@align"/></xsl:when>
 				<xsl:when test="ancestor::mn:th/@align"><xsl:value-of select="ancestor::mn:th/@align"/></xsl:when>
+				<xsl:when test="$skip_default = 'true'"/>
 				<xsl:otherwise><xsl:value-of select="$default"/></xsl:otherwise>
 			</xsl:choose>
-		</xsl:attribute>
+		</xsl:variable>
+		<xsl:if test="normalize-space($text_align) != ''">
+			<xsl:attribute name="text-align"><xsl:value-of select="$text_align"/></xsl:attribute>
+		</xsl:if>
 		<xsl:if test="$align = 'indent'">
 			<xsl:attribute name="margin-left">7mm</xsl:attribute>
 		</xsl:if>
@@ -14023,8 +14099,10 @@
 
 	<xsl:template name="setBlockAttributes">
 		<xsl:param name="text_align_default">left</xsl:param>
+		<xsl:param name="skip_text_align_default">false</xsl:param>
 		<xsl:call-template name="setTextAlignment">
 			<xsl:with-param name="default" select="$text_align_default"/>
+			<xsl:with-param name="skip_default" select="$skip_text_align_default"/>
 		</xsl:call-template>
 		<xsl:call-template name="setKeepAttributes"/>
 		<xsl:if test="node()[1][self::mn:span][contains(@style, 'line-height')]">

data/lib/isodoc/cc/init.rb

@@ -17,7 +17,8 @@ module IsoDoc
 
       def i18n_init(lang, script, locale, i18nyaml = nil)
         @i18n = I18n.new(lang, script, locale: locale,
-                                       i18nyaml: i18nyaml || @i18nyaml)
+                                       i18nyaml: [i18nyaml,
+          Metanorma::Cc.configuration.i18nyaml, @i18nyaml])
       end
     end
   end

data/lib/metanorma/cc/converter.rb

@@ -49,3 +49,5 @@ module Metanorma
     end
   end
 end
+
+require_relative "log"

data/lib/metanorma/cc/log.rb

@@ -0,0 +1,45 @@
+module Metanorma
+  module Cc
+    class Converter
+      CC_LOG_MESSAGES = {
+        # rubocop:disable Naming/VariableNumber
+        "CC_1": { category: "Style",
+                  error: "Only one Symbols and Abbreviated Terms section in the standard",
+                  severity: 2 },
+        "CC_2": { category: "Style",
+                  error: "Symbols and Abbreviated Terms can only contain a definition list",
+                  severity: 2 },
+        "CC_3": { category: "Style",
+                  error: "(section sequencing) %s",
+                  severity: 2 },
+        "CC_4": { category: "Style",
+                  error: "Document must contain at least one clause",
+                  severity: 2 },
+        "CC_5": { category: "Style",
+                  error: "Document must contain clause after Terms and Definitions",
+                  severity: 2 },
+        "CC_6": { category: "Style",
+                  error: "Scope must occur before Terms and Definitions",
+                  severity: 2 },
+        "CC_8": { category: "Style",
+                  error: "Only annexes and references can follow clauses",
+                  severity: 2 },
+        "CC_9": { category: "Style",
+                  error: "Document must include (references) Normative References",
+                  severity: 2 },
+        "CC_11": { category: "Style",
+                   error: "Final section must be (references) Bibliography",
+                   severity: 2 },
+        "CC_12": { category: "Style",
+                   error: "There are sections after the final Bibliography",
+                   severity: 2 },
+
+      }.freeze
+      # rubocop:enable Naming/VariableNumber
+
+      def log_messages
+        super.merge(CC_LOG_MESSAGES)
+      end
+    end
+  end
+end

data/lib/metanorma/cc/validate_section.rb

@@ -11,19 +11,13 @@ module Metanorma
         super
       end
 
-      ONE_SYMBOLS_WARNING = "Only one Symbols and Abbreviated "\
-                            "Terms section in the standard".freeze
-
-      NON_DL_SYMBOLS_WARNING = "Symbols and Abbreviated Terms can "\
-                               "only contain a definition list".freeze
-
       def symbols_validate(root)
         f = root.xpath("//definitions")
         f.empty? && return
-        (f.size == 1) || @log.add("Style", f.first, ONE_SYMBOLS_WARNING)
+        f.size == 1 or @log.add("CC_1", f.first)
         f.first.elements.each do |e|
           unless e.name == "dl"
-            @log.add("Style", f.first, NON_DL_SYMBOLS_WARNING)
+            @log.add("CC_2", f.first)
             return
           end
         end
@@ -35,7 +29,7 @@ module Metanorma
 
         test = accepted.map { |a| n.at(a) }
         if test.all?(&:nil?)
-          @log.add("Style", nil, msg)
+          @log.add("CC_3", nil, params: [msg])
         end
         names
       end
@@ -83,42 +77,35 @@ module Metanorma
           n = names.shift
         end
         if n.nil? || n.name != "clause"
-          @log.add("Style", nil, "Document must contain at least one clause")
+          @log.add("CC_4", nil)
         end
         n&.at("./self::clause") ||
-          @log.add("Style", nil, "Document must contain clause after "\
-                                 "Terms and Definitions")
+          @log.add("CC_5", nil)
         n&.at("./self::clause[@type = 'scope']") &&
-          @log.add("Style", nil,
-                   "Scope must occur before Terms and Definitions")
+          @log.add("CC_6", nil)
         n = names.shift
         while n&.name == "clause"
           n&.at("./self::clause[@type = 'scope']")
-          @log.add("Style", nil,
-                   "Scope must occur before Terms and Definitions")
+          @log.add("CC_6", nil)
           n = names.shift
         end
         unless %w(annex references).include? n&.name
-          @log.add("Style", nil,
-                   "Only annexes and references can follow clauses")
+          @log.add("CC_8", nil)
         end
         while n&.name == "annex"
           n = names.shift
           if n.nil?
-            @log.add("Style", nil, "Document must include (references) "\
-                                   "Normative References")
+            @log.add("CC_9", nil)
+
           end
         end
         n&.at("./self::references[@normative = 'true']") ||
-          @log.add("Style", nil, "Document must include (references) "\
-                                 "Normative References")
+          @log.add("CC_9", nil)
         n = names&.shift
         n&.at("./self::references[@normative = 'false']") ||
-          @log.add("Style", nil,
-                   "Final section must be (references) Bibliography")
+          @log.add("CC_11", nil)
         names.empty? ||
-          @log.add("Style", nil,
-                   "There are sections after the final Bibliography")
+          @log.add("CC_12", nil)
       end
 
       def style_warning(node, msg, text = nil)
@@ -126,7 +113,7 @@ module Metanorma
 
         w = msg
         w += ": #{text}" if text
-        @log.add("Style", node, w)
+        @log.add("STANDOC_48", node, params: [w])
       end
     end
   end

data/lib/metanorma/cc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Cc
-    VERSION = "2.7.6".freeze
+    VERSION = "2.7.7".freeze
   end
 end

data/metanorma-cc.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = Gem::Requirement.new(">= 3.1.0")
 
-  spec.add_dependency "metanorma-generic", "~> 3.1.0"
+  spec.add_dependency "metanorma-generic", "~> 3.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.7.6
+  version: 2.7.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-10-13 00:00:00.000000000 Z
+date: 2025-11-03 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.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -246,6 +246,7 @@ files:
 - lib/metanorma/cc/cc.rng
 - lib/metanorma/cc/converter.rb
 - lib/metanorma/cc/isodoc.rng
+- lib/metanorma/cc/log.rb
 - lib/metanorma/cc/processor.rb
 - lib/metanorma/cc/relaton-cc.rng
 - lib/metanorma/cc/reqt.rng