metanorma-standoc 2.8.2 → 2.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2015e269893b92d91e3b1f7fabe93f706693d7a45da1719daac5b60e04f0011
-  data.tar.gz: 2ac72c8476a05968b34648c05eec685f8339dfbe711780ed7b1b7f646c94aa2e
+  metadata.gz: 76c0e218fd82abc53141b42753ee4cbc14956ee9ccc75f1e8115bf91ac6a0eb6
+  data.tar.gz: 532c96be450bb8f4a234ec5f6cd6c032d71fe89e20ad46e1f48195137b108c94
 SHA512:
-  metadata.gz: 1df98678c7d010abdbdc9c4ba754ca1892ce75c5d4aa7bb882642bca4e3b4df725c9b3ae01b208a0b0cfe77dbf23eec2d7742e5a402c574479170f1140ebc71b
-  data.tar.gz: 6340b42bc795cc70c3184a5d3b268c726dec16705f1396a6fc3d298c882eaf0b21d08f8bb0d982db30829518b24a6f09256361218d10b3ff8083ac00c1aadd68
+  metadata.gz: bab6d097fc885f64299d90ceed88dc475c951ff7c916f176e504aaca63336b69e62bb12c48059004fe757200a448a15fd4c798ffcd2e7f9b7c04444259431799
+  data.tar.gz: 6acb021a5f5348caa7c625db4d54a9a2af9e26e1720318cdd77a54c77bc0c734109c600d96a95d2a5a161bc5eb28f6db2336f06dee75bd896733fef8a600f1bf

data/lib/metanorma/standoc/biblio.rng

@@ -338,29 +338,32 @@
   </define>
   <define name="organization">
     <element name="organization">
-      <oneOrMore>
-        <ref name="orgname"/>
-      </oneOrMore>
-      <zeroOrMore>
-        <ref name="subdivision"/>
-      </zeroOrMore>
-      <optional>
-        <ref name="abbreviation"/>
-      </optional>
-      <zeroOrMore>
-        <ref name="uri"/>
-      </zeroOrMore>
-      <zeroOrMore>
-        <ref name="org-identifier"/>
-      </zeroOrMore>
-      <zeroOrMore>
-        <ref name="contact"/>
-      </zeroOrMore>
-      <optional>
-        <ref name="logo"/>
-      </optional>
+      <ref name="OrganizationType"/>
     </element>
   </define>
+  <define name="OrganizationType">
+    <oneOrMore>
+      <ref name="orgname"/>
+    </oneOrMore>
+    <zeroOrMore>
+      <ref name="subdivision"/>
+    </zeroOrMore>
+    <optional>
+      <ref name="abbreviation"/>
+    </optional>
+    <zeroOrMore>
+      <ref name="uri"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="org-identifier"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="contact"/>
+    </zeroOrMore>
+    <optional>
+      <ref name="logo"/>
+    </optional>
+  </define>
   <define name="orgname">
     <element name="name">
       <choice>
@@ -371,10 +374,10 @@
   </define>
   <define name="subdivision">
     <element name="subdivision">
-      <choice>
-        <ref name="LocalizedString"/>
-        <ref name="NameWithVariants"/>
-      </choice>
+      <optional>
+        <attribute name="type"/>
+      </optional>
+      <ref name="OrganizationType"/>
     </element>
   </define>
   <define name="logo">

data/lib/metanorma/standoc/cleanup_table.rb

@@ -22,8 +22,7 @@ module Metanorma
 
       def insert_thead(table)
         thead = table.at("./thead")
-        return thead unless thead.nil?
-
+        thead.nil? or return thead
         if tname = table.at("./name")
           thead = tname.add_next_sibling("<thead/>").first
           return thead
@@ -35,8 +34,7 @@ module Metanorma
         xmldoc.xpath("//table[@headerrows]").each do |s|
           thead = insert_thead(s)
           (thead.xpath("./tr").size...s["headerrows"].to_i).each do
-            row = s.at("./tbody/tr")
-            row.parent = thead
+            s.at("./tbody/tr").parent = thead
           end
           thead.xpath(".//td").each { |n| n.name = "th" }
           s.delete("headerrows")

