metanorma-standoc 2.3.6 → 2.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7c637a8a2cab495ee675be427ab80dbfa3268f7630cc1161ca3f1b75c40688c
-  data.tar.gz: db253ce3dde5b476d87a404d6de2d99606410262ad091edacea453c18476910c
+  metadata.gz: 00ae5b84e04807e4d13ce97c2be80f47fc46a0004c8a1630d59f041597627f9e
+  data.tar.gz: 1e67f2c42a5b84081e44a6ad63b0cce70d980cc8478014de53355cf4b74e5e24
 SHA512:
-  metadata.gz: 1ba632dd7ca73b0c6314212c57d9a56ed2da84f52b4ab2cd32c46d53a1a994d096d2b6a43cdc4dd161f2ddfff19a2ac7d4c113e6181054631cb3494421ff02b0
-  data.tar.gz: bc6cf925cc3bd5aa0777044a2568368600adcffe486e164d1ca7d0dd31370c729e45eafc62e0d3dd64d0238d618efdf9a2fc4405dddfe5af25d982f93de69966
+  metadata.gz: 65608377bcc5b0b06e6895f6d9ed842c956def5cf77e28e25d4db3ae554b062f0e798afa2a964a18265396c22243d6aeebea98e913b4c269ddf09c04e3f06f92
+  data.tar.gz: 01aff668829eb7d52cec2e94e9b9da8b06353b56847a615b543e6fa2cfefad4fe8e9a9cc0f72e266b74e4f7535671f23ed34b31da43b6cddffe14ba189165e4c

data/lib/metanorma/standoc/base.rb

@@ -144,8 +144,7 @@ module Metanorma
       end
 
       def insert_xml_cr(doc)
-        doc
-          .gsub(%r{(</(clause|table|figure|p|bibitem|ul|ol|dl|dt|dd|li|example|
+        doc.gsub(%r{(</(clause|table|figure|p|bibitem|ul|ol|dl|dt|dd|li|example|
                        sourcecode|formula|quote|references|annex|appendix|title|
                        name|note|thead|tbody|tfoot|th|td|form|requirement|
                        recommendation|permission|imagemap|svgmap|preferred|
@@ -153,7 +152,8 @@ module Metanorma
                        graphical-symbol|expression|abbreviation-type|subject|
                        pronunciation|grammar|term|terms|termnote|termexample|
                        termsource|origin|termref|modification)>)}x, "\\1\n")
-          .gsub(%r{(<(title|name))}x, "\n\\1")
+          .gsub(%r{(<(title|name))}, "\n\\1")
+          .gsub(%r{(<sourcecode[^>]*>)\s+(<name[^>]*>[^<]+</name>)\s+}, "\\1\\2")
       end
 
       def version

data/lib/metanorma/standoc/basicdoc.rng

@@ -522,7 +522,6 @@
       <value>tip</value>
       <value>important</value>
       <value>caution</value>
-      <value>statement</value>
     </choice>
   </define>
   <define name="figure">

data/lib/metanorma/standoc/biblio.rng

@@ -1316,7 +1316,7 @@
       <value>commentaryOf</value>
       <value>hasCommentary</value>
       <value>related</value>
-      <value>complements</value>
+      <value>hasComplement</value>
       <value>complementOf</value>
       <value>obsoletes</value>
       <value>obsoletedBy</value>

data/lib/metanorma/standoc/blocks_notes.rb

@@ -91,11 +91,8 @@ module Metanorma
       end
 
       def admonition_name(node)
-        name = node.attr("name")
-        a = node.attr("type") and ["danger", "safety precautions"].each do |t|
-          name = t if a.casecmp(t).zero?
-        end
-        name
+        ret = node.attr("type") || node.attr("name")
+        ret&.downcase
       end
 
       def admonition(node)

data/lib/metanorma/standoc/cleanup_maths.rb

@@ -77,10 +77,10 @@ module Metanorma
       UNITSML_NS = "https://schema.unitsml.org/unitsml/1.0".freeze
 
       def add_misc_container(xmldoc)
-        unless ins = xmldoc.at("//misc-container")
+        unless ins = xmldoc.at("//metanorma-extension")
           a = xmldoc.at("//termdocsource") || xmldoc.at("//bibdata")
-          a.next = "<misc-container/>"
-          ins = xmldoc.at("//misc-container")
+          a.next = "<metanorma-extension/>"
+          ins = xmldoc.at("//metanorma-extension")
         end
         ins
       end

data/lib/metanorma/standoc/cleanup_xref.rb

@@ -77,7 +77,8 @@ module Metanorma
           elem["citeas"] = ""
           xref_to_eref1(elem)
         end
-        elem.delete("target").delete("style")
+        elem.delete("target")
+        elem.delete("style")
         extract_localities(elem)
       end
 
@@ -109,7 +110,7 @@ module Metanorma
       end
 
       def anchor_alias(xmldoc)
-        t = xmldoc.at("//misc-container/table[@id = " \
+        t = xmldoc.at("//metanorma-extension/table[@id = " \
                       "'_misccontainer_anchor_aliases']") or return
         key = ""
         t.xpath("./tbody/tr").each do |tr|

data/lib/metanorma/standoc/isodoc.rng

@@ -66,6 +66,7 @@
         <value>caution</value>
         <value>statement</value>
         <value>editorial</value>
+        <value>box</value>
       </choice>
     </define>
     <define name="index">
@@ -1580,7 +1581,7 @@
     </element>
   </define>
   <define name="misccontainer">
-    <element name="misc-container">
+    <element name="metanorma-extension">
       <oneOrMore>
         <ref name="AnyElement"/>
       </oneOrMore>

data/lib/metanorma/standoc/ref_utility.rb

@@ -25,7 +25,7 @@ module Metanorma
 
       def conditional_date(bib, match, noyr)
         if match.names.include?("year") && !match[:year].nil?
-          bib.date(**{ type: "published" }) do |d|
+          bib.date(type: "published") do |d|
             (noyr and d.on "--") or set_date_range(d, norm_year(match[:year]))
           end
         end
@@ -152,6 +152,12 @@ module Metanorma
         ref.gsub(/&/, "&")
           .gsub(/>\n/, "> \n")
       end
+
+      def skip_docid
+        <<~XPATH.strip.freeze
+          @type = 'DOI' or @type = 'doi' or @type = 'ISSN' or @type = 'issn' or @type = 'ISBN' or @type = 'isbn' or starts-with(@type, 'ISSN.') or starts-with(@type, 'ISBN.') or starts-with(@type, 'issn.') or starts-with(@type, 'isbn.')
+        XPATH
+      end
     end
   end
 end

data/lib/metanorma/standoc/section.rb

@@ -53,8 +53,8 @@ module Metanorma
       end
 
       PREFACE_CLAUSE_NAMES =
-        %w(abstract foreword introduction misc-container
-           acknowledgements).freeze
+        %w(abstract foreword introduction metanorma-extension
+           misc-container acknowledgements).freeze
 
       MAIN_CLAUSE_NAMES =
         ["normative references", "terms and definitions", "scope",
@@ -108,7 +108,8 @@ module Metanorma
         a = section_attributes(node)
         noko do |xml|
           case sectiontype(node)
-          when "misc-container" then misccontainer_parse(a, xml, node)
+          when "misc-container", "metanorma-extension"
+            misccontainer_parse(a, xml, node)
           when "introduction" then introduction_parse(a, xml, node)
           when "foreword" then foreword_parse(a, xml, node)
           when "scope" then scope_parse(a, xml, node)

data/lib/metanorma/standoc/validate.rb

@@ -23,7 +23,7 @@ module Metanorma
         @iev = init_iev or return
         xmldoc.xpath("//term").each do |t|
           t.xpath(".//termsource").each do |src|
-            (/^IEC 60050-/.match(src.at("./origin/@citeas")&.text) &&
+            (/^IEC[  ]60050-/.match(src.at("./origin/@citeas")&.text) &&
           loc = src.xpath(SOURCELOCALITY)&.text) or next
             iev_validate1(t, loc, xmldoc)
           end
@@ -182,7 +182,7 @@ module Metanorma
       WILDCARD_ATTRS =
         "//*[@format] | //stem | //bibdata//description | " \
         "//formattedref | //bibdata//note | //bibdata/abstract | " \
-        "//bibitem/abstract | //bibitem/note | //misc-container".freeze
+        "//bibitem/abstract | //bibitem/note | //metanorma-extension".freeze
 
       # RelaxNG cannot cope well with wildcard attributes. So we strip
       # any attributes from FormattedString instances (which can contain
@@ -204,7 +204,7 @@ module Metanorma
         @doc_xrefs = doc.xpath("//xref/@target | //xref/@to")
           .each_with_object({}) do |x, m|
           m[x.text] = x
-          @doc_ids[x] and next
+          @doc_ids[x.text] and next
           @log.add("Anchors", x.parent,
                    "Crossreference target #{x} is undefined")
         end

data/lib/metanorma/standoc/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "2.3.6".freeze
+    VERSION = "2.3.8".freeze
   end
 end

data/metanorma-standoc.gemspec

@@ -41,7 +41,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "latexmath"
   spec.add_dependency "mathml2asciimath"
   spec.add_dependency "pngcheck"
-  spec.add_dependency "relaton-cli", "~> 1.14.0"
+  spec.add_dependency "relaton-cli", "~> 1.15.0"
   spec.add_dependency "relaton-iev", "~> 1.1.0"
   spec.add_dependency "unicode2latex", "~> 0.0.1"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 2.3.6
+  version: 2.3.8
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-30 00:00:00.000000000 Z
+date: 2023-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -184,14 +184,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.14.0
+        version: 1.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.14.0
+        version: 1.15.0
 - !ruby/object:Gem::Dependency
   name: relaton-iev
   requirement: !ruby/object:Gem::Requirement