metanorma-standoc 1.3.24 → 1.3.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92fc31b8bb1e9754d79b535a4daf3025602e87e0611a5bf6381b9acf5a3d80e6
-  data.tar.gz: 801345a1e19a5d89df053dbcd969ae508b604f82914e93623bbfebb7f33b55af
+  metadata.gz: 500052e6d1bd5c05e37f8bb82ef9a6169e5d172d6a72216436995611d398d3b2
+  data.tar.gz: 32bfbcaa5e44d661c9ca28a5b6abf38e2cdc772751cd74b90c959decfd7e6df5
 SHA512:
-  metadata.gz: 829deae2c17c445636d4e7ef20e2e34043e1e6dff35c9d3e7c41949119867e8865279a6ed527f60ac5c413bb87058cd4262a6ada7719b36850f099aaa1e39cac
-  data.tar.gz: 44adac89d280d897bb4fa515f6da866da79bdde608a40bf3ea3ff31e2dd0d3f22c989e671e9ab6b1fe54d534c3476ac82d1acd22ecf87ca98248b4948a87cc50
+  metadata.gz: 0d5d15e5456577b3178c875adce471b9e68debea793ce50d347fe16652ebbcc89a346267826846fb979c255ea24d166f8c5c79b0eb42a276dd070328f360e4a0
+  data.tar.gz: f496a942f64052abae15c8ea1864f8f977a40dc57c8264140b5d6f9b07626489998f85a1e30fdfcac9cda4049cd9131110f6642451c4e57f53375f5020161f9f

data/.github/workflows/macos.yml

@@ -28,7 +28,8 @@ jobs:
       - name: Install LaTeXML
         run: |
           brew install libxml2 cpanminus
-          env PATH=$(brew --prefix libxml2)/bin:$PATH cpanm --notest XML::LibXSLT@1.96 git://github.com/brucemiller/LaTeXML.git@9a0e7dc5
+          env PATH=$(brew --prefix libxml2)/bin:$PATH \
+            cpanm --notest XML::LibXSLT@1.96 git://github.com/brucemiller/LaTeXML.git@9a0e7dc5
       - name: Install PlantUML
         run: |
           brew install plantuml

data/.github/workflows/ubuntu.yml

@@ -31,14 +31,16 @@ jobs:
           bundle install --jobs 4 --retry 3
       - name: Install LaTeXML
         run: |
-          sudo snap install latexml
-          sudo snap alias latexml.math latexmlmath
+          sudo snap install latexml --edge
+          echo "::add-path::/snap/bin"
       - name: Install PlantUML
         run: |
           curl -L https://raw.githubusercontent.com/metanorma/plantuml-install/master/ubuntu.sh | sudo bash
       - name: Install puppeteer
         run: |
-          npm -g i puppeteer
+          sudo apt-get update
+          sudo apt-get install -y libgbm1
+          npm install -g puppeteer@3.0.1
       - name: Run specs
         run: |
           bundle exec rake

data/.github/workflows/windows.yml

@@ -34,7 +34,6 @@ jobs:
         run: |
           gem install bundler
           bundle config --local path vendor/bundle
-          bundle update
           bundle install --jobs 4 --retry 3
       - name: Install LaTeXML
         shell: cmd

data/lib/asciidoctor/standoc/base.rb

@@ -15,6 +15,7 @@ module Asciidoctor
       XML_NAMESPACE = "https://www.metanorma.org/ns/standoc".freeze
 
       Asciidoctor::Extensions.register do
+        preprocessor Asciidoctor::Standoc::Yaml2TextPreprocessor
         inline_macro Asciidoctor::Standoc::AltTermInlineMacro
         inline_macro Asciidoctor::Standoc::DeprecatedTermInlineMacro
         inline_macro Asciidoctor::Standoc::DomainTermInlineMacro
@@ -27,6 +28,14 @@ module Asciidoctor
         block Asciidoctor::Standoc::PseudocodeBlockMacro
       end
 
+      def xml_root_tag
+        self.class::XML_ROOT_TAG
+      end
+
+      def xml_namespace
+        self.class::XML_NAMESPACE
+      end
+
       def content(node)
         node.content
       end
@@ -54,6 +63,7 @@ module Asciidoctor
           datauriimage: node.attr("data-uri-image"),
           htmltoclevels: node.attr("htmltoclevels") || node.attr("toclevels"),
           doctoclevels: node.attr("doctoclevels") || node.attr("toclevels"),
+          break_up_urls_in_tables: node.attr("break-up-urls-in-tables"),
         }
       end
 
@@ -78,6 +88,7 @@ module Asciidoctor
           olstyle: node.attr("olstyle"),
           htmltoclevels: node.attr("htmltoclevels") || node.attr("toclevels"),
           doctoclevels: node.attr("doctoclevels") || node.attr("toclevels"),
+          break_up_urls_in_tables: node.attr("break-up-urls-in-tables"),
         }
       end
 
@@ -165,17 +176,17 @@ module Asciidoctor
 
       def makexml1(node)
         result = ["<?xml version='1.0' encoding='UTF-8'?>",
-                  "<#{self.class::XML_ROOT_TAG}>"]
+                  "<#{xml_root_tag}>"]
         result << noko { |ixml| front node, ixml }
         result << noko { |ixml| middle node, ixml }
-        result << "</#{self.class::XML_ROOT_TAG}>"
+        result << "</#{xml_root_tag}>"
         textcleanup(result)
       end
 
       def makexml(node)
         result = makexml1(node)
         ret1 = cleanup(Nokogiri::XML(result))
-        ret1.root.add_namespace(nil, self.class::XML_NAMESPACE)
+        ret1.root.add_namespace(nil, xml_namespace)
         validate(ret1) unless @novalid
         ret1
       end
@@ -207,15 +218,19 @@ module Asciidoctor
       end
 
       def add_term_source(xml_t, seen_xref, m)
-        xml_t.origin seen_xref.children[0].content,
-          **attr_code(term_source_attr(seen_xref))
+        if seen_xref.children[0].name == "concept"
+          xml_t.origin { |o| o << seen_xref.children[0].to_xml }
+        else
+          xml_t.origin seen_xref.children[0].content,
+            **attr_code(term_source_attr(seen_xref))
+        end
         m[:text] && xml_t.modification do |mod|
           mod.p { |p| p << m[:text].sub(/^\s+/, "") }
         end
       end
 
       TERM_REFERENCE_RE_STR = <<~REGEXP.freeze
-        ^(?<xref><xref[^>]+>([^<]*</xref>)?)
+        ^(?<xref><(xref|concept)[^>]+>([^<]*</(xref|concept)>)?)
                (,\s(?<text>.*))?
         $
       REGEXP
@@ -226,8 +241,7 @@ module Asciidoctor
       def extract_termsource_refs(text, node)
         matched = TERM_REFERENCE_RE.match text
         matched.nil? and
-          #Utils::warning(node, "term reference not in expected format", text)
-        @log.add("Asciidoctor Input", node, "term reference not in expected format: #{text}")
+          @log.add("Asciidoctor Input", node, "term reference not in expected format: #{text}")
         matched
       end
 

data/lib/asciidoctor/standoc/biblio.rng

@@ -767,6 +767,8 @@
       <value>unchanged</value>
       <value>circulated</value>
       <value>adapted</value>
+      <value>vote-started</value>
+      <value>vote-ended</value>
     </choice>
   </define>
   <define name="bdate">
@@ -1019,38 +1021,63 @@
   </define>
   <define name="DocRelationType">
     <choice>
-      <value>obsoletes</value>
-      <value>obsoletedBy</value>
-      <value>supersedes</value>
-      <value>supersededBy</value>
-      <value>updates</value>
-      <value>updatedBy</value>
-      <value>complements</value>
-      <value>derivedFrom</value>
-      <value>translatedFrom</value>
-      <value>hasTranslation</value>
-      <value>adoptedFrom</value>
-      <value>equivalent</value>
-      <value>identical</value>
-      <value>nonequivalent</value>
-      <value>includedIn</value>
       <value>includes</value>
-      <value>instance</value>
-      <value>instanceOf</value>
-      <value>partOf</value>
+      <value>includedIn</value>
       <value>hasPart</value>
-      <value>hasDraft</value>
-      <value>draftOf</value>
+      <value>partOf</value>
       <value>merges</value>
+      <value>mergedInto</value>
       <value>splits</value>
