metanorma-iec 2.2.3 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3df1d6637e7c07bd1e152d015eab70efb8907e5b75fdcd988b38bcf9bf4710cd
-  data.tar.gz: 6c00622ff41524f4451c0f3c43f0b36388eeff742c61ac33e5f2533681c57bbd
+  metadata.gz: aa0cb1e4f74a208623ea4afa6ac089d07ef738ab6a5e2b743ba1c9cf874c761f
+  data.tar.gz: 306daf6fb488295282985216c68bd3e27f50c0a9a48d5b44949c9b8a7c793ad2
 SHA512:
-  metadata.gz: 62f8813c4e594dcfb25ac7a681b8507647ec4cfcd18b2df774903cf54e32bafca9816bac62340771b3b2ac88ccbd1864a18e75f5225e14b6c58dd55282ca6955
-  data.tar.gz: 30392d4a42b4fa9d2a9c3c8233c251e96a93b43e930a3653674e5f5ca12dad82c1f1021f0dc7a8fbad46b0dc3adf2e5dcac2970d0af54586b410138dc43ef14c
+  metadata.gz: ff37df74026031b95f8900c82d5ab67ff1e9df40999ddee4f82e35ead8b9f9d4087c67d60db1987889b69e7dce311163fa79b9d0744d8303322e80ea4d50c7e7
+  data.tar.gz: f2969e8aed2645c90fee5e6fafa183ece04729b87827daf62783bc8214a0e37250c0780ad62dd076fa0c19951e1446fd21f770f812d962ea06df42b1962f47db

data/lib/isodoc/iec/html/html_iec_titlepage.html

@@ -13,7 +13,7 @@
 <p class="coverpage_docnumber">{{ docnumber }}(E) {{ draftinfo }}</p>
 {% endif %}
 
-<p class="coverpage_techcommittee">{{ agency }}/{{ editorialgroup | join: "/" }}</p>
+<p class="coverpage_techcommittee">{{ editorialgroup }}</p>
 
 <p class="coverpage_techcommittee"><a
 name="CVP_Secretariat_Loca">Secretariat</a>: {{ secretariat }}</p>

data/lib/metanorma/iec/basicdoc.rng

@@ -522,7 +522,6 @@
       <value>tip</value>
       <value>important</value>
       <value>caution</value>
-      <value>statement</value>
     </choice>
   </define>
   <define name="figure">

data/lib/metanorma/iec/converter.rb

@@ -126,8 +126,8 @@ module Metanorma
         m = /60050-(\d+)/.match(id) or return
         xmldoc.xpath("//sections/clause/terms/title").each_with_index do |t, i|
           num = "%02d" % [i + 1]
-          t.next = "<variant-title type='toc'>"\
-                   "#{@i18n.section_iev} #{m[1]}-#{num} &#x2013; "\
+          t.next = "<variant-title type='toc'>" \
+                   "#{@i18n.section_iev} #{m[1]}-#{num} &#x2013; " \
                    "#{t.children.to_xml}</variant-title>"
         end
       end
@@ -136,6 +136,29 @@ module Metanorma
         attr_code(keep_attrs(node)
                   .merge(id: ::Metanorma::Utils::anchor_or_uuid(node)))
       end
+
+      # TODO remove when I adopt pubid-iec
+      #
+      def get_id_prefix(xmldoc)
+        xmldoc.xpath("//bibdata/contributor[role/@type = 'publisher']" \
+                     "/organization").each_with_object([]) do |x, prefix|
+          x1 = x.at("abbreviation")&.text || x.at("name")&.text
+          #(x1 == "IEC" and prefix.unshift("IEC")) or prefix << x1
+          prefix << x1
+        end
+      end
+#
+      def docidentifier_cleanup(xmldoc)
+        prefix = get_id_prefix(xmldoc)
+        id = xmldoc.at("//bibdata/docidentifier[@type = 'ISO']") or return
+        id.content = id_prefix(prefix, id)
+        id = xmldoc.at("//bibdata/ext/structuredidentifier/project-number") and
+          id.content = id_prefix(prefix, id)
+        %w(iso-with-lang iso-reference iso-undated).each do |t|
+          id = xmldoc.at("//bibdata/docidentifier[@type = '#{t}']") and
+            id.content = id_prefix(prefix, id)
+        end
+      end
     end
   end
 end

