metanorma-standoc 1.6.0 → 1.6.5

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/asciidoctor/standoc/table.rb

@@ -17,6 +17,7 @@ module Asciidoctor
         @table_fn_number = "a"
         noko do |xml|
           xml.table **attr_code(table_attrs(node)) do |xml_table|
+            colgroup(node, xml_table)
             table_name(node, xml_table)
             %i(head body foot).reject do |tblsec|
               node.rows[tblsec].empty?
@@ -28,6 +29,17 @@ module Asciidoctor
 
       private
 
+      def colgroup(node, xml_table)
+        return if node.option? "autowidth"
+        cols = node&.attr("cols")&.split(/,/) or return
+        return unless cols.size > 1 and cols.all? { |c| /\d/.match(c) }
+        xml_table.colgroup do |cg|
+          node.columns.each do |col|
+            cg.col **{ width: "#{col.attr 'colpcwidth'}%" }
+          end
+        end
+      end
+
       def table_name(node, xml_table)
         if node.title?
           xml_table.name do |n|

data/lib/asciidoctor/standoc/term_lookup_cleanup.rb

@@ -0,0 +1,86 @@
+# frozen_string_literal: true.
+
+module Asciidoctor
+  module Standoc
+    # Intelligent term lookup xml modifier
+    # Lookup all `term` and `calause` tags and replace `termxref` tags with
+    # `xref`:target tag
+    class TermLookupCleanup
+      AUTOMATIC_GENERATED_ID_REGEXP = /\A_/
+      EXISTING_TERM_REGEXP = /\Aterm-/
+
+      attr_reader :xmldoc, :termlookup, :log
+
+      def initialize(xmldoc, log)
+        @xmldoc = xmldoc
+        @log = log
+        @termlookup = {}
+      end
+
+      def call
+        @termlookup = replace_automatic_generated_ids_terms
+        set_termxref_tags_target
+      end
+
+      private
+
+      def set_termxref_tags_target
+        xmldoc.xpath('//termxref').each do |node|
+          target = normalize_ref_id(node.text)
+          if termlookup[target].nil?
+            remove_missing_ref(node, target)
+            next
+          end
+          modify_ref_node(node, target)
+        end
+      end
+
+      def remove_missing_ref(node, target)
+        log.add('AsciiDoc Input', node,
+                %(Error: Term reference in `term[#{target}]` missing: \
+                "#{target}" is not defined in document))
+        term_name_node = node.previous.previous
+        term_name_node.remove
+        term_name_node.name = "strong"
+        term_name_node.children.first.content =
+          %(term "#{term_name_node.text}" not resolved)
+        node.add_previous_sibling(term_name_node)
+        node.remove
+      end
+
+      def modify_ref_node(node, target)
+        node.name = 'xref'
+        node['target'] = termlookup[target]
+        node.children.remove
+        node.remove_attribute('defaultref')
+      end
+
+      def replace_automatic_generated_ids_terms
+        xmldoc.xpath('//term').each.with_object({}) do |term_node, res|
+          normalize_id_and_memorize(term_node, res, './preferred')
+        end
+      end
+
+      def normalize_id_and_memorize(term_node, res_table, text_selector)
+        term_text = normalize_ref_id(term_node.at(text_selector).text)
+                  unless AUTOMATIC_GENERATED_ID_REGEXP.match(term_node['id']).nil?
+        term_node['id'] = unique_text_id(term_text)
+                  end
+        res_table[term_text] = term_node['id']
+      end
+
+      def normalize_ref_id(text)
+        text.downcase.gsub(/[[:space:]]/, '-')
+      end
+
+      def unique_text_id(text)
+        return "term-#{text}" if xmldoc.at("//*[@id = 'term-#{text}']").nil?
+        (1..Float::INFINITY).lazy.each do |index|
+          if xmldoc.at("//*[@id = 'term-#{text}-#{index}']").nil?
+            break("term-#{text}-#{index}")
+          end
+        end
+      end
+    end
+  end
+end

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.5".freeze
   end
 end

data/metanorma-standoc.gemspec

@@ -28,17 +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 "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.4.0"
-  spec.add_dependency "relaton-iev", "~> 1.0.0"
+  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

@@ -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,12 +201,22 @@ 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
+      :isbn: ISBN-13
+      :isbn10: ISBN-10
     INPUT
     <?xml version="1.0" encoding="UTF-8"?>
 <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>
@@ -252,19 +263,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 +289,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 +313,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 +434,8 @@ OUTPUT
       :relaton-uri: F
       :title-eo: Dokumenttitolo
       :doctype: This is a DocType
+      :subdivision: Subdivision
+      :subdivision-abbr: SD
 
       [abstract]
       == Abstract
@@ -535,6 +550,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 +757,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

data/spec/asciidoctor-standoc/blocks_spec.rb

@@ -318,7 +318,7 @@ RSpec.describe Asciidoctor::Standoc do
          <terms id="_" obligation="normative">
          <title>Terms and definitions</title>
          <p id="_">For the purposes of this document, the following terms and definitions apply.</p>
-         <term id="_">
+         <term id="term-term1">
          <preferred>Term1</preferred>
          <termnote id="_">
          <p id="_">This is a note</p>
@@ -383,7 +383,7 @@ RSpec.describe Asciidoctor::Standoc do
               <sections>
   <terms id="_" obligation="normative"><title>Terms, definitions and symbols</title>
 <p id="_">For the purposes of this document, the following terms and definitions apply.</p>
-<term id="_">
+<term id="term-term1">
   <preferred>Term1</preferred>
 </term>
 <definitions id="_" obligation="normative" type="symbols">
@@ -528,7 +528,7 @@ RSpec.describe Asciidoctor::Standoc do
   <terms id="_" obligation="normative">
   <title>Terms and definitions</title>
 <p id="_">For the purposes of this document, the following terms and definitions apply.</p>
-  <term id="_">
+  <term id="term-term1">
   <preferred>Term1</preferred>
 
 <termexample id="ABC">
@@ -583,7 +583,7 @@ RSpec.describe Asciidoctor::Standoc do
               #{BLANK_HDR}
 <sections> 
   <terms id="_" obligation="normative"><title>Terms, definitions and symbols</title>
-<p id="_">For the purposes of this document, the following terms and definitions apply.</p><term id="_">   
+<p id="_">For the purposes of this document, the following terms and definitions apply.</p><term id="term-term1">   
   <preferred>Term1</preferred>   
 </term>  
 <definitions id="_" obligation="normative" type="symbols">   
@@ -972,7 +972,7 @@ RSpec.describe Asciidoctor::Standoc do
          <terms id="_" obligation="normative">
          <title>Terms and definitions</title><p id="_">For the purposes of this document,
        the following terms and definitions apply.</p>
-         <term id="_">
+         <term id="term-term1">
          <preferred>Term1</preferred>
          <termsource status="identical">
          <origin bibitemid="ISO2191" type="inline" citeas="">
@@ -982,7 +982,7 @@ RSpec.describe Asciidoctor::Standoc do
         </origin>
        </termsource>
        </term>
-       <term id='_'>
+       <term id='term-term2'>
   <preferred>Term2</preferred>
   <definition>
     <p id='_'>Definition</p>
@@ -1032,7 +1032,7 @@ RSpec.describe Asciidoctor::Standoc do
          <title>Terms and definitions</title>
          <p id="_">For the purposes of this document,
        the following terms and definitions apply.</p>
-         <term id="_">
+         <term id="term-term1">
          <preferred>Term1</preferred>
          <termsource status="modified">
          <origin bibitemid="ISO2191" type="inline" citeas="">
@@ -1045,7 +1045,7 @@ RSpec.describe Asciidoctor::Standoc do
          </modification>
        </termsource>
        </term>
-       <term id='_'>
+       <term id='term-term2'>
   <preferred>Term2</preferred>
   <definition>
     <p id='_'>Definition</p>