metanorma-nist 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bab11b072819d5c1ca9ddf38c87144d724fbb4bdd24908ef07ba463448917027
-  data.tar.gz: 7d9153055e1f188f1355b289dc22da96754a1864b64ccaf87c503dc02ab75a4a
+  metadata.gz: '058ea96daf6a2940d6a1b2b2ddb8464f13a62389c006cfcf423dfa57d5d33c11'
+  data.tar.gz: 47dd1e6208cdf299e9b2146dfe92f0003a66e7b0ca6f169c50dd9a1792627c48
 SHA512:
-  metadata.gz: 29e8aab3e4e244abe3c889e354eb368c67b3c2a66922ab7efd0be885a7b8118163e8e45ae453177ffdba9ebf12c2fa68091b20347d6257590ccc91df38d5fb39
-  data.tar.gz: e13976985ddb04f3c30d8dca1aa74306231d62b883b93be40fee082fe35b8e6b31c94311f1f50dee5c5614c8f11a7a8471c765595452a2abdc4b480814866fda
+  metadata.gz: 423c8ba7e534b31b3176e22234937d58a3ae2599e45f0bb476822c05752d4fd9b407df989bba48c19be262c28fcb80fe67df4e107b8632f50fb80ffc9803b8b8
+  data.tar.gz: 9ed5d3661a6804ac4c75a58a2b17effe96115e066d7179bc376a539f097e6249383c1baeed5c26ad4bfddac500142e78741abf8c8030de1ecb69f11c339301a0

data/Gemfile

@@ -1,6 +1,11 @@
-source "https://rubygems.org"
-git_source(:github) {|repo| "https://github.com/#{repo}" }
+Encoding.default_external = Encoding::UTF_8
+Encoding.default_internal = Encoding::UTF_8
 
-#gem "metanorma-standoc", git: "https://github.com/metanorma/metanorma-standoc"
+source "https://rubygems.org"
+git_source(:github) { |repo| "https://github.com/#{repo}" }
 
 gemspec
+
+if File.exist? 'Gemfile.devel'
+  eval File.read('Gemfile.devel'), nil, 'Gemfile.devel' # rubocop:disable Security/Eval
+end

data/lib/asciidoctor/nist/cleanup.rb

@@ -135,6 +135,44 @@ module Asciidoctor
         end
         ret
       end
+
+      TERM_CLAUSE = "//sections/terms | "\
+        "//sections/clause[descendant::terms] | "\
+        "//annex/terms | "\
+        "//annex/clause[descendant::terms] ".freeze
+
+      def boilerplate_cleanup(xmldoc)
+        isodoc = IsoDoc::Convert.new({})
+        @lang = xmldoc&.at("//bibdata/language")&.text
+        @script = xmldoc&.at("//bibdata/script")&.text
+        isodoc.i18n_init(@lang, @script)
+        f = xmldoc.at(self.class::TERM_CLAUSE) and
+          term_defs_boilerplate(f.at("../title"),
+                                xmldoc.xpath(".//termdocsource"),
+                                f.at(".//term"), f.at(".//p"), isodoc)
+      end
+
+      def sort_biblio(bib)
+        @citation_order = {}
+        bib.document.xpath("//xref | //origin").each_with_index do |x, i|
+          cit = x["target"] || x["bibitemid"]
+          next unless refid? cit
+          @citation_order[cit] ||= i
+        end
+        bib.sort do |a, b|
+          sort_biblio_key(a) <=> sort_biblio_key(b)
+        end
+      end
+
+      # if numeric citation, order by appearance. if alphanumeric, sort alphabetically
+      def sort_biblio_key(bib)
+        if metaid = bib&.at("./docidentifier[@type = 'metanorma']")&.text&.gsub(%r{[\[\]]}, "")
+          key = /^\[\d+\]$/.match(metaid) ? ( @citation_order[metaid] % "09%d" ) : metaid
+        end
+        title = bib&.at("./title[@type = 'main']")&.text ||
+          bib&.at("./title")&.text || bib&.at("./formattedref")&.text
+        "#{key} :: #{title}"
+      end
     end
   end
 end

data/lib/asciidoctor/nist/converter.rb

@@ -237,22 +237,6 @@ module Asciidoctor
         end
       end
 
-      TERM_CLAUSE = "//sections/terms | "\
-        "//sections/clause[descendant::terms] | "\
-        "//annex/terms | "\
-        "//annex/clause[descendant::terms] ".freeze
-
-      def boilerplate_cleanup(xmldoc)
-        isodoc = IsoDoc::Convert.new({})
-        @lang = xmldoc&.at("//bibdata/language")&.text
-        @script = xmldoc&.at("//bibdata/script")&.text
-        isodoc.i18n_init(@lang, @script)
-        f = xmldoc.at(self.class::TERM_CLAUSE) and
-          term_defs_boilerplate(f.at("../title"),
-                                xmldoc.xpath(".//termdocsource"),
-                                f.at(".//term"), f.at(".//p"), isodoc)
-      end
-
       NIST_PREFIX_REFS = "SP|FIPS"
 
       def refitem(xml, item, node)

data/lib/asciidoctor/nist/front.rb

@@ -26,28 +26,28 @@ module Asciidoctor
       def title_subtitle(node, t, at)
         return unless node.attr("title-sub")
         t.title(**attr_code(at.merge(type: "subtitle"))) do |t1|
-          t1 << asciidoc_sub(node.attr("title-sub"))
+          t1 << Asciidoctor::Standoc::Utils::asciidoc_sub(node.attr("title-sub"))
         end
         node.attr("title-sub-short") and
           t.title(**attr_code(at.merge(type: "short-subtitle"))) do |t1|
-          t1 << asciidoc_sub(node.attr("title-sub-short"))
+          t1 << Asciidoctor::Standoc::Utils::asciidoc_sub(node.attr("title-sub-short"))
         end
       end
 
       def title_document_class(node, t, at)
         return unless node.attr("title-document-class")
         t.title(**attr_code(at.merge(type: "document-class"))) do |t1|
-          t1 << asciidoc_sub(node.attr("title-document-class"))
+          t1 << Asciidoctor::Standoc::Utils::asciidoc_sub(node.attr("title-document-class"))
         end
       end
 
       def title_main(node, t, at)
         t.title(**attr_code(at.merge(type: "main"))) do |t1|
-          t1 << asciidoc_sub(node.attr("title-main") || node.title)
+          t1 << Asciidoctor::Standoc::Utils::asciidoc_sub(node.attr("title-main") || node.title)
         end
         node.attr("title-main-short") and
           t.title(**attr_code(at.merge(type: "short-title"))) do |t1|
-          t1 << asciidoc_sub(node.attr("title-main-short"))
+          t1 << Asciidoctor::Standoc::Utils::asciidoc_sub(node.attr("title-main-short"))
         end
       end
 
@@ -263,16 +263,16 @@ module Asciidoctor
 
       def metadata_superseding_titles(b, node)
         if node.attr("superseding-title")
-          b.title asciidoc_sub(node.attr("superseding-title")),
+          b.title Asciidoctor::Standoc::Utils::asciidoc_sub(node.attr("superseding-title")),
             **{ type: "main" }
           node.attr("superseding-subtitle") and
-            b.title asciidoc_sub(node.attr("superseding-subtitle")),
+            b.title Asciidoctor::Standoc::Utils::asciidoc_sub(node.attr("superseding-subtitle")),
             **{ type: "subtitle" }
         else
-          b.title asciidoc_sub(node.attr("title-main") || node.title),
+          b.title Asciidoctor::Standoc::Utils::asciidoc_sub(node.attr("title-main") || node.title),
             **{ type: "main" }
           node.attr("title-sub") and
-            b.title asciidoc_sub(node.attr("title-sub")), **{ type: "subtitle" }
+            b.title Asciidoctor::Standoc::Utils::asciidoc_sub(node.attr("title-sub")), **{ type: "subtitle" }
         end
       end
 

data/lib/isodoc/nist/base_convert.rb

@@ -251,13 +251,14 @@ module IsoDoc
       end
 
       def reference_format(b, r)
-        code = bibitem_ref_code(b)
-        if /^\d+$/.match(code)
+        id = bibitem_ref_code(b)
+        code = render_identifier(id)
+        if id["type"] == "metanorma"
           r << "[#{code}] "
           insert_tab(r, 1)
         end
         reference_format1(b, r)
-        r << " [#{code}] " unless /^\d+$/.match(code)
+        r << " [#{code}] " unless id["type"] == "metanorma"
       end
 
       def reference_format1(b, r)

data/lib/metanorma/nist/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module NIST
-    VERSION = "0.2.1"
+    VERSION = "0.2.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-nist
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-02 00:00:00.000000000 Z
+date: 2019-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor