metanorma-iec 2.5.11 → 2.5.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed4a618c9e1ba0726ed92aa754be91fc050633dfcc14200f8ca1df0770d6e6e2
-  data.tar.gz: 79c04caf59bb6e617d2e7a2481673af29cd11d43c44c17cd625b554567a1f43d
+  metadata.gz: 293aedaf5e38a5a6144556ee13fffdc271e4477c945cd681728e5e9e9154c01f
+  data.tar.gz: 79a0643a146fe752e1895523068f2589da742e391ff1596cb00aabae692e3a59
 SHA512:
-  metadata.gz: 81d946a173c03c2782a6c20c4ba5a42396605778fb8780446256b8e303731d0c3ce5813cb5c9ad60c38e0f9091250d589e18dc7dd0fd8dbfdef4eb329f6dd4b1
-  data.tar.gz: f9e096af9bc5e8f8e34b6ded0a600dcfdedf3fc636555663fc85c30558fdd9a54539382ca5cbc871760bc47b26669dc6d0b0a9023d3ea16a8c52f47501f65ac6
+  metadata.gz: 6a20bc6b38666a64a6a768a3a8908420db3efef4a59dee7b2643a1e24a4c08611bfa34d3f894a7df3e5ee69a5bf1fba8e97ea7695fa7b8ab915835b5e4c02aea
+  data.tar.gz: f4d3769e2894778122a77a38657fd0870d2b1408235bfa30845e1133689272c815a1085948c34e9e11d21e623869a9969c9336867944305c4659d27bf061c2f0

data/lib/isodoc/iec/base_convert.rb

@@ -43,6 +43,11 @@ module IsoDoc
         end
       end
 
+      def termdef_parse(node, out)
+        node.at(ns("./fmt-preferred")) or return
+        super
+      end
+
       def para_class(node)
         case node["class"]
         when "zzSTDTitle1", "zzSTDTitle2" then "zzSTDTitle1"

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

@@ -3403,6 +3403,9 @@
 
 	</xsl:attribute-set>
 
+	<xsl:attribute-set name="related-block-style" use-attribute-sets="preferred-block-style">
+	</xsl:attribute-set>
+
 	<xsl:attribute-set name="definition-style">
 
 			<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
@@ -5732,7 +5735,9 @@
 					<xsl:with-param name="element">
 						<fo:basic-link internal-destination="{$ref_id}" fox:alt-text="footnote {$current_fn_number}"> <!-- note: role="Lbl" removed in https://github.com/metanorma/mn2pdf/issues/291 -->
 							<fo:inline role="Lbl"> <!-- need for https://github.com/metanorma/metanorma-iso/issues/1003 -->
+
 								<xsl:copy-of select="$current_fn_number_text"/>
+
 							</fo:inline>
 						</fo:basic-link>
 					</xsl:with-param>
@@ -5751,8 +5756,7 @@
 
 						<fo:block-container xsl:use-attribute-sets="fn-container-body-style" role="SKIP">
 
-							<fo:block xsl:use-attribute-sets="fn-body-style" role="SKIP">
-
+							<xsl:variable name="fn_block">
 								<xsl:call-template name="refine_fn-body-style"/>
 
 								<fo:inline id="{$ref_id}" xsl:use-attribute-sets="fn-body-num-style" role="Lbl">
@@ -5760,9 +5764,15 @@
 									<xsl:call-template name="refine_fn-body-num-style"/>
 
 									<xsl:value-of select="$current_fn_number_text"/>
+
 								</fo:inline>
 								<xsl:apply-templates/>
-							</fo:block>
+							</xsl:variable>
+
+									<fo:block xsl:use-attribute-sets="fn-body-style" role="SKIP">
+										<xsl:copy-of select="$fn_block"/>
+									</fo:block>
+
 						</fo:block-container>
 					</fo:footnote-body>
 				</fo:footnote>
@@ -11904,14 +11914,17 @@
 		</fo:block>
 	</xsl:template>
 
