metanorma-standoc 1.5.3 → 1.6.4

data/lib/asciidoctor/standoc/macros.rb

@@ -5,8 +5,8 @@ require "yaml"
 require_relative "./macros_plantuml.rb"
 require_relative "./datamodel/attributes_table_preprocessor.rb"
 require_relative "./datamodel/diagram_preprocessor.rb"
-require_relative "./yaml2_text_preprocessor.rb"
-require_relative "./json2_text_preprocessor.rb"
+require "metanorma-plugin-datastruct"
+require "metanorma-plugin-lutaml"
 
 module Asciidoctor
   module Standoc
@@ -187,5 +187,31 @@ module Asciidoctor
         %{<autonumber type=#{target}>#{out}</autonumber>}
       end
     end
+
+    class VariantInlineMacro < Extensions::InlineMacroProcessor
+      use_dsl
+      named :lang
+      parse_content_as :text
+
+      def process(parent, target, attrs)
+        /^(?<lang>[^-]*)(-(?<script>.*))?$/ =~ target
+        out = Asciidoctor::Inline.new(parent, :quoted, attrs["text"]).convert
+        script ?
+        %{<variant lang=#{lang} script=#{script}>#{out}</variant>} :
+        %{<variant lang=#{lang}>#{out}</variant>}
+      end
+    end
+
+    class FootnoteBlockInlineMacro < Asciidoctor::Extensions::InlineMacroProcessor
+      use_dsl
+      named :footnoteblock
+      parse_content_as :text
+      using_format :short
+
+      def process(parent, _target, attrs)
+        out = Asciidoctor::Inline.new(parent, :quoted, attrs["text"]).convert
+        %{<footnoteblock>#{out}</footnoteblock>}
+      end
+    end
   end
 end

data/lib/asciidoctor/standoc/ref.rb

@@ -42,8 +42,7 @@ module Asciidoctor
 
       def docid(t, code)
         type, code1 = /^\[\d+\]$|^\([^)]+\).*$/.match(code) ?
-          ["metanorma", mn_code(code)] :
-          @bibdb&.docid_type(code) || [nil, code]
+          ["metanorma", mn_code(code)] : @bibdb&.docid_type(code) || [nil, code]
         code1.sub!(/^nofetch\((.+)\)$/, "\\1")
         t.docidentifier **attr_code(type: type) do |d|
           d << code1
@@ -57,7 +56,9 @@ module Asciidoctor
       end
 
       def norm_year(yr)
-        /^\&\#821[12];$/.match(yr) ? "--" : yr
+        /^\&\#821[12];$/.match(yr) and return "--" 
+        /^\d\d\d\d-\d\d\d\d$/.match(yr) and return yr
+        yr&.sub(/(?<=[0-9])-.*$/, "")
       end
 
       def isorefrender1(t, m, yr, allp = "")
@@ -69,7 +70,8 @@ module Asciidoctor
 
       def isorefmatches(xml, m)
         yr = norm_year(m[:year])
-        ref = fetch_ref xml, m[:code], yr, title: m[:text], usrlbl: m[:usrlbl]
+        ref = fetch_ref xml, m[:code], yr, title: m[:text], usrlbl: m[:usrlbl],
+          lang: (@lang || :all)
         return use_my_anchor(ref, m[:anchor]) if ref
         xml.bibitem **attr_code(ref_attributes(m)) do |t|
           isorefrender1(t, m, yr)
@@ -82,15 +84,19 @@ module Asciidoctor
 
       def isorefmatches2(xml, m)
         ref = fetch_ref xml, m[:code], nil, no_year: true, note: m[:fn],
-          title: m[:text], usrlbl: m[:usrlbl]
+          title: m[:text], usrlbl: m[:usrlbl], lang: (@lang || :all)
         return use_my_anchor(ref, m[:anchor]) if ref
+        isorefmatches2_1(xml, m)
+      end
+
+      def isorefmatches2_1(xml, m)
         xml.bibitem **attr_code(ref_attributes(m)) do |t|
           isorefrender1(t, m, "--")
           t.date **{ type: "published" } do |d|
             d.on "--"
           end
           iso_publisher(t, m[:code])
-          m[:fn].nil? or t.note(**plaintxt.merge(type: "ISO DATE")) do |p|
+          m[:fn].nil? or t.note(**plaintxt.merge(type: "Unpublished-Status")) do |p|
             p << "#{m[:fn]}"
           end
         end
@@ -106,19 +112,21 @@ module Asciidoctor
 
       def isorefmatches3(xml, m)
         yr = norm_year(m[:year])
-        #hasyr =  m.names.include?("year") && yr != "--"
         hasyr = !yr.nil? && yr != "--"
-        #noyr =  m.names.include?("year") && yr == "--"
         ref = fetch_ref xml, m[:code], hasyr ? yr : nil, all_parts: true, 
-          no_year: yr == "--", text: m[:text], usrlbl: m[:usrlbl]
+          no_year: yr == "--", text: m[:text], usrlbl: m[:usrlbl],
+          lang: (@lang || :all)
         return use_my_anchor(ref, m[:anchor]) if ref
+        isorefmatches3_1(xml, m, yr, hasyr, ref)
+      end
 
+      def isorefmatches3_1(xml, m, yr, hasyr, ref)
         xml.bibitem(**attr_code(ref_attributes(m))) do |t|
           isorefrender1(t, m, yr, " (all parts)")
           conditional_date(t, m, yr == "--")
           iso_publisher(t, m[:code])
           m.names.include?("fn") && m[:fn] and
-            t.note(**plaintxt.merge(type: "ISO DATE")) { |p| p << "#{m[:fn]}" }
+            t.note(**plaintxt.merge(type: "Unpublished-Status")) { |p| p << "#{m[:fn]}" }
           t.extent **{ type: 'part' } do |e|
             e.referenceFrom "all"
           end
@@ -147,30 +155,25 @@ module Asciidoctor
       end
 
       MALFORMED_REF = "no anchor on reference, markup may be malformed: see "\
-        "https://www.metanorma.com/author/topics/document-format/bibliography/ , "\
-        "https://www.metanorma.com/author/iso/topics/markup/#bibliographies".freeze
+        "https://www.metanorma.com/author/topics/document-format/"\
+        "bibliography/ , https://www.metanorma.com/author/iso/topics/markup/"\
+        "#bibliographies".freeze
 
       def analyse_ref_nofetch(ret)
         return ret unless m = /^nofetch\((?<id>.+)\)$/.match(ret[:id])
-        ret[:id] = m[:id]
-        ret[:nofetch] = true
-        ret
+        ret.merge(id: m[:id], nofetch: true)
       end
 
       def analyse_ref_repo_path(ret)
         return ret unless m =
-          /^(?<type>repo|path):\((?<key>[^,]+),(?<id>.+)\)$/.match(ret[:id])
-        ret[:id] = m[:id]
-        ret[:type] = m[:type]
-        ret[:key] = m[:key]
-        ret[:nofetch] = true
-        ret
+          /^(?<type>repo|path):\((?<key>[^,]+),?(?<id>.*)\)$/.match(ret[:id])
+        id = m[:id].empty? ? m[:key].sub(%r{^[^/]+/}, "")  : m[:id]
+        ret.merge(id: id, type: m[:type], key: m[:key], nofetch: true)
       end
 
       def analyse_ref_numeric(ret)
         return ret unless /^\d+$/.match(ret[:id])
-        ret[:numeric] = true
-        ret
+        ret.merge(numeric: true)
       end
 
       # ref id = (usrlbl)code[:-]year
@@ -178,23 +181,22 @@ module Asciidoctor
       def analyse_ref_code(code)
         ret = {id: code}
         return ret if code.nil? || code.empty?
-        ret = analyse_ref_nofetch(ret)
-        ret = analyse_ref_repo_path(ret)
-        ret = analyse_ref_numeric(ret)
-        ret
+        analyse_ref_nofetch(analyse_ref_repo_path(analyse_ref_numeric(ret)))
       end
 
       # TODO: alternative where only title is available
       def refitem(xml, item, node)
-        unless m = NON_ISO_REF.match(item)
-          @log.add("AsciiDoc Input", node, "#{MALFORMED_REF}: #{item}")
-          return
-        end
+        m = NON_ISO_REF.match(item) and return refitem1(xml, item, m)
+        @log.add("AsciiDoc Input", node, "#{MALFORMED_REF}: #{item}")
+        nil
+      end
+
+      def refitem1(xml, item, m)
         code = analyse_ref_code(m[:code])
         unless code[:id] && code[:numeric] || code[:nofetch]
           ref = fetch_ref xml, code[:id],
             m.names.include?("year") ? m[:year] : nil, title: m[:text],
-            usrlbl: m[:usrlbl]
+            usrlbl: m[:usrlbl], lang: (@lang || :all)
           return use_my_anchor(ref, m[:anchor]) if ref
         end
         refitem_render(xml, m, code)
@@ -214,23 +216,25 @@ module Asciidoctor
         (?<text>.*)$}xm
 
         ISO_REF_NO_YEAR = %r{^<ref\sid="(?<anchor>[^"]+)">
-      \[(?<usrlbl>\([^)]+\))?(?<code>(ISO|IEC)[^0-9]*\s[0-9-]+):(--|\&\#821[12]\;)\]</ref>,?\s*
+      \[(?<usrlbl>\([^)]+\))?(?<code>(ISO|IEC)[^0-9]*\s[0-9-]+):
+      (--|\&\#821[12]\;)\]</ref>,?\s*
         (<fn[^>]*>\s*<p>(?<fn>[^\]]+)</p>\s*</fn>)?,?\s?(?<text>.*)$}xm
 
         ISO_REF_ALL_PARTS = %r{^<ref\sid="(?<anchor>[^"]+)">
-        \[(?<usrlbl>\([^)]+\))?(?<code>(ISO|IEC)[^0-9]*\s[0-9]+)(:(?<year>--|\&\#821[12]\;|[0-9][0-9-]+))?\s
+        \[(?<usrlbl>\([^)]+\))?(?<code>(ISO|IEC)[^0-9]*\s[0-9]+)
+        (:(?<year>--|\&\#821[12]\;|[0-9][0-9-]+))?\s
         \(all\sparts\)\]</ref>,?\s*
           (<fn[^>]*>\s*<p>(?<fn>[^\]]+)</p>\s*</fn>,?\s?)?(?<text>.*)$}xm
 
           NON_ISO_REF = %r{^<ref\sid="(?<anchor>[^"]+)">
-        \[(?<usrlbl>\([^)]+\))?(?<code>[^\]]+?)([:-](?<year>(19|20)[0-9][0-9]))?\]</ref>,?\s*
-          (?<text>.*)$}xm
-
-          def reference1_matches(item)
-            matched = ISO_REF.match item
-            matched2 = ISO_REF_NO_YEAR.match item
-            matched3 = ISO_REF_ALL_PARTS.match item
-            [matched, matched2, matched3]
+        \[(?<usrlbl>\([^)]+\))?(?<code>[^\]]+?)
+        ([:-](?<year>(19|20)[0-9][0-9][0-9-]*))?\]</ref>,?\s*(?<text>.*)$}xm
+
+        def reference1_matches(item)
+          matched = ISO_REF.match item
+          matched2 = ISO_REF_NO_YEAR.match item
+          matched3 = ISO_REF_ALL_PARTS.match item
+          [matched, matched2, matched3]
         end
 
         def reference1(node, item, xml)
@@ -243,12 +247,6 @@ module Asciidoctor
           end
         end
 
-        def reference(node)
-          noko do |xml|
-            node.items.each { |item| reference1(node, item.text, xml) }
-          end.join
-        end
-
         def mn_code(code)
           code.sub(/^\(/, "[").sub(/\).*$/, "]").sub(/^nofetch\((.+)\)$/, "\\1")
         end

data/lib/asciidoctor/standoc/ref_sect.rb

@@ -9,14 +9,20 @@ module Asciidoctor
         @norm_ref
       end
 
+      def reference(node)
+          noko do |xml|
+            node.items.each { |item| reference1(node, item.text, xml) }
+          end.join
+        end
+
       def bibliography_parse(attrs, xml, node)
         node.option? "bibitem" and return bibitem_parse(attrs, xml, node)
         node.attr("style") == "bibliography" or
           @log.add("AsciiDoc Input", node, "Section not marked up as [bibliography]!")
         @biblio = true
         xml.references **attr_code(attrs.merge(normative: false)) do |xml_section|
-          title = node.level == 1 ? "Bibliography" : node.title
-          xml_section.title { |t| t << title }
+          #title = node.level == 1 ? "Bibliography" : node.title
+          xml_section.title { |t| t << node.title }
           xml_section << node.content
         end
         @biblio = false
@@ -38,7 +44,8 @@ module Asciidoctor
           @log.add("AsciiDoc Input", node, "Section not marked up as [bibliography]!")
         @norm_ref = true
         xml.references **attr_code(attrs.merge(normative: true)) do |xml_section|
-          xml_section.title { |t| t << "Normative References" }
+          #xml_section.title { |t| t << "Normative References" }
+          xml_section.title { |t| t << node.title }
           xml_section << node.content
         end
         @norm_ref = false
@@ -58,10 +65,10 @@ module Asciidoctor
       def fetch_ref(xml, code, year, **opts)
         return nil if opts[:no_year]
         code = code.sub(/^\([^)]+\)/, "")
+        #require "byebug"; byebug if opts[:lang] == "fr"
         hit = @bibdb&.fetch(code, year, opts)
         return nil if hit.nil?
-        xml.parent.add_child(smart_render_xml(hit, code, opts[:title],
-                                              opts[:usrlbl]))
+        xml.parent.add_child(smart_render_xml(hit, code, opts))
         xml
       rescue RelatonBib::RequestError
         @log.add("Bibliography", nil, "Could not retrieve #{code}: "\
@@ -84,10 +91,11 @@ module Asciidoctor
           "<docidentifier type='metanorma'>#{mn_code(usrlbl)}</docidentifier>"
       end
 
-      def smart_render_xml(x, code, title, usrlbl)
-        xstr = x.to_xml if x.respond_to? :to_xml
+      def smart_render_xml(x, code, opts)
+        x.respond_to? :to_xml or return nil
+        xstr = x.to_xml(lang: opts[:lang])
         xml = Nokogiri::XML(xstr)
-        emend_biblio(xml, code, title, usrlbl)
+        emend_biblio(xml, code, opts[:title], opts[:usrlbl])
         xml.xpath("//date").each { |d| Utils::endash_date(d) }
         xml.traverse do |n|
           n.text? and n.replace(Utils::smartformat(n.text))

data/lib/asciidoctor/standoc/section.rb

@@ -60,8 +60,7 @@ module Asciidoctor
         ret.merge(change: node.attributes["change"],
                   path: node.attributes["path"],
                   path_end: node.attributes["path_end"],
-                  title: node.attributes["title"],
-        )
+                  title: node.attributes["title"])
       end
 
       def section(node)
@@ -105,13 +104,10 @@ module Asciidoctor
       end
 
       def set_obligation(attrs, node)
-        attrs[:obligation] = if node.attributes.has_key?("obligation")
-                               node.attr("obligation")
-                             elsif node.parent.attributes.has_key?("obligation")
-                               node.parent.attr("obligation")
-                             else
-                               "normative"
-                             end
+        attrs[:obligation] = node.attributes.has_key?("obligation") ?
+                               node.attr("obligation") :
+                             node.parent.attributes.has_key?("obligation") ?
+                               node.parent.attr("obligation") : "normative"
       end
 
       def preamble(node)

data/lib/liquid/custom_blocks/with_json_nested_context.rb

@@ -0,0 +1,18 @@
+module Liquid
+  module CustomBlocks
+    class WithJsonNestedContext < Block
+      def initialize(tag_name, markup, tokens)
+        super
+        @context_file_variable, @context_name = markup.split(",").map(&:strip)
+      end
+
+      def render(context)
+        context_file = context[@context_file_variable].to_s.strip
+        context[@context_name] = JSON.parse(
+          File.read(context_file, encoding: "utf-8")
+        )
+        super
+      end
+    end
+  end
+end

data/lib/liquid/custom_blocks/with_yaml_nested_context.rb

@@ -0,0 +1,19 @@
+module Liquid
+  module CustomBlocks
+    class WithYamlNestedContext < Block
+      def initialize(tag_name, markup, tokens)
+        super
+        @context_file_variable, @context_name = markup.split(",").map(&:strip)
+      end
+
+      def render(context)
+        context_file = context[@context_file_variable].to_s.strip
+        context[@context_name] = YAML.safe_load(
+          File.read(context_file, encoding: "utf-8"),
+          [Date, Time]
+        )
+        super
+      end
+    end
+  end
+end

data/lib/metanorma/standoc.rb

@@ -1,11 +1,6 @@
 require_relative "./standoc/processor"
-require_relative "./standoc/requirement"
-require_relative "./standoc/latexml_requirement"
 
 module Metanorma
   module Standoc
-    Requirements = {
-      latexml: LatexmlRequirement.new
-    }
   end
 end

data/lib/metanorma/standoc/version.rb

@@ -1,5 +1,24 @@
 module Metanorma
+  class << self
+    # https://stackoverflow.com/a/53399471
+    def parent_of(mod)
+      parent_name = mod.name =~ /::[^:]+\Z/ ? $`.freeze : nil
+      Object.const_get(parent_name) if parent_name
+    end
+
+    def all_modules(mod)
+      [mod] + mod.constants.map { |c| mod.const_get(c) }
+        .select {|c| c.is_a?(Module) && parent_of(c) == mod }
+        .flat_map {|m| all_modules(m) }
+    end
+
+    def versioned(mod, flavour)
+      all_modules(mod).select {|c| defined? c::VERSION}.
+        select {|c| c.name =~ /::#{flavour}$/ }
+    end
+  end
+
   module Standoc
-   VERSION = "1.5.3".freeze
+    VERSION = "1.6.4".freeze
   end
 end

data/metanorma-standoc.gemspec

@@ -28,16 +28,20 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "asciidoctor", "~> 2.0.0"
   spec.add_dependency "ruby-jing"
-  spec.add_dependency "isodoc", "~> 1.2.0"
+  spec.add_dependency "isodoc", "~> 1.3.0"
   spec.add_dependency "iev", "~> 0.2.1"
-  spec.add_dependency "relaton", "~> 1.3.0"
-  spec.add_dependency "relaton-iev", "~> 1.0.0"
+  spec.add_dependency "metanorma-plugin-datastruct"
+  spec.add_dependency "metanorma-plugin-lutaml", "~> 0.2.1"
+  # relaton-cli not just relaton, to avoid circular reference in metanorma
+  spec.add_dependency "relaton-cli", "~> 1.7.0"
+  spec.add_dependency "relaton-iev", "~> 1.1.0"
   spec.add_dependency "sterile", "~> 1.0.14"
   spec.add_dependency "concurrent-ruby"
   spec.add_dependency "unicode2latex", "~> 0.0.1"
   spec.add_dependency "mimemagic"
   spec.add_dependency "mathml2asciimath"
   spec.add_dependency "latexmath"
+  spec.add_dependency "fontist", "~> 1.5.0"
 
   spec.add_development_dependency "byebug"
   spec.add_development_dependency "sassc", "2.4.0"

data/spec/asciidoctor-standoc/base_spec.rb

@@ -32,8 +32,101 @@ RSpec.describe Asciidoctor::Standoc do
     expect(File.exist?("htmlstyle.css")).to be false
   end
 
+    it "processes publisher abbreviations" do
+    mock_org_abbrevs
+    expect(xmlpp(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+      = Document title
+      Author
+      :docfile: test.adoc
+      :nodoc:
+      :novalid:
+      :publisher: International Electrotechnical Commission,IETF,ISO
+INPUT
+<standard-document xmlns='https://www.metanorma.org/ns/standoc' type='semantic' version='#{Metanorma::Standoc::VERSION}'>
+  <bibdata type='standard'>
+    <title language='en' format='text/plain'>Document title</title>
+    <contributor>
+      <role type='author'/>
+      <organization>
+        <name>International Electrotechnical Commission</name>
+        <abbreviation>IEC</abbreviation>
+      </organization>
+    </contributor>
+    <contributor>
+      <role type='author'/>
+      <organization>
+        <name>IETF</name>
+      </organization>
+    </contributor>
+    <contributor>
+      <role type='author'/>
+      <organization>
+        <name>International Standards Organization</name>
+        <abbreviation>ISO</abbreviation>
+      </organization>
+    </contributor>
+    <contributor>
+      <role type='publisher'/>
+      <organization>
+        <name>International Electrotechnical Commission</name>
+        <abbreviation>IEC</abbreviation>
+      </organization>
+    </contributor>
+    <contributor>
+      <role type='publisher'/>
+      <organization>
+        <name>IETF</name>
+      </organization>
+    </contributor>
+    <contributor>
+      <role type='publisher'/>
+      <organization>
+        <name>International Standards Organization</name>
+        <abbreviation>ISO</abbreviation>
+      </organization>
+    </contributor>
+    <language>en</language>
+    <script>Latn</script>
+    <status>
+      <stage>published</stage>
+    </status>
+    <copyright>
+      <from>2020</from>
+      <owner>
+        <organization>
+          <name>International Electrotechnical Commission</name>
+          <abbreviation>IEC</abbreviation>
+        </organization>
+      </owner>
+    </copyright>
+    <copyright>
+      <from>2020</from>
+      <owner>
+        <organization>
+          <name>IETF</name>
+        </organization>
+      </owner>
+    </copyright>
+    <copyright>
+      <from>2020</from>
+      <owner>
+        <organization>
+          <name>International Standards Organization</name>
+          <abbreviation>ISO</abbreviation>
+        </organization>
+      </owner>
+    </copyright>
+    <ext>
+      <doctype>article</doctype>
+    </ext>
+  </bibdata>
+  <sections> </sections>
+</standard-document>
+OUTPUT
+  end
+
   it "processes default metadata" do
-    expect(xmlpp(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true))).to be_equivalent_to xmlpp(<<~'OUTPUT')
+    expect(xmlpp(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
       = Document title
       Author
       :docfile: test.adoc
@@ -98,7 +191,8 @@ RSpec.describe Asciidoctor::Standoc do
       :role_2: editor
       :affiliation_2: Rockhead and Quarry Cave Construction Company
       :affiliation_abbrev_2: RQCCC
-      :address_2: 6A Rubble Way, Bedrock
+      :address_2: 6A Rubble Way, + \\
+      Bedrock
       :email_2: barney@rockhead.example.com
       :phone_2: 789
       :fax_2: 012
@@ -107,12 +201,22 @@ RSpec.describe Asciidoctor::Standoc do
       :part-of: ABC
       :translated-from: DEF,GHI;JKL MNO,PQR
       :keywords: a, b, c
+      :pub-address: 1 Infinity Loop + \\
+      California
+      :pub-phone: 3333333
+      :pub-fax: 4444444
+      :pub-email: x@example.com
+      :pub-uri: http://www.example.com
+      :isbn: ISBN-13
+      :isbn10: ISBN-10
     INPUT
     <?xml version="1.0" encoding="UTF-8"?>
-<standard-document xmlns="https://www.metanorma.org/ns/standoc">
+<standard-document xmlns="https://www.metanorma.org/ns/standoc" type="semantic" version="#{Metanorma::Standoc::VERSION}">
 <bibdata type="standard">
 <title language="en" format="text/plain">Main Title — Title</title>
   <docidentifier>1000-1</docidentifier>
+  <docidentifier type='ISBN'>ISBN-13</docidentifier>
+<docidentifier type='ISBN10'>ISBN-10</docidentifier>
   <docnumber>1000</docnumber>
   <date type="published">
   <on>1000-01-01</on>
@@ -159,19 +263,19 @@ RSpec.describe Asciidoctor::Standoc do
 <contributor>
   <role type="author"/>
   <organization>
-    <name>Ribose, Inc.</name>
+    <name>Hanna Barbera</name>
   </organization>
 </contributor>
 <contributor>
   <role type="author"/>
   <organization>
-    <name>Hanna Barbera</name>
+    <name>Cartoon Network</name>
   </organization>
 </contributor>
 <contributor>
   <role type="author"/>
   <organization>
-    <name>Cartoon Network</name>
+    <name>Ribose, Inc.</name>
   </organization>
 </contributor>
 <contributor>
@@ -185,7 +289,9 @@ RSpec.describe Asciidoctor::Standoc do
      <name>Slate Rock and Gravel Company</name>
      <abbreviation>SRG</abbreviation>
   <address>
-    <formattedAddress>6 Rubble Way, Bedrock</formattedAddress>
+  <formattedAddress>
+  6 Rubble Way, Bedrock
+</formattedAddress>
   </address>
    </organization>
    </affiliation>
@@ -207,7 +313,7 @@ RSpec.describe Asciidoctor::Standoc do
     <name>Rockhead and Quarry Cave Construction Company</name>
     <abbreviation>RQCCC</abbreviation>
   <address>
-    <formattedAddress>6A Rubble Way, Bedrock</formattedAddress>
+    <formattedAddress>6A Rubble Way, <br/>Bedrock</formattedAddress>
   </address>
   </organization>
 </affiliation>
@@ -328,6 +434,8 @@ RSpec.describe Asciidoctor::Standoc do
       :relaton-uri: F
       :title-eo: Dokumenttitolo
       :doctype: This is a DocType
+      :subdivision: Subdivision
+      :subdivision-abbr: SD
 
       [abstract]
       == Abstract
@@ -339,7 +447,7 @@ RSpec.describe Asciidoctor::Standoc do
       == Clause 1
     INPUT
            <?xml version="1.0" encoding="UTF-8"?>
-       <standard-document xmlns="https://www.metanorma.org/ns/standoc">
+       <standard-document xmlns="https://www.metanorma.org/ns/standoc"  type="semantic" version="#{Metanorma::Standoc::VERSION}">
        <bibdata type="standard">
          <title language="en" format="text/plain">Document title</title>
          <title language="eo" format="text/plain">Dokumenttitolo</title>
@@ -442,6 +550,105 @@ RSpec.describe Asciidoctor::Standoc do
     OUTPUT
   end
 
+   it "processes subdivisions" do
+     mock_default_publisher
+    expect(xmlpp(strip_guid(Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+      = Document title
+      Author
+      :docfile: test.adoc
+      :nodoc:
+      :novalid:
+      :revdate: 2000-01
+      :published-date: 1000-01
+      :docnumber: 1000
+      :partnumber: 1-1
+      :tc-docnumber: 2000
+      :language: el
+      :script: Grek
+      :subdivision: Subdivision
+      :subdivision-abbr: SD
+      :doctype: This is a DocType
+      :pub-address: 1 Infinity Loop + \\
+      California
+      :pub-phone: 3333333
+      :pub-fax: 4444444
+      :pub-email: x@example.com
+      :pub-uri: http://www.example.com
+
+    INPUT
+       <standard-document xmlns="https://www.metanorma.org/ns/standoc"  type="semantic" version="#{Metanorma::Standoc::VERSION}">
+  <bibdata type='standard'>
+    <title language='en' format='text/plain'>Document title</title>
+    <docidentifier>1000-1-1</docidentifier>
+    <docnumber>1000</docnumber>
+    <date type='published'>
+      <on>1000-01</on>
+    </date>
+    <contributor>
+      <role type='author'/>
+      <organization>
+        <name>International Standards Organization</name>
+        <subdivision>Subdivision</subdivision>
+        <abbreviation>SD</abbreviation>
+        <address>
+  <formattedAddress>1 Infinity Loop <br/>California</formattedAddress>
+</address>
+<phone>3333333</phone>
+<phone type='fax'>4444444</phone>
+<email>x@example.com</email>
+<uri>http://www.example.com</uri>
+      </organization>
+    </contributor>
+    <contributor>
+      <role type='publisher'/>
+      <organization>
+        <name>International Standards Organization</name>
+        <subdivision>Subdivision</subdivision>
+        <abbreviation>SD</abbreviation>
+        <address>
+  <formattedAddress>1 Infinity Loop <br/>California</formattedAddress>
+</address>
+<phone>3333333</phone>
+<phone type='fax'>4444444</phone>
+<email>x@example.com</email>
+<uri>http://www.example.com</uri>
+      </organization>
+    </contributor>
+    <version>
+      <revision-date>2000-01</revision-date>
+    </version>
+    <language>el</language>
+    <script>Grek</script>
+    <status>
+      <stage>published</stage>
+    </status>
+    <copyright>
+      <from>2020</from>
+      <owner>
+        <organization>
+          <name>International Standards Organization</name>
+          <subdivision>Subdivision</subdivision>
+          <abbreviation>SD</abbreviation>
+        <address>
+  <formattedAddress>1 Infinity Loop <br/>California</formattedAddress>
+</address>
+<phone>3333333</phone>
+<phone type='fax'>4444444</phone>
+<email>x@example.com</email>
+<uri>http://www.example.com</uri>
+        </organization>
+      </owner>
+    </copyright>
+    <ext>
+      <doctype>this-is-a-doctype</doctype>
+    </ext>
+  </bibdata>
+  <sections> </sections>
+</standard-document>
+        
+OUTPUT
+   end
+
   it "reads scripts into blank HTML document" do
     FileUtils.rm_f "test.html"
     Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)
@@ -526,6 +733,36 @@ QU1FOiB0ZXN0Cgo=
 ])
   end
 
+  it "test submitting-organizations with delimiter in end" do
+    FileUtils.rm_f "test.doc"
+    Asciidoctor.convert(<<~"INPUT", backend: :standoc, header_footer: true)
+      = Document title
+      Author
+      :docfile: test.adoc
+      :doctype: standard
+      :encoding: utf-8
+      :lang: en
+      :submitting-organizations: Organization One; Organization Two;
+      :publisher: "Hanna Barbera", "Cartoon Network", "Ribose, Inc.",
+    INPUT
+    expect(File.exist?("test.doc")).to be true
+  end
+
+  private
+
+  def mock_org_abbrevs
+    allow_any_instance_of(::Asciidoctor::Standoc::Front).to receive(:org_abbrev).and_return(
+      { "International Standards Organization" => "ISO",
+        "International Electrotechnical Commission" => "IEC" }
+    )
+  end
+
+   def mock_default_publisher 
+    allow_any_instance_of(::Asciidoctor::Standoc::Front).to receive(:default_publisher).and_return(
+        "International Standards Organization"
+    )
+  end
+ 
 
 end