metanorma-standoc 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e25ec1e8d5bc7bd069b096125a76184bd1349bc64bc79a4e5c51f2441d3fb89
-  data.tar.gz: 888e53e4d5a11a260d74a520715c9343cf6d5889430e8491c91a1abf2476e057
+  metadata.gz: 7d40164559c6167d8a76a56feec14ad218ad6b3151419dd7f5069859daf39945
+  data.tar.gz: 55b683b4abb435f27648c042092526121b9235cebe9dfc95ce633efe9af3e057
 SHA512:
-  metadata.gz: d0b4f072611604bd9d6859676f98baaa6f09c95d886dbac7e5e21172fa34ccaec156c7560eccbb69a1e9bca784aae39325dce0e82bbbdf64dd0f27d05835b3b2
-  data.tar.gz: 405c4e68f48462b48249cc5d76de89b80b412f546a47992b37bd36ff68cce0a52f0cb82467439e7fe666b3b03fbf102831e17f3fb8b47757b56093627914581d
+  metadata.gz: 94f95a9f73f40f7037fccda3c15f7608e570f3cef8903aa3f11e4540d370bf9f84809dd2566fdf27106a263c5cf16fcef2757be434ff9d85f7ee424224240012
+  data.tar.gz: 17579d0d6cd9d1401a847d0cc9fe519a95b6708d181f621a8592b615d2b09ef9376452c20aa8e8baaa55ca3b6630a1a28c26dc38d557304f10086ab369b23188

data/lib/asciidoctor/standoc/biblio.rng

@@ -384,7 +384,7 @@
   </define>
   <define name="LocalityType">
     <data type="string">
-      <param name="pattern">section|clause|part|paragraph|chapter|page|whole|table|annex|figure|note|example|volume|issue|locality:[a-zA-Z0-9_]+</param>
+      <param name="pattern">section|clause|part|paragraph|chapter|page|whole|table|annex|figure|note|list|example|volume|issue|locality:[a-zA-Z0-9_]+</param>
     </data>
   </define>
   <define name="referenceFrom">
@@ -700,8 +700,12 @@
         <ref name="btitle"/>
         <ref name="formattedref"/>
       </choice>
-      <ref name="bplace"/>
-      <ref name="seriesorganization"/>
+      <optional>
+        <ref name="bplace"/>
+      </optional>
+      <optional>
+        <ref name="seriesorganization"/>
+      </optional>
       <optional>
         <ref name="abbreviation"/>
       </optional>

data/lib/asciidoctor/standoc/cleanup_ref.rb

@@ -6,7 +6,7 @@ module Asciidoctor
       # extending localities to cover ISO referencing
       LOCALITY_REGEX_STR = <<~REGEXP.freeze
         ^((?<locality>section|clause|part|paragraph|chapter|page|
-                      table|annex|figure|example|note|formula|
+                      table|annex|figure|example|note|formula|list|
                       locality:[^ \\t\\n\\r:,]+)(\\s+|=)
                (?<ref>[^"][^ \\t\\n,:-]*|"[^"]+")
                  (-(?<to>[^"][^ \\t\\n,:-]*|"[^"]"))?|
@@ -115,10 +115,12 @@ module Asciidoctor
       def reference_names(xmldoc)
         xmldoc.xpath("//bibitem[not(ancestor::bibitem)]").each do |ref|
           isopub = ref.at(ISO_PUBLISHER_XPATH)
-          docid = ref.at("./docidentifier")
+          docid = ref.at("./docidentifier[not(@type = 'DOI')]")
           date = ref.at("./date[@type = 'published']")
+          allparts = ref.at("./allparts")
           reference = format_ref(docid.text, isopub)
           reference += ":#{date_range(date)}" if date
+          reference += " (all parts)" if allparts
           @anchors[ref["id"]] = { xref: reference }
         end
       end
@@ -129,11 +131,12 @@ module Asciidoctor
       # <locality type="clause"><referenceFrom>101-01-01</referenceFrom></locality></eref>
       def linksIev2iec60050part(xmldoc)
         parts = Set.new()
-        xmldoc.xpath("//eref[@citeas = 'IEC 60050'] | //origin[@citeas = 'IEC 60050']").each do |x|
+        xmldoc.xpath("//eref[@citeas = 'IEC 60050:2011'] | "\
+                     "//origin[@citeas = 'IEC 60050:2011']").each do |x|
           cl = x&.at("./locality[@type = 'clause']/referenceFrom")&.text || next
           m = /^(\d+)/.match cl || next
           parts << m[0]
-          x["citeas"] += "-#{m[0]}"
+          x["citeas"] = x["citeas"].sub(/60050/, "60050-#{m[0]}")
         end
         parts
       end

data/lib/asciidoctor/standoc/ref.rb

@@ -58,29 +58,39 @@ module Asciidoctor
           t.title(**plaintxt) { |i| i << ref_normalise(m[:text]) }
           t.docidentifier m[:code]
           t.date **{ type: "published" } do |d|
-            d.on "--"
+            d.on "--" 
           end
           iso_publisher(t, m[:code])
           t.note(**plaintxt) { |p| p << "ISO DATE: #{m[:fn]}" }
         end
       end
 
+      def conditional_date(t, m, noyr)
+          m.names.include?("year") and
+            t.date(**{ type: "published" }) do |d|
+            if noyr then d.on "--"
+            else
+              set_date_range(d, m[:year])
+            end
+          end
+      end
+
       def isorefmatches3(xml, m)
-        hasyr =  m.names.include?("year")
-        ref = fetch_ref xml, m[:code], hasyr ? m[:year] : nil, all_parts: true
+        hasyr =  m.names.include?("year") && m[:year] != "--"
+        noyr =  m.names.include?("year") && m[:year] == "--"
+        ref = fetch_ref xml, m[:code], hasyr ? m[:year] : nil, all_parts: true, no_year: noyr
         return use_my_anchor(ref, m[:anchor]) if ref
         xml.bibitem(**attr_code(ref_attributes(m))) do |t|
           t.title(**plaintxt) { |i| i << ref_normalise(m[:text]) }
           t.docidentifier "#{m[:code]}"
-          hasyr and
-            t.date(**{ type: "published" }) { |d| set_date_range(d, m[:year]) }
+          conditional_date(t, m, noyr)
           iso_publisher(t, m[:code])
-          t.allParts "true"
+          t.note(**plaintxt) { |p| p << "ISO DATE: #{m[:fn]}" } if m.names.include?("fn") && m[:fn]
+          t.allparts "true"
         end
       end
 
       def fetch_ref(xml, code, year, **opts)
-        #require "byebug"; byebug
         hit = @bibdb&.fetch(code, year, opts) 
         return nil if hit.nil?
         xml.parent.add_child(hit.to_xml)
@@ -135,9 +145,9 @@ module Asciidoctor
       <fn[^>]*>\s*<p>(?<fn>[^\]]+)</p>\s*</fn>,?\s?(?<text>.*)$}xm
 
       ISO_REF_ALL_PARTS = %r{^<ref\sid="(?<anchor>[^"]+)">
-      \[(?<code>(ISO|IEC)[^0-9]*\s[0-9]+)(:(?<year>[0-9][0-9-]+))?\s
+      \[(?<code>(ISO|IEC)[^0-9]*\s[0-9]+)(:(?<year>--|[0-9][0-9-]+))?\s
       \(all\sparts\)\]</ref>,?\s
-      (?<text>.*)$}xm
+      (<fn[^>]*>\s*<p>(?<fn>[^\]]+)</p>\s*</fn>,?\s?)?(?<text>.*)$}xm
 
       NON_ISO_REF = %r{^<ref\sid="(?<anchor>[^"]+)">
       \[(?<code>[^\]]+?)([:-](?<year>(19|20)[0-9][0-9]))?\]</ref>,?\s

data/lib/asciidoctor/standoc/section.rb

@@ -133,7 +133,7 @@ module Asciidoctor
         xml.terms **attr_code(attrs) do |section|
           section.title { |t| t << term_def_title(toplevel, node) }
           (s = node.attr("source")) && s.split(/,/).each do |s1|
-            section.termdocsource(nil, **attr_code(bibitemid: s1, type: "inline"))
+            section.termdocsource(nil, **attr_code(bibitemid: s1))
           end
           section << node.content
         end

data/lib/asciidoctor/standoc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Standoc
-    VERSION = "1.0.1".freeze
+    VERSION = "1.0.2".freeze
   end
 end

data/spec/asciidoctor-standoc/cleanup_spec.rb

@@ -790,25 +790,28 @@ r = 1 %</stem>
        <terms id="_" obligation="normative"><title>Terms and definitions</title><term id="_">
          <preferred>Automation1</preferred>
          <termsource status="identical">
-         <origin bibitemid="iev" type="inline" citeas="IEC 60050-103"><locality type="clause"><referenceFrom>103-01-02</referenceFrom></locality></origin>
+         <origin bibitemid="iev" type="inline" citeas="IEC 60050-103:2011"><locality type="clause"><referenceFrom>103-01-02</referenceFrom></locality></origin>
        </termsource>
        </term>
        <term id="_">
          <preferred>Automation2</preferred>
          <termsource status="identical">
