isodoc 2.0.5.1 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7eac37329d91f52ffb48b04b35a58e9d5966ba1ef79492c7e1fd14f77490b81a
-  data.tar.gz: e4e1fffbadb350529b5b8bcc4e3f8b13604fd9ceb982d935da33f61722ab1984
+  metadata.gz: 3633136f121834056746917a4af6b5c6b917365ffb941b0561a0941d16ccfb3a
+  data.tar.gz: d15461d2103ff7e43ee22c1afe80d4a4b4e0a240a76c3ee5afe11df47652ab72
 SHA512:
-  metadata.gz: 7f64dbf601952d1e7141ddca015d6fe61e989efd1d751ee9e42575a78e818a3551c4cbb26f5890dc53a1a50c1e75c02deca03e26c64b3568e1f49b76985027c0
-  data.tar.gz: fe336da69b2efe89d21299708b62f968109f4ff7be2973cdd6d4f92e56616ff79ee71c024a222794dfdabb7d67b8b50b7d7065f448704d6383f93639846fea20
+  metadata.gz: 047f237237096490e9a6380675f96d46e1de721025f17eb60a3140face2cfe794d649fb31d992bca7a63e863c42c6d79cd42fa0810c77f6bc09518d905b55fbf
+  data.tar.gz: 7cde47764db6a87866b4fe618550dc8412b85c32c90ea2e60a903083849b6e16325574d723dbb83948a8524062fa63b4c0eb19a50590f0fb3d46164962dc0368

data/.github/workflows/release.yml

@@ -0,0 +1,24 @@
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
+name: release
+
+on:
+  workflow_dispatch:
+    inputs:
+      next_version:
+        description: |
+          Next release version. Possible values: x.y.z, major, minor, patch or pre|rc|etc
+        required: true
+        default: 'skip'
+  push:
+    tags: [ v* ]
+
+jobs:
+  release:
+    uses: metanorma/metanorma-build-scripts/.github/workflows/rubygems-release.yml@main
+    with:
+      next_version: ${{ github.event.inputs.next_version }}
+      event_name: ${{ github.event_name }}
+    secrets:
+      rubygems-api-key: ${{ secrets.METANORMA_CI_RUBYGEMS_API_KEY }}
+

data/lib/isodoc/html_function/postprocess_footnotes.rb

@@ -36,7 +36,7 @@ module IsoDoc::HtmlFunction
     def footnote_backlinks(docxml)
       seen = {}
       docxml.xpath('//a[@class = "FootnoteRef"]').each_with_index do |x, i|
