metanorma-mpfa 0.5.7 → 0.5.12
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 +7 -5
- data/lib/asciidoctor/mpfa/basicdoc.rng +52 -3
- data/lib/asciidoctor/mpfa/fonts_manifest.yaml +5 -0
- data/lib/asciidoctor/mpfa/isodoc.rng +51 -3
- data/lib/isodoc/mpfa/base_convert.rb +3 -3
- data/lib/isodoc/mpfa/html/htmlstyle.css +3 -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 +5 -3
- data/lib/isodoc/mpfa/mpfd.circular.xsl +254 -46
- data/lib/isodoc/mpfa/mpfd.compliance-standards-for-mpf-trustees.xsl +254 -46
- data/lib/isodoc/mpfa/mpfd.guidelines.xsl +254 -46
- data/lib/isodoc/mpfa/mpfd.standards.xsl +254 -46
- data/lib/isodoc/mpfa/mpfd.supervision-of-mpf-intermediaries.xsl +254 -46
- data/lib/isodoc/mpfa/word_convert.rb +7 -3
- data/lib/metanorma/mpfa/processor.rb +8 -7
- data/lib/metanorma/mpfa/version.rb +1 -1
- data/metanorma-mpfd.gemspec +2 -2
- metadata +7 -6
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 0467ad12b2ffb1cf2ea0b8e5c3978b9a468f9c742c177f29fbe80ad407f51a2f
|
4
|
+
data.tar.gz: 9a2e33c2c864553d1808945a114478287f7db0d3182b967772dff3ba959cd290
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 75f5316070167ca1a4637a475b5cf0b2bfdafc6705fbbb88d456e0d535be5409748dffc2a5c683cccd1f54d9ab6dd9dfdb2ece99ac97f7de2e0babae245f17d4
|
7
|
+
data.tar.gz: e52103a7422b8df892d85f94dfae8f2795922aaea99ce7b2e98c5096854cc78a9dbbc95579941ad9e1a804a5a6343930a8e52079d68fc558f7efadc5dc7ec110
|
data/.github/workflows/rake.yml
CHANGED
@@ -36,7 +36,10 @@ jobs:
|
|
36
36
|
with:
|
37
37
|
ruby-version: ${{ matrix.ruby }}
|
38
38
|
|
39
|
-
-
|
39
|
+
- if: matrix.os == 'macos-latest'
|
40
|
+
run: brew install autoconf automake libtool
|
41
|
+
|
42
|
+
- uses: actions/cache@v2
|
40
43
|
with:
|
41
44
|
path: vendor/bundle
|
42
45
|
key: bundle-${{ matrix.os }}-${{ matrix.ruby }}-${{ hashFiles('**/*.gemspec') }}
|
@@ -48,15 +51,14 @@ jobs:
|
|
48
51
|
|
49
52
|
- run: bundle exec rake
|
50
53
|
|
51
|
-
|
52
|
-
name: Trigger notify workflow
|
54
|
+
tests-passed:
|
53
55
|
needs: rake
|
54
56
|
runs-on: ubuntu-latest
|
55
57
|
steps:
|
56
|
-
- name: Trigger
|
58
|
+
- name: Trigger tests passed event
|
57
59
|
uses: Sibz/github-status-action@v1
|
58
60
|
with:
|
59
|
-
authToken: ${{ secrets.GITHUB_TOKEN }}
|
61
|
+
authToken: ${{ secrets.METANORMA_CI_PAT_TOKEN || secrets.GITHUB_TOKEN }}
|
60
62
|
context: 'tests-passed-successfully'
|
61
63
|
description: 'Tests passed successfully'
|
62
64
|
state: 'success'
|
@@ -596,6 +596,7 @@
|
|
596
596
|
<ref name="bookmark"/>
|
597
597
|
<ref name="image"/>
|
598
598
|
<ref name="index"/>
|
599
|
+
<ref name="index-xref"/>
|
599
600
|
</choice>
|
600
601
|
</define>
|
601
602
|
<define name="PureTextElement">
|
@@ -728,13 +729,61 @@
|
|
728
729
|
</define>
|
729
730
|
<define name="index">
|
730
731
|
<element name="index">
|
731
|
-
<attribute name="primary"/>
|
732
732
|
<optional>
|
733
|
-
<attribute name="
|
733
|
+
<attribute name="to">
|
734
|
+
<data type="IDREF"/>
|
735
|
+
</attribute>
|
736
|
+
</optional>
|
737
|
+
<element name="primary">
|
738
|
+
<oneOrMore>
|
739
|
+
<ref name="PureTextElement"/>
|
740
|
+
</oneOrMore>
|
741
|
+
</element>
|
742
|
+
<optional>
|
743
|
+
<element name="secondary">
|
744
|
+
<oneOrMore>
|
745
|
+
<ref name="PureTextElement"/>
|
746
|
+
</oneOrMore>
|
747
|
+
</element>
|
748
|
+
</optional>
|
749
|
+
<optional>
|
750
|
+
<element name="tertiary">
|
751
|
+
<oneOrMore>
|
752
|
+
<ref name="PureTextElement"/>
|
753
|
+
</oneOrMore>
|
754
|
+
</element>
|
755
|
+
</optional>
|
756
|
+
</element>
|
757
|
+
</define>
|
758
|
+
<define name="index-xref">
|
759
|
+
<element name="index-xref">
|
760
|
+
<attribute name="also">
|
761
|
+
<data type="boolean"/>
|
762
|
+
</attribute>
|
763
|
+
<element name="primary">
|
764
|
+
<oneOrMore>
|
765
|
+
<ref name="PureTextElement"/>
|
766
|
+
</oneOrMore>
|
767
|
+
</element>
|
768
|
+
<optional>
|
769
|
+
<element name="secondary">
|
770
|
+
<oneOrMore>
|
771
|
+
<ref name="PureTextElement"/>
|
772
|
+
</oneOrMore>
|
773
|
+
</element>
|
734
774
|
</optional>
|
735
775
|
<optional>
|
736
|
-
<
|
776
|
+
<element name="tertiary">
|
777
|
+
<oneOrMore>
|
778
|
+
<ref name="PureTextElement"/>
|
779
|
+
</oneOrMore>
|
780
|
+
</element>
|
737
781
|
</optional>
|
782
|
+
<element name="target">
|
783
|
+
<oneOrMore>
|
784
|
+
<ref name="PureTextElement"/>
|
785
|
+
</oneOrMore>
|
786
|
+
</element>
|
738
787
|
</element>
|
739
788
|
</define>
|
740
789
|
<!-- bare ID element, used for referencing arbitrary spans of text -->
|
@@ -55,6 +55,13 @@
|
|
55
55
|
<param name="pattern">\i\c*|\c+#\c+</param>
|
56
56
|
</data>
|
57
57
|
</attribute>
|
58
|
+
<optional>
|
59
|
+
<attribute name="to">
|
60
|
+
<data type="string">
|
61
|
+
<param name="pattern">\i\c*|\c+#\c+</param>
|
62
|
+
</data>
|
63
|
+
</attribute>
|
64
|
+
</optional>
|
58
65
|
<optional>
|
59
66
|
<attribute name="type">
|
60
67
|
<ref name="ReferenceFormat"/>
|
@@ -246,6 +253,12 @@
|
|
246
253
|
<data type="boolean"/>
|
247
254
|
</attribute>
|
248
255
|
</optional>
|
256
|
+
<optional>
|
257
|
+
<attribute name="width"/>
|
258
|
+
</optional>
|
259
|
+
<optional>
|
260
|
+
<ref name="colgroup"/>
|
261
|
+
</optional>
|
249
262
|
<optional>
|
250
263
|
<ref name="tname"/>
|
251
264
|
</optional>
|
@@ -764,6 +777,21 @@
|
|
764
777
|
</define>
|
765
778
|
</include>
|
766
779
|
<!-- end overrides -->
|
780
|
+
<define name="colgroup">
|
781
|
+
<element name="colgroup">
|
782
|
+
<oneOrMore>
|
783
|
+
<ref name="col"/>
|
784
|
+
</oneOrMore>
|
785
|
+
</element>
|
786
|
+
</define>
|
787
|
+
<define name="col">
|
788
|
+
<element name="col">
|
789
|
+
<attribute name="width"/>
|
790
|
+
</element>
|
791
|
+
</define>
|
792
|
+
<define name="BibItemType" combine="choice">
|
793
|
+
<value>internal</value>
|
794
|
+
</define>
|
767
795
|
<define name="TextElement" combine="choice">
|
768
796
|
<ref name="concept"/>
|
769
797
|
</define>
|
@@ -814,6 +842,9 @@
|
|
814
842
|
<data type="boolean"/>
|
815
843
|
</attribute>
|
816
844
|
</optional>
|
845
|
+
<optional>
|
846
|
+
<attribute name="number"/>
|
847
|
+
</optional>
|
817
848
|
<optional>
|
818
849
|
<attribute name="obligation">
|
819
850
|
<choice>
|
@@ -869,9 +900,11 @@
|
|
869
900
|
<element name="code">
|
870
901
|
<text/>
|
871
902
|
</element>
|
872
|
-
<
|
873
|
-
<text
|
874
|
-
|
903
|
+
<optional>
|
904
|
+
<element name="text">
|
905
|
+
<text/>
|
906
|
+
</element>
|
907
|
+
</optional>
|
875
908
|
</element>
|
876
909
|
</define>
|
877
910
|
<define name="standard-document">
|
@@ -1041,6 +1074,9 @@
|
|
1041
1074
|
</choice>
|
1042
1075
|
</attribute>
|
1043
1076
|
</optional>
|
1077
|
+
<optional>
|
1078
|
+
<attribute name="number"/>
|
1079
|
+
</optional>
|
1044
1080
|
<optional>
|
1045
1081
|
<attribute name="type"/>
|
1046
1082
|
</optional>
|
@@ -1094,6 +1130,9 @@
|
|
1094
1130
|
<optional>
|
1095
1131
|
<attribute name="type"/>
|
1096
1132
|
</optional>
|
1133
|
+
<optional>
|
1134
|
+
<attribute name="number"/>
|
1135
|
+
</optional>
|
1097
1136
|
<optional>
|
1098
1137
|
<ref name="section-title"/>
|
1099
1138
|
</optional>
|
@@ -1196,6 +1235,9 @@
|
|
1196
1235
|
<optional>
|
1197
1236
|
<attribute name="type"/>
|
1198
1237
|
</optional>
|
1238
|
+
<optional>
|
1239
|
+
<attribute name="number"/>
|
1240
|
+
</optional>
|
1199
1241
|
<optional>
|
1200
1242
|
<attribute name="obligation">
|
1201
1243
|
<choice>
|
@@ -1524,6 +1566,7 @@
|
|
1524
1566
|
<value>add</value>
|
1525
1567
|
<value>modify</value>
|
1526
1568
|
<value>delete</value>
|
1569
|
+
<value>replace</value>
|
1527
1570
|
</choice>
|
1528
1571
|
</attribute>
|
1529
1572
|
<optional>
|
@@ -1554,6 +1597,11 @@
|
|
1554
1597
|
</optional>
|
1555
1598
|
<optional>
|
1556
1599
|
<element name="newcontent">
|
1600
|
+
<optional>
|
1601
|
+
<attribute name="id">
|
1602
|
+
<data type="ID"/>
|
1603
|
+
</attribute>
|
1604
|
+
</optional>
|
1557
1605
|
<zeroOrMore>
|
1558
1606
|
<ref name="BasicBlock"/>
|
1559
1607
|
</zeroOrMore>
|
@@ -40,12 +40,12 @@ module IsoDoc
|
|
40
40
|
end
|
41
41
|
end
|
42
42
|
|
43
|
-
def middle_clause
|
43
|
+
def middle_clause(_docxml)
|
44
44
|
"//clause[parent::sections][not(descendant::terms)]"
|
45
45
|
end
|
46
46
|
|
47
47
|
def middle(isoxml, out)
|
48
|
-
middle_title(out)
|
48
|
+
middle_title(isoxml, out)
|
49
49
|
middle_admonitions(isoxml, out)
|
50
50
|
clause isoxml, out
|
51
51
|
annex isoxml, out
|
@@ -59,7 +59,7 @@ module IsoDoc
|
|
59
59
|
end
|
60
60
|
|
61
61
|
def clause(isoxml, out)
|
62
|
-
isoxml.xpath(ns(middle_clause)).each do |c|
|
62
|
+
isoxml.xpath(ns(middle_clause(isoxml))).each do |c|
|
63
63
|
out.div **attr_code(id: c["id"]) do |s|
|
64
64
|
clause_name(nil, c&.at(ns("./title")), s,
|
65
65
|
class: c["container"] ? "containerhdr" : nil )
|
@@ -224,7 +224,7 @@ body {
|
|
224
224
|
margin-left: auto;
|
225
225
|
margin-right: auto;
|
226
226
|
max-width: 100%;
|
227
|
-
font-size:
|
227
|
+
font-size: {{normalfontsize}};
|
228
228
|
font-weight: 300;
|
229
229
|
line-height: 1.4em;
|
230
230
|
color: #301907;
|
@@ -687,7 +687,7 @@ p.Biblio, p.NormRef {
|
|
687
687
|
pre,
|
688
688
|
.pseudocode {
|
689
689
|
background-color: #f7f7f7;
|
690
|
-
font-size:
|
690
|
+
font-size: {{monospacefontsize}};
|
691
691
|
line-height: 1.6em;
|
692
692
|
padding: 1.5em;
|
693
693
|
margin: 2em 0 1em 0;
|
@@ -793,7 +793,7 @@ a.footnote-number {
|
|
793
793
|
font-size: 0.8em; }
|
794
794
|
|
795
795
|
.footnote {
|
796
|
-
font-size:
|
796
|
+
font-size: {{footnotefontsize}}; }
|
797
797
|
|
798
798
|
/*
|
799
799
|
3.11 Blockquotes
|
@@ -14,7 +14,7 @@
|
|
14
14
|
*/
|
15
15
|
|
16
16
|
body {
|
17
|
-
@include bodyStyle1(
|
17
|
+
@include bodyStyle1($normalfontsize, 1.4em, #301907, #f7f7f7, 300);
|
18
18
|
// @include sidebarNavContainer(323px);
|
19
19
|
main {
|
20
20
|
margin: 0 0 0 6em;
|
@@ -446,7 +446,7 @@ a.footnote-number {
|
|
446
446
|
}
|
447
447
|
|
448
448
|
.footnote {
|
449
|
-
font-size:
|
449
|
+
font-size: $footnotefontsize;
|
450
450
|
}
|
451
451
|
|
452
452
|
|
@@ -9,7 +9,7 @@ p.Sourcecode, li.Sourcecode, div.Sourcecode, pre.Sourcecode, pre {
|
|
9
9
|
text-align: left;
|
10
10
|
mso-pagination: widow-orphan;
|
11
11
|
tab-stops: 45.8pt 91.6pt 137.4pt 183.2pt 229.0pt 274.8pt 320.6pt 366.4pt 412.2pt 458.0pt 503.8pt 549.6pt 595.4pt 641.2pt 687.0pt 732.8pt;
|
12
|
-
font-size:
|
12
|
+
font-size: {{monospacefontsize}};
|
13
13
|
font-family: {{monospacefont}};
|
14
14
|
mso-fareast-font-family: Calibri;
|
15
15
|
mso-bidi-font-family: "Courier New";
|
@@ -26,7 +26,7 @@ p.pseudocode, li.pseudocode, div.pseudocode {
|
|
26
26
|
text-align: left;
|
27
27
|
mso-pagination: widow-orphan;
|
28
28
|
tab-stops: 45.8pt 91.6pt 137.4pt 183.2pt 229.0pt 274.8pt 320.6pt 366.4pt 412.2pt 458.0pt 503.8pt 549.6pt 595.4pt 641.2pt 687.0pt 732.8pt;
|
29
|
-
font-size:
|
29
|
+
font-size: {{normalfontsize}};
|
30
30
|
font-family: {{bodyfont}};
|
31
31
|
mso-fareast-font-family: Calibri;
|
32
32
|
mso-bidi-font-family: "Courier New";
|
@@ -44,7 +44,7 @@ p.Biblio, li.Biblio, div.Biblio, p.NormRef, li.NormRef, div.NormRef {
|
|
44
44
|
tab-stops: 33.15pt;
|
45
45
|
line-height: 12.0pt;
|
46
46
|
mso-pagination: widow-orphan;
|
47
|
-
font-size:
|
47
|
+
font-size: {{normalfontsize}};
|
48
48
|
font-weight: normal;
|
49
49
|
font-family: {{bodyfont}};
|
50
50
|
mso-fareast-font-family: {{bodyfont}};
|
@@ -142,10 +142,9 @@ p.Note, div.Note, li.Note, p.TableFootnote, div.TableFootnote, li.TableFootnote
|
|
142
142
|
line-height: 12.0pt;
|
143
143
|
mso-pagination: widow-orphan;
|
144
144
|
tab-stops: 20.15pt;
|
145
|
-
font-size:
|
145
|
+
font-size: {{smallerfontsize}};
|
146
146
|
mso-bidi-font-size: 11.0pt;
|
147
147
|
font-family: {{bodyfont}};
|
148
|
-
font-size: 10.0pt;
|
149
148
|
mso-fareast-font-family: {{bodyfont}};
|
150
149
|
mso-bidi-font-family: {{bodyfont}};
|
151
150
|
mso-ansi-language: EN-GB; }
|
@@ -410,7 +409,7 @@ p.zzCopyright, li.zzCopyright {
|
|
410
409
|
tab-stops: 20.15pt 25.7pt 481.15pt;
|
411
410
|
padding: 0cm;
|
412
411
|
mso-padding-alt: 1.0pt 4.0pt 1.0pt 4.0pt;
|
413
|
-
font-size:
|
412
|
+
font-size: {{normalfontsize}};
|
414
413
|
font-family: {{bodyfont}};
|
415
414
|
mso-fareast-font-family: {{bodyfont}};
|
416
415
|
mso-bidi-font-family: {{bodyfont}};
|
@@ -496,7 +495,7 @@ p.Quote, li.Quote, div.Quote {
|
|
496
495
|
line-height: 12.0pt;
|
497
496
|
mso-pagination: widow-orphan;
|
498
497
|
tab-stops: 20.15pt;
|
499
|
-
font-size:
|
498
|
+
font-size: {{normalfontsize}};
|
500
499
|
font-family: {{bodyfont}};
|
501
500
|
mso-fareast-font-family: {{bodyfont}};
|
502
501
|
mso-bidi-font-family: {{bodyfont}};
|
@@ -512,7 +511,7 @@ p.QuoteAttribution {
|
|
512
511
|
line-height: 12.0pt;
|
513
512
|
mso-pagination: widow-orphan;
|
514
513
|
tab-stops: 20.15pt;
|
515
|
-
font-size:
|
514
|
+
font-size: {{normalfontsize}};
|
516
515
|
font-family: {{bodyfont}};
|
517
516
|
mso-fareast-font-family: {{bodyfont}};
|
518
517
|
mso-bidi-font-family: {{bodyfont}};
|
@@ -574,7 +573,7 @@ p.Formula, li.Formula, div.Formula {
|
|
574
573
|
line-height: 12.0pt;
|
575
574
|
mso-pagination: widow-orphan;
|
576
575
|
tab-stops: right 487.45pt;
|
577
|
-
font-size:
|
576
|
+
font-size: {{normalfontsize}};
|
578
577
|
font-family: {{bodyfont}};
|
579
578
|
mso-fareast-font-family: {{bodyfont}};
|
580
579
|
mso-bidi-font-family: {{bodyfont}};
|
@@ -688,7 +687,7 @@ table.MsoISOTable, table.MsoISOTableBig {
|
|
688
687
|
mso-yfti-tbllook: 480;
|
689
688
|
mso-border-insideh: .75pt solid windowtext;
|
690
689
|
mso-border-insidev: .75pt solid windowtext;
|
691
|
-
font-size:
|
690
|
+
font-size: {{smallerfontsize}};
|
692
691
|
font-family: {{bodyfont}}; }
|
693
692
|
|
694
693
|
table.MsoISOTable th, table.MsoISOTableBig th {
|
@@ -702,7 +701,7 @@ table.MsoISOTable td, table.MsoISOTableBig td {
|
|
702
701
|
padding: 0cm 2.85pt 0cm 2.85pt; }
|
703
702
|
|
704
703
|
table.MsoISOTable p, table.MsoISOTableBig p {
|
705
|
-
font-size:
|
704
|
+
font-size: {{smallerfontsize}}; }
|
706
705
|
|
707
706
|
table.MsoTableGrid {
|
708
707
|
mso-style-name: "Table Grid";
|
@@ -718,7 +717,7 @@ table.MsoTableGrid {
|
|
718
717
|
mso-para-margin: 0cm;
|
719
718
|
mso-para-margin-bottom: .0001pt;
|
720
719
|
mso-pagination: widow-orphan;
|
721
|
-
font-size:
|
720
|
+
font-size: {{smallerfontsize}};
|
722
721
|
font-family: {{bodyfont}}; }
|
723
722
|
|
724
723
|
div.formula {
|
@@ -760,7 +759,7 @@ a.TableFootnoteRef, span.TableFootnoteRef {
|
|
760
759
|
vertical-align: super; }
|
761
760
|
|
762
761
|
aside {
|
763
|
-
font-size:
|
762
|
+
font-size: {{footnotefontsize}}; }
|
764
763
|
|
765
764
|
.example-title {
|
766
765
|
font-weight: bold;
|
@@ -778,32 +777,32 @@ div.example {
|
|
778
777
|
|
779
778
|
p.example, li.example, div.example, td.example {
|
780
779
|
mso-pagination: none;
|
781
|
-
font-size:
|
780
|
+
font-size: {{smallerfontsize}};
|
782
781
|
font-family: {{bodyfont}}; }
|
783
782
|
|
784
783
|
td.example p.MsoListParagraph {
|
785
|
-
font-size:
|
784
|
+
font-size: {{smallerfontsize}}; }
|
786
785
|
|
787
786
|
div.example p.MsoListParagraph {
|
788
|
-
font-size:
|
787
|
+
font-size: {{smallerfontsize}}; }
|
789
788
|
|
790
789
|
div.Note p.MsoListParagraph {
|
791
|
-
font-size:
|
790
|
+
font-size: {{smallerfontsize}};
|
792
791
|
margin-left: 1.0cm; }
|
793
792
|
|
794
793
|
div.Note span.stem {
|
795
|
-
font-size:
|
794
|
+
font-size: {{smallerfontsize}}; }
|
796
795
|
|
797
796
|
div.Note p.Sourcecode, div.Note pre.Sourcecode {
|
798
797
|
font-size: 8.0pt;
|
799
798
|
margin-left: 1.0cm; }
|
800
799
|
|
801
800
|
div.Note table.dl {
|
802
|
-
font-size:
|
801
|
+
font-size: {{smallerfontsize}};
|
803
802
|
margin-left: 1.0cm; }
|
804
803
|
|
805
804
|
span.note_label, span.example_label, td.example_label, td.note_label {
|
806
|
-
font-size:
|
805
|
+
font-size: {{smallerfontsize}};
|
807
806
|
font-family: {{bodyfont}}; }
|
808
807
|
|
809
808
|
table.dl {
|