metanorma-standoc 2.6.3 → 2.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8505150e755f57c7d7d9a02212bc3915ee49d8547f4c2143369ea00f4d9b623
-  data.tar.gz: d2dd6aae079a71359d5012f03ea6f937eb998f2a9912d1b5886246de9797d81c
+  metadata.gz: f97ecd18866405cdb9d6b66001a4e36d2fbd8a54fdbf1b3c9158ea86a0b9bb18
+  data.tar.gz: 91d500390673aee641a3f909e43f618c657c5441ce97e315f5cbcdbfd3e9b346
 SHA512:
-  metadata.gz: 33a2b3eae8bb5f0092e5bd36ceb05f9a653fb3f5af645d035641f2e64076b2746738bb23dd75d83191a835873aef921a28a2baed313fb1b3fb939c747543acee
-  data.tar.gz: ba20076eab6ecc6a2ffcda225012863094ef6f24abcb85feb7da4f4fd46dd1caa259938a7aa970911841665e7cdce328f95e0e899dc6250ba2c8776eb574895a
+  metadata.gz: 3747b45da1d18b643ac4a5475057543765333cfee4d2f9a840045c7f86125b8c687499ceebe2f6bc4c97c0d11cfa6c6852fc2a550b40244d69d1b5880c9163ac
+  data.tar.gz: 6ccc6bd35186eb717929cac051d85c1ac13bd42ddd97a22ee3cd6ac59259a8fbfaeff4e3e90a381f87ccf873b279c0cf2c27db3fdc88571805ca546d86068cfb

data/Gemfile

@@ -4,10 +4,12 @@ Encoding.default_internal = Encoding::UTF_8
 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
+group :development, :test do
+  gem "rspec"
 end
 
+if File.exist? "Gemfile.devel"
+  eval File.read("Gemfile.devel"), nil, "Gemfile.devel" # rubocop:disable Security/Eval
+end
 
+gemspec

data/lib/metanorma/standoc/front.rb

@@ -172,6 +172,7 @@ module Metanorma
         metadata_date(node, xml)
         metadata_author(node, xml)
         metadata_publisher(node, xml)
+        metadata_sponsor(node, xml)
         metadata_version(node, xml)
         metadata_note(node, xml)
         metadata_language(node, xml)

data/lib/metanorma/standoc/front_contributor.rb

@@ -1,59 +1,46 @@
 require "date"
-require "nokogiri"
-require "htmlentities"
-require "pathname"
-require "csv"
 
 module Metanorma
   module Standoc
     module Front
       def committee_component(compname, node, out)
-        out.send compname.gsub(/-/, "_"), node.attr(compname),
-                 **attr_code(number: node.attr("#{compname}-number"),
-                             type: node.attr("#{compname}-type"))
-        i = 2
-        while node.attr(compname + "_#{i}")
-          out.send compname.gsub(/-/, "_"), node.attr(compname + "_#{i}"),
-                   **attr_code(number: node.attr("#{compname}-number_#{i}"),
-                               type: node.attr("#{compname}-type_#{i}"))
+        i = 1
+        suffix = ""
+        while node.attr(compname + suffix)
+          out.send compname.gsub(/-/, "_"), node.attr(compname + suffix),
+                   **attr_code(number: node.attr("#{compname}-number#{suffix}"),
+                               type: node.attr("#{compname}-type#{suffix}"))
           i += 1
+          suffix = "_#{i}"
         end
       end
 
-      def organization(org, orgname, is_pub, node = nil, default_org = nil)
+      def organization(org, orgname, node = nil, default_org = nil)
         abbrevs = org_abbrev
         n = abbrevs.invert[orgname] and orgname = n
         org.name orgname
-        default_org and a = node.attr("subdivision") and org.subdivision a
+        default_org and a = node&.attr("subdivision") and org.subdivision a
         abbr = org_abbrev[orgname]
-        default_org && b = node.attr("subdivision-abbr") and abbr = b
+        default_org && b = node&.attr("subdivision-abbr") and abbr = b
         abbr and org.abbreviation abbr
-        is_pub && node and org_address(node, org)
       end
 