-        seen[x["href"]] and next or seen[x["href"]] = true
+        (seen[x["href"]] and next) or seen[x["href"]] = true
         fn = docxml.at(%<//*[@id = '#{x['href'].sub(/^#/, '')}']>) || next
         footnote_backlinks1(x, fn)
         x["id"] ||= "fnref:#{i + 1}"

data/lib/isodoc/metadata_contributor.rb

@@ -5,10 +5,9 @@ module IsoDoc
         if a.at(ns("./name/completename"))
           ret << a.at(ns("./name/completename")).text
         else
-          forenames = a.xpath(ns("./name/forename"))
-          fn = forenames.each_with_object([]) { |f, m| m << f.text }
-          surname = a&.at(ns("./name/surname"))&.text
-          ret << "#{fn.join(' ')} #{surname}"
+          fn = a.xpath(ns("./name/forename"))
+            .each_with_object([]) { |f, m| m << f.text }
+          ret << "#{fn.join(' ')} #{a&.at(ns('./name/surname'))&.text}"
         end
       end
     end

data/lib/isodoc/presentation_function/inline.rb

@@ -50,7 +50,7 @@ module IsoDoc
       node["droploc"] = true
       ret = resolve_eref_connectives(eref_locality_stacks(refs, target,
                                                           node))
-      node["droploc"] = droploc
+      node.delete("droploc") unless droploc
       eref_localities1(target,
                        refs.first.at(ns("./locality/@type")).text,
                        l10n(ret[1..-1].join), nil, node, @lang)
@@ -114,14 +114,18 @@ module IsoDoc
         added.each { |a| m << a }
         next if i == refs.size - 1
 
-        m << if r&.next_element&.name == "localityStack"
-               r.next_element["connective"]
-             else locality_delimiter(r)
-             end
+        m << eref_locality_delimiter(r)
       end
       ret.empty? ? ret : [", "] + ret
     end
 
+    def eref_locality_delimiter(ref)
+      if ref&.next_element&.name == "localityStack"
+        ref.next_element["connective"]
+      else locality_delimiter(ref)
+      end
+    end
+
     def eref_locality_stack(ref, idx, target, node)
       ret = []
       if ref.name == "localityStack"

data/lib/isodoc/presentation_xml_convert.rb

@@ -13,7 +13,7 @@ module IsoDoc
       super
     end
 
-    def convert1(docxml, filename, dir)
+    def convert1(docxml, _filename, _dir)
       @xrefs.parse docxml
       info docxml, nil
       conversions(docxml)
@@ -76,11 +76,11 @@ module IsoDoc
     end
 
     def postprocess(result, filename, _dir)
-      toXML(result, filename)
+      to_xml(result, filename)
       @files_to_delete.each { |f| FileUtils.rm_rf f }
     end
 
-    def toXML(result, filename)
+    def to_xml(result, filename)
       File.open(filename, "w:UTF-8") { |f| f.write(result) }
     end
   end

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "2.0.5.1".freeze
+  VERSION = "2.0.6".freeze
 end

data/lib/isodoc/word_function/body.rb

@@ -233,7 +233,7 @@ module IsoDoc
       end
 
       def suffix_url(url)
-        return url if url.nil? || %r{^https?://}.match?(url)
+        return url if url.nil? || %r{^https?://|^#}.match?(url)
         return url unless File.extname(url).empty?
 
         url.sub(/#{File.extname(url)}$/, ".doc")

data/lib/isodoc/word_function/postprocess.rb

@@ -107,9 +107,8 @@ module IsoDoc
                 x += 1
               end
               (r..(r + rs - 1)).each do |y2|
-                (x..(x + cs - 1)).each do |x2|
-                  cells2d[y2][x2] = 1
-                end
+                cells2d[y2].nil? and next
+                (x..(x + cs - 1)).each { |x2| cells2d[y2][x2] = 1 }
               end
               width = (x..(x + cs - 1)).each_with_object({ width: 0 }) do |z, m|
                 m[:width] += w[z]

data/lib/isodoc/xref/xref_gen.rb

@@ -35,7 +35,7 @@ module IsoDoc
         @labels["termnote"].gsub(/%/, note.to_s)
       end
 
-      def increment_label(elems, node, counter, increment = true)
+      def increment_label(elems, node, counter, increment: true)
         return "" if elems.size == 1 && !node["number"]
 
         counter.increment(node) if increment
@@ -62,10 +62,9 @@ module IsoDoc
           c = Counter.new
           examples.reject { |n| blank?(n["id"]) }.each do |n|
             c.increment(n)
-            idx = increment_label(examples, n, c, false)
-            @anchors[n["id"]] =
-              anchor_struct(idx, n, @labels["example_xref"], "termexample",
-                            n["unnumbered"])
+            idx = increment_label(examples, n, c, increment: false)
+            @anchors[n["id"]] = anchor_struct(idx, n, @labels["example_xref"],
+                                              "termexample", n["unnumbered"])
           end
         end
       end
@@ -88,18 +87,23 @@ module IsoDoc
 
       def note_anchor_names(sections)
         sections.each do |s|
-          c = Counter.new
-          (notes = s.xpath(CHILD_NOTES_XPATH)).each do |n|
-            next if @anchors[n["id"]] || n["id"].nil? || n["id"].empty?
-
-            @anchors[n["id"]] =
-              anchor_struct(increment_label(notes, n, c), n,
-                            @labels["note_xref"], "note", false)
-          end
+          notes = s.xpath(CHILD_NOTES_XPATH) -
+            s.xpath(ns(".//figure//note | .//table//note"))
+          note_anchor_names1(notes, Counter.new)
           note_anchor_names(s.xpath(ns(CHILD_SECTIONS)))
         end
       end
 
+      def note_anchor_names1(notes, counter)
+        notes.each do |n|
+          next if @anchors[n["id"]] || blank?(n["id"])
+
+          @anchors[n["id"]] =
+            anchor_struct(increment_label(notes, n, counter), n,
+                          @labels["note_xref"], "note", false)
+        end
+      end
+
       CHILD_EXAMPLES_XPATH =
         "./*[not(self::xmlns:clause) and not(self::xmlns:appendix) and "\
         "not(self::xmlns:terms) and not(self::xmlns:definitions)]//"\
@@ -110,18 +114,22 @@ module IsoDoc
 
       def example_anchor_names(sections)
         sections.each do |s|
-          c = Counter.new
-          (notes = s.xpath(CHILD_EXAMPLES_XPATH)).each do |n|
-            next if @anchors[n["id"]] || n["id"].nil? || n["id"].empty?
-
-            @anchors[n["id"]] =
-              anchor_struct(increment_label(notes, n, c), n,
-                            @labels["example_xref"], "example", n["unnumbered"])
-          end
+          notes = s.xpath(CHILD_EXAMPLES_XPATH)
+          example_anchor_names1(notes, Counter.new)
           example_anchor_names(s.xpath(ns(CHILD_SECTIONS)))
         end
       end
 
+      def example_anchor_names1(notes, counter)
+        notes.each do |n|
+          next if @anchors[n["id"]] || blank?(n["id"])
+
+          @anchors[n["id"]] =
+            anchor_struct(increment_label(notes, n, counter), n,
+                          @labels["example_xref"], "example", n["unnumbered"])
+        end
+      end
+
       def list_anchor_names(sections)
         sections.each do |s|
           notes = s.xpath(ns(".//ol")) - s.xpath(ns(".//clause//ol")) -
@@ -155,17 +163,20 @@ module IsoDoc
         sections.each do |s|
           notes = s.xpath(ns(".//dl")) - s.xpath(ns(".//clause//dl")) -
             s.xpath(ns(".//appendix//dl")) - s.xpath(ns(".//dl//dl"))
-          c = Counter.new
-          notes.reject { |n| blank?(n["id"]) }.each do |n|
-            @anchors[n["id"]] =
-              anchor_struct(increment_label(notes, n, c), n,
-                            @labels["deflist"], "deflist", false)
-            deflist_term_anchor_names(n, @anchors[n["id"]])
-          end
+          deflist_anchor_names1(notes, Counter.new)
           deflist_anchor_names(s.xpath(ns(CHILD_SECTIONS)))
         end
       end
 
+      def deflist_anchor_names1(notes, counter)
+        notes.reject { |n| blank?(n["id"]) }.each do |n|
+          @anchors[n["id"]] =
+            anchor_struct(increment_label(notes, n, counter), n,
+                          @labels["deflist"], "deflist", false)
+          deflist_term_anchor_names(n, @anchors[n["id"]])
+        end
+      end
+
       def deflist_term_anchor_names(list, list_anchor)
         list.xpath(ns("./dt")).each do |li|
           label = l10n("#{list_anchor[:xref]}: #{dt2xreflabel(li)}")

data/lib/isodoc/xslfo_convert.rb

@@ -2,7 +2,7 @@ require "metanorma"
 
 module IsoDoc
   class XslfoPdfConvert < ::IsoDoc::Convert
-    # MN2PDF_OPTIONS = :mn2pdf
+    MN_OPTIONS_KEY = :mn2pdf
     MN2PDF_FONT_MANIFEST = :font_manifest
     MN2PDF_OPTIONS = { pdfencryptionlength: "--encryption-length",
                        pdfownerpassword: "--owner-password",
@@ -43,7 +43,7 @@ module IsoDoc
 
     def pdf_options(_docxml)
       ret = {}
-      font_manifest = @options[MN2PDF_FONT_MANIFEST] and
+      font_manifest = @options.dig(MN_OPTIONS_KEY, MN2PDF_FONT_MANIFEST) and
         ret[MN2PDF_FONT_MANIFEST] = font_manifest
       @aligncrosselements && !@aligncrosselements.empty? and
         ret["--param align-cross-elements="] =

data/lib/metanorma/output/base.rb

@@ -1,10 +1,9 @@
-
 module Metanorma
   module Output
 
     class Base
 
-      def convert(in_path, out_path)
+      def convert(_in_path, _out_path)
         raise "This is an abstract class"
       end
 

data/spec/isodoc/blocks_spec.rb

@@ -558,6 +558,49 @@ RSpec.describe IsoDoc do
       .convert("test", input, true)))).to be_equivalent_to xmlpp(doc)
   end
 
+  it "numbers notes in tables and figures separately from notes outside them" do
+    input = <<~INPUT
+      <iso-standard xmlns="http://riboseinc.com/isoxml">
+          <preface><foreword>
+          <figure id="F"><note id="FB"><p>XYZ</p></note></figure>
+          <table id="T"><note id="TB"><p>XYZ</p></note></table>
+          <p id="A">ABC <note id="B"><p id="C">XYZ</p></note>
+      </foreword></preface>
+          </iso-standard>
+    INPUT
+    output = <<~OUTPUT
+           <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
+         <preface>
+           <foreword displayorder='1'>
+             <figure id='F'>
+               <name>Figure 1</name>
+               <note id='FB'>
+                 <name>NOTE</name>
+                 <p>XYZ</p>
+               </note>
+             </figure>
+             <table id='T'>
+               <name>Table 1</name>
+               <note id='TB'>
+                 <name>NOTE</name>
+                 <p>XYZ</p>
+               </note>
+             </table>
+             <p id='A'>
+               ABC
+               <note id='B'>
+                 <name>NOTE</name>
+                 <p id='C'>XYZ</p>
+               </note>
+             </p>
+           </foreword>
+         </preface>
+       </iso-standard>
+    OUTPUT
+    expect(xmlpp(IsoDoc::PresentationXMLConvert.new({})
+      .convert("test", input, true))).to be_equivalent_to xmlpp(output)
+  end
+
   it "processes figures" do
     input = <<~INPUT
           <iso-standard xmlns="http://riboseinc.com/isoxml">

data/spec/isodoc/inline_spec.rb

@@ -2208,7 +2208,7 @@ RSpec.describe IsoDoc do
     output = <<~OUTPUT
       <itu-standard xmlns='https://www.calconnect.org/standards/itu' type='presentation'>
          <p id='_'>
-           <eref type='inline' bibitemid='ref1' citeas='XYZ' droploc=''>
+           <eref type='inline' bibitemid='ref1' citeas='XYZ'>
              <localityStack connective='from'>
                <locality type='clause'>
                  <referenceFrom>3</referenceFrom>
@@ -2239,7 +2239,7 @@ RSpec.describe IsoDoc do
            </eref>
             text
          </p>
-         <eref type='inline' bibitemid='ref1' citeas='XYZ' droploc=''>
+         <eref type='inline' bibitemid='ref1' citeas='XYZ'>
            <localityStack connective='and'>
              <locality type='clause'>
                <referenceFrom>3</referenceFrom>
@@ -2252,7 +2252,7 @@ RSpec.describe IsoDoc do
            </localityStack>
            XYZ, Clause 3 and 5
          </eref>
-         <eref type='inline' bibitemid='ref1' citeas='XYZ' droploc=''>
+         <eref type='inline' bibitemid='ref1' citeas='XYZ'>
            <localityStack connective='and'>
              <locality type='clause'>
                <referenceFrom>3</referenceFrom>
@@ -2296,7 +2296,7 @@ RSpec.describe IsoDoc do
            </localityStack>
             text
          </eref>
-         <eref type='inline' bibitemid='ref1' citeas='XYZ' droploc=''>
+         <eref type='inline' bibitemid='ref1' citeas='XYZ'>
            <localityStack connective='from'>
              <locality type='clause'>
                <referenceFrom>3</referenceFrom>

data/spec/isodoc/xslfo_convert_spec.rb

@@ -15,7 +15,7 @@ RSpec.describe IsoDoc do
     convert = IsoDoc::XslfoPdfConvert.new(
       {
         datauriimage: false,
-        IsoDoc::XslfoPdfConvert::MN2PDF_OPTIONS => {
+        IsoDoc::XslfoPdfConvert::MN_OPTIONS_KEY => {
           IsoDoc::XslfoPdfConvert::MN2PDF_FONT_MANIFEST => nil,
         },
       },
@@ -32,8 +32,7 @@ RSpec.describe IsoDoc do
     convert = IsoDoc::XslfoPdfConvert.new(
       {
         datauriimage: false,
-        IsoDoc::XslfoPdfConvert::MN2PDF_OPTIONS => mn2pdf_opts,
-        font_manifest: "/tmp/manifest.yml",
+        IsoDoc::XslfoPdfConvert::MN_OPTIONS_KEY => mn2pdf_opts,
       },
     )
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 2.0.5.1
+  version: 2.0.6
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-07 00:00:00.000000000 Z
+date: 2022-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath
@@ -372,6 +372,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/workflows/rake.yml"
+- ".github/workflows/release.yml"
 - ".hound.yml"
 - ".oss-guides.rubocop.yml"
 - ".rubocop.yml"
@@ -534,7 +535,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.3.9
 signing_key:
 specification_version: 4
 summary: Convert documents in IsoDoc into Word and HTML in AsciiDoc.