metanorma-standoc 1.5.1 → 1.6.2

data/lib/asciidoctor/standoc/cleanup_section.rb

@@ -1,8 +1,6 @@
 require "date"
-require "nokogiri"
 require "htmlentities"
 require "json"
-require "pathname"
 require "open-uri"
 require "mathml2asciimath"
 
@@ -107,6 +105,7 @@ module Asciidoctor
         sections_order_cleanup(x)
         sections_level_cleanup(x)
         sections_names_cleanup(x)
+        change_clauses(x)
       end
 
       def obligations_cleanup(x)
@@ -141,12 +140,29 @@ module Asciidoctor
       end
 
       def clausebefore_cleanup(xmldoc)
+        preface_clausebefore_cleanup(xmldoc)
+        sections_clausebefore_cleanup(xmldoc)
+      end
+
+       def preface_clausebefore_cleanup(xmldoc)
+        return unless xmldoc.at("//preface")
+        unless ins = xmldoc.at("//preface").children.first
+          xmldoc.at("//preface") << " "
+          ins = xmldoc.at("//preface").children.first
+        end
+        xmldoc.xpath("//preface//*[@beforeclauses = 'true']").each do |x|
+          x.delete("beforeclauses")
+          ins.previous = x.remove
+        end
+      end
+
+      def sections_clausebefore_cleanup(xmldoc)
         return unless xmldoc.at("//sections")
         unless ins = xmldoc.at("//sections").children.first
           xmldoc.at("//sections") << " "
           ins = xmldoc.at("//sections").children.first
         end
-        xmldoc.xpath("//*[@beforeclauses = 'true']").each do |x|
+        xmldoc.xpath("//sections//*[@beforeclauses = 'true']").each do |x|
           x.delete("beforeclauses")
           ins.previous = x.remove
         end

data/lib/asciidoctor/standoc/cleanup_terms.rb

@@ -110,8 +110,8 @@ module Asciidoctor
         end
         ret = Nokogiri::XML(key.to_xml)
         HTMLEntities.new.decode(ret.text).
-          gsub(/[\[\]\{\}<>\(\)]/, "").strip.
-          gsub(/[[:punct]]|[_^]/, ":\\0").gsub(/`/, "").
+          gsub(/[\[\]\{\}<>\(\)]/, "").gsub(/\s/m, "").
+          gsub(/[[:punct:]]|[_^]/, ":\\0").gsub(/`/, "").
           gsub(/[0-9]+/, "þ\\0")
       end
         

data/lib/asciidoctor/standoc/converter.rb

@@ -23,13 +23,15 @@ module Asciidoctor
       Asciidoctor::Extensions.register do
         preprocessor Asciidoctor::Standoc::Datamodel::AttributesTablePreprocessor
         preprocessor Asciidoctor::Standoc::Datamodel::DiagramPreprocessor
-        preprocessor Asciidoctor::Standoc::Yaml2TextPreprocessor
+        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
         inline_macro Asciidoctor::Standoc::InheritInlineMacro
         inline_macro Asciidoctor::Standoc::HTML5RubyMacro
         inline_macro Asciidoctor::Standoc::ConceptInlineMacro
+        inline_macro Asciidoctor::Standoc::AutonumberInlineMacro
         block Asciidoctor::Standoc::ToDoAdmonitionBlock
         treeprocessor Asciidoctor::Standoc::ToDoInlineAdmonitionBlock
         block Asciidoctor::Standoc::PlantUMLBlockMacro
@@ -65,7 +67,7 @@ module Asciidoctor
         attr_accessor :_file
       end
 
-      def self.inherited( k )
+      def self.inherited(k)
         k._file = caller_locations.first.absolute_path
       end
 

data/lib/asciidoctor/standoc/front.rb

@@ -17,6 +17,11 @@ module Asciidoctor
         xml.docnumber node.attr("docnumber")
       end
 
+      def metadata_other_id(node, xml)
+        a = node.attr("isbn") and xml.docidentifier a, type: "ISBN"
+        a = node.attr("isbn10") and xml.docidentifier a, type: "ISBN10"
+      end
+
       def metadata_version(node, xml)
         xml.edition node.attr("edition") if node.attr("edition")
         xml.version do |v|
