metanorma-standoc 2.8.9 → 2.8.11

data/lib/metanorma/standoc/ref.rb

@@ -17,7 +17,7 @@ module Metanorma
 
       def isorefrender1(bib, match, code, year, allp = "")
         bib.title(**plaintxt) { |i| i << ref_normalise(match[:text]) }
-        #refitem_render_formattedref(bib, match[:text])
+        # refitem_render_formattedref(bib, match[:text])
         docid(bib, match[:usrlbl]) if match[:usrlbl]
         docid(bib, code[:usrlabel]) if code && code[:usrlabel]
         docid(bib, id_and_year(match[:code], year) + allp)
@@ -33,16 +33,14 @@ module Metanorma
       end
 
       def isorefmatchesout(item, xml)
-        if item[:doc] then use_retrieved_relaton(item, xml)
-        else
-          xml.bibitem **attr_code(ref_attributes(item[:ref][:match])) do |t|
-            isorefrender1(t, item[:ref][:match], item[:ref][:analyse_code],
-                          item[:ref][:year])
-            item[:ref][:year] and t.date type: "published" do |d|
-              set_date_range(d, item[:ref][:year])
-            end
-            iso_publisher(t, item[:ref][:match][:code])
+        item[:doc] and return use_retrieved_relaton(item, xml)
+        r = item[:ref]
+        xml.bibitem **attr_code(ref_attributes(r[:match])) do |t|
+          isorefrender1(t, r[:match], r[:analyse_code], r[:year])
+          y = r[:year] and t.date type: "published" do |d|
+            set_date_range(d, y)
           end
+          iso_publisher(t, r[:match][:code])
         end
       end
 
@@ -111,19 +109,26 @@ module Metanorma
       end
 
       def refitem_render1(match, code, bib)
-        if code[:type] == "path"
-          bib.uri code[:key].sub(/\.[a-zA-Z0-9]+$/, ""), type: "URI"
-          bib.uri code[:key].sub(/\.[a-zA-Z0-9]+$/, ""), type: "citation"
-        end
+        refitem_uri(code, bib)
         # code[:id].sub!(/[:-](19|20)[0-9][0-9]$/, "")
         docid(bib, match[:usrlbl]) if match[:usrlbl]
         docid(bib, code[:usrlabel]) if code[:usrlabel]
-        code[:id] and
-          docid(bib, /^\d+$/.match?(code[:id]) ? "[#{code[:id]}]" : code[:id])
+        i = code[:id] and docid(bib, /^\d+$/.match?(i) ? "[#{i}]" : i)
         code[:type] == "repo" and
           bib.docidentifier code[:key], type: "repository"
       end
 
+      def refitem_uri(code, bib)
+        if code[:type] == "path"
+          bib.uri code[:key].sub(/\.[a-zA-Z0-9]+$/, ""), type: "URI"
+          bib.uri code[:key].sub(/\.[a-zA-Z0-9]+$/, ""), type: "citation"
+        end
+        if code[:type] == "attachment"
+          bib.uri code[:key], type: "attachment"
+          bib.uri code[:key], type: "citation"
+        end
+      end
+
       def refitem_render(xml, match, code)
         xml.bibitem **attr_code(
           id: match[:anchor], suppress_identifier: code[:dropid],
@@ -214,16 +219,12 @@ module Metanorma
       end
 
       def reference1code(item, node)
-        matched, matched2, matched3 = reference1_matches(item)
-        if matched3.nil? && matched2.nil? && matched.nil?
-          refitemcode(item, node).merge(process: 0)
-        elsif !matched.nil? then isorefmatchescode(matched,
-                                                   item).merge(process: 1)
-        elsif !matched2.nil? then isorefmatches2code(matched2,
-                                                     item).merge(process: 2)
-        elsif !matched3.nil? then isorefmatches3code(matched3,
-                                                     item).merge(process: 3)
-        end
+        m, m2, m3 = reference1_matches(item)
+        m3.nil? && m2.nil? && m.nil? and
+          return refitemcode(item, node).merge(process: 0)
+        !m.nil? and return isorefmatchescode(m, item).merge(process: 1)
+        !m2.nil? and return isorefmatches2code(m2, item).merge(process: 2)
+        !m3.nil? and return isorefmatches3code(m3, item).merge(process: 3)
       end
 
       def reference1out(item, xml)

data/lib/metanorma/standoc/ref_utility.rb

@@ -33,9 +33,9 @@ module Metanorma
 
       def use_my_anchor(ref, id, opt)
         ref.parent.elements.last["id"] = id
-        opt[:hidden] and ref.parent.elements.last["hidden"] = opt[:hidden]
-        opt[:dropid] and
-          ref.parent.elements.last["suppress_identifier"] = opt[:dropid]
+        a = opt[:hidden] and ref.parent.elements.last["hidden"] = a
+        a = opt[:dropid] and
+          ref.parent.elements.last["suppress_identifier"] = a
         ref
       end
 
@@ -69,7 +69,7 @@ module Metanorma
       def analyse_ref_localfile(ret)
         m = /^local-file\((?:(?<source>[^,]+),\s*)?(?<id>.+)\)$/.match(ret[:id])
         m or return ret
-        ret.merge(id: m[:id], localfile: (m[:source] || "default"))
+        ret.merge(id: m[:id], localfile: m[:source] || "default")
       end
 
       def analyse_ref_nofetch(ret)
@@ -88,9 +88,14 @@ module Metanorma
       end
 
       def analyse_ref_repo_path(ret)
-        m = /^(?<type>repo|path):\((?<key>[^,]+),?(?<id>.*)\)$/
+        m = /^(?<type>repo|path|attachment):\((?<key>[^,]+),?(?<id>[^)]*)\)$/
           .match(ret[:id]) or return ret
-        id = m[:id].empty? ? m[:key].sub(%r{^[^/]+/}, "") : m[:id]
+        id = if m[:id].empty?
+               if m[:type] == "attachment"
+                 "(#{m[:key]})"
+               else m[:key].sub(%r{^[^/]+/}, "")
+               end
+             else m[:id] end
         ret.merge(id: id, type: m[:type], key: m[:key], nofetch: true)
       end
 
@@ -139,12 +144,12 @@ module Metanorma
           case k
           when :dropid, :hidden, :nofetch
             ret[k] = v == "true"
-          when :repo, :path
+          when :repo, :path, :attachment
             ret[:type] = k.to_s
             ret[:key] = v
             ret[:nofetch] = true
             source[:code] or
-              ret[:id] = v.sub(%r{^[^/]+/}, "")
+              ret[:id] = v == :attachment ? nil : v.sub(%r{^[^/]+/}, "")
           when :"local-file"
             ret[:localfile] = v
           when :number
@@ -160,7 +165,8 @@ module Metanorma
 
       # ref id = (usrlbl)code[:-]year
       # code = \[? number \]? | ident | nofetch(code) | hidden(code) |
-      # dropid(code) | # (repo|path):(key,code) | local-file(source,? key) |
+      # dropid(code) | # (repo|path|attachment):(key,code) |
+      # local-file(source,? key) |
       # merge(code, code) | dual(code, code)
       def analyse_ref_code_nested(ret)
         analyse_ref_dual(

data/lib/metanorma/standoc/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "2.8.9".freeze
+    VERSION = "2.8.11".freeze
   end
 end

data/metanorma-standoc.gemspec

@@ -42,7 +42,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "asciimath2unitsml", "~> 0.4.0"
   spec.add_dependency "concurrent-ruby"
   spec.add_dependency "pngcheck"
-  spec.add_dependency "relaton-cli", "~> 1.18.0"
+  spec.add_dependency "relaton-cli", "~> 1.18.1"
   spec.add_dependency "relaton-iev", "~> 1.2.0"
   spec.add_dependency "unicode2latex", "~> 0.0.1"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 2.8.9
+  version: 2.8.11
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-05-06 00:00:00.000000000 Z
+date: 2024-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -198,14 +198,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.18.0
+        version: 1.18.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.18.0
+        version: 1.18.1
 - !ruby/object:Gem::Dependency
   name: relaton-iev
   requirement: !ruby/object:Gem::Requirement
@@ -495,6 +495,7 @@ files:
 - lib/metanorma/standoc/cleanup_bibitem.rb
 - lib/metanorma/standoc/cleanup_block.rb
 - lib/metanorma/standoc/cleanup_boilerplate.rb
+- lib/metanorma/standoc/cleanup_dochistory.rb
 - lib/metanorma/standoc/cleanup_footnotes.rb
 - lib/metanorma/standoc/cleanup_image.rb
 - lib/metanorma/standoc/cleanup_inline.rb