metanorma-iec 2.4.1 → 2.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b329047e60d24ccacf88f54b8b6cfa17d7eed313b4badcf010edd7c68428d513
-  data.tar.gz: bfb37bf61f2b60538271615b357f765254dfe11d37c8521d311957c3d04418b4
+  metadata.gz: 10177bc4adcd772657e975fa25b6291c9bc160c5305f6de3771dca5165376958
+  data.tar.gz: 3e8e6457114391eab0741c6835962f8971a1d7c4895538c815372e6dc38aef80
 SHA512:
-  metadata.gz: 516a7f7d89fb06ec86ad7d70e376c708fb623535a97e9f9441abde946b0889d98728f5e99df2fcb8951b4eaf273c47d1ebbd3a6dd34980536293aaa1e1dce29b
-  data.tar.gz: 316c640b39a4a56827d3e836e0d3ddbb752d4f7138b38d8730f62d515529c9d954921684ba9942b6012412f84d06f505d74c51509936d07d2761d63f1dca9e0b
+  metadata.gz: 5a7d53c37f35af53686200f67f136562922c1ddecd44526782e25ba244939c5860956aceda69a2c4458d80d58e5a5aeb4e6d548d4a5cb3846f18b04665a81997
+  data.tar.gz: e6bd168b98945bae77c74f348cacfb4ee20f81860cff0c6f8b3e4a6608a3e2372a726fc303069add01c99414da251d3ac527ee5b2ee8a7acc842c7be0073016a

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

@@ -1018,7 +1018,13 @@
 			</xsl:call-template>
 			<xsl:text> </xsl:text>
 			<fo:inline>
-				<xsl:variable name="edition" select="//iec:iec-standard/iec:bibdata/iec:edition[normalize-space(@language) = '']"/>
+				<xsl:variable name="edition_" select="normalize-space(//iec:iec-standard/iec:bibdata/iec:edition[normalize-space(@language) = ''])"/>
+				<xsl:variable name="edition">
+					<xsl:choose>
+						<xsl:when test="$edition_ = ''">1</xsl:when>
+						<xsl:otherwise><xsl:value-of select="$edition_"/></xsl:otherwise>
+					</xsl:choose>
+				</xsl:variable>
 				<xsl:value-of select="$edition"/>
 				<xsl:if test="not(contains($edition, '.'))">.0</xsl:if>
 			</fo:inline>
@@ -2630,6 +2636,10 @@
 
 	</xsl:attribute-set>
 
+	<xsl:template name="refine_termexample-style">
+
+	</xsl:template>
+
 	<xsl:attribute-set name="example-style">
 
 			<xsl:attribute name="space-before">8pt</xsl:attribute>
@@ -3804,6 +3814,36 @@
 		</xsl:for-each>
 	</xsl:template>
 
+	<xsl:template name="processMainSectionsDefault_flatxml">
+		<xsl:for-each select="/*/*[local-name()='sections']/* | /*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']">
+			<xsl:sort select="@displayorder" data-type="number"/>
+			<xsl:variable name="flatxml">
+				<xsl:apply-templates select="." mode="flatxml"/>
+			</xsl:variable>
+			<!-- debug_flatxml='<xsl:copy-of select="$flatxml"/>' -->
+			<xsl:apply-templates select="xalan:nodeset($flatxml)/*"/>
+
+		</xsl:for-each>
+
+		<xsl:for-each select="/*/*[local-name()='annex']">
+			<xsl:sort select="@displayorder" data-type="number"/>
+			<xsl:variable name="flatxml">
+				<xsl:apply-templates select="." mode="flatxml"/>
+			</xsl:variable>
+			<!-- debug_flatxml='<xsl:copy-of select="$flatxml"/>' -->
+			<xsl:apply-templates select="xalan:nodeset($flatxml)/*"/>
+		</xsl:for-each>
+
+		<xsl:for-each select="/*/*[local-name()='bibliography']/*[not(@normative='true')] |          /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]]">
+			<xsl:sort select="@displayorder" data-type="number"/>
+			<xsl:variable name="flatxml">
+				<xsl:apply-templates select="." mode="flatxml"/>
+			</xsl:variable>
+			<!-- debug_flatxml='<xsl:copy-of select="$flatxml"/>' -->
+			<xsl:apply-templates select="xalan:nodeset($flatxml)/*"/>
+		</xsl:for-each>
+	</xsl:template>
+
 	<xsl:variable name="regex_standard_reference">([A-Z]{2,}(/[A-Z]{2,})* \d+(-\d+)*(:\d{4})?)</xsl:variable>
 	<xsl:variable name="tag_fo_inline_keep-together_within-line_open">###fo:inline keep-together_within-line###</xsl:variable>
 	<xsl:variable name="tag_fo_inline_keep-together_within-line_close">###/fo:inline keep-together_within-line###</xsl:variable>
@@ -5967,13 +6007,13 @@
 		<tr>
 			<td>
 				<xsl:attribute name="id">
-					<xsl:value-of select="concat($id,'_',$row_number,'_1')"/>
+					<xsl:value-of select="concat($id,'@',$row_number,'_1')"/>
 				</xsl:attribute>
 				<xsl:apply-templates/>
 			</td>
 			<td>
 				<xsl:attribute name="id">