-      <value>amends</value>
-      <value>amendedBy</value>
-      <value>corrects</value>
-      <value>correctedBy</value>
-      <value>revises</value>
-      <value>revisedBy</value>
+      <value>splitInto</value>
+      <value>instance</value>
+      <value>hasInstance</value>
+      <value>exemplarOf</value>
+      <value>hasExemplar</value>
+      <value>manifestationOf</value>
+      <value>hasManifestation</value>
+      <value>reproductionOf</value>
+      <value>hasReproduction</value>
+      <value>reprintOf</value>
+      <value>hasReprint</value>
+      <value>expressionOf</value>
+      <value>hasExpression</value>
+      <value>translatedFrom</value>
+      <value>hasTranslation</value>
+      <value>arrangementOf</value>
+      <value>hasArrangement</value>
+      <value>abridgementOf</value>
+      <value>hasAbridgement</value>
+      <value>annotationOf</value>
+      <value>hasAnnotation</value>
+      <value>draftOf</value>
+      <value>hasDraft</value>
+      <value>editionOf</value>
+      <value>hasEdition</value>
+      <value>updates</value>
+      <value>updatedBy</value>
+      <value>derivedFrom</value>
+      <value>derives</value>
       <value>describes</value>
       <value>describedBy</value>
+      <value>catalogues</value>
+      <value>cataloguedBy</value>
+      <value>hasSuccessor</value>
+      <value>successorOf</value>
+      <value>adaptedFrom</value>
+      <value>hasAdaptation</value>
+      <value>adoptedFrom</value>
+      <value>adoptedAs</value>
+      <value>reviewOf</value>
+      <value>hasReview</value>
+      <value>commentaryOf</value>
+      <value>hasCommentary</value>
+      <value>related</value>
+      <value>complements</value>
+      <value>complementOf</value>
+      <value>obsoletes</value>
+      <value>obsoletedBy</value>
+      <value>cited</value>
+      <value>isCitedIn</value>
     </choice>
   </define>
   <define name="docrelation">

data/lib/asciidoctor/standoc/cleanup.rb

@@ -20,18 +20,18 @@ module Asciidoctor
             "<amathstem>#{HTMLEntities.new.decode($1)}</amathstem>"
           end
           text = Html2Doc.
-            asciimath_to_mathml(text, ["<amathstem>", "</amathstem>"]).
-            gsub(%r{<math xmlns='http://www.w3.org/1998/Math/MathML'>},
-                 "<stem type='MathML'>"\
-                 "<math xmlns='http://www.w3.org/1998/Math/MathML'>").
-                 gsub(%r{</math>}, %{</math></stem>})
+            asciimath_to_mathml(text, ["<amathstem>", "</amathstem>"])
+          x =  Nokogiri::XML(text)
+          x.xpath("//*[local-name() = 'math'][not(parent::stem)]").each do |y|
+            y.wrap("<stem type='MathML'></stem>")
+          end
+          text = x.to_xml
         end
         text.gsub(/\s+<fn /, "<fn ")
       end
 
       def cleanup(xmldoc)
         element_name_cleanup(xmldoc)
-        termdef_cleanup(xmldoc)
         sections_cleanup(xmldoc)
         obligations_cleanup(xmldoc)
         table_cleanup(xmldoc)
@@ -45,8 +45,9 @@ module Asciidoctor
         reference_names(xmldoc)
         symbols_cleanup(xmldoc)
         xref_cleanup(xmldoc)
-        origin_cleanup(xmldoc)
         concept_cleanup(xmldoc)
+        origin_cleanup(xmldoc)
+        termdef_cleanup(xmldoc)
         RelatonIev::iev_cleanup(xmldoc, @bibdb)
         element_name_cleanup(xmldoc)
         bpart_cleanup(xmldoc)

data/lib/asciidoctor/standoc/cleanup_inline.rb

@@ -90,6 +90,9 @@ module Asciidoctor
       end
 
       def origin_cleanup(xmldoc)
