metanorma-bipm 1.2.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f9652ed0417da543c2ac78f8b3c1f07523d3263955edd4ebb56ed7d6ad62acd
-  data.tar.gz: 253e9177d7beb3a0607b486ea0be4a44551cb3b22804a2211f10906d2ddc063d
+  metadata.gz: 04e8a940bb602417adbbd2d5dafd80355eb30dd5eb68849d1e5f6235266c5ede
+  data.tar.gz: b94d3e7801ecbb2bfb6cd2ce90b617b52808cb5c7a36e54493a122a661b1e1dd
 SHA512:
-  metadata.gz: c070212a333befb8e336548e30f914d2f8197bdda5691735fb51d0d589190dd3ea761f05de0b6acd809f3b31f7809e84232bf577238a400fa6e2d5a6c4b7a44b
-  data.tar.gz: 3803393ec0101d70da575bfafa9af9a2aa3a5d56deea989561fd9d2f77d51b92cce0293f0cd49bf1863f347063438f9508efcf72e4e16a230b3b4a2676428672
+  metadata.gz: 92c6b89ab656a9d8d0288e292c151e046af5773ecae72223fc8ef3b4c44ebd9f6be467dee48cd15e6af4c65d7cb3affa973e7dc0512b3a77dd64412a83bdf997
+  data.tar.gz: a747ba21ed7ae9ba2b1d4f2546ef786e48946afcf6820b722668442bf912dd9444b4f958875843ee97c1af222fb8b76b3449415213d8e1c39e768d261683d6cb

data/.github/workflows/rake.yml

@@ -9,35 +9,7 @@ on:
   pull_request:
 
 jobs:
-  rake:
-    name: Test on Ruby ${{ matrix.ruby }} ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    continue-on-error: ${{ matrix.experimental }}
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '3.0', '2.7', '2.6', '2.5' ]
-        os: [ ubuntu-latest, windows-latest, macos-latest ]
-        experimental: [ false ]
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          submodules: true
-
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true
-
-      - run: bundle exec rake
-
-  tests-passed:
-    needs: rake
-    runs-on: ubuntu-latest
-    steps:
-      - uses: peter-evans/repository-dispatch@v1
-        with:
-          token: ${{ secrets.METANORMA_CI_PAT_TOKEN || secrets.GITHUB_TOKEN }}
-          repository: ${{ github.repository }}
-          event-type: tests-passed
-          client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}"}'
+  notify:
+    uses: metanorma/metanorma-build-scripts/.github/workflows/mn-processor-rake.yml@main
+    secrets:
+      pat_token: ${{ secrets.METANORMA_CI_PAT_TOKEN }}

data/.gitignore

@@ -2,3 +2,5 @@
 /.byebug_history
 /.rspec_status
 /coverage/
+/Gemfile.devel
+/Gemfile.lock

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require "bundler/setup"
-require "asciidoctor/vsd"
+require "metanorma/bipm"
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.

data/lib/isodoc/bipm/base_convert.rb

@@ -8,7 +8,8 @@ module IsoDoc
       end
 
       def convert1(docxml, filename, dir)
-        @jcgm = docxml&.at(ns("//bibdata/ext/editorialgroup/committee/@acronym"))&.value == "JCGM"
+        @jcgm = docxml&.at(ns("//bibdata/ext/editorialgroup/committee/"\
+                              "@acronym"))&.value == "JCGM"
         super
       end
 
@@ -45,7 +46,7 @@ module IsoDoc
           identifiers = render_identifier(ids)
           if biblio then ref_entry_code(ref, ordinal, identifiers, ids)
           else
-            ref << identifiers[0] || identifiers[1]
+            ref << (identifiers[0] || identifiers[1])
             ref << " #{identifiers[1]}" if identifiers[0] && identifiers[1]
           end
           ref << " " unless biblio && !identifiers[1]
@@ -58,7 +59,7 @@ module IsoDoc
           identifiers = render_identifier(bibitem_ref_code(bibitem))
           if biblio then ref_entry_code(ref, ordinal, identifiers, nil)
           else
-            ref << identifiers[0] || identifiers[1]
+            ref << (identifiers[0] || identifiers[1])
             ref << " #{identifiers[1]}" if identifiers[0] && identifiers[1]
           end
           date_note_process(bibitem, ref)
@@ -71,16 +72,6 @@ module IsoDoc
         @jcgm ? docxml : super
       end
 
-      def termref_cleanup(docxml)
-        docxml
-          .gsub(/\s*\[MODIFICATION\]\s*\[\/TERMREF\]/,
-                l10n(", #{@i18n.modified} [/TERMREF]"))
-          .gsub(%r{\s*\[/TERMREF\]\s*</p>\s*<p>\s*\[TERMREF\]}, "; ")
-          .gsub(/\[TERMREF\]\s*/, l10n("[#{@i18n.source} "))
-          .gsub(%r{\s*\[/TERMREF\]\s*}, l10n("]"))
-          .gsub(/\s*\[MODIFICATION\]/, l10n(", #{@i18n.modified} &mdash; "))
-      end
-
       def error_parse(node, out)
         case node.name
         when "blacksquare" then blacksquare_parse(node, out)