-      def org_address(node, person)
-        node.attr("pub-address") and person.address do |ad|
+      def org_address(org, xml)
+        p = org[:address] and xml.address do |ad|
           ad.formattedAddress do |f|
-            f << node.attr("pub-address").gsub(/ \+\n/, "<br/>")
+            f << p.gsub(/ \+\n/, "<br/>")
           end
         end
-        node.attr("pub-phone") and person.phone node.attr("pub-phone")
-        node.attr("pub-fax") and
-          person.phone node.attr("pub-fax"), type: "fax"
-        node.attr("pub-email") and person.email node.attr("pub-email")
-        node.attr("pub-uri") and person.uri node.attr("pub-uri")
+        p = org[:phone] and xml.phone p
+        p = org[:fax] and xml.phone p, type: "fax"
+        p = org[:email] and xml.email p
+        p = org[:uri] and xml.uri p
       end
 
       def metadata_author(node, xml)
-        csv_split(node.attr("publisher") || default_publisher || "")
-          &.each do |p|
-          xml.contributor do |c|
-            c.role type: "author"
-            c.organization do |a|
-              organization(a, p, false, node, !node.attr("publisher"))
-            end
-          end
-        end
+        org_contributor(node, xml,
+                        { source: ["publisher", "pub"], role: "author",
+                          default: default_publisher })
         personal_author(node, xml)
       end
 
@@ -129,6 +116,7 @@ module Metanorma
           xml.subdivision s
         end
         person_address(node, suffix, xml)
+        person_org_logo(node, suffix, xml)
       end
 
       def person_address(node, suffix, xml)
@@ -145,11 +133,19 @@ module Metanorma
 
       def person_address_components(node, suffix, xml)
         xml.address do |ad|
-          s = node.attr("street#{suffix}") and ad.street s
-          s = node.attr("city#{suffix}") and ad.city s
-          s = node.attr("state#{suffix}") and ad.state s
-          s = node.attr("country#{suffix}") and ad.country s
-          s = node.attr("postcode#{suffix}") and ad.postcode s
+          %w(street city state country postcode).each do |k|
+            s = node.attr("#{k}#{suffix}") and ad.send k, s
+          end
+        end
+      end
+
+      def person_org_logo(node, suffix, xml)
+        p = node.attr("affiliation_logo#{suffix}") and org_logo(xml, p)
+      end
+
+      def org_logo(xml, logo)
+        logo and xml.logo do |l|
+          l.image src: logo
         end
       end
 
@@ -162,27 +158,109 @@ module Metanorma
       end
 
       def metadata_publisher(node, xml)
-        publishers = node.attr("publisher") || default_publisher || return
-        csv_split(publishers)&.each do |p|
+        o = { source: ["publisher", "pub"], role: "publisher",
+              default: default_publisher }
+        org_contributor(node, xml, o)
+      end
+
+      def metadata_sponsor(node, xml)
+        o = { source: ["sponsor"], role: "enabler" }
+        org_contributor(node, xml, o)
+      end
+
+      def org_contributor(node, xml, opts)
+        org_attrs_parse(node, opts).each do |o|
           xml.contributor do |c|
-            c.role type: "publisher"
+            org_contributor_role(c, o)
             c.organization do |a|
-              organization(a, p, true, node, !node.attr("publisher"))
+              org_organization(node, a, o)
             end
           end
         end
       end
 
