metanorma-mpfa 0.7.0 → 0.7.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. checksums.yaml +4 -4
  2. data/lib/asciidoctor/mpfa/isodoc.rng +12 -1
  3. data/lib/isodoc/mpfa/mpfa.circular.xsl +24 -8
  4. data/lib/isodoc/mpfa/mpfa.compliance-standards-for-mpf-trustees.xsl +24 -8
  5. data/lib/isodoc/mpfa/mpfa.guidelines.xsl +24 -8
  6. data/lib/isodoc/mpfa/mpfa.standards.xsl +24 -8
  7. data/lib/isodoc/mpfa/mpfa.supervision-of-mpf-intermediaries.xsl +24 -8
  8. data/lib/metanorma/mpfa/version.rb +1 -1
  9. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 592004772a07c932bec0911cdced10525f60adbb36dbfe833850db766b11c61b
4
- data.tar.gz: c1cfa762a4068aaa3f60b0db2d00fbe2916a942f4c8c85591735a4494e67a15b
3
+ metadata.gz: 6c8ca5a7caeb351d633b4634fc1ccf1c753306f4f585c94a21a3db4ef2c6415a
4
+ data.tar.gz: 8287264ff711cc29b80bbc5874e7aa8f8bd71d68f06f933583e04a626273970c
5
5
  SHA512:
6
- metadata.gz: 0efcb81771ac2398695d9ff3c8af9c805051eb5bc971a0b8dd11f0baab20e32f3c5993f6fed7d340adde70bad2910866761183f2e776e91c241466ccf027c8cc
7
- data.tar.gz: 4aa88bc3e88dc9ae904d4c77958a1e0423ca05df9c7f2977ad88440662de8da476b64eadc93c3a12df2b2b93bf3415345d5a87e3525461ea97fd54f4f6311bf8
6
+ metadata.gz: 101768b7548de4be22fb87eee873ddc0d203e09c185f62611565194115014af18334a40187e34fc41b33bd2975245b497d6b5f2984f9acb2dbb376203a8d74cb
7
+ data.tar.gz: 8f8d89828603c1f8ad7c5b5131cb18461e2a36ad9bad1f6d2bc815fd379cf3ee934afdec28906070f7bd575ab4d3e6237da9354fc6a62d5dd166e134d4257a94
data/lib/asciidoctor/mpfa/isodoc.rng CHANGED
@@ -2063,7 +2063,12 @@
2063
2063
  <define name="verbaldefinition">
2064
2064
  <element name="verbaldefinition">
2065
2065
  <oneOrMore>
2066
- <ref name="paragraph"/>
2066
+ <choice>
2067
+ <ref name="paragraph"/>
2068
+ <ref name="dl"/>
2069
+ <ref name="ol"/>
2070
+ <ref name="ul"/>
2071
+ </choice>
2067
2072
  </oneOrMore>
2068
2073
  <zeroOrMore>
2069
2074
  <ref name="termsource"/>
@@ -2163,6 +2168,12 @@
2163
2168
  <value>modified</value>
2164
2169
  </choice>
2165
2170
  </attribute>
2171
+ <attribute name="type">
2172
+ <choice>
2173
+ <value>authoritative</value>
2174
+ <value>lineage</value>
2175
+ </choice>
2176
+ </attribute>
2166
2177
  <ref name="origin"/>
2167
2178
  <optional>
2168
2179
  <ref name="modification"/>
data/lib/isodoc/mpfa/mpfa.circular.xsl CHANGED
@@ -2744,6 +2744,7 @@
2744
2744
  <fo:table-cell>
2745
2745
 
2746
2746
  <fo:block margin-top="6pt">
2747
+ <xsl:copy-of select="@id"/>
2747
2748
 
2748
2749
 
2749
2750
  <xsl:if test="normalize-space($key_iso) = 'true'">
@@ -3579,14 +3580,18 @@
3579
3580
  </xsl:template><xsl:template match="*[local-name() = 'termnote']/*[local-name() = 'p']">
3580
3581
  <fo:inline><xsl:apply-templates/></fo:inline>
3581
3582
  </xsl:template><xsl:template match="*[local-name() = 'terms']">
3583
+ <!-- <xsl:message>'terms' <xsl:number/> processing...</xsl:message> -->
3582
3584
  <fo:block id="{@id}">
3583
3585
  <xsl:apply-templates/>
3584
3586
  </fo:block>
3585
3587
  </xsl:template><xsl:template match="*[local-name() = 'term']">
3588
+ <!-- <xsl:message>'term' <xsl:number/> processing, name=<xsl:value-of select="iso:name"/>, preferred=<xsl:value-of select="iso:preferred"/>...</xsl:message> -->
3586
3589
  <fo:block id="{@id}" xsl:use-attribute-sets="term-style">
3587
3590
 
3588
3591
 
3589
-
3592
+ <xsl:if test="parent::*[local-name() = 'term'] and not(preceding-sibling::*[local-name() = 'term'])">
3593
+
3594
+ </xsl:if>
3590
3595
  <xsl:apply-templates/>
3591
3596
  </fo:block>
3592
3597
  </xsl:template><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']" mode="presentation">
@@ -4560,7 +4565,8 @@
4560
4565
  </fo:block>
4561
4566
  </fo:table-cell>
4562
4567
  </xsl:template><xsl:template match="*[local-name() = 'p'][@class='RecommendationTitle' or @class = 'RecommendationTestTitle']" priority="2">
4563
- <fo:block font-size="11pt" color="rgb(237, 193, 35)"> <!-- font-weight="bold" margin-bottom="4pt" text-align="center" -->
4568
+ <fo:block font-size="11pt">
4569
+
4564
4570
  <xsl:apply-templates/>
4565
4571
  </fo:block>
4566
4572
  </xsl:template><xsl:template match="*[local-name() = 'p2'][ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']]">
@@ -4676,11 +4682,13 @@
4676
4682
  <!-- <xsl:apply-templates /> -->
4677
4683
  <xsl:copy-of select="$termsource_text"/>
4678
4684
  </xsl:when>
4679
- <xsl:otherwise>
4685
+ <xsl:otherwise>
4686
+
4680
4687
 
4681
4688
  <!-- <xsl:apply-templates /> -->
4682
4689
  <xsl:copy-of select="$termsource_text"/>
4683
4690
 
4691
+
4684
4692
  </xsl:otherwise>
4685
4693
  </xsl:choose>
4686
4694
  </fo:block>
@@ -4762,12 +4770,20 @@
4762
4770
  </xsl:template><xsl:template match="*[local-name() = 'author']">
4763
4771
  <xsl:text>— </xsl:text>
4764
4772
  <xsl:apply-templates/>
4765
- </xsl:template><xsl:template match="*[local-name() = 'eref']">
4773
+ </xsl:template><xsl:variable name="bibitem_hidden_">
4774
+ <xsl:for-each select="//*[local-name() = 'bibitem'][@hidden='true']">
4775
+ <xsl:copy-of select="."/>
4776
+ </xsl:for-each>
4777
+ <xsl:for-each select="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem']">
4778
+ <xsl:copy-of select="."/>
4779
+ </xsl:for-each>
4780
+ </xsl:variable><xsl:variable name="bibitem_hidden" select="xalan:nodeset($bibitem_hidden_)"/><xsl:template match="*[local-name() = 'eref']">
4766
4781
 
4767
4782
  <xsl:variable name="bibitemid">
4768
4783
  <xsl:choose>
4769
- <xsl:when test="//*[local-name() = 'bibitem'][@hidden='true' and @id = current()/@bibitemid]"/>
4770
- <xsl:when test="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"/>
4784
+ <!-- <xsl:when test="//*[local-name() = 'bibitem'][@hidden='true' and @id = current()/@bibitemid]"></xsl:when>
4785
+ <xsl:when test="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"></xsl:when> -->
4786
+ <xsl:when test="$bibitem_hidden/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"/>
4771
4787
  <xsl:otherwise><xsl:value-of select="@bibitemid"/></xsl:otherwise>
4772
4788
  </xsl:choose>
4773
4789
  </xsl:variable>
@@ -4854,10 +4870,10 @@
4854
4870
  </xsl:choose>
4855
4871
  </xsl:variable>
4856
4872
 
4857
- <xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/>
4873
+ <!-- <xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/> -->
4858
4874
 
4859
4875
  <xsl:choose>
4860
- <xsl:when test="$language = 'zh'">
4876
+ <xsl:when test="$lang = 'zh'">
4861
4877
  <fo:inline><xsl:value-of select="$tab_zh"/></fo:inline>
4862
4878
  </xsl:when>
4863
4879
  <xsl:when test="../../@inline-header = 'true'">
data/lib/isodoc/mpfa/mpfa.compliance-standards-for-mpf-trustees.xsl CHANGED
@@ -2744,6 +2744,7 @@
2744
2744
  <fo:table-cell>
2745
2745
 
2746
2746
  <fo:block margin-top="6pt">
2747
+ <xsl:copy-of select="@id"/>
2747
2748
 
2748
2749
 
2749
2750
  <xsl:if test="normalize-space($key_iso) = 'true'">
@@ -3579,14 +3580,18 @@
3579
3580
  </xsl:template><xsl:template match="*[local-name() = 'termnote']/*[local-name() = 'p']">
3580
3581
  <fo:inline><xsl:apply-templates/></fo:inline>
3581
3582
  </xsl:template><xsl:template match="*[local-name() = 'terms']">
3583
+ <!-- <xsl:message>'terms' <xsl:number/> processing...</xsl:message> -->
3582
3584
  <fo:block id="{@id}">
3583
3585
  <xsl:apply-templates/>
3584
3586
  </fo:block>
3585
3587
  </xsl:template><xsl:template match="*[local-name() = 'term']">
3588
+ <!-- <xsl:message>'term' <xsl:number/> processing, name=<xsl:value-of select="iso:name"/>, preferred=<xsl:value-of select="iso:preferred"/>...</xsl:message> -->
3586
3589
  <fo:block id="{@id}" xsl:use-attribute-sets="term-style">
3587
3590
 
3588
3591
 
3589
-
3592
+ <xsl:if test="parent::*[local-name() = 'term'] and not(preceding-sibling::*[local-name() = 'term'])">
3593
+
3594
+ </xsl:if>
3590
3595
  <xsl:apply-templates/>
3591
3596
  </fo:block>
3592
3597
  </xsl:template><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']" mode="presentation">
@@ -4560,7 +4565,8 @@
4560
4565
  </fo:block>
4561
4566
  </fo:table-cell>
4562
4567
  </xsl:template><xsl:template match="*[local-name() = 'p'][@class='RecommendationTitle' or @class = 'RecommendationTestTitle']" priority="2">
4563
- <fo:block font-size="11pt" color="rgb(237, 193, 35)"> <!-- font-weight="bold" margin-bottom="4pt" text-align="center" -->
4568
+ <fo:block font-size="11pt">
4569
+
4564
4570
  <xsl:apply-templates/>
4565
4571
  </fo:block>
4566
4572
  </xsl:template><xsl:template match="*[local-name() = 'p2'][ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']]">
@@ -4676,11 +4682,13 @@
4676
4682
  <!-- <xsl:apply-templates /> -->
4677
4683
  <xsl:copy-of select="$termsource_text"/>
4678
4684
  </xsl:when>
4679
- <xsl:otherwise>
4685
+ <xsl:otherwise>
4686
+
4680
4687
 
4681
4688
  <!-- <xsl:apply-templates /> -->
4682
4689
  <xsl:copy-of select="$termsource_text"/>
4683
4690
 
4691
+
4684
4692
  </xsl:otherwise>
4685
4693
  </xsl:choose>
4686
4694
  </fo:block>
@@ -4762,12 +4770,20 @@
4762
4770
  </xsl:template><xsl:template match="*[local-name() = 'author']">
4763
4771
  <xsl:text>— </xsl:text>
4764
4772
  <xsl:apply-templates/>
4765
- </xsl:template><xsl:template match="*[local-name() = 'eref']">
4773
+ </xsl:template><xsl:variable name="bibitem_hidden_">
4774
+ <xsl:for-each select="//*[local-name() = 'bibitem'][@hidden='true']">
4775
+ <xsl:copy-of select="."/>
4776
+ </xsl:for-each>
4777
+ <xsl:for-each select="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem']">
4778
+ <xsl:copy-of select="."/>
4779
+ </xsl:for-each>
4780
+ </xsl:variable><xsl:variable name="bibitem_hidden" select="xalan:nodeset($bibitem_hidden_)"/><xsl:template match="*[local-name() = 'eref']">
4766
4781
 
4767
4782
  <xsl:variable name="bibitemid">
4768
4783
  <xsl:choose>
4769
- <xsl:when test="//*[local-name() = 'bibitem'][@hidden='true' and @id = current()/@bibitemid]"/>
4770
- <xsl:when test="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"/>
4784
+ <!-- <xsl:when test="//*[local-name() = 'bibitem'][@hidden='true' and @id = current()/@bibitemid]"></xsl:when>
4785
+ <xsl:when test="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"></xsl:when> -->
4786
+ <xsl:when test="$bibitem_hidden/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"/>
4771
4787
  <xsl:otherwise><xsl:value-of select="@bibitemid"/></xsl:otherwise>
4772
4788
  </xsl:choose>
4773
4789
  </xsl:variable>
@@ -4854,10 +4870,10 @@
4854
4870
  </xsl:choose>
4855
4871
  </xsl:variable>
4856
4872
 
4857
- <xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/>
4873
+ <!-- <xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/> -->
4858
4874
 
4859
4875
  <xsl:choose>
4860
- <xsl:when test="$language = 'zh'">
4876
+ <xsl:when test="$lang = 'zh'">
4861
4877
  <fo:inline><xsl:value-of select="$tab_zh"/></fo:inline>
4862
4878
  </xsl:when>
4863
4879
  <xsl:when test="../../@inline-header = 'true'">
data/lib/isodoc/mpfa/mpfa.guidelines.xsl CHANGED
@@ -2744,6 +2744,7 @@
2744
2744
  <fo:table-cell>
2745
2745
 
2746
2746
  <fo:block margin-top="6pt">
2747
+ <xsl:copy-of select="@id"/>
2747
2748
 
2748
2749
 
2749
2750
  <xsl:if test="normalize-space($key_iso) = 'true'">
@@ -3579,14 +3580,18 @@
3579
3580
  </xsl:template><xsl:template match="*[local-name() = 'termnote']/*[local-name() = 'p']">
3580
3581
  <fo:inline><xsl:apply-templates/></fo:inline>
3581
3582
  </xsl:template><xsl:template match="*[local-name() = 'terms']">
3583
+ <!-- <xsl:message>'terms' <xsl:number/> processing...</xsl:message> -->
3582
3584
  <fo:block id="{@id}">
3583
3585
  <xsl:apply-templates/>
3584
3586
  </fo:block>
3585
3587
  </xsl:template><xsl:template match="*[local-name() = 'term']">
3588
+ <!-- <xsl:message>'term' <xsl:number/> processing, name=<xsl:value-of select="iso:name"/>, preferred=<xsl:value-of select="iso:preferred"/>...</xsl:message> -->
3586
3589
  <fo:block id="{@id}" xsl:use-attribute-sets="term-style">
3587
3590
 
3588
3591
 
3589
-
3592
+ <xsl:if test="parent::*[local-name() = 'term'] and not(preceding-sibling::*[local-name() = 'term'])">
3593
+
3594
+ </xsl:if>
3590
3595
  <xsl:apply-templates/>
3591
3596
  </fo:block>
3592
3597
  </xsl:template><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']" mode="presentation">
@@ -4560,7 +4565,8 @@
4560
4565
  </fo:block>
4561
4566
  </fo:table-cell>
4562
4567
  </xsl:template><xsl:template match="*[local-name() = 'p'][@class='RecommendationTitle' or @class = 'RecommendationTestTitle']" priority="2">
4563
- <fo:block font-size="11pt" color="rgb(237, 193, 35)"> <!-- font-weight="bold" margin-bottom="4pt" text-align="center" -->
4568
+ <fo:block font-size="11pt">
4569
+
4564
4570
  <xsl:apply-templates/>
4565
4571
  </fo:block>
4566
4572
  </xsl:template><xsl:template match="*[local-name() = 'p2'][ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']]">
@@ -4676,11 +4682,13 @@
4676
4682
  <!-- <xsl:apply-templates /> -->
4677
4683
  <xsl:copy-of select="$termsource_text"/>
4678
4684
  </xsl:when>
4679
- <xsl:otherwise>
4685
+ <xsl:otherwise>
4686
+
4680
4687
 
4681
4688
  <!-- <xsl:apply-templates /> -->
4682
4689
  <xsl:copy-of select="$termsource_text"/>
4683
4690
 
4691
+
4684
4692
  </xsl:otherwise>
4685
4693
  </xsl:choose>
4686
4694
  </fo:block>
@@ -4762,12 +4770,20 @@
4762
4770
  </xsl:template><xsl:template match="*[local-name() = 'author']">
4763
4771
  <xsl:text>— </xsl:text>
4764
4772
  <xsl:apply-templates/>
4765
- </xsl:template><xsl:template match="*[local-name() = 'eref']">
4773
+ </xsl:template><xsl:variable name="bibitem_hidden_">
4774
+ <xsl:for-each select="//*[local-name() = 'bibitem'][@hidden='true']">
4775
+ <xsl:copy-of select="."/>
4776
+ </xsl:for-each>
4777
+ <xsl:for-each select="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem']">
4778
+ <xsl:copy-of select="."/>
4779
+ </xsl:for-each>
4780
+ </xsl:variable><xsl:variable name="bibitem_hidden" select="xalan:nodeset($bibitem_hidden_)"/><xsl:template match="*[local-name() = 'eref']">
4766
4781
 
4767
4782
  <xsl:variable name="bibitemid">
4768
4783
  <xsl:choose>
4769
- <xsl:when test="//*[local-name() = 'bibitem'][@hidden='true' and @id = current()/@bibitemid]"/>
4770
- <xsl:when test="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"/>
4784
+ <!-- <xsl:when test="//*[local-name() = 'bibitem'][@hidden='true' and @id = current()/@bibitemid]"></xsl:when>
4785
+ <xsl:when test="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"></xsl:when> -->
4786
+ <xsl:when test="$bibitem_hidden/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"/>
4771
4787
  <xsl:otherwise><xsl:value-of select="@bibitemid"/></xsl:otherwise>
4772
4788
  </xsl:choose>
4773
4789
  </xsl:variable>
@@ -4854,10 +4870,10 @@
4854
4870
  </xsl:choose>
4855
4871
  </xsl:variable>
4856
4872
 
4857
- <xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/>
4873
+ <!-- <xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/> -->
4858
4874
 
4859
4875
  <xsl:choose>
4860
- <xsl:when test="$language = 'zh'">
4876
+ <xsl:when test="$lang = 'zh'">
4861
4877
  <fo:inline><xsl:value-of select="$tab_zh"/></fo:inline>
4862
4878
  </xsl:when>
4863
4879
  <xsl:when test="../../@inline-header = 'true'">
data/lib/isodoc/mpfa/mpfa.standards.xsl CHANGED
@@ -2744,6 +2744,7 @@
2744
2744
  <fo:table-cell>
2745
2745
 
2746
2746
  <fo:block margin-top="6pt">
2747
+ <xsl:copy-of select="@id"/>
2747
2748
 
2748
2749
 
2749
2750
  <xsl:if test="normalize-space($key_iso) = 'true'">
@@ -3579,14 +3580,18 @@
3579
3580
  </xsl:template><xsl:template match="*[local-name() = 'termnote']/*[local-name() = 'p']">
3580
3581
  <fo:inline><xsl:apply-templates/></fo:inline>
3581
3582
  </xsl:template><xsl:template match="*[local-name() = 'terms']">
3583
+ <!-- <xsl:message>'terms' <xsl:number/> processing...</xsl:message> -->
3582
3584
  <fo:block id="{@id}">
3583
3585
  <xsl:apply-templates/>
3584
3586
  </fo:block>
3585
3587
  </xsl:template><xsl:template match="*[local-name() = 'term']">
3588
+ <!-- <xsl:message>'term' <xsl:number/> processing, name=<xsl:value-of select="iso:name"/>, preferred=<xsl:value-of select="iso:preferred"/>...</xsl:message> -->
3586
3589
  <fo:block id="{@id}" xsl:use-attribute-sets="term-style">
3587
3590
 
3588
3591
 
3589
-
3592
+ <xsl:if test="parent::*[local-name() = 'term'] and not(preceding-sibling::*[local-name() = 'term'])">
3593
+
3594
+ </xsl:if>
3590
3595
  <xsl:apply-templates/>
3591
3596
  </fo:block>
3592
3597
  </xsl:template><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']" mode="presentation">
@@ -4560,7 +4565,8 @@
4560
4565
  </fo:block>
4561
4566
  </fo:table-cell>
4562
4567
  </xsl:template><xsl:template match="*[local-name() = 'p'][@class='RecommendationTitle' or @class = 'RecommendationTestTitle']" priority="2">
4563
- <fo:block font-size="11pt" color="rgb(237, 193, 35)"> <!-- font-weight="bold" margin-bottom="4pt" text-align="center" -->
4568
+ <fo:block font-size="11pt">
4569
+
4564
4570
  <xsl:apply-templates/>
4565
4571
  </fo:block>
4566
4572
  </xsl:template><xsl:template match="*[local-name() = 'p2'][ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']]">
@@ -4676,11 +4682,13 @@
4676
4682
  <!-- <xsl:apply-templates /> -->
4677
4683
  <xsl:copy-of select="$termsource_text"/>
4678
4684
  </xsl:when>
4679
- <xsl:otherwise>
4685
+ <xsl:otherwise>
4686
+
4680
4687
 
4681
4688
  <!-- <xsl:apply-templates /> -->
4682
4689
  <xsl:copy-of select="$termsource_text"/>
4683
4690
 
4691
+
4684
4692
  </xsl:otherwise>
4685
4693
  </xsl:choose>
4686
4694
  </fo:block>
@@ -4762,12 +4770,20 @@
4762
4770
  </xsl:template><xsl:template match="*[local-name() = 'author']">
4763
4771
  <xsl:text>— </xsl:text>
4764
4772
  <xsl:apply-templates/>
4765
- </xsl:template><xsl:template match="*[local-name() = 'eref']">
4773
+ </xsl:template><xsl:variable name="bibitem_hidden_">
4774
+ <xsl:for-each select="//*[local-name() = 'bibitem'][@hidden='true']">
4775
+ <xsl:copy-of select="."/>
4776
+ </xsl:for-each>
4777
+ <xsl:for-each select="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem']">
4778
+ <xsl:copy-of select="."/>
4779
+ </xsl:for-each>
4780
+ </xsl:variable><xsl:variable name="bibitem_hidden" select="xalan:nodeset($bibitem_hidden_)"/><xsl:template match="*[local-name() = 'eref']">
4766
4781
 
4767
4782
  <xsl:variable name="bibitemid">
4768
4783
  <xsl:choose>
4769
- <xsl:when test="//*[local-name() = 'bibitem'][@hidden='true' and @id = current()/@bibitemid]"/>
4770
- <xsl:when test="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"/>
4784
+ <!-- <xsl:when test="//*[local-name() = 'bibitem'][@hidden='true' and @id = current()/@bibitemid]"></xsl:when>
4785
+ <xsl:when test="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"></xsl:when> -->
4786
+ <xsl:when test="$bibitem_hidden/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"/>
4771
4787
  <xsl:otherwise><xsl:value-of select="@bibitemid"/></xsl:otherwise>
4772
4788
  </xsl:choose>
4773
4789
  </xsl:variable>
@@ -4854,10 +4870,10 @@
4854
4870
  </xsl:choose>
4855
4871
  </xsl:variable>
4856
4872
 
4857
- <xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/>
4873
+ <!-- <xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/> -->
4858
4874
 
4859
4875
  <xsl:choose>
4860
- <xsl:when test="$language = 'zh'">
4876
+ <xsl:when test="$lang = 'zh'">
4861
4877
  <fo:inline><xsl:value-of select="$tab_zh"/></fo:inline>
4862
4878
  </xsl:when>
4863
4879
  <xsl:when test="../../@inline-header = 'true'">
data/lib/isodoc/mpfa/mpfa.supervision-of-mpf-intermediaries.xsl CHANGED
@@ -2744,6 +2744,7 @@
2744
2744
  <fo:table-cell>
2745
2745
 
2746
2746
  <fo:block margin-top="6pt">
2747
+ <xsl:copy-of select="@id"/>
2747
2748
 
2748
2749
 
2749
2750
  <xsl:if test="normalize-space($key_iso) = 'true'">
@@ -3579,14 +3580,18 @@
3579
3580
  </xsl:template><xsl:template match="*[local-name() = 'termnote']/*[local-name() = 'p']">
3580
3581
  <fo:inline><xsl:apply-templates/></fo:inline>
3581
3582
  </xsl:template><xsl:template match="*[local-name() = 'terms']">
3583
+ <!-- <xsl:message>'terms' <xsl:number/> processing...</xsl:message> -->
3582
3584
  <fo:block id="{@id}">
3583
3585
  <xsl:apply-templates/>
3584
3586
  </fo:block>
3585
3587
  </xsl:template><xsl:template match="*[local-name() = 'term']">
3588
+ <!-- <xsl:message>'term' <xsl:number/> processing, name=<xsl:value-of select="iso:name"/>, preferred=<xsl:value-of select="iso:preferred"/>...</xsl:message> -->
3586
3589
  <fo:block id="{@id}" xsl:use-attribute-sets="term-style">
3587
3590
 
3588
3591
 
3589
-
3592
+ <xsl:if test="parent::*[local-name() = 'term'] and not(preceding-sibling::*[local-name() = 'term'])">
3593
+
3594
+ </xsl:if>
3590
3595
  <xsl:apply-templates/>
3591
3596
  </fo:block>
3592
3597
  </xsl:template><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'term']/*[local-name() = 'name']" mode="presentation">
@@ -4560,7 +4565,8 @@
4560
4565
  </fo:block>
4561
4566
  </fo:table-cell>
4562
4567
  </xsl:template><xsl:template match="*[local-name() = 'p'][@class='RecommendationTitle' or @class = 'RecommendationTestTitle']" priority="2">
4563
- <fo:block font-size="11pt" color="rgb(237, 193, 35)"> <!-- font-weight="bold" margin-bottom="4pt" text-align="center" -->
4568
+ <fo:block font-size="11pt">
4569
+
4564
4570
  <xsl:apply-templates/>
4565
4571
  </fo:block>
4566
4572
  </xsl:template><xsl:template match="*[local-name() = 'p2'][ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']]">
@@ -4676,11 +4682,13 @@
4676
4682
  <!-- <xsl:apply-templates /> -->
4677
4683
  <xsl:copy-of select="$termsource_text"/>
4678
4684
  </xsl:when>
4679
- <xsl:otherwise>
4685
+ <xsl:otherwise>
4686
+
4680
4687
 
4681
4688
  <!-- <xsl:apply-templates /> -->
4682
4689
  <xsl:copy-of select="$termsource_text"/>
4683
4690
 
4691
+
4684
4692
  </xsl:otherwise>
4685
4693
  </xsl:choose>
4686
4694
  </fo:block>
@@ -4762,12 +4770,20 @@
4762
4770
  </xsl:template><xsl:template match="*[local-name() = 'author']">
4763
4771
  <xsl:text>— </xsl:text>
4764
4772
  <xsl:apply-templates/>
4765
- </xsl:template><xsl:template match="*[local-name() = 'eref']">
4773
+ </xsl:template><xsl:variable name="bibitem_hidden_">
4774
+ <xsl:for-each select="//*[local-name() = 'bibitem'][@hidden='true']">
4775
+ <xsl:copy-of select="."/>
4776
+ </xsl:for-each>
4777
+ <xsl:for-each select="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem']">
4778
+ <xsl:copy-of select="."/>
4779
+ </xsl:for-each>
4780
+ </xsl:variable><xsl:variable name="bibitem_hidden" select="xalan:nodeset($bibitem_hidden_)"/><xsl:template match="*[local-name() = 'eref']">
4766
4781
 
4767
4782
  <xsl:variable name="bibitemid">
4768
4783
  <xsl:choose>
4769
- <xsl:when test="//*[local-name() = 'bibitem'][@hidden='true' and @id = current()/@bibitemid]"/>
4770
- <xsl:when test="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"/>
4784
+ <!-- <xsl:when test="//*[local-name() = 'bibitem'][@hidden='true' and @id = current()/@bibitemid]"></xsl:when>
4785
+ <xsl:when test="//*[local-name() = 'references'][@hidden='true']/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"></xsl:when> -->
4786
+ <xsl:when test="$bibitem_hidden/*[local-name() = 'bibitem'][@id = current()/@bibitemid]"/>
4771
4787
  <xsl:otherwise><xsl:value-of select="@bibitemid"/></xsl:otherwise>
4772
4788
  </xsl:choose>
4773
4789
  </xsl:variable>
@@ -4854,10 +4870,10 @@
4854
4870
  </xsl:choose>
4855
4871
  </xsl:variable>
4856
4872
 
4857
- <xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/>
4873
+ <!-- <xsl:variable name="language" select="//*[local-name()='bibdata']//*[local-name()='language']"/> -->
4858
4874
 
4859
4875
  <xsl:choose>
4860
- <xsl:when test="$language = 'zh'">
4876
+ <xsl:when test="$lang = 'zh'">
4861
4877
  <fo:inline><xsl:value-of select="$tab_zh"/></fo:inline>
4862
4878
  </xsl:when>
4863
4879
  <xsl:when test="../../@inline-header = 'true'">
data/lib/metanorma/mpfa/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module MPFA
3
- VERSION = "0.7.0".freeze
3
+ VERSION = "0.7.1".freeze
4
4
  end
5
5
  end
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.7.0
4
+ version: 0.7.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2021-10-25 00:00:00.000000000 Z
11
+ date: 2021-11-04 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: htmlentities