data/lib/metanorma/standoc/converter.rb

@@ -21,6 +21,14 @@ module Metanorma
     # schema encapsulation of the document for validation
     class Converter
       Asciidoctor::Extensions.register do
+        preprocessor Metanorma::Plugin::Lutaml::LutamlPreprocessor
+        preprocessor Metanorma::Plugin::Lutaml::LutamlUmlAttributesTablePreprocessor
+        preprocessor Metanorma::Plugin::Lutaml::LutamlUmlDatamodelDescriptionPreprocessor
+        preprocessor Metanorma::Plugin::Lutaml::LutamlUmlClassPreprocessor
+        inline_macro Metanorma::Plugin::Lutaml::LutamlFigureInlineMacro
+        inline_macro Metanorma::Plugin::Lutaml::LutamlTableInlineMacro
+        block_macro Metanorma::Plugin::Lutaml::LutamlDiagramBlockMacro
+        block Metanorma::Plugin::Lutaml::LutamlDiagramBlock
         preprocessor Metanorma::Standoc::EmbedIncludeProcessor
         preprocessor Metanorma::Standoc::LinkProtectPreprocessor
         preprocessor Metanorma::Standoc::Datamodel::AttributesTablePreprocessor

data/lib/metanorma/standoc/datamodel/attributes_table_preprocessor.rb

@@ -14,8 +14,8 @@ module Metanorma
         #  read include derectives that goes after that in block and transform
         #  into yaml2text blocks
         def process(document, reader)
-          input_lines = reader.readlines.to_enum
-          Asciidoctor::Reader.new(processed_lines(document, input_lines))
+          input_lines = reader.lines.to_enum
+          Asciidoctor::PreprocessorReader.new(document, processed_lines(document, input_lines))
         end
 
         private

data/lib/metanorma/standoc/datamodel/diagram_preprocessor.rb

@@ -15,8 +15,8 @@ module Metanorma
         #  read include derectives that goes after that in block and transform
         #  into plantuml block
         def process(document, reader)
-          input_lines = reader.readlines.to_enum
-          Asciidoctor::Reader.new(processed_lines(document, input_lines))
+          input_lines = reader.lines.to_enum
+          Asciidoctor::PreprocessorReader.new(document, processed_lines(document, input_lines))
         end
 
         private

data/lib/metanorma/standoc/front_contributor.rb

@@ -88,6 +88,8 @@ module Metanorma
       def metadata_sponsor(node, xml)
         o = { source: ["sponsor"], role: "enabler" }
         org_contributor(node, xml, o)
+        o = { source: ["authorizer"], role: "authorizer" }
+        org_contributor(node, xml, o)
       end
 
       def copyright_parse(node)

data/lib/metanorma/standoc/front_organisation.rb

@@ -13,16 +13,48 @@ module Metanorma
         end
       end
 
-      def organization(org, orgname, node = nil, default_org = nil)
+      def organization(org, orgname, node = nil, default_org = nil, attrs = {})
         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 && (a = node&.attr("subdivision")) && !attrs[:subdiv] and
+          subdivision(a, node&.attr("subdivision-abbr"), org)
+        a = attrs[:subdiv] and subdivision(a, nil, org)
         abbr = org_abbrev[orgname]
-        default_org && b = node&.attr("subdivision-abbr") and abbr = b
         abbr and org.abbreviation abbr
       end
 
+      def subdivision(attr, abbr, org)
+        abbrs = csv_split(abbr) || []
+        subdivs = csv_split(attr, ";")
+        subdivs.size == abbrs.size or abbrs = []
+        subdivs.each_with_index do |s, i|
+          subdivision1(s, abbrs[i], org)
+        end
+      end
+
+      def subdivision1(attr, abbr, org)
+        m = csv_split(attr, ",").map do |s1|
+          t, v = s1.split(":", 2).map(&:strip)
+          if v.nil?
+            v = t
+            t = nil
+          end
+          { type: t, value: v }
+        end
+        abbr and m[0][:abbr] = abbr
+        subdiv_build(m, org)
+      end
+
+      def subdiv_build(list, org)
+        list.empty? and return
+        org.subdivision **attr_code(type: list[0][:type]) do |s|
+          s.name { |n| n << list[0][:value] }
+          subdiv_build(list[1..-1], s)
+          a = list[0][:abbr] and s.abbreviation { |n| n << a }
+        end
+      end
+
       def org_address(org, xml)
         p = org[:address] and xml.address do |ad|
           ad.formattedAddress do |f|
