isodoc 1.8.3 → 1.8.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f13a3c3a1018484dfa9518b6831d188803ca83c2d89ee872ff17723994c0fae7
-  data.tar.gz: b4461e1537e949cbfbc851309cc1f29c974a38fda8728f405591dc586267943c
+  metadata.gz: ee178bd5fb88dd6ee3302731a8325eec443d80aac78adb9b9bd166157ffb4ebb
+  data.tar.gz: 95d464d67887b5ea80dd507a66815107c7e9c99d2e7ab4e11f86467524b5a9f2
 SHA512:
-  metadata.gz: eb0cf999d3a0155a13913543101228f4c1d60c4705dfdd67ca76f4e21fd00e59853040e4bbe516b64d4fc11a0aaf7da3573f8932f6bf7112dd3293ccc82263a2
-  data.tar.gz: c43855701417ffcad7a7e85086b489995ac1af483752c5b9ad1f958fbf944e38a94ca5fd3b4dcf90103608cad6a2d9b6d08fa46a877dffaeef14475212e7056c
+  metadata.gz: 8c5501c94696d11e07b7e7e0689eb3c4ae46917e7494f4c64407b150ba1171fb7d5c8723e59ab88c01f94f733a9880f8a40b6668c5c364f058d9865964957378
+  data.tar.gz: 6a4d747161c3a88b7be6034e82876d5aafd3c500ba1dffdd5f4359382da35285738f2a3fb7c3351892eb5472459054e5f2010dc0e769077052c5e1bd4a7b03ec

data/lib/isodoc/presentation_function/terms.rb

@@ -221,16 +221,19 @@ module IsoDoc
     end
 
     def termsource(docxml)
+      docxml.xpath(ns("//termsource/modification")).each do |f|
+        termsource_modification(f)
+      end
       docxml.xpath(ns("//termsource")).each do |f|
         termsource1(f)
       end
     end
 
     def termsource1(elem)
-      mod = elem.at(ns("./modification")) and
-        termsource_modification(mod)
+      while elem&.next_element&.name == "termsource"
+        elem << "; #{elem.next_element.remove.children.to_xml}"
+      end
       elem.children = l10n("[#{@i18n.source}: #{elem.children.to_xml.strip}]")
-      elem&.next_element&.name == "termsource" and elem.next = "; "
     end
 
     def termsource_modification(mod)

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "1.8.3".freeze
+  VERSION = "1.8.3.1".freeze
 end

data/spec/isodoc/terms_spec.rb

@@ -101,8 +101,8 @@ RSpec.describe IsoDoc do
        </termexample>
        <termsource status="identical">[SOURCE: <origin citeas="">
              <termref base="IEV" target="xyz">t1</termref>
-           </origin>, modified]</termsource>;
-         <termsource status="modified">[SOURCE: <origin citeas="">
+           </origin>, modified ;
+         <origin citeas="">
              <termref base="IEV" target="xyz"/>
            </origin>, modified
             &#x2013;
@@ -155,8 +155,8 @@ RSpec.describe IsoDoc do
           <li>A</li>
           </ul>
         </div>
-        <p>[SOURCE: t1, modified]</p>;
-          <p>[SOURCE: Termbase IEV, term ID xyz, modified
+        <p>[SOURCE: t1, modified ;
+          Termbase IEV, term ID xyz, modified
              &#8211;
               with adjustments]</p>
         <p class="TermNum" id="paddy">1.2.</p><p class="Terms" style="text-align:left;"><b>paddy</b></p>
@@ -197,8 +197,8 @@ RSpec.describe IsoDoc do
           <li>A</li>
           </ul>
         </div>
-        <p>[SOURCE: t1, modified]</p>;
-          <p>[SOURCE: Termbase IEV, term ID xyz, modified
+        <p>[SOURCE: t1, modified ;
+          Termbase IEV, term ID xyz, modified
              &#8211;
               with adjustments]</p>
         <p class="TermNum" id="paddy">1.2.</p><p class="Terms" style="text-align:left;"><b>paddy</b></p>
@@ -321,9 +321,7 @@ RSpec.describe IsoDoc do
               <termsource status='identical'>[SOURCE:
                 <origin citeas=''>
                   <termref base='IEV' target='xyz'>t1</termref>
-                </origin>]
-              </termsource>;
-              <termsource status='modified'>[SOURCE:
+                </origin>;
                 <origin citeas=''>
                   <termref base='IEV' target='xyz'/>
                 </origin>, modified &#x2013; with adjustments]

metadata

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