@@ -27,7 +32,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
@@ -138,6 +143,7 @@ module Asciidoctor
         title node, xml
         metadata_source(node, xml)
         metadata_id(node, xml)
+        metadata_other_id(node, xml)
         metadata_date(node, xml)
         metadata_author(node, xml)
         metadata_publisher(node, xml)
@@ -180,8 +186,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,22 +21,45 @@ 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
+        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
       # at start of field
       def csv_split(s, delim = ",")
-        CSV.parse_line(s&.gsub(/, "(?!")/, ',"'), liberal_parsing: true,
-                       col_sep: delim)&.map { |x| x.strip }
+        CSV.parse_line(s&.gsub(/, "(?!")/, ',"'),
+                       liberal_parsing: true,
+                       col_sep: delim)&.compact&.map { |x| x.strip }
       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)
@@ -52,18 +75,26 @@ module Asciidoctor
         end
       end
 
+      def personal_role(node, c, suffix)
+        c.role **{ type: node.attr("role#{suffix}")&.downcase || "author" }
+      end
+
+      def personal_contact(node, suffix, p)
+        node.attr("phone#{suffix}") and p.phone node.attr("phone#{suffix}")
+        node.attr("fax#{suffix}") and
+          p.phone node.attr("fax#{suffix}"), **{type: "fax"}
+        node.attr("email#{suffix}") and p.email node.attr("email#{suffix}")
+        node.attr("contributor-uri#{suffix}") and
+          p.uri node.attr("contributor-uri#{suffix}")
+      end
+
       def personal_author1(node, xml, suffix)
         xml.contributor do |c|
-          c.role **{ type: node.attr("role#{suffix}")&.downcase || "author" }
+          personal_role(node, c, suffix)
           c.person do |p|
             person_name(node, xml, suffix, p)
             person_affiliation(node, xml, suffix, p)
-            node.attr("phone#{suffix}") and p.phone node.attr("phone#{suffix}")
-            node.attr("fax#{suffix}") and
-              p.phone node.attr("fax#{suffix}"), **{type: "fax"}
-            node.attr("email#{suffix}") and p.email node.attr("email#{suffix}")
-            node.attr("contributor-uri#{suffix}") and
-              p.uri node.attr("contributor-uri#{suffix}")
+            personal_contact(node, suffix, p)
           end
         end
       end
@@ -87,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
@@ -97,24 +130,31 @@ module Asciidoctor
         nil
       end
 
+      def org_abbrev
+        { }
+      end
+
       def metadata_publisher(node, xml)
         publishers = node.attr("publisher") || default_publisher || return
         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/inline.rb

@@ -3,7 +3,8 @@ require "htmlentities"
 require "unicode2latex"
 require "mime/types"
 require "base64"
-require 'English'
+require "English"
+require "latexmath"
 
 module Asciidoctor
   module Standoc
@@ -32,18 +33,28 @@ module Asciidoctor
       end
 
       def inline_anchor_xref(node)
