metanorma-generic 2.7.2 → 2.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5aaf13e062eaa9bbeb558f84841502576373ed5ca16b0de408ffb03e4188fd1
-  data.tar.gz: 426eb64a30385e162c09182980b28b66208aa5f85f2e056c03ffe17ff6d36f83
+  metadata.gz: 544489629e8593f44323300cb1055fb6ae045d123c71b6e0488d2e7fffcb0fa6
+  data.tar.gz: e32109c06d37c4346c2962f44b633e86aa69936859255592ebdcb27d7971d06b
 SHA512:
-  metadata.gz: f3ec27cd71d85d72b5ce074b5a6bb2d60ebb1a18b125f0b9801f0ebcf331b80e2c309ef3dc383883484854b61448c9c4167c8be72f69b9e1b2c599aca148fecd
-  data.tar.gz: 29db4667506fbfe0c578b951cb314ae202c4a3a92e9d085bf17ca2d7bf57713da907649a63b4d8e6c9602efd520efb0f97ad3ac3696f501e58f2daee585d3a0b
+  metadata.gz: aa0be32d01a1983b2cd595927651273318bb446e933ab47de201bf65290e688017a1b22984647329614fb4a6fc17a5d9822dc770e687fbf43a8706367279440f
+  data.tar.gz: 0cf866748e44a75bec32fe5699247093fa3ea48d914779fac795fd2abc2ae129cbea90e0904d728a1394d8daeaf7a50b5a6246fb275019a27469de0154590b6b

data/lib/isodoc/generic/pdf_convert.rb

@@ -10,7 +10,7 @@ module IsoDoc
         super
       end
 
-      def pdf_stylesheet(docxml)
+      def pdf_stylesheet(_docxml)
         configuration.pdf_stylesheet
       end
 

data/lib/isodoc/generic/presentation_xml_convert.rb

@@ -5,12 +5,8 @@ require "isodoc"
 module IsoDoc
   module Generic
     class PresentationXMLConvert < IsoDoc::PresentationXMLConvert
-      def annex1(elem)
-        lbl = @xrefs.anchor(elem["id"], :label)
-        if t = elem.at(ns("./title"))
-          t.children = "<strong>#{to_xml(t.children)}</strong>"
-        end
-        prefix_name(elem, "<br/>", lbl, "title")
+      def annex_delim(_elem)
+        "<br/>"
       end
 
       include Init

data/lib/isodoc/generic/utils.rb

@@ -10,18 +10,9 @@ module IsoDoc
       end
 
       def baselocation(loc)
-        return nil if loc.nil?
-        return "" if loc.empty?
-
-        return loc
-        f = if defined?(self.class::_file)
-              (self.class::_file || __FILE__)
-            else
-              __FILE__
-            end
-        File.expand_path(File.join(
-                           File.dirname(f), "..", "..", "..", loc
-                         ))
+        loc.nil? and return nil
+        loc.empty? and return ""
+        loc
       end
     end
   end

data/lib/metanorma/generic/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/generic/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/generic/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Generic
-    VERSION = "2.7.2".freeze
+    VERSION = "2.7.3".freeze
   end
 end

data/metanorma-generic.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = Gem::Requirement.new(">= 3.1.0")
 
-  spec.add_dependency "metanorma-standoc", "~> 2.10.0"
+  spec.add_dependency "metanorma-standoc", "~> 2.10.1"
 
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-generic
 version: !ruby/object:Gem::Version
-  version: 2.7.2
+  version: 2.7.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-11-11 00:00:00.000000000 Z
+date: 2024-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 2.10.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.10.0
+        version: 2.10.1
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement