metanorma-iec 2.2.14 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0dcfbfc355ea835e896c3efa463647098bc8ad0c10d79ace8de627e15c1b8a3e
-  data.tar.gz: '054086032be92eea2f17e511ca544c283dd2d33892a1626929da7dc918bf7d34'
+  metadata.gz: 6bbf4100356359c06914283c42cdc828b4af82024174d93a4d49d5a9f2b12902
+  data.tar.gz: 96c9f82aa720dfe3786e18737580b5634deedd70fca154442bbdab16b1620875
 SHA512:
-  metadata.gz: 8dbca0f48f61bbcac0645919b6fb8748efa855929b6d5487b62bb8cfe254693f4e083cce53d0bdeec4a736a50d3589372321529c4a2e543ee4b24b1e2e0931fc
-  data.tar.gz: 2e0688e57610d42458e70ca71cd3d1a90b749791d4f5261171a3981b8411c2eb9518fbab082c07e7176526b0e4ff1d66cfa5da09fdbacdc5c42da1183c55dde1
+  metadata.gz: a1b41a266e6b3a83a7be27392f8d0e3dcbe52767039b781b72f0a12424ee96f9ce35eb7450e6f02082b45927b044d03c1323cbaf12024f661155f3ac8a67d9f8
+  data.tar.gz: 370bc7e84e79e71194530fe5e9238da8ce89e55ad4babf7517bc57417268a6be5ccc443adba5859a1a3d297282a44581178691bd20d5508109bc838bef2ca6d6

data/lib/isodoc/iec/base_convert.rb

@@ -15,35 +15,7 @@ module IsoDoc
         end
       end
 
-      def middle_title(_isoxml, out)
-        title1, title2 = middle_title_parts(out)
-        out.p(class: "zzSTDTitle1") do |p|
-          p.b { |b| b << title1 }
-        end
-        if title2
-          out.p(class: "zzSTDTitle1") { |p| p << "&#xa0;" }
-          out.p(class: "zzSTDTitle2") do |p|
-            p.b { |b| b << title2 }
-          end
-        end
-        out.p(class: "zzSTDTitle1") { |p| p << "&#xa0;" }
-      end
-
-      def middle_title_parts(_out)
-        title1 = @meta.get[:doctitlemain]&.sub(/\s+$/, "")
-        @meta.get[:doctitleintro] and
-          title1 = "#{@meta.get[:doctitleintro]} &#x2014; #{title1}"
-        title2 = nil
-        if @meta.get[:doctitlepart]
-          title1 += " &#x2014;"
-          title2 = @meta.get[:doctitlepart]&.sub(/\s+$/, "")
-          @meta.get[:doctitlepartlabel] and
-            title2 = "#{@meta.get[:doctitlepartlabel]}: #{title2}"
-        end
-        [title1, title2]
-      end
-
-      def bibliography(isoxml, out)
+      def bibliography(node, out)
         return super unless @is_iev
       end
 

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

@@ -1350,10 +1350,13 @@
 		<fo:block break-after="page"/>
 	</xsl:template>
 
-	<xsl:template match="*[local-name() = 'preface' or local-name() = 'sections']/iec:p[starts-with(@class, 'zzSTDTitle')]" priority="3">
+	<xsl:template match="*[local-name() = 'preface' or local-name() = 'sections']/iec:p[starts-with(@class, 'zzSTDTitle')]" priority="4">
 		<fo:block-container font-size="12pt" text-align="center">
 			<xsl:if test="following-sibling::*[1][not(self::iec:p[starts-with(@class, 'zzSTDTitle')])]">
 				<xsl:attribute name="margin-bottom">18pt</xsl:attribute>
+				<xsl:if test="ancestor::*[local-name() = 'sections']">
+					<xsl:attribute name="margin-bottom">30pt</xsl:attribute>
+				</xsl:if>
 			</xsl:if>
 			<fo:block>
 				<xsl:if test="iec:strong"> <!-- title -->
@@ -1364,6 +1367,10 @@
 		</fo:block-container>
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'sections']/iec:p[@class = 'zzSTDTitle1']//text()" priority="4">
+		<xsl:value-of select="java:toUpperCase(java:java.lang.String.new(.))"/>
+	</xsl:template>
+
 	<xsl:template name="insertPrefacepages">
 		<xsl:param name="lang" select="$lang"/>
 		<fo:block break-after="page"/>
@@ -1408,17 +1415,17 @@
 			<xsl:call-template name="insertHeaderFooter"/>
 			<fo:flow flow-name="xsl-region-body">
 
-				<fo:block-container font-size="12pt" text-align="center" margin-bottom="36pt">
-
-					<fo:block font-weight="bold" role="H1">
-
+				<!-- <fo:block-container font-size="12pt" text-align="center" margin-bottom="36pt">
+					
+					<fo:block font-weight="bold" role="H1">						
+					
 						<xsl:call-template name="printTitles">
 							<xsl:with-param name="lang" select="$lang"/>
 						</xsl:call-template>
-
-						<fo:block> </fo:block>
+						
+						<fo:block>&#xa0;</fo:block>
 					</fo:block>
-				</fo:block-container>
+				</fo:block-container> -->
 
 				<!-- Main sections -->
 				<fo:block>
@@ -6161,6 +6168,9 @@
 	<!-- END Definition List -->
 	<!-- ===================== -->
 
+	<!-- default: ignore title in sections/p -->
+	<xsl:template match="*[local-name() = 'sections']/*[local-name() = 'p'][starts-with(@class, 'zzSTDTitle')]" priority="3"/>
+
 	<!-- ========================= -->
 	<!-- Rich text formatting -->
 	<!-- ========================= -->
@@ -8316,25 +8326,45 @@
 							<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:variable name="img_src">
-										<xsl:choose>
-											<xsl:when test="not(starts-with(@src, 'data:'))"><xsl:value-of select="concat($basepath, @src)"/></xsl:when>
-											<xsl:otherwise><xsl:value-of select="@src"/></xsl:otherwise>
-										</xsl:choose>
-									</xsl:variable>
+									<xsl:if test="@width != '' and @width != 'auto'">
+										<xsl:attribute name="width">
+											<xsl:value-of select="@width"/>
+										</xsl:attribute>
+									</xsl:if>
 
-									<xsl:variable name="image_width_effective">
+									<xsl:if test="@height != '' and @height != 'auto'">
+										<xsl:attribute name="height">
+											<xsl:value-of select="@height"/>
+										</xsl:attribute>
+									</xsl:if>
 
-												<xsl:value-of select="$width_effective"/>
+									<xsl:choose>
+										<xsl:when test="@width != '' and @width != 'auto' and @height != '' and @height != 'auto'">
+											<xsl:attribute name="scaling">non-uniform</xsl:attribute>
+										</xsl:when>
+										<xsl:otherwise>
 
-									</xsl:variable>
+											<xsl:variable name="img_src">
+												<xsl:choose>
+													<xsl:when test="not(starts-with(@src, 'data:'))"><xsl:value-of select="concat($basepath, @src)"/></xsl:when>
+													<xsl:otherwise><xsl:value-of select="@src"/></xsl:otherwise>
+												</xsl:choose>
+											</xsl:variable>
 
-									<xsl:variable name="scale" select="java:org.metanorma.fop.Util.getImageScale($img_src, $image_width_effective, $height_effective)"/>
-									<xsl:if test="number($scale) &lt; 100">
+											<xsl:variable name="image_width_effective">
 
-												<xsl:attribute name="content-width"><xsl:value-of select="$scale"/>%</xsl:attribute>
+														<xsl:value-of select="$width_effective"/>
 
-									</xsl:if>
+											</xsl:variable>
+
+											<xsl:variable name="scale" select="java:org.metanorma.fop.Util.getImageScale($img_src, $image_width_effective, $height_effective)"/>
+											<xsl:if test="number($scale) &lt; 100">
+
+														<xsl:attribute name="content-width"><xsl:value-of select="$scale"/>%</xsl:attribute>
+
+											</xsl:if>
+										</xsl:otherwise>
+									</xsl:choose>
 
 								</xsl:if>
 
@@ -12011,7 +12041,7 @@
 	<xsl:template match="*[local-name() = 'span']" mode="update_xml_step1">
 		<xsl:apply-templates mode="update_xml_step1"/>
 	</xsl:template>
-	<xsl:template match="*[local-name() = 'sourcecode']//*[local-name() = 'span'][@class]" mode="update_xml_step1" priority="2">
+	<xsl:template match="*[local-name() = 'sections']/*[local-name() = 'p'][starts-with(@class, 'zzSTDTitle')]/*[local-name() = 'span'][@class] | *[local-name() = 'sourcecode']//*[local-name() = 'span'][@class]" mode="update_xml_step1" priority="2">
 		<xsl:copy>
 			<xsl:copy-of select="@*"/>
 			<xsl:apply-templates mode="update_xml_step1"/>

data/lib/isodoc/iec/presentation_terms.rb

@@ -0,0 +1,185 @@
+module IsoDoc
+  module Iec
+    class PresentationXMLConvert < IsoDoc::Iso::PresentationXMLConvert
+      def termclause1(elem)
+        @is_iev or return clause1(elem)
+        @suppressheadingnumbers || elem["unnumbered"] and return
+        lbl = @xrefs.anchor(elem["id"], :label, true) or return
+        prefix_name(elem, " ", "#{lbl}#{clausedelim}", "title")
+      end
+
+      def concept(docxml)
+        @is_iev and concept_iev(docxml)
+        super
+      end
+
+      def concept_iev(docxml)
+        labels = @xrefs.get_anchors.each_with_object({}) do |(k, v), m|
+          m[v[:label]] = k
+        end
+        docpart = docxml&.at(ns("//bibdata/ext/structuredidentifier/" \
+                                "project-number/@part"))&.text or return
+        docxml.xpath(ns("//termref[@base = 'IEV']")).each do |t|
+          concept_iev1(t, docpart, labels)
+        end
+      end
+
+      def concept_iev1(termref, docpart, labels)
+        /^#{docpart}-/.match?(termref["target"]) or return
+        newtarget = labels[termref["target"]] or return
+        termref.name = "xref"
+        termref.delete("base")
+        termref["target"] = newtarget
+      end
+
+      def terms(docxml)
+        otherlang_designations(docxml)
+        super
+        merge_fr_into_en_term(docxml)
+      end
+
+      def merge_fr_into_en_term(docxml)
+        @is_iev or return
+        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
+        end
+        @xrefs.parse_inclusions(clauses: true).parse docxml
+        docxml.xpath(ns("//term/name")).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 << dl if dl
+        en_term["language"] = "en,fr"
+        en_term.delete("tag")
+      end
+
+      def otherlang_designations(docxml)
+        @is_iev or return
+        docxml.xpath(ns("//term")).each do |t|
+          otherlang_designations1(t, t["language"]&.split(",") || %w(en fr))
+        end
+      end
+
+      def extract_otherlang_designations(term, lgs)
+        term.xpath(ns(".//preferred/expression[@language]"))
+          .each_with_object([]) do |d, m|
+          lg = d["language"]
+          d.delete("language")
+          next if lgs.include?(lg)
+
+          p = d.parent
+          designation_annotate(p, d.at(ns("./name")))
+          m << { lang: lg, script: Metanorma::Utils.default_script(lg),
+                 designation: to_xml(l10n_recursive(p.remove, lg)).strip }
+        end
+      end
+
+      def l10n_recursive(xml, lang)
+        script = Metanorma::Utils.default_script(lang)
+        c = HTMLEntities.new
+        xml.traverse do |x|
+          x.text? or next
+          text = c.encode(c.decode(x.text), :hexadecimal)
+          x.replace(cleanup_entities(l10n(text, lang, script), is_xml: false))
+        end
+        xml
+      end
+
+      def merge_otherlang_designations(desgn)
+        h = desgn.each_with_object({}) do |e, m|
+          if m[e[:lang]]
+            m[e[:lang]][:designation] += e[:designation]
+          else m[e[:lang]] = e
+          end
+        end
+        h.keys.sort.each_with_object([]) { |k, m| m << h[k] }
+      end
+
+      def otherlang_designations1(term, lgs)
+        pr = merge_otherlang_designations(
+          extract_otherlang_designations(term, lgs),
+        )
+        pr.empty? and return
+        prefs = pr.map do |p|
+          "<dt>#{p[:lang]}</dt>" \
+            "<dd language='#{p[:lang]}' script='#{p[:script]}'>" \
+            "#{cleanup_entities(p[:designation])}</dd>"
+        end
+        term << "<dl type='other-lang'>#{prefs.join}</dl>"
+      end
+
+      def related(docxml)
+        docxml.xpath(ns("//term[related]")).each { |f| move_related(f) }
+        super
+      end
+
+      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 related1(node)
+        lg = node&.at("./ancestor::xmlns:term/@language")&.text
+        @i18n = @i18n_lg[lg] if lg && @i18n_lg[lg]
+        p = node.at(ns("./preferred"))
+        ref = node.at(ns("./xref | ./eref | ./termref"))
+        label = @i18n.relatedterms[node["type"]].upcase
+        node.replace(l10n("<p>#{label}: " \
+                          "#{to_xml(p.children)} (#{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]
+        super
+        @i18n = @i18n_lg["default"]
+      end
+
+      def termsource1(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)
+        else super
+        end
+        @i18n = @i18n_lg["default"]
+      end
+
+      def termsource1_iev(elem)
+        while elem&.next_element&.name == "termsource"
+          elem << "; #{to_xml(elem.next_element.remove.children)}"
+        end
+        elem.children = l10n("#{@i18n.source}: #{to_xml(elem.children).strip}")
+      end
+
+      def termexample(docxml)
+        docxml.xpath(ns("//termexample")).each do |f|
+          termexample1(f)
+        end
+      end
+
+      def termexample1(elem)
+        lg = elem&.at("./ancestor::xmlns:term/@language")&.text
+        @i18n = @i18n_lg[lg] if lg && @i18n_lg[lg]
+        example1(elem)
+        @i18n = @i18n_lg["default"]
+      end
+
+      def termnote1(elem)
+        lg = elem&.at("./ancestor::xmlns:term/@language")&.text
+        @i18n = @i18n_lg[lg] if lg && @i18n_lg[lg]
+
+        val = @xrefs.anchor(elem["id"], :value) || "???"
+        lbl = @i18n.termnote.gsub("%", val)
+        prefix_name(elem, "", lower2cap(lbl), "name")
+        @i18n = @i18n_lg["default"]
+      end
+    end
+  end
+end

data/lib/isodoc/iec/presentation_xml_convert.rb

@@ -1,6 +1,7 @@
 require_relative "init"
 require "isodoc"
 require_relative "../../relaton/render-iec/general"
+require_relative "presentation_terms"
 
 module IsoDoc
   module Iec
@@ -27,13 +28,6 @@ module IsoDoc
         end
       end
 
-      def termclause1(elem)
-        @is_iev or return clause1(elem)
-        @suppressheadingnumbers || elem["unnumbered"] and return
-        lbl = @xrefs.anchor(elem["id"], :label, true) or return
-        prefix_name(elem, " ", "#{lbl}#{clausedelim}", "title")
-      end
-
       def clause1(elem)
         IsoDoc::PresentationXMLConvert.instance_method(:clause1).bind(self)
           .call(elem)
@@ -56,179 +50,6 @@ module IsoDoc
         end
       end
 
-      def concept(docxml)
-        @is_iev and concept_iev(docxml)
-        super
-      end
-
-      def concept_iev(docxml)
-        labels = @xrefs.get_anchors.each_with_object({}) do |(k, v), m|
-          m[v[:label]] = k
-        end
-        docpart = docxml&.at(ns("//bibdata/ext/structuredidentifier/" \
-                                "project-number/@part"))&.text or return
-        docxml.xpath(ns("//termref[@base = 'IEV']")).each do |t|
-          concept_iev1(t, docpart, labels)
-        end
-      end
-
-      def concept_iev1(termref, docpart, labels)
-        /^#{docpart}-/.match?(termref["target"]) or return
-        newtarget = labels[termref["target"]] or return
-        termref.name = "xref"
-        termref.delete("base")
-        termref["target"] = newtarget
-      end
-
-      def terms(docxml)
-        otherlang_designations(docxml)
-        super
-        merge_fr_into_en_term(docxml)
-      end
-
-      def merge_fr_into_en_term(docxml)
-        @is_iev or return
-        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
-        end
-        @xrefs.parse_inclusions(clauses: true).parse docxml
-        docxml.xpath(ns("//term/name")).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 << dl if dl
-        en_term["language"] = "en,fr"
-        en_term.delete("tag")
-      end
-
-      def otherlang_designations(docxml)
-        @is_iev or return
-        docxml.xpath(ns("//term")).each do |t|
-          otherlang_designations1(t, t["language"]&.split(/,/) || %w(en fr))
-        end
-      end
-
-      def extract_otherlang_designations(term, lgs)
-        term.xpath(ns(".//preferred/expression[@language]"))
-          .each_with_object([]) do |d, m|
-          lg = d["language"]
-          d.delete("language")
-          next if lgs.include?(lg)
-
-          p = d.parent
-          designation_annotate(p, d.at(ns("./name")))
-          m << { lang: lg, script: Metanorma::Utils.default_script(lg),
-                 designation: to_xml(l10n_recursive(p.remove, lg)).strip }
-        end
-      end
-
-      def l10n_recursive(xml, lang)
-        script = Metanorma::Utils.default_script(lang)
-        c = HTMLEntities.new
-        xml.traverse do |x|
-          x.text? or next
-          text = c.encode(c.decode(x.text), :hexadecimal)
-          x.replace(cleanup_entities(l10n(text, lang, script), is_xml: false))
-        end
-        xml
-      end
-
-      def merge_otherlang_designations(desgn)
-        h = desgn.each_with_object({}) do |e, m|
-          if m[e[:lang]]
-            m[e[:lang]][:designation] += e[:designation]
-          else m[e[:lang]] = e
-          end
-        end
-        h.keys.sort.each_with_object([]) { |k, m| m << h[k] }
-      end
-
-      def otherlang_designations1(term, lgs)
-        pr = merge_otherlang_designations(
-          extract_otherlang_designations(term, lgs),
-        )
-        pr.empty? and return
-        prefs = pr.map do |p|
-          "<dt>#{p[:lang]}</dt>" \
-            "<dd language='#{p[:lang]}' script='#{p[:script]}'>" \
-            "#{cleanup_entities(p[:designation])}</dd>"
-        end
-        term << "<dl type='other-lang'>#{prefs.join}</dl>"
-      end
-
-      def related(docxml)
-        docxml.xpath(ns("//term[related]")).each { |f| move_related(f) }
-        super
-      end
-
-      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 related1(node)
-        lg = node&.at("./ancestor::xmlns:term/@language")&.text
-        @i18n = @i18n_lg[lg] if lg && @i18n_lg[lg]
-        p = node.at(ns("./preferred"))
-        ref = node.at(ns("./xref | ./eref | ./termref"))
-        label = @i18n.relatedterms[node["type"]].upcase
-        node.replace(l10n("<p>#{label}: " \
-                          "#{to_xml(p.children)} (#{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]
-        super
-        @i18n = @i18n_lg["default"]
-      end
-
-      def termsource1(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)
-        else super
-        end
-        @i18n = @i18n_lg["default"]
-      end
-
-      def termsource1_iev(elem)
-        while elem&.next_element&.name == "termsource"
-          elem << "; #{to_xml(elem.next_element.remove.children)}"
-        end
-        elem.children = l10n("#{@i18n.source}: #{to_xml(elem.children).strip}")
-      end
-
-      def termexample(docxml)
-        docxml.xpath(ns("//termexample")).each do |f|
-          termexample1(f)
-        end
-      end
-
-      def termexample1(elem)
-        lg = elem&.at("./ancestor::xmlns:term/@language")&.text
-        @i18n = @i18n_lg[lg] if lg && @i18n_lg[lg]
-        example1(elem)
-        @i18n = @i18n_lg["default"]
-      end
-
-      def termnote1(elem)
-        lg = elem&.at("./ancestor::xmlns:term/@language")&.text
-        @i18n = @i18n_lg[lg] if lg && @i18n_lg[lg]
-
-        val = @xrefs.anchor(elem["id"], :value) || "???"
-        lbl = @i18n.termnote.gsub(/%/, val)
-        prefix_name(elem, "", lower2cap(lbl), "name")
-        @i18n = @i18n_lg["default"]
-      end
-
       def bibrenderer
         ::Relaton::Render::Iec::General.new(language: @lang,
                                             i18nhash: @i18n.get)
@@ -257,27 +78,30 @@ module IsoDoc
 
       def insert_middle_title(docxml)
         ins = docxml.at(ns("//preface/clause[@type = 'toc']")) or return
-        title1, title2 = middle_title_parts(nil)
+        title1, title2 = middle_title_parts
         title2out = ""
         title2 and title2out = <<~OUTPUT
           <p class="zzSTDTitle1">&#xa0;</p>
           <p class="zzSTDTitle2"><strong>#{title2}</strong></p>
         OUTPUT
         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}
+          <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">&#xa0;</p>
         OUTPUT
       end
 
-      def middle_title_parts(_out)
+      def middle_title_parts
         title1 = @meta.get[:doctitlemain]&.sub(/\s+$/, "")
         @meta.get[:doctitleintro] and
           title1 = "#{@meta.get[:doctitleintro]} \u2014 #{title1}"
-        title2 = nil
+        title1, title2 = middle_title_part(title1, nil)
+        title1&.empty? and title1 = nil
+        [title1, title2]
+      end
+
+      def middle_title_part(title1, title2)
         if @meta.get[:doctitlepart]
           title1 += " \u2014"
           title2 = @meta.get[:doctitlepart]&.sub(/\s+$/, "")
@@ -287,6 +111,20 @@ module IsoDoc
         [title1, title2]
       end
 
+      def middle_title(docxml)
+        s = docxml.at(ns("//sections")) or return
+        title1, title2 = middle_title_parts
+        title1 || title2 or return
+        ret = ""
+        title1 and ret = "<p class='zzSTDTitle1'><strong>#{title1}</strong></p>"
+        title2 and ret += <<~TITLE
+          <p class='zzSTDTitle1'>&#xa0;</p>
+          <p class='zzSTDTitle2'><strong>#{title2}</strong><p>
+        TITLE
+        ret += "<p class='zzSTDTitle1'>&#xa0;</p>"
+        s.children.first.previous = ret
+      end
+
       include Init
     end
   end

data/lib/isodoc/iec/word_convert.rb

@@ -202,19 +202,7 @@ module IsoDoc
         { class: "TableTitle", style: "text-align:center;" }
       end
 
-      def para_class(node)
-        case node["class"]
-        when "zzSTDTitle1", "zzSTDTitle2" then node["class"]
-        else
-          classtype = nil
-          classtype = "MsoCommentText" if @in_comment
-          classtype = "Sourcecode" if @annotation
-          classtype
-        end
-      end
-
       def annex_name(_annex, name, div)
-        preceding_floating_titles(name, div)
         return if name.nil?
 
         div.h1 class: "Annex" do |t|

data/lib/metanorma/iec/iec_intro_en.xml

@@ -105,7 +105,7 @@
         <p>More than 55 000 electrotechnical terminology entries in English and French extracted from the Terms and Definitions clause of IEC publications issued since 2002. Some entries have been collected from earlier publications of IEC TC 37, 77, 86 and CISPR.</p>
       </clause>
       <clause><title>IEC Customer Service Centre - <link target="https://webstore.iec.ch/csc">webstore.iec.ch/csc</link></title>
-        <p>If you wish to give us your feedback on this publication or need further assistance, please contact the Customer Service Centre: <link target="mailto://csc@iec.ch">csc@iec.ch</link>.</p>
+        <p>If you wish to give us your feedback on this publication or need further assistance, please contact the Customer Service Centre: <link target="mailto:csc@iec.ch">csc@iec.ch</link>.</p>
       </clause>
     </clause>
     {% endif %}

data/lib/metanorma/iec/iec_intro_fr.xml

@@ -108,7 +108,7 @@ les coordonnées ci-après ou contactez le Comité national de l'IEC de votre pa
     <p>Plus de 55 000 entrées terminologiques électrotechniques, en anglais et en français, extraites des articles Termes et Définitions des publications IEC parues depuis 2002. Plus certaines entrées antérieures extraites des publications des CE 37, 77, 86 et CISPR de l'IEC.</p>
   </clause>
   <clause><title>Service Clients - <link target="https://webstore.iec.ch/csc">webstore.iec.ch/csc</link></title>
-    <p>Si vous désirez nous donner des commentaires sur cette publication ou si vous avez des questions contactez-nous: <link target="mailto://csc@iec.ch">csc@iec.ch</link>.</p>
+    <p>Si vous désirez nous donner des commentaires sur cette publication ou si vous avez des questions contactez-nous: <link target="mailto:csc@iec.ch">csc@iec.ch</link>.</p>
   </clause>
 </clause>
 {% endif %}

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.2 -->
+<!-- VERSION v1.2.3 -->
 <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">
@@ -192,9 +192,11 @@
         </attribute>
       </optional>
       <attribute name="citeas"/>
-      <attribute name="type">
-        <ref name="ReferenceFormat"/>
-      </attribute>
+      <optional>
+        <attribute name="type">
+          <ref name="ReferenceFormat"/>
+        </attribute>
+      </optional>
       <optional>
         <attribute name="alt"/>
       </optional>
@@ -836,6 +838,26 @@
         <ref name="paragraph"/>
       </element>
     </define>
+    <define name="stem">
+      <element name="stem">
+        <attribute name="type">
+          <choice>
+            <value>MathML</value>
+            <value>AsciiMath</value>
+            <value>LatexMath</value>
+          </choice>
+        </attribute>
+        <attribute name="block">
+          <data type="boolean"/>
+        </attribute>
+        <oneOrMore>
+          <choice>
+            <text/>
+            <ref name="AnyElement"/>
+          </choice>
+        </oneOrMore>
+      </element>
+    </define>
     <define name="em">
       <element name="em">
         <zeroOrMore>

data/lib/metanorma/iec/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module Iec
-    VERSION = "2.2.14".freeze
+    VERSION = "2.3.0".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.4.2"
+  spec.add_dependency "metanorma-iso", "~> 2.5.0"
   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.2.14
+  version: 2.3.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-24 00:00:00.000000000 Z
+date: 2023-08-07 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.4.2
+        version: 2.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.2
+        version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: pubid-iec
   requirement: !ruby/object:Gem::Requirement
@@ -245,6 +245,7 @@ files:
 - lib/isodoc/iec/init.rb
 - lib/isodoc/iec/metadata.rb
 - lib/isodoc/iec/pdf_convert.rb
+- lib/isodoc/iec/presentation_terms.rb
 - lib/isodoc/iec/presentation_xml_convert.rb
 - lib/isodoc/iec/word_convert.rb
 - lib/isodoc/iec/xref.rb