-         <origin bibitemid="iev" type="inline" citeas="IEC 60050-102"><locality type="clause"><referenceFrom>102-01-02</referenceFrom></locality></origin>
+         <origin bibitemid="iev" type="inline" citeas="IEC 60050-102:2011"><locality type="clause"><referenceFrom>102-01-02</referenceFrom></locality></origin>
        </termsource>
        </term>
        <term id="_">
          <preferred>Automation3</preferred>
          <termsource status="identical">
-         <origin bibitemid="iev" type="inline" citeas="IEC 60050-103"><locality type="clause"><referenceFrom>103-01-02</referenceFrom></locality></origin>
+         <origin bibitemid="iev" type="inline" citeas="IEC 60050-103:2011"><locality type="clause"><referenceFrom>103-01-02</referenceFrom></locality></origin>
        </termsource>
        </term></terms></sections><bibliography><references id="_" obligation="informative">
          <title>Normative References</title>
          <bibitem type="international-standard" id="IEC60050-102">
          <title format="text/plain" language="en" script="Latn">International Electrotechnical Vocabulary</title>
          <docidentifier>IEC 60050-102</docidentifier>
+         <date type="published">
+           <on>2011</on>
+         </date>
          <contributor>
            <role type="publisher"/>
            <organization>
@@ -836,6 +839,9 @@ r = 1 %</stem>
        </bibitem><bibitem type="international-standard" id="IEC60050-103">
          <title format="text/plain" language="en" script="Latn">International Electrotechnical Vocabulary</title>
          <docidentifier>IEC 60050-103</docidentifier>
+         <date type="published">
+           <on>2011</on>
+         </date>
          <contributor>
            <role type="publisher"/>
            <organization>

data/spec/asciidoctor-standoc/refs_spec.rb

@@ -332,7 +332,7 @@ RSpec.describe Asciidoctor::Standoc do
              <name>ISO</name>
            </organization>
          </contributor>
-         <allParts>true</allParts>
+         <allparts>true</allparts>
        </bibitem>
       </references>
       </bibliography>
@@ -347,16 +347,27 @@ RSpec.describe Asciidoctor::Standoc do
       [bibliography]
       == Normative References
 
-      * [[[iso123,IETF RFC 8341]]] _Standard_
+      * [[[iso123,IETF RFC 8341]]], _Standard_
+
+      == Clause 4
+
+      <<iso123>>
     INPUT
        #{BLANK_HDR}
               <sections>
+<clause id="_" inline-header="false" obligation="normative">
+  <title>Clause 4</title>
+  <p id="_">
+  <eref type="inline" bibitemid="iso123" citeas="RFC 8341:2018"/>
+</p>
+</clause>
 
        </sections><bibliography><references id="_" obligation="informative">
          <title>Normative References</title>
                <bibitem type="" id="iso123">
   <title format="text/plain" language="en" script="Latn">Network Configuration Access Control Model</title>
-  <docidentifier>8341</docidentifier>
+  <docidentifier type="DOI">10.17487/RFC8341</docidentifier>
+  <docidentifier type="IETF">RFC 8341</docidentifier>
   <date type="published">
     <on>2018</on>
   </date>
@@ -588,19 +599,20 @@ OUTPUT
     end
 end
 
-       def mock_rfcbib_get_rfc8341
+    def mock_rfcbib_get_rfc8341
       expect(RfcBib::RfcBibliography).to receive(:get).with("RFC 8341", nil, {}) do
-      IsoBibItem.from_xml(<<~"OUTPUT")
+        IsoBibItem.from_xml(<<~"OUTPUT")
       <bibitem id="RFC8341">
   <title format="text/plain" language="en" script="Latn">Network Configuration Access Control Model</title>
-  <docidentifier>8341</docidentifier>
+  <docidentifier type="DOI">10.17487/RFC8341</docidentifier>
+  <docidentifier type="IETF">RFC 8341</docidentifier>
   <date type="published">
     <on>2018</on>
   </date>
   <status>published</status>
 </bibitem>
-OUTPUT
+        OUTPUT
+      end
     end
-end
 
 end

data/spec/asciidoctor-standoc/section_spec.rb

@@ -298,7 +298,7 @@ RSpec.describe Asciidoctor::Standoc do
 
      INPUT
              #{BLANK_HDR}
-             <termdocsource bibitemid="iso1234" type="inline"/><termdocsource bibitemid="iso5678" type="inline"/>
+             <termdocsource bibitemid="iso1234"/><termdocsource bibitemid="iso5678"/>
         <preface><foreword obligation="informative">
          <title>Foreword</title>
          <p id="_">Foreword</p>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-21 00:00:00.000000000 Z
+date: 2018-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor