metanorma-mpfa 0.5.2 → 0.5.7

data/lib/isodoc/mpfa/pdf_convert.rb

@@ -0,0 +1,23 @@
+require_relative "base_convert"
+require "isodoc"
+
+module IsoDoc
+  module MPFA
+    # A {Converter} implementation that generates PDF HTML output, and a
+    # document schema encapsulation of the document for validation
+    class PdfConvert < IsoDoc::XslfoPdfConvert
+      def initialize(options)
+        @libdir = File.dirname(__FILE__)
+        super
+      end
+
+      def pdf_stylesheet(docxml)
+        doctype = docxml&.at(ns("//bibdata/ext/doctype"))&.text
+        doctype = "standards" unless %w(circular guidelines
+        compliance-standards-for-mpf-trustees
+        supervision-of-mpf-intermediaries).include? doctype
+        "mpfd.#{doctype}.xsl"
+      end
+    end
+  end
+end

data/lib/isodoc/mpfa/presentation_xml_convert.rb

@@ -12,6 +12,15 @@ module IsoDoc
         prefix_name(f, " ", lbl, "title")
       end
 
+      def clause1(f)
+        lbl = @xrefs.anchor(f['id'], :label, f.parent.name != "sections")
+        if lbl == "1" and !f.at(ns("./title"))
+          prefix_name(f, "<tab/>", " ", "title")
+        else
+          super
+        end
+      end
+
       include Init
     end
   end

data/lib/isodoc/mpfa/xref.rb

@@ -75,8 +75,8 @@ module IsoDoc
       end
 
       def annex_names(clause, num)
-        @anchors[clause["id"]] = { label: annex_name_lbl(clause, num),
-                                   xref: "#{@labels['annex']} #{num}", level: 1 }
+        @anchors[clause["id"]] = { label: annex_name_lbl(clause, num), value: num,
+                                   xref: l10n("#{@labels['annex']} #{num}"), level: 1 }
         if a = single_annex_special_section(clause)
           annex_names1(a, "#{num}", 1)
         else
@@ -91,7 +91,7 @@ module IsoDoc
 
       def annex_names1(clause, num, level)
         clause["container"] or @anchors[clause["id"]] =
-          { label: num, xref: "#{@labels['annex']} #{num}", level: level }
+          { label: num, xref: l10n("#{@labels['annex']} #{num}"), level: level }
         i = 0
         clause.xpath(ns("./clause | ./references")).each do |c|
           i = annex_naming(c, num, level, i)

data/lib/metanorma-mpfa.rb

@@ -1,6 +1,7 @@
 require "asciidoctor" unless defined? Asciidoctor::Converter
 require_relative "asciidoctor/mpfa/converter"
 require_relative "isodoc/mpfa/html_convert"
+require_relative "isodoc/mpfa/pdf_convert"
 require_relative "isodoc/mpfa/word_convert"
 require_relative "isodoc/mpfa/presentation_xml_convert"
 require_relative "metanorma/mpfa/version"

data/lib/metanorma/mpfa/processor.rb

@@ -20,7 +20,8 @@ module Metanorma
       def output_formats
         super.merge(
           html: "html",
-          doc: "doc"
+          doc: "doc",
+          pdf: "pdf"
         )
       end
 
@@ -34,6 +35,8 @@ module Metanorma
           IsoDoc::MPFA::HtmlConvert.new(options).convert(inname, isodoc_node, nil, outname)
         when :doc
           IsoDoc::MPFA::WordConvert.new(options).convert(inname, isodoc_node, nil, outname)
+        when :pdf
+          IsoDoc::MPFA::PdfConvert.new(options).convert(inname, isodoc_node, nil, outname)
         when :presentation
           IsoDoc::MPFA::PresentationXMLConvert.new(options).convert(inname, isodoc_node, nil, outname)
         else

data/lib/metanorma/mpfa/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module MPFA
-    VERSION = "0.5.2"
+    VERSION = "0.5.7"
   end
 end

data/metanorma-mpfd.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
 
   spec.add_dependency "htmlentities", "~> 4.3.4"
-  spec.add_dependency "metanorma-standoc", "~> 1.5.0"
+  spec.add_dependency "metanorma-standoc", "~> 1.6.0"
   spec.add_dependency "isodoc", "~> 1.2.0"
   spec.add_dependency "twitter_cldr"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-mpfa
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-08-27 00:00:00.000000000 Z
+date: 2020-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: isodoc
   requirement: !ruby/object:Gem::Requirement
@@ -218,9 +218,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/macos.yml"
-- ".github/workflows/ubuntu.yml"
-- ".github/workflows/windows.yml"
+- ".github/workflows/rake.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".rubocop.yml"
@@ -265,6 +263,12 @@ files:
 - lib/isodoc/mpfa/i18n.rb
 - lib/isodoc/mpfa/init.rb
 - lib/isodoc/mpfa/metadata.rb
+- lib/isodoc/mpfa/mpfd.circular.xsl
+- lib/isodoc/mpfa/mpfd.compliance-standards-for-mpf-trustees.xsl
+- lib/isodoc/mpfa/mpfd.guidelines.xsl
+- lib/isodoc/mpfa/mpfd.standards.xsl
+- lib/isodoc/mpfa/mpfd.supervision-of-mpf-intermediaries.xsl
+- lib/isodoc/mpfa/pdf_convert.rb
 - lib/isodoc/mpfa/presentation_xml_convert.rb
 - lib/isodoc/mpfa/word_convert.rb
 - lib/isodoc/mpfa/xref.rb

data/.github/workflows/macos.yml

@@ -1,38 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-name: macos
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    paths-ignore:
-      - .github/workflows/ubuntu.yml
-      - .github/workflows/windows.yml
-
-jobs:
-  test-macos:
-    name: Test on Ruby ${{ matrix.ruby }} macOS
-    runs-on: macos-latest
-    continue-on-error: ${{ matrix.experimental }}
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '2.6', '2.5', '2.4' ]
-        experimental: [false]
-        include:
-          - ruby: '2.7'
-            experimental: true
-    steps:
-      - uses: actions/checkout@master
-      - name: Use Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-      - name: Update gems
-        run: |
-          sudo gem install bundler --force
-          bundle install --jobs 4 --retry 3
-      - name: Run specs
-        run: |
-          bundle exec rake

data/.github/workflows/ubuntu.yml

@@ -1,56 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-name: ubuntu
-
-on:
-  push:
-    branches: [ master ]
-    tags:
-      - '*'
-  pull_request:
-    paths-ignore:
-      - .github/workflows/macos.yml
-      - .github/workflows/windows.yml
-
-jobs:
-  test-linux:
-    name: Test on Ruby ${{ matrix.ruby }} Ubuntu
-    runs-on: ubuntu-latest
-    continue-on-error: ${{ matrix.experimental }}
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '2.6', '2.5', '2.4' ]
-        experimental: [false]
-        include:
-          - ruby: '2.7'
-            experimental: true
-    steps:
-      - uses: actions/checkout@master
-      - name: Use Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-      - name: Update gems
-        run: |
-          gem install bundler
-          bundle install --jobs 4 --retry 3
-      - name: Run specs
-        run: |
-          bundle exec rake
-      - name: Trigger repositories
-        if: matrix.ruby == '2.6'
-        env:
-          GH_USERNAME: metanorma-ci
-          GH_ACCESS_TOKEN: ${{ secrets.METANORMA_CI_PAT_TOKEN }}
-        run: |
-          curl -LO --retry 3 https://raw.githubusercontent.com/metanorma/metanorma-build-scripts/master/trigger-gh-actions.sh
-          [[ -f ".github/workflows/dependent_repos.env" ]] && source .github/workflows/dependent_repos.env
-          CLIENT_PAYLOAD=$(cat <<EOF
-          "{ "ref": "${GITHUB_REF}", "repo": "${GITHUB_REPOSITORY}" }"
-          EOF
-          )
-          for repo in $REPOS
-          do
-            sh trigger-gh-actions.sh $ORGANISATION $repo $GH_USERNAME $GH_ACCESS_TOKEN $GITHUB_REPOSITORY "$CLIENT_PAYLOAD"
-          done

data/.github/workflows/windows.yml

@@ -1,40 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-name: windows
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    paths-ignore:
-      - .github/workflows/macos.yml
-      - .github/workflows/ubuntu.yml
-
-jobs:
-  test-windows:
-    name: Test on Ruby ${{ matrix.ruby }} Windows
-    runs-on: windows-latest
-    continue-on-error: ${{ matrix.experimental }}
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '2.6', '2.5', '2.4' ]
-        experimental: [false]
-        include:
-          - ruby: '2.7'
-            experimental: true
-    steps:
-      - uses: actions/checkout@master
-      - name: Use Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-      - name: Update gems
-        shell: pwsh
-        run: |
-          gem install bundler
-          bundle config --local path vendor/bundle
-          bundle install --jobs 4 --retry 3
-      - name: Run specs
-        run: |
-          bundle exec rake