metanorma-bipm 2.7.0 → 2.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 (11) hide show
  1. checksums.yaml +4 -4
  2. data/lib/isodoc/bipm/bipm.brochure.xsl +141 -43
  3. data/lib/isodoc/bipm/bipm.guide.xsl +141 -43
  4. data/lib/isodoc/bipm/bipm.mise-en-pratique.xsl +141 -43
  5. data/lib/isodoc/bipm/bipm.rapport.xsl +141 -43
  6. data/lib/isodoc/bipm/jcgm.standard.xsl +136 -56
  7. data/lib/metanorma/bipm/basicdoc.rng +5 -5
  8. data/lib/metanorma/bipm/isodoc.rng +7 -1
  9. data/lib/metanorma/bipm/version.rb +1 -1
  10. data/metanorma-bipm.gemspec +1 -1
  11. metadata +4 -4
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 243bb92d777033b554b303bab0f2a4671dd0368197c62f25c5bf728c1ee81860
4
- data.tar.gz: 22da95ca5d0f70f8f0089306269793f5c9730a60d3cbc3e89f362fef7c1312f6
3
+ metadata.gz: ad65231e2c60636b8ddb3dcceca5cc8935151f6873eb7964c0787d662874553c
4
+ data.tar.gz: 81a16168046a619da81c5c9598386889ff8cae291e29631b713b91b141599974
5
5
  SHA512:
6
- metadata.gz: ae953bd7af98c52ff5c3666a58aa90c0903db302f656babc0adbb2005ea693ef6260f38c4a75ba2370761abef7b9f7672b4d963c82b5b199301ac1c4652bbf4c
7
- data.tar.gz: 524d813e92cc86aa321acbfcd657b3c2e78760f176c350c31b816a434cbe702ca6b00aa863528bd62d9370003d7fc64a8f10bae0c175e060653f7d4efd9c40ab
6
+ metadata.gz: b36f2a8a8ffb26c22912b4bc3743249c0fbf40ed3ca03e79ed730368aee91bfdbc98a7f8e021a2549e553dce343a27427bae866a8865fb99a7b7dffcfff21f97
7
+ data.tar.gz: 545719bca99fb1d7222196c351c83dcdcad98cd81cc75bccd8c441882be3d98baab029bb19ecae5394d6caa33a208d26043dcb8343e8c52fd48f5b3118191cfc
data/lib/isodoc/bipm/bipm.brochure.xsl CHANGED
@@ -1145,9 +1145,9 @@
1145
1145
 
1146
1146
  <fo:flow flow-name="xsl-region-body">
1147
1147
 
1148
- <fo:block-container margin-left="-14mm" margin-right="0mm">
1149
- <fo:block-container margin-left="0mm" margin-right="0mm">
1150
- <fo:block font-family="Arial" font-size="16pt" font-weight="bold" text-align-last="justify" margin-bottom="82pt" role="H1">
1148
+ <!-- <fo:block-container margin-left="-14mm" margin-right="0mm">
1149
+ <fo:block-container margin-left="0mm" margin-right="0mm"> -->
1150
+ <fo:block xsl:use-attribute-sets="toc-title-style">
1151
1151
  <fo:inline><xsl:value-of select="//mn:metanorma/mn:bibdata/mn:title[@language = $curr_lang and @type='title-main']"/></fo:inline>
1152
1152
  <fo:inline keep-together.within-line="always">
1153
1153
  <fo:leader leader-pattern="space"/>
@@ -1156,10 +1156,10 @@
1156
1156
  </fo:inline>
1157
1157
  </fo:inline>
1158
1158
  </fo:block>
1159
- </fo:block-container>
1160
- </fo:block-container>
1159
+ <!-- </fo:block-container>
1160
+ </fo:block-container> -->
1161
1161
 
1162
- <fo:block-container line-height="135%">
1162
+ <fo:block-container xsl:use-attribute-sets="toc-style">
1163
1163
  <fo:block role="TOC">
1164
1164
  <!-- <xsl:copy-of select="$contents"/> -->
1165
1165
 
@@ -1896,7 +1896,7 @@
1896
1896
 
1897
1897
  <xsl:template name="insertContentItem">
1898
1898
  <xsl:param name="keep-with-next"/>
1899
- <fo:table-row role="TOCI">
1899
+ <fo:table-row xsl:use-attribute-sets="toc-item-style">
1900
1900
  <xsl:if test="$keep-with-next = 'true'">
1901
1901
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
1902
1902
  </xsl:if>
@@ -1922,32 +1922,8 @@
1922
1922
  <xsl:attribute name="padding-bottom"><xsl:value-of select="normalize-space($space-after)"/></xsl:attribute>
1923
1923
  </xsl:if>
1924
1924
  <fo:block role="SKIP">