-					<xsl:value-of select="concat($id,'_',$row_number,'_2')"/>
+					<xsl:value-of select="concat($id,'@',$row_number,'_2')"/>
 				</xsl:attribute>
 
 						<xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]">
@@ -6655,6 +6695,10 @@
 		<fo:inline keep-with-next.within-line="always"><xsl:value-of select="."/></fo:inline>
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'span'][contains(@style, 'text-transform:none')]//text()" priority="5">
+		<xsl:value-of select="."/>
+	</xsl:template>
+
 	<!-- ========================= -->
 	<!-- END Rich text formatting -->
 	<!-- ========================= -->
@@ -7285,7 +7329,7 @@
 				</xsl:choose>
 			</xsl:variable>
 			<xsl:attribute name="id">
-				<xsl:value-of select="concat($id,'_',$row_number,'_',$col_number,'_',$divide)"/>
+				<xsl:value-of select="concat($id,'@',$row_number,'_',$col_number,'_',$divide)"/>
 			</xsl:attribute>
 
 			<xsl:for-each select="*[local-name() = 'p']">
@@ -7293,7 +7337,7 @@
 					<xsl:copy-of select="@*"/>
 					<xsl:variable name="p_num" select="count(preceding-sibling::*[local-name() = 'p']) + 1"/>
 					<xsl:attribute name="id">
-						<xsl:value-of select="concat($id,'_',$row_number,'_',$col_number,'_p_',$p_num,'_',$divide)"/>
+						<xsl:value-of select="concat($id,'@',$row_number,'_',$col_number,'_p_',$p_num,'_',$divide)"/>
 					</xsl:attribute>
 
 					<!-- <xsl:copy-of select="node()" /> -->
@@ -7357,7 +7401,7 @@
 					<xsl:variable name="num" select="count(preceding-sibling::word) + 1"/>
 					<xsl:copy>
 						<xsl:attribute name="id">
-							<xsl:value-of select="concat($id,'_',$row_number,'_',$col_number,'_word_',$num,'_',$divide)"/>
+							<xsl:value-of select="concat($id,'@',$row_number,'_',$col_number,'_word_',$num,'_',$divide)"/>
 						</xsl:attribute>
 						<xsl:copy-of select="node()"/>
 					</xsl:copy>
@@ -10173,7 +10217,7 @@
 	<!-- ====== -->
 	<xsl:template match="*[local-name() = 'termexample']">
 		<fo:block id="{@id}" xsl:use-attribute-sets="termexample-style">
-
+			<xsl:call-template name="refine_termexample-style"/>
 			<xsl:call-template name="setBlockSpanAll"/>
 
 			<xsl:apply-templates select="*[local-name()='name']"/>

data/lib/isodoc/iec/presentation_xml_convert.rb

@@ -84,10 +84,11 @@ module IsoDoc
           <p class="zzSTDTitle1">&#xa0;</p>
           <p class="zzSTDTitle2"><strong>#{title2}</strong></p>
         OUTPUT
+        title1 &&= Metanorma::Utils.case_transform_xml(title1, :upcase)
         ins.next = <<~OUTPUT
           <pagebreak/><p class="zzSTDTitle1">#{@i18n.get['IEC']}</p>
           <p class="zzSTDTitle1">____________</p><p class="zzSTDTitle1">&#xa0;</p>
-          <p class="zzSTDTitle1"><strong>#{title1&.upcase}</strong></p>#{title2out}
+          <p class="zzSTDTitle1"><strong>#{title1}</strong></p>#{title2out}
           <p class="zzSTDTitle1">&#xa0;</p>
         OUTPUT
       end

data/lib/metanorma/iec/front.rb

@@ -63,9 +63,9 @@ module Metanorma
                 type: get_typeabbr(node),
                 edition: node.attr("edition"), publisher: pub[0],
                 unpublished: /^[0-5]/.match?(get_stage(node)),
-                copublisher: pub[1..-1] }.compact
+                copublisher: pub[1..-1] }
         ret[:copublisher].empty? and ret.delete(:copublisher)
-        ret
+        compact_blank(ret)
       end
 
       def iso_id_stage(node)
@@ -143,11 +143,11 @@ module Metanorma
         @id_revdate = node.attr("revdate")
         ret = { number: node.attr("amendment-number") ||
           node.attr("corrigendum-number"),
-                year: iso_id_year(node) }.compact
+                year: iso_id_year(node) }
         if stage && !cen?(node.attr("publisher"))
           ret[:stage] = stage
         end
-        ret
+        compact_blank(ret)
       end
 
       def report_illegal_stage(stage, substage)

data/lib/metanorma/iec/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module Iec
-    VERSION = "2.4.1".freeze
+    VERSION = "2.4.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.7.0"
+  spec.add_dependency "metanorma-iso", "~> 2.7.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.4.1
+  version: 2.4.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-05 00:00:00.000000000 Z
+date: 2024-02-19 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.7.0
+        version: 2.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 2.7.2
 - !ruby/object:Gem::Dependency
   name: pubid-iec
   requirement: !ruby/object:Gem::Requirement