metanorma-mpfa 0.5.1 → 0.5.6
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 +44 -0
- data/lib/asciidoctor/mpfa/basicdoc.rng +23 -0
- data/lib/asciidoctor/mpfa/converter.rb +6 -0
- data/lib/asciidoctor/mpfa/isodoc.rng +125 -58
- data/lib/asciidoctor/mpfa/mpfd.rng +7 -0
- data/lib/isodoc/mpfa/base_convert.rb +5 -0
- data/lib/isodoc/mpfa/html/htmlstyle.css +5 -1
- data/lib/isodoc/mpfa/html/rsd.css +16 -4
- data/lib/isodoc/mpfa/html/rsd.scss +18 -4
- data/lib/isodoc/mpfa/mpfd.circular.xsl +4153 -0
- data/lib/isodoc/mpfa/mpfd.compliance-standards-for-mpf-trustees.xsl +4153 -0
- data/lib/isodoc/mpfa/mpfd.guidelines.xsl +4153 -0
- data/lib/isodoc/mpfa/mpfd.standards.xsl +4153 -0
- data/lib/isodoc/mpfa/mpfd.supervision-of-mpf-intermediaries.xsl +4153 -0
- data/lib/isodoc/mpfa/pdf_convert.rb +23 -0
- data/lib/isodoc/mpfa/word_convert.rb +1 -0
- data/lib/isodoc/mpfa/xref.rb +1 -1
- data/lib/metanorma-mpfa.rb +1 -0
- data/lib/metanorma/mpfa/processor.rb +4 -1
- data/lib/metanorma/mpfa/version.rb +1 -1
- data/metanorma-mpfd.gemspec +1 -1
- metadata +11 -7
- data/.github/workflows/macos.yml +0 -38
- data/.github/workflows/ubuntu.yml +0 -56
- data/.github/workflows/windows.yml +0 -40
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: '028095c8e9593bbd435c9c26a832aa880035eb14677e39cbc3404ade7b43c87c'
|
4
|
+
data.tar.gz: 0ca0917efb37987a0740e0fae27b57cb36418940cb7a4be77fd6e941835ae4ab
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 1c94dc642e33f3def7152b42c9805057a1cb70ab01814848c1bc82961f52b26a27c084ddd579ca541d25b387d92642ec771180c5021febe241208e0ed5fddcce
|
7
|
+
data.tar.gz: eeb38f86787013cd4a977b36e4ea50a55e92c9d7c18641ea193899427efbe98a6550600cf0e08484acd1efd5719b9105041f78f075b73ee94f45ebfdcabea02e
|
@@ -0,0 +1,44 @@
|
|
1
|
+
# Auto-generated by Cimas: Do not edit it manually!
|
2
|
+
# See https://github.com/metanorma/cimas
|
3
|
+
name: rake
|
4
|
+
|
5
|
+
on:
|
6
|
+
push:
|
7
|
+
branches: [ master ]
|
8
|
+
pull_request:
|
9
|
+
|
10
|
+
jobs:
|
11
|
+
rake:
|
12
|
+
name: Test on Ruby ${{ matrix.ruby }} ${{ matrix.os }}
|
13
|
+
runs-on: ${{ matrix.os }}
|
14
|
+
continue-on-error: ${{ matrix.experimental }}
|
15
|
+
strategy:
|
16
|
+
fail-fast: false
|
17
|
+
matrix:
|
18
|
+
ruby: [ '2.6', '2.5', '2.4' ]
|
19
|
+
os: [ ubuntu-latest, windows-latest, macos-latest ]
|
20
|
+
experimental: [ false ]
|
21
|
+
include:
|
22
|
+
- ruby: '2.7'
|
23
|
+
os: 'ubuntu-latest'
|
24
|
+
experimental: true
|
25
|
+
- ruby: '2.7'
|
26
|
+
os: 'windows-latest'
|
27
|
+
experimental: true
|
28
|
+
- ruby: '2.7'
|
29
|
+
os: 'macos-latest'
|
30
|
+
experimental: true
|
31
|
+
steps:
|
32
|
+
- uses: actions/checkout@master
|
33
|
+
|
34
|
+
- name: Use Ruby
|
35
|
+
uses: ruby/setup-ruby@v1
|
36
|
+
with:
|
37
|
+
ruby-version: ${{ matrix.ruby }}
|
38
|
+
bundler-cache: true
|
39
|
+
|
40
|
+
- name: Update gems
|
41
|
+
run: bundle install --jobs 4 --retry 3
|
42
|
+
|
43
|
+
- name: Run specs
|
44
|
+
run: bundle exec rake
|
@@ -402,6 +402,16 @@
|
|
402
402
|
</choice>
|
403
403
|
</attribute>
|
404
404
|
</optional>
|
405
|
+
<optional>
|
406
|
+
<attribute name="valign">
|
407
|
+
<choice>
|
408
|
+
<value>top</value>
|
409
|
+
<value>middle</value>
|
410
|
+
<value>bottom</value>
|
411
|
+
<value>baseline</value>
|
412
|
+
</choice>
|
413
|
+
</attribute>
|
414
|
+
</optional>
|
405
415
|
<choice>
|
406
416
|
<zeroOrMore>
|
407
417
|
<ref name="TextElement"/>
|
@@ -429,6 +439,16 @@
|
|
429
439
|
</choice>
|
430
440
|
</attribute>
|
431
441
|
</optional>
|
442
|
+
<optional>
|
443
|
+
<attribute name="valign">
|
444
|
+
<choice>
|
445
|
+
<value>top</value>
|
446
|
+
<value>middle</value>
|
447
|
+
<value>bottom</value>
|
448
|
+
<value>baseline</value>
|
449
|
+
</choice>
|
450
|
+
</attribute>
|
451
|
+
</optional>
|
432
452
|
<choice>
|
433
453
|
<zeroOrMore>
|
434
454
|
<ref name="TextElement"/>
|
@@ -998,6 +1018,9 @@
|
|
998
1018
|
<value>alphabet_upper</value>
|
999
1019
|
</choice>
|
1000
1020
|
</attribute>
|
1021
|
+
<optional>
|
1022
|
+
<attribute name="start"/>
|
1023
|
+
</optional>
|
1001
1024
|
<oneOrMore>
|
1002
1025
|
<ref name="li"/>
|
1003
1026
|
</oneOrMore>
|
@@ -56,6 +56,7 @@ module Asciidoctor
|
|
56
56
|
presentation_xml_converter(node).convert(@filename + ".xml")
|
57
57
|
html_converter(node).convert(@filename + ".presentation.xml", nil, false, "#{@filename}.html")
|
58
58
|
doc_converter(node).convert(@filename + ".presentation.xml", nil, false, "#{@filename}.doc")
|
59
|
+
pdf_converter(node)&.convert(@filename + ".presentation.xml", nil, false, "#{@filename}.pdf")
|
59
60
|
end
|
60
61
|
|
61
62
|
def validate(doc)
|
@@ -79,6 +80,11 @@ module Asciidoctor
|
|
79
80
|
def doc_converter(node)
|
80
81
|
IsoDoc::MPFA::WordConvert.new(doc_extract_attributes(node))
|
81
82
|
end
|
83
|
+
|
84
|
+
def pdf_converter(node)
|
85
|
+
return if node.attr("no-pdf")
|
86
|
+
IsoDoc::MPFA::PdfConvert.new(doc_extract_attributes(node))
|
87
|
+
end
|
82
88
|
end
|
83
89
|
end
|
84
90
|
end
|
@@ -43,7 +43,9 @@
|
|
43
43
|
<define name="xref">
|
44
44
|
<element name="xref">
|
45
45
|
<attribute name="target">
|
46
|
-
<data type="
|
46
|
+
<data type="string">
|
47
|
+
<param name="pattern">\i\c*|\c+#\c+</param>
|
48
|
+
</data>
|
47
49
|
</attribute>
|
48
50
|
<optional>
|
49
51
|
<attribute name="type">
|
@@ -61,6 +63,11 @@
|
|
61
63
|
</choice>
|
62
64
|
</attribute>
|
63
65
|
</optional>
|
66
|
+
<optional>
|
67
|
+
<attribute name="droploc">
|
68
|
+
<data type="boolean"/>
|
69
|
+
</attribute>
|
70
|
+
</optional>
|
64
71
|
<text/>
|
65
72
|
</element>
|
66
73
|
</define>
|
@@ -578,6 +585,8 @@
|
|
578
585
|
<ref name="ol"/>
|
579
586
|
<ref name="dl"/>
|
580
587
|
<ref name="formula"/>
|
588
|
+
<ref name="quote"/>
|
589
|
+
<ref name="sourcecode"/>
|
581
590
|
</choice>
|
582
591
|
</oneOrMore>
|
583
592
|
</element>
|
@@ -661,6 +670,16 @@
|
|
661
670
|
</choice>
|
662
671
|
</attribute>
|
663
672
|
</optional>
|
673
|
+
<optional>
|
674
|
+
<attribute name="valign">
|
675
|
+
<choice>
|
676
|
+
<value>top</value>
|
677
|
+
<value>middle</value>
|
678
|
+
<value>bottom</value>
|
679
|
+
<value>baseline</value>
|
680
|
+
</choice>
|
681
|
+
</attribute>
|
682
|
+
</optional>
|
664
683
|
<choice>
|
665
684
|
<zeroOrMore>
|
666
685
|
<choice>
|
@@ -697,6 +716,16 @@
|
|
697
716
|
</choice>
|
698
717
|
</attribute>
|
699
718
|
</optional>
|
719
|
+
<optional>
|
720
|
+
<attribute name="valign">
|
721
|
+
<choice>
|
722
|
+
<value>top</value>
|
723
|
+
<value>middle</value>
|
724
|
+
<value>bottom</value>
|
725
|
+
<value>baseline</value>
|
726
|
+
</choice>
|
727
|
+
</attribute>
|
728
|
+
</optional>
|
700
729
|
<choice>
|
701
730
|
<zeroOrMore>
|
702
731
|
<choice>
|
@@ -834,6 +863,13 @@
|
|
834
863
|
</define>
|
835
864
|
<define name="standard-document">
|
836
865
|
<element name="standard-document">
|
866
|
+
<attribute name="version"/>
|
867
|
+
<attribute name="type">
|
868
|
+
<choice>
|
869
|
+
<value>semantic</value>
|
870
|
+
<value>presentation</value>
|
871
|
+
</choice>
|
872
|
+
</attribute>
|
837
873
|
<ref name="bibdata"/>
|
838
874
|
<optional>
|
839
875
|
<ref name="boilerplate"/>
|
@@ -855,7 +891,7 @@
|
|
855
891
|
<oneOrMore>
|
856
892
|
<choice>
|
857
893
|
<ref name="content"/>
|
858
|
-
<ref name="
|
894
|
+
<ref name="abstract"/>
|
859
895
|
<ref name="foreword"/>
|
860
896
|
<ref name="introduction"/>
|
861
897
|
<ref name="acknowledgements"/>
|
@@ -1049,14 +1085,17 @@
|
|
1049
1085
|
<ref name="section-title"/>
|
1050
1086
|
</optional>
|
1051
1087
|
<group>
|
1052
|
-
<
|
1053
|
-
<
|
1054
|
-
<
|
1055
|
-
|
1056
|
-
|
1057
|
-
<
|
1058
|
-
|
1059
|
-
|
1088
|
+
<choice>
|
1089
|
+
<group>
|
1090
|
+
<zeroOrMore>
|
1091
|
+
<ref name="BasicBlock"/>
|
1092
|
+
</zeroOrMore>
|
1093
|
+
<zeroOrMore>
|
1094
|
+
<ref name="note"/>
|
1095
|
+
</zeroOrMore>
|
1096
|
+
</group>
|
1097
|
+
<ref name="amend"/>
|
1098
|
+
</choice>
|
1060
1099
|
<zeroOrMore>
|
1061
1100
|
<choice>
|
1062
1101
|
<ref name="clause-subsection"/>
|
@@ -1125,49 +1164,7 @@
|
|
1125
1164
|
</define>
|
1126
1165
|
<define name="annex">
|
1127
1166
|
<element name="annex">
|
1128
|
-
<
|
1129
|
-
<attribute name="id">
|
1130
|
-
<data type="ID"/>
|
1131
|
-
</attribute>
|
1132
|
-
</optional>
|
1133
|
-
<optional>
|
1134
|
-
<attribute name="language"/>
|
1135
|
-
</optional>
|
1136
|
-
<optional>
|
1137
|
-
<attribute name="script"/>
|
1138
|
-
</optional>
|
1139
|
-
<optional>
|
1140
|
-
<attribute name="inline-header">
|
1141
|
-
<data type="boolean"/>
|
1142
|
-
</attribute>
|
1143
|
-
</optional>
|
1144
|
-
<attribute name="obligation">
|
1145
|
-
<choice>
|
1146
|
-
<value>normative</value>
|
1147
|
-
<value>informative</value>
|
1148
|
-
</choice>
|
1149
|
-
</attribute>
|
1150
|
-
<optional>
|
1151
|
-
<ref name="section-title"/>
|
1152
|
-
</optional>
|
1153
|
-
<group>
|
1154
|
-
<group>
|
1155
|
-
<zeroOrMore>
|
1156
|
-
<ref name="BasicBlock"/>
|
1157
|
-
</zeroOrMore>
|
1158
|
-
<zeroOrMore>
|
1159
|
-
<ref name="note"/>
|
1160
|
-
</zeroOrMore>
|
1161
|
-
</group>
|
1162
|
-
<zeroOrMore>
|
1163
|
-
<choice>
|
1164
|
-
<ref name="annex-subsection"/>
|
1165
|
-
<ref name="terms"/>
|
1166
|
-
<ref name="definitions"/>
|
1167
|
-
<ref name="references"/>
|
1168
|
-
</choice>
|
1169
|
-
</zeroOrMore>
|
1170
|
-
</group>
|
1167
|
+
<ref name="Annex-Section"/>
|
1171
1168
|
</element>
|
1172
1169
|
</define>
|
1173
1170
|
<define name="terms">
|
@@ -1453,11 +1450,6 @@
|
|
1453
1450
|
</optional>
|
1454
1451
|
</element>
|
1455
1452
|
</define>
|
1456
|
-
<define name="preface_abstract">
|
1457
|
-
<element name="abstract">
|
1458
|
-
<ref name="Basic-Section"/>
|
1459
|
-
</element>
|
1460
|
-
</define>
|
1461
1453
|
<define name="term-clause">
|
1462
1454
|
<element name="clause">
|
1463
1455
|
<optional>
|
@@ -1507,4 +1499,79 @@
|
|
1507
1499
|
<ref name="CitationType"/>
|
1508
1500
|
</element>
|
1509
1501
|
</define>
|
1502
|
+
<define name="amend">
|
1503
|
+
<element name="amend">
|
1504
|
+
<optional>
|
1505
|
+
<attribute name="id">
|
1506
|
+
<data type="ID"/>
|
1507
|
+
</attribute>
|
1508
|
+
</optional>
|
1509
|
+
<attribute name="change">
|
1510
|
+
<choice>
|
1511
|
+
<value>add</value>
|
1512
|
+
<value>modify</value>
|
1513
|
+
<value>delete</value>
|
1514
|
+
</choice>
|
1515
|
+
</attribute>
|
1516
|
+
<optional>
|
1517
|
+
<attribute name="path"/>
|
1518
|
+
</optional>
|
1519
|
+
<optional>
|
1520
|
+
<attribute name="path_end"/>
|
1521
|
+
</optional>
|
1522
|
+
<optional>
|
1523
|
+
<attribute name="title"/>
|
1524
|
+
</optional>
|
1525
|
+
<optional>
|
1526
|
+
<element name="location">
|
1527
|
+
<zeroOrMore>
|
1528
|
+
<ref name="locality"/>
|
1529
|
+
</zeroOrMore>
|
1530
|
+
</element>
|
1531
|
+
</optional>
|
1532
|
+
<zeroOrMore>
|
1533
|
+
<ref name="autonumber"/>
|
1534
|
+
</zeroOrMore>
|
1535
|
+
<optional>
|
1536
|
+
<element name="description">
|
1537
|
+
<zeroOrMore>
|
1538
|
+
<ref name="BasicBlock"/>
|
1539
|
+
</zeroOrMore>
|
1540
|
+
</element>
|
1541
|
+
</optional>
|
1542
|
+
<optional>
|
1543
|
+
<element name="newcontent">
|
1544
|
+
<zeroOrMore>
|
1545
|
+
<ref name="BasicBlock"/>
|
1546
|
+
</zeroOrMore>
|
1547
|
+
</element>
|
1548
|
+
</optional>
|
1549
|
+
<optional>
|
1550
|
+
<element name="description">
|
1551
|
+
<zeroOrMore>
|
1552
|
+
<ref name="BasicBlock"/>
|
1553
|
+
</zeroOrMore>
|
1554
|
+
</element>
|
1555
|
+
</optional>
|
1556
|
+
</element>
|
1557
|
+
</define>
|
1558
|
+
<define name="autonumber">
|
1559
|
+
<element name="autonumber">
|
1560
|
+
<attribute name="type">
|
1561
|
+
<choice>
|
1562
|
+
<value>requirement</value>
|
1563
|
+
<value>recommendation</value>
|
1564
|
+
<value>permission</value>
|
1565
|
+
<value>table</value>
|
1566
|
+
<value>figure</value>
|
1567
|
+
<value>admonition</value>
|
1568
|
+
<value>formula</value>
|
1569
|
+
<value>sourcecode</value>
|
1570
|
+
<value>example</value>
|
1571
|
+
<value>note</value>
|
1572
|
+
</choice>
|
1573
|
+
</attribute>
|
1574
|
+
<text/>
|
1575
|
+
</element>
|
1576
|
+
</define>
|
1510
1577
|
</grammar>
|
@@ -59,6 +59,13 @@
|
|
59
59
|
</define>
|
60
60
|
<define name="mpfd-standard">
|
61
61
|
<element name="mpfd-standard">
|
62
|
+
<attribute name="version"/>
|
63
|
+
<attribute name="type">
|
64
|
+
<choice>
|
65
|
+
<value>semantic</value>
|
66
|
+
<value>presentation</value>
|
67
|
+
</choice>
|
68
|
+
</attribute>
|
62
69
|
<ref name="bibdata"/>
|
63
70
|
<zeroOrMore>
|
64
71
|
<ref name="termdocsource"/>
|
@@ -28,6 +28,7 @@ module IsoDoc
|
|
28
28
|
def preface(isoxml, out)
|
29
29
|
isoxml.xpath(ns(self.class::FRONT_CLAUSE)).each do |c|
|
30
30
|
if c.name == "terms" || c.at(ns(".//terms")) then terms_defs isoxml, out, 0
|
31
|
+
elsif !is_clause?(c.name) then parse(c, out)
|
31
32
|
else
|
32
33
|
out.div **attr_code(id: c["id"]) do |s|
|
33
34
|
clause_name(nil, c&.at(ns("./title")), s, nil)
|
@@ -39,6 +40,10 @@ module IsoDoc
|
|
39
40
|
end
|
40
41
|
end
|
41
42
|
|
43
|
+
def middle_clause
|
44
|
+
"//clause[parent::sections][not(descendant::terms)]"
|
45
|
+
end
|
46
|
+
|
42
47
|
def middle(isoxml, out)
|
43
48
|
middle_title(out)
|
44
49
|
middle_admonitions(isoxml, out)
|
@@ -16,7 +16,7 @@ fieldset, form, label, legend,
|
|
16
16
|
table, caption, tbody, tfoot, thead, tr, th, td,
|
17
17
|
article, aside, canvas, details, embed,
|
18
18
|
figure, figcaption, footer, header, hgroup,
|
19
|
-
menu,
|
19
|
+
menu, output, ruby, section, summary,
|
20
20
|
time, mark, audio, video {
|
21
21
|
margin: 0;
|
22
22
|
padding: 0; }
|
@@ -111,6 +111,10 @@ b, strong {
|
|
111
111
|
div.document-stage-band, div.document-type-band {
|
112
112
|
background-color: #333333; }
|
113
113
|
|
114
|
+
a.FootnoteRef + a.FootnoteRef:before {
|
115
|
+
content: ", ";
|
116
|
+
vertical-align: super; }
|
117
|
+
|
114
118
|
#standard-band {
|
115
119
|
background-color: #0AC442; }
|
116
120
|
|
@@ -670,7 +670,7 @@ div.WordSection2 {
|
|
670
670
|
div.WordSection3 {
|
671
671
|
page: WordSection3; }
|
672
672
|
|
673
|
-
table.MsoISOTable {
|
673
|
+
table.MsoISOTable, table.MsoISOTableBig {
|
674
674
|
mso-style-name: "Table ISO";
|
675
675
|
mso-tstyle-rowband-size: 0;
|
676
676
|
mso-tstyle-colband-size: 0;
|
@@ -691,17 +691,17 @@ table.MsoISOTable {
|
|
691
691
|
font-size: 10.0pt;
|
692
692
|
font-family: {{bodyfont}}; }
|
693
693
|
|
694
|
-
table.MsoISOTable th {
|
694
|
+
table.MsoISOTable th, table.MsoISOTableBig th {
|
695
695
|
border: solid windowtext 1pt;
|
696
696
|
mso-border-alt: solid windowtext 1pt;
|
697
697
|
padding: 0cm 2.85pt 0cm 2.85pt; }
|
698
698
|
|
699
|
-
table.MsoISOTable td {
|
699
|
+
table.MsoISOTable td, table.MsoISOTableBig td {
|
700
700
|
border: solid windowtext 1pt;
|
701
701
|
mso-border-alt: solid windowtext 1pt;
|
702
702
|
padding: 0cm 2.85pt 0cm 2.85pt; }
|
703
703
|
|
704
|
-
table.MsoISOTable p {
|
704
|
+
table.MsoISOTable p, table.MsoISOTableBig p {
|
705
705
|
font-size: 10.0pt; }
|
706
706
|
|
707
707
|
table.MsoTableGrid {
|
@@ -788,8 +788,20 @@ div.example p.MsoListParagraph {
|
|
788
788
|
font-size: 10.0pt; }
|
789
789
|
|
790
790
|
div.Note p.MsoListParagraph {
|
791
|
+
font-size: 10.0pt;
|
792
|
+
margin-left: 1.0cm; }
|
793
|
+
|
794
|
+
div.Note span.stem {
|
791
795
|
font-size: 10.0pt; }
|
792
796
|
|
797
|
+
div.Note p.Sourcecode, div.Note pre.Sourcecode {
|
798
|
+
font-size: 8.0pt;
|
799
|
+
margin-left: 1.0cm; }
|
800
|
+
|
801
|
+
div.Note table.dl {
|
802
|
+
font-size: 10.0pt;
|
803
|
+
margin-left: 1.0cm; }
|
804
|
+
|
793
805
|
span.note_label, span.example_label, td.example_label, td.note_label {
|
794
806
|
font-size: 10.0pt;
|
795
807
|
font-family: {{bodyfont}}; }
|