1925
- <xsl:if test="@level = 1">
1926
- <xsl:attribute name="font-family">Arial</xsl:attribute>
1927
- <xsl:attribute name="font-size">10pt</xsl:attribute>
1928
- <xsl:attribute name="font-weight">bold</xsl:attribute>
1929
- </xsl:if>
1930
- <xsl:if test="@level &gt;= 2 and not(@parent = 'annex')">
1931
- <xsl:attribute name="font-size">10.5pt</xsl:attribute>
1932
- </xsl:if>
1933
- <xsl:if test="@level = 2">
1934
- <xsl:attribute name="margin-left">8mm</xsl:attribute>
1935
- </xsl:if>
1936
- <xsl:if test="@level &gt; 2">
1937
- <xsl:attribute name="margin-left">9mm</xsl:attribute>
1938
- </xsl:if>
1939
- <xsl:if test="@level &gt;= 2 and @parent = 'annex'">
1940
- <xsl:attribute name="font-family">Arial</xsl:attribute>
1941
- <xsl:attribute name="font-size">8pt</xsl:attribute>
1942
- <xsl:attribute name="margin-left">25mm</xsl:attribute>
1943
- <xsl:attribute name="font-weight">bold</xsl:attribute>
1944
- </xsl:if>
1945
- <xsl:if test="@type = 'index'">
1946
- <xsl:attribute name="font-family">Arial</xsl:attribute>
1947
- <xsl:attribute name="font-size">10pt</xsl:attribute>
1948
- <xsl:attribute name="font-weight">bold</xsl:attribute>
1949
- <xsl:attribute name="space-before">14pt</xsl:attribute>
1950
- </xsl:if>
1925
+
1926
+ <xsl:call-template name="refine_toc-item-style"/>
1951
1927
 
1952
1928
  <fo:list-block role="SKIP">
1953
1929
  <xsl:attribute name="provisional-distance-between-starts">
@@ -1961,15 +1937,16 @@
1961
1937
  </xsl:attribute>
1962
1938
 
1963
1939
  <fo:list-item role="SKIP">
1940
+
1964
1941
  <fo:list-item-label end-indent="label-end()" role="SKIP">
1965
1942
  <fo:block role="SKIP">
1966
1943
  <xsl:if test="@level = 1 or (@level = 2 and not(@parent = 'annex'))">
1967
1944
  <xsl:value-of select="@section"/>
1968
1945
  <xsl:if test="normalize-space(@section) != '' and @type = 'annex'">.</xsl:if>
1969
1946
  </xsl:if>
1970
-
1971
1947
  </fo:block>
1972
1948
  </fo:list-item-label>
1949
+
1973
1950
  <fo:list-item-body start-indent="body-start()" role="SKIP">
1974
1951
  <fo:block role="SKIP">
1975
1952
  <xsl:if test="@level &gt;= 3">
@@ -2001,7 +1978,7 @@
2001
1978
  </xsl:if>
2002
1979
  <fo:block role="SKIP">
2003
1980
  <fo:basic-link internal-destination="{@id}" fox:alt-text="{mnx:title}" role="SKIP">
2004
- <fo:inline font-family="Arial" font-weight="bold" font-size="10pt" role="SKIP"><fo:wrapper role="artifact"><fo:page-number-citation ref-id="{@id}"/></fo:wrapper></fo:inline>
1981
+ <fo:inline xsl:use-attribute-sets="toc-pagenumber-style" role="SKIP"><fo:wrapper role="artifact"><fo:page-number-citation ref-id="{@id}"/></fo:wrapper></fo:inline>
2005
1982
  </fo:basic-link>
2006
1983
  </fo:block>
2007
1984
  </fo:table-cell>
@@ -2011,7 +1988,7 @@
2011
1988
  <xsl:template name="insertListOf_Title">
2012
1989
  <xsl:param name="title"/>
2013
1990
  <fo:table-row keep-with-next="always">
2014
- <fo:table-cell font-family="Arial" font-weight="bold" font-size="10pt" padding-top="14pt" padding-bottom="6pt">
1991
+ <fo:table-cell xsl:use-attribute-sets="toc-listof-title-style">
2015
1992
  <fo:block role="TOCI">
2016
1993
  <xsl:value-of select="$title"/>
2017
1994
  </fo:block>
@@ -2025,7 +2002,7 @@
2025
2002
  <xsl:template name="insertListOf_Item">
2026
2003
  <fo:table-row>
2027
2004
  <fo:table-cell>
2028
- <fo:block role="TOCI" font-size="10.5pt" margin-left="8mm">
2005
+ <fo:block xsl:use-attribute-sets="toc-listof-item-style">
2029
2006
  <fo:list-block provisional-distance-between-starts="8mm">
2030
2007
  <fo:list-item>
2031
2008
  <fo:list-item-label end-indent="label-end()">
@@ -2047,7 +2024,7 @@
2047
2024
  </fo:list-block>
2048
2025
  </fo:block>
2049
2026
  </fo:table-cell>