@@ -43,9 +75,8 @@ module Metanorma
         xml.name node.attr("affiliation#{suffix}")
         abbr = node.attr("affiliation_abbrev#{suffix}") and
           xml.abbreviation abbr
-        csv_split(node.attr("affiliation_subdiv#{suffix}"))&.each do |s|
-          xml.subdivision s
-        end
+        a = node.attr("affiliation_subdiv#{suffix}") and
+          subdivision(a, nil, xml)
         person_address(node, suffix, xml)
         person_org_logo(node, suffix, xml)
       end
@@ -108,7 +139,7 @@ module Metanorma
       end
 
       def org_organization(node, xml, org)
-        organization(xml, org[:name], node, !node.attr("publisher"))
+        organization(xml, org[:name], node, !node.attr("publisher"), org)
         org_address(org, xml)
         org_logo(xml, org[:logo])
       end
@@ -150,6 +181,7 @@ module Metanorma
       def extract_org_attrs_complex(node, opts, source, suffix)
         { name: node.attr(source + suffix),
           role: opts[:role], desc: opts[:desc],
+          subdiv: node.attr("#{source}_subdivision#{suffix}"),
           logo: node.attr("#{source}_logo#{suffix}") }.compact
           .merge(extract_org_attrs_address(node, opts, suffix))
       end

data/lib/metanorma/standoc/macros.rb

@@ -50,14 +50,14 @@ module Metanorma
     end
 
     class NamedEscapePreprocessor < Asciidoctor::Extensions::Preprocessor
-      def process(_document, reader)
+      def process(document, reader)
         c = HTMLEntities.new
-        lines = reader.readlines.map do |l|
-          l.split(/(&[A-Za-z][^;]*;)/).map do |s|
+        lines = reader.lines.map do |l|
+          l.split(/(&[A-Za-z][^&;]*;)/).map do |s|
             /^&[A-Za-z]/.match?(s) ? c.encode(c.decode(s), :hexadecimal) : s
           end.join
         end
-        ::Asciidoctor::Reader.new lines
+        ::Asciidoctor::PreprocessorReader.new document, lines
       end
     end
 
@@ -85,14 +85,14 @@ module Metanorma
           delimln: delimln }
       end
 
-      def process(_document, reader)
+      def process(document, reader)
         p = init
-        lines = reader.readlines.map do |t|
+        lines = reader.lines.map do |t|
           p = pass_status(p, t.rstrip)
           !p[:pass] && t.include?(":") and t = inlinelinkmacro(inlinelink(t))
           t
         end
-        ::Asciidoctor::Reader.new lines
+        ::Asciidoctor::PreprocessorReader.new document, lines
       end
 
       def pass_status(status, text)

data/lib/metanorma/standoc/macros_embed.rb

@@ -1,13 +1,22 @@
 require "pathname"
 
+module Asciidoctor
+  class PreprocessorNoIfdefsReader < PreprocessorReader
+    def preprocess_conditional_directive(keyword, target, delimiter, text)
+      false # decline to resolve idefs
+    end
+  end
+end
+
 module Metanorma
   module Standoc
     class EmbedIncludeProcessor < Asciidoctor::Extensions::Preprocessor
       def process(doc, reader)
         reader.eof? and return reader
-        lines = reader.readlines
+        r = ::Asciidoctor::PreprocessorNoIfdefsReader.new doc, reader.lines
+        lines = r.readlines
         headings = lines.grep(/^== /).map(&:strip)