data/lib/metanorma/iec/front.rb

@@ -5,7 +5,7 @@ module Metanorma
         publishers = node.attr("publisher") || "IEC"
         csv_split(publishers)&.each do |p|
           xml.contributor do |c|
-            c.role **{ type: "author" }
+            c.role type: "author"
             c.organization do |a|
               organization(a, p, false, node, !node.attr("publisher"))
             end
@@ -17,7 +17,7 @@ module Metanorma
         publishers = node.attr("publisher") || "IEC"
         csv_split(publishers)&.each do |p|
           xml.contributor do |c|
-            c.role **{ type: "publisher" }
+            c.role type: "publisher"
             c.organization do |a|
               organization(a, p, true, node, !node.attr("publisher"))
             end
@@ -51,6 +51,37 @@ module Metanorma
         xml.docidentifier dn, **attr_code(type: "ISO")
       end
 
+      def add_id_parts(docnum, part, subpart)
+        docnum += "-#{part}" if part
+        docnum += "-#{subpart}" if subpart
+        docnum
+      end
+
+      def id_stage_prefix(docnum, node)
+        stage = get_stage(node)
+        typeabbr = get_typeabbr(node)&.upcase
+        if stage && (stage.to_i < 60)
+          docnum = unpub_stage_prefix(docnum, stage, typeabbr, node)
+        elsif typeabbr == "DIR " then docnum = "#{typeabbr}#{docnum}"
+        elsif typeabbr && !@amd then docnum = "/#{typeabbr}#{docnum}"
+        end
+        docnum
+      end
+
+      def unpub_stage_prefix(docnum, stage, typeabbr, node)
+        abbr = id_stage_abbr(stage, get_substage(node), node)
+        %w(40 50).include?(stage) && i = node.attr("iteration") and
+          itersuffix = ".#{i}"
+        return docnum if abbr.nil? || abbr.empty? # prefixes added in cleanup
+
+        typeabbr = "" if %w(DTS FDTS).include?(abbr.sub(/\s+$/, ""))
+        return "/#{abbr}#{typeabbr} #{docnum}#{itersuffix}" unless @amd
+
+        a = docnum.split(%r{/})
+        a[-1] = "#{abbr}#{a[-1]}#{itersuffix}"
+        a.join("/")
+      end
+
       def id_edition_suffix(docnum, node)
         ed = node.attr("edition") || 1
         docnum += " ED #{ed}"
@@ -151,7 +182,7 @@ module Metanorma
         abbr
       end
 
-      def stage_abbr(stage, _substage)
+      def stage_abbr(stage, _substage, _doctype)
         return "PPUB" if stage == "60"
 
         DOC_STAGE[stage.to_sym] || "??"
@@ -191,7 +222,8 @@ module Metanorma
         stage = get_stage(node)
         substage = get_substage(node)
         xml.status do |s|
-          s.stage stage, **attr_code(abbreviation: stage_abbr(stage, substage))
+          s.stage stage,
+                  **attr_code(abbreviation: stage_abbr(stage, substage, nil))
           subst = status_abbrev1(stage, substage, node.attr("iteration"),
                                  doctype(node), node.attr("draft"))
           s.substage substage, **attr_code(abbreviation: subst)

data/lib/metanorma/iec/isodoc.rng

@@ -66,6 +66,7 @@
         <value>caution</value>
         <value>statement</value>
         <value>editorial</value>
+        <value>box</value>
       </choice>
     </define>
     <define name="index">

data/lib/metanorma/iec/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module Iec
-    VERSION = "2.2.3".freeze
+    VERSION = "2.2.4".freeze
   end
 end
 

metadata

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