-	<xsl:template match="*[local-name() = 'domain']">
+	<!-- <xsl:template match="*[local-name() = 'domain']"> -->
 		<!-- https://github.com/metanorma/isodoc/issues/607 
 		<fo:inline xsl:use-attribute-sets="domain-style">&lt;<xsl:apply-templates/>&gt;</fo:inline>
 		<xsl:text> </xsl:text> -->
-		<xsl:if test="not(@hidden = 'true')">
+		<!-- <xsl:if test="not(@hidden = 'true')">
 			<xsl:apply-templates/>
 		</xsl:if>
-	</xsl:template>
+	</xsl:template> -->
+
+	<!-- https://github.com/metanorma/isodoc/issues/632#issuecomment-2567163931 -->
+	<xsl:template match="*[local-name() = 'domain']"/>
 
 	<xsl:template match="*[local-name() = 'admitted']">
 		<fo:block xsl:use-attribute-sets="admitted-style">
@@ -11926,9 +11939,11 @@
 	</xsl:template>
 
 	<xsl:template name="setStyle_preferred">
-		<xsl:if test="*[local-name() = 'strong']">
-			<xsl:attribute name="font-weight">normal</xsl:attribute>
-		</xsl:if>
+
+				<xsl:if test="*[local-name() = 'strong']">
+					<xsl:attribute name="font-weight">normal</xsl:attribute>
+				</xsl:if>
+
 	</xsl:template>
 
 	<!-- regarding ISO 10241-1:2011,  If there is more than one preferred term, each preferred term follows the previous one on a new line. -->
@@ -11938,6 +11953,17 @@
 	</xsl:template>
 	<!--  End Preferred, admitted, deprecated -->
 
+	<xsl:template match="*[local-name() = 'fmt-related']">
+		<fo:block role="SKIP" xsl:use-attribute-sets="related-block-style">
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template>
+	<xsl:template match="*[local-name() = 'fmt-related']/*[local-name() = 'p']" priority="4">
+		<fo:block>
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template>
+
 	<!-- ========== -->
 	<!-- definition -->
 	<!-- ========== -->
@@ -12848,6 +12874,7 @@
 
 	<!-- Normative references -->
 	<xsl:template match="*[local-name() = 'references'][@normative='true']/*[local-name() = 'bibitem']" name="bibitem" priority="2">
+		<xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][local-name() = 'bibitem'] and 1 = 1)"/> <!-- current bibiitem is non-first -->
 
 				<fo:block id="{@id}" xsl:use-attribute-sets="bibitem-normative-style">
 
@@ -13564,7 +13591,8 @@
 			<!-- add @id - first element with @id plus '_element_name' -->
 			<xsl:variable name="prefix_id_" select="(.//*[@id])[1]/@id"/>
 			<xsl:variable name="prefix_id"><xsl:value-of select="$prefix_id_"/><xsl:if test="normalize-space($prefix_id_) = ''"><xsl:value-of select="generate-id()"/></xsl:if></xsl:variable>
-			<xsl:attribute name="id"><xsl:value-of select="$prefix_id"/>_<xsl:value-of select="local-name()"/></xsl:attribute>
+			<xsl:variable name="document_suffix" select="ancestor::*[contains(local-name(), '-standard')]/@document_suffix"/>
+			<xsl:attribute name="id"><xsl:value-of select="concat($prefix_id, '_', local-name(), '_', $document_suffix)"/></xsl:attribute>
 		</xsl:if>
 	</xsl:template>
 
@@ -13621,6 +13649,31 @@
 	<xsl:template match="*[local-name() = 'name'][following-sibling::*[1][local-name() = 'fmt-name']]" mode="update_xml_pres"/>
 	<xsl:template match="*[local-name() = 'section-title'][following-sibling::*[1][local-name() = 'p'][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_step1"/>
 	<xsl:template match="*[local-name() = 'section-title'][following-sibling::*[1][local-name() = 'p'][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_pres"/>
+	<!-- <xsl:template match="*[local-name() = 'preferred'][following-sibling::*[not(local-name() = 'preferred')][1][local-name() = 'fmt-preferred']]" mode="update_xml_step1"/> -->
+	<xsl:template match="*[local-name() = 'preferred']" mode="update_xml_step1"/>
+	<!-- <xsl:template match="*[local-name() = 'preferred'][following-sibling::*[not(local-name() = 'preferred')][1][local-name() = 'fmt-preferred']]" mode="update_xml_pres"/> -->
+	<xsl:template match="*[local-name() = 'preferred']" mode="update_xml_pres"/>
+	<!-- <xsl:template match="*[local-name() = 'admitted'][following-sibling::*[not(local-name() = 'admitted')][1][local-name() = 'fmt-admitted']]" mode="update_xml_step1"/> -->
+	<xsl:template match="*[local-name() = 'admitted']" mode="update_xml_step1"/>
+	<!-- <xsl:template match="*[local-name() = 'admitted'][following-sibling::*[not(local-name() = 'admitted')][1][local-name() = 'fmt-admitted']]" mode="update_xml_pres"/> -->
+	<xsl:template match="*[local-name() = 'admitted']" mode="update_xml_pres"/>
+	<!-- <xsl:template match="*[local-name() = 'deprecates'][following-sibling::*[not(local-name() = 'deprecates')][1][local-name() = 'fmt-deprecates']]" mode="update_xml_step1"/> -->
+	<xsl:template match="*[local-name() = 'deprecates']" mode="update_xml_step1"/>
+	<xsl:template match="*[local-name() = 'related']" mode="update_xml_step1"/>
+	<!-- <xsl:template match="*[local-name() = 'deprecates'][following-sibling::*[not(local-name() = 'deprecates')][1][local-name() = 'fmt-deprecates']]" mode="update_xml_pres"/> -->
+	<xsl:template match="*[local-name() = 'deprecates']" mode="update_xml_pres"/>
+	<xsl:template match="*[local-name() = 'related']" mode="update_xml_pres"/>
+	<!-- <xsl:template match="*[local-name() = 'definition'][following-sibling::*[1][local-name() = 'fmt-definition']]" mode="update_xml_step1"/> -->
+	<xsl:template match="*[local-name() = 'definition']" mode="update_xml_step1"/>
+	<!-- <xsl:template match="*[local-name() = 'definition'][following-sibling::*[1][local-name() = 'fmt-definition']]" mode="update_xml_pres"/> -->
+	<xsl:template match="*[local-name() = 'definition']" mode="update_xml_pres"/>
+	<!-- <xsl:template match="*[local-name() = 'termsource'][following-sibling::*[1][local-name() = 'fmt-termsource']]" mode="update_xml_step1"/> -->
+	<xsl:template match="*[local-name() = 'termsource']" mode="update_xml_step1"/>
+	<!-- <xsl:template match="*[local-name() = 'termsource'][following-sibling::*[1][local-name() = 'fmt-termsource']]" mode="update_xml_pres"/> -->
+	<xsl:template match="*[local-name() = 'termsource']" mode="update_xml_pres"/>
+
+	<xsl:template match="*[local-name() = 'term'][@unnumbered = 'true'][not(.//*[starts-with(local-name(), 'fmt-')])]" mode="update_xml_step1"/>
+	<xsl:template match="*[local-name() = 'term'][@unnumbered = 'true'][not(.//*[starts-with(local-name(), 'fmt-')])]" mode="update_xml_pres"/>
 
 	<xsl:template match="*[local-name() = 'p'][@type = 'section-title' or @type = 'floating-title'][preceding-sibling::*[1][local-name() = 'section-title']]" mode="update_xml_step1">
 		<xsl:copy>