2050
- <fo:table-cell text-align="right" font-family="Arial" font-weight="bold" font-size="10pt">
2027
+ <fo:table-cell xsl:use-attribute-sets="toc-pagenumber-style" text-align="right">
2051
2028
  <fo:block>
2052
2029
  <fo:basic-link internal-destination="{@id}">
2053
2030
  <xsl:call-template name="setAltText">
@@ -3405,7 +3382,7 @@
3405
3382
  <fo:table-column column-width="100%"/>
3406
3383
  <fo:table-header role="SKIP">
3407
3384
  <fo:table-row font-weight="bold" role="SKIP">
3408
- <fo:table-cell text-align="right" font-size="9pt" font-family="Arial" role="SKIP">
3385
+ <fo:table-cell xsl:use-attribute-sets="toc-title-page-style">
3409
3386
  <fo:block role="Caption">
3410
3387
  <xsl:variable name="page">
3411
3388
  <xsl:call-template name="getLocalizedString">
@@ -9067,6 +9044,16 @@
9067
9044
  </xsl:variable>
9068
9045
  <xsl:variable name="quot">"</xsl:variable>
9069
9046
  <xsl:variable name="styles_">
9047
+ <!-- PDF: Borderless tables https://github.com/metanorma/metanorma-jis/issues/344 -->
9048
+ <xsl:if test="@plain = 'true' or ancestor::mn:table/@plain = 'true'">
9049
+ <style name="border-top">none</style>
9050
+ <style name="border-right">none</style>
9051
+ <style name="border-left">none</style>
9052
+ <style name="border-bottom">none</style>
9053
+ <style name="color">inherit</style>
9054
+ <style name="background-color">transparent</style>
9055
+ </xsl:if>
9056
+
9070
9057
  <xsl:for-each select="xalan:nodeset($styles__)/mnx:item">
9071
9058
  <xsl:variable name="key" select="normalize-space(substring-before(., ':'))"/>
9072
9059
  <xsl:variable name="value" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
@@ -11085,7 +11072,10 @@
11085
11072
 
11086
11073
  <xsl:call-template name="setNamedDestination"/>
11087
11074
 
11088
- <fo:block-container id="{@id}" xsl:use-attribute-sets="note-style" role="SKIP">
11075
+ <fo:block-container xsl:use-attribute-sets="note-style" role="SKIP">
11076
+ <xsl:if test="not(parent::mn:references)">
11077
+ <xsl:copy-of select="@id"/>
11078
+ </xsl:if>
11089
11079
 
11090
11080
  <xsl:call-template name="setBlockSpanAll"/>
11091
11081
 
@@ -13818,8 +13808,8 @@
13818
13808
  </xsl:template> <!-- bibitem -->
13819
13809
 
13820
13810
  <!-- Bibliography (non-normative references) -->
13821
- <xsl:template match="mn:references[not(@normative='true')]/mn:bibitem" name="bibitem_non_normative" priority="2">
13822
- <xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][self::mn:bibitem] and 1 = 1)"/> <!-- current bibiitem is non-first -->
13811
+ <xsl:template match="mn:references[not(@normative='true')]/mn:bibitem | mn:references[not(@normative='true')]/mn:note" name="bibitem_non_normative" priority="2">
13812
+ <xsl:param name="skip" select="normalize-space(preceding-sibling::*[not(self::mn:note)][1][self::mn:bibitem] and 1 = 1)"/> <!-- current bibiitem is non-first -->
13823
13813
  <!-- start BIPM bibitem processing -->
13824
13814
  <xsl:call-template name="setNamedDestination"/>
13825
13815
  <fo:list-block id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-list-style">
@@ -13871,7 +13861,7 @@
13871
13861
  </fo:list-item>
13872
13862
  </xsl:otherwise>
13873
13863
  </xsl:choose>
13874
- <xsl:apply-templates select="following-sibling::*[1][self::mn:bibitem]">
13864
+ <xsl:apply-templates select="following-sibling::*[1]"> <!-- [self::mn:bibitem] -->
13875
13865
  <xsl:with-param name="skip">false</xsl:with-param>
13876
13866
  </xsl:apply-templates>
13877
13867
  </xsl:template>
@@ -13888,8 +13878,26 @@
13888
13878
  </xsl:apply-templates>
13889
13879
  <xsl:apply-templates select="mn:formattedref"/>
13890
13880
  <!-- end bibitem processing -->
13881
+
13882
+ <xsl:call-template name="processBibliographyNote"/>
13891
13883
  </xsl:template> <!-- processBibitem (bibitem) -->
13892
13884
 
13885
+ <xsl:template name="processBibliographyNote">
13886
+ <xsl:if test="self::mn:note">
13887
+ <xsl:variable name="note_node">
13888
+ <xsl:element name="{local-name(..)}" namespace="{$namespace_full}"> <!-- save parent context node for determining styles -->
13889
+ <xsl:copy> <!-- skip @id -->
13890
+ <xsl:copy-of select="node()"/>
13891
+ </xsl:copy>
13892
+ </xsl:element>
13893
+ </xsl:variable>
13894
+ <!-- <xsl:for-each select="xalan:nodeset($note_node)//mn:note">
13895
+ <xsl:call-template name="note"/>
13896
+ </xsl:for-each> -->
13897
+ <xsl:call-template name="note"/>
13898
+ </xsl:if>
13899
+ </xsl:template>
13900
+
13893
13901
  <xsl:template match="mn:title" mode="title">
13894
13902
  <fo:inline><xsl:apply-templates/></fo:inline>
13895
13903
  </xsl:template>
@@ -14442,6 +14450,96 @@
14442
14450
  <!-- End Form's elements processing -->
14443
14451
  <!-- =================== -->
14444
14452
 
14453
+ <xsl:attribute-set name="toc-style">
14454
+ <xsl:attribute name="line-height">135%</xsl:attribute>
14455
+ </xsl:attribute-set>
14456
+
14457
+ <xsl:template name="refine_toc-style">
14458
+ </xsl:template>
14459
+
14460
+ <xsl:attribute-set name="toc-title-style">
14461
+ <xsl:attribute name="margin-left">-14mm</xsl:attribute>
14462
+ <xsl:attribute name="font-family">Arial</xsl:attribute>
14463
+ <xsl:attribute name="font-size">16pt</xsl:attribute>
14464
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
14465
+ <xsl:attribute name="text-align-last">justify</xsl:attribute>
14466
+ <xsl:attribute name="margin-bottom">82pt</xsl:attribute>
14467
+ <xsl:attribute name="role">H1</xsl:attribute>
14468
+ </xsl:attribute-set>
14469
+
14470
+ <xsl:attribute-set name="toc-title-page-style">
14471
+ <xsl:attribute name="text-align">right</xsl:attribute>
14472
+ <xsl:attribute name="font-size">9pt</xsl:attribute>
14473
+ <xsl:attribute name="font-family">Arial</xsl:attribute>
14474
+ <xsl:attribute name="role">SKIP</xsl:attribute>
14475
+ </xsl:attribute-set> <!-- toc-title-page-style -->
14476
+
14477
+ <xsl:attribute-set name="toc-item-block-style">
14478
+ </xsl:attribute-set>
14479
+
14480
+ <xsl:template name="refine_toc-item-block-style">
14481
+ </xsl:template>
14482
+
14483
+ <xsl:attribute-set name="toc-item-style">
14484
+ <xsl:attribute name="role">TOCI</xsl:attribute>
14485
+ </xsl:attribute-set> <!-- END: toc-item-style -->
14486
+
14487
+ <xsl:template name="refine_toc-item-style">
14488
+ <xsl:if test="@level = 1">
14489
+ <xsl:attribute name="font-family">Arial</xsl:attribute>
14490
+ <xsl:attribute name="font-size">10pt</xsl:attribute>
14491
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
14492
+ </xsl:if>
14493
+ <xsl:if test="@level &gt;= 2 and not(@parent = 'annex')">
14494
+ <xsl:attribute name="font-size">10.5pt</xsl:attribute>
14495
+ </xsl:if>
14496
+ <xsl:if test="@level = 2">
14497
+ <xsl:attribute name="margin-left">8mm</xsl:attribute>
14498
+ </xsl:if>
14499
+ <xsl:if test="@level &gt; 2">
14500
+ <xsl:attribute name="margin-left">9mm</xsl:attribute>
14501
+ </xsl:if>
14502
+ <xsl:if test="@level &gt;= 2 and @parent = 'annex'">
14503
+ <xsl:attribute name="font-family">Arial</xsl:attribute>
14504
+ <xsl:attribute name="font-size">8pt</xsl:attribute>
14505
+ <xsl:attribute name="margin-left">25mm</xsl:attribute>
14506
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
14507
+ </xsl:if>
14508
+ <xsl:if test="@type = 'index'">
14509
+ <xsl:attribute name="font-family">Arial</xsl:attribute>
14510
+ <xsl:attribute name="font-size">10pt</xsl:attribute>
14511
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
14512
+ <xsl:attribute name="space-before">14pt</xsl:attribute>
14513
+ </xsl:if>
14514
+ </xsl:template> <!-- END: refine_toc-item-style -->
14515
+
14516
+ <xsl:attribute-set name="toc-leader-style">
14517
+ </xsl:attribute-set> <!-- END: toc-leader-style -->
14518
+
14519
+ <xsl:attribute-set name="toc-pagenumber-style">
14520
+ <xsl:attribute name="font-family">Arial</xsl:attribute>
14521
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
14522
+ <xsl:attribute name="font-size">10pt</xsl:attribute>
14523
+ </xsl:attribute-set>
14524
+
14525
+ <!-- List of Figures, Tables -->
14526
+ <xsl:attribute-set name="toc-listof-title-style">
14527
+ <xsl:attribute name="font-family">Arial</xsl:attribute>
14528
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
14529
+ <xsl:attribute name="font-size">10pt</xsl:attribute>
14530
+ <xsl:attribute name="padding-top">14pt</xsl:attribute>
14531
+ <xsl:attribute name="padding-bottom">6pt</xsl:attribute>
14532
+ </xsl:attribute-set>
14533
+
14534
+ <xsl:attribute-set name="toc-listof-item-block-style">
14535
+ </xsl:attribute-set>
14536
+
14537
+ <xsl:attribute-set name="toc-listof-item-style">
14538
+ <xsl:attribute name="role">TOCI</xsl:attribute>
14539
+ <xsl:attribute name="font-size">10.5pt</xsl:attribute>
14540
+ <xsl:attribute name="margin-left">8mm</xsl:attribute>
14541
+ </xsl:attribute-set>
14542
+
14445
14543
  <xsl:template name="processPrefaceSectionsDefault_Contents">