-        ret = lines.each_with_object(embed_acc(doc, reader)) do |line, m|
+        ret = lines.each_with_object(embed_acc(doc, r)) do |line, m|
           process_line(line, m, headings)
         end
         return_to_document(doc, ret)
@@ -37,7 +46,8 @@ module Metanorma
         ret.reverse.each do |l|
           if l[:file]
             new = Pathname.new(l[:path]).relative_path_from(b).to_s
-            reader.push_include l[:lines], new, l[:path]
+            #reader.push_include l[:lines], new, l[:path]
+            reader.unshift_lines l[:lines]
           else reader.unshift_lines l[:lines]
           end
         end
@@ -120,8 +130,8 @@ module Metanorma
         lines = filter_sections(read(inc_path), headings)
         n = Asciidoctor::Document
           .new [], { safe: :safe, base_dir: File.dirname(inc_path) }
-        r = ::Asciidoctor::PreprocessorReader.new n, lines
-        ret = embed_acc(n, r).merge(strip_header(r.read_lines))
+        r = ::Asciidoctor::PreprocessorNoIfdefsReader.new n, lines
+        ret = embed_acc(n, r).merge(strip_header(r.readlines))
           .merge(file: fname, path: inc_path, orig: acc[:orig])
         ret[:hdr] or
           raise "Embedding an incomplete document with no header: #{ret[:path]}"

data/lib/metanorma/standoc/utils.rb

@@ -26,7 +26,8 @@ module Metanorma
       end
 
       def csv_split(text, delim = ";")
-        Metanorma::Utils::csv_split(text, delim)
+        Metanorma::Utils::csv_split(@c.decode(text), delim)
+          .map { |x| @c.encode(x, :basic, :hexadecimal) }
       end
 
       def wrap_in_para(node, out)
@@ -69,11 +70,11 @@ module Metanorma
       end
 
       def xml_encode(text)
-        @c.encode(text, :basic, :hexadecimal).
-          gsub("&amp;gt;", ">").gsub("&amp;lt;", "<").gsub("&amp;amp;", "&").
-          gsub("&gt;", ">").gsub("&lt;", "<").gsub("&amp;", "&").
-          gsub("&quot;", '"').gsub("&#xa;", "\n").gsub("&amp;#", "&#").
-          gsub("&apos;", "'")
+        @c.encode(text, :basic, :hexadecimal)
+          .gsub("&amp;gt;", ">").gsub("&amp;lt;", "<").gsub("&amp;amp;", "&")
+          .gsub("&gt;", ">").gsub("&lt;", "<").gsub("&amp;", "&")
+          .gsub("&quot;", '"').gsub("&#xa;", "\n").gsub("&amp;#", "&#")
+          .gsub("&apos;", "'")
       end
 
       # wrapped in <sections>

data/lib/metanorma/standoc/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "2.8.2".freeze
+    VERSION = "2.8.3".freeze
   end
 end

data/metanorma-standoc.gemspec

@@ -31,11 +31,11 @@ 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.8.3"
+  spec.add_dependency "isodoc", "~> 2.9.0"
   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"
-  spec.add_dependency "metanorma-plugin-lutaml"
+  spec.add_dependency "metanorma-plugin-datastruct", "~> 0.3.0"
+  spec.add_dependency "metanorma-plugin-glossarist", "~> 0.2.0"
+  spec.add_dependency "metanorma-plugin-lutaml", "~> 0.5.0"
   spec.add_dependency "ruby-jing"
   # relaton-cli not just relaton, to avoid circular reference in metanorma
   spec.add_dependency "asciimath2unitsml", "~> 0.4.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 2.8.2
+  version: 2.8.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-19 00:00:00.000000000 Z
+date: 2024-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.3
+        version: 2.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.3
+        version: 2.9.0
 - !ruby/object:Gem::Dependency
   name: metanorma
   requirement: !ruby/object:Gem::Requirement
@@ -86,42 +86,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: metanorma-plugin-glossarist
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: metanorma-plugin-lutaml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: ruby-jing
   requirement: !ruby/object:Gem::Requirement