metanorma-iso 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e608abed8ce4aa5c4ca053f1f144fa46e1e613bdd4727054e2e55f86caf8fe4
-  data.tar.gz: c156d095288a2d586c0780fbca85b0fc775580ba9725b3ef4b821449e4a646fa
+  metadata.gz: c19e6c74f9375995e56a1e37a32ddb30772d952ace1c418e69a9a833c3ab2bd2
+  data.tar.gz: b0a914f36aea83bc10d3b01f699c6f0362d83e6f63827742dc27c8bea789c958
 SHA512:
-  metadata.gz: 426a44d2e547b14919eda3726cd9c7df60f59122b94a3e50db3b2f783e2ade2552d142f138750b4601c90e429eaf2293c9e15e23f38fb1e5018e924cc348f4de
-  data.tar.gz: 6ac6979ee3394d59b80ad02e46d713eee22a2691c73334c95ec9f792b9e4cc450b95efa1866805ec77789d7f10b70e992d37676e0e3291483eeaddb82200f96a
+  metadata.gz: a98a998ebf542a21aa53996ba826827fcf6a5216b109356c40ea8edd86f4fcf18f4d8d20168e014817fac422632af5ff4326bc297600d4a5b9e42f671698aaa2
+  data.tar.gz: 004766f312b82a75a7b9831d6da6e024dcc1fc4db75f1971a4496255861e6b7a7a6d102b5e73c17c9872c3a09a0817d61d8a1614afab4c69ebe8a360527136ad

data/Gemfile

@@ -2,6 +2,10 @@ Encoding.default_external = Encoding::UTF_8
 Encoding.default_internal = Encoding::UTF_8
 
 source "https://rubygems.org"
+git_source(:github) { |repo| "https://github.com/#{repo}" }
 
-# Specify your gem's dependencies in gemspec
 gemspec
+
+if File.exist? 'Gemfile.devel'
+  eval File.read('Gemfile.devel'), nil, 'Gemfile.devel' # rubocop:disable Security/Eval
+end

data/lib/asciidoctor/iso/cleanup.rb

@@ -66,10 +66,8 @@ module Asciidoctor
         return 2 if bib.at("#{PUBLISHER}[abbreviation = 'IEC']")
         return 2 if bib.at("#{PUBLISHER}[name = 'International "\
                            "Electrotechnical Commission']")
-        return 3 if bib.at("./docidentifier[@type][not(@type = 'DOI')]"\
-                           "[not(@type = 'metanorma')]")
-        return 3 if bib.at("./docidentifier[not(@type)]") &&
-          !bib.at("./docidentifier[@type]")
+        return 3 if bib.at("./docidentifier[@type][not(@type = 'DOI' or "\
+                           "@type = 'metanorma' or @type = 'ISSN' or @type = 'ISBN')]")
         4
       end
 
@@ -80,15 +78,23 @@ module Asciidoctor
       end
 
       # TODO sort by authors
+      # sort by: doc class (ISO, IEC, other standard (not DOI &c), other
+      # then standard class (docid class other than DOI &c)
+      # then docnumber if present, numeric sort
+      #      else alphanumeric metanorma id (abbreviation)
+      # then doc id (not DOI &c)
+      # then title
       def sort_biblio_key(bib)
         pubclass = pub_class(bib)
         num = bib&.at("./docnumber")&.text
-        id = bib&.at("./docidentifier[not(@type = 'metanorma')]"\
-                     "[not(@type = 'DOI')]")
+        id = bib&.at("./docidentifier[not(@type = 'DOI' or "\
+                           "@type = 'metanorma' or @type = 'ISSN' or @type = 'ISBN')]")
+        metaid = bib&.at("./docidentifier[@type = 'metanorma']")&.text
+        abbrid = metaid unless /^\[\d+\]$/.match(metaid)
         type = id['type'] if id
         title = bib&.at("./title[@type = 'main']")&.text ||
           bib&.at("./title")&.text || bib&.at("./formattedref")&.text
-        "#{pubclass} :: #{type} :: #{num.nil? ? "" : num % "09%d"} :: #{id&.text} :: #{title}"
+        "#{pubclass} :: #{type} :: #{num.nil? ? abbrid : sprintf("%09d", num.to_i)} :: #{id&.text} :: #{title}"
       end
     end
   end

data/lib/asciidoctor/iso/front.rb

@@ -138,20 +138,20 @@ module Asciidoctor
       def title_intro(node, t, lang, at)
         return unless node.attr("title-intro-#{lang}")
         t.title(**attr_code(at.merge(type: "title-intro"))) do |t1|