14446
14544
  <xsl:variable name="nodes_preface_">
14447
14545
  <xsl:for-each select="/*/mn:preface/*[not(self::mn:note or self::mn:admonition or @type = 'toc')]">
data/lib/isodoc/bipm/bipm.guide.xsl CHANGED
@@ -1145,9 +1145,9 @@
1145
1145
 
1146
1146
  <fo:flow flow-name="xsl-region-body">
1147
1147
 
1148
- <fo:block-container margin-left="-14mm" margin-right="0mm">
1149
- <fo:block-container margin-left="0mm" margin-right="0mm">
1150
- <fo:block font-family="Arial" font-size="16pt" font-weight="bold" text-align-last="justify" margin-bottom="82pt" role="H1">
1148
+ <!-- <fo:block-container margin-left="-14mm" margin-right="0mm">
1149
+ <fo:block-container margin-left="0mm" margin-right="0mm"> -->
1150
+ <fo:block xsl:use-attribute-sets="toc-title-style">
1151
1151
  <fo:inline><xsl:value-of select="//mn:metanorma/mn:bibdata/mn:title[@language = $curr_lang and @type='title-main']"/></fo:inline>
1152
1152
  <fo:inline keep-together.within-line="always">
1153
1153
  <fo:leader leader-pattern="space"/>
@@ -1156,10 +1156,10 @@
1156
1156
  </fo:inline>
1157
1157
  </fo:inline>
1158
1158
  </fo:block>
1159
- </fo:block-container>
1160
- </fo:block-container>
1159
+ <!-- </fo:block-container>
1160
+ </fo:block-container> -->
1161
1161
 
1162
- <fo:block-container line-height="135%">
1162
+ <fo:block-container xsl:use-attribute-sets="toc-style">
1163
1163
  <fo:block role="TOC">
1164
1164
  <!-- <xsl:copy-of select="$contents"/> -->
1165
1165
 
@@ -1896,7 +1896,7 @@
1896
1896
 
1897
1897
  <xsl:template name="insertContentItem">
1898
1898
  <xsl:param name="keep-with-next"/>
1899
- <fo:table-row role="TOCI">
1899
+ <fo:table-row xsl:use-attribute-sets="toc-item-style">
1900
1900
  <xsl:if test="$keep-with-next = 'true'">
1901
1901
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
1902
1902
  </xsl:if>
@@ -1922,32 +1922,8 @@
1922
1922
  <xsl:attribute name="padding-bottom"><xsl:value-of select="normalize-space($space-after)"/></xsl:attribute>
1923
1923
  </xsl:if>
1924
1924
  <fo:block role="SKIP">
1925
- <xsl:if test="@level = 1">
1926
- <xsl:attribute name="font-family">Arial</xsl:attribute>
1927
- <xsl:attribute name="font-size">10pt</xsl:attribute>
1928
- <xsl:attribute name="font-weight">bold</xsl:attribute>
1929
- </xsl:if>
1930
- <xsl:if test="@level &gt;= 2 and not(@parent = 'annex')">
1931
- <xsl:attribute name="font-size">10.5pt</xsl:attribute>
1932
- </xsl:if>
1933
- <xsl:if test="@level = 2">
1934
- <xsl:attribute name="margin-left">8mm</xsl:attribute>
1935
- </xsl:if>
1936
- <xsl:if test="@level &gt; 2">
1937
- <xsl:attribute name="margin-left">9mm</xsl:attribute>
1938
- </xsl:if>
1939
- <xsl:if test="@level &gt;= 2 and @parent = 'annex'">
1940
- <xsl:attribute name="font-family">Arial</xsl:attribute>
1941
- <xsl:attribute name="font-size">8pt</xsl:attribute>
1942
- <xsl:attribute name="margin-left">25mm</xsl:attribute>
1943
- <xsl:attribute name="font-weight">bold</xsl:attribute>
1944
- </xsl:if>
1945
- <xsl:if test="@type = 'index'">
1946
- <xsl:attribute name="font-family">Arial</xsl:attribute>
1947
- <xsl:attribute name="font-size">10pt</xsl:attribute>
1948
- <xsl:attribute name="font-weight">bold</xsl:attribute>
1949
- <xsl:attribute name="space-before">14pt</xsl:attribute>
1950
- </xsl:if>
1925
+
1926
+ <xsl:call-template name="refine_toc-item-style"/>
1951
1927
 
1952
1928
  <fo:list-block role="SKIP">
1953
1929
  <xsl:attribute name="provisional-distance-between-starts">
@@ -1961,15 +1937,16 @@
1961
1937
  </xsl:attribute>
1962
1938
 
1963
1939
  <fo:list-item role="SKIP">
1940
+
1964
1941
  <fo:list-item-label end-indent="label-end()" role="SKIP">
1965
1942
  <fo:block role="SKIP">
1966
1943
  <xsl:if test="@level = 1 or (@level = 2 and not(@parent = 'annex'))">
1967
1944
  <xsl:value-of select="@section"/>
1968
1945
  <xsl:if test="normalize-space(@section) != '' and @type = 'annex'">.</xsl:if>
1969
1946
  </xsl:if>
1970
-
1971
1947
  </fo:block>
1972
1948
  </fo:list-item-label>
1949
+
1973
1950
  <fo:list-item-body start-indent="body-start()" role="SKIP">
1974
1951
  <fo:block role="SKIP">
1975
1952
  <xsl:if test="@level &gt;= 3">
@@ -2001,7 +1978,7 @@
2001
1978
  </xsl:if>
2002
1979
  <fo:block role="SKIP">
2003
1980
  <fo:basic-link internal-destination="{@id}" fox:alt-text="{mnx:title}" role="SKIP">
2004
- <fo:inline font-family="Arial" font-weight="bold" font-size="10pt" role="SKIP"><fo:wrapper role="artifact"><fo:page-number-citation ref-id="{@id}"/></fo:wrapper></fo:inline>
1981
+ <fo:inline xsl:use-attribute-sets="toc-pagenumber-style" role="SKIP"><fo:wrapper role="artifact"><fo:page-number-citation ref-id="{@id}"/></fo:wrapper></fo:inline>
2005
1982
  </fo:basic-link>
2006
1983
  </fo:block>
2007
1984
  </fo:table-cell>
@@ -2011,7 +1988,7 @@
2011
1988
  <xsl:template name="insertListOf_Title">
2012
1989
  <xsl:param name="title"/>
2013
1990
  <fo:table-row keep-with-next="always">
2014
- <fo:table-cell font-family="Arial" font-weight="bold" font-size="10pt" padding-top="14pt" padding-bottom="6pt">
1991
+ <fo:table-cell xsl:use-attribute-sets="toc-listof-title-style">
2015
1992
  <fo:block role="TOCI">
2016
1993
  <xsl:value-of select="$title"/>
2017
1994
  </fo:block>
@@ -2025,7 +2002,7 @@
2025
2002
  <xsl:template name="insertListOf_Item">
2026
2003
  <fo:table-row>
2027
2004
  <fo:table-cell>
2028
- <fo:block role="TOCI" font-size="10.5pt" margin-left="8mm">
2005
+ <fo:block xsl:use-attribute-sets="toc-listof-item-style">
2029
2006
  <fo:list-block provisional-distance-between-starts="8mm">
2030
2007
  <fo:list-item>
2031
2008
  <fo:list-item-label end-indent="label-end()">
@@ -2047,7 +2024,7 @@
2047
2024
  </fo:list-block>
2048
2025
  </fo:block>
2049
2026
  </fo:table-cell>
2050
- <fo:table-cell text-align="right" font-family="Arial" font-weight="bold" font-size="10pt">
2027
+ <fo:table-cell xsl:use-attribute-sets="toc-pagenumber-style" text-align="right">
2051
2028
  <fo:block>
2052
2029
  <fo:basic-link internal-destination="{@id}">
2053
2030
  <xsl:call-template name="setAltText">
@@ -3405,7 +3382,7 @@
3405
3382
  <fo:table-column column-width="100%"/>
3406
3383
  <fo:table-header role="SKIP">
3407
3384
  <fo:table-row font-weight="bold" role="SKIP">
3408
- <fo:table-cell text-align="right" font-size="9pt" font-family="Arial" role="SKIP">
3385
+ <fo:table-cell xsl:use-attribute-sets="toc-title-page-style">
3409
3386
  <fo:block role="Caption">
3410
3387
  <xsl:variable name="page">
3411
3388
  <xsl:call-template name="getLocalizedString">
@@ -9067,6 +9044,16 @@
9067
9044
  </xsl:variable>
9068
9045
  <xsl:variable name="quot">"</xsl:variable>
9069
9046
  <xsl:variable name="styles_">
9047
+ <!-- PDF: Borderless tables https://github.com/metanorma/metanorma-jis/issues/344 -->
9048
+ <xsl:if test="@plain = 'true' or ancestor::mn:table/@plain = 'true'">
9049
+ <style name="border-top">none</style>
9050
+ <style name="border-right">none</style>
9051
+ <style name="border-left">none</style>
9052
+ <style name="border-bottom">none</style>
9053
+ <style name="color">inherit</style>
9054
+ <style name="background-color">transparent</style>
9055
+ </xsl:if>
9056
+
9070
9057
  <xsl:for-each select="xalan:nodeset($styles__)/mnx:item">
9071
9058
  <xsl:variable name="key" select="normalize-space(substring-before(., ':'))"/>
9072
9059
  <xsl:variable name="value" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
@@ -11085,7 +11072,10 @@
11085
11072
 
11086
11073
  <xsl:call-template name="setNamedDestination"/>
11087
11074
 
11088
- <fo:block-container id="{@id}" xsl:use-attribute-sets="note-style" role="SKIP">
11075
+ <fo:block-container xsl:use-attribute-sets="note-style" role="SKIP">
11076
+ <xsl:if test="not(parent::mn:references)">
11077
+ <xsl:copy-of select="@id"/>
11078
+ </xsl:if>
11089
11079
 
11090
11080
  <xsl:call-template name="setBlockSpanAll"/>
11091
11081
 
@@ -13818,8 +13808,8 @@
13818
13808
  </xsl:template> <!-- bibitem -->
13819
13809
 
13820
13810
  <!-- Bibliography (non-normative references) -->
13821
- <xsl:template match="mn:references[not(@normative='true')]/mn:bibitem" name="bibitem_non_normative" priority="2">
13822
- <xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][self::mn:bibitem] and 1 = 1)"/> <!-- current bibiitem is non-first -->
13811
+ <xsl:template match="mn:references[not(@normative='true')]/mn:bibitem | mn:references[not(@normative='true')]/mn:note" name="bibitem_non_normative" priority="2">
13812
+ <xsl:param name="skip" select="normalize-space(preceding-sibling::*[not(self::mn:note)][1][self::mn:bibitem] and 1 = 1)"/> <!-- current bibiitem is non-first -->
13823
13813
  <!-- start BIPM bibitem processing -->
13824
13814
  <xsl:call-template name="setNamedDestination"/>
13825
13815
  <fo:list-block id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-list-style">
@@ -13871,7 +13861,7 @@
13871
13861
  </fo:list-item>
13872
13862
  </xsl:otherwise>
13873
13863
  </xsl:choose>
13874
- <xsl:apply-templates select="following-sibling::*[1][self::mn:bibitem]">
13864
+ <xsl:apply-templates select="following-sibling::*[1]"> <!-- [self::mn:bibitem] -->
13875
13865
  <xsl:with-param name="skip">false</xsl:with-param>
13876
13866
  </xsl:apply-templates>
13877
13867
  </xsl:template>
@@ -13888,8 +13878,26 @@
13888
13878
  </xsl:apply-templates>
13889
13879
  <xsl:apply-templates select="mn:formattedref"/>
13890
13880
  <!-- end bibitem processing -->
13881
+
13882
+ <xsl:call-template name="processBibliographyNote"/>
13891
13883
  </xsl:template> <!-- processBibitem (bibitem) -->
13892
13884
 
13885
+ <xsl:template name="processBibliographyNote">
13886
+ <xsl:if test="self::mn:note">
13887
+ <xsl:variable name="note_node">
13888
+ <xsl:element name="{local-name(..)}" namespace="{$namespace_full}"> <!-- save parent context node for determining styles -->
13889
+ <xsl:copy> <!-- skip @id -->
13890
+ <xsl:copy-of select="node()"/>
13891
+ </xsl:copy>
13892
+ </xsl:element>
13893
+ </xsl:variable>
13894
+ <!-- <xsl:for-each select="xalan:nodeset($note_node)//mn:note">
13895
+ <xsl:call-template name="note"/>
13896
+ </xsl:for-each> -->
13897
+ <xsl:call-template name="note"/>
13898
+ </xsl:if>
13899
+ </xsl:template>
13900
+
13893
13901
  <xsl:template match="mn:title" mode="title">
13894
13902
  <fo:inline><xsl:apply-templates/></fo:inline>
13895
13903
  </xsl:template>
@@ -14442,6 +14450,96 @@
14442
14450
  <!-- End Form's elements processing -->
14443
14451
  <!-- =================== -->
14444
14452
 
14453
+ <xsl:attribute-set name="toc-style">
14454
+ <xsl:attribute name="line-height">135%</xsl:attribute>
14455
+ </xsl:attribute-set>
14456
+
14457
+ <xsl:template name="refine_toc-style">
14458
+ </xsl:template>
14459
+
14460
+ <xsl:attribute-set name="toc-title-style">
14461
+ <xsl:attribute name="margin-left">-14mm</xsl:attribute>
14462
+ <xsl:attribute name="font-family">Arial</xsl:attribute>
14463
+ <xsl:attribute name="font-size">16pt</xsl:attribute>
14464
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
14465
+ <xsl:attribute name="text-align-last">justify</xsl:attribute>
14466
+ <xsl:attribute name="margin-bottom">82pt</xsl:attribute>
14467
+ <xsl:attribute name="role">H1</xsl:attribute>
14468
+ </xsl:attribute-set>
14469
+
14470
+ <xsl:attribute-set name="toc-title-page-style">
14471
+ <xsl:attribute name="text-align">right</xsl:attribute>
14472
+ <xsl:attribute name="font-size">9pt</xsl:attribute>
14473
+ <xsl:attribute name="font-family">Arial</xsl:attribute>
14474
+ <xsl:attribute name="role">SKIP</xsl:attribute>
14475
+ </xsl:attribute-set> <!-- toc-title-page-style -->
14476
+
14477
+ <xsl:attribute-set name="toc-item-block-style">
14478
+ </xsl:attribute-set>
14479
+
14480
+ <xsl:template name="refine_toc-item-block-style">
14481
+ </xsl:template>
14482
+
14483
+ <xsl:attribute-set name="toc-item-style">
14484
+ <xsl:attribute name="role">TOCI</xsl:attribute>
14485
+ </xsl:attribute-set> <!-- END: toc-item-style -->
14486
+
14487
+ <xsl:template name="refine_toc-item-style">
14488
+ <xsl:if test="@level = 1">
14489
+ <xsl:attribute name="font-family">Arial</xsl:attribute>
14490
+ <xsl:attribute name="font-size">10pt</xsl:attribute>
14491
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
14492
+ </xsl:if>
14493
+ <xsl:if test="@level &gt;= 2 and not(@parent = 'annex')">
14494
+ <xsl:attribute name="font-size">10.5pt</xsl:attribute>
14495
+ </xsl:if>
14496
+ <xsl:if test="@level = 2">
14497
+ <xsl:attribute name="margin-left">8mm</xsl:attribute>
14498
+ </xsl:if>
14499
+ <xsl:if test="@level &gt; 2">
14500
+ <xsl:attribute name="margin-left">9mm</xsl:attribute>
14501
+ </xsl:if>
14502
+ <xsl:if test="@level &gt;= 2 and @parent = 'annex'">
14503
+ <xsl:attribute name="font-family">Arial</xsl:attribute>
14504
+ <xsl:attribute name="font-size">8pt</xsl:attribute>
14505
+ <xsl:attribute name="margin-left">25mm</xsl:attribute>
14506
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
14507
+ </xsl:if>
14508
+ <xsl:if test="@type = 'index'">
14509
+ <xsl:attribute name="font-family">Arial</xsl:attribute>
14510
+ <xsl:attribute name="font-size">10pt</xsl:attribute>
14511
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
14512
+ <xsl:attribute name="space-before">14pt</xsl:attribute>
14513
+ </xsl:if>
14514
+ </xsl:template> <!-- END: refine_toc-item-style -->
14515
+
14516
+ <xsl:attribute-set name="toc-leader-style">
14517
+ </xsl:attribute-set> <!-- END: toc-leader-style -->
14518
+
14519
+ <xsl:attribute-set name="toc-pagenumber-style">
14520
+ <xsl:attribute name="font-family">Arial</xsl:attribute>
14521
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
14522
+ <xsl:attribute name="font-size">10pt</xsl:attribute>
14523
+ </xsl:attribute-set>
14524
+
14525
+ <!-- List of Figures, Tables -->
14526
+ <xsl:attribute-set name="toc-listof-title-style">
14527
+ <xsl:attribute name="font-family">Arial</xsl:attribute>
14528
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
14529
+ <xsl:attribute name="font-size">10pt</xsl:attribute>
14530
+ <xsl:attribute name="padding-top">14pt</xsl:attribute>
14531
+ <xsl:attribute name="padding-bottom">6pt</xsl:attribute>
14532
+ </xsl:attribute-set>
14533
+
14534
+ <xsl:attribute-set name="toc-listof-item-block-style">
14535
+ </xsl:attribute-set>
14536
+
14537
+ <xsl:attribute-set name="toc-listof-item-style">
14538
+ <xsl:attribute name="role">TOCI</xsl:attribute>
14539
+ <xsl:attribute name="font-size">10.5pt</xsl:attribute>
14540
+ <xsl:attribute name="margin-left">8mm</xsl:attribute>
14541
+ </xsl:attribute-set>
14542
+
14445
14543
  <xsl:template name="processPrefaceSectionsDefault_Contents">
14446
14544
  <xsl:variable name="nodes_preface_">
14447
14545
  <xsl:for-each select="/*/mn:preface/*[not(self::mn:note or self::mn:admonition or @type = 'toc')]">