metanorma-iec 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08369dfaab9066548f5aad7c5011c358f56f6c1f1f704173de19afc0df4a6a51'
-  data.tar.gz: 8995d08b8a4a9c6569af60204a6964cc5e6ebcd0e57dfde55c26d2f030040661
+  metadata.gz: a536ad5ae8feafb5364a940423a83411ad986dcc162c53f323ab249f446bb47a
+  data.tar.gz: 76f4ed5012cac79543dedf0ff9013d55964d1e04058d1d7a7fb6feb290976a11
 SHA512:
-  metadata.gz: 7038a4915d5f370122494500b39fefdb530310eb7c57a420f61eab9ae6c1bdd8ba5aa9a1ece06e4e4d63f41f76aefdf78943768c28061ea3db896e819180318d
-  data.tar.gz: e6906b0c4ee3debfd9ffa0fde700c4df213b7451c6ee3a60db8eb3a67b6da67656c9de1e43d5d3d8475dd0109753e714014962a1ec8063b5985cc2efe1ba213f
+  metadata.gz: 4b28d85a7b1b8629e5f793df2111a6a8c94e6162232de29f936fa501450a0d7c47ab4195a917933507f39c23cc51821149d6ed742998888709d0bbd60db18cb4
+  data.tar.gz: effe98054f3f3cfa8961aebf19cf378399f88196f6cf3ffad9866cb1576314edf5d9c6fd09f5016c8bd19ebc2ffe0c48bd51330e7f5ee65a93f211525e75975a

data/lib/asciidoctor/iec/biblio.rng

@@ -49,11 +49,17 @@
   </define>
   <define name="stage">
     <element name="stage">
+      <optional>
+        <attribute name="abbreviation"/>
+      </optional>
       <text/>
     </element>
   </define>
   <define name="substage">
     <element name="substage">
+      <optional>
+        <attribute name="abbreviation"/>
+      </optional>
       <text/>
     </element>
   </define>
@@ -452,9 +458,14 @@
     <attribute name="bibitemid">
       <data type="IDREF"/>
     </attribute>
-    <zeroOrMore>
-      <ref name="locality"/>
-    </zeroOrMore>
+    <choice>
+      <zeroOrMore>
+        <ref name="locality"/>
+      </zeroOrMore>
+      <zeroOrMore>
+        <ref name="localityStack"/>
+      </zeroOrMore>
+    </choice>
     <optional>
       <ref name="date"/>
     </optional>
@@ -469,6 +480,25 @@
       <ref name="BibItemLocality"/>
     </element>
   </define>
+  <define name="localityStack">
+    <element name="localityStack">
+      <zeroOrMore>
+        <ref name="locality"/>
+      </zeroOrMore>
+    </element>
+  </define>
+  <define name="sourceLocality">
+    <element name="sourceLocality">
+      <ref name="BibItemLocality"/>
+    </element>
+  </define>
+  <define name="sourceLocalityStack">
+    <element name="sourceLocalityStack">
+      <zeroOrMore>
+        <ref name="sourceLocality"/>
+      </zeroOrMore>
+    </element>
+  </define>
   <define name="BibItemLocality">
     <attribute name="type">
       <ref name="LocalityType"/>
@@ -1028,12 +1058,30 @@
       <attribute name="type">
         <ref name="DocRelationType"/>
       </attribute>
+      <optional>
+        <element name="description">
+          <ref name="FormattedString"/>
+        </element>
+      </optional>
       <element name="bibitem">
         <ref name="BibliographicItem"/>
       </element>
-      <zeroOrMore>
-        <ref name="locality"/>
-      </zeroOrMore>
+      <choice>
+        <zeroOrMore>
+          <ref name="locality"/>
+        </zeroOrMore>
+        <zeroOrMore>
+          <ref name="localityStack"/>
+        </zeroOrMore>
+      </choice>
+      <choice>
+        <zeroOrMore>
+          <ref name="sourceLocality"/>
+        </zeroOrMore>
+        <zeroOrMore>
+          <ref name="sourceLocalityStack"/>
+        </zeroOrMore>
+      </choice>
     </element>
   </define>
   <define name="version">

data/lib/asciidoctor/iec/converter.rb

@@ -1,5 +1,6 @@
 require "asciidoctor"
 require "metanorma-iso"
+require_relative "./front.rb"
 
 module Asciidoctor
   module Iec
@@ -9,51 +10,9 @@ module Asciidoctor
 
       register_for "iec"
 
-      def metadata_author(node, xml)
-        publishers = node.attr("publisher") || "IEC"
-        publishers.split(/,[ ]?/).each do |p|
-          xml.contributor do |c|
-            c.role **{ type: "author" }
-            c.organization { |a| organization(a, p) }
-          end
-        end
-      end
-
-      def metadata_publisher(node, xml)
-        publishers = node.attr("publisher") || "IEC"
-        publishers.split(/,[ ]?/).each do |p|
-          xml.contributor do |c|
-            c.role **{ type: "publisher" }
-            c.organization { |a| organization(a, p) }
-          end
-        end
-      end
-
-      def metadata_copyright(node, xml)
-        publishers = node.attr("publisher") || "IEC"
-        publishers.split(/,[ ]?/).each do |p|
-          xml.copyright do |c|
-            c.from (node.attr("copyright-year") || Date.today.year)
-            c.owner do |owner|
-              owner.organization { |o| organization(o, p) }
-            end
-          end
-        end
-      end
-
-      def iso_id(node, xml)
-        return unless node.attr("docnumber")
-        part, subpart = node&.attr("partnumber")&.split(/-/)
-        dn = add_id_parts(node.attr("docnumber"), part, subpart)
-        dn = id_stage_prefix(dn, node)
-        dn = id_edition_suffix(dn, node)
-        xml.docidentifier dn, **attr_code(type: "iso")
-      end
-
-      def id_edition_suffix(dn, node)
-        ed = node.attr("edition") || 1
-        dn += " ED #{ed}"
-        dn
+      def init(node)
+        super
+        @is_iev = node.attr("docnumber") == "60050"
       end
 
       def boilerplate_file(x_orig)
@@ -79,91 +38,6 @@ module Asciidoctor
                         File.join(File.dirname(__FILE__), "iec.rng"))
       end
 
-      STAGE_CODES = {
-        "PNW" => "1000",
-        "ANW" => "2000",
-        "CAN" => "2098",
-        "ACD" => "2099",
-        "CD" => "3020",
-        "BWG" => "3092",
-        "A2CD" => "3099",
-        "2CD" => "3520",
-        "3CD" => "3520",
-        "4CD" => "3520",
-        "5CD" => "3520",
-        "6CD" => "3520",
-        "7CD" => "3520",
-        "8CD" => "3520",
-        "9CD" => "3520",
-        "CDM" => "3591",
-        "A3CD" => "3592",
-        "A4CD" => "3592",
-        "A5CD" => "3592",
-        "A6CD" => "3592",
-        "A7CD" => "3592",
-        "A8CD" => "3592",
-        "A9CD" => "3592",
-        "ACDV" => "3599",
-        "CCDV" => "4020",
-        "CDVM" => "4091",
-        "NCDV" => "4092",
-        "NADIS" => "4093",
-        "ADIS" => "4099",
-        "ADTR" => "4099",
-        "ADTS" => "4099",
-        "RDISH" => "5000",
-        "RFDIS" => "5000",
-        "CDISH" => "5020",
-        "CDPAS" => "5020",
-        "CDTR" => "5020",
-        "CDTS" => "5020",
-        "CFDIS" => "5020",
-        "DTRM" => "5092",
-        "DTSM" => "5092",
-        "NDTR" => "5092",
-        "NDTS" => "5092",
-        "NFDIS" => "5092",
-        "APUB" => "5099",
-        "BPUB" => "6000",
-        "PPUB" => "6060",
-        "RR" => "9092",
-        "AMW" => "9220",
-        "WPUB" => "9599",
-        "DELPUB" => "9960",
-      }.freeze
-
-      DOC_STAGE = {
-        "00": "PWI",
-        "10": "NWIP",
-        "20": "WD",
-        "30": "CD",
-        "40": "CDV",
-        "50": "FDIS",
-      }.freeze
-
-      def get_stage(node)
-        stage = node.attr("status") || node.attr("docstage") || "60"
-        m = /([0-9])CD$/.match(stage) and
-          node.set_attr("iteration", m[1])
-        STAGE_CODES[stage] and stage = STAGE_CODES[stage][0..1]
-        stage
-      end
-
-      def get_substage(node)
-        st = node.attr("status") || node.attr("docstage")
-        stage = get_stage(node)
-        node.attr("docsubstage") || 
-          ( stage == "60" ? "60" : 
-           STAGE_CODES[st] ? STAGE_CODES[st][2..3] :
-           "00" )
-      end
-
-      def id_stage_abbr(stage, substage, node)
-        abbr = DOC_STAGE[stage.to_sym] || ""
-        abbr = node.attr("iteration") + abbr if node.attr("iteration")
-        abbr
-      end
-
       def load_yaml(lang, script)
         y = if @i18nyaml then YAML.load_file(@i18nyaml)
             elsif lang == "en"
@@ -187,6 +61,16 @@ module Asciidoctor
         node.nil? ? IsoDoc::Iec::WordConvert.new({}) :
           IsoDoc::Iec::WordConvert.new(doc_extract_attributes(node))
       end
+
+      def norm_ref_preface(f)
+        return super unless @is_iev
+        f.at("./title").next =
+          "<p>#{@norm_empty_pref}</p>"
+      end
+
+      def term_defs_boilerplate(div, source, term, preface, isodoc)
+        return super unless @is_iev
+      end
     end
   end
 end

data/lib/asciidoctor/iec/front.rb

@@ -0,0 +1,220 @@
+module Asciidoctor
+  module Iec
+    class Converter < ISO::Converter
+      def metadata_author(node, xml)
+        publishers = node.attr("publisher") || "IEC"
+        publishers.split(/,[ ]?/).each do |p|
+          xml.contributor do |c|
+            c.role **{ type: "author" }
+            c.organization { |a| organization(a, p) }
+          end
+        end
+      end
+
+      def metadata_publisher(node, xml)
+        publishers = node.attr("publisher") || "IEC"
+        publishers.split(/,[ ]?/).each do |p|
+          xml.contributor do |c|
+            c.role **{ type: "publisher" }
+            c.organization { |a| organization(a, p) }
+          end
+        end
+      end
+
+      def metadata_copyright(node, xml)
+        publishers = node.attr("publisher") || "IEC"
+        publishers.split(/,[ ]?/).each do |p|
+          xml.copyright do |c|
+            c.from (node.attr("copyright-year") || Date.today.year)
+            c.owner do |owner|
+              owner.organization { |o| organization(o, p) }
+            end
+          end
+        end
+      end
+
+      def iso_id(node, xml)
+        return unless node.attr("docnumber")
+        part, subpart = node&.attr("partnumber")&.split(/-/)
+        dn = add_id_parts(node.attr("docnumber"), part, subpart)
+        dn = id_stage_prefix(dn, node)
+        dn = id_edition_suffix(dn, node)
+        xml.docidentifier dn, **attr_code(type: "iso")
+      end
+
+      def id_edition_suffix(dn, node)
+        ed = node.attr("edition") || 1
+        dn += " ED #{ed}"
+        dn
+      end
+
+      STAGE_CODES = {
+        "PNW" => "1000",
+        "ANW" => "2000",
+        "CAN" => "2098",
+        "ACD" => "2099",
+        "CD" => "3020",
+        "BWG" => "3092",
+        "A2CD" => "3099",
+        "2CD" => "3520",
+        "3CD" => "3520",
+        "4CD" => "3520",
+        "5CD" => "3520",
+        "6CD" => "3520",
+        "7CD" => "3520",
+        "8CD" => "3520",
+        "9CD" => "3520",
+        "CDM" => "3591",
+        "A3CD" => "3592",
+        "A4CD" => "3592",
+        "A5CD" => "3592",
+        "A6CD" => "3592",
+        "A7CD" => "3592",
+        "A8CD" => "3592",
+        "A9CD" => "3592",
+        "ACDV" => "3599",
+        "CCDV" => "4020",
+        "CDVM" => "4091",
+        "NCDV" => "4092",
+        "NADIS" => "4093",
+        "ADIS" => "4099",
+        "ADTR" => "4099",
+        "ADTS" => "4099",
+        "RDISH" => "5000",
+        "RFDIS" => "5000",
+        "CDISH" => "5020",
+        "CDPAS" => "5020",
+        "CDTR" => "5020",
+        "CDTS" => "5020",
+        "CFDIS" => "5020",
+        "DTRM" => "5092",
+        "DTSM" => "5092",
+        "NDTR" => "5092",
+        "NDTS" => "5092",
+        "NFDIS" => "5092",
+        "APUB" => "5099",
+        "BPUB" => "6000",
+        "PPUB" => "6060",
+        "RR" => "9092",
+        "AMW" => "9220",
+        "WPUB" => "9599",
+        "DELPUB" => "9960",
+      }.freeze
+
+      DOC_STAGE = {
+        "00": "PWI",
+        "10": "NWIP",
+        "20": "WD",
+        "30": "CD",
+        "40": "CDV",
+        "50": "FDIS",
+        "60": "PPUB",
+        "90": "RR",
+        "92": "AMW",
+        "95": "WPUB",
+        "99": "DELPUB",
+      }.freeze
+
+      STAGE_ABBRS = {
+        "00" => {"00" => "PWI"},
+        "10" => {"00" => "PNW"},
+        "20" => {"00" => "ANW", "98" => "CAN", "99" => "ACD"},
+        "30" => {"00" => "CD", "20" => "CD", "92" => "BWG", "97" => "MERGED", "98" => "DREJ", "99" => "A2CD"},
+        "35" => {"00" => "CD", "20" => "CD", "91" => "CDM", "92" => "ACD", "99" => "ACDV"},
+        "40" => {"00" => "CCDV", "20" => "CCDV", "91" => "CDVM", "92" => "NCDV", "93" => "NADIS", "95" => "ADISSB", "99" => "ADIS"},
+        "50" => {"00" => "RFDIS", "20" => "CFDIS", "92" => "NFDIS", "95" => "APUBSB", "99" => "APUB"},
+        "60" => {"00" => "BPUB", "60" => "PPUB"},
+        "90" => {"00" => "RR", "92" => "RR"},
+        "92" => {"00" => "AMW", "20" => "AMW"},
+        "95" => {"00" => "WPUB", "99" => "WPUB"},
+        "99" => {"00" => "DELPUB", "60" => "DELPUB"},
+      }.freeze
+
+      STAGE_NAMES = {
+        "00": "Preliminary work item",
+        "10": "New work item proposal",
+        "20": "Working draft",
+        "30": "Committee draft",
+        "35": "Committee draft",
+        "40": "Committed draft for vote",
+        "50": "Final draft international standard",
+        "60": "International standard",
+        "90": "Review",
+        "92": "Review",
+        "95": "Withdrawal",
+        "99": "Deleted",
+      }.freeze
+
+      def status_abbrev1(stage, substage, iter, doctype, draft)
+        return "" unless stage
+        abbr = STAGE_ABBRS.dig(stage, substage) || "??"
+        if stage == "35" && substage == "92"
+          iter = (iter.to_i + 1) % "02"
+        end
+        case doctype
+        when "technical-report"
+          stage = "ADTR" if stage == "40" && substage == "99"
+          stage = "CDTR" if stage == "50" && substage == "20"
+          stage = "DTRM" if stage == "50" && substage == "92"
+        when "technical-specification"
+          stage = "ADTS" if stage == "40" && substage == "99"
+          stage = "CDTS" if stage == "50" && substage == "20"
+          stage = "DTSM" if stage == "50" && substage == "92"
+        when "interpretation-sheet"
+          stage = "RDISH" if stage == "50" && substage == "00"
+          stage = "CDISH" if stage == "50" && substage == "20"
+        when "publicly-available-specification"
+          stage = "CDPAS" if stage == "50" && substage == "20"
+        end
+        abbr = abbr.sub(/CD$/, "#{iter}CD") if iter
+        abbr
+      end
+
+      def stage_abbr(stage, substage)
+        return "PPUB" if stage == "60"
+        DOC_STAGE[stage.to_sym] || "??"
+      end
+
+      def stage_name(stage, substage)
+        STAGE_NAMES[stage.to_sym]
+      end
+
+      def get_stage(node)
+        stage = node.attr("status") || node.attr("docstage") || "60"
+        m = /([0-9])CD$/.match(stage) and
+          node.set_attr("iteration", m[1])
+        STAGE_CODES[stage] and stage = STAGE_CODES[stage][0..1]
+        stage
+      end
+
+      def get_substage(node)
+        st = node.attr("status") || node.attr("docstage")
+        stage = get_stage(node)
+        node.attr("docsubstage") ||
+          ( stage == "60" ? "60" :
+           STAGE_CODES[st] ? STAGE_CODES[st][2..3] :
+           "00" )
+      end
+
+      def id_stage_abbr(stage, substage, node)
+        return "" if stage == "60"
+        abbr = DOC_STAGE[stage.to_sym] || ""
+        abbr = node.attr("iteration") + abbr if node.attr("iteration")
+        abbr
+      end
+
+      def metadata_status(node, xml)
+        stage = get_stage(node)
+        substage = get_substage(node)
+        xml.status do |s|
+          s.stage stage, **attr_code(abbreviation: stage_abbr(stage, substage))
+          s.substage substage,
+            **attr_code(abbreviation: status_abbrev1(stage, substage,
+                                                     node.attr("iteration"), 
+                                                     doctype(node),node.attr("draft")))
+          node.attr("iteration") && (s.iteration node.attr("iteration"))
+        end
+      end
+    end
+  end
+end