metanorma-standoc 1.11.0.1 → 1.11.4

data/lib/asciidoctor/standoc/cleanup_terms_designations.rb

@@ -2,17 +2,35 @@ module Asciidoctor
   module Standoc
     module Cleanup
       def termdef_stem_cleanup(xmldoc)
+        termdef_stem2admitted(xmldoc)
+        xmldoc.xpath("//term//expression/name[stem]").each do |n|
+          test = n.dup
+          test.at("./stem").remove
+          next unless test.text.strip.empty?
+
+          n.parent.name = "letter-symbol"
+        end
+      end
+
+      def termdef_stem2admitted(xmldoc)
         xmldoc.xpath("//term/p/stem").each do |a|
-          if a.parent.elements.size == 1 # para contains just a stem expression
+          if initial_formula(a.parent)
             parent = a.parent
             parent.replace("<admitted>#{term_expr(a.to_xml)}</admitted>")
           end
         end
-        xmldoc.xpath("//term//expression/name[stem]").each do |n|
-          n.parent.name = "letter-symbol"
+        xmldoc.xpath("//term/formula").each do |a|
+          initial_formula(a) and
+            a.replace("<admitted>#{term_expr(a.children.to_xml)}</admitted>")
         end
       end
 
+      def initial_formula(elem)
+        elem.elements.size == 1 && # para contains just stem expression
+          !elem.at("./preceding-sibling::p | ./preceding-sibling::dl | "\
+                   "./preceding-sibling::ol | ./preceding-sibling::ul")
+      end
+
       # release termdef tags from surrounding paras
       def termdef_unnest_cleanup(xmldoc)
         desgn = "//p/admitted | //p/deprecates | //p/preferred | //p//related"
@@ -26,7 +44,7 @@ module Asciidoctor
       def term_dl_to_metadata(xmldoc)
         xmldoc.xpath("//term[dl[@metadata = 'true']]").each do |t|
           t.xpath("./dl[@metadata = 'true']").each do |dl|
-            prev = dl_to_designation(dl) or next
+            prev = related2pref(dl_to_designation(dl)) or next
             term_dl_to_designation_metadata(prev, dl)
             term_dl_to_term_metadata(prev, dl)
             term_dl_to_expression_metadata(prev, dl)
@@ -40,13 +58,18 @@ module Asciidoctor
           prev.at("./preceding-sibling::preferred").nil?
 
         ins = term_element_insert_point(prev)
-        %w(domain subject usageinfo).each do |a|
+        %w(domain subject).each do |a|
           ins = dl_to_elems(ins, prev.parent, dlist, a)
         end
       end
 
       def term_dl_to_designation_metadata(prev, dlist)
-        %w(absent geographicArea).each { |a| dl_to_attrs(related2pref(prev), dlist, a) }
+        %w(absent geographic-area).each do |a|
+          dl_to_attrs(prev, dlist, a)
+        end
+        %w(field-of-application usage-info).reverse.each do |a|
+          dl_to_elems(prev.at("./expression"), prev, dlist, a)
+        end
       end
 
       def term_element_insert_point(prev)
@@ -59,34 +82,48 @@ module Asciidoctor
       end
 
       def term_dl_to_expression_metadata(prev, dlist)
-        %w(language script type isInternational).each do |a|
-          dl_to_attrs(prev, dlist, a)
+        term_dl_to_expression_root_metadata(prev, dlist)
+        term_dl_to_expression_name_metadata(prev, dlist)
+        term_to_letter_symbol(prev, dlist)
+      end
+
+      def term_dl_to_expression_root_metadata(prev, dlist)
+        %w(isInternational).each do |a|
+          p = prev.at("./expression | ./letter-symbol | ./graphical-symbol")
+          dl_to_attrs(p, dlist, a)
+        end
+        %w(language script type).each do |a|
+          p = prev.at("./expression") or next
+          dl_to_attrs(p, dlist, a)
         end
-        %w(abbreviationType pronunciation).reverse.each do |a|
+      end
+
+      def term_dl_to_expression_name_metadata(prev, dlist)
+        %w(abbreviation-type pronunciation).reverse.each do |a|
           dl_to_elems(prev.at("./expression/name"), prev, dlist, a)
         end
         g = dlist.at("./dt[text()='grammar']/following::dd//dl") and
           term_dl_to_expression_grammar(prev, g)
-        term_to_letter_symbol(prev, dlist)
       end
 
       def term_dl_to_expression_grammar(prev, dlist)
         prev.at(".//expression") or return
         prev.at(".//expression") << "<grammar><sentinel/></grammar>"
-        %w(gender isPreposition isParticiple isAdjective isAdverb isNoun
-           grammarValue).reverse.each do |a|
+        %w(gender number isPreposition isParticiple isAdjective isAdverb isNoun
+           grammar-value).reverse.each do |a|
           dl_to_elems(prev.at(".//expression/grammar/*"), prev.elements.last,
                       dlist, a)
         end
-        term_dl_to_designation_gender(prev)
+        term_dl_to_designation_category(prev, "gender")
+        term_dl_to_designation_category(prev, "number")
+        prev.at(".//expression/grammar/sentinel").remove
       end
 
-      def term_dl_to_designation_gender(prev)
-        gender = prev.at(".//expression/grammar/gender")
-        /,/.match?(gender&.text) and
-          gender.replace(gender.text.split(/,\s*/)
-            .map { |x| "<gender>#{x}</gender>" }.join)
-        prev.at(".//expression/grammar/sentinel").remove
+      def term_dl_to_designation_category(prev, category)
+        cat = prev.at(".//expression/grammar/#{category}")
+        /,/.match?(cat&.text) and
+          cat.replace(cat.text.split(/,\s*/)
+            .map { |x| "<#{category}>#{x}</#{category}>" }.join)
       end
 
       def term_to_letter_symbol(prev, dlist)
@@ -134,7 +171,7 @@ module Asciidoctor
       def term_termsource_to_designation(xmldoc)
         xmldoc.xpath("//term/termsource").each do |t|
           p = t.previous_element
-          while %w(domain subject usageinfo).include? p&.name
+          while %w(domain subject).include? p&.name
             p = p.previous_element
           end
           %w(preferred admitted deprecates related).include?(p&.name) or
@@ -155,7 +192,7 @@ module Asciidoctor
       end
 
       def related2pref(elem)
-        elem.name == "related" ? elem = elem.at("./preferred") : elem
+        elem&.name == "related" ? elem = elem.at("./preferred") : elem
       end
     end
   end

data/lib/asciidoctor/standoc/cleanup_text.rb

@@ -28,6 +28,7 @@ module Asciidoctor
       end
 
       # "abc<tag/>", def => "abc",<tag/> def
+=begin
       def uninterrupt_quotes_around_xml(xmldoc)
         xmldoc.xpath("//*[following::text()[1]"\
                      "[starts-with(., '\"') or starts-with(., \"'\")]]")
@@ -37,6 +38,28 @@ module Asciidoctor
           uninterrupt_quotes_around_xml1(x)
         end
       end
+=end
+=begin
+      def uninterrupt_quotes_around_xml(xmldoc)
+        xmldoc.traverse do |n|
+          next unless n.element? && n&.next&.text? &&
+            n.ancestors("pre, tt, sourcecode, stem, figure").empty?
+          next unless /^['"]/.match?(n.next.text)
+
+          uninterrupt_quotes_around_xml1(n)
+        end
+      end
+=end
+      def uninterrupt_quotes_around_xml(xmldoc)
+        xmldoc.traverse do |n|
+          next unless n.text? && n&.previous&.element?
+          next unless /^['"]/.match?(n.text)
+          next unless n.previous.ancestors("pre, tt, sourcecode, stem, figure")
+            .empty?
+
+          uninterrupt_quotes_around_xml1(n.previous)
+        end
+      end
 
       def uninterrupt_quotes_around_xml1(elem)
         prev = elem.at(".//preceding::text()[1]") or return

data/lib/asciidoctor/standoc/datamodel/attributes_table_preprocessor.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'erb'
+require "erb"
 
 module Asciidoctor
   module Standoc
@@ -9,7 +9,7 @@ module Asciidoctor
         BLOCK_START_REGEXP = /\{(.+?)\.\*,(.+),(.+)\}/
         BLOCK_END_REGEXP = /\A\{[A-Z]+\}\z/
         MARCO_REGEXP = /\[datamodel_attributes_table,([^,]+),?(.+)?\]/
-        TEMPLATES_PATH = File.expand_path('../views/datamodel', __dir__).freeze
+        TEMPLATES_PATH = File.expand_path("../views/datamodel", __dir__).freeze
         # search document for block `datamodel_attributes_table`
         #  read include derectives that goes after that in block and transform
         #  into yaml2text blocks
@@ -39,16 +39,16 @@ module Asciidoctor
         def model_representation(model_path)
           template = File.read(File.join(
                                  TEMPLATES_PATH,
-                                 'model_representation.adoc.erb'
-          ))
-          file_name = File.basename(model_path).gsub(/\.ya?ml/, '')
+                                 "model_representation.adoc.erb",
+                               ))
+          file_name = File.basename(model_path).gsub(/\.ya?ml/, "")
           ERB
             .new(template)
             .result(binding)
         end
 
         def yaml_relative_path(file_path, document)
