metanorma-standoc 2.10.0 → 2.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be2ed59cc5913ed2c104fdd03479643b39183682a8e17d977d2afb6a6617cc1f
-  data.tar.gz: 38fa43ef39ca71510411b98a492d332f71d3ec4d234e4ccb3cbfc987c5d548bb
+  metadata.gz: d72c6ed69fa0ccc28a28c17306eee42d5a79512aac74e88fac810415ebed8744
+  data.tar.gz: 7f965dc03a094785be980450a1c5370de9d43ddbae30c805ca65669911d0dc69
 SHA512:
-  metadata.gz: f5db76444b5bc527f3edc10723f26a0fb230e826473b1426f812494128966bf21391922859f35112546d29ab9fd66ee7d71f4d298736d6b67359a4df7d2ebf69
-  data.tar.gz: 7d3fc23fab73965d54475bbc7b0be492b746eb8f351cc4123ee4f8b8870bc4c572634e2f37340649ab2d529ff39054f1faccadc82707204e1c754911e863334a
+  metadata.gz: 49896c1fd5521c1065a6a789baf7008a312bc1706772aff2b9938621d97185d77f4f8cd24d13c7b50554549e33b1f04c7b3a12364548d2fd6994431b12c967b4
+  data.tar.gz: 95e3c3de4fc714b04ebf54e24d2ae1c4d24cfafd9f9e3fb5795a5be8c5b86b302c6f2025d55eba42634666239faaa4cb863ad307eff14300765e8c096c00cc49

data/Gemfile

@@ -7,3 +7,4 @@ git_source(:github) { |repo| "https://github.com/#{repo}" }
 gemspec
 
 eval_gemfile("Gemfile.devel") rescue nil
+

data/lib/metanorma/standoc/biblio.rng

@@ -1783,9 +1783,21 @@ that the `number` given for the series applies to the second iteration of number
 May be used to differentiate rendering of notes in bibliographies</a:documentation>
         </attribute>
       </optional>
-      <ref name="LocalizedMarkedUpString">
+      <ref name="LocalizedStringAttributes">
         <a:documentation>The content of the note</a:documentation>
       </ref>
+      <choice>
+        <oneOrMore>
+          <ref name="BasicBlockNoId">
+            <a:documentation>Multiple blocks of content</a:documentation>
+          </ref>
+        </oneOrMore>
+        <oneOrMore>
+          <ref name="TextElement">
+            <a:documentation>Single block of content</a:documentation>
+          </ref>
+        </oneOrMore>
+      </choice>
     </element>
   </define>
   <define name="bibabstract">

data/lib/metanorma/standoc/cleanup_text.rb

@@ -88,6 +88,15 @@ module Metanorma
         end
       end
 
+      # "abc<tag/>", def => "abc",<tag/> def
+      # TODO?
+      def uninterrupt_quotes_around_xml1(xmldoc)
+          xmldoc.xpath("//text()[preceding-sibling::*[1]]").each do |n|
+          uninterrupt_quotes_around_xml_skip(n) and next
+          uninterrupt_quotes_around_xml1(n.previous)
+        end
+      end
+
       IGNORE_QUOTES_ELEMENTS =
         %w(pre tt sourcecode stem asciimath figure bibdata passthrough
            identifier metanorma-extension).freeze
@@ -157,6 +166,20 @@ module Metanorma
         end
       end
 
+      def dumb2smart_quotesx(xmldoc)
+        # TODO?>
+        prev = ""
+        xmldoc.xpath("//* | //text()").each do |x|
+          x.is_a?(Nokogiri::XML::Node) or next
+          block?(x) and prev = ""
+          empty_tag_with_text_content?(x) and prev = "dummy"
+          x.text? or next
+ancestor_include?(x, IGNORE_QUOTES_ELEMENTS) and next
+ dumb2smart_quotes1(x, prev)
+          prev = x.text
+        end
+      end
+
       def dumb2smart_quotes1(curr, prev)
         /[-'"(<>]|\.\.|\dx/.match?(curr.text) or return
 

data/lib/metanorma/standoc/isodoc.rng

@@ -17,7 +17,7 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
-<!-- VERSION v1.4.0 -->
+<!-- VERSION v1.4.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">
@@ -326,7 +326,7 @@ normative or informative references, some split references into sections organiz
       <a:documentation>Content of note</a:documentation>
       <oneOrMore>
         <choice>
-          <ref name="paragraph"/>
+          <ref name="paragraph-with-footnote"/>
           <ref name="ul"/>
           <ref name="ol"/>
           <ref name="dl"/>
@@ -412,7 +412,7 @@ normative or informative references, some split references into sections organiz
       <element name="note">
         <ref name="OptionalId"/>
         <oneOrMore>
-          <ref name="paragraph"/>
+          <ref name="paragraph-with-footnote"/>
         </oneOrMore>
       </element>
     </define>
@@ -1977,7 +1977,7 @@ used in document amendments</a:documentation>
       <oneOrMore>
         <choice>
           <a:documentation>Content of the verbal representation of the term</a:documentation>
-          <ref name="paragraph"/>
+          <ref name="paragraph-with-footnote"/>
           <ref name="dl"/>
           <ref name="ol"/>
           <ref name="ul"/>
@@ -2015,7 +2015,7 @@ used in document amendments</a:documentation>
       <oneOrMore>
         <choice>
           <a:documentation>Content of the term note</a:documentation>
-          <ref name="paragraph"/>
+          <ref name="paragraph-with-footnote"/>
           <ref name="ul"/>
           <ref name="ol"/>
           <ref name="dl"/>
@@ -2037,7 +2037,7 @@ used in document amendments</a:documentation>
           <ref name="dl"/>
           <ref name="quote"/>
           <ref name="sourcecode"/>
-          <ref name="paragraph"/>
+          <ref name="paragraph-with-footnote"/>
           <ref name="figure"/>
         </choice>
       </oneOrMore>

data/lib/metanorma/standoc/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "2.10.0".freeze
+    VERSION = "2.10.2".freeze
   end
 end

data/metanorma-standoc.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "asciidoctor", "~> 2.0.0"
   spec.add_dependency "crass", "~> 1.0.0"
   spec.add_dependency "iev", "~> 0.3.0"
-  spec.add_dependency "isodoc", "~> 2.12.1"
+  spec.add_dependency "isodoc", "~> 2.12.4"
   spec.add_dependency "metanorma", ">= 1.6.0"
   spec.add_dependency "metanorma-plugin-datastruct", "~> 0.3.0"
   spec.add_dependency "metanorma-plugin-glossarist", "~> 0.2.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 2.10.0
+  version: 2.10.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-11-11 00:00:00.000000000 Z
+date: 2024-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.12.1
+        version: 2.12.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.12.1
+        version: 2.12.4
 - !ruby/object:Gem::Dependency
   name: metanorma
   requirement: !ruby/object:Gem::Requirement