metanorma-gb 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 274fe81bfa08f26c92749b206f26223b788d78f9a857156b97971bb31d3dc86a
-  data.tar.gz: 5fc0fd4d8a6aad3e07a6246a50f6a8c751b7c6cf0797be3bd977e95ca3706033
+  metadata.gz: 502289adfb4acad2a7e4f2822371c906b71757688f6625b33af0a16d664e4d63
+  data.tar.gz: 42e5b4cec6e333c486c3ef3a0a821b9d84b593e3399eebc7382803a2c5beb328
 SHA512:
-  metadata.gz: 55de595c7d6265307288f0ee6a9f10f21a5dd8c6e3a4397980ab821371a4b2b9255cdf8f3f40014fbf765f0fc593c1428481c3814db6d7e7519de9268689a09c
-  data.tar.gz: 667d00f0e29a26a2849f4909955001ff9d9544cc849b2d028d55ddfa442599ef844aa14d25f401ea3df2451d604b511e4521a6b062b9dd27c7ef5c6789aa1f68
+  metadata.gz: c09d9310acf0f5c23768b0e164df35e4fa701ef14db205eb48365ae77ad69a5e84f9d87d395b5f7f90b8ebbacf84143e2043362ec3294a45959de27c775384f5
+  data.tar.gz: 352a3967223f72c5c7aaacc893428fabaa467b8f8c832188c477d0124229866092007645a6bc10ffb48755e3e1974abdea64ea9fdabd8d61c01a21ce88737d7c

data/.travis.yml

@@ -6,6 +6,7 @@ os:
 - linux
 - osx
 rvm:
+- 2.6
 - 2.5
 - 2.4
 - ruby-head

data/appveyor.yml

@@ -7,6 +7,7 @@ cache:
 
 environment:
   matrix:
+    - RUBY_VERSION: 26
     - RUBY_VERSION: 25
     - RUBY_VERSION: 24
     - RUBY_VERSION: _trunk

data/lib/isodoc/gb/gbbaseconvert.rb

@@ -164,8 +164,10 @@ module IsoDoc
       end
 
       def termref_render(x)
+        x.sub!(%r{\s*\[MODIFICATION\]\s*$}m, l10n(", #{@modified_lbl}"))
         parts = x.split(%r{(\s*\[MODIFICATION\]|,)}m)
-        parts[1] = l10n(", #{@source_lbl}") if parts.size > 1 && parts[1] == ","
+        parts[1] = l10n(", #{@source_lbl}") if parts.size > 1 && parts[1] == "," &&
+          !/^\s*#{@modified_lbl}/.match(parts[2])
         parts.map do |p|
           /\s*\[MODIFICATION\]/.match(p) ? l10n(", #{@modified_lbl} — ") : p
         end.join.sub(/\A\s*/m, l10n("[")).sub(/\s*\z/m, l10n("]"))

data/lib/metanorma/gb/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Gb
-    VERSION = "1.2.2"
+    VERSION = "1.2.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-gb
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-15 00:00:00.000000000 Z
+date: 2019-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-iso