-          directory = File.dirname(document.attributes['docfile'] || '.')
+          directory = File.dirname(document.attributes["docfile"] || ".")
           document.path_resolver.system_path(file_path, directory)
         end
       end

data/lib/asciidoctor/standoc/front.rb

@@ -94,7 +94,7 @@ module Asciidoctor
 
       def metadata_script(node, xml)
         xml.script (node.attr("script") ||
-                    default_script(node.attr("language")))
+                    Metanorma::Utils.default_script(node.attr("language")))
       end
 
       def relaton_relations
@@ -120,15 +120,19 @@ module Asciidoctor
       end
 
       def metadata_getrelation(node, xml, type, desc = nil)
-        docs = node.attr(desc || type) || return
+        docs = node.attr(desc || type) or return
         HTMLEntities.new.decode(docs).split(/;\s*/).each do |d|
-          id = d.split(/,\s*/)
-          xml.relation **{ type: relation_normalise(type) } do |r|
-            desc.nil? or r.description relation_normalise(desc)
-            fetch_ref(r, d, nil, **{}) or r.bibitem do |b|
-              b.title id[1] || "--"
-              b.docidentifier id[0]
-            end
+          metadata_getrelation1(d, xml, type, desc)
+        end
+      end
+
+      def metadata_getrelation1(doc, xml, type, desc)
+        id = doc.split(/,\s*/)
+        xml.relation **{ type: relation_normalise(type) } do |r|
+          desc.nil? or r.description desc.gsub(/-/, " ")
+          fetch_ref(r, doc, nil, **{}) or r.bibitem do |b|
+            b.title id[1] || "--"
+            b.docidentifier id[0]
           end
         end
       end

data/lib/asciidoctor/standoc/inline.rb

@@ -15,14 +15,10 @@ module Asciidoctor
 
       def inline_anchor(node)
         case node.type
-        when :ref
-          inline_anchor_ref node
-        when :xref
-          inline_anchor_xref node
-        when :link
-          inline_anchor_link node
-        when :bibref
-          inline_anchor_bibref node
+        when :ref then inline_anchor_ref node
+        when :xref then inline_anchor_xref node
+        when :link then inline_anchor_link node
+        when :bibref then inline_anchor_bibref node
         end
       end
 
@@ -50,7 +46,12 @@ module Asciidoctor
         m.nil? and return { target: t, type: "inline", text: node.text }
         droploc = m[:drop].nil? && m[:drop2].nil? ? nil : true
         f = m[:fn].nil? ? "inline" : "footnote"
-        c = %i[case fn drop drop2].any? { |x| !m[x].nil? } ? m[:text] : node.text
+        c = if %i[case fn drop drop2].any? do |x|
+                 !m[x].nil?
+               end
+              m[:text]
+            else node.text
+            end
         { target: t, type: f, case: m[:case]&.sub(/%$/, ""), droploc: droploc,
           text: c }
       end
@@ -58,8 +59,9 @@ module Asciidoctor
       def inline_anchor_link(node)
         contents = node.text
         contents = "" if node.target.gsub(%r{^mailto:}, "") == node.text
-        attributes = { "target": node.target, "alt": node.attr("title"),
-                       "updatetype": node.attr("updatetype") }
+        attributes = { target: node.target, alt: node.attr("title"),
+                       "update-type": node.attr("updatetype") ||
+                         node.attr("update-type") }
         noko do |xml|
           xml.link **attr_code(attributes) do |l|
             l << contents

data/lib/asciidoctor/standoc/isodoc.rng

@@ -58,7 +58,7 @@
           <attribute name="alt"/>
         </optional>
         <optional>
-          <attribute name="updatetype">
+          <attribute name="update-type">
             <data type="boolean"/>
           </attribute>
         </optional>
@@ -1796,6 +1796,20 @@
           <data type="ID"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="language"/>
+      </optional>
+      <optional>
+        <attribute name="script"/>
+      </optional>
+      <optional>
+        <attribute name="tag"/>
+      </optional>
+      <optional>
+        <attribute name="multilingual-rendering">
+          <ref name="MultilingualRenderingType"/>
+        </attribute>
+      </optional>
       <oneOrMore>
         <ref name="preferred"/>
       </oneOrMore>
@@ -1814,9 +1828,6 @@
       <optional>
         <ref name="termsubject"/>
       </optional>
-      <optional>
-        <ref name="termusage"/>
-      </optional>
       <oneOrMore>
         <ref name="termdefinition"/>
       </oneOrMore>
@@ -1880,17 +1891,37 @@
       </attribute>
     </optional>
     <optional>
