isodoc 2.0.5.1 → 2.0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7eac37329d91f52ffb48b04b35a58e9d5966ba1ef79492c7e1fd14f77490b81a
-  data.tar.gz: e4e1fffbadb350529b5b8bcc4e3f8b13604fd9ceb982d935da33f61722ab1984
+  metadata.gz: '099aeb3456fabbcbd95076b6ccb9826997871b9d85ff079fc04aadf82a491a80'
+  data.tar.gz: 4002cee22c77b7a64f69864f3a67990cdfedddd458f95e86921ff132a804fe10
 SHA512:
-  metadata.gz: 7f64dbf601952d1e7141ddca015d6fe61e989efd1d751ee9e42575a78e818a3551c4cbb26f5890dc53a1a50c1e75c02deca03e26c64b3568e1f49b76985027c0
-  data.tar.gz: fe336da69b2efe89d21299708b62f968109f4ff7be2973cdd6d4f92e56616ff79ee71c024a222794dfdabb7d67b8b50b7d7065f448704d6383f93639846fea20
+  metadata.gz: 5342970e267f7a1b8c259d7c06c8cd27e5600cc0ff4d33033f5d8e5206d335050dd4d6f989f68220d8adc0966483f26c30e472b51cacbe93268ddbd24c42e1c7
+  data.tar.gz: 0f03dd6d85ada4c98a13b0a1bfe6c86b19d0dc5d02fc759a334d560eeed1ad7642a2c25c1442610187206d41a24aa058db3e16fb6f7a96d0e19ed6752a244290

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/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "2.0.5.1".freeze
+  VERSION = "2.0.5.2".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/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>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 2.0.5.1
+  version: 2.0.5.2
 platform: ruby
 authors:
 - Ribose Inc.