metanorma-standoc 2.4.2 → 2.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04c2c98697be18adacdad75abadd4f5d323d6082091a17de0a70f3ffa2488317
-  data.tar.gz: 8824f124552d8e6ac6d38c5330dbd194bd6171bf24f0b870b9b7dff281e6df52
+  metadata.gz: d0ade5d859084779fe2f7357438926e03e0359adbf528d4db67a1851200f7e45
+  data.tar.gz: d17ee40a8d465764b0d7577a0ab69db5d96ab1c4e5c923b77059326d2e52e45c
 SHA512:
-  metadata.gz: cfe8279a23b6c7323927907f5063e2b1dc98b64ad83d742ced62f4bdd6b098bd520cbcaa051319ad0d247efab17d2d989554bce9ba70ba8251fa01e28f384fe5
-  data.tar.gz: 261168bf0efc23682c9e9a1fb8294a0e6ecf3c541a3ed4fcc6fb31a8116c211c967b8b8f4c26c021d8eceb84a284996bcf0952443bef289705229d669c86e819
+  metadata.gz: 794db303464ba57e25b5ccb240b794524842fe99a42cf136f7f0ff3d0e77f82eb017676b3a0b9ef491b655ffe42b50d9332d880c4a10c9ca7a705252e62c5199
+  data.tar.gz: 6f9f27b816283a7cf27fc3b441cfd9d04a72c7a26da7d66264f3984e391e4ab3f3be384e167e1a813d8bfabcc070d98f162908a5f1a9dd5670dca3614e002873

data/lib/metanorma/standoc/base.rb

@@ -168,9 +168,14 @@ module Metanorma
         Metanorma.versioned(Metanorma, flavour)[-1]::VERSION
       end
 
-      def clean_exit
-        @log.write("#{@output_dir}#{@filename}.err") unless @novalid
+      def schema_version
+        f = File.read(File.join(File.dirname(__FILE__), "isodoc.rng"))
+        m = / VERSION (v\S+)/.match(f)
+        m[1]
+      end
 
+      def clean_exit
+        @novalid or @log.write("#{@output_dir}#{@filename}.err")
         @files_to_delete.each { |f| FileUtils.rm f }
       end
 
@@ -185,7 +190,8 @@ module Metanorma
 
       def makexml1(node)
         result = ["<?xml version='1.0' encoding='UTF-8'?>",
-                  "<#{xml_root_tag} type='semantic' version='#{version}'>"]
+                  "<#{xml_root_tag} type='semantic' version='#{version}' " \
+                  "schema-version='#{schema_version}'>"]
         result << noko { |ixml| front node, ixml }
         result << noko { |ixml| middle node, ixml }
         result << "</#{xml_root_tag}>"
@@ -225,8 +231,7 @@ module Metanorma
       def metadata_attrs(node)
         node.attributes.each_with_object([]) do |(k, v), ret|
           %w(presentation semantic).each do |t|
-            next unless /^#{t}-metadata-/.match?(k)
-
+            /^#{t}-metadata-/.match?(k) or next
             k = k.sub(/^#{t}-metadata-/, "")
             csv_split(v, ",")&.each do |c|
               ret << "<#{t}-metadata><#{k}>#{c}</#{k}></#{t}-metadata>"

data/lib/metanorma/standoc/cleanup_block.rb

@@ -79,8 +79,7 @@ module Metanorma
       def single_subfigure_cleanup(xmldoc)
         xmldoc.xpath("//figure[figure]").each do |e|
           s = e.xpath("./figure")
-          return unless s.size == 1
-
+          s.size == 1 or next
           s[0].replace(s[0].children)
         end
       end

data/lib/metanorma/standoc/cleanup_footnotes.rb

@@ -42,11 +42,15 @@ module Metanorma
           outnum = idx
           seen[content] = outnum
         end
-        fnote["reference"] = (outnum - 1 + "a".ord).chr
+        fnote["reference"] = table_footnote_number(outnum)
         fnote["table"] = true
         [idx, seen]
       end
 
+      def table_footnote_number(outnum)
+        (outnum - 1 + "a".ord).chr
+      end
+
       def table_footnote_renumber(xmldoc)
         xmldoc.xpath("//table | //figure").each do |t|
           seen = {}

data/lib/metanorma/standoc/converter.rb

@@ -86,7 +86,7 @@ module Metanorma
         basebackend "html"
         outfilesuffix ".xml"
         @libdir = File.dirname(self.class::_file || __FILE__)
-                @c = HTMLEntities.new
+        @c = HTMLEntities.new
       end
 
       class << self

data/lib/metanorma/standoc/isodoc.rng

@@ -17,6 +17,7 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
+<!-- VERSION v1.2.1 -->
 <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <include href="reqt.rng"/>
   <include href="basicdoc.rng">
@@ -1349,15 +1350,19 @@
       </choice>
     </element>
   </define>
+  <define name="Root-Attributes">
+    <attribute name="version"/>
+    <attribute name="schema-version"/>
+    <attribute name="type">
+      <choice>
+        <value>semantic</value>
+        <value>presentation</value>
+      </choice>
+    </attribute>
+  </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="Root-Attributes"/>
       <ref name="bibdata"/>
       <optional>
         <ref name="misccontainer"/>

data/lib/metanorma/standoc/ref.rb

@@ -122,7 +122,7 @@ module Metanorma
           t.formattedref format: "application/x-isodoc+xml" do |i|
             i << ref_normalise_no_format(match[:text])
           end
-          yr_match = /[:-](?<year>(?:19|20)[0-9][0-9])\b/.match(code[:id])
+          yr_match = refitem1yr(code[:id])
           refitem_render1(match, code, t)
           /^\d+$|^\(.+\)$/.match?(code[:id]) or
             docnumber(t, code[:id].sub(/[:-](19|20)[0-9][0-9]$/, ""))
@@ -143,16 +143,17 @@ module Metanorma
         ((code[:id] && code[:numeric]) || code[:nofetch]) and
           return { code: nil, match: match, analyse_code: code,
                    hidden: code[:hidden] }
-        year = refitem1yr(code[:id])
         { code: code[:id], analyse_code: code, localfile: code[:localfile],
-          year: year,
+          year: (m = refitem1yr(code[:id])) ? m[:year] : nil,
           title: match[:text], match: match, hidden: code[:hidden],
           usrlbl: match[:usrlbl], lang: (@lang || :all) }
       end
 
       def refitem1yr(code)
-        yr_match = /[:-](?<year>(?:19|20)[0-9][0-9])\b/.match(code)
-        yr_match ? yr_match[:year] : nil
+        yr_match = /[:-](?<year>(?:19|20)[0-9][0-9])$/.match(code)
+        /[:-](?:19|20)[0-9][0-9].*?[:-](?:19|20)[0-9][0-9]$/.match(code) and
+          yr_match = nil
+        yr_match
       end
 
       def refitemout(item, xml)

data/lib/metanorma/standoc/validate.rb

@@ -1,6 +1,7 @@
 require "metanorma/standoc/utils"
 require_relative "./validate_section"
 require_relative "./validate_table"
+require_relative "./validate_xref"
 require "nokogiri"
 require "jing"
 require "iev"
@@ -155,22 +156,6 @@ module Metanorma
         ret
       end
 
-      def repeat_id_validate1(elem)
-        if @doc_ids[elem["id"]]
-          @log.add("Anchors", elem, "Anchor #{elem['id']} has already been " \
-                                    "used at line #{@doc_ids[elem['id']]}")
-          @fatalerror << "Multiple instances of same ID: #{elem['id']}"
-        end
-        @doc_ids[elem["id"]] = elem.line
-      end
-
-      def repeat_id_validate(doc)
-        @doc_ids = {}
-        doc.xpath("//*[@id]").each do |x|
-          repeat_id_validate1(x)
-        end
-      end
-
       def schema_validate(doc, schema)
         Tempfile.open(["tmp", ".xml"], encoding: "UTF-8") do |f|
           schema_validate1(f, doc, schema)
@@ -214,17 +199,6 @@ module Metanorma
         doc
       end
 
-      # manually check for xref/@target, xref/@to integrity
-      def xref_validate(doc)
-        @doc_xrefs = doc.xpath("//xref/@target | //xref/@to")
-          .each_with_object({}) do |x, m|
-          m[x.text] = x
-          @doc_ids[x.text] and next
-          @log.add("Anchors", x.parent,
-                   "Crossreference target #{x} is undefined")
-        end
-      end
-
       def image_validate(doc)
         image_exists(doc)
         png_validate(doc)

data/lib/metanorma/standoc/validate_xref.rb

@@ -0,0 +1,32 @@
+module Metanorma
+  module Standoc
+    module Validate
+      def repeat_id_validate1(elem)
+        if @doc_ids[elem["id"]]
+          @log.add("Anchors", elem, "Anchor #{elem['id']} has already been " \
+                                    "used at line #{@doc_ids[elem['id']]}")
+          @fatalerror << "Multiple instances of same ID: #{elem['id']}"
+        end
+        @doc_ids[elem["id"]] = elem.line
+      end
+
+      def repeat_id_validate(doc)
+        @doc_ids = {}
+        doc.xpath("//*[@id]").each do |x|
+          repeat_id_validate1(x)
+        end
+      end
+
+      # manually check for xref/@target, xref/@to integrity
+      def xref_validate(doc)
+        @doc_xrefs = doc.xpath("//xref/@target | //xref/@to")
+          .each_with_object({}) do |x, m|
+          m[x.text] = x
+          @doc_ids[x.text] and next
+          @log.add("Anchors", x.parent,
+                   "Crossreference target #{x} is undefined")
+        end
+      end
+    end
+  end
+end

data/lib/metanorma/standoc/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "2.4.2".freeze
+    VERSION = "2.4.3".freeze
   end
 end

data/metanorma-standoc.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "asciidoctor", "~> 2.0.0"
   spec.add_dependency "iev", "~> 0.3.0"
-  spec.add_dependency "isodoc", "~> 2.5.0"
+  spec.add_dependency "isodoc", "~> 2.5.4"
   spec.add_dependency "metanorma", ">= 1.5.0"
   spec.add_dependency "metanorma-plugin-datastruct", "~> 0.2.0"
   spec.add_dependency "metanorma-plugin-lutaml"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 2.4.2
+  version: 2.4.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-10 00:00:00.000000000 Z
+date: 2023-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.5.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.5.4
 - !ruby/object:Gem::Dependency
   name: metanorma
   requirement: !ruby/object:Gem::Requirement
@@ -514,6 +514,7 @@ files:
 - lib/metanorma/standoc/validate.rb
 - lib/metanorma/standoc/validate_section.rb
 - lib/metanorma/standoc/validate_table.rb
+- lib/metanorma/standoc/validate_xref.rb
 - lib/metanorma/standoc/version.rb
 - lib/metanorma/standoc/views/datamodel/model_representation.adoc.erb
 - lib/metanorma/standoc/views/datamodel/plantuml_representation.adoc.erb