metanorma-itu 2.8.11 → 2.8.12

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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 8ceac3f9d4c8a3e8c90917ee56165b9b6fa691db45e8cf7272e01b2a6a269fe4
4
- data.tar.gz: 031d734a23f0e1ba3b6fd8e63008a379d1c1d4a1f2d77bdb38665489ebb2aa97
3
+ metadata.gz: 9f55df171f32b8aa5c0e6712c2eaf872a5798004f9fec44289f5620eb5944bfa
4
+ data.tar.gz: e06cf021857a55ff7596cab2222a84571e8e9458487043dc9f8ad5edaf0654ad
5
5
  SHA512:
6
- metadata.gz: ae152a82e095fd48892d94f31802a891ebc6ed94d162edcecde495b3f6a86072c6177b28aa590b50902c7963df817d4e3d50e19653853e4c224acec861cc4ac6
7
- data.tar.gz: 7f0b1adf2b53903340881c10020b57d45d5f4d541048c13b796a2d52668f72a626082125eab75c8ecefed38f50e14122963117ba4482453b38c7d9339358ab40
6
+ metadata.gz: 4fae0e7fc149b3bb469be04cea54ce61d89da0ffcf2314764505392340f934a386b55a23b681a11143589a10ad4252c9469414e74d7b3dffd79b463b76488b3b
7
+ data.tar.gz: 6ebc95406a8a9b70cf268427065468641463fd6f45eecb1ff216fb85d1da046f89b4f9a7b13ffe7a64adc6969cae0c47ed861fd25a2bb4f04b769369c907ef51
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
@@ -8678,6 +8678,12 @@
8678
8678
  <style name="{$key}-left"><xsl:value-of select="$value"/></style>
8679
8679
  <style name="{$key}-bottom"><xsl:value-of select="$value"/></style>
8680
8680
  </xsl:if>
8681
+ <xsl:if test="$key = 'page-break-inside' and $value = 'avoid'">
8682
+ <style name="keep-together.within-page">always</style>
8683
+ </xsl:if>
8684
+ <xsl:if test="$key = 'page-break-after' and $value = 'always'">
8685
+ <style name="break-after">page</style>
8686
+ </xsl:if>
8681
8687
  </xsl:for-each>
8682
8688
  </xsl:variable>
8683
8689
  <xsl:variable name="styles" select="xalan:nodeset($styles_)"/>
@@ -8721,6 +8727,11 @@
8721
8727
 
8722
8728
  <fo:block role="SKIP">
8723
8729
 
8730
+ <xsl:variable name="styles">
8731
+ <styles><xsl:call-template name="setTableStyles"/></styles>
8732
+ </xsl:variable>
8733
+ <xsl:copy-of select="xalan:nodeset($styles)/styles/@break-after"/>
8734
+
8724
8735
  <xsl:if test="$isGenerateTableIF = 'true'">
8725
8736
  <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
8726
8737
  </xsl:if>
@@ -10914,10 +10925,26 @@
10914
10925
  <!-- ====== -->
10915
10926
  <!-- ====== -->
10916
10927
 
10917
- <xsl:attribute-set name="quote-style">
10928
+ <xsl:attribute-set name="quote-container-style">
10918
10929
  <xsl:attribute name="margin-left">12mm</xsl:attribute>
10919
10930
  <xsl:attribute name="margin-right">12mm</xsl:attribute>
10931
+ <xsl:attribute name="role">SKIP</xsl:attribute>
10932
+ <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
10933
+ </xsl:attribute-set>
10934
+
10935
+ <xsl:template name="refine_quote-container-style">
10936
+ <xsl:if test="parent::mn:note">
10937
+ <xsl:if test="not(ancestor::mn:table)">
10938
+ <xsl:attribute name="margin-left">5mm</xsl:attribute>
10939
+ </xsl:if>
10940
+ </xsl:if>
10941
+ </xsl:template>
10942
+
10943
+ <xsl:attribute-set name="quote-style">
10944
+ <xsl:attribute name="margin-left">0mm</xsl:attribute>
10945
+ <xsl:attribute name="margin-right">0mm</xsl:attribute>
10920
10946
  <xsl:attribute name="margin-top">6pt</xsl:attribute>
10947
+
10921
10948
  </xsl:attribute-set> <!-- quote-style -->
10922
10949
 
10923
10950
  <xsl:template name="refine_quote-style">
@@ -10925,6 +10952,7 @@
10925
10952
 
10926
10953
  <xsl:attribute-set name="quote-source-style">
10927
10954
  <xsl:attribute name="text-align">right</xsl:attribute>
10955
+ <xsl:attribute name="margin-right">-12mm</xsl:attribute>
10928
10956
  </xsl:attribute-set> <!-- quote-source-style -->
10929
10957
 
10930
10958
  <xsl:template name="refine_quote-source-style">
@@ -10947,12 +10975,9 @@
10947
10975
 
10948
10976
  <xsl:call-template name="setBlockSpanAll"/>
10949
10977
 
10950
- <xsl:if test="parent::mn:note">
10951
- <xsl:if test="not(ancestor::mn:table)">
10952
- <xsl:attribute name="margin-left">5mm</xsl:attribute>
10953
- </xsl:if>
10954
- </xsl:if>
10955
- <fo:block-container margin-left="0mm" role="SKIP">
10978
+ <fo:block-container xsl:use-attribute-sets="quote-container-style">
10979
+ <xsl:call-template name="refine_quote-container-style"/>
10980
+
10956
10981
  <fo:block-container xsl:use-attribute-sets="quote-style" role="SKIP">
10957
10982
 
10958
10983
  <xsl:call-template name="refine_quote-style"/>
@@ -10964,14 +10989,16 @@
10964
10989
  </fo:block-container>
10965
10990
  </fo:block-container>
10966
10991
  <xsl:if test="mn:author or mn:fmt-source or mn:attribution">
10967
- <fo:block xsl:use-attribute-sets="quote-source-style">
10968
- <xsl:call-template name="refine_quote-source-style"/>
10969
- <!-- — ISO, ISO 7301:2011, Clause 1 -->
10970
- <xsl:apply-templates select="mn:author"/>
10971
- <xsl:apply-templates select="mn:fmt-source"/>
10972
- <!-- added for https://github.com/metanorma/isodoc/issues/607 -->
10973
- <xsl:apply-templates select="mn:attribution/mn:p/node()"/>
10974
- </fo:block>
10992
+ <fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
10993
+ <fo:block xsl:use-attribute-sets="quote-source-style">
10994
+ <xsl:call-template name="refine_quote-source-style"/>
10995
+ <!-- — ISO, ISO 7301:2011, Clause 1 -->
10996
+ <xsl:apply-templates select="mn:author"/>
10997
+ <xsl:apply-templates select="mn:fmt-source"/>
10998
+ <!-- added for https://github.com/metanorma/isodoc/issues/607 -->
10999
+ <xsl:apply-templates select="mn:attribution/mn:p/node()"/>
11000
+ </fo:block>
11001
+ </fo:block-container>
10975
11002
  </xsl:if>
10976
11003
 
10977
11004
  </fo:block-container>
@@ -16209,6 +16236,10 @@
16209
16236
  <fo:block break-after="page"/>
16210
16237
  </xsl:template>
16211
16238
 
16239
+ <xsl:template match="mn:pagebreak[ancestor::mn:table]" priority="2">
16240
+ <fo:block break-after="page"/>
16241
+ </xsl:template>
16242
+
16212
16243
  <xsl:variable name="font_main_root_style">
16213
16244
  <root-style xsl:use-attribute-sets="root-style">
16214
16245
  </root-style>
@@ -8678,6 +8678,12 @@
8678
8678
  <style name="{$key}-left"><xsl:value-of select="$value"/></style>
8679
8679
  <style name="{$key}-bottom"><xsl:value-of select="$value"/></style>
8680
8680
  </xsl:if>
8681
+ <xsl:if test="$key = 'page-break-inside' and $value = 'avoid'">
8682
+ <style name="keep-together.within-page">always</style>
8683
+ </xsl:if>
8684
+ <xsl:if test="$key = 'page-break-after' and $value = 'always'">
8685
+ <style name="break-after">page</style>
8686
+ </xsl:if>
8681
8687
  </xsl:for-each>
8682
8688
  </xsl:variable>
8683
8689
  <xsl:variable name="styles" select="xalan:nodeset($styles_)"/>
@@ -8721,6 +8727,11 @@
8721
8727
 
8722
8728
  <fo:block role="SKIP">
8723
8729
 
8730
+ <xsl:variable name="styles">
8731
+ <styles><xsl:call-template name="setTableStyles"/></styles>
8732
+ </xsl:variable>
8733
+ <xsl:copy-of select="xalan:nodeset($styles)/styles/@break-after"/>
8734
+
8724
8735
  <xsl:if test="$isGenerateTableIF = 'true'">
8725
8736
  <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
8726
8737
  </xsl:if>
@@ -10914,10 +10925,26 @@
10914
10925
  <!-- ====== -->
10915
10926
  <!-- ====== -->
10916
10927
 
10917
- <xsl:attribute-set name="quote-style">
10928
+ <xsl:attribute-set name="quote-container-style">
10918
10929
  <xsl:attribute name="margin-left">12mm</xsl:attribute>
10919
10930
  <xsl:attribute name="margin-right">12mm</xsl:attribute>
10931
+ <xsl:attribute name="role">SKIP</xsl:attribute>
10932
+ <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
10933
+ </xsl:attribute-set>
10934
+
10935
+ <xsl:template name="refine_quote-container-style">
10936
+ <xsl:if test="parent::mn:note">
10937
+ <xsl:if test="not(ancestor::mn:table)">
10938
+ <xsl:attribute name="margin-left">5mm</xsl:attribute>
10939
+ </xsl:if>
10940
+ </xsl:if>
10941
+ </xsl:template>
10942
+
10943
+ <xsl:attribute-set name="quote-style">
10944
+ <xsl:attribute name="margin-left">0mm</xsl:attribute>
10945
+ <xsl:attribute name="margin-right">0mm</xsl:attribute>
10920
10946
  <xsl:attribute name="margin-top">6pt</xsl:attribute>
10947
+
10921
10948
  </xsl:attribute-set> <!-- quote-style -->
10922
10949
 
10923
10950
  <xsl:template name="refine_quote-style">
@@ -10925,6 +10952,7 @@
10925
10952
 
10926
10953
  <xsl:attribute-set name="quote-source-style">
10927
10954
  <xsl:attribute name="text-align">right</xsl:attribute>
10955
+ <xsl:attribute name="margin-right">-12mm</xsl:attribute>
10928
10956
  </xsl:attribute-set> <!-- quote-source-style -->
10929
10957
 
10930
10958
  <xsl:template name="refine_quote-source-style">
@@ -10947,12 +10975,9 @@
10947
10975
 
10948
10976
  <xsl:call-template name="setBlockSpanAll"/>
10949
10977
 
10950
- <xsl:if test="parent::mn:note">
10951
- <xsl:if test="not(ancestor::mn:table)">
10952
- <xsl:attribute name="margin-left">5mm</xsl:attribute>
10953
- </xsl:if>
10954
- </xsl:if>
10955
- <fo:block-container margin-left="0mm" role="SKIP">
10978
+ <fo:block-container xsl:use-attribute-sets="quote-container-style">
10979
+ <xsl:call-template name="refine_quote-container-style"/>
10980
+
10956
10981
  <fo:block-container xsl:use-attribute-sets="quote-style" role="SKIP">
10957
10982
 
10958
10983
  <xsl:call-template name="refine_quote-style"/>
@@ -10964,14 +10989,16 @@
10964
10989
  </fo:block-container>
10965
10990
  </fo:block-container>
10966
10991
  <xsl:if test="mn:author or mn:fmt-source or mn:attribution">
10967
- <fo:block xsl:use-attribute-sets="quote-source-style">
10968
- <xsl:call-template name="refine_quote-source-style"/>
10969
- <!-- — ISO, ISO 7301:2011, Clause 1 -->
10970
- <xsl:apply-templates select="mn:author"/>
10971
- <xsl:apply-templates select="mn:fmt-source"/>
10972
- <!-- added for https://github.com/metanorma/isodoc/issues/607 -->
10973
- <xsl:apply-templates select="mn:attribution/mn:p/node()"/>
10974
- </fo:block>
10992
+ <fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
10993
+ <fo:block xsl:use-attribute-sets="quote-source-style">
10994
+ <xsl:call-template name="refine_quote-source-style"/>
10995
+ <!-- — ISO, ISO 7301:2011, Clause 1 -->
10996
+ <xsl:apply-templates select="mn:author"/>
10997
+ <xsl:apply-templates select="mn:fmt-source"/>
10998
+ <!-- added for https://github.com/metanorma/isodoc/issues/607 -->
10999
+ <xsl:apply-templates select="mn:attribution/mn:p/node()"/>
11000
+ </fo:block>
11001
+ </fo:block-container>
10975
11002
  </xsl:if>
10976
11003
 
10977
11004
  </fo:block-container>
@@ -16209,6 +16236,10 @@
16209
16236
  <fo:block break-after="page"/>
16210
16237
  </xsl:template>
16211
16238
 
16239
+ <xsl:template match="mn:pagebreak[ancestor::mn:table]" priority="2">
16240
+ <fo:block break-after="page"/>
16241
+ </xsl:template>
16242
+
16212
16243
  <xsl:variable name="font_main_root_style">
16213
16244
  <root-style xsl:use-attribute-sets="root-style">
16214
16245
  </root-style>
@@ -8678,6 +8678,12 @@
8678
8678
  <style name="{$key}-left"><xsl:value-of select="$value"/></style>
8679
8679
  <style name="{$key}-bottom"><xsl:value-of select="$value"/></style>
8680
8680
  </xsl:if>
8681
+ <xsl:if test="$key = 'page-break-inside' and $value = 'avoid'">
8682
+ <style name="keep-together.within-page">always</style>
8683
+ </xsl:if>
8684
+ <xsl:if test="$key = 'page-break-after' and $value = 'always'">
8685
+ <style name="break-after">page</style>
8686
+ </xsl:if>
8681
8687
  </xsl:for-each>
8682
8688
  </xsl:variable>
8683
8689
  <xsl:variable name="styles" select="xalan:nodeset($styles_)"/>
@@ -8721,6 +8727,11 @@
8721
8727
 
8722
8728
  <fo:block role="SKIP">
8723
8729
 
8730
+ <xsl:variable name="styles">
8731
+ <styles><xsl:call-template name="setTableStyles"/></styles>
8732
+ </xsl:variable>
8733
+ <xsl:copy-of select="xalan:nodeset($styles)/styles/@break-after"/>
8734
+
8724
8735
  <xsl:if test="$isGenerateTableIF = 'true'">
8725
8736
  <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
8726
8737
  </xsl:if>
@@ -10914,10 +10925,26 @@
10914
10925
  <!-- ====== -->
10915
10926
  <!-- ====== -->
10916
10927
 
10917
- <xsl:attribute-set name="quote-style">
10928
+ <xsl:attribute-set name="quote-container-style">
10918
10929
  <xsl:attribute name="margin-left">12mm</xsl:attribute>
10919
10930
  <xsl:attribute name="margin-right">12mm</xsl:attribute>
10931
+ <xsl:attribute name="role">SKIP</xsl:attribute>
10932
+ <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
10933
+ </xsl:attribute-set>
10934
+
10935
+ <xsl:template name="refine_quote-container-style">
10936
+ <xsl:if test="parent::mn:note">
10937
+ <xsl:if test="not(ancestor::mn:table)">
10938
+ <xsl:attribute name="margin-left">5mm</xsl:attribute>
10939
+ </xsl:if>
10940
+ </xsl:if>
10941
+ </xsl:template>
10942
+
10943
+ <xsl:attribute-set name="quote-style">
10944
+ <xsl:attribute name="margin-left">0mm</xsl:attribute>
10945
+ <xsl:attribute name="margin-right">0mm</xsl:attribute>
10920
10946
  <xsl:attribute name="margin-top">6pt</xsl:attribute>
10947
+
10921
10948
  </xsl:attribute-set> <!-- quote-style -->
10922
10949
 
10923
10950
  <xsl:template name="refine_quote-style">
@@ -10925,6 +10952,7 @@
10925
10952
 
10926
10953
  <xsl:attribute-set name="quote-source-style">
10927
10954
  <xsl:attribute name="text-align">right</xsl:attribute>
10955
+ <xsl:attribute name="margin-right">-12mm</xsl:attribute>
10928
10956
  </xsl:attribute-set> <!-- quote-source-style -->
10929
10957
 
10930
10958
  <xsl:template name="refine_quote-source-style">
@@ -10947,12 +10975,9 @@
10947
10975
 
10948
10976
  <xsl:call-template name="setBlockSpanAll"/>
10949
10977
 
10950
- <xsl:if test="parent::mn:note">
10951
- <xsl:if test="not(ancestor::mn:table)">
10952
- <xsl:attribute name="margin-left">5mm</xsl:attribute>
10953
- </xsl:if>
10954
- </xsl:if>
10955
- <fo:block-container margin-left="0mm" role="SKIP">
10978
+ <fo:block-container xsl:use-attribute-sets="quote-container-style">
10979
+ <xsl:call-template name="refine_quote-container-style"/>
10980
+
10956
10981
  <fo:block-container xsl:use-attribute-sets="quote-style" role="SKIP">
10957
10982
 
10958
10983
  <xsl:call-template name="refine_quote-style"/>
@@ -10964,14 +10989,16 @@
10964
10989
  </fo:block-container>
10965
10990
  </fo:block-container>
10966
10991
  <xsl:if test="mn:author or mn:fmt-source or mn:attribution">
10967
- <fo:block xsl:use-attribute-sets="quote-source-style">
10968
- <xsl:call-template name="refine_quote-source-style"/>
10969
- <!-- — ISO, ISO 7301:2011, Clause 1 -->
10970
- <xsl:apply-templates select="mn:author"/>
10971
- <xsl:apply-templates select="mn:fmt-source"/>
10972
- <!-- added for https://github.com/metanorma/isodoc/issues/607 -->
10973
- <xsl:apply-templates select="mn:attribution/mn:p/node()"/>
10974
- </fo:block>
10992
+ <fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
10993
+ <fo:block xsl:use-attribute-sets="quote-source-style">
10994
+ <xsl:call-template name="refine_quote-source-style"/>
10995
+ <!-- — ISO, ISO 7301:2011, Clause 1 -->
10996
+ <xsl:apply-templates select="mn:author"/>
10997
+ <xsl:apply-templates select="mn:fmt-source"/>
10998
+ <!-- added for https://github.com/metanorma/isodoc/issues/607 -->
10999
+ <xsl:apply-templates select="mn:attribution/mn:p/node()"/>
11000
+ </fo:block>
11001
+ </fo:block-container>
10975
11002
  </xsl:if>
10976
11003
 
10977
11004
  </fo:block-container>
@@ -16209,6 +16236,10 @@
16209
16236
  <fo:block break-after="page"/>
16210
16237
  </xsl:template>
16211
16238
 
16239
+ <xsl:template match="mn:pagebreak[ancestor::mn:table]" priority="2">
16240
+ <fo:block break-after="page"/>
16241
+ </xsl:template>
16242
+
16212
16243
  <xsl:variable name="font_main_root_style">
16213
16244
  <root-style xsl:use-attribute-sets="root-style">
16214
16245
  </root-style>
@@ -8678,6 +8678,12 @@
8678
8678
  <style name="{$key}-left"><xsl:value-of select="$value"/></style>
8679
8679
  <style name="{$key}-bottom"><xsl:value-of select="$value"/></style>
8680
8680
  </xsl:if>
8681
+ <xsl:if test="$key = 'page-break-inside' and $value = 'avoid'">
8682
+ <style name="keep-together.within-page">always</style>
8683
+ </xsl:if>
8684
+ <xsl:if test="$key = 'page-break-after' and $value = 'always'">
8685
+ <style name="break-after">page</style>
8686
+ </xsl:if>
8681
8687
  </xsl:for-each>
8682
8688
  </xsl:variable>
8683
8689
  <xsl:variable name="styles" select="xalan:nodeset($styles_)"/>
@@ -8721,6 +8727,11 @@
8721
8727
 
8722
8728
  <fo:block role="SKIP">
8723
8729
 
8730
+ <xsl:variable name="styles">
8731
+ <styles><xsl:call-template name="setTableStyles"/></styles>
8732
+ </xsl:variable>
8733
+ <xsl:copy-of select="xalan:nodeset($styles)/styles/@break-after"/>
8734
+
8724
8735
  <xsl:if test="$isGenerateTableIF = 'true'">
8725
8736
  <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
8726
8737
  </xsl:if>
@@ -10914,10 +10925,26 @@
10914
10925
  <!-- ====== -->
10915
10926
  <!-- ====== -->
10916
10927
 
10917
- <xsl:attribute-set name="quote-style">
10928
+ <xsl:attribute-set name="quote-container-style">
10918
10929
  <xsl:attribute name="margin-left">12mm</xsl:attribute>
10919
10930
  <xsl:attribute name="margin-right">12mm</xsl:attribute>
10931
+ <xsl:attribute name="role">SKIP</xsl:attribute>
10932
+ <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
10933
+ </xsl:attribute-set>
10934
+
10935
+ <xsl:template name="refine_quote-container-style">
10936
+ <xsl:if test="parent::mn:note">
10937
+ <xsl:if test="not(ancestor::mn:table)">
10938
+ <xsl:attribute name="margin-left">5mm</xsl:attribute>
10939
+ </xsl:if>
10940
+ </xsl:if>
10941
+ </xsl:template>
10942
+
10943
+ <xsl:attribute-set name="quote-style">
10944
+ <xsl:attribute name="margin-left">0mm</xsl:attribute>
10945
+ <xsl:attribute name="margin-right">0mm</xsl:attribute>
10920
10946
  <xsl:attribute name="margin-top">6pt</xsl:attribute>
10947
+
10921
10948
  </xsl:attribute-set> <!-- quote-style -->
10922
10949
 
10923
10950
  <xsl:template name="refine_quote-style">
@@ -10925,6 +10952,7 @@
10925
10952
 
10926
10953
  <xsl:attribute-set name="quote-source-style">
10927
10954
  <xsl:attribute name="text-align">right</xsl:attribute>
10955
+ <xsl:attribute name="margin-right">-12mm</xsl:attribute>
10928
10956
  </xsl:attribute-set> <!-- quote-source-style -->
10929
10957
 
10930
10958
  <xsl:template name="refine_quote-source-style">
@@ -10947,12 +10975,9 @@
10947
10975
 
10948
10976
  <xsl:call-template name="setBlockSpanAll"/>
10949
10977
 
10950
- <xsl:if test="parent::mn:note">
10951
- <xsl:if test="not(ancestor::mn:table)">
10952
- <xsl:attribute name="margin-left">5mm</xsl:attribute>
10953
- </xsl:if>
10954
- </xsl:if>
10955
- <fo:block-container margin-left="0mm" role="SKIP">
10978
+ <fo:block-container xsl:use-attribute-sets="quote-container-style">
10979
+ <xsl:call-template name="refine_quote-container-style"/>
10980
+
10956
10981
  <fo:block-container xsl:use-attribute-sets="quote-style" role="SKIP">
10957
10982
 
10958
10983
  <xsl:call-template name="refine_quote-style"/>
@@ -10964,14 +10989,16 @@
10964
10989
  </fo:block-container>
10965
10990
  </fo:block-container>
10966
10991
  <xsl:if test="mn:author or mn:fmt-source or mn:attribution">
10967
- <fo:block xsl:use-attribute-sets="quote-source-style">
10968
- <xsl:call-template name="refine_quote-source-style"/>
10969
- <!-- — ISO, ISO 7301:2011, Clause 1 -->
10970
- <xsl:apply-templates select="mn:author"/>
10971
- <xsl:apply-templates select="mn:fmt-source"/>
10972
- <!-- added for https://github.com/metanorma/isodoc/issues/607 -->
10973
- <xsl:apply-templates select="mn:attribution/mn:p/node()"/>
10974
- </fo:block>
10992
+ <fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
10993
+ <fo:block xsl:use-attribute-sets="quote-source-style">
10994
+ <xsl:call-template name="refine_quote-source-style"/>
10995
+ <!-- — ISO, ISO 7301:2011, Clause 1 -->
10996
+ <xsl:apply-templates select="mn:author"/>
10997
+ <xsl:apply-templates select="mn:fmt-source"/>
10998
+ <!-- added for https://github.com/metanorma/isodoc/issues/607 -->
10999
+ <xsl:apply-templates select="mn:attribution/mn:p/node()"/>
11000
+ </fo:block>
11001
+ </fo:block-container>
10975
11002
  </xsl:if>
10976
11003
 
10977
11004
  </fo:block-container>
@@ -16209,6 +16236,10 @@
16209
16236
  <fo:block break-after="page"/>
16210
16237
  </xsl:template>
16211
16238
 
16239
+ <xsl:template match="mn:pagebreak[ancestor::mn:table]" priority="2">
16240
+ <fo:block break-after="page"/>
16241
+ </xsl:template>
16242
+
16212
16243
  <xsl:variable name="font_main_root_style">
16213
16244
  <root-style xsl:use-attribute-sets="root-style">
16214
16245
  </root-style>
@@ -8678,6 +8678,12 @@
8678
8678
  <style name="{$key}-left"><xsl:value-of select="$value"/></style>
8679
8679
  <style name="{$key}-bottom"><xsl:value-of select="$value"/></style>
8680
8680
  </xsl:if>
8681
+ <xsl:if test="$key = 'page-break-inside' and $value = 'avoid'">
8682
+ <style name="keep-together.within-page">always</style>
8683
+ </xsl:if>
8684
+ <xsl:if test="$key = 'page-break-after' and $value = 'always'">
8685
+ <style name="break-after">page</style>
8686
+ </xsl:if>
8681
8687
  </xsl:for-each>
8682
8688
  </xsl:variable>
8683
8689
  <xsl:variable name="styles" select="xalan:nodeset($styles_)"/>
@@ -8721,6 +8727,11 @@
8721
8727
 
8722
8728
  <fo:block role="SKIP">
8723
8729
 
8730
+ <xsl:variable name="styles">
8731
+ <styles><xsl:call-template name="setTableStyles"/></styles>
8732
+ </xsl:variable>
8733
+ <xsl:copy-of select="xalan:nodeset($styles)/styles/@break-after"/>
8734
+
8724
8735
  <xsl:if test="$isGenerateTableIF = 'true'">
8725
8736
  <xsl:attribute name="id"><xsl:value-of select="@id"/></xsl:attribute>
8726
8737
  </xsl:if>
@@ -10914,10 +10925,26 @@
10914
10925
  <!-- ====== -->
10915
10926
  <!-- ====== -->
10916
10927
 
10917
- <xsl:attribute-set name="quote-style">
10928
+ <xsl:attribute-set name="quote-container-style">
10918
10929
  <xsl:attribute name="margin-left">12mm</xsl:attribute>
10919
10930
  <xsl:attribute name="margin-right">12mm</xsl:attribute>
10931
+ <xsl:attribute name="role">SKIP</xsl:attribute>
10932
+ <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
10933
+ </xsl:attribute-set>
10934
+
10935
+ <xsl:template name="refine_quote-container-style">
10936
+ <xsl:if test="parent::mn:note">
10937
+ <xsl:if test="not(ancestor::mn:table)">
10938
+ <xsl:attribute name="margin-left">5mm</xsl:attribute>
10939
+ </xsl:if>
10940
+ </xsl:if>
10941
+ </xsl:template>
10942
+
10943
+ <xsl:attribute-set name="quote-style">
10944
+ <xsl:attribute name="margin-left">0mm</xsl:attribute>
10945
+ <xsl:attribute name="margin-right">0mm</xsl:attribute>
10920
10946
  <xsl:attribute name="margin-top">6pt</xsl:attribute>
10947
+
10921
10948
  </xsl:attribute-set> <!-- quote-style -->
10922
10949
 
10923
10950
  <xsl:template name="refine_quote-style">
@@ -10925,6 +10952,7 @@
10925
10952
 
10926
10953
  <xsl:attribute-set name="quote-source-style">
10927
10954
  <xsl:attribute name="text-align">right</xsl:attribute>
10955
+ <xsl:attribute name="margin-right">-12mm</xsl:attribute>
10928
10956
  </xsl:attribute-set> <!-- quote-source-style -->
10929
10957
 
10930
10958
  <xsl:template name="refine_quote-source-style">
@@ -10947,12 +10975,9 @@
10947
10975
 
10948
10976
  <xsl:call-template name="setBlockSpanAll"/>
10949
10977
 
10950
- <xsl:if test="parent::mn:note">
10951
- <xsl:if test="not(ancestor::mn:table)">
10952
- <xsl:attribute name="margin-left">5mm</xsl:attribute>
10953
- </xsl:if>
10954
- </xsl:if>
10955
- <fo:block-container margin-left="0mm" role="SKIP">
10978
+ <fo:block-container xsl:use-attribute-sets="quote-container-style">
10979
+ <xsl:call-template name="refine_quote-container-style"/>
10980
+
10956
10981
  <fo:block-container xsl:use-attribute-sets="quote-style" role="SKIP">
10957
10982
 
10958
10983
  <xsl:call-template name="refine_quote-style"/>
@@ -10964,14 +10989,16 @@
10964
10989
  </fo:block-container>
10965
10990
  </fo:block-container>
10966
10991
  <xsl:if test="mn:author or mn:fmt-source or mn:attribution">
10967
- <fo:block xsl:use-attribute-sets="quote-source-style">
10968
- <xsl:call-template name="refine_quote-source-style"/>
10969
- <!-- — ISO, ISO 7301:2011, Clause 1 -->
10970
- <xsl:apply-templates select="mn:author"/>
10971
- <xsl:apply-templates select="mn:fmt-source"/>
10972
- <!-- added for https://github.com/metanorma/isodoc/issues/607 -->
10973
- <xsl:apply-templates select="mn:attribution/mn:p/node()"/>
10974
- </fo:block>
10992
+ <fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
10993
+ <fo:block xsl:use-attribute-sets="quote-source-style">
10994
+ <xsl:call-template name="refine_quote-source-style"/>
10995
+ <!-- — ISO, ISO 7301:2011, Clause 1 -->
10996
+ <xsl:apply-templates select="mn:author"/>
10997
+ <xsl:apply-templates select="mn:fmt-source"/>
10998
+ <!-- added for https://github.com/metanorma/isodoc/issues/607 -->
10999
+ <xsl:apply-templates select="mn:attribution/mn:p/node()"/>
11000
+ </fo:block>
11001
+ </fo:block-container>
10975
11002
  </xsl:if>
10976
11003
 
10977
11004
  </fo:block-container>
@@ -16209,6 +16236,10 @@
16209
16236
  <fo:block break-after="page"/>
16210
16237
  </xsl:template>
16211
16238
 
16239
+ <xsl:template match="mn:pagebreak[ancestor::mn:table]" priority="2">
16240
+ <fo:block break-after="page"/>
16241
+ </xsl:template>
16242
+
16212
16243
  <xsl:variable name="font_main_root_style">
16213
16244
  <root-style xsl:use-attribute-sets="root-style">
16214
16245
  </root-style>