metanorma-mpfa 0.5.7 → 0.5.8

Sign up to get free protection for your applications and to get access to all the features.
Files changed (20) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/rake.yml +4 -5
  3. data/lib/asciidoctor/mpfa/fonts_manifest.yaml +5 -0
  4. data/lib/isodoc/mpfa/html/htmlstyle.css +3 -3
  5. data/lib/isodoc/mpfa/html/htmlstyle.scss +2 -2
  6. data/lib/isodoc/mpfa/html/rsd.css +19 -20
  7. data/lib/isodoc/mpfa/html/rsd.scss +19 -20
  8. data/lib/isodoc/mpfa/html/wordstyle.css +19 -19
  9. data/lib/isodoc/mpfa/html/wordstyle.scss +19 -19
  10. data/lib/isodoc/mpfa/html_convert.rb +3 -1
  11. data/lib/isodoc/mpfa/mpfd.circular.xsl +7 -3
  12. data/lib/isodoc/mpfa/mpfd.compliance-standards-for-mpf-trustees.xsl +7 -3
  13. data/lib/isodoc/mpfa/mpfd.guidelines.xsl +7 -3
  14. data/lib/isodoc/mpfa/mpfd.standards.xsl +7 -3
  15. data/lib/isodoc/mpfa/mpfd.supervision-of-mpf-intermediaries.xsl +7 -3
  16. data/lib/isodoc/mpfa/word_convert.rb +5 -1
  17. data/lib/metanorma/mpfa/processor.rb +0 -7
  18. data/lib/metanorma/mpfa/version.rb +1 -1
  19. data/metanorma-mpfd.gemspec +1 -1
  20. metadata +5 -4
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: aa8dc04fe7159fa549adc2516114541a31411ca3541f4bd528c3ed14499478fb
4
- data.tar.gz: c7cba808a347d5b850ac98610689623cbc89196045b64792f318c8c16add0af3
3
+ metadata.gz: 596d79a5ba9b9bb29e0f198f49ad991e2e7050b0544208ac76debb9f7c85d18c
4
+ data.tar.gz: dd508a80cb6b33f736752c4bf581f6d7721827134db82218ddb043a8726ef9f5
5
5
  SHA512:
6
- metadata.gz: 9671e717d844aa493d53cd591eec1cbb2803b5b960ed901383656488512c9315b0cd59031731a26566d6ad8062aaebb699e86fe1c03e8f75ed16d09183812445
7
- data.tar.gz: 624c66223ca8933f464e37664ebd7fff5d41282bcfa5dea97d9a93ef61c04435745d4c1d7706b9a22ec721864b75ba686d6f4ad1793f9d91f4cf6e2d23fc04dc
6
+ metadata.gz: 318a73311033294df909c6231da009cdd54695c1a731017a71945a07f034e6fa6bb66ec2e1217ccaa0703b005ca6fa95efb37ba545b64eac8c0731d873f5bac6
7
+ data.tar.gz: 1109389bdd638728883b07c0112a0f714aa7520ba345a9685af1c4cf926127f22035a6e6707faa4e2b7339f50d67b84ed67b9eab890db5b7d3f2801eebb37a9b
data/.github/workflows/rake.yml CHANGED
@@ -36,7 +36,7 @@ jobs:
36
36
  with:
37
37
  ruby-version: ${{ matrix.ruby }}
38
38
 
39
- - uses: actions/cache@v1
39
+ - uses: actions/cache@v2
40
40
  with:
41
41
  path: vendor/bundle
42
42
  key: bundle-${{ matrix.os }}-${{ matrix.ruby }}-${{ hashFiles('**/*.gemspec') }}
@@ -48,15 +48,14 @@ jobs:
48
48
 
49
49
  - run: bundle exec rake
50
50
 
51
- notify:
52
- name: Trigger notify workflow
51
+ tests-passed:
53
52
  needs: rake
54
53
  runs-on: ubuntu-latest
55
54
  steps:
56
- - name: Trigger notify workflow
55
+ - name: Trigger tests passed event
57
56
  uses: Sibz/github-status-action@v1
58
57
  with:
59
- authToken: ${{ secrets.GITHUB_TOKEN }}
58
+ authToken: ${{ secrets.METANORMA_CI_PAT_TOKEN || secrets.GITHUB_TOKEN }}
60
59
  context: 'tests-passed-successfully'
61
60
  description: 'Tests passed successfully'
62
61
  state: 'success'
data/lib/asciidoctor/mpfa/fonts_manifest.yaml ADDED
@@ -0,0 +1,5 @@
1
+ ---
2
+ Titillium Web:
3
+ Space Mono:
4
+ Arial:
5
+ Courier New:
data/lib/isodoc/mpfa/html/htmlstyle.css CHANGED
@@ -224,7 +224,7 @@ body {
224
224
  margin-left: auto;
225
225
  margin-right: auto;
226
226
  max-width: 100%;
227
- font-size: 15px;
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: 0.8em;
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: 0.9em; }
796
+ font-size: {{footnotefontsize}}; }
797
797
 
798
798
  /*
799
799
  3.11 Blockquotes
data/lib/isodoc/mpfa/html/htmlstyle.scss CHANGED
@@ -14,7 +14,7 @@
14
14
  */
15
15
 
16
16
  body {
17
- @include bodyStyle1(15px, 1.4em, #301907, #f7f7f7, 300);
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: 0.9em;
449
+ font-size: $footnotefontsize;
450
450
  }
451
451
 
452
452
 
data/lib/isodoc/mpfa/html/rsd.css CHANGED
@@ -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: 10.0pt;
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: 10.5pt;
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: 10.5pt;
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: 10.0pt;
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: 10.5pt;
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: 10.5pt;
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: 10.5pt;
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: 10.5pt;
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: 10.0pt;
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: 10.0pt; }
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: 10.0pt;
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: 10.0pt; }
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: 10.0pt;
780
+ font-size: {{smallerfontsize}};
782
781
  font-family: {{bodyfont}}; }
783
782
 
784
783
  td.example p.MsoListParagraph {
785
- font-size: 10.0pt; }
784
+ font-size: {{smallerfontsize}}; }
786
785
 
787
786
  div.example p.MsoListParagraph {
788
- font-size: 10.0pt; }
787
+ font-size: {{smallerfontsize}}; }
789
788
 
790
789
  div.Note p.MsoListParagraph {
791
- font-size: 10.0pt;
790
+ font-size: {{smallerfontsize}};
792
791
  margin-left: 1.0cm; }
793
792
 
794
793
  div.Note span.stem {
795
- font-size: 10.0pt; }
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: 10.0pt;
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: 10.0pt;
805
+ font-size: {{smallerfontsize}};
807
806
  font-family: {{bodyfont}}; }
808
807
 
809
808
  table.dl {
data/lib/isodoc/mpfa/html/rsd.scss CHANGED
@@ -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:10.0pt;
12
+ font-size:$monospacefontsize;
13
13
  font-family:$monospacefont;
14
14
  mso-fareast-font-family:Calibri;
15
15
  mso-bidi-font-family:"Courier New";
@@ -25,7 +25,7 @@ p.pseudocode, li.pseudocode, div.pseudocode
25
25
  text-align:left;
26
26
  mso-pagination:widow-orphan;
27
27
  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;
28
- font-size:10.5pt;
28
+ font-size:$normalfontsize;
29
29
  font-family:$bodyfont;
30
30
  mso-fareast-font-family:Calibri;
31
31
  mso-bidi-font-family:"Courier New";
@@ -42,7 +42,7 @@ p.Biblio, li.Biblio, div.Biblio, p.NormRef, li.NormRef, div.NormRef
42
42
  tab-stops: 33.15pt;
43
43
  line-height:12.0pt;
44
44
  mso-pagination:widow-orphan;
45
- font-size:10.5pt;
45
+ font-size:$normalfontsize;
46
46
  font-weight:normal;
47
47
  font-family:$bodyfont;
48
48
  mso-fareast-font-family:$bodyfont;
@@ -135,10 +135,9 @@ p.Note, div.Note, li.Note, p.TableFootnote, div.TableFootnote, li.TableFootnote
135
135
  line-height:12.0pt;
136
136
  mso-pagination:widow-orphan;
137
137
  tab-stops:20.15pt;
138
- font-size:10.0pt;
138
+ font-size:$smallerfontsize;
139
139
  mso-bidi-font-size:11.0pt;
140
140
  font-family:$bodyfont;
141
- font-size:10.0pt;
142
141
  mso-fareast-font-family:$bodyfont;
143
142
  mso-bidi-font-family:$bodyfont;
144
143
  mso-ansi-language:EN-GB;}
@@ -392,7 +391,7 @@ p.zzCopyright, li.zzCopyright
392
391
  tab-stops:20.15pt 25.7pt 481.15pt;
393
392
  padding:0cm;
394
393
  mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt;
395
- font-size:10.5pt;
394
+ font-size:$normalfontsize;
396
395
  font-family:$bodyfont;
397
396
  mso-fareast-font-family:$bodyfont;
398
397
  mso-bidi-font-family:$bodyfont;
@@ -473,7 +472,7 @@ p.Quote, li.Quote, div.Quote
473
472
  line-height:12.0pt;
474
473
  mso-pagination:widow-orphan;
475
474
  tab-stops:20.15pt;
476
- font-size:10.5pt;
475
+ font-size:$normalfontsize;
477
476
  font-family:$bodyfont;
478
477
  mso-fareast-font-family:$bodyfont;
479
478
  mso-bidi-font-family:$bodyfont;
@@ -488,7 +487,7 @@ p.QuoteAttribution
488
487
  line-height:12.0pt;
489
488
  mso-pagination:widow-orphan;
490
489
  tab-stops:20.15pt;
491
- font-size:10.5pt;
490
+ font-size:$normalfontsize;
492
491
  font-family:$bodyfont;
493
492
  mso-fareast-font-family:$bodyfont;
494
493
  mso-bidi-font-family:$bodyfont;
@@ -548,7 +547,7 @@ p.Formula, li.Formula, div.Formula
548
547
  line-height:12.0pt;
549
548
  mso-pagination:widow-orphan;
550
549
  tab-stops:right 487.45pt;
551
- font-size:10.5pt;
550
+ font-size:$normalfontsize;
552
551
  font-family:$bodyfont;
553
552
  mso-fareast-font-family:$bodyfont;
554
553
  mso-bidi-font-family:$bodyfont;
@@ -651,7 +650,7 @@ table.MsoISOTable, table.MsoISOTableBig
651
650
  mso-yfti-tbllook:480;
652
651
  mso-border-insideh:.75pt solid windowtext;
653
652
  mso-border-insidev:.75pt solid windowtext;
654
- font-size:10.0pt;
653
+ font-size:$smallerfontsize;
655
654
  font-family:$bodyfont;}
656
655
  table.MsoISOTable th, table.MsoISOTableBig th
657
656
  {border:solid windowtext 1pt;
@@ -662,7 +661,7 @@ table.MsoISOTable td, table.MsoISOTableBig td
662
661
  mso-border-alt:solid windowtext 1pt;
663
662
  padding:0cm 2.85pt 0cm 2.85pt;}
664
663
  table.MsoISOTable p, table.MsoISOTableBig p
665
- {font-size:10.0pt; }
664
+ {font-size:$smallerfontsize; }
666
665
  table.MsoTableGrid
667
666
  {mso-style-name:"Table Grid";
668
667
  mso-tstyle-rowband-size:0;
@@ -677,7 +676,7 @@ table.MsoTableGrid
677
676
  mso-para-margin:0cm;
678
677
  mso-para-margin-bottom:.0001pt;
679
678
  mso-pagination:widow-orphan;
680
- font-size:10.0pt;
679
+ font-size:$smallerfontsize;
681
680
  font-family:$bodyfont;}
682
681
  div.formula
683
682
  {tab-stops:right 487.45pt;}
@@ -712,7 +711,7 @@ div.coverpage_warning
712
711
  vertical-align:super;}
713
712
 
714
713
  aside {
715
- font-size:10.0pt;
714
+ font-size:$footnotefontsize;
716
715
  }
717
716
 
718
717
  .example-title {
@@ -734,24 +733,24 @@ div.example {
734
733
 
735
734
  p.example, li.example, div.example, td.example {
736
735
  mso-pagination:none;
737
- font-size:10.0pt;
736
+ font-size:$smallerfontsize;
738
737
  font-family:$bodyfont;}
739
738
 
740
739
  td.example p.MsoListParagraph {
741
- font-size: 10.0pt;
740
+ font-size: $smallerfontsize;
742
741
  }
743
742
 
744
743
  div.example p.MsoListParagraph {
745
- font-size: 10.0pt;
744
+ font-size: $smallerfontsize;
746
745
  }
747
746
 
748
747
  div.Note p.MsoListParagraph {
749
- font-size: 10.0pt;
748
+ font-size: $smallerfontsize;
750
749
  margin-left: 1.0cm;
751
750
  }
752
751
 
753
752
  div.Note span.stem {
754
- font-size: 10.0pt; }
753
+ font-size: $smallerfontsize; }
755
754
 
756
755
  div.Note p.Sourcecode, div.Note pre.Sourcecode {
757
756
  font-size: 8.0pt;
@@ -759,13 +758,13 @@ div.Note p.Sourcecode, div.Note pre.Sourcecode {
759
758
  }
760
759
 
761
760
  div.Note table.dl {
762
- font-size: 10.0pt;
761
+ font-size: $smallerfontsize;
763
762
  margin-left: 1.0cm;
764
763
  }
765
764
 
766
765
  span.note_label, span.example_label, td.example_label, td.note_label
767
766
  {
768
- font-size: 10.0pt;
767
+ font-size: $smallerfontsize;
769
768
  font-family:$bodyfont;
770
769
  }
771
770
 
data/lib/isodoc/mpfa/html/wordstyle.css CHANGED
@@ -81,7 +81,7 @@ p.MsoNormal, li.MsoNormal, div.MsoNormal {
81
81
  margin: 0cm;
82
82
  margin-bottom: 12.0pt;
83
83
  mso-pagination: widow-orphan;
84
- font-size: 10.5pt;
84
+ font-size: {{normalfontsize}};
85
85
  font-family: {{bodyfont}};
86
86
  mso-fareast-font-family: "Times New Roman";
87
87
  mso-ansi-language: EN-US;
@@ -97,7 +97,7 @@ p.MsoListParagraph, li.MsoListParagraph, div.MsoListParagraph {
97
97
  margin-bottom: 12.0pt;
98
98
  mso-add-space: auto;
99
99
  mso-pagination: widow-orphan;
100
- font-size: 10.5pt;
100
+ font-size: {{normalfontsize}};
101
101
  font-family: {{bodyfont}};
102
102
  mso-ansi-language: EN-AU;
103
103
  mso-fareast-language: EN-US; }
@@ -113,7 +113,7 @@ p.MsoListParagraphCxSpFirst, li.MsoListParagraphCxSpFirst, div.MsoListParagraphC
113
113
  /* do not put in margin-left, it is specific to list level */
114
114
  mso-add-space: auto;
115
115
  mso-pagination: widow-orphan;
116
- font-size: 10.5pt;
116
+ font-size: {{normalfontsize}};
117
117
  font-family: {{bodyfont}};
118
118
  mso-ansi-language: EN-AU;
119
119
  mso-fareast-language: EN-US; }
@@ -129,7 +129,7 @@ p.MsoListParagraphCxSpMiddle, li.MsoListParagraphCxSpMiddle, div.MsoListParagrap
129
129
  /* do not put in margin-left, it is specific to list level */
130
130
  mso-add-space: auto;
131
131
  mso-pagination: widow-orphan;
132
- font-size: 10.5pt;
132
+ font-size: {{normalfontsize}};
133
133
  font-family: {{bodyfont}};
134
134
  mso-ansi-language: EN-AU;
135
135
  mso-fareast-language: EN-US; }
@@ -145,7 +145,7 @@ p.MsoListParagraphCxSpLast, li.MsoListParagraphCxSpLast, div.MsoListParagraphCxS
145
145
  /* do not put in margin-left, it is specific to list level */
146
146
  mso-add-space: auto;
147
147
  mso-pagination: widow-orphan;
148
- font-size: 10.5pt;
148
+ font-size: {{normalfontsize}};
149
149
  font-family: {{bodyfont}};
150
150
  mso-ansi-language: EN-AU;
151
151
  mso-fareast-language: EN-US; }
@@ -156,7 +156,7 @@ p.MsoCommentText, li.MsoCommentText, div.MsoCommentText {
156
156
  margin: 0cm;
157
157
  margin-bottom: .0001pt;
158
158
  mso-pagination: widow-orphan;
159
- font-size: 10.0pt;
159
+ font-size: {{footnotefontsize}};
160
160
  font-family: {{bodyfont}};
161
161
  mso-fareast-font-family: "Times New Roman";
162
162
  mso-ansi-language: EN-US;
@@ -168,7 +168,7 @@ p.MsoHeader, li.MsoHeader, div.MsoHeader {
168
168
  margin-bottom: .0001pt;
169
169
  mso-pagination: widow-orphan;
170
170
  tab-stops: center 216.0pt right 482.0pt;
171
- font-size: 10.5pt;
171
+ font-size: {{normalfontsize}};
172
172
  font-family: {{bodyfont}};
173
173
  mso-fareast-font-family: "Times New Roman";
174
174
  mso-ansi-language: EN-US;
@@ -180,7 +180,7 @@ p.MsoHeaderLandscape, li.MsoHeaderLandscape, div.MsoHeaderLandscape {
180
180
  margin-bottom: .0001pt;
181
181
  mso-pagination: widow-orphan;
182
182
  tab-stops: center 367.0pt right 734.0pt;
183
- font-size: 10.5pt;
183
+ font-size: {{normalfontsize}};
184
184
  font-family: {{bodyfont}};
185
185
  mso-fareast-font-family: "Times New Roman";
186
186
  mso-ansi-language: EN-US;
@@ -192,7 +192,7 @@ p.MsoFooter, li.MsoFooter, div.MsoFooter {
192
192
  margin-bottom: .0001pt;
193
193
  mso-pagination: widow-orphan;
194
194
  tab-stops: right 482.0pt;
195
- font-size: 10.5pt;
195
+ font-size: {{normalfontsize}};
196
196
  font-family: {{bodyfont}};
197
197
  mso-fareast-font-family: "Times New Roman";
198
198
  mso-ansi-language: EN-US;
@@ -204,7 +204,7 @@ p.MsoFooterLandscape, li.MsoFooterLandscape, div.MsoFooterLandscape {
204
204
  margin-bottom: .0001pt;
205
205
  mso-pagination: widow-orphan;
206
206
  tab-stops: right 734.0pt;
207
- font-size: 10.5pt;
207
+ font-size: {{normalfontsize}};
208
208
  font-family: {{bodyfont}};
209
209
  mso-fareast-font-family: "Times New Roman";
210
210
  mso-ansi-language: EN-US;
@@ -333,7 +333,7 @@ p.MsoCommentSubject, li.MsoCommentSubject, div.MsoCommentSubject {
333
333
  margin: 0cm;
334
334
  margin-bottom: .0001pt;
335
335
  mso-pagination: widow-orphan;
336
- font-size: 10.0pt;
336
+ font-size: {{footnotefontsize}};
337
337
  font-family: {{bodyfont}};
338
338
  mso-fareast-font-family: "Times New Roman";
339
339
  mso-ansi-language: EN-US;
@@ -605,7 +605,7 @@ p.MsoToc1, li.MsoToc1, div.MsoToc1 {
605
605
  mso-pagination: widow-orphan;
606
606
  mso-hyphenate: none;
607
607
  tab-stops: 20.15pt 36.0pt right dotted 487.6pt;
608
- font-size: 10.5pt;
608
+ font-size: {{normalfontsize}};
609
609
  font-family: {{bodyfont}};
610
610
  mso-fareast-font-family: {{bodyfont}};
611
611
  mso-bidi-font-family: {{bodyfont}};
@@ -629,7 +629,7 @@ p.MsoToc2, li.MsoToc2, div.MsoToc2 {
629
629
  mso-pagination: widow-orphan;
630
630
  mso-hyphenate: none;
631
631
  tab-stops: 20.15pt 36.0pt right dotted 487.6pt;
632
- font-size: 10.5pt;
632
+ font-size: {{normalfontsize}};
633
633
  font-family: {{bodyfont}};
634
634
  mso-fareast-font-family: {{bodyfont}};
635
635
  mso-bidi-font-family: {{bodyfont}};
@@ -653,7 +653,7 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3 {
653
653
  mso-pagination: widow-orphan;
654
654
  mso-hyphenate: none;
655
655
  tab-stops: 20.15pt 36.0pt right dotted 487.6pt;
656
- font-size: 10.5pt;
656
+ font-size: {{normalfontsize}};
657
657
  font-family: {{bodyfont}};
658
658
  mso-fareast-font-family: {{bodyfont}};
659
659
  mso-bidi-font-family: {{bodyfont}};
@@ -677,7 +677,7 @@ p.MsoFootnoteText, li.MsoFootnoteText, div.MsoFootnoteText {
677
677
  line-height: 12.0pt;
678
678
  mso-pagination: widow-orphan;
679
679
  tab-stops: 20.15pt;
680
- font-size: 10.0pt;
680
+ font-size: {{footnotefontsize}};
681
681
  font-family: {{bodyfont}};
682
682
  mso-fareast-font-family: {{bodyfont}};
683
683
  mso-bidi-font-family: {{bodyfont}};
@@ -696,7 +696,7 @@ p.MsoBodyText, li.MsoBodyText, div.MsoBodyText {
696
696
  text-align: justify;
697
697
  line-height: 12.0pt;
698
698
  mso-pagination: widow-orphan;
699
- font-size: 10.5pt;
699
+ font-size: {{normalfontsize}};
700
700
  font-family: {{bodyfont}};
701
701
  mso-fareast-font-family: {{bodyfont}};
702
702
  mso-bidi-font-family: {{bodyfont}};
@@ -812,9 +812,9 @@ p.Tablebody, li.Tablebody, div.Tablebody {
812
812
  margin-right: 0cm;
813
813
  margin-bottom: 3.0pt;
814
814
  margin-left: 0cm;
815
- line-height: 10.5pt;
815
+ line-height: {{normalfontsize}};
816
816
  mso-pagination: widow-orphan;
817
- font-size: 10.0pt;
817
+ font-size: {{smallerfontsize}};
818
818
  mso-bidi-font-size: 11.0pt;
819
819
  font-family: {{bodyfont}};
820
820
  mso-fareast-font-family: {{bodyfont}};
@@ -1241,7 +1241,7 @@ table.MsoNormalTable {
1241
1241
  mso-para-margin: 0cm;
1242
1242
  mso-para-margin-bottom: .0001pt;
1243
1243
  mso-pagination: widow-orphan;
1244
- font-size: 10.0pt;
1244
+ font-size: {{smallerfontsize}};
1245
1245
  font-family: {{bodyfont}}; }
1246
1246
 
1247
1247
  ol {
data/lib/isodoc/mpfa/html/wordstyle.scss CHANGED
@@ -71,7 +71,7 @@ p.MsoNormal, li.MsoNormal, div.MsoNormal
71
71
  margin:0cm;
72
72
  margin-bottom:12.0pt;
73
73
  mso-pagination:widow-orphan;
74
- font-size:10.5pt;
74
+ font-size:$normalfontsize;
75
75
  font-family:$bodyfont;
76
76
  mso-fareast-font-family:"Times New Roman";
77
77
  mso-ansi-language:EN-US;
@@ -86,7 +86,7 @@ p.MsoListParagraph, li.MsoListParagraph, div.MsoListParagraph
86
86
  margin-bottom:12.0pt;
87
87
  mso-add-space:auto;
88
88
  mso-pagination:widow-orphan;
89
- font-size:10.5pt;
89
+ font-size:$normalfontsize;
90
90
  font-family:$bodyfont;
91
91
  mso-ansi-language:EN-AU;
92
92
  mso-fareast-language:EN-US;}
@@ -101,7 +101,7 @@ p.MsoListParagraphCxSpFirst, li.MsoListParagraphCxSpFirst, div.MsoListParagraphC
101
101
  /* do not put in margin-left, it is specific to list level */
102
102
  mso-add-space:auto;
103
103
  mso-pagination:widow-orphan;
104
- font-size:10.5pt;
104
+ font-size:$normalfontsize;
105
105
  font-family:$bodyfont;
106
106
  mso-ansi-language:EN-AU;
107
107
  mso-fareast-language:EN-US;}
@@ -116,7 +116,7 @@ p.MsoListParagraphCxSpMiddle, li.MsoListParagraphCxSpMiddle, div.MsoListParagrap
116
116
  /* do not put in margin-left, it is specific to list level */
117
117
  mso-add-space:auto;
118
118
  mso-pagination:widow-orphan;
119
- font-size:10.5pt;
119
+ font-size:$normalfontsize;
120
120
  font-family:$bodyfont;
121
121
  mso-ansi-language:EN-AU;
122
122
  mso-fareast-language:EN-US;}
@@ -131,7 +131,7 @@ p.MsoListParagraphCxSpLast, li.MsoListParagraphCxSpLast, div.MsoListParagraphCxS
131
131
  /* do not put in margin-left, it is specific to list level */
132
132
  mso-add-space:auto;
133
133
  mso-pagination:widow-orphan;
134
- font-size:10.5pt;
134
+ font-size:$normalfontsize;
135
135
  font-family:$bodyfont;
136
136
  mso-ansi-language:EN-AU;
137
137
  mso-fareast-language:EN-US;}
@@ -142,7 +142,7 @@ p.MsoCommentText, li.MsoCommentText, div.MsoCommentText
142
142
  margin:0cm;
143
143
  margin-bottom:.0001pt;
144
144
  mso-pagination:widow-orphan;
145
- font-size:10.0pt;
145
+ font-size:$footnotefontsize;
146
146
  font-family:$bodyfont;
147
147
  mso-fareast-font-family:"Times New Roman";
148
148
  mso-ansi-language:EN-US;
@@ -153,7 +153,7 @@ p.MsoHeader, li.MsoHeader, div.MsoHeader
153
153
  margin-bottom:.0001pt;
154
154
  mso-pagination:widow-orphan;
155
155
  tab-stops:center 216.0pt right 482.0pt;
156
- font-size:10.5pt;
156
+ font-size:$normalfontsize;
157
157
  font-family:$bodyfont;
158
158
  mso-fareast-font-family:"Times New Roman";
159
159
  mso-ansi-language:EN-US;
@@ -164,7 +164,7 @@ p.MsoHeaderLandscape, li.MsoHeaderLandscape, div.MsoHeaderLandscape
164
164
  margin-bottom:.0001pt;
165
165
  mso-pagination:widow-orphan;
166
166
  tab-stops:center 367.0pt right 734.0pt;
167
- font-size:10.5pt;
167
+ font-size:$normalfontsize;
168
168
  font-family:$bodyfont;
169
169
  mso-fareast-font-family:"Times New Roman";
170
170
  mso-ansi-language:EN-US;
@@ -175,7 +175,7 @@ p.MsoFooter, li.MsoFooter, div.MsoFooter
175
175
  margin-bottom:.0001pt;
176
176
  mso-pagination:widow-orphan;
177
177
  tab-stops:right 482.0pt;
178
- font-size:10.5pt;
178
+ font-size:$normalfontsize;
179
179
  font-family:$bodyfont;
180
180
  mso-fareast-font-family:"Times New Roman";
181
181
  mso-ansi-language:EN-US;
@@ -186,7 +186,7 @@ p.MsoFooterLandscape, li.MsoFooterLandscape, div.MsoFooterLandscape
186
186
  margin-bottom:.0001pt;
187
187
  mso-pagination:widow-orphan;
188
188
  tab-stops:right 734.0pt;
189
- font-size:10.5pt;
189
+ font-size:$normalfontsize;
190
190
  font-family:$bodyfont;
191
191
  mso-fareast-font-family:"Times New Roman";
192
192
  mso-ansi-language:EN-US;
@@ -306,7 +306,7 @@ p.MsoCommentSubject, li.MsoCommentSubject, div.MsoCommentSubject
306
306
  margin:0cm;
307
307
  margin-bottom:.0001pt;
308
308
  mso-pagination:widow-orphan;
309
- font-size:10.0pt;
309
+ font-size:$footnotefontsize;
310
310
  font-family:$bodyfont;
311
311
  mso-fareast-font-family:"Times New Roman";
312
312
  mso-ansi-language:EN-US;
@@ -567,7 +567,7 @@ p.MsoToc1, li.MsoToc1, div.MsoToc1
567
567
  mso-pagination:widow-orphan;
568
568
  mso-hyphenate:none;
569
569
  tab-stops:20.15pt 36.0pt right dotted 487.6pt;
570
- font-size:10.5pt;
570
+ font-size:$normalfontsize;
571
571
  font-family:$bodyfont;
572
572
  mso-fareast-font-family:$bodyfont;
573
573
  mso-bidi-font-family:$bodyfont;
@@ -590,7 +590,7 @@ p.MsoToc2, li.MsoToc2, div.MsoToc2
590
590
  mso-pagination:widow-orphan;
591
591
  mso-hyphenate:none;
592
592
  tab-stops:20.15pt 36.0pt right dotted 487.6pt;
593
- font-size:10.5pt;
593
+ font-size:$normalfontsize;
594
594
  font-family:$bodyfont;
595
595
  mso-fareast-font-family:$bodyfont;
596
596
  mso-bidi-font-family:$bodyfont;
@@ -613,7 +613,7 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3
613
613
  mso-pagination:widow-orphan;
614
614
  mso-hyphenate:none;
615
615
  tab-stops:20.15pt 36.0pt right dotted 487.6pt;
616
- font-size:10.5pt;
616
+ font-size:$normalfontsize;
617
617
  font-family:$bodyfont;
618
618
  mso-fareast-font-family:$bodyfont;
619
619
  mso-bidi-font-family:$bodyfont;
@@ -635,7 +635,7 @@ p.MsoFootnoteText, li.MsoFootnoteText, div.MsoFootnoteText
635
635
  line-height:12.0pt;
636
636
  mso-pagination:widow-orphan;
637
637
  tab-stops:20.15pt;
638
- font-size:10.0pt;
638
+ font-size:$footnotefontsize;
639
639
  font-family:$bodyfont;
640
640
  mso-fareast-font-family:$bodyfont;
641
641
  mso-bidi-font-family:$bodyfont;
@@ -653,7 +653,7 @@ p.MsoBodyText, li.MsoBodyText, div.MsoBodyText
653
653
  text-align:justify;
654
654
  line-height:12.0pt;
655
655
  mso-pagination:widow-orphan;
656
- font-size:10.5pt;
656
+ font-size:$normalfontsize;
657
657
  font-family:$bodyfont;
658
658
  mso-fareast-font-family:$bodyfont;
659
659
  mso-bidi-font-family:$bodyfont;
@@ -762,9 +762,9 @@ p.Tablebody, li.Tablebody, div.Tablebody
762
762
  margin-right:0cm;
763
763
  margin-bottom:3.0pt;
764
764
  margin-left:0cm;
765
- line-height:10.5pt;
765
+ line-height:$normalfontsize;
766
766
  mso-pagination:widow-orphan;
767
- font-size:10.0pt;
767
+ font-size:$smallerfontsize;
768
768
  mso-bidi-font-size:11.0pt;
769
769
  font-family:$bodyfont;
770
770
  mso-fareast-font-family:$bodyfont;
@@ -1146,7 +1146,7 @@ table.MsoNormalTable
1146
1146
  mso-para-margin:0cm;
1147
1147
  mso-para-margin-bottom:.0001pt;
1148
1148
  mso-pagination:widow-orphan;
1149
- font-size:10.0pt;
1149
+ font-size:$smallerfontsize;
1150
1150
  font-family:$bodyfont;}
1151
1151
  ol
1152
1152
  {margin-bottom:0cm;
data/lib/isodoc/mpfa/html_convert.rb CHANGED
@@ -20,7 +20,9 @@ module IsoDoc
20
20
  {
21
21
  bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' : '"Titillium Web",sans-serif'),
22
22
  headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' : '"Titillium Web",sans-serif'),
23
- monospacefont: '"Space Mono",monospace'
23
+ monospacefont: '"Space Mono",monospace',
24
+ normalfontsize: "15px",
25
+ footnotefontsize: "0.9em",
24
26
  }
25
27
  end
26
28
 
data/lib/isodoc/mpfa/mpfd.circular.xsl CHANGED
@@ -1167,6 +1167,7 @@
1167
1167
  </xsl:attribute-set><xsl:attribute-set name="term-style">
1168
1168
 
1169
1169
  </xsl:attribute-set><xsl:attribute-set name="figure-name-style">
1170
+
1170
1171
 
1171
1172
 
1172
1173
 
@@ -2429,6 +2430,7 @@
2429
2430
  </fo:inline>
2430
2431
  </xsl:template><xsl:template match="*[local-name()='strong'] | *[local-name()='b']">
2431
2432
  <fo:inline font-weight="bold">
2433
+
2432
2434
  <xsl:apply-templates/>
2433
2435
  </fo:inline>
2434
2436
  </xsl:template><xsl:template match="*[local-name()='sup']">
@@ -2833,6 +2835,7 @@
2833
2835
  </xsl:choose>
2834
2836
  </xsl:variable>
2835
2837
  <fo:inline xsl:use-attribute-sets="link-style">
2838
+
2836
2839
  <xsl:choose>
2837
2840
  <xsl:when test="$target = ''">
2838
2841
  <xsl:apply-templates/>
@@ -3044,7 +3047,8 @@
3044
3047
  </fo:inline>
3045
3048
  </xsl:if>
3046
3049
  </xsl:template><xsl:template match="*[local-name() = 'figure']">
3047
- <fo:block-container id="{@id}">
3050
+ <fo:block-container id="{@id}">
3051
+
3048
3052
  <fo:block>
3049
3053
  <xsl:apply-templates/>
3050
3054
  </fo:block>
@@ -3095,7 +3099,7 @@
3095
3099
  <xsl:apply-templates mode="bookmarks"/>
3096
3100
  </xsl:template><xsl:template match="*[local-name() = 'stem']" mode="contents">
3097
3101
  <xsl:apply-templates select="."/>
3098
- </xsl:template><xsl:template match="*[local-name() = 'stem']" mode="bookmarks">
3102
+ </xsl:template><xsl:template match="*[local-name() = 'references'][@hidden='true']" mode="contents" priority="3"/><xsl:template match="*[local-name() = 'stem']" mode="bookmarks">
3099
3103
  <xsl:apply-templates mode="bookmarks"/>
3100
3104
  </xsl:template><xsl:template name="addBookmarks">
3101
3105
  <xsl:param name="contents"/>
@@ -3822,7 +3826,7 @@
3822
3826
  <fo:block id="{@id}">
3823
3827
  <xsl:apply-templates/>
3824
3828
  </fo:block>
3825
- </xsl:template><xsl:template match="/*/*[local-name() = 'bibliography']/*[local-name() = 'references'][@normative='true']">
3829
+ </xsl:template><xsl:template match="*[local-name() = 'references'][@hidden='true']" priority="3"/><xsl:template match="*[local-name() = 'bibitem'][@hidden='true']" priority="3"/><xsl:template match="/*/*[local-name() = 'bibliography']/*[local-name() = 'references'][@normative='true']">
3826
3830
 
3827
3831
  <fo:block id="{@id}">
3828
3832
  <xsl:apply-templates/>
data/lib/isodoc/mpfa/mpfd.compliance-standards-for-mpf-trustees.xsl CHANGED
@@ -1167,6 +1167,7 @@
1167
1167
  </xsl:attribute-set><xsl:attribute-set name="term-style">
1168
1168
 
1169
1169
  </xsl:attribute-set><xsl:attribute-set name="figure-name-style">
1170
+
1170
1171
 
1171
1172
 
1172
1173
 
@@ -2429,6 +2430,7 @@
2429
2430
  </fo:inline>
2430
2431
  </xsl:template><xsl:template match="*[local-name()='strong'] | *[local-name()='b']">
2431
2432
  <fo:inline font-weight="bold">
2433
+
2432
2434
  <xsl:apply-templates/>
2433
2435
  </fo:inline>
2434
2436
  </xsl:template><xsl:template match="*[local-name()='sup']">
@@ -2833,6 +2835,7 @@
2833
2835
  </xsl:choose>
2834
2836
  </xsl:variable>
2835
2837
  <fo:inline xsl:use-attribute-sets="link-style">
2838
+
2836
2839
  <xsl:choose>
2837
2840
  <xsl:when test="$target = ''">
2838
2841
  <xsl:apply-templates/>
@@ -3044,7 +3047,8 @@
3044
3047
  </fo:inline>
3045
3048
  </xsl:if>
3046
3049
  </xsl:template><xsl:template match="*[local-name() = 'figure']">
3047
- <fo:block-container id="{@id}">
3050
+ <fo:block-container id="{@id}">
3051
+
3048
3052
  <fo:block>
3049
3053
  <xsl:apply-templates/>
3050
3054
  </fo:block>
@@ -3095,7 +3099,7 @@
3095
3099
  <xsl:apply-templates mode="bookmarks"/>
3096
3100
  </xsl:template><xsl:template match="*[local-name() = 'stem']" mode="contents">
3097
3101
  <xsl:apply-templates select="."/>
3098
- </xsl:template><xsl:template match="*[local-name() = 'stem']" mode="bookmarks">
3102
+ </xsl:template><xsl:template match="*[local-name() = 'references'][@hidden='true']" mode="contents" priority="3"/><xsl:template match="*[local-name() = 'stem']" mode="bookmarks">
3099
3103
  <xsl:apply-templates mode="bookmarks"/>
3100
3104
  </xsl:template><xsl:template name="addBookmarks">
3101
3105
  <xsl:param name="contents"/>
@@ -3822,7 +3826,7 @@
3822
3826
  <fo:block id="{@id}">
3823
3827
  <xsl:apply-templates/>
3824
3828
  </fo:block>
3825
- </xsl:template><xsl:template match="/*/*[local-name() = 'bibliography']/*[local-name() = 'references'][@normative='true']">
3829
+ </xsl:template><xsl:template match="*[local-name() = 'references'][@hidden='true']" priority="3"/><xsl:template match="*[local-name() = 'bibitem'][@hidden='true']" priority="3"/><xsl:template match="/*/*[local-name() = 'bibliography']/*[local-name() = 'references'][@normative='true']">
3826
3830
 
3827
3831
  <fo:block id="{@id}">
3828
3832
  <xsl:apply-templates/>
data/lib/isodoc/mpfa/mpfd.guidelines.xsl CHANGED
@@ -1167,6 +1167,7 @@
1167
1167
  </xsl:attribute-set><xsl:attribute-set name="term-style">
1168
1168
 
1169
1169
  </xsl:attribute-set><xsl:attribute-set name="figure-name-style">
1170
+
1170
1171
 
1171
1172
 
1172
1173
 
@@ -2429,6 +2430,7 @@
2429
2430
  </fo:inline>
2430
2431
  </xsl:template><xsl:template match="*[local-name()='strong'] | *[local-name()='b']">
2431
2432
  <fo:inline font-weight="bold">
2433
+
2432
2434
  <xsl:apply-templates/>
2433
2435
  </fo:inline>
2434
2436
  </xsl:template><xsl:template match="*[local-name()='sup']">
@@ -2833,6 +2835,7 @@
2833
2835
  </xsl:choose>
2834
2836
  </xsl:variable>
2835
2837
  <fo:inline xsl:use-attribute-sets="link-style">
2838
+
2836
2839
  <xsl:choose>
2837
2840
  <xsl:when test="$target = ''">
2838
2841
  <xsl:apply-templates/>
@@ -3044,7 +3047,8 @@
3044
3047
  </fo:inline>
3045
3048
  </xsl:if>
3046
3049
  </xsl:template><xsl:template match="*[local-name() = 'figure']">
3047
- <fo:block-container id="{@id}">
3050
+ <fo:block-container id="{@id}">
3051
+
3048
3052
  <fo:block>
3049
3053
  <xsl:apply-templates/>
3050
3054
  </fo:block>
@@ -3095,7 +3099,7 @@
3095
3099
  <xsl:apply-templates mode="bookmarks"/>
3096
3100
  </xsl:template><xsl:template match="*[local-name() = 'stem']" mode="contents">
3097
3101
  <xsl:apply-templates select="."/>
3098
- </xsl:template><xsl:template match="*[local-name() = 'stem']" mode="bookmarks">
3102
+ </xsl:template><xsl:template match="*[local-name() = 'references'][@hidden='true']" mode="contents" priority="3"/><xsl:template match="*[local-name() = 'stem']" mode="bookmarks">
3099
3103
  <xsl:apply-templates mode="bookmarks"/>
3100
3104
  </xsl:template><xsl:template name="addBookmarks">
3101
3105
  <xsl:param name="contents"/>
@@ -3822,7 +3826,7 @@
3822
3826
  <fo:block id="{@id}">
3823
3827
  <xsl:apply-templates/>
3824
3828
  </fo:block>
3825
- </xsl:template><xsl:template match="/*/*[local-name() = 'bibliography']/*[local-name() = 'references'][@normative='true']">
3829
+ </xsl:template><xsl:template match="*[local-name() = 'references'][@hidden='true']" priority="3"/><xsl:template match="*[local-name() = 'bibitem'][@hidden='true']" priority="3"/><xsl:template match="/*/*[local-name() = 'bibliography']/*[local-name() = 'references'][@normative='true']">
3826
3830
 
3827
3831
  <fo:block id="{@id}">
3828
3832
  <xsl:apply-templates/>
data/lib/isodoc/mpfa/mpfd.standards.xsl CHANGED
@@ -1167,6 +1167,7 @@
1167
1167
  </xsl:attribute-set><xsl:attribute-set name="term-style">
1168
1168
 
1169
1169
  </xsl:attribute-set><xsl:attribute-set name="figure-name-style">
1170
+
1170
1171
 
1171
1172
 
1172
1173
 
@@ -2429,6 +2430,7 @@
2429
2430
  </fo:inline>
2430
2431
  </xsl:template><xsl:template match="*[local-name()='strong'] | *[local-name()='b']">
2431
2432
  <fo:inline font-weight="bold">
2433
+
2432
2434
  <xsl:apply-templates/>
2433
2435
  </fo:inline>
2434
2436
  </xsl:template><xsl:template match="*[local-name()='sup']">
@@ -2833,6 +2835,7 @@
2833
2835
  </xsl:choose>
2834
2836
  </xsl:variable>
2835
2837
  <fo:inline xsl:use-attribute-sets="link-style">
2838
+
2836
2839
  <xsl:choose>
2837
2840
  <xsl:when test="$target = ''">
2838
2841
  <xsl:apply-templates/>
@@ -3044,7 +3047,8 @@
3044
3047
  </fo:inline>
3045
3048
  </xsl:if>
3046
3049
  </xsl:template><xsl:template match="*[local-name() = 'figure']">
3047
- <fo:block-container id="{@id}">
3050
+ <fo:block-container id="{@id}">
3051
+
3048
3052
  <fo:block>
3049
3053
  <xsl:apply-templates/>
3050
3054
  </fo:block>
@@ -3095,7 +3099,7 @@
3095
3099
  <xsl:apply-templates mode="bookmarks"/>
3096
3100
  </xsl:template><xsl:template match="*[local-name() = 'stem']" mode="contents">
3097
3101
  <xsl:apply-templates select="."/>
3098
- </xsl:template><xsl:template match="*[local-name() = 'stem']" mode="bookmarks">
3102
+ </xsl:template><xsl:template match="*[local-name() = 'references'][@hidden='true']" mode="contents" priority="3"/><xsl:template match="*[local-name() = 'stem']" mode="bookmarks">
3099
3103
  <xsl:apply-templates mode="bookmarks"/>
3100
3104
  </xsl:template><xsl:template name="addBookmarks">
3101
3105
  <xsl:param name="contents"/>
@@ -3822,7 +3826,7 @@
3822
3826
  <fo:block id="{@id}">
3823
3827
  <xsl:apply-templates/>
3824
3828
  </fo:block>
3825
- </xsl:template><xsl:template match="/*/*[local-name() = 'bibliography']/*[local-name() = 'references'][@normative='true']">
3829
+ </xsl:template><xsl:template match="*[local-name() = 'references'][@hidden='true']" priority="3"/><xsl:template match="*[local-name() = 'bibitem'][@hidden='true']" priority="3"/><xsl:template match="/*/*[local-name() = 'bibliography']/*[local-name() = 'references'][@normative='true']">
3826
3830
 
3827
3831
  <fo:block id="{@id}">
3828
3832
  <xsl:apply-templates/>
data/lib/isodoc/mpfa/mpfd.supervision-of-mpf-intermediaries.xsl CHANGED
@@ -1167,6 +1167,7 @@
1167
1167
  </xsl:attribute-set><xsl:attribute-set name="term-style">
1168
1168
 
1169
1169
  </xsl:attribute-set><xsl:attribute-set name="figure-name-style">
1170
+
1170
1171
 
1171
1172
 
1172
1173
 
@@ -2429,6 +2430,7 @@
2429
2430
  </fo:inline>
2430
2431
  </xsl:template><xsl:template match="*[local-name()='strong'] | *[local-name()='b']">
2431
2432
  <fo:inline font-weight="bold">
2433
+
2432
2434
  <xsl:apply-templates/>
2433
2435
  </fo:inline>
2434
2436
  </xsl:template><xsl:template match="*[local-name()='sup']">
@@ -2833,6 +2835,7 @@
2833
2835
  </xsl:choose>
2834
2836
  </xsl:variable>
2835
2837
  <fo:inline xsl:use-attribute-sets="link-style">
2838
+
2836
2839
  <xsl:choose>
2837
2840
  <xsl:when test="$target = ''">
2838
2841
  <xsl:apply-templates/>
@@ -3044,7 +3047,8 @@
3044
3047
  </fo:inline>
3045
3048
  </xsl:if>
3046
3049
  </xsl:template><xsl:template match="*[local-name() = 'figure']">
3047
- <fo:block-container id="{@id}">
3050
+ <fo:block-container id="{@id}">
3051
+
3048
3052
  <fo:block>
3049
3053
  <xsl:apply-templates/>
3050
3054
  </fo:block>
@@ -3095,7 +3099,7 @@
3095
3099
  <xsl:apply-templates mode="bookmarks"/>
3096
3100
  </xsl:template><xsl:template match="*[local-name() = 'stem']" mode="contents">
3097
3101
  <xsl:apply-templates select="."/>
3098
- </xsl:template><xsl:template match="*[local-name() = 'stem']" mode="bookmarks">
3102
+ </xsl:template><xsl:template match="*[local-name() = 'references'][@hidden='true']" mode="contents" priority="3"/><xsl:template match="*[local-name() = 'stem']" mode="bookmarks">
3099
3103
  <xsl:apply-templates mode="bookmarks"/>
3100
3104
  </xsl:template><xsl:template name="addBookmarks">
3101
3105
  <xsl:param name="contents"/>
@@ -3822,7 +3826,7 @@
3822
3826
  <fo:block id="{@id}">
3823
3827
  <xsl:apply-templates/>
3824
3828
  </fo:block>
3825
- </xsl:template><xsl:template match="/*/*[local-name() = 'bibliography']/*[local-name() = 'references'][@normative='true']">
3829
+ </xsl:template><xsl:template match="*[local-name() = 'references'][@hidden='true']" priority="3"/><xsl:template match="*[local-name() = 'bibitem'][@hidden='true']" priority="3"/><xsl:template match="/*/*[local-name() = 'bibliography']/*[local-name() = 'references'][@normative='true']">
3826
3830
 
3827
3831
  <fo:block id="{@id}">
3828
3832
  <xsl:apply-templates/>
data/lib/isodoc/mpfa/word_convert.rb CHANGED
@@ -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/metanorma/mpfa/processor.rb CHANGED
@@ -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
data/lib/metanorma/mpfa/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module MPFA
3
- VERSION = "0.5.7"
3
+ VERSION = "0.5.8"
4
4
  end
5
5
  end
data/metanorma-mpfd.gemspec CHANGED
@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
30
30
 
31
31
  spec.add_dependency "htmlentities", "~> 4.3.4"
32
32
  spec.add_dependency "metanorma-standoc", "~> 1.6.0"
33
- spec.add_dependency "isodoc", "~> 1.2.0"
33
+ spec.add_dependency "isodoc", "~> 1.3.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.7
4
+ version: 0.5.8
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-09 00:00:00.000000000 Z
11
+ date: 2020-11-30 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: htmlentities
@@ -44,14 +44,14 @@ dependencies:
44
44
  requirements:
45
45
  - - "~>"
46
46
  - !ruby/object:Gem::Version
47
- version: 1.2.0
47
+ version: 1.3.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.2.0
54
+ version: 1.3.0
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: twitter_cldr
57
57
  requirement: !ruby/object:Gem::Requirement
@@ -235,6 +235,7 @@ files:
235
235
  - lib/asciidoctor/mpfa/basicdoc.rng
236
236
  - lib/asciidoctor/mpfa/biblio.rng
237
237
  - lib/asciidoctor/mpfa/converter.rb
238
+ - lib/asciidoctor/mpfa/fonts_manifest.yaml
238
239
  - lib/asciidoctor/mpfa/isodoc.rng
239
240
  - lib/asciidoctor/mpfa/mpfd.rng
240
241
  - lib/asciidoctor/mpfa/reqt.rng