@@ -13665,6 +13718,94 @@
 		</xsl:element>
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'fmt-preferred']"/>
+	<xsl:template match="*[local-name() = 'fmt-preferred'][*[local-name() = 'p']]" mode="update_xml_step1">
+		<xsl:apply-templates mode="update_xml_step1"/>
+	</xsl:template>
+	<xsl:template match="*[local-name() = 'fmt-preferred'][not(*[local-name() = 'p'])] | *[local-name() = 'fmt-preferred']/*[local-name() = 'p']" mode="update_xml_step1">
+		<xsl:element name="preferred" namespace="{$namespace_full}">
+			<xsl:copy-of select="@*"/>
+			<xsl:apply-templates mode="update_xml_step1"/>
+		</xsl:element>
+	</xsl:template>
+	<xsl:template match="*[local-name() = 'fmt-preferred'][*[local-name() = 'p']]" mode="update_xml_pres">
+		<xsl:apply-templates mode="update_xml_pres"/>
+	</xsl:template>
+	<xsl:template match="*[local-name() = 'fmt-preferred'][not(*[local-name() = 'p'])] | *[local-name() = 'fmt-preferred']/*[local-name() = 'p']" mode="update_xml_pres">
+		<xsl:element name="preferred" namespace="{$namespace_full}">
+			<xsl:copy-of select="@*"/>
+			<xsl:apply-templates mode="update_xml_pres"/>
+		</xsl:element>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'fmt-admitted']"/>
+	<xsl:template match="*[local-name() = 'fmt-admitted'][*[local-name() = 'p']]" mode="update_xml_step1">
+		<xsl:apply-templates mode="update_xml_step1"/>
+	</xsl:template>
+	<xsl:template match="*[local-name() = 'fmt-admitted'][not(*[local-name() = 'p'])] | *[local-name() = 'fmt-admitted']/*[local-name() = 'p']" mode="update_xml_step1">
+		<xsl:element name="admitted" namespace="{$namespace_full}">
+			<xsl:copy-of select="@*"/>
+			<xsl:apply-templates mode="update_xml_step1"/>
+		</xsl:element>
+	</xsl:template>
+	<xsl:template match="*[local-name() = 'fmt-admitted'][*[local-name() = 'p']]" mode="update_xml_pres">
+		<xsl:apply-templates mode="update_xml_pres"/>
+	</xsl:template>
+	<xsl:template match="*[local-name() = 'fmt-admitted'][not(*[local-name() = 'p'])] | *[local-name() = 'fmt-admitted']/*[local-name() = 'p']" mode="update_xml_pres">
+		<xsl:element name="admitted" namespace="{$namespace_full}">
+			<xsl:copy-of select="@*"/>
+			<xsl:apply-templates mode="update_xml_pres"/>
+		</xsl:element>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'fmt-deprecates']"/>
+	<xsl:template match="*[local-name() = 'fmt-deprecates'][*[local-name() = 'p']]" mode="update_xml_step1">
+		<xsl:apply-templates mode="update_xml_step1"/>
+	</xsl:template>
+	<xsl:template match="*[local-name() = 'fmt-deprecates'][not(*[local-name() = 'p'])] | *[local-name() = 'fmt-deprecates']/*[local-name() = 'p']" mode="update_xml_step1">
+		<xsl:element name="deprecates" namespace="{$namespace_full}">
+			<xsl:copy-of select="@*"/>
+			<xsl:apply-templates mode="update_xml_step1"/>
+		</xsl:element>
+	</xsl:template>
+	<xsl:template match="*[local-name() = 'fmt-deprecates'][*[local-name() = 'p']]" mode="update_xml_pres">
+		<xsl:apply-templates mode="update_xml_pres"/>
+	</xsl:template>
+	<xsl:template match="*[local-name() = 'fmt-deprecates'][not(*[local-name() = 'p'])] | *[local-name() = 'fmt-deprecates']/*[local-name() = 'p']" mode="update_xml_pres">
+		<xsl:element name="deprecates" namespace="{$namespace_full}">
+			<xsl:copy-of select="@*"/>
+			<xsl:apply-templates mode="update_xml_pres"/>
+		</xsl:element>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'fmt-definition']"/>
+	<xsl:template match="*[local-name() = 'fmt-definition']" mode="update_xml_step1">
+		<xsl:element name="definition" namespace="{$namespace_full}">
+			<xsl:copy-of select="@*"/>
+			<xsl:apply-templates mode="update_xml_step1"/>
+		</xsl:element>
+	</xsl:template>
+	<xsl:template match="*[local-name() = 'fmt-definition']" mode="update_xml_pres">
+		<xsl:element name="definition" namespace="{$namespace_full}">
+			<xsl:copy-of select="@*"/>
+			<xsl:apply-templates mode="update_xml_pres"/>
+		</xsl:element>
+	</xsl:template>
+
+	<xsl:template match="*[local-name() = 'fmt-termsource']"/>
+	<xsl:template match="*[local-name() = 'fmt-termsource']" mode="update_xml_step1">
+		<xsl:element name="termsource" namespace="{$namespace_full}">
+			<xsl:copy-of select="@*"/>
+			<xsl:apply-templates mode="update_xml_step1"/>
+		</xsl:element>
+	</xsl:template>
+	<xsl:template match="*[local-name() = 'fmt-termsource']" mode="update_xml_pres">
+		<xsl:element name="termsource" namespace="{$namespace_full}">
+			<xsl:copy-of select="@*"/>
+			<xsl:apply-templates mode="update_xml_pres"/>
+		</xsl:element>
+	</xsl:template>
+
 	<xsl:template match="*[local-name() = 'span'][                @class = 'fmt-caption-label' or                 @class = 'fmt-element-name' or                @class = 'fmt-caption-delim' or                @class = 'fmt-autonum-delim']" mode="update_xml_step1" priority="3">
 		<xsl:apply-templates mode="update_xml_step1"/>
 	</xsl:template>