+        xmldoc.xpath("//origin/concept[termref]").each do |x|
+          x.replace(x.children)
+        end
         xmldoc.xpath("//origin").each do |x|
           x["citeas"] = @anchors&.dig(x["bibitemid"], :xref) ||
             @log.add("Crossreferences", x,

data/lib/asciidoctor/standoc/cleanup_ref.rb

@@ -187,6 +187,10 @@ module Asciidoctor
         end
         bib
       end
+
+      def fetch_termbase(termbase, id)
+        ""
+      end
     end
   end
 end

data/lib/asciidoctor/standoc/cleanup_section.rb

@@ -117,7 +117,7 @@ module Asciidoctor
       end
 
       def obligations_cleanup_inherit(x)
-        x.xpath("//annex | //clause").each do |r|
+        x.xpath("//annex | //clause[not(ancestor::boilerplate)]").each do |r|
           r["obligation"] = "normative" unless r["obligation"]
         end
         x.xpath(Utils::SUBCLAUSE_XPATH).each do |r|
@@ -192,7 +192,16 @@ module Asciidoctor
         end
       end
 
+      def termdef_from_termbase(xmldoc)
+        xmldoc.xpath("//term").each do |x|
+          if c = x.at("./origin/termref") and !x.at("./definition")
+            x.at("./origin").previous = fetch_termbase(c["base"], c.text)
+          end
+        end
+      end
+
       def termdef_cleanup(xmldoc)
+        termdef_from_termbase(xmldoc)
         termdef_unnest_cleanup(xmldoc)
         termdef_stem_cleanup(xmldoc)
         termdomain_cleanup(xmldoc)
@@ -209,15 +218,21 @@ module Asciidoctor
       # Numbers sort *after* letters; we use thorn to force that sort order.
       def symbol_key(x)
         key = x.dup
-        key.xpath("//*[local-name() = 'math']").each do |m|
-          m.replace(MathML2AsciiMath.m2a(m.to_xml))
+        key.traverse do |n|
+          next unless n.name == "math"
+          n.replace(grkletters(MathML2AsciiMath.m2a(n.to_xml)))
         end
-        ret = Nokogiri::XML(MathML2AsciiMath.m2a(key.to_xml))
-        HTMLEntities.new.decode(ret.text).strip.
+        ret = Nokogiri::XML(key.to_xml)
+        HTMLEntities.new.decode(ret.text).
+          gsub(/[\[\]\{\}<>\(\)]/, "").strip.
           gsub(/[[:punct]]|[_^]/, ":\\0").gsub(/`/, "").
           gsub(/[0-9]+/, "þ\\0")
       end
 
+      def grkletters(x)
+        x.gsub(/\b(alpha|beta|gamma|delta|epsilon|zeta|eta|theta|iota|kappa|lambda|mu|nu|xi|omicron|pi|rho|sigma|tau|upsilon|phi|chi|psi|omega)\b/i, "&\\1;")
+      end
+
       def extract_symbols_list(dl)
         dl_out = []
         dl.xpath("./dt | ./dd").each do |dtd|
@@ -233,7 +248,7 @@ module Asciidoctor
       def symbols_cleanup(docxml)
         docxml.xpath("//definitions/dl").each do |dl|
           dl_out = extract_symbols_list(dl)
-          dl_out.sort! { |a, b| a[:key] <=> b[:key] }
+          dl_out.sort! { |a, b| a[:key] <=> b[:key] || a[:dt] <=> b[:dt] }
           dl.children = dl_out.map { |d| d[:dt].to_s + d[:dd].to_s }.join("\n")
         end
         docxml

data/lib/asciidoctor/standoc/front.rb

@@ -78,7 +78,9 @@ module Asciidoctor
 
       def datetypes
         %w{ published accessed created implemented obsoleted
-            confirmed updated issued circulated unchanged received }
+            confirmed updated issued circulated unchanged received 
+            vote-started vote-ended
+        }
       end
 
       def metadata_date(node, xml)
@@ -190,8 +192,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/inline.rb

@@ -3,6 +3,7 @@ require "htmlentities"
 require "unicode2latex"
 require "mime/types"
 require "base64"
+require 'English'
 
 module Asciidoctor
   module Standoc
@@ -106,23 +107,47 @@ module Asciidoctor
           gsub(/"/, '"').gsub(/
/, "\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
+      end
+
+      def latex_parse(text)
+        lxm_input = Unicode2LaTeX.unicode2latex(HTMLEntities.new.decode(text))
+        results = latex_run(lxm_input)
+        results.nil? and
+          @log.add('Math', nil,
+                   "latexmlmath failed to process equation:\n#{lxm_input}")
+        results
+      end
+
       def stem_parse(text, xml, style)
         if /<([^:>&]+:)?math(\s+[^>&]+)?> |
           <([^:>&]+:)?math(\s+[^>&]+)?>/x.match text
           math = xml_encode(text)
           xml.stem math, **{ type: "MathML" }
         elsif style == :latexmath
-          latex_cmd = Metanorma::Standoc::Requirements[:latexml].cmd
-          latexmlmath_input =
-            Unicode2LaTeX::unicode2latex(HTMLEntities.new.decode(text)).
-            gsub(/'/, '\\').gsub(/\n/, " ")
-          latex = IO.popen(latex_cmd, "r+", external_encoding: "UTF-8") do |io|
-            io.write(latexmlmath_input)
-            io.close_write
-            io.read
-          end
+          latex = latex_parse(text) or return xml.stem **{ type: "MathML" }
           xml.stem **{ type: "MathML" } do |s|
-            s << latex.sub(/<\?[^>]+>/, "")
+            math = Nokogiri::XML.fragment(latex.sub(/<\?[^>]+>/, "")).elements[0]
+            math.delete("alttext")
+            s.parent.children = math
           end
         else
           xml.stem text, **{ type: "AsciiMath" }
@@ -173,13 +198,13 @@ module Asciidoctor
         type = types.first.to_s
         uri = uri.sub(%r{^data:image/\*;}, "data:#{type};")
         attr_code(src: @datauriimage ? datauri(uri) : uri,
-          id: Utils::anchor_or_uuid,
-          mimetype: type,
-          height: node.attr("height") || "auto",
-          width: node.attr("width") || "auto" ,
-          filename: node.attr("filename"),
-          title: node.attr("titleattr"),
-          alt: node.alt == node.attr("default-alt") ? nil : node.alt)
+                  id: Utils::anchor_or_uuid,
+                  mimetype: type,
+                  height: node.attr("height") || "auto",
+                  width: node.attr("width") || "auto" ,
+                  filename: node.attr("filename"),
+                  title: node.attr("titleattr"),
+                  alt: node.alt == node.attr("default-alt") ? nil : node.alt)
       end
 
       def inline_image(node)

data/lib/asciidoctor/standoc/isodoc.rng

@@ -303,8 +303,23 @@
         <ref name="paragraph"/>
       </element>
     </define>
+    <define name="TextElement" combine="choice">
+      <ref name="concept"/>
+    </define>
   </include>
   <!-- end overrides -->
+  <define name="concept">
+    <element name="concept">
+      <optional>
+        <attribute name="term"/>
+      </optional>
+      <choice>
+        <ref name="eref"/>
+        <ref name="xref"/>
+        <ref name="termref"/>
+      </choice>
+    </element>
+  </define>
   <define name="BasicBlock" combine="choice">
     <choice>
       <ref name="requirement"/>
@@ -911,7 +926,10 @@
   </define>
   <define name="origin">
     <element name="origin">
-      <ref name="erefType"/>
+      <choice>
+        <ref name="erefType"/>
+        <ref name="termref"/>
+      </choice>
     </element>
   </define>
   <define name="modification">
@@ -919,6 +937,15 @@
       <ref name="paragraph"/>
     </element>
   </define>
+  <define name="termref">
+    <element name="termref">
+      <attribute name="base"/>
+      <attribute name="target"/>
+      <optional>
+        <text/>
+      </optional>
+    </element>
+  </define>
   <define name="structuredidentifier">
     <element name="structuredidentifier">
       <optional>

data/lib/asciidoctor/standoc/macros.rb

@@ -2,6 +2,7 @@ require "asciidoctor/extensions"
 require "fileutils"
 require "uuidtools"
 require_relative "./macros_plantuml.rb"
+require_relative "./macros_yaml2text.rb"
 
 module Asciidoctor
   module Standoc
@@ -58,7 +59,7 @@ module Asciidoctor
       named :concept
       name_positional_attributes "id", "word", "term"
       #match %r{concept:(?<target>[^\[]*)\[(?<content>|.*?[^\\])\]$}
-      match /\{\{(?<content>|.*?[^\\])\}\}$/
+      match /\{\{(?<content>|.*?[^\\])\}\}/
       using_format :short
 
       # deal with locality attrs and their disruption of positional attrs