+      def org_contributor_role(xml, org)
+        xml.role type: org[:role] do |r|
+          org[:desc] and r.description do |d|
+            d << org[:desc]
+          end
+        end
+      end
+
+      def org_organization(node, xml, org)
+        organization(xml, org[:name], node, !node.attr("publisher"))
+        org_address(org, xml)
+        org_logo(xml, org[:logo])
+      end
+
+      def org_attrs_parse(node, opts)
+        source = opts[:source]&.detect { |s| node.attr(s) }
+        org_attrs_simple_parse(node, opts, source) ||
+          org_attrs_complex_parse(node, opts, source)
+      end
+
+      def org_attrs_simple_parse(node, opts, source)
+        !source and return org_attrs_simple_parse_no_source(node, opts)
+        orgs = csv_split(node.attr(source))
+        orgs.size > 1 and return orgs.map do |o|
+          { name: o, role: opts[:role], desc: opts[:desc] }
+        end
+        nil
+      end
+
+      def org_attrs_simple_parse_no_source(node, opts)
+        !opts[:default] && !opts[:name] and return []
+        [{ name: opts[:name] || opts[:default],
+           role: opts[:role], desc: opts[:desc] }
+          .compact.merge(extract_org_attrs_address(node, opts, ""))]
+      end
+
+      def org_attrs_complex_parse(node, opts, source)
+        i = 1
+        suffix = ""
+        ret = []
+        while node.attr(source + suffix)
+          ret << extract_org_attrs_complex(node, opts, source, suffix)
+          i += 1
+          suffix = "_#{i}"
+        end
+        ret
+      end
+
+      def extract_org_attrs_complex(node, opts, source, suffix)
+        { name: node.attr(source + suffix),
+          role: opts[:role], desc: opts[:desc],
+          logo: node.attr("#{source}_logo#{suffix}") }.compact
+          .merge(extract_org_attrs_address(node, opts, suffix))
+      end
+
+      def extract_org_attrs_address(node, opts, suffix)
+        %w(address phone fax email uri).each_with_object({}) do |a, m|
+          opts[:source]&.each do |s|
+            p = node.attr("#{s}-#{a}#{suffix}") and
+              m[a.to_sym] = p
+          end
+        end
+      end
+
+      def copyright_parse(node)
+        opt = { source: ["copyright-holder", "publisher", "pub"],
+                role: "publisher", default: default_publisher }
+        ret = org_attrs_parse(node, opt)
+        ret.empty? and ret = [{ name: "-" }]
+        ret
+      end
+
       def metadata_copyright(node, xml)
-        pub = node.attr("copyright-holder") || node.attr("publisher")
-        csv_split(pub || default_publisher || "-")&.each do |p|
+        copyright_parse(node).each do |p|
           xml.copyright do |c|
             c.from (node.attr("copyright-year") || Date.today.year)
-            p.match(/[A-Za-z]/).nil? or c.owner do |owner|
-              owner.organization do |a|
-                organization(a, p, true, node, !pub)
+            (p[:name].is_a?(String) && p[:name].match(/\p{L}/).nil?) or
+              c.owner do |owner|
+                owner.organization do |a|
+                  org_organization(node, a, p)
+                end
               end
-            end
           end
         end
       end

data/lib/metanorma/standoc/ref.rb

@@ -9,7 +9,7 @@ module Metanorma
           bib.contributor do |c|
             c.role type: "publisher"
             c.organization do |org|
-              organization(org, abbrev, true)
+              organization(org, abbrev, nil, true)
             end
           end
         end

data/lib/metanorma/standoc/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "2.6.3".freeze
+    VERSION = "2.7.1".freeze
   end
 end

data/metanorma-standoc.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "addressable", "~> 2.8.0"
   spec.add_dependency "asciidoctor", "~> 2.0.0"
   spec.add_dependency "iev", "~> 0.3.0"
-  spec.add_dependency "isodoc", "~> 2.7.0"
+  spec.add_dependency "isodoc", "~> 2.7.1"
   spec.add_dependency "metanorma", ">= 1.6.0"
   spec.add_dependency "metanorma-plugin-datastruct", "~> 0.2.0"
   spec.add_dependency "metanorma-plugin-glossarist", "~> 0.1.1"
@@ -41,7 +41,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.16.0"
+  spec.add_dependency "relaton-cli", "~> 1.17.0"
   spec.add_dependency "relaton-iev", "~> 1.1.5"
   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.6.3
+  version: 2.7.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-20 00:00:00.000000000 Z
+date: 2023-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 2.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 2.7.1
 - !ruby/object:Gem::Dependency
   name: metanorma
   requirement: !ruby/object:Gem::Requirement
@@ -184,14 +184,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.16.0
+        version: 1.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.16.0
+        version: 1.17.0
 - !ruby/object:Gem::Dependency
   name: relaton-iev
   requirement: !ruby/object:Gem::Requirement