metanorma-iec 2.3.0 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6bbf4100356359c06914283c42cdc828b4af82024174d93a4d49d5a9f2b12902
-  data.tar.gz: 96c9f82aa720dfe3786e18737580b5634deedd70fca154442bbdab16b1620875
+  metadata.gz: 775ea3e8ebe1ca3b1f99a984c20cd6bab0d47ecd96b66af97c6a3d1701d5539a
+  data.tar.gz: 77c767e8dc7f34d00bbd6efc742932b8799574a26ced31f964688ba99a9f7eb5
 SHA512:
-  metadata.gz: a1b41a266e6b3a83a7be27392f8d0e3dcbe52767039b781b72f0a12424ee96f9ce35eb7450e6f02082b45927b044d03c1323cbaf12024f661155f3ac8a67d9f8
-  data.tar.gz: 370bc7e84e79e71194530fe5e9238da8ce89e55ad4babf7517bc57417268a6be5ccc443adba5859a1a3d297282a44581178691bd20d5508109bc838bef2ca6d6
+  metadata.gz: 36af1bdfc571c505d61b2f645a8c9b17688f4ad66d0fbbd53b169e7ccacb31ba2de46ec98bcff92a7ab84ac9e028e2f29a30855c85be2824549c3794b5d2432f
+  data.tar.gz: c3ad912193409e961b414a963dbf0ef96727be45c1895e6c554054dd5b2210d95f28fcd1a0d64259e849b79020e3976280e94edf68097a603f72960dacf1d006

data/lib/isodoc/iec/iec.international-standard.xsl

@@ -2424,11 +2424,26 @@
 							<xsl:value-of select="$font_extended"/><xsl:text>, </xsl:text>
 						</xsl:if>
 
-						<xsl:value-of select="."/>
+						<xsl:variable name="font_family" select="."/>
 
-						<xsl:if test="$additional_fonts != ''">
-							<xsl:text>, </xsl:text><xsl:value-of select="$additional_fonts"/>
-						</xsl:if>
+						<xsl:choose>
+							<xsl:when test="$additional_fonts = ''">
+								<xsl:value-of select="$font_family"/>
+							</xsl:when>
+							<xsl:otherwise> <!-- $additional_fonts != '' -->
+								<xsl:choose>
+									<xsl:when test="contains($font_family, ',')">
+										<xsl:value-of select="substring-before($font_family, ',')"/>
+										<xsl:text>, </xsl:text><xsl:value-of select="$additional_fonts"/>
+										<xsl:text>, </xsl:text><xsl:value-of select="substring-after($font_family, ',')"/>
+									</xsl:when>
+									<xsl:otherwise>
+										<xsl:value-of select="$font_family"/>
+										<xsl:text>, </xsl:text><xsl:value-of select="$additional_fonts"/>
+									</xsl:otherwise>
+								</xsl:choose>
+							</xsl:otherwise>
+						</xsl:choose>
 					</xsl:attribute>
 				</xsl:when>
 				<xsl:otherwise>
@@ -5077,21 +5092,21 @@
 
 	<xsl:template match="*[local-name()='table']/*[local-name()='note' or local-name() = 'example']" priority="2">
 
-		<fo:block xsl:use-attribute-sets="table-note-style">
+				<fo:block xsl:use-attribute-sets="table-note-style">
 
-			<xsl:call-template name="refine_table-note-style"/>
+					<xsl:call-template name="refine_table-note-style"/>
 
-			<!-- Table's note/example name (NOTE, for example) -->
-			<fo:inline xsl:use-attribute-sets="table-note-name-style">
+					<!-- Table's note/example name (NOTE, for example) -->
+					<fo:inline xsl:use-attribute-sets="table-note-name-style">
 
-				<xsl:call-template name="refine_table-note-name-style"/>
+						<xsl:call-template name="refine_table-note-name-style"/>
 
-				<xsl:apply-templates select="*[local-name() = 'name']"/>
+						<xsl:apply-templates select="*[local-name() = 'name']"/>
 
-			</fo:inline>
+					</fo:inline>
 
-			<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
-		</fo:block>
+					<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
+				</fo:block>
 
 	</xsl:template> <!-- table/note -->
 
@@ -8292,8 +8307,12 @@
 		<xsl:variable name="isAdded" select="../@added"/>
 		<xsl:variable name="isDeleted" select="../@deleted"/>
 		<xsl:choose>
-			<xsl:when test="ancestor::*[local-name() = 'title']">
+			<xsl:when test="ancestor::*[local-name() = 'title'] or not(parent::*[local-name() = 'figure']) or parent::*[local-name() = 'p']">
 				<fo:inline padding-left="1mm" padding-right="1mm">