-          t1 << asciidoc_sub(node.attr("title-intro-#{lang}"))
+          t1 << Asciidoctor::Standoc::Utils::asciidoc_sub(node.attr("title-intro-#{lang}"))
         end
       end
 
       def title_main(node, t, lang, at)
         t.title **attr_code(at.merge(type: "title-main")) do |t1|
-          t1 << asciidoc_sub(node.attr("title-main-#{lang}"))
+          t1 << Asciidoctor::Standoc::Utils::asciidoc_sub(node.attr("title-main-#{lang}"))
         end
       end
 
       def title_part(node, t, lang, at)
         return unless node.attr("title-part-#{lang}")
         t.title(**attr_code(at.merge(type: "title-part"))) do |t1|
-          t1 << asciidoc_sub(node.attr("title-part-#{lang}"))
+          t1 << Asciidoctor::Standoc::Utils::asciidoc_sub(node.attr("title-part-#{lang}"))
         end
       end
 
@@ -162,7 +162,7 @@ module Asciidoctor
         title = "#{intro} -- #{title}" if intro
         title = "#{title} -- #{part}" if part
         t.title **attr_code(at.merge(type: "main")) do |t1|
-          t1 << asciidoc_sub(title)
+          t1 << Asciidoctor::Standoc::Utils::asciidoc_sub(title)
         end
       end
 

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "1.3.1".freeze
+    VERSION = "1.3.2".freeze
   end
 end

data/spec/asciidoctor-iso/cleanup_spec.rb

@@ -799,28 +799,32 @@ r = 1 %</stem>
     * [[[ref1,ISO 123]]], _Standard ISO 123_
     * [[[ref4,GB 123]]], _Standard GB 123_
     * [[[ref2,ISO/IEC 123]]], _Standard ISO/IEC 123_
+    * [[[ref6,(B)]]], _Standard 20_
+    * [[[ref7,(A)]]], _Standard 30_
 
     [bibliography]
     === {blank}
-    * [[[ref10,20]]], _Standard 10_
-    * [[[ref9,GB 123]]], _Standard GB 123_
-    * [[[ref8,IEC 123]]], _Standard IEC 123_
-    * [[[ref7,ISO 123]]], _Standard ISO 123_
-    * [[[ref6,ISO/IEC 123]]], _Standard ISO/IEC 123_
+    * [[[ref15,20]]], _Standard 10_
+    * [[[ref14,GB 123]]], _Standard GB 123_
+    * [[[ref13,IEC 123]]], _Standard IEC 123_
+    * [[[ref11,ISO 123]]], _Standard ISO 123_
+    * [[[ref10,ISO/IEC 123]]], _Standard ISO/IEC 123_
+    * [[[ref16,(B)]]], _Standard 20_
+    * [[[ref17,(A)]]], _Standard 30_
     INPUT
         #{BLANK_HDR}
-    <sections><clause id="_" inline-header="false" obligation="normative">
+        <sections><clause id="_" inline-header="false" obligation="normative">
          <title>Clause 1</title>
          <p id="_"><eref type="inline" bibitemid="ref1" citeas="ISO 123"/>
        <eref type="inline" bibitemid="ref2" citeas="ISO/IEC 123"/>
        <eref type="inline" bibitemid="ref3" citeas="IEC 123"/>
        <eref type="inline" bibitemid="ref4" citeas="GB 123"/>
-       <eref type="inline" bibitemid="ref5" citeas="[5]"/>
-       <eref type="inline" bibitemid="ref6" citeas="ISO/IEC 123"/>
-       <eref type="inline" bibitemid="ref7" citeas="ISO 123"/>
-       <eref type="inline" bibitemid="ref8" citeas="IEC 123"/>
-       <eref type="inline" bibitemid="ref9" citeas="GB 123"/>
-       <eref type="inline" bibitemid="ref10" citeas="[10]"/></p>
+       <eref type="inline" bibitemid="ref5" citeas="[4]"/>
+       <eref type="inline" bibitemid="ref6" citeas="[B]"/>
+       <eref type="inline" bibitemid="ref7" citeas="[A]"/>
+       <xref target="ref8"/>
+       <xref target="ref9"/>
+       <eref type="inline" bibitemid="ref10" citeas="ISO/IEC 123"/></p>
        </clause>
        </sections><bibliography><clause id="_" obligation="informative"><title>Bibliography</title><references id="_" obligation="informative">
          <title>Clause 1</title><bibitem id="ref1" type="standard">
@@ -860,25 +864,37 @@ r = 1 %</stem>
              <abbreviation>IEC</abbreviation>
            </organization>
          </contributor>