@@ -14803,7 +14944,7 @@
 	</xsl:template>
 
 	<xsl:template name="namespaceCheck">
-		<xsl:variable name="documentNS" select="namespace-uri(/*)"/>
+		<xsl:variable name="documentNS" select="$namespace_full"/> <!-- namespace-uri(/*) -->
 		<xsl:variable name="XSLNS">
 
 				<xsl:value-of select="document('')//*/namespace::iec"/>
@@ -14893,6 +15034,9 @@
 				<xsl:when test="$formatted = 'true' and string-length($bibdata_updated) != ''">
 					<xsl:apply-templates select="xalan:nodeset($bibdata_updated)//*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
 				</xsl:when>
+				<xsl:when test="string-length($bibdata_updated) != ''">
+					<xsl:value-of select="xalan:nodeset($bibdata_updated)//*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
+				</xsl:when>
 				<xsl:when test="$formatted = 'true'">
 					<xsl:apply-templates select="xalan:nodeset($bibdata)//*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
 				</xsl:when>

data/lib/isodoc/iec/presentation_terms.rb

@@ -39,13 +39,14 @@ module IsoDoc
       def terms(docxml)
         otherlang_designations(docxml)
         super
+        remove_otherlang_designations(docxml)
         merge_fr_into_en_term(docxml)
       end
 
-      def termdomain(elem)
+      def termdomain(elem, fmt_defn)
         if @is_iev
-          d = elem.at(ns("./domain")) or return
-          d["hidden"] = true
+          #d = elem.at(ns("./domain")) or return
+          #d["hidden"] = true
         else super
         end
       end
@@ -55,17 +56,21 @@ module IsoDoc
         docxml.xpath(ns("//term[@language = 'en'][@tag]")).each do |en|
           fr = docxml.at(ns("//term[@language = 'fr'][@tag = '#{en['tag']}']"))
           merge_fr_into_en_term1(en, fr) if fr
-          en.xpath(ns("./fmt-name | ./fmt-xref-label")).each(&:remove)
-          term1(en)
         end
+        # renumber
         @xrefs.parse_inclusions(clauses: true).parse docxml
-        #docxml.xpath(ns("//term/fmt-name | //term/fmt-xref")).each(&:remove)
-        #term(docxml)
+        docxml.xpath(ns("//term/fmt-name | //term/fmt-xref-label")).each(&:remove)
+        term(docxml)
       end
 
       def merge_fr_into_en_term1(en_term, fr_term)
         dl = en_term&.at(ns("./dl[@type = 'other-lang']"))&.remove
-        en_term << fr_term.remove.children
+        #en_term << fr_term.remove.children
+        dup = semx_fmt_dup(fr_term)
+        dup.xpath(ns("./fmt-name | ./fmt-xref-label")).each(&:remove)
+        en_term << dup
+        fr_term.xpath(ns(".//fmt-name | .//fmt-xref-label | .//fmt-preferred | .//fmt-admitted | .//fmt-deprecates | .//fmt-definition | .//fmt-related | .//fmt-termsource")).each(&:remove)
+        fr_term["unnumbered"] = "true"
         en_term << dl if dl
         en_term["language"] = "en,fr"
         en_term.delete("tag")
@@ -78,6 +83,14 @@ module IsoDoc
         end
       end
 
+      def remove_otherlang_designations(docxml)
+        @is_iev or return
+        docxml.xpath(ns("//term")).each do |t|
+          remove_otherlang_designations1(t, t["language"]&.split(",") || %w(en fr))
+        end
+      end
+
+      # KILL
       def extract_otherlang_designations(term, lgs)
         term.xpath(ns(".//preferred/expression[@language]"))
           .each_with_object([]) do |d, m|
@@ -85,12 +98,26 @@ module IsoDoc
           d.delete("language")
           lgs.include?(lg) and next
           p = d.parent
-          designation_annotate(p, d.at(ns("./name")))
+          designation_annotate(p, p.at(ns("./name")))
           m << { lang: lg, script: Metanorma::Utils.default_script(lg),
                  designation: to_xml(l10n_recursive(p.remove, lg)).strip }
         end
       end
 
+      def extract_otherlang_designations(term, lgs)
+        term.xpath(ns(".//preferred/expression[@language]"))
+          .each_with_object([]) do |d, m|
+            lg = d["language"]
+          lgs.include?(lg) and next
+          p = semx_fmt_dup(d.parent)
+          e = p.at(ns("./expression"))
+          e.delete("language")
+          designation_annotate(p, p.at(ns(".//name")), d.parent)
+          m << { lang: lg, script: Metanorma::Utils.default_script(lg),
+                 designation: to_xml(l10n_recursive(p, lg)).strip }
+        end
+      end
+
       def l10n_recursive(xml, lang)
         script = Metanorma::Utils.default_script(lang)
         c = HTMLEntities.new
@@ -125,18 +152,36 @@ module IsoDoc
         term << "<dl type='other-lang'>#{prefs.join}</dl>"
       end
 
+      def remove_otherlang_designations1(term, lgs)
+        term.xpath(ns(".//fmt-preferred/p/semx[@element = 'preferred']")).each do |s|
+          p = semx_orig(s, term)
+          lg = p.at(ns("./expression/@language"))&.text or next
+          lgs.include?(lg) and next
+          s.parent.remove
+      end
+      end
+
       def related(docxml)
-        docxml.xpath(ns("//term[related]")).each { |f| move_related(f) }
+        #docxml.xpath(ns("//term[related]")).each { |f| move_related(f) }
         super
+        docxml.xpath(ns("//term[related]")).each { |f| move_related(f) }
       end
 
-      def move_related(term)
+      # KILL
+            def move_related(term)
         defn = term.at(ns("./definition")) or return
         term.xpath(ns("./related")).reverse_each do |r|
           defn.next = r.remove
         end
       end
 
+      def move_related(term)
+        defn = term.at(ns("./fmt-definition")) or return
+        rel = term.at(ns("./fmt-related")) or return
+        defn << rel.children
+      end
+
+      # KILL
       def related1(node)
         lg = node.at("./ancestor::xmlns:term/@language")&.text
         @i18n = @i18n_lg[lg] if lg && @i18n_lg[lg]
@@ -148,6 +193,16 @@ module IsoDoc
         @i18n = @i18n_lg["default"]
       end
 
+            def related1(node)
+        lg = node.at("./ancestor::xmlns:term/@language")&.text
+        @i18n = @i18n_lg[lg] if lg && @i18n_lg[lg]
+        p, ref, orig = related1_prep(node)
+      label = @i18n.relatedterms[orig["type"]].upcase
+        node.children =(l10n("<p>#{label}: " \
+                          "#{to_xml(p)} (#{Common::to_xml(ref)})</p>"))
+        @i18n = @i18n_lg["default"]
+      end
+
       def termsource_modification(node)
         lg = node&.at("./ancestor::xmlns:term/@language")&.text
         @i18n = @i18n_lg[lg] if lg && @i18n_lg[lg]
@@ -155,7 +210,8 @@ module IsoDoc
         @i18n = @i18n_lg["default"]
       end
 
-      def termsource1(node)
+      # KILL
+      def termsource1xx(node)
         lg = node&.at("./ancestor::xmlns:term/@language")&.text
         @i18n = @i18n_lg[lg] if lg && @i18n_lg[lg]
         if @is_iev then termsource1_iev(node)
@@ -164,6 +220,7 @@ module IsoDoc
         @i18n = @i18n_lg["default"]
       end
 
+      # KILL
       def termsource1_iev(elem)
         while elem&.next_element&.name == "termsource"
           elem << "; #{to_xml(elem.next_element.remove.children)}"
@@ -171,6 +228,14 @@ module IsoDoc
         elem.children = l10n("#{@i18n.source}: #{to_xml(elem.children).strip}")
       end
 
+      def termsource_label(elem, sources)
+        @is_iev or return super
+        lg = elem&.at("./ancestor::xmlns:term/@language")&.text
+        @i18n = @i18n_lg[lg] if lg && @i18n_lg[lg]
+      elem.replace(l10n("#{@i18n.source}: #{sources}"))
+      @i18n = @i18n_lg["default"]
+    end
+
       def termexample(docxml)
         docxml.xpath(ns("//termexample")).each do |f|
           termexample1(f)

data/lib/isodoc/iec/xref.rb

@@ -32,10 +32,13 @@ module IsoDoc
               #xref: l10n("#{@labels['section_iev']} #{num}"),
               xref: labelled_autonum(@labels['section_iev'], num),
               level: 2, type: "clause", elem: @labels["section_iev"] }
-          t.xpath(ns("./term")).each_with_index do |c, j|
+          j = 0
+          t.xpath(ns("./term")).each do |c|
+            c["unnumbered"] == "true" and next
             num2 = semx(c, "%02d" % [j + 1])
             #section_names1(c, "#{num}#{delim_wrap("-")}#{num2}", 3)
             section_names1(c, num, num2, 3)
+            j += 1
           end
         end
       end

data/lib/metanorma/iec/biblio.rng

@@ -1277,17 +1277,17 @@ for which this claim of validity is made, if applicable</a:documentation>
   </define>
   <define name="validityBegins">
     <element name="validityBegins">
-      <ref name="ISO8601DateTime"/>
+      <ref name="ISO8601Date"/>
     </element>
   </define>
   <define name="validityEnds">
     <element name="validityEnds">
-      <ref name="ISO8601DateTime"/>
+      <ref name="ISO8601Date"/>
     </element>
   </define>
   <define name="validityRevision">
     <element name="revision">
-      <ref name="ISO8601DateTime"/>
+      <ref name="ISO8601Date"/>
     </element>
   </define>
   <define name="TypedTitleString">

data/lib/metanorma/iec/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module Iec
-    VERSION = "2.5.11".freeze
+    VERSION = "2.5.12".freeze
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iec
 version: !ruby/object:Gem::Version
-  version: 2.5.11
+  version: 2.5.12
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-07 00:00:00.000000000 Z
+date: 2025-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-iso