+					<xsl:if test="not(parent::*[local-name() = 'figure']) or parent::*[local-name() = 'p']">
+						<xsl:attribute name="padding-left">0mm</xsl:attribute>
+						<xsl:attribute name="padding-right">0mm</xsl:attribute>
+					</xsl:if>
 					<xsl:variable name="src">
 						<xsl:call-template name="image_src"/>
 					</xsl:variable>
@@ -8326,7 +8345,7 @@
 							<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style">
 								<xsl:if test="not(@mimetype = 'image/svg+xml') and ../*[local-name() = 'name'] and not(ancestor::*[local-name() = 'table'])">
 
-									<xsl:if test="@width != '' and @width != 'auto'">
+									<xsl:if test="@width != '' and @width != 'auto' and @width != 'text-width' and @width != 'full-page-width' and @width != 'narrow'">
 										<xsl:attribute name="width">
 											<xsl:value-of select="@width"/>
 										</xsl:attribute>

data/lib/metanorma/iec/converter.rb

@@ -1,7 +1,7 @@
 require "asciidoctor"
 require "metanorma-iso"
 require "metanorma/iso/converter"
-require_relative "./front"
+require_relative "front"
 
 module Metanorma
   module Iec
@@ -29,13 +29,12 @@ module Metanorma
       end
 
       def doctype_validate(xmldoc)
-        doctype = xmldoc&.at("//bibdata/ext/doctype")&.text
         %w(international-standard technical-specification technical-report
            publicly-available-specification international-workshop-agreement
-           guide interpretation-sheet).include? doctype or
+           guide interpretation-sheet).include? @doctype or
           @log.add("Document Attributes", nil,
-                   "#{doctype} is not a recognised document type")
-        if function = xmldoc&.at("//bibdata/ext/function")&.text
+                   "#{@doctype} is not a recognised document type")
+        if function = xmldoc.at("//bibdata/ext/function")&.text
           %w(emc quality-assurance safety environment).include? function or
             @log.add("Document Attributes", nil,
                      "#{function} is not a recognised document function")

data/lib/metanorma/iec/front.rb

@@ -3,44 +3,8 @@ require "pubid-iec"
 module Metanorma
   module Iec
     class Converter < ISO::Converter
-      def metadata_author(node, xml)
-        publishers = node.attr("publisher") || "IEC"
-        csv_split(publishers)&.each do |p|
-          xml.contributor do |c|
-            c.role type: "author"
-            c.organization do |a|
-              organization(a, p, false, node, !node.attr("publisher"))
-            end
-          end
-        end
-      end
-
-      def metadata_publisher(node, xml)
-        publishers = node.attr("publisher") || "IEC"
-        csv_split(publishers)&.each do |p|
-          xml.contributor do |c|
-            c.role type: "publisher"
-            c.organization do |a|
-              organization(a, p, true, node, !node.attr("publisher"))
-            end
-          end
-        end
-      end
-
-      def metadata_copyright(node, xml)
-        publishers = node.attr("copyright-holder") || node.attr("publisher") ||
-          "IEC"
-        csv_split(publishers)&.each do |p|
-          xml.copyright do |c|
-            c.from (node.attr("copyright-year") || Date.today.year)
-            c.owner do |owner|
-              owner.organization do |o|
-                organization(o, p, true, node, !node.attr("copyright-holder") ||
-                             node.attr("publisher"))
-              end
-            end
-          end
-        end
+      def home_agency
+        "IEC"
       end
 
       def iso_id(node, xml)

data/lib/metanorma/iec/isodoc.rng

@@ -17,7 +17,7 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
-<!-- VERSION v1.2.3 -->
+<!-- VERSION v1.2.4 -->
 <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">
   <include href="reqt.rng"/>
   <include href="basicdoc.rng">
@@ -2068,6 +2068,9 @@
   </define>
   <define name="termdefinition">
     <element name="definition">
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <choice>
         <ref name="verbaldefinition"/>
         <ref name="nonverbalrep"/>

data/lib/metanorma/iec/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module Iec
-    VERSION = "2.3.0".freeze
+    VERSION = "2.3.2".freeze
   end
 end
 

data/metanorma-iec.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
   spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
-  spec.add_dependency "metanorma-iso", "~> 2.5.0"
+  spec.add_dependency "metanorma-iso", "~> 2.5.2"
   spec.add_dependency "pubid-iec"
   spec.add_dependency "ruby-jing"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iec
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-07 00:00:00.000000000 Z
+date: 2023-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-iso
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.5.2
 - !ruby/object:Gem::Dependency
   name: pubid-iec
   requirement: !ruby/object:Gem::Requirement