-        m = /^(?<case>capital%|lowercase%)?(?<fn>fn(:\s*(?<text>.*))?)?$/.match node.text
-        casing = m.nil? ? nil : m[:case]&.sub(/%$/, "")
-        f = (m.nil? || m[:fn].nil?) ? "inline" : "footnote"
-        c = (!m.nil? && (!m[:fn].nil? || !m[:case].nil?)) ? m[:text] : node.text
-        t = node.target.gsub(/^#/, "").gsub(%r{(\.xml|\.adoc)(#.*$)}, "\\2")
         noko do |xml|
-          xml.xref **attr_code(target: t, type: f, case: casing) do |x|
+          attrs = inline_anchor_xref_attrs(node)
+          c = attrs[:text]
+          attrs.delete(:text) unless c.nil?
+          xml.xref **attr_code(attrs) do |x|
             x << c
           end
         end.join
       end
 
+      def inline_anchor_xref_attrs(node)
+        m = /^(?<drop>droploc%)?(?<case>capital%|lowercase%)?(?<drop2>droploc%)?
+          (?<fn>fn(:\s*(?<text>.*))?)?$/x.match node.text
+        casing = m.nil? ? nil : m[:case]&.sub(/%$/, "")
+        droploc = m.nil? ? nil : ((m[:drop].nil? && m[:drop2].nil?) ? nil: true)
+        f = (m.nil? || m[:fn].nil?) ? "inline" : "footnote"
+        c = (!m.nil? && (%i[case fn drop drop2].any? { |x| !m[x].nil? })) ?
+          m[:text] : node.text
+        t = node.target.gsub(/^#/, "").gsub(%r{(\.xml|\.adoc)(#.*$)}, "\\2")
+        { target: t, type: f, case: casing, droploc: droploc, text: c }
+      end
+
       def inline_anchor_link(node)
         contents = node.text
         contents = "" if node.target.gsub(%r{^mailto:}, "") == node.text
@@ -105,33 +116,12 @@ module Asciidoctor
         HTMLEntities.new.encode(text, :basic, :hexadecimal).
           gsub(/&amp;gt;/, ">").gsub(/\&amp;lt;/, "<").gsub(/&amp;amp;/, "&").
           gsub(/&gt;/, ">").gsub(/&lt;/, "<").gsub(/&amp;/, "&").
-          gsub(/&quot;/, '"').gsub(/&#xa;/, "\n")
-      end
-
-      def latex_run1(lxm_input, cmd)
-        IO.popen(cmd, "r+", external_encoding: "UTF-8") do |io|
-          io.write(lxm_input)
-          io.close_write
-          io.read
-        end
-      end
-
-      def latex_run(lxm_input)
-        results = nil
-        Metanorma::Standoc::Requirements[:latexml].cmd.each_with_index do |cmd, i|
-          warn "Retrying with #{cmd}" if i > 0
-          results = latex_run1(lxm_input, cmd)
-          if $CHILD_STATUS.to_i.zero?
-            warn "Success!" if i > 0
-            break
-          end
-        end
-        $CHILD_STATUS.to_i.zero? ? results : nil
+          gsub(/&quot;/, '"').gsub(/&#xa;/, "\n").gsub(/&amp;#/, "&#")
       end
 
       def latex_parse(text)
         lxm_input = Unicode2LaTeX.unicode2latex(HTMLEntities.new.decode(text))
-        results = latex_run(lxm_input)
+        results = Latexmath.parse(lxm_input).to_mathml
         results.nil? and
           @log.add('Math', nil,
                    "latexmlmath failed to process equation:\n#{lxm_input}")
@@ -151,7 +141,7 @@ module Asciidoctor
             s.parent.children = math
           end
         else
-          xml.stem text, **{ type: "AsciiMath" }
+          xml.stem text&.gsub(/\&amp;#/, "&#"), **{ type: "AsciiMath" }
         end
       end
 

data/lib/asciidoctor/standoc/isodoc.rng

@@ -43,7 +43,9 @@
     <define name="xref">
       <element name="xref">
         <attribute name="target">
-          <data type="IDREF"/>
+          <data type="string">
+            <param name="pattern">\i\c*|\c+#\c+</param>
+          </data>
         </attribute>
         <optional>
           <attribute name="type">
@@ -61,6 +63,11 @@
             </choice>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="droploc">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <text/>
       </element>
     </define>
@@ -578,6 +585,8 @@
             <ref name="ol"/>
             <ref name="dl"/>
             <ref name="formula"/>
+            <ref name="quote"/>
+            <ref name="sourcecode"/>
           </choice>
         </oneOrMore>
       </element>
@@ -661,6 +670,16 @@
             </choice>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="valign">
+            <choice>
+              <value>top</value>
+              <value>middle</value>
+              <value>bottom</value>
+              <value>baseline</value>
+            </choice>
+          </attribute>
+        </optional>
         <choice>
           <zeroOrMore>
             <choice>
@@ -697,6 +716,16 @@
             </choice>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="valign">
+            <choice>
+              <value>top</value>
+              <value>middle</value>
+              <value>bottom</value>
+              <value>baseline</value>
+            </choice>
+          </attribute>
+        </optional>
         <choice>
           <zeroOrMore>
             <choice>
@@ -834,6 +863,13 @@
   </define>
   <define name="standard-document">
     <element name="standard-document">
+      <attribute name="version"/>
+      <attribute name="type">
+        <choice>
+          <value>semantic</value>
+          <value>presentation</value>
+        </choice>
+      </attribute>
       <ref name="bibdata"/>
       <optional>
         <ref name="boilerplate"/>
@@ -855,7 +891,7 @@
       <oneOrMore>
         <choice>
           <ref name="content"/>
-          <ref name="preface_abstract"/>
+          <ref name="abstract"/>
           <ref name="foreword"/>
           <ref name="introduction"/>
           <ref name="acknowledgements"/>
@@ -1049,14 +1085,17 @@
       <ref name="section-title"/>
     </optional>
     <group>
-      <group>
-        <zeroOrMore>
-          <ref name="BasicBlock"/>
-        </zeroOrMore>
-        <zeroOrMore>
-          <ref name="note"/>
-        </zeroOrMore>
-      </group>
+      <choice>
+        <group>
+          <zeroOrMore>
+            <ref name="BasicBlock"/>
+          </zeroOrMore>
+          <zeroOrMore>
+            <ref name="note"/>
+          </zeroOrMore>
+        </group>
+        <ref name="amend"/>
+      </choice>
       <zeroOrMore>
         <choice>
           <ref name="clause-subsection"/>
@@ -1125,49 +1164,7 @@
   </define>
   <define name="annex">
     <element name="annex">
-      <optional>
-        <attribute name="id">
-          <data type="ID"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="language"/>
-      </optional>
-      <optional>
-        <attribute name="script"/>
-      </optional>
-      <optional>
-        <attribute name="inline-header">
-          <data type="boolean"/>
-        </attribute>
-      </optional>
-      <attribute name="obligation">
-        <choice>
-          <value>normative</value>
-          <value>informative</value>
-        </choice>
-      </attribute>
-      <optional>
-        <ref name="section-title"/>
-      </optional>
-      <group>
-        <group>
-          <zeroOrMore>
-            <ref name="BasicBlock"/>
-          </zeroOrMore>
-          <zeroOrMore>
-            <ref name="note"/>
-          </zeroOrMore>
-        </group>
-        <zeroOrMore>
-          <choice>
-            <ref name="annex-subsection"/>
-            <ref name="terms"/>
-            <ref name="definitions"/>
-            <ref name="references"/>
-          </choice>
-        </zeroOrMore>
-      </group>
+      <ref name="Annex-Section"/>
     </element>
   </define>
   <define name="terms">
@@ -1453,11 +1450,6 @@
       </optional>
     </element>
   </define>
-  <define name="preface_abstract">
-    <element name="abstract">
-      <ref name="Basic-Section"/>
-    </element>
-  </define>
   <define name="term-clause">
     <element name="clause">
       <optional>
@@ -1507,4 +1499,79 @@
       <ref name="CitationType"/>
     </element>
   </define>
+  <define name="amend">
+    <element name="amend">
+      <optional>
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+      </optional>
+      <attribute name="change">
+        <choice>
+          <value>add</value>
+          <value>modify</value>
+          <value>delete</value>
+        </choice>
+      </attribute>
+      <optional>
+        <attribute name="path"/>
+      </optional>
+      <optional>
+        <attribute name="path_end"/>
+      </optional>
+      <optional>
+        <attribute name="title"/>
+      </optional>
+      <optional>
+        <element name="location">
+          <zeroOrMore>
+            <ref name="locality"/>
+          </zeroOrMore>
+        </element>
+      </optional>
+      <zeroOrMore>
+        <ref name="autonumber"/>
+      </zeroOrMore>
+      <optional>
+        <element name="description">
+          <zeroOrMore>
+            <ref name="BasicBlock"/>
+          </zeroOrMore>
+        </element>
+      </optional>
+      <optional>
+        <element name="newcontent">
+          <zeroOrMore>
+            <ref name="BasicBlock"/>
+          </zeroOrMore>
+        </element>
+      </optional>
+      <optional>
+        <element name="description">
+          <zeroOrMore>
+            <ref name="BasicBlock"/>
+          </zeroOrMore>
+        </element>
+      </optional>
+    </element>
+  </define>
+  <define name="autonumber">
+    <element name="autonumber">
+      <attribute name="type">
+        <choice>
+          <value>requirement</value>
+          <value>recommendation</value>
+          <value>permission</value>
+          <value>table</value>
+          <value>figure</value>
+          <value>admonition</value>
+          <value>formula</value>
+          <value>sourcecode</value>
+          <value>example</value>
+          <value>note</value>
+        </choice>
+      </attribute>
+      <text/>
+    </element>
+  </define>
 </grammar>