metanorma-mpfa 0.5.5 → 0.5.10
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/workflows/rake.yml +62 -0
- data/README.adoc +6 -6
- data/lib/asciidoctor/mpfa/basicdoc.rng +50 -3
- data/lib/asciidoctor/mpfa/converter.rb +2 -1
- data/lib/asciidoctor/mpfa/fonts_manifest.yaml +5 -0
- data/lib/asciidoctor/mpfa/isodoc.rng +36 -43
- data/lib/isodoc/mpfa/base_convert.rb +2 -2
- data/lib/isodoc/mpfa/html/htmlstyle.css +7 -3
- data/lib/isodoc/mpfa/html/htmlstyle.scss +2 -2
- data/lib/isodoc/mpfa/html/rsd.css +19 -20
- data/lib/isodoc/mpfa/html/rsd.scss +19 -20
- data/lib/isodoc/mpfa/html/wordstyle.css +19 -19
- data/lib/isodoc/mpfa/html/wordstyle.scss +19 -19
- data/lib/isodoc/mpfa/html_convert.rb +3 -1
- data/lib/isodoc/mpfa/mpfd.circular.xsl +298 -67
- data/lib/isodoc/mpfa/mpfd.compliance-standards-for-mpf-trustees.xsl +298 -67
- data/lib/isodoc/mpfa/mpfd.guidelines.xsl +298 -67
- data/lib/isodoc/mpfa/mpfd.standards.xsl +298 -67
- data/lib/isodoc/mpfa/mpfd.supervision-of-mpf-intermediaries.xsl +298 -67
- data/lib/isodoc/mpfa/presentation_xml_convert.rb +9 -0
- data/lib/isodoc/mpfa/word_convert.rb +5 -1
- data/lib/isodoc/mpfa/xref.rb +2 -2
- data/lib/metanorma/mpfa/processor.rb +7 -7
- data/lib/metanorma/mpfa/version.rb +1 -1
- data/metanorma-mpfd.gemspec +2 -2
- metadata +8 -9
- data/.github/workflows/macos.yml +0 -38
- data/.github/workflows/ubuntu.yml +0 -56
- data/.github/workflows/windows.yml +0 -40
@@ -12,6 +12,15 @@ module IsoDoc
|
|
12
12
|
prefix_name(f, " ", lbl, "title")
|
13
13
|
end
|
14
14
|
|
15
|
+
def clause1(f)
|
16
|
+
lbl = @xrefs.anchor(f['id'], :label, f.parent.name != "sections")
|
17
|
+
if lbl == "1" and !f.at(ns("./title"))
|
18
|
+
prefix_name(f, "<tab/>", " ", "title")
|
19
|
+
else
|
20
|
+
super
|
21
|
+
end
|
22
|
+
end
|
23
|
+
|
15
24
|
include Init
|
16
25
|
end
|
17
26
|
end
|
@@ -18,7 +18,11 @@ module IsoDoc
|
|
18
18
|
{
|
19
19
|
bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' : '"Arial",sans-serif'),
|
20
20
|
headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' : '"Arial",sans-serif'),
|
21
|
-
monospacefont: '"Courier New",monospace'
|
21
|
+
monospacefont: '"Courier New",monospace',
|
22
|
+
normalfontsize: "10.5pt",
|
23
|
+
monospacefontsize: "10.0pt",
|
24
|
+
footnotefontsize: "10.0pt",
|
25
|
+
smallerfontsize: "10.0pt",
|
22
26
|
}
|
23
27
|
end
|
24
28
|
|
data/lib/isodoc/mpfa/xref.rb
CHANGED
@@ -76,7 +76,7 @@ module IsoDoc
|
|
76
76
|
|
77
77
|
def annex_names(clause, num)
|
78
78
|
@anchors[clause["id"]] = { label: annex_name_lbl(clause, num), value: num,
|
79
|
-
xref: "#{@labels['annex']} #{num}", level: 1 }
|
79
|
+
xref: l10n("#{@labels['annex']} #{num}"), level: 1 }
|
80
80
|
if a = single_annex_special_section(clause)
|
81
81
|
annex_names1(a, "#{num}", 1)
|
82
82
|
else
|
@@ -91,7 +91,7 @@ module IsoDoc
|
|
91
91
|
|
92
92
|
def annex_names1(clause, num, level)
|
93
93
|
clause["container"] or @anchors[clause["id"]] =
|
94
|
-
{ label: num, xref: "#{@labels['annex']} #{num}", level: level }
|
94
|
+
{ label: num, xref: l10n("#{@labels['annex']} #{num}"), level: level }
|
95
95
|
i = 0
|
96
96
|
clause.xpath(ns("./clause | ./references")).each do |c|
|
97
97
|
i = annex_naming(c, num, level, i)
|
@@ -2,13 +2,6 @@ require "metanorma/processor"
|
|
2
2
|
|
3
3
|
module Metanorma
|
4
4
|
module MPFA
|
5
|
-
def self.fonts_used
|
6
|
-
{
|
7
|
-
html: ["Titillium Web", "Space Mono"],
|
8
|
-
doc: ["Arial", "Courier New"],
|
9
|
-
}
|
10
|
-
end
|
11
|
-
|
12
5
|
class Processor < Metanorma::Processor
|
13
6
|
|
14
7
|
def initialize
|
@@ -25,6 +18,13 @@ module Metanorma
|
|
25
18
|
)
|
26
19
|
end
|
27
20
|
|
21
|
+
def fonts_manifest
|
22
|
+
{
|
23
|
+
"Arial" => nil,
|
24
|
+
"STIX Two Math" => nil,
|
25
|
+
}
|
26
|
+
end
|
27
|
+
|
28
28
|
def version
|
29
29
|
"Metanorma::MPFA #{Metanorma::MPFA::VERSION}"
|
30
30
|
end
|
data/metanorma-mpfd.gemspec
CHANGED
@@ -29,8 +29,8 @@ Gem::Specification.new do |spec|
|
|
29
29
|
spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
|
30
30
|
|
31
31
|
spec.add_dependency "htmlentities", "~> 4.3.4"
|
32
|
-
spec.add_dependency "metanorma-standoc", "~> 1.
|
33
|
-
spec.add_dependency "isodoc", "~> 1.
|
32
|
+
spec.add_dependency "metanorma-standoc", "~> 1.7.0"
|
33
|
+
spec.add_dependency "isodoc", "~> 1.4.0"
|
34
34
|
spec.add_dependency "twitter_cldr"
|
35
35
|
|
36
36
|
spec.add_development_dependency "byebug", "~> 9.1"
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: metanorma-mpfa
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.5.
|
4
|
+
version: 0.5.10
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Ribose Inc.
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date: 2020-
|
11
|
+
date: 2020-12-28 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: htmlentities
|
@@ -30,28 +30,28 @@ dependencies:
|
|
30
30
|
requirements:
|
31
31
|
- - "~>"
|
32
32
|
- !ruby/object:Gem::Version
|
33
|
-
version: 1.
|
33
|
+
version: 1.7.0
|
34
34
|
type: :runtime
|
35
35
|
prerelease: false
|
36
36
|
version_requirements: !ruby/object:Gem::Requirement
|
37
37
|
requirements:
|
38
38
|
- - "~>"
|
39
39
|
- !ruby/object:Gem::Version
|
40
|
-
version: 1.
|
40
|
+
version: 1.7.0
|
41
41
|
- !ruby/object:Gem::Dependency
|
42
42
|
name: isodoc
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|
44
44
|
requirements:
|
45
45
|
- - "~>"
|
46
46
|
- !ruby/object:Gem::Version
|
47
|
-
version: 1.
|
47
|
+
version: 1.4.0
|
48
48
|
type: :runtime
|
49
49
|
prerelease: false
|
50
50
|
version_requirements: !ruby/object:Gem::Requirement
|
51
51
|
requirements:
|
52
52
|
- - "~>"
|
53
53
|
- !ruby/object:Gem::Version
|
54
|
-
version: 1.
|
54
|
+
version: 1.4.0
|
55
55
|
- !ruby/object:Gem::Dependency
|
56
56
|
name: twitter_cldr
|
57
57
|
requirement: !ruby/object:Gem::Requirement
|
@@ -218,9 +218,7 @@ executables: []
|
|
218
218
|
extensions: []
|
219
219
|
extra_rdoc_files: []
|
220
220
|
files:
|
221
|
-
- ".github/workflows/
|
222
|
-
- ".github/workflows/ubuntu.yml"
|
223
|
-
- ".github/workflows/windows.yml"
|
221
|
+
- ".github/workflows/rake.yml"
|
224
222
|
- ".gitignore"
|
225
223
|
- ".hound.yml"
|
226
224
|
- ".rubocop.yml"
|
@@ -237,6 +235,7 @@ files:
|
|
237
235
|
- lib/asciidoctor/mpfa/basicdoc.rng
|
238
236
|
- lib/asciidoctor/mpfa/biblio.rng
|
239
237
|
- lib/asciidoctor/mpfa/converter.rb
|
238
|
+
- lib/asciidoctor/mpfa/fonts_manifest.yaml
|
240
239
|
- lib/asciidoctor/mpfa/isodoc.rng
|
241
240
|
- lib/asciidoctor/mpfa/mpfd.rng
|
242
241
|
- lib/asciidoctor/mpfa/reqt.rng
|
data/.github/workflows/macos.yml
DELETED
@@ -1,38 +0,0 @@
|
|
1
|
-
# Auto-generated by Cimas: Do not edit it manually!
|
2
|
-
# See https://github.com/metanorma/cimas
|
3
|
-
name: macos
|
4
|
-
|
5
|
-
on:
|
6
|
-
push:
|
7
|
-
branches: [ master ]
|
8
|
-
pull_request:
|
9
|
-
paths-ignore:
|
10
|
-
- .github/workflows/ubuntu.yml
|
11
|
-
- .github/workflows/windows.yml
|
12
|
-
|
13
|
-
jobs:
|
14
|
-
test-macos:
|
15
|
-
name: Test on Ruby ${{ matrix.ruby }} macOS
|
16
|
-
runs-on: macos-latest
|
17
|
-
continue-on-error: ${{ matrix.experimental }}
|
18
|
-
strategy:
|
19
|
-
fail-fast: false
|
20
|
-
matrix:
|
21
|
-
ruby: [ '2.6', '2.5', '2.4' ]
|
22
|
-
experimental: [false]
|
23
|
-
include:
|
24
|
-
- ruby: '2.7'
|
25
|
-
experimental: true
|
26
|
-
steps:
|
27
|
-
- uses: actions/checkout@master
|
28
|
-
- name: Use Ruby
|
29
|
-
uses: actions/setup-ruby@v1
|
30
|
-
with:
|
31
|
-
ruby-version: ${{ matrix.ruby }}
|
32
|
-
- name: Update gems
|
33
|
-
run: |
|
34
|
-
sudo gem install bundler --force
|
35
|
-
bundle install --jobs 4 --retry 3
|
36
|
-
- name: Run specs
|
37
|
-
run: |
|
38
|
-
bundle exec rake
|
@@ -1,56 +0,0 @@
|
|
1
|
-
# Auto-generated by Cimas: Do not edit it manually!
|
2
|
-
# See https://github.com/metanorma/cimas
|
3
|
-
name: ubuntu
|
4
|
-
|
5
|
-
on:
|
6
|
-
push:
|
7
|
-
branches: [ master ]
|
8
|
-
tags:
|
9
|
-
- '*'
|
10
|
-
pull_request:
|
11
|
-
paths-ignore:
|
12
|
-
- .github/workflows/macos.yml
|
13
|
-
- .github/workflows/windows.yml
|
14
|
-
|
15
|
-
jobs:
|
16
|
-
test-linux:
|
17
|
-
name: Test on Ruby ${{ matrix.ruby }} Ubuntu
|
18
|
-
runs-on: ubuntu-latest
|
19
|
-
continue-on-error: ${{ matrix.experimental }}
|
20
|
-
strategy:
|
21
|
-
fail-fast: false
|
22
|
-
matrix:
|
23
|
-
ruby: [ '2.6', '2.5', '2.4' ]
|
24
|
-
experimental: [false]
|
25
|
-
include:
|
26
|
-
- ruby: '2.7'
|
27
|
-
experimental: true
|
28
|
-
steps:
|
29
|
-
- uses: actions/checkout@master
|
30
|
-
- name: Use Ruby
|
31
|
-
uses: actions/setup-ruby@v1
|
32
|
-
with:
|
33
|
-
ruby-version: ${{ matrix.ruby }}
|
34
|
-
- name: Update gems
|
35
|
-
run: |
|
36
|
-
gem install bundler
|
37
|
-
bundle install --jobs 4 --retry 3
|
38
|
-
- name: Run specs
|
39
|
-
run: |
|
40
|
-
bundle exec rake
|
41
|
-
- name: Trigger repositories
|
42
|
-
if: matrix.ruby == '2.6'
|
43
|
-
env:
|
44
|
-
GH_USERNAME: metanorma-ci
|
45
|
-
GH_ACCESS_TOKEN: ${{ secrets.METANORMA_CI_PAT_TOKEN }}
|
46
|
-
run: |
|
47
|
-
curl -LO --retry 3 https://raw.githubusercontent.com/metanorma/metanorma-build-scripts/master/trigger-gh-actions.sh
|
48
|
-
[[ -f ".github/workflows/dependent_repos.env" ]] && source .github/workflows/dependent_repos.env
|
49
|
-
CLIENT_PAYLOAD=$(cat <<EOF
|
50
|
-
"{ "ref": "${GITHUB_REF}", "repo": "${GITHUB_REPOSITORY}" }"
|
51
|
-
EOF
|
52
|
-
)
|
53
|
-
for repo in $REPOS
|
54
|
-
do
|
55
|
-
sh trigger-gh-actions.sh $ORGANISATION $repo $GH_USERNAME $GH_ACCESS_TOKEN $GITHUB_REPOSITORY "$CLIENT_PAYLOAD"
|
56
|
-
done
|
@@ -1,40 +0,0 @@
|
|
1
|
-
# Auto-generated by Cimas: Do not edit it manually!
|
2
|
-
# See https://github.com/metanorma/cimas
|
3
|
-
name: windows
|
4
|
-
|
5
|
-
on:
|
6
|
-
push:
|
7
|
-
branches: [ master ]
|
8
|
-
pull_request:
|
9
|
-
paths-ignore:
|
10
|
-
- .github/workflows/macos.yml
|
11
|
-
- .github/workflows/ubuntu.yml
|
12
|
-
|
13
|
-
jobs:
|
14
|
-
test-windows:
|
15
|
-
name: Test on Ruby ${{ matrix.ruby }} Windows
|
16
|
-
runs-on: windows-latest
|
17
|
-
continue-on-error: ${{ matrix.experimental }}
|
18
|
-
strategy:
|
19
|
-
fail-fast: false
|
20
|
-
matrix:
|
21
|
-
ruby: [ '2.6', '2.5', '2.4' ]
|
22
|
-
experimental: [false]
|
23
|
-
include:
|
24
|
-
- ruby: '2.7'
|
25
|
-
experimental: true
|
26
|
-
steps:
|
27
|
-
- uses: actions/checkout@master
|
28
|
-
- name: Use Ruby
|
29
|
-
uses: actions/setup-ruby@v1
|
30
|
-
with:
|
31
|
-
ruby-version: ${{ matrix.ruby }}
|
32
|
-
- name: Update gems
|
33
|
-
shell: pwsh
|
34
|
-
run: |
|
35
|
-
gem install bundler
|
36
|
-
bundle config --local path vendor/bundle
|
37
|
-
bundle install --jobs 4 --retry 3
|
38
|
-
- name: Run specs
|
39
|
-
run: |
|
40
|
-
bundle exec rake
|