metanorma-iso 1.3.21 → 1.3.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62665df85ff03f5ccbe57732b20477b552c423f5fa004f793324cfbce96266d0
-  data.tar.gz: cb491baae9f44397948b20169267014f7c79268b497e6ecc4e41fab0628cce3d
+  metadata.gz: 1f454035889b3408ef910c7bdc28bb3d53cca352078b04459381fbeb48cfe71e
+  data.tar.gz: f9de44382a1a76374569a60fd18807f4a4412222148a7529f42420923b60ffdc
 SHA512:
-  metadata.gz: 16e5f1a048f7808589ad7be5b3313176fcae4aee2850a3ba9b260709243cca2a196500ac58908bc2f35756b91f05d7861dc156393b29ce539e11cc19e7c807a2
-  data.tar.gz: bdd365e2218975f49bda309ec1d63073a5edd25f09b42d3ecdfd462360dee8fe5a39eb14205d4d5fef6b354f560a884316291149b3fad0667c7c490f93eeeeed
+  metadata.gz: 638a95ff84fe3bdeec6cb509c3a00f740190dcddfa5765ee585a5c2e79716a86be12cdb5a351fed9133b21d0414b554922aaf8a24ddf317017ac1368d526ca0c
+  data.tar.gz: 8abc4415c4ad990b6cafd3f1bdce2ea93dadaece4cf4f339455d6547ee4c7cb4af2a73ee2b8816d065270c0955c620d739e54dc376c0cb3f1ecb23411298bb0f

data/lib/asciidoctor/iso/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/iso/front.rb

@@ -9,6 +9,41 @@ require "pp"
 module Asciidoctor
   module ISO
     class Converter < Standoc::Converter
+       STAGE_ABBRS = {
+        "00": "PWI",
+        "10": "NWIP",
+        "20": "WD",
+        "30": "CD",
+        "40": "DIS",
+        "50": "FDIS",
+        "60": "IS",
+        "90": "(Review)",
+        "95": "(Withdrawal)",
+      }.freeze
+
+       STAGE_NAMES = {
+        "00": "Preliminary work item",
+        "10": "New work item proposal",
+        "20": "Working draft",
+        "30": "Committee draft",
+        "40": "Draft international standard",
+        "50": "Final draft international standard",
+        "60": "International standard",
+        "90": "Review",
+        "95": "Withdrawal",
+      }.freeze
+
+      def stage_abbr(stage, substage)
+        return nil if stage.to_i > 60
+        return "PRF" if stage == "60" && substage == "00"
+        STAGE_ABBRS[stage.to_sym]
+      end
+
+      def stage_name(stage, substage)
+        return "Proof" if stage == "60" && substage == "00"
+        STAGE_NAMES[stage.to_sym]
+      end
+
       def metadata_id(node, xml)
         iso_id(node, xml)
         node&.attr("tc-docnumber")&.split(/,\s*/)&.each do |n|
@@ -40,6 +75,7 @@ module Asciidoctor
       def metadata_ext(node, xml)
         super
         structured_id(node, xml)
+        xml.stagename stage_name(get_stage(node), get_substage(node))
       end
 
       def structured_id(node, xml)
@@ -59,14 +95,14 @@ module Asciidoctor
 
       def id_stage_abbr(stage, substage, node)
         IsoDoc::Iso::Metadata.new("en", "Latn", {}).
-          status_abbrev(stage, substage, node.attr("iteration"),
+          status_abbrev(stage_abbr(stage, substage), substage, node.attr("iteration"),
                        node.attr("draft"))
       end
 
       def id_stage_prefix(dn, node)
         stage = get_stage(node)
         substage = get_substage(node)
-        if stage && (stage.to_i < 60 || stage.to_i == 60 && substage.to_i < 60)
+        if stage && (stage.to_i < 60)
           abbr = id_stage_abbr(stage, substage, node)
           dn = "/#{abbr} #{dn}" unless abbr.nil? || abbr.empty? # prefixes added in cleanup
         else
@@ -131,9 +167,11 @@ module Asciidoctor
       end
 
       def metadata_status(node, xml)
+        stage = get_stage(node)
+        substage = get_substage(node)
         xml.status do |s|
-          s.stage get_stage(node)
-          s.substage get_substage(node)
+          s.stage stage, **attr_code(abbreviation: stage_abbr(stage, substage))
+          s.substage substage
           node.attr("iteration") && (s.iteration node.attr("iteration"))
         end
       end

data/lib/asciidoctor/iso/isostandard.rng

@@ -43,6 +43,9 @@
         <ref name="ics"/>
       </zeroOrMore>
       <ref name="structuredidentifier"/>
+      <optional>
+        <ref name="stagename"/>
+      </optional>
     </define>
     <define name="bdate">
       <element name="date">
@@ -511,4 +514,9 @@
       </oneOrMore>
     </element>
   </define>
+  <define name="stagename">
+    <element name="stagename">
+      <text/>
+    </element>
+  </define>
 </grammar>

data/lib/asciidoctor/iso/validate.rb

@@ -65,7 +65,7 @@ module Asciidoctor
 
       # ISO/IEC DIR 2, 10.4
       def locality_erefs_validate(root)
-        root.xpath("//eref[locality]").each do |t|
+        root.xpath("//eref[descendant::locality]").each do |t|
           if /^(ISO|IEC)/.match t["citeas"]
             unless /:[ ]?(\d+{4}|–)$/.match t["citeas"]
               @log.add("Style", t, "undated reference #{t['citeas']} should not contain "\

data/lib/asciidoctor/iso/validate_style.rb

@@ -8,7 +8,7 @@ module Asciidoctor
       def extract_text(node)
         return "" if node.nil?
         node1 = Nokogiri::XML.fragment(node.to_s)
-        node1.xpath("//link | //locality").each(&:remove)
+        node1.xpath("//link | //locality | //localityStack").each(&:remove)
         ret = ""
         node1.traverse { |x| ret += x.text if x.text? }
         ret

data/lib/isodoc/iso/base_convert.rb

@@ -91,9 +91,9 @@ module IsoDoc
         end
       end
 
-      def eref_localities1_zh(target, type, from, to)
+      def eref_localities1_zh(target, type, from, to, delim)
         subsection = from&.text&.match(/\./)
-        ret = type == "list" ? "" : ","
+        ret = (delim == ";") ? ";" : (type == "list") ? "" : delim
         ret += " 第#{from.text}" if from
         ret += "–#{to}" if to
         loc = (@locality[type] || type.sub(/^locality:/, "").capitalize )
@@ -103,11 +103,11 @@ module IsoDoc
         ret
       end
 
-      def eref_localities1(target, type, from, to, lang = "en")
+      def eref_localities1(target, type, from, to, delim, lang = "en")
         subsection = from&.text&.match(/\./)
         type = type.downcase
-        return l10n(eref_localities1_zh(target, type, from, to)) if lang == "zh"
-        ret = type == "list" ? "" : ","
+        return l10n(eref_localities1_zh(target, type, from, to, delim)) if lang == "zh"
+        ret = (delim == ";") ? ";" : (type == "list") ? "" : delim
         loc = @locality[type] || type.sub(/^locality:/, "").capitalize
         ret += " #{loc}" unless subsection && type == "clause" ||
           type == "list" || target.match(/^IEV$|^IEC 60050-/)

data/lib/isodoc/iso/html/style-human.scss

@@ -317,14 +317,17 @@ div.figure {
 */
 
 .document-type-band {
-    @include docBand(2, 100%, 180px);
+    @include docBand($order: 2, $offset: 180px);
+
+    .document-type {
+        top: 20px;
+    }
 }
 
 .document-stage-band {
     @include docBand(1, 100%);
 }
 
-p.document-type,
 p.document-stage {
     @include docBandTitle(210px);
     writing-mode: vertical-rl;

data/lib/isodoc/iso/html/style-iso.scss

@@ -263,14 +263,17 @@ div.figure {
 */
 
 .document-type-band {
-    @include docBand(2, 100%, 180px);
+    @include docBand($order: 2, $offset: 180px);
+
+    .document-type {
+        top: 20px;
+    }
 }
 
 .document-stage-band {
     @include docBand(1, 100%);
 }
 
-p.document-type,
 p.document-stage {
     @include docBandTitle(210px);
     writing-mode: vertical-rl;

data/lib/isodoc/iso/metadata.rb

@@ -16,26 +16,8 @@ module IsoDoc
       }
       end
 
-      STAGE_ABBRS = {
-        "00": "PWI",
-        "10": "NWIP",
-        "20": "WD",
-        "30": "CD",
-        "40": "DIS",
-        "50": "FDIS",
-        "60": "IS",
-        "90": "(Review)",
-        "95": "(Withdrawal)",
-      }.freeze
-
-      def stage_abbr(stage)
-        self.class::STAGE_ABBRS[stage.to_sym] || "??"
-      end
-
       def status_abbrev(stage, substage, iter, draft)
         return "" unless stage
-        stage = self.class::STAGE_ABBRS[stage.to_sym] || "??"
-        stage = "PRF" if stage == "IS" && substage == "00"
         stage += iter if iter
         stage = "Pre" + stage if draft =~ /^0\./
         stage
@@ -48,12 +30,12 @@ module IsoDoc
           set(:stage, docstatus.text)
           set(:stage_int, docstatus.text.to_i)
           set(:unpublished, unpublished(docstatus.text))
-          set(:statusabbr, status_abbrev(docstatus.text,
+          set(:statusabbr, status_abbrev(docstatus["abbreviation"] || "??",
                                          isoxml&.at(ns("//bibdata/status/substage"))&.text,
                                          isoxml&.at(ns("//bibdata/status/iteration"))&.text,
                                          isoxml&.at(ns("//version/draft"))&.text))
           unpublished(docstatus.text) and
-            set(:stageabbr, stage_abbr(docstatus.text))
+            set(:stageabbr, docstatus["abbreviation"])
         end
         revdate = isoxml.at(ns("//version/revision-date"))
         set(:revdate, revdate&.text)

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "1.3.21".freeze
+    VERSION = "1.3.22".freeze
   end
 end

data/spec/asciidoctor-iso/base_spec.rb

@@ -124,7 +124,7 @@ RSpec.describe Asciidoctor::ISO do
          <language>en</language>
          <script>Latn</script>
          <status>
-           <stage>10</stage>
+           <stage abbreviation="NWIP">10</stage>
            <substage>20</substage>
            <iteration>3</iteration>
          </status>
@@ -160,6 +160,7 @@ RSpec.describe Asciidoctor::ISO do
 <structuredidentifier>
   <project-number part="1">ISO 1000</project-number>
 </structuredidentifier>
+<stagename>New work item proposal</stagename>
        </ext>
        </bibdata>
        <sections/>
@@ -235,7 +236,7 @@ RSpec.describe Asciidoctor::ISO do
          <language>el</language>
          <script>Grek</script>
          <status>
-           <stage>60</stage>
+           <stage abbreviation="IS">60</stage>
            <substage>60</substage>
          </status>
          <copyright>
@@ -274,6 +275,7 @@ RSpec.describe Asciidoctor::ISO do
          <structuredidentifier>
            <project-number part="1" subpart="1">ISO/IEC/IETF 1000</project-number>
          </structuredidentifier>
+         <stagename>International standard</stagename>
          </ext>
        </bibdata>
        <sections/>
@@ -316,7 +318,7 @@ RSpec.describe Asciidoctor::ISO do
   <language>fr</language>
   <script>Latn</script>
   <status>
-    <stage>50</stage>
+    <stage abbreviation="FDIS">50</stage>
     <substage>00</substage>
   </status>
   <copyright>
@@ -338,6 +340,7 @@ RSpec.describe Asciidoctor::ISO do
     <structuredidentifier>
       <project-number>ISO 1000</project-number>
     </structuredidentifier>
+    <stagename>Final draft international standard</stagename>
   </ext>
 </bibdata>
 <sections/>
@@ -379,7 +382,7 @@ OUTPUT
   <language>en</language>
   <script>Latn</script>
   <status>
-    <stage>60</stage>
+    <stage abbreviation="IS">60</stage>
     <substage>60</substage>
   </status>
   <copyright>
@@ -401,6 +404,7 @@ OUTPUT
     <structuredidentifier>
       <project-number>ISO 1000</project-number>
     </structuredidentifier>
+    <stagename>International standard</stagename>
   </ext>
 </bibdata>
 <sections/>
@@ -422,8 +426,8 @@ OUTPUT
     INPUT
 <iso-standard xmlns="https://www.metanorma.org/ns/iso">
 <bibdata type="standard">
-  <docidentifier type="iso">ISO/PRF 1000</docidentifier>
-  <docidentifier type='iso-with-lang'>ISO/PRF 1000 (E)</docidentifier>
+  <docidentifier type="iso">ISO 1000</docidentifier>
+  <docidentifier type='iso-with-lang'>ISO 1000 (E)</docidentifier>
   <docnumber>1000</docnumber>
   <contributor>
     <role type="author"/>
@@ -443,7 +447,7 @@ OUTPUT
   <language>en</language>
   <script>Latn</script>
   <status>
-    <stage>60</stage>
+    <stage abbreviation="PRF">60</stage>
     <substage>00</substage>
   </status>
   <copyright>
@@ -465,6 +469,7 @@ OUTPUT
     <structuredidentifier>
       <project-number>ISO 1000</project-number>
     </structuredidentifier>
+    <stagename>Proof</stagename>
   </ext>
 </bibdata>
 <sections/>

data/spec/asciidoctor-iso/blocks_spec.rb

@@ -351,7 +351,11 @@ RSpec.describe Asciidoctor::ISO do
       #{BLANK_HDR}
        <sections>
          <quote id="_">
-         <source type="inline" bibitemid="ISO7301" citeas=""><locality type="section"><referenceFrom>1</referenceFrom></locality></source>
+         <source type="inline" bibitemid="ISO7301" citeas="">
+         <localityStack>
+        <locality type="section"><referenceFrom>1</referenceFrom></locality>
+         </localityStack>
+        </source>
          <author>ISO</author>
          <p id="_">Block quotation</p>
        </quote>
@@ -427,7 +431,11 @@ RSpec.describe Asciidoctor::ISO do
          <term id="_">
          <preferred>Term1</preferred>
          <termsource status="identical">
-         <origin bibitemid="ISO2191" type="inline" citeas=""><locality type="section"><referenceFrom>1</referenceFrom></locality></origin>
+         <origin bibitemid="ISO2191" type="inline" citeas="">
+         <localityStack>
+        <locality type="section"><referenceFrom>1</referenceFrom></locality>
+         </localityStack>
+        </origin>
        </termsource>
        </term>
        </terms>
@@ -454,7 +462,11 @@ RSpec.describe Asciidoctor::ISO do
          <term id="_">
          <preferred>Term1</preferred>
          <termsource status="modified">
-         <origin bibitemid="ISO2191" type="inline" citeas=""><locality type="section"><referenceFrom>1</referenceFrom></locality></origin>
+         <origin bibitemid="ISO2191" type="inline" citeas="">
+         <localityStack>
+        <locality type="section"><referenceFrom>1</referenceFrom></locality>
+         </localityStack>
+        </origin>
          <modification>
            <p id="_">with adjustments</p>
          </modification>

data/spec/asciidoctor-iso/cleanup_spec.rb

@@ -225,7 +225,10 @@ RSpec.describe Asciidoctor::ISO do
       <preface><foreword id='_' obligation="informative">
         <title>Foreword</title>
         <p id="_">
-        <eref type="inline" bibitemid="iso216" citeas="ISO 216"><locality type="whole"/><locality type="clause"><referenceFrom>3</referenceFrom></locality><locality type="example"><referenceFrom>9</referenceFrom><referenceTo>11</referenceTo></locality><locality type="locality:prelude"><referenceFrom>33</referenceFrom></locality><locality type="locality:entirety"/>the reference</eref>
+        <eref type="inline" bibitemid="iso216" citeas="ISO 216">
+        <localityStack>
+        <locality type="whole"/><locality type="clause"><referenceFrom>3</referenceFrom></locality><locality type="example"><referenceFrom>9</referenceFrom><referenceTo>11</referenceTo></locality><locality type="locality:prelude"><referenceFrom>33</referenceFrom></locality><locality type="locality:entirety"/>
+        </localityStack>the reference</eref>
         </p>
       </foreword></preface><sections>
       </sections><bibliography><references id="_" obligation="informative">
@@ -302,7 +305,11 @@ RSpec.describe Asciidoctor::ISO do
          <term id="_">
          <preferred>Term1</preferred>
          <termsource status="identical">
-         <origin bibitemid="ISO2191" type="inline" citeas=""><locality type="section"><referenceFrom>1</referenceFrom></locality></origin>
+         <origin bibitemid="ISO2191" type="inline" citeas="">
+         <localityStack>
+        <locality type="section"><referenceFrom>1</referenceFrom></locality>
+         </localityStack>
+        </origin>
        </termsource>
        </term>
        </terms>

data/spec/isodoc/metadata_spec.rb

@@ -46,7 +46,7 @@ RSpec.describe IsoDoc::Iso::Metadata do
   <language>en</language>
   <script>Latn</script>
   <status>
-    <stage>30</stage>
+    <stage abbreviation="CD">30</stage>
     <substage>92</substage>
     <iteration>3</iteration>
   </status>
@@ -69,6 +69,7 @@ RSpec.describe IsoDoc::Iso::Metadata do
   <structuredidentifier>
     <project-number part="1">ISO/PreCD3 17301</project-number>
   </structuredidentifier>
+  <stagename>Committee draft</stagename>
   </ext>
 </bibdata>
 </iso-standard>
@@ -120,7 +121,7 @@ OUTPUT
   <language>en</language>
   <script>Latn</script>
   <status>
-    <stage>60</stage>
+    <stage abbreviation="IS">60</stage>
     <substage>92</substage>
   </status>
   <copyright>
@@ -147,6 +148,7 @@ OUTPUT
     <structuredidentifier>
     <project-number part="1" subpart="3">ISO/IEC/CD 17301</project-number>
   </strucuredidentifier>
+  <stagename>International standard</stagename>
   </ext>
 </bibdata>
 </iso-standard>

data/spec/spec_helper.rb

@@ -125,7 +125,7 @@ BLANK_HDR = <<~"HDR"
   <language>en</language>
   <script>Latn</script>
   <status>
-    <stage>60</stage>
+    <stage abbreviation="IS">60</stage>
     <substage>60</substage>
   </status>
   <copyright>
@@ -144,6 +144,7 @@ BLANK_HDR = <<~"HDR"
     <subcommittee/>
     <workgroup/>
   </editorialgroup>
+  <stagename>International standard</stagename>
   </ext>
 </bibdata>
 #{BOILERPLATE}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 1.3.21
+  version: 1.3.22
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-03 00:00:00.000000000 Z
+date: 2020-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-jing