-      <attribute name="geographicArea"/>
+      <attribute name="geographic-area"/>
     </optional>
     <choice>
       <ref name="expression_designation"/>
       <ref name="letter_symbol_designation"/>
       <ref name="graphical_symbol_designation"/>
     </choice>
+    <optional>
+      <ref name="fieldofapplication"/>
+    </optional>
+    <optional>
+      <ref name="usageinfo"/>
+    </optional>
     <zeroOrMore>
       <ref name="termsource"/>
     </zeroOrMore>
   </define>
+  <define name="fieldofapplication">
+    <element name="field-of-application">
+      <oneOrMore>
+        <ref name="PureTextElement"/>
+      </oneOrMore>
+    </element>
+  </define>
+  <define name="usageinfo">
+    <element name="usage-info">
+      <oneOrMore>
+        <ref name="PureTextElement"/>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="letter_symbol_designation">
     <element name="letter-symbol">
       <optional>
@@ -1942,11 +1973,15 @@
       </optional>
       <element name="name">
         <zeroOrMore>
-          <ref name="PureTextElement"/>
+          <choice>
+            <ref name="PureTextElement"/>
+            <ref name="stem"/>
+            <ref name="index"/>
+          </choice>
         </zeroOrMore>
       </element>
       <optional>
-        <element name="abbreviationType">
+        <element name="abbreviation-type">
           <ref name="AbbreviationType"/>
         </element>
       </optional>
@@ -1956,7 +1991,7 @@
         </element>
       </optional>
       <optional>
-        <element name="grammarInfo">
+        <element name="grammar">
           <ref name="Grammar"/>
         </element>
       </optional>
@@ -1983,6 +2018,11 @@
         <ref name="GrammarGender"/>
       </element>
     </zeroOrMore>
+    <zeroOrMore>
+      <element name="number">
+        <ref name="GrammarNumber"/>
+      </element>
+    </zeroOrMore>
     <optional>
       <element name="isPreposition">
         <data type="boolean"/>
@@ -2014,7 +2054,7 @@
       </element>
     </optional>
     <zeroOrMore>
-      <element name="grammarvalue">
+      <element name="grammar-value">
         <text/>
       </element>
     </zeroOrMore>
@@ -2027,6 +2067,13 @@
       <value>common</value>
     </choice>
   </define>
+  <define name="GrammarNumber">
+    <choice>
+      <value>singular</value>
+      <value>dual</value>
+      <value>plural</value>
+    </choice>
+  </define>
   <define name="termdomain">
     <element name="domain">
       <oneOrMore>
@@ -2041,13 +2088,6 @@
       </oneOrMore>
     </element>
   </define>
-  <define name="termusage">
-    <element name="usageinfo">
-      <oneOrMore>
-        <ref name="BasicBlock"/>
-      </oneOrMore>
-    </element>
-  </define>
   <define name="termdefinition">
     <element name="definition">
       <choice>
@@ -2061,9 +2101,17 @@
     </element>
   </define>
   <define name="verbaldefinition">
-    <element name="verbaldefinition">
+    <element name="verbal-definition">
       <oneOrMore>
-        <ref name="paragraph"/>
+        <choice>
+          <ref name="paragraph"/>
+          <ref name="dl"/>
+          <ref name="ol"/>
+          <ref name="ul"/>
+          <ref name="table"/>
+          <ref name="figure"/>
+          <ref name="formula"/>
+        </choice>
       </oneOrMore>
       <zeroOrMore>
         <ref name="termsource"/>
@@ -2071,7 +2119,7 @@
     </element>
   </define>
   <define name="nonverbalrep">
-    <element name="nonverbalrepresentation">
+    <element name="non-verbal-representation">
       <oneOrMore>
         <choice>
           <ref name="table"/>
@@ -2163,6 +2211,12 @@
           <value>modified</value>
         </choice>
       </attribute>
+      <attribute name="type">
+        <choice>
+          <value>authoritative</value>
+          <value>lineage</value>
+        </choice>
+      </attribute>
       <ref name="origin"/>
       <optional>
         <ref name="modification"/>

data/lib/asciidoctor/standoc/lists.rb

@@ -14,11 +14,9 @@ module Asciidoctor
 
       def ul_li(xml_ul, item)
         xml_ul.li **ul_li_attrs(item) do |xml_li|
+          xml_li.p(**attr_code(id_attr(item))) { |t| t << item.text }
           if item.blocks?
-            xml_li.p(**attr_code(id_attr(item))) { |t| t << item.text }
             xml_li << item.content
-          else
-            xml_li.p(**attr_code(id_attr(item))) { |p| p << item.text }
           end
         end
       end