metanorma-bipm 2.8.9 → 2.8.10

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 (19) hide show
  1. checksums.yaml +4 -4
  2. data/.rubocop.yml +13 -1
  3. data/lib/isodoc/bipm/bipm.brochure.xsl +46 -15
  4. data/lib/isodoc/bipm/bipm.guide.xsl +46 -15
  5. data/lib/isodoc/bipm/bipm.mise-en-pratique.xsl +46 -15
  6. data/lib/isodoc/bipm/bipm.rapport.xsl +46 -15
  7. data/lib/isodoc/bipm/jcgm.standard.xsl +53 -20
  8. data/lib/metanorma/bipm/basicdoc.rng +31 -6
  9. data/lib/metanorma/bipm/isodoc.rng +22 -3
  10. data/lib/metanorma/bipm/mathml3-common.rng +257 -0
  11. data/lib/metanorma/bipm/mathml3-content.rng +1544 -0
  12. data/lib/metanorma/bipm/mathml3-presentation.rng +2324 -0
  13. data/lib/metanorma/bipm/mathml3-strict-content.rng +205 -0
  14. data/lib/metanorma/bipm/mathml3.rng +23 -0
  15. data/lib/metanorma/bipm/metanorma-mathml.rng +45 -0
  16. data/lib/metanorma/bipm/reqt.rng +10 -2
  17. data/lib/metanorma/bipm/version.rb +1 -1
  18. data/metanorma-bipm.gemspec +1 -1
  19. metadata +8 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: d5f93ce18263d7cd23547de7791629e3854396c418a98e333b023d1482d0f810
4
- data.tar.gz: 993d7e81f3a9b6e7a70929064682193f3fc7e7229bab3d9d296ca52fb84d08d6
3
+ metadata.gz: d48ce68eca58a03f89efa3ec9786cc63c8d2bdf553c1170c95bebd928827783f
4
+ data.tar.gz: 55a48fc7d328cc604b37921872fe69175b58d0934dddde9d3699a15e3f999730
5
5
  SHA512:
6
- metadata.gz: c09c30befb9ccd50eacf497036df1d130154b6065851c0602ae0e3dfe850a703c9e31b44001a2ba4a320bff60c941d4620752ee4f48a163c0096b4b9c0b3af8d
7
- data.tar.gz: 863a357bdde4b9d778ea55e544b1e8a9f9334714a7586f3f8f03612bb8a6f0297c35ab3a0bc5feb319931e040e8b60dc0b24ffcf10c2a48d9f10a79b99f0263f
6
+ metadata.gz: 2e1f1063ca440c5b0c0e16997e97dc67c32443c0e6658df28f8b374e946b9f78b6ea52e1ca3389fe52daeffc92f55ebdea253e385e7583ad40bb83512e60f0c6
7
+ data.tar.gz: 8d5d4fe4b9b422b5b92d5d79492f6a1e0afd02ed634e284ef257c20448fab220f23ea9d85c78b07fc30637f198e15015a6babde9382ad0c9a778de4d0d87124e
data/.rubocop.yml CHANGED
@@ -3,8 +3,20 @@
3
3
  inherit_from:
4
4
  - https://raw.githubusercontent.com/riboseinc/oss-guides/main/ci/rubocop.yml
5
5
 
6
+ # Rubocop plugins enabled centrally so every metanorma-org gem picks them up
7
+ # on cimas sync — best practice belongs at the shared-template layer, not
8
+ # per-repo. Per ronaldtse feedback on metanorma/ci#332.
9
+ plugins:
10
+ - rubocop-rspec
11
+ - rubocop-performance
12
+ - rubocop-rake
13
+
6
14
  # local repo-specific modifications
7
15
  # ...
8
16
 
9
17
  AllCops:
10
- TargetRubyVersion: 3.4
18
+ # 3.3 matches the org-wide minimum being pushed via #274 (Raise minimum
19
+ # Ruby version to 3.3 due to EOL of 3.2 on 2026-03-31). Was 3.4 before
20
+ # this commit — 3.4 was above the org's stated minimum and would have
21
+ # applied Rubocop rules that fail-close on gems still targeting 3.3.
22
+ TargetRubyVersion: 3.3
data/lib/isodoc/bipm/bipm.brochure.xsl CHANGED
@@ -9392,6 +9392,12 @@
9392
9392
  <style name="{$key}-left"><xsl:value-of select="$value"/></style>
9393
9393
  <style name="{$key}-bottom"><xsl:value-of select="$value"/></style>
9394
9394
  </xsl:if>
9395
+ <xsl:if test="$key = 'page-break-inside' and $value = 'avoid'">
9396
+ <style name="keep-together.within-page">always</style>
9397
+ </xsl:if>
9398
+ <xsl:if test="$key = 'page-break-after' and $value = 'always'">
9399
+ <style name="break-after">page</style>
9400
+ </xsl:if>
9395
9401
  </xsl:for-each>
9396
9402
  </xsl:variable>
9397
9403
  <xsl:variable name="styles" select="xalan:nodeset($styles_)"/>
@@ -9435,6 +9441,11 @@
9435
9441
 
9436
9442
  <fo:block role="SKIP">
9437
9443
 
9444
+ <xsl:variable name="styles">
9445
+ <styles><xsl:call-template name="setTableStyles"/></styles>
9446
+ </xsl:variable>
9447
+ <xsl:copy-of select="xalan:nodeset($styles)/styles/@break-after"/>
9448
+
9438
9449
  <xsl:if test="$isGenerateTableIF = 'true'">
9439
9450
  <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
9440
9451
  </xsl:if>
@@ -11617,9 +11628,25 @@
11617
11628
  <!-- ====== -->
11618
11629
  <!-- ====== -->
11619
11630
 
11620
- <xsl:attribute-set name="quote-style">
11631
+ <xsl:attribute-set name="quote-container-style">
11621
11632
  <xsl:attribute name="margin-left">12mm</xsl:attribute>
11622
11633
  <xsl:attribute name="margin-right">12mm</xsl:attribute>
11634
+ <xsl:attribute name="role">SKIP</xsl:attribute>
11635
+ <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
11636
+ </xsl:attribute-set>
11637
+
11638
+ <xsl:template name="refine_quote-container-style">
11639
+ <xsl:if test="parent::mn:note">
11640
+ <xsl:if test="not(ancestor::mn:table)">
11641
+ <xsl:attribute name="margin-left">5mm</xsl:attribute>
11642
+ </xsl:if>
11643
+ </xsl:if>
11644
+ </xsl:template>
11645
+
11646
+ <xsl:attribute-set name="quote-style">
11647
+ <xsl:attribute name="margin-left">0mm</xsl:attribute>
11648
+ <xsl:attribute name="margin-right">0mm</xsl:attribute>
11649
+
11623
11650
  </xsl:attribute-set> <!-- quote-style -->
11624
11651
 
11625
11652
  <xsl:template name="refine_quote-style">
@@ -11627,6 +11654,7 @@
11627
11654
 
11628
11655
  <xsl:attribute-set name="quote-source-style">
11629
11656
  <xsl:attribute name="text-align">right</xsl:attribute>
11657
+ <xsl:attribute name="margin-right">-12mm</xsl:attribute>
11630
11658
  </xsl:attribute-set> <!-- quote-source-style -->
11631
11659
 
11632
11660
  <xsl:template name="refine_quote-source-style">
@@ -11649,12 +11677,9 @@
11649
11677
 
11650
11678
  <xsl:call-template name="setBlockSpanAll"/>
11651
11679
 
11652
- <xsl:if test="parent::mn:note">
11653
- <xsl:if test="not(ancestor::mn:table)">
11654
- <xsl:attribute name="margin-left">5mm</xsl:attribute>
11655
- </xsl:if>
11656
- </xsl:if>
11657
- <fo:block-container margin-left="0mm" role="SKIP">
11680
+ <fo:block-container xsl:use-attribute-sets="quote-container-style">
11681
+ <xsl:call-template name="refine_quote-container-style"/>
11682
+
11658
11683
  <fo:block-container xsl:use-attribute-sets="quote-style" role="SKIP">
11659
11684
 
11660
11685
  <xsl:call-template name="refine_quote-style"/>
@@ -11666,14 +11691,16 @@
11666
11691
  </fo:block-container>
11667
11692
  </fo:block-container>
11668
11693
  <xsl:if test="mn:author or mn:fmt-source or mn:attribution">
11669
- <fo:block xsl:use-attribute-sets="quote-source-style">
11670
- <xsl:call-template name="refine_quote-source-style"/>
11671
- <!-- — ISO, ISO 7301:2011, Clause 1 -->
11672
- <xsl:apply-templates select="mn:author"/>
11673
- <xsl:apply-templates select="mn:fmt-source"/>
11674
- <!-- added for https://github.com/metanorma/isodoc/issues/607 -->
11675
- <xsl:apply-templates select="mn:attribution/mn:p/node()"/>
11676
- </fo:block>
11694
+ <fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
11695
+ <fo:block xsl:use-attribute-sets="quote-source-style">
11696
+ <xsl:call-template name="refine_quote-source-style"/>
11697
+ <!-- — ISO, ISO 7301:2011, Clause 1 -->
11698
+ <xsl:apply-templates select="mn:author"/>
11699
+ <xsl:apply-templates select="mn:fmt-source"/>
11700
+ <!-- added for https://github.com/metanorma/isodoc/issues/607 -->
11701
+ <xsl:apply-templates select="mn:attribution/mn:p/node()"/>
11702
+ </fo:block>
11703
+ </fo:block-container>
11677
11704
  </xsl:if>
11678
11705
 
11679
11706
  </fo:block-container>
@@ -16881,6 +16908,10 @@
16881
16908
  <fo:block break-after="page"/>
16882
16909
  </xsl:template>
16883
16910
 
16911
+ <xsl:template match="mn:pagebreak[ancestor::mn:table]" priority="2">
16912
+ <fo:block break-after="page"/>
16913
+ </xsl:template>
16914
+
16884
16915
  <xsl:variable name="font_main_root_style">
16885
16916
  <root-style xsl:use-attribute-sets="root-style">
16886
16917
  </root-style>
data/lib/isodoc/bipm/bipm.guide.xsl CHANGED
@@ -9392,6 +9392,12 @@
9392
9392
  <style name="{$key}-left"><xsl:value-of select="$value"/></style>
9393
9393
  <style name="{$key}-bottom"><xsl:value-of select="$value"/></style>
9394
9394
  </xsl:if>
9395
+ <xsl:if test="$key = 'page-break-inside' and $value = 'avoid'">
9396
+ <style name="keep-together.within-page">always</style>
9397
+ </xsl:if>
9398
+ <xsl:if test="$key = 'page-break-after' and $value = 'always'">
9399
+ <style name="break-after">page</style>
9400
+ </xsl:if>
9395
9401
  </xsl:for-each>
9396
9402
  </xsl:variable>
9397
9403
  <xsl:variable name="styles" select="xalan:nodeset($styles_)"/>
@@ -9435,6 +9441,11 @@
9435
9441
 
9436
9442
  <fo:block role="SKIP">
9437
9443
 
9444
+ <xsl:variable name="styles">
9445
+ <styles><xsl:call-template name="setTableStyles"/></styles>
9446
+ </xsl:variable>
9447
+ <xsl:copy-of select="xalan:nodeset($styles)/styles/@break-after"/>
9448
+
9438
9449
  <xsl:if test="$isGenerateTableIF = 'true'">
9439
9450
  <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
9440
9451
  </xsl:if>
@@ -11617,9 +11628,25 @@
11617
11628
  <!-- ====== -->
11618
11629
  <!-- ====== -->
11619
11630
 
11620
- <xsl:attribute-set name="quote-style">
11631
+ <xsl:attribute-set name="quote-container-style">
11621
11632
  <xsl:attribute name="margin-left">12mm</xsl:attribute>
11622
11633
  <xsl:attribute name="margin-right">12mm</xsl:attribute>
11634
+ <xsl:attribute name="role">SKIP</xsl:attribute>
11635
+ <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
11636
+ </xsl:attribute-set>
11637
+
11638
+ <xsl:template name="refine_quote-container-style">
11639
+ <xsl:if test="parent::mn:note">
11640
+ <xsl:if test="not(ancestor::mn:table)">
11641
+ <xsl:attribute name="margin-left">5mm</xsl:attribute>
11642
+ </xsl:if>
11643
+ </xsl:if>
11644
+ </xsl:template>
11645
+
11646
+ <xsl:attribute-set name="quote-style">
11647
+ <xsl:attribute name="margin-left">0mm</xsl:attribute>
11648
+ <xsl:attribute name="margin-right">0mm</xsl:attribute>
11649
+
11623
11650
  </xsl:attribute-set> <!-- quote-style -->
11624
11651
 
11625
11652
  <xsl:template name="refine_quote-style">
@@ -11627,6 +11654,7 @@
11627
11654
 
11628
11655
  <xsl:attribute-set name="quote-source-style">
11629
11656
  <xsl:attribute name="text-align">right</xsl:attribute>
11657
+ <xsl:attribute name="margin-right">-12mm</xsl:attribute>
11630
11658
  </xsl:attribute-set> <!-- quote-source-style -->
11631
11659
 
11632
11660
  <xsl:template name="refine_quote-source-style">
@@ -11649,12 +11677,9 @@
11649
11677
 
11650
11678
  <xsl:call-template name="setBlockSpanAll"/>
11651
11679
 
11652
- <xsl:if test="parent::mn:note">
11653
- <xsl:if test="not(ancestor::mn:table)">
11654
- <xsl:attribute name="margin-left">5mm</xsl:attribute>
11655
- </xsl:if>
11656
- </xsl:if>
11657
- <fo:block-container margin-left="0mm" role="SKIP">
11680
+ <fo:block-container xsl:use-attribute-sets="quote-container-style">
11681
+ <xsl:call-template name="refine_quote-container-style"/>
11682
+
11658
11683
  <fo:block-container xsl:use-attribute-sets="quote-style" role="SKIP">
11659
11684
 
11660
11685
  <xsl:call-template name="refine_quote-style"/>
@@ -11666,14 +11691,16 @@
11666
11691
  </fo:block-container>
11667
11692
  </fo:block-container>
11668
11693
  <xsl:if test="mn:author or mn:fmt-source or mn:attribution">
11669
- <fo:block xsl:use-attribute-sets="quote-source-style">
11670
- <xsl:call-template name="refine_quote-source-style"/>
11671
- <!-- — ISO, ISO 7301:2011, Clause 1 -->
11672
- <xsl:apply-templates select="mn:author"/>
11673
- <xsl:apply-templates select="mn:fmt-source"/>
11674
- <!-- added for https://github.com/metanorma/isodoc/issues/607 -->
11675
- <xsl:apply-templates select="mn:attribution/mn:p/node()"/>
11676
- </fo:block>
11694
+ <fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
11695
+ <fo:block xsl:use-attribute-sets="quote-source-style">
11696
+ <xsl:call-template name="refine_quote-source-style"/>
11697
+ <!-- — ISO, ISO 7301:2011, Clause 1 -->
11698
+ <xsl:apply-templates select="mn:author"/>
11699
+ <xsl:apply-templates select="mn:fmt-source"/>
11700
+ <!-- added for https://github.com/metanorma/isodoc/issues/607 -->
11701
+ <xsl:apply-templates select="mn:attribution/mn:p/node()"/>
11702
+ </fo:block>
11703
+ </fo:block-container>
11677
11704
  </xsl:if>
11678
11705
 
11679
11706
  </fo:block-container>
@@ -16881,6 +16908,10 @@
16881
16908
  <fo:block break-after="page"/>
16882
16909
  </xsl:template>
16883
16910
 
16911
+ <xsl:template match="mn:pagebreak[ancestor::mn:table]" priority="2">
16912
+ <fo:block break-after="page"/>
16913
+ </xsl:template>
16914
+
16884
16915
  <xsl:variable name="font_main_root_style">
16885
16916
  <root-style xsl:use-attribute-sets="root-style">
16886
16917
  </root-style>
data/lib/isodoc/bipm/bipm.mise-en-pratique.xsl CHANGED
@@ -9392,6 +9392,12 @@
9392
9392
  <style name="{$key}-left"><xsl:value-of select="$value"/></style>
9393
9393
  <style name="{$key}-bottom"><xsl:value-of select="$value"/></style>
9394
9394
  </xsl:if>
9395
+ <xsl:if test="$key = 'page-break-inside' and $value = 'avoid'">
9396
+ <style name="keep-together.within-page">always</style>
9397
+ </xsl:if>
9398
+ <xsl:if test="$key = 'page-break-after' and $value = 'always'">
9399
+ <style name="break-after">page</style>
9400
+ </xsl:if>
9395
9401
  </xsl:for-each>
9396
9402
  </xsl:variable>
9397
9403
  <xsl:variable name="styles" select="xalan:nodeset($styles_)"/>
@@ -9435,6 +9441,11 @@
9435
9441
 
9436
9442
  <fo:block role="SKIP">
9437
9443
 
9444
+ <xsl:variable name="styles">
9445
+ <styles><xsl:call-template name="setTableStyles"/></styles>
9446
+ </xsl:variable>
9447
+ <xsl:copy-of select="xalan:nodeset($styles)/styles/@break-after"/>
9448
+
9438
9449
  <xsl:if test="$isGenerateTableIF = 'true'">
9439
9450
  <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
9440
9451
  </xsl:if>
@@ -11617,9 +11628,25 @@
11617
11628
  <!-- ====== -->
11618
11629
  <!-- ====== -->
11619
11630
 
11620
- <xsl:attribute-set name="quote-style">
11631
+ <xsl:attribute-set name="quote-container-style">
11621
11632
  <xsl:attribute name="margin-left">12mm</xsl:attribute>
11622
11633
  <xsl:attribute name="margin-right">12mm</xsl:attribute>
11634
+ <xsl:attribute name="role">SKIP</xsl:attribute>
11635
+ <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
11636
+ </xsl:attribute-set>
11637
+
11638
+ <xsl:template name="refine_quote-container-style">
11639
+ <xsl:if test="parent::mn:note">
11640
+ <xsl:if test="not(ancestor::mn:table)">
11641
+ <xsl:attribute name="margin-left">5mm</xsl:attribute>
11642
+ </xsl:if>
11643
+ </xsl:if>
11644
+ </xsl:template>
11645
+
11646
+ <xsl:attribute-set name="quote-style">
11647
+ <xsl:attribute name="margin-left">0mm</xsl:attribute>
11648
+ <xsl:attribute name="margin-right">0mm</xsl:attribute>
11649
+
11623
11650
  </xsl:attribute-set> <!-- quote-style -->
11624
11651
 
11625
11652
  <xsl:template name="refine_quote-style">
@@ -11627,6 +11654,7 @@
11627
11654
 
11628
11655
  <xsl:attribute-set name="quote-source-style">
11629
11656
  <xsl:attribute name="text-align">right</xsl:attribute>
11657
+ <xsl:attribute name="margin-right">-12mm</xsl:attribute>
11630
11658
  </xsl:attribute-set> <!-- quote-source-style -->
11631
11659
 
11632
11660
  <xsl:template name="refine_quote-source-style">
@@ -11649,12 +11677,9 @@
11649
11677
 
11650
11678
  <xsl:call-template name="setBlockSpanAll"/>
11651
11679
 
11652
- <xsl:if test="parent::mn:note">
11653
- <xsl:if test="not(ancestor::mn:table)">
11654
- <xsl:attribute name="margin-left">5mm</xsl:attribute>
11655
- </xsl:if>
11656
- </xsl:if>
11657
- <fo:block-container margin-left="0mm" role="SKIP">
11680
+ <fo:block-container xsl:use-attribute-sets="quote-container-style">
11681
+ <xsl:call-template name="refine_quote-container-style"/>
11682
+
11658
11683
  <fo:block-container xsl:use-attribute-sets="quote-style" role="SKIP">
11659
11684
 
11660
11685
  <xsl:call-template name="refine_quote-style"/>
@@ -11666,14 +11691,16 @@
11666
11691
  </fo:block-container>
11667
11692
  </fo:block-container>
11668
11693
  <xsl:if test="mn:author or mn:fmt-source or mn:attribution">
11669
- <fo:block xsl:use-attribute-sets="quote-source-style">
11670
- <xsl:call-template name="refine_quote-source-style"/>
11671
- <!-- — ISO, ISO 7301:2011, Clause 1 -->
11672
- <xsl:apply-templates select="mn:author"/>
11673
- <xsl:apply-templates select="mn:fmt-source"/>
11674
- <!-- added for https://github.com/metanorma/isodoc/issues/607 -->
11675
- <xsl:apply-templates select="mn:attribution/mn:p/node()"/>
11676
- </fo:block>
11694
+ <fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
11695
+ <fo:block xsl:use-attribute-sets="quote-source-style">
11696
+ <xsl:call-template name="refine_quote-source-style"/>
11697
+ <!-- — ISO, ISO 7301:2011, Clause 1 -->
11698
+ <xsl:apply-templates select="mn:author"/>
11699
+ <xsl:apply-templates select="mn:fmt-source"/>
11700
+ <!-- added for https://github.com/metanorma/isodoc/issues/607 -->
11701
+ <xsl:apply-templates select="mn:attribution/mn:p/node()"/>
11702
+ </fo:block>
11703
+ </fo:block-container>
11677
11704
  </xsl:if>
11678
11705
 
11679
11706
  </fo:block-container>
@@ -16881,6 +16908,10 @@
16881
16908
  <fo:block break-after="page"/>
16882
16909
  </xsl:template>
16883
16910
 
16911
+ <xsl:template match="mn:pagebreak[ancestor::mn:table]" priority="2">
16912
+ <fo:block break-after="page"/>
16913
+ </xsl:template>
16914
+
16884
16915
  <xsl:variable name="font_main_root_style">
16885
16916
  <root-style xsl:use-attribute-sets="root-style">
16886
16917
  </root-style>
data/lib/isodoc/bipm/bipm.rapport.xsl CHANGED
@@ -9392,6 +9392,12 @@
9392
9392
  <style name="{$key}-left"><xsl:value-of select="$value"/></style>
9393
9393
  <style name="{$key}-bottom"><xsl:value-of select="$value"/></style>
9394
9394
  </xsl:if>
9395
+ <xsl:if test="$key = 'page-break-inside' and $value = 'avoid'">
9396
+ <style name="keep-together.within-page">always</style>
9397
+ </xsl:if>
9398
+ <xsl:if test="$key = 'page-break-after' and $value = 'always'">
9399
+ <style name="break-after">page</style>
9400
+ </xsl:if>
9395
9401
  </xsl:for-each>
9396
9402
  </xsl:variable>
9397
9403
  <xsl:variable name="styles" select="xalan:nodeset($styles_)"/>
@@ -9435,6 +9441,11 @@
9435
9441
 
9436
9442
  <fo:block role="SKIP">
9437
9443
 
9444
+ <xsl:variable name="styles">
9445
+ <styles><xsl:call-template name="setTableStyles"/></styles>
9446
+ </xsl:variable>
9447
+ <xsl:copy-of select="xalan:nodeset($styles)/styles/@break-after"/>
9448
+
9438
9449
  <xsl:if test="$isGenerateTableIF = 'true'">
9439
9450
  <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
9440
9451
  </xsl:if>
@@ -11617,9 +11628,25 @@
11617
11628
  <!-- ====== -->
11618
11629
  <!-- ====== -->
11619
11630
 
11620
- <xsl:attribute-set name="quote-style">
11631
+ <xsl:attribute-set name="quote-container-style">
11621
11632
  <xsl:attribute name="margin-left">12mm</xsl:attribute>
11622
11633
  <xsl:attribute name="margin-right">12mm</xsl:attribute>
11634
+ <xsl:attribute name="role">SKIP</xsl:attribute>
11635
+ <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
11636
+ </xsl:attribute-set>
11637
+
11638
+ <xsl:template name="refine_quote-container-style">
11639
+ <xsl:if test="parent::mn:note">
11640
+ <xsl:if test="not(ancestor::mn:table)">
11641
+ <xsl:attribute name="margin-left">5mm</xsl:attribute>
11642
+ </xsl:if>
11643
+ </xsl:if>
11644
+ </xsl:template>
11645
+
11646
+ <xsl:attribute-set name="quote-style">
11647
+ <xsl:attribute name="margin-left">0mm</xsl:attribute>
11648
+ <xsl:attribute name="margin-right">0mm</xsl:attribute>
11649
+
11623
11650
  </xsl:attribute-set> <!-- quote-style -->
11624
11651
 
11625
11652
  <xsl:template name="refine_quote-style">
@@ -11627,6 +11654,7 @@
11627
11654
 
11628
11655
  <xsl:attribute-set name="quote-source-style">
11629
11656
  <xsl:attribute name="text-align">right</xsl:attribute>
11657
+ <xsl:attribute name="margin-right">-12mm</xsl:attribute>
11630
11658
  </xsl:attribute-set> <!-- quote-source-style -->
11631
11659
 
11632
11660
  <xsl:template name="refine_quote-source-style">
@@ -11649,12 +11677,9 @@
11649
11677
 
11650
11678
  <xsl:call-template name="setBlockSpanAll"/>
11651
11679
 
11652
- <xsl:if test="parent::mn:note">
11653
- <xsl:if test="not(ancestor::mn:table)">
11654
- <xsl:attribute name="margin-left">5mm</xsl:attribute>
11655
- </xsl:if>
11656
- </xsl:if>
11657
- <fo:block-container margin-left="0mm" role="SKIP">
11680
+ <fo:block-container xsl:use-attribute-sets="quote-container-style">
11681
+ <xsl:call-template name="refine_quote-container-style"/>
11682
+
11658
11683
  <fo:block-container xsl:use-attribute-sets="quote-style" role="SKIP">
11659
11684
 
11660
11685
  <xsl:call-template name="refine_quote-style"/>
@@ -11666,14 +11691,16 @@
11666
11691
  </fo:block-container>
11667
11692
  </fo:block-container>
11668
11693
  <xsl:if test="mn:author or mn:fmt-source or mn:attribution">
11669
- <fo:block xsl:use-attribute-sets="quote-source-style">
11670
- <xsl:call-template name="refine_quote-source-style"/>
11671
- <!-- — ISO, ISO 7301:2011, Clause 1 -->
11672
- <xsl:apply-templates select="mn:author"/>
11673
- <xsl:apply-templates select="mn:fmt-source"/>
11674
- <!-- added for https://github.com/metanorma/isodoc/issues/607 -->
11675
- <xsl:apply-templates select="mn:attribution/mn:p/node()"/>
11676
- </fo:block>
11694
+ <fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
11695
+ <fo:block xsl:use-attribute-sets="quote-source-style">
11696
+ <xsl:call-template name="refine_quote-source-style"/>
11697
+ <!-- — ISO, ISO 7301:2011, Clause 1 -->
11698
+ <xsl:apply-templates select="mn:author"/>
11699
+ <xsl:apply-templates select="mn:fmt-source"/>
11700
+ <!-- added for https://github.com/metanorma/isodoc/issues/607 -->
11701
+ <xsl:apply-templates select="mn:attribution/mn:p/node()"/>
11702
+ </fo:block>
11703
+ </fo:block-container>
11677
11704
  </xsl:if>
11678
11705
 
11679
11706
  </fo:block-container>
@@ -16881,6 +16908,10 @@
16881
16908
  <fo:block break-after="page"/>
16882
16909
  </xsl:template>
16883
16910
 
16911
+ <xsl:template match="mn:pagebreak[ancestor::mn:table]" priority="2">
16912
+ <fo:block break-after="page"/>
16913
+ </xsl:template>
16914
+
16884
16915
  <xsl:variable name="font_main_root_style">
16885
16916
  <root-style xsl:use-attribute-sets="root-style">
16886
16917
  </root-style>
data/lib/isodoc/bipm/jcgm.standard.xsl CHANGED
@@ -7581,6 +7581,12 @@
7581
7581
  <style name="{$key}-left"><xsl:value-of select="$value"/></style>
7582
7582
  <style name="{$key}-bottom"><xsl:value-of select="$value"/></style>
7583
7583
  </xsl:if>
7584
+ <xsl:if test="$key = 'page-break-inside' and $value = 'avoid'">
7585
+ <style name="keep-together.within-page">always</style>
7586
+ </xsl:if>
7587
+ <xsl:if test="$key = 'page-break-after' and $value = 'always'">
7588
+ <style name="break-after">page</style>
7589
+ </xsl:if>
7584
7590
  </xsl:for-each>
7585
7591
  </xsl:variable>
7586
7592
  <xsl:variable name="styles" select="xalan:nodeset($styles_)"/>
@@ -7624,6 +7630,11 @@
7624
7630
 
7625
7631
  <fo:block role="SKIP">
7626
7632
 
7633
+ <xsl:variable name="styles">
7634
+ <styles><xsl:call-template name="setTableStyles"/></styles>
7635
+ </xsl:variable>
7636
+ <xsl:copy-of select="xalan:nodeset($styles)/styles/@break-after"/>
7637
+
7627
7638
  <xsl:if test="$isGenerateTableIF = 'true'">
7628
7639
  <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
7629
7640
  </xsl:if>
@@ -9778,24 +9789,43 @@
9778
9789
  <!-- ====== -->
9779
9790
  <!-- ====== -->
9780
9791
 
9781
- <xsl:attribute-set name="quote-style">
9792
+ <xsl:attribute-set name="quote-container-style">
9782
9793
  <xsl:attribute name="margin-left">12mm</xsl:attribute>
9783
9794
  <xsl:attribute name="margin-right">12mm</xsl:attribute>
9795
+ <xsl:attribute name="role">SKIP</xsl:attribute>
9796
+ <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
9797
+ </xsl:attribute-set>
9798
+
9799
+ <xsl:template name="refine_quote-container-style">
9800
+ <xsl:if test="parent::mn:note">
9801
+ <xsl:if test="not(ancestor::mn:table)">
9802
+ <xsl:attribute name="margin-left">5mm</xsl:attribute>
9803
+ </xsl:if>
9804
+ </xsl:if>
9805
+ <xsl:if test="ancestor::mn:boilerplate">
9806
+ <xsl:attribute name="margin-left">7mm</xsl:attribute>
9807
+ <xsl:attribute name="margin-right">7mm</xsl:attribute>
9808
+ </xsl:if>
9809
+ </xsl:template>
9810
+
9811
+ <xsl:attribute-set name="quote-style">
9812
+ <xsl:attribute name="margin-left">0mm</xsl:attribute>
9813
+ <xsl:attribute name="margin-right">0mm</xsl:attribute>
9784
9814
  <xsl:attribute name="margin-top">12pt</xsl:attribute>
9785
9815
  <xsl:attribute name="font-style">italic</xsl:attribute>
9786
9816
  <xsl:attribute name="text-align">justify</xsl:attribute>
9817
+
9787
9818
  </xsl:attribute-set> <!-- quote-style -->
9788
9819
 
9789
9820
  <xsl:template name="refine_quote-style">
9790
9821
  <xsl:if test="ancestor::mn:boilerplate">
9791
- <xsl:attribute name="margin-left">7mm</xsl:attribute>
9792
- <xsl:attribute name="margin-right">7mm</xsl:attribute>
9793
9822
  <xsl:attribute name="font-style">normal</xsl:attribute>
9794
9823
  </xsl:if>
9795
9824
  </xsl:template> <!-- refine_quote-style -->
9796
9825
 
9797
9826
  <xsl:attribute-set name="quote-source-style">
9798
9827
  <xsl:attribute name="text-align">right</xsl:attribute>
9828
+ <xsl:attribute name="margin-right">-12mm</xsl:attribute>
9799
9829
  </xsl:attribute-set> <!-- quote-source-style -->
9800
9830
 
9801
9831
  <xsl:template name="refine_quote-source-style">
@@ -9815,18 +9845,15 @@
9815
9845
  <!-- ====== -->
9816
9846
  <xsl:template match="mn:quote">
9817
9847
  <fo:block-container margin-left="0mm" role="SKIP">
9818
-
9819
- <xsl:call-template name="setBlockSpanAll"/>
9820
-
9821
- <xsl:if test="parent::mn:note">
9822
- <xsl:if test="not(ancestor::mn:table)">
9823
- <xsl:attribute name="margin-left">5mm</xsl:attribute>
9824
- </xsl:if>
9825
- </xsl:if>
9826
9848
  <xsl:if test="not(*)">
9827
9849
  <xsl:attribute name="space-after">12pt</xsl:attribute>
9828
9850
  </xsl:if>
9829
- <fo:block-container margin-left="0mm" role="SKIP">
9851
+
9852
+ <xsl:call-template name="setBlockSpanAll"/>
9853
+
9854
+ <fo:block-container xsl:use-attribute-sets="quote-container-style">
9855
+ <xsl:call-template name="refine_quote-container-style"/>
9856
+
9830
9857
  <fo:block-container xsl:use-attribute-sets="quote-style" role="SKIP">
9831
9858
 
9832
9859
  <xsl:call-template name="refine_quote-style"/>
@@ -9838,14 +9865,16 @@
9838
9865
  </fo:block-container>
9839
9866
  </fo:block-container>
9840
9867
  <xsl:if test="mn:author or mn:fmt-source or mn:attribution">
9841
- <fo:block xsl:use-attribute-sets="quote-source-style">
9842
- <xsl:call-template name="refine_quote-source-style"/>
9843
- <!-- — ISO, ISO 7301:2011, Clause 1 -->
9844
- <xsl:apply-templates select="mn:author"/>
9845
- <xsl:apply-templates select="mn:fmt-source"/>
9846
- <!-- added for https://github.com/metanorma/isodoc/issues/607 -->
9847
- <xsl:apply-templates select="mn:attribution/mn:p/node()"/>
9848
- </fo:block>
9868
+ <fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
9869
+ <fo:block xsl:use-attribute-sets="quote-source-style">
9870
+ <xsl:call-template name="refine_quote-source-style"/>
9871
+ <!-- — ISO, ISO 7301:2011, Clause 1 -->
9872
+ <xsl:apply-templates select="mn:author"/>
9873
+ <xsl:apply-templates select="mn:fmt-source"/>
9874
+ <!-- added for https://github.com/metanorma/isodoc/issues/607 -->
9875
+ <xsl:apply-templates select="mn:attribution/mn:p/node()"/>
9876
+ </fo:block>
9877
+ </fo:block-container>
9849
9878
  </xsl:if>
9850
9879
 
9851
9880
  </fo:block-container>
@@ -14941,6 +14970,10 @@
14941
14970
  <fo:block break-after="page"/>
14942
14971
  </xsl:template>
14943
14972
 
14973
+ <xsl:template match="mn:pagebreak[ancestor::mn:table]" priority="2">
14974
+ <fo:block break-after="page"/>
14975
+ </xsl:template>
14976
+
14944
14977
  <xsl:variable name="font_main_root_style">
14945
14978
  <root-style xsl:use-attribute-sets="root-style">
14946
14979
  </root-style>