+       </bibitem><bibitem id="ref5">
+         <formattedref format="application/x-isodoc+xml">
+           <em>Standard 10</em>
+         </formattedref>
+         <docidentifier type="metanorma">[4]</docidentifier>
        </bibitem><bibitem id="ref4">
          <formattedref format="application/x-isodoc+xml">
            <em>Standard GB 123</em>
          </formattedref>
          <docidentifier>GB 123</docidentifier>
-       </bibitem><bibitem id="ref5">
+       </bibitem><bibitem id="ref7">
          <formattedref format="application/x-isodoc+xml">
-           <em>Standard 10</em>
+           <em>Standard 30</em>
+         </formattedref>
+         <docidentifier type="metanorma">[A]</docidentifier>
+       </bibitem><bibitem id="ref6">
+         <formattedref format="application/x-isodoc+xml">
+           <em>Standard 20</em>
          </formattedref>
-         <docidentifier type="metanorma">[5]</docidentifier>
+         <docidentifier type="metanorma">[B]</docidentifier>
        </bibitem>
 
 
 
 
 
+
+
        </references>
        <references id="_" obligation="informative">
-         <bibitem id="ref7" type="standard">
+         <bibitem id="ref11" type="standard">
          <title format="text/plain">Standard ISO 123</title>
          <docidentifier>ISO 123</docidentifier>
          <contributor>
@@ -888,7 +904,7 @@ r = 1 %</stem>
              <abbreviation>ISO</abbreviation>
            </organization>
          </contributor>
-       </bibitem><bibitem id="ref6" type="standard">
+       </bibitem><bibitem id="ref10" type="standard">
          <title format="text/plain">Standard ISO/IEC 123</title>
          <docidentifier>ISO/IEC 123</docidentifier>
          <contributor>
@@ -905,7 +921,7 @@ r = 1 %</stem>
              <abbreviation>IEC</abbreviation>
            </organization>
          </contributor>
-       </bibitem><bibitem id="ref8" type="standard">
+       </bibitem><bibitem id="ref13" type="standard">
          <title format="text/plain">Standard IEC 123</title>
          <docidentifier>IEC 123</docidentifier>
          <contributor>
@@ -915,22 +931,34 @@ r = 1 %</stem>
              <abbreviation>IEC</abbreviation>
            </organization>
          </contributor>
-       </bibitem><bibitem id="ref9">
+       </bibitem><bibitem id="ref15">
+         <formattedref format="application/x-isodoc+xml">
+           <em>Standard 10</em>
+         </formattedref>
+         <docidentifier type="metanorma">[11]</docidentifier>
+       </bibitem><bibitem id="ref14">
          <formattedref format="application/x-isodoc+xml">
            <em>Standard GB 123</em>
          </formattedref>
          <docidentifier>GB 123</docidentifier>
-       </bibitem><bibitem id="ref10">
+       </bibitem><bibitem id="ref17">
          <formattedref format="application/x-isodoc+xml">
-           <em>Standard 10</em>
+           <em>Standard 30</em>
          </formattedref>
-         <docidentifier type="metanorma">[10]</docidentifier>
+         <docidentifier type="metanorma">[A]</docidentifier>
+       </bibitem><bibitem id="ref16">
+         <formattedref format="application/x-isodoc+xml">
+           <em>Standard 20</em>
+         </formattedref>
+         <docidentifier type="metanorma">[B]</docidentifier>
        </bibitem>
 
 
 
 
 
+
+
        </references></clause></bibliography>
        </iso-standard>
     OUTPUT

data/spec/asciidoctor-iso/section_spec.rb

@@ -355,7 +355,7 @@ standardization at the following addresses:</p>
        </foreword></preface><sections>
        <terms id="_" obligation="normative">
           <title>Terms and definitions</title><p>For the purposes of this document, the terms and definitions 
-  given in <eref bibitem="iso1234"/> and <eref bibitem="iso5678"/> and the following apply.</p>
+  given in <eref bibitemid="iso1234"/> and <eref bibitemid="iso5678"/> and the following apply.</p>
   <p>ISO and IEC maintain terminological databases for use in
 standardization at the following addresses:</p>
 
@@ -427,7 +427,7 @@ standardization at the following addresses:</p>
        <terms id="_" obligation="normative">
          <title>Terms and definitions</title>
          <p>For the purposes of this document,
-        the terms and definitions given in <eref bibitem="iso1234"/> and <eref bibitem="iso5678"/> apply.</p>
+        the terms and definitions given in <eref bibitemid="iso1234"/> and <eref bibitemid="iso5678"/> apply.</p>
         <p>ISO and IEC maintain terminological databases for use in
 standardization at the following addresses:</p>
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-01 00:00:00.000000000 Z
+date: 2019-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor