metanorma-standoc 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a619338025bf24d56d382fde0bfcd3d7c5f2e5ecf5520d995d8c7d4986cb67d
-  data.tar.gz: 1f8c10a80a5ada1b94c6216568eb11851fd081c9ae63bae2d8b9e3e080673b17
+  metadata.gz: 11adce8b2fe42f3e2b4db51088b5818f5cff207a62cc19e33b27cf5a53160c47
+  data.tar.gz: 17967efeb1bc5c518a9498ec8329d7ae0fb6c77cb19bb911527aa15efd2f0881
 SHA512:
-  metadata.gz: 5d9fea4687d265c36099b30faa69893c10ec011e7d1a8b7e32b4e0df4ef9d892e5efe90bb8bd0767f51f3ec74f91b05dc3613532eeff247f1a2039b6094f15dc
-  data.tar.gz: 2ccb181da62a4ca659c2f3915ffdbebbc88b501c97938244d65d780b241e05bd2f61870ac32cc8a3cef739ac7a36b8c714f2cc5027d9269e78c7e6f6bcabb12c
+  metadata.gz: 6bef6b7fb5db91fd23d039a2e01d69685ba049b3ef34ebb2c4eaafa2e144b54c6c948b1c0a91796b700c2c18494c048d79d71b21fe58e1437f994a296d950785
+  data.tar.gz: 6c4d35c69f213280a58dd8b5e53da18c4947cc5de3210397f35f19726dbcceb2a3ea4f26066f86ee2fca2e0d0a37d9941e6cb092a7625d557dfba25eb4367812

data/lib/asciidoctor/standoc/cleanup_footnotes.rb

@@ -72,7 +72,18 @@ module Asciidoctor
         end
       end
 
+      def title_footnote_move(xmldoc)
+        ins = xmldoc.at("//bibdata/language")
+        xmldoc.xpath("//bibdata/title//fn").each do |f|
+          f.name = "note"
+          f["type"] = "title-footnote"
+          f.delete("reference")
+          ins.previous = f.remove
+        end
+      end
+
       def footnote_cleanup(xmldoc)
+        title_footnote_move(xmldoc)
         table_footnote_renumber(xmldoc)
         other_footnote_renumber(xmldoc)
         xmldoc.xpath("//fn").each do |fn|

data/lib/asciidoctor/standoc/cleanup_ref.rb

@@ -126,7 +126,7 @@ module Asciidoctor
           bibitemxml = RelatonBib::BibliographicItem.new(
             RelatonBib::HashConverter::hash_to_bib(bib)).to_xml or next
           bibitem = Nokogiri::XML(bibitemxml)
-          bibitem["id"] = c["id"] if c["id"]
+          bibitem.root["id"] = c["id"] if c["id"] && !/^_/.match(c["id"])
           c.replace(bibitem.root)
         end
       end

data/lib/asciidoctor/standoc/converter.rb

@@ -23,8 +23,8 @@ module Asciidoctor
       Asciidoctor::Extensions.register do
         preprocessor Asciidoctor::Standoc::Datamodel::AttributesTablePreprocessor
         preprocessor Asciidoctor::Standoc::Datamodel::DiagramPreprocessor
-        preprocessor Asciidoctor::Standoc::Yaml2TextPreprocessor
-        preprocessor Asciidoctor::Standoc::Json2TextPreprocessor
+        preprocessor Metanorma::Plugin::Datastruct::Json2TextPreprocessor
+        preprocessor Metanorma::Plugin::Datastruct::Yaml2TextPreprocessor
         inline_macro Asciidoctor::Standoc::AltTermInlineMacro
         inline_macro Asciidoctor::Standoc::DeprecatedTermInlineMacro
         inline_macro Asciidoctor::Standoc::DomainTermInlineMacro

data/lib/asciidoctor/standoc/front.rb

@@ -27,7 +27,7 @@ module Asciidoctor
 
       def metadata_status(node, xml)
         xml.status do |s|
-          s.stage ( node.attr("status") || node.attr("docstage") || "published" )
+          s.stage (node.attr("status") || node.attr("docstage") || "published")
           node.attr("docsubstage") and s.substage node.attr("docsubstage")
           node.attr("iteration") and s.iteration node.attr("iteration")
         end
@@ -180,8 +180,8 @@ module Asciidoctor
         ["en"].each do |lang|
           at = { language: lang, format: "text/plain" }
           xml.title **attr_code(at) do |t|
-            t << (Utils::asciidoc_sub(node.attr("title") || node.attr("title-en")) ||
-                  node.title)
+            t << (Utils::asciidoc_sub(node.attr("title") ||
+                                      node.attr("title-en")) || node.title)
           end
         end
       end

data/lib/asciidoctor/standoc/front_contributor.rb

@@ -21,11 +21,27 @@ module Asciidoctor
         end
       end
 
-      def organization(org, orgname)
+      def organization(org, orgname, node = nil, default_org = nil)
         abbrevs = org_abbrev
         n = abbrevs.invert[orgname] and orgname = n
         org.name orgname
-        a = org_abbrev[orgname] and org.abbreviation 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
+        abbr and org.abbreviation abbr
+        default_org and org_address(node, org)
+      end
+
+      def org_address(node, p)
+        node.attr("pub-address") and p.address do |ad|
+          ad.formattedAddress do |f|
+            f << node.attr("pub-address").gsub(/ \+\n/, "<br/>")
+          end
+        end
+        node.attr("pub-phone") and p.phone node.attr("pub-phone")
+        node.attr("pub-fax") and p.phone node.attr("pub-fax"), **{type: "fax"}
+        node.attr("pub-email") and p.email node.attr("pub-email")
+        node.attr("pub-uri") and p.uri node.attr("pub-uri")
       end
 
       # , " => ," : CSV definition does not deal with space followed by quote
@@ -37,10 +53,13 @@ module Asciidoctor
       end
 
       def metadata_author(node, xml)
-        csv_split(node.attr("publisher") || default_publisher || "")&.each do |p|
+        csv_split(node.attr("publisher") || default_publisher || "")&.
+          each do |p|
           xml.contributor do |c|
             c.role **{ type: "author" }
-            c.organization { |a| organization(a, p) }
+            c.organization do |a|
+              organization(a, p, node, !node.attr("publisher"))  
+            end
           end
         end
         personal_author(node, xml)
@@ -99,7 +118,9 @@ module Asciidoctor
             abbr = node.attr("affiliation_abbrev#{suffix}") and
               o.abbreviation abbr
             node.attr("address#{suffix}") and o.address do |ad|
-              ad.formattedAddress node.attr("address#{suffix}")
+              ad.formattedAddress do |f|
+                f << node.attr("address#{suffix}").gsub(/ \+\n/, "<br/>")
+              end
             end
           end
         end
@@ -118,19 +139,22 @@ module Asciidoctor
         csv_split(publishers)&.each do |p|
           xml.contributor do |c|
             c.role **{ type: "publisher" }
-            c.organization { |a| organization(a, p) }
+            c.organization do |a|
+              organization(a, p, node, !node.attr("publisher"))
+            end
           end
         end
       end
 
       def metadata_copyright(node, xml)
-        publishers = node.attr("copyright-holder") || node.attr("publisher") || 
-          default_publisher || "-"
-        csv_split(publishers)&.each do |p|
+        pub = node.attr("copyright-holder") || node.attr("publisher")
+        csv_split(pub || default_publisher || "-")&.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 { |o| organization(o, p) }
+              owner.organization do |a|
+                organization(a, p, node, !pub)
+              end
             end
           end
         end

data/lib/asciidoctor/standoc/isodoc.rng

@@ -42,7 +42,6 @@
     </define>
     <define name="xref">
       <element name="xref">
-        <!-- attribute target { xsd:IDREF }, -->
         <attribute name="target">
           <data type="string">
             <param name="pattern">\i\c*|\c+#\c+</param>

data/lib/asciidoctor/standoc/macros.rb

@@ -5,8 +5,7 @@ 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"
 
 module Asciidoctor
   module Standoc

data/lib/asciidoctor/standoc/ref.rb

@@ -68,7 +68,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)
@@ -81,7 +82,7 @@ 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
@@ -111,7 +112,8 @@ module Asciidoctor
         yr = norm_year(m[:year])
         hasyr = !yr.nil? && 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
@@ -181,11 +183,9 @@ module Asciidoctor
 
       # 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
-        refitem1(xml, item, m)
+        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)
@@ -193,7 +193,7 @@ module Asciidoctor
         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)
@@ -244,12 +244,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,6 +9,12 @@ 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
@@ -58,10 +64,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 +90,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/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "1.6.0".freeze
+    VERSION = "1.6.1".freeze
   end
 end

data/metanorma-standoc.gemspec

@@ -30,8 +30,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency "ruby-jing"
   spec.add_dependency "isodoc", "~> 1.2.0"
   spec.add_dependency "iev", "~> 0.2.1"
+  spec.add_dependency "metanorma-plugin-datastruct"
   # relaton-cli not just relaton, to avoid circular reference in metanorma
-  spec.add_dependency "relaton-cli", "~> 1.4.0"
+  spec.add_dependency "relaton-cli", "~> 1.5.0"
   spec.add_dependency "relaton-iev", "~> 1.0.0"
   spec.add_dependency "sterile", "~> 1.0.14"
   spec.add_dependency "concurrent-ruby"

data/spec/asciidoctor-standoc/base_spec.rb

@@ -34,7 +34,7 @@ RSpec.describe Asciidoctor::Standoc do
 
     it "processes publisher abbreviations" do
     mock_org_abbrevs
-    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
@@ -42,7 +42,7 @@ RSpec.describe Asciidoctor::Standoc do
       :novalid:
       :publisher: International Electrotechnical Commission,IETF,ISO
 INPUT
-<standard-document xmlns='https://www.metanorma.org/ns/standoc' type='semantic' version='1.5.3'>
+<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>
@@ -191,7 +191,8 @@ OUTPUT
       :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
@@ -200,6 +201,12 @@ OUTPUT
       :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
     INPUT
     <?xml version="1.0" encoding="UTF-8"?>
 <standard-document xmlns="https://www.metanorma.org/ns/standoc" type="semantic" version="#{Metanorma::Standoc::VERSION}">
@@ -252,19 +259,19 @@ OUTPUT
 <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>
@@ -278,7 +285,9 @@ OUTPUT
      <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>
@@ -300,7 +309,7 @@ OUTPUT
     <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>
@@ -421,6 +430,8 @@ OUTPUT
       :relaton-uri: F
       :title-eo: Dokumenttitolo
       :doctype: This is a DocType
+      :subdivision: Subdivision
+      :subdivision-abbr: SD
 
       [abstract]
       == Abstract
@@ -535,6 +546,105 @@ OUTPUT
     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)
@@ -643,6 +753,11 @@ QU1FOiB0ZXN0Cgo=
     )
   end
 
+   def mock_default_publisher 
+    allow_any_instance_of(::Asciidoctor::Standoc::Front).to receive(:default_publisher).and_return(
+        "International Standards Organization"
+    )
+  end
  
 
 end