metanorma-ogc 2.7.10 → 2.8.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 (24) hide show
  1. checksums.yaml +4 -4
  2. data/README.adoc +1 -1
  3. data/lib/isodoc/ogc/ogc.abstract-specification-topic.xsl +127 -37
  4. data/lib/isodoc/ogc/ogc.best-practice.xsl +127 -37
  5. data/lib/isodoc/ogc/ogc.change-request-supporting-document.xsl +127 -37
  6. data/lib/isodoc/ogc/ogc.community-practice.xsl +127 -37
  7. data/lib/isodoc/ogc/ogc.community-standard.xsl +127 -37
  8. data/lib/isodoc/ogc/ogc.discussion-paper.xsl +127 -37
  9. data/lib/isodoc/ogc/ogc.draft-standard.xsl +127 -37
  10. data/lib/isodoc/ogc/ogc.engineering-report.xsl +127 -37
  11. data/lib/isodoc/ogc/ogc.other.xsl +127 -37
  12. data/lib/isodoc/ogc/ogc.policy.xsl +127 -37
  13. data/lib/isodoc/ogc/ogc.reference-model.xsl +127 -37
  14. data/lib/isodoc/ogc/ogc.release-notes.xsl +127 -37
  15. data/lib/isodoc/ogc/ogc.standard.xsl +127 -37
  16. data/lib/isodoc/ogc/ogc.test-suite.xsl +127 -37
  17. data/lib/isodoc/ogc/ogc.user-guide.xsl +127 -37
  18. data/lib/isodoc/ogc/ogc.white-paper.xsl +113 -23
  19. data/lib/isodoc/ogc/presentation_sections.rb +3 -2
  20. data/lib/metanorma/ogc/basicdoc.rng +6 -6
  21. data/lib/metanorma/ogc/isodoc.rng +8 -60
  22. data/lib/metanorma/ogc/version.rb +1 -1
  23. data/metanorma-ogc.gemspec +1 -1
  24. metadata +3 -3
data/lib/isodoc/ogc/ogc.community-standard.xsl CHANGED
@@ -838,7 +838,7 @@
838
838
 
839
839
  <xsl:template name="insertListOf_Title">
840
840
  <xsl:param name="title"/>
841
- <fo:block-container margin-left="-18mm" keep-with-next="always" margin-bottom="10pt" space-before="36pt" role="SKIP">
841
+ <fo:block-container xsl:use-attribute-sets="toc-listof-title-style">
842
842
  <fo:block-container margin-left="0mm" role="H2">
843
843
  <xsl:call-template name="insertSectionTitle">
844
844
  <xsl:with-param name="title" select="$title"/>
@@ -848,7 +848,7 @@
848
848
  </xsl:template>
849
849
 
850
850
  <xsl:template name="insertListOf_Item">
851
- <fo:block text-align-last="justify" margin-top="2pt" role="TOCI">
851
+ <fo:block xsl:use-attribute-sets="toc-listof-item-style">
852
852
  <fo:basic-link internal-destination="{@id}">
853
853
  <xsl:call-template name="setAltText">
854
854
  <xsl:with-param name="value" select="@alt-text"/>
@@ -856,14 +856,14 @@
856
856
  <!-- <xsl:copy-of select="node()"/> -->
857
857
  <xsl:apply-templates select="." mode="contents"/>
858
858
  <fo:inline keep-together.within-line="always">
859
- <fo:leader leader-pattern="dots"/>
859
+ <fo:leader xsl:use-attribute-sets="toc-leader-style"/>
860
860
  <fo:page-number-citation ref-id="{@id}"/>
861
861
  </fo:inline>
862
862
  </fo:basic-link>
863
863
  </fo:block>
864
864
  </xsl:template>
865
865
 
866
- <xsl:template match="mn:preface//mn:clause[@type = 'toc']" priority="4">
866
+ <xsl:template match="mn:preface//mn:clause[@type = 'toc']" name="toc" priority="4">
867
867
  <fo:block color="{$color_text_title}">
868
868
 
869
869
  <xsl:apply-templates/>
@@ -874,16 +874,9 @@
874
874
  <fo:block role="TOC">
875
875
  <xsl:for-each select="$contents//mnx:item[@display = 'true' and normalize-space(@id) != '']">
876
876
 
877
- <fo:block role="TOCI">
878
- <xsl:if test="@level = 1">
879
- <xsl:attribute name="margin-top">14pt</xsl:attribute>
880
- </xsl:if>
881
- <xsl:if test="@level = 1 or @parent = 'annex'">
882
- <xsl:attribute name="font-size">12pt</xsl:attribute>
883
- </xsl:if>
884
- <xsl:if test="@level &gt;= 2"> <!-- and not(@parent = 'annex') -->
885
- <xsl:attribute name="font-size">10pt</xsl:attribute>
886
- </xsl:if>
877
+ <fo:block xsl:use-attribute-sets="toc-item-style">
878
+
879
+ <xsl:call-template name="refine_toc-item-style"/>
887
880
 
888
881
  <xsl:choose>
889
882
  <xsl:when test="@level = 1">
@@ -909,7 +902,7 @@
909
902
  <xsl:value-of select="java:toUpperCase(java:java.lang.String.new($sectionTitle))"/>
910
903
  <xsl:text> </xsl:text>
911
904
  <fo:inline keep-together.within-line="always">
912
- <fo:leader leader-pattern="dots"/>
905
+ <fo:leader xsl:use-attribute-sets="toc-leader-style"/>
913
906
  <fo:inline><fo:page-number-citation ref-id="{@id}"/></fo:inline>
914
907
  </fo:inline>
915
908
  </fo:basic-link>
@@ -935,7 +928,7 @@
935
928
  <xsl:apply-templates select="mnx:title"/>
936
929
  <xsl:text> </xsl:text>
937
930
  <fo:inline keep-together.within-line="always">
938
- <fo:leader leader-pattern="dots"/>
931
+ <fo:leader xsl:use-attribute-sets="toc-leader-style"/>
939
932
  <fo:inline><fo:page-number-citation ref-id="{@id}"/></fo:inline>
940
933
  </fo:inline>
941
934
  </fo:basic-link>
@@ -987,7 +980,7 @@
987
980
  <xsl:copy-of select="title/node()"/>
988
981
  <xsl:text> </xsl:text>
989
982
  <fo:inline keep-together.within-line="always">
990
- <fo:leader leader-pattern="dots"/>
983
+ <fo:leader xsl:use-attribute-sets="toc-leader-style"/>
991
984
  <fo:page-number-citation ref-id="{@id}"/>
992
985
  </fo:inline>
993
986
  </fo:basic-link>
@@ -1005,22 +998,17 @@
1005
998
  <xsl:template match="mn:preface//mn:clause[@type = 'toc']/mn:fmt-title" priority="3">
1006
999
  <xsl:variable name="title-toc">
1007
1000
  <xsl:apply-templates/>
1008
- <!-- <xsl:call-template name="getTitle">
1009
- <xsl:with-param name="name" select="'title-toc'"/>
1010
- </xsl:call-template> -->
1011
1001
  </xsl:variable>
1012
1002
 
1013
- <fo:block-container margin-left="-18mm">
1003
+ <fo:block-container margin-left="-18mm" margin-bottom="40pt">
1014
1004
  <fo:block-container margin-left="0mm">
1015
- <fo:block margin-bottom="40pt">
1016
- <fo:block font-size="33pt" margin-bottom="4pt" role="H1">
1017
- <xsl:call-template name="addLetterSpacing">
1018
- <xsl:with-param name="text" select="java:toUpperCase(java:java.lang.String.new($title-toc))"/>
1019
- <xsl:with-param name="letter-spacing" select="1.1"/>
1020
- </xsl:call-template>
1021
- </fo:block>
1022
- <xsl:call-template name="insertBigHorizontalLine"/>
1005
+ <fo:block xsl:use-attribute-sets="toc-title-style">
1006
+ <xsl:call-template name="addLetterSpacing">
1007
+ <xsl:with-param name="text" select="java:toUpperCase(java:java.lang.String.new($title-toc))"/>
1008
+ <xsl:with-param name="letter-spacing" select="1.1"/>
1009
+ </xsl:call-template>
1023
1010
  </fo:block>
1011
+ <xsl:call-template name="insertBigHorizontalLine"/>
1024
1012
  </fo:block-container>
1025
1013
  </fo:block-container>
1026
1014
  </xsl:template>
@@ -1967,7 +1955,7 @@
1967
1955
  </xsl:template>
1968
1956
 
1969
1957
  <xsl:template name="insertFootnoteSeparator">
1970
- <fo:static-content flow-name="xsl-footnote-separator">
1958
+ <fo:static-content flow-name="xsl-footnote-separator" role="artifact">
1971
1959
  <fo:block>
1972
1960
  <fo:leader leader-pattern="rule" leader-length="20%" color="{$color_design}"/>
1973
1961
  </fo:block>
@@ -7065,6 +7053,16 @@
7065
7053
  </xsl:variable>
7066
7054
  <xsl:variable name="quot">"</xsl:variable>
7067
7055
  <xsl:variable name="styles_">
7056
+ <!-- PDF: Borderless tables https://github.com/metanorma/metanorma-jis/issues/344 -->
7057
+ <xsl:if test="@plain = 'true' or ancestor::mn:table/@plain = 'true'">
7058
+ <style name="border-top">none</style>
7059
+ <style name="border-right">none</style>
7060
+ <style name="border-left">none</style>
7061
+ <style name="border-bottom">none</style>
7062
+ <style name="color">inherit</style>
7063
+ <style name="background-color">transparent</style>
7064
+ </xsl:if>
7065
+
7068
7066
  <xsl:for-each select="xalan:nodeset($styles__)/mnx:item">
7069
7067
  <xsl:variable name="key" select="normalize-space(substring-before(., ':'))"/>
7070
7068
  <xsl:variable name="value" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
@@ -9089,7 +9087,10 @@
9089
9087
 
9090
9088
  <xsl:call-template name="setNamedDestination"/>
9091
9089
 
9092
- <fo:block-container id="{@id}" xsl:use-attribute-sets="note-style" role="SKIP">
9090
+ <fo:block-container xsl:use-attribute-sets="note-style" role="SKIP">
9091
+ <xsl:if test="not(parent::mn:references)">
9092
+ <xsl:copy-of select="@id"/>
9093
+ </xsl:if>
9093
9094
 
9094
9095
  <xsl:call-template name="setBlockSpanAll"/>
9095
9096
 
@@ -11546,7 +11547,7 @@
11546
11547
 
11547
11548
  <xsl:template name="insertFootnoteSeparatorCommon">
11548
11549
  <xsl:param name="leader_length">30%</xsl:param>
11549
- <fo:static-content flow-name="xsl-footnote-separator">
11550
+ <fo:static-content flow-name="xsl-footnote-separator" role="artifact">
11550
11551
  <fo:block>
11551
11552
  <fo:leader leader-pattern="rule" leader-length="{$leader_length}"/>
11552
11553
  </fo:block>
@@ -11789,8 +11790,8 @@
11789
11790
  </xsl:template> <!-- bibitem -->
11790
11791
 
11791
11792
  <!-- Bibliography (non-normative references) -->
11792
- <xsl:template match="mn:references[not(@normative='true')]/mn:bibitem" name="bibitem_non_normative" priority="2">
11793
- <xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][self::mn:bibitem] and 1 = 1)"/> <!-- current bibiitem is non-first --> <!-- $namespace = 'csd' or $namespace = 'gb' or $namespace = 'iec' or $namespace = 'ieee' or $namespace = 'iso' or $namespace = 'jcgm' or $namespace = 'm3d' or
11793
+ <xsl:template match="mn:references[not(@normative='true')]/mn:bibitem | mn:references[not(@normative='true')]/mn:note" name="bibitem_non_normative" priority="2">
11794
+ <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 --> <!-- $namespace = 'csd' or $namespace = 'gb' or $namespace = 'iec' or $namespace = 'ieee' or $namespace = 'iso' or $namespace = 'jcgm' or $namespace = 'm3d' or
11794
11795
  $namespace = 'mpfd' or $namespace = 'ogc' or $namespace = 'ogc-white-paper' -->
11795
11796
  <!-- Example: [1] ISO 9:1995, Information and documentation – Transliteration of Cyrillic characters into Latin characters – Slavic and non-Slavic languages -->
11796
11797
  <xsl:call-template name="setNamedDestination"/>
@@ -11842,7 +11843,7 @@
11842
11843
  </fo:list-item>
11843
11844
  </xsl:otherwise>
11844
11845
  </xsl:choose>
11845
- <xsl:apply-templates select="following-sibling::*[1][self::mn:bibitem]">
11846
+ <xsl:apply-templates select="following-sibling::*[1]"> <!-- [self::mn:bibitem] -->
11846
11847
  <xsl:with-param name="skip">false</xsl:with-param>
11847
11848
  </xsl:apply-templates>
11848
11849
  </xsl:template>
@@ -11859,8 +11860,26 @@
11859
11860
  </xsl:apply-templates>
11860
11861
  <xsl:apply-templates select="mn:formattedref"/>
11861
11862
  <!-- end bibitem processing -->
11863
+
11864
+ <xsl:call-template name="processBibliographyNote"/>
11862
11865
  </xsl:template> <!-- processBibitem (bibitem) -->
11863
11866
 
11867
+ <xsl:template name="processBibliographyNote">
11868
+ <xsl:if test="self::mn:note">
11869
+ <xsl:variable name="note_node">
11870
+ <xsl:element name="{local-name(..)}" namespace="{$namespace_full}"> <!-- save parent context node for determining styles -->
11871
+ <xsl:copy> <!-- skip @id -->
11872
+ <xsl:copy-of select="node()"/>
11873
+ </xsl:copy>
11874
+ </xsl:element>
11875
+ </xsl:variable>
11876
+ <!-- <xsl:for-each select="xalan:nodeset($note_node)//mn:note">
11877
+ <xsl:call-template name="note"/>
11878
+ </xsl:for-each> -->
11879
+ <xsl:call-template name="note"/>
11880
+ </xsl:if>
11881
+ </xsl:template>
11882
+
11864
11883
  <xsl:template match="mn:title" mode="title">
11865
11884
  <fo:inline><xsl:apply-templates/></fo:inline>
11866
11885
  </xsl:template>
@@ -12406,6 +12425,77 @@
12406
12425
  <!-- End Form's elements processing -->
12407
12426
  <!-- =================== -->
12408
12427
 
12428
+ <xsl:attribute-set name="toc-style">
12429
+ </xsl:attribute-set>
12430
+
12431
+ <xsl:template name="refine_toc-style">
12432
+ </xsl:template>
12433
+
12434
+ <xsl:attribute-set name="toc-title-style">
12435
+ <xsl:attribute name="font-size">33pt</xsl:attribute>
12436
+ <xsl:attribute name="margin-bottom">4pt</xsl:attribute>
12437
+ <xsl:attribute name="role">H1</xsl:attribute>
12438
+ </xsl:attribute-set>
12439
+
12440
+ <xsl:template name="refine_toc-title-style">
12441
+ </xsl:template>
12442
+
12443
+ <xsl:attribute-set name="toc-title-page-style">
12444
+ </xsl:attribute-set> <!-- toc-title-page-style -->
12445
+
12446
+ <xsl:template name="refine_toc-title-page-style">
12447
+ </xsl:template>
12448
+
12449
+ <xsl:attribute-set name="toc-item-block-style">
12450
+ </xsl:attribute-set>
12451
+
12452
+ <xsl:template name="refine_toc-item-block-style">
12453
+ </xsl:template>
12454
+
12455
+ <xsl:attribute-set name="toc-item-style">
12456
+ <xsl:attribute name="role">TOCI</xsl:attribute>
12457
+ </xsl:attribute-set> <!-- END: toc-item-style -->
12458
+
12459
+ <xsl:template name="refine_toc-item-style">
12460
+ <xsl:if test="@level = 1">
12461
+ <xsl:attribute name="margin-top">14pt</xsl:attribute>
12462
+ </xsl:if>
12463
+ <xsl:if test="@level = 1 or @parent = 'annex'">
12464
+ <xsl:attribute name="font-size">12pt</xsl:attribute>
12465
+ </xsl:if>
12466
+ <xsl:if test="@level &gt;= 2"> <!-- and not(@parent = 'annex') -->
12467
+ <xsl:attribute name="font-size">10pt</xsl:attribute>
12468
+ </xsl:if>
12469
+ </xsl:template> <!-- END: refine_toc-item-style -->
12470
+
12471
+ <xsl:attribute-set name="toc-leader-style">
12472
+ <xsl:attribute name="leader-pattern">dots</xsl:attribute>
12473
+ </xsl:attribute-set> <!-- END: toc-leader-style -->
12474
+
12475
+ <xsl:attribute-set name="toc-pagenumber-style">
12476
+ </xsl:attribute-set>
12477
+
12478
+ <!-- List of Figures, Tables -->
12479
+ <xsl:attribute-set name="toc-listof-title-style">
12480
+ <xsl:attribute name="margin-left">-18mm</xsl:attribute>
12481
+ <xsl:attribute name="keep-with-next">always</xsl:attribute>
12482
+ <xsl:attribute name="margin-bottom">10pt</xsl:attribute>
12483
+ <xsl:attribute name="space-before">36pt</xsl:attribute>
12484
+ <xsl:attribute name="role">SKIP</xsl:attribute>
12485
+ </xsl:attribute-set>
12486
+
12487
+ <xsl:template name="refine_toc-listof-title-style">
12488
+ </xsl:template>
12489
+
12490
+ <xsl:attribute-set name="toc-listof-item-block-style">
12491
+ </xsl:attribute-set>
12492
+
12493
+ <xsl:attribute-set name="toc-listof-item-style">
12494
+ <xsl:attribute name="role">TOCI</xsl:attribute>
12495
+ <xsl:attribute name="text-align-last">justify</xsl:attribute>
12496
+ <xsl:attribute name="margin-top">2pt</xsl:attribute>
12497
+ </xsl:attribute-set>
12498
+
12409
12499
  <xsl:template name="processPrefaceSectionsDefault_Contents">
12410
12500
  <xsl:variable name="nodes_preface_">
12411
12501
  <xsl:for-each select="/*/mn:preface/*[not(self::mn:note or self::mn:admonition or @type = 'toc')]">
@@ -12743,7 +12833,7 @@
12743
12833
  </xsl:if>
12744
12834
 
12745
12835
  <xsl:for-each select="$contents_nodes/mnx:doc">
12746
- <fo:bookmark internal-destination="{contents/mnx:item[@display = 'true'][1]/@id}" starting-state="hide">
12836
+ <fo:bookmark internal-destination="{mnx:contents/mnx:item[@display = 'true'][1]/@id}" starting-state="hide">
12747
12837
  <xsl:if test="@bundle = 'true'">
12748
12838
  <xsl:attribute name="internal-destination"><xsl:value-of select="@firstpage_id"/></xsl:attribute>
12749
12839
  </xsl:if>
@@ -12777,7 +12867,7 @@
12777
12867
  </xsl:choose>
12778
12868
  </fo:bookmark-title>
12779
12869
 
12780
- <xsl:apply-templates select="contents/mnx:item" mode="bookmark"/>
12870
+ <xsl:apply-templates select="mnx:contents/mnx:item" mode="bookmark"/>
12781
12871
 
12782
12872
  <xsl:call-template name="insertFigureBookmarks">
12783
12873
  <xsl:with-param name="contents" select="mnx:contents"/>
data/lib/isodoc/ogc/ogc.discussion-paper.xsl CHANGED
@@ -838,7 +838,7 @@
838
838
 
839
839
  <xsl:template name="insertListOf_Title">
840
840
  <xsl:param name="title"/>
841
- <fo:block-container margin-left="-18mm" keep-with-next="always" margin-bottom="10pt" space-before="36pt" role="SKIP">
841
+ <fo:block-container xsl:use-attribute-sets="toc-listof-title-style">
842
842
  <fo:block-container margin-left="0mm" role="H2">
843
843
  <xsl:call-template name="insertSectionTitle">
844
844
  <xsl:with-param name="title" select="$title"/>
@@ -848,7 +848,7 @@
848
848
  </xsl:template>
849
849
 
850
850
  <xsl:template name="insertListOf_Item">
851
- <fo:block text-align-last="justify" margin-top="2pt" role="TOCI">
851
+ <fo:block xsl:use-attribute-sets="toc-listof-item-style">
852
852
  <fo:basic-link internal-destination="{@id}">
853
853
  <xsl:call-template name="setAltText">
854
854
  <xsl:with-param name="value" select="@alt-text"/>
@@ -856,14 +856,14 @@
856
856
  <!-- <xsl:copy-of select="node()"/> -->
857
857
  <xsl:apply-templates select="." mode="contents"/>
858
858
  <fo:inline keep-together.within-line="always">
859
- <fo:leader leader-pattern="dots"/>
859
+ <fo:leader xsl:use-attribute-sets="toc-leader-style"/>
860
860
  <fo:page-number-citation ref-id="{@id}"/>
861
861
  </fo:inline>
862
862
  </fo:basic-link>
863
863
  </fo:block>
864
864
  </xsl:template>
865
865
 
866
- <xsl:template match="mn:preface//mn:clause[@type = 'toc']" priority="4">
866
+ <xsl:template match="mn:preface//mn:clause[@type = 'toc']" name="toc" priority="4">
867
867
  <fo:block color="{$color_text_title}">
868
868
 
869
869
  <xsl:apply-templates/>
@@ -874,16 +874,9 @@
874
874
  <fo:block role="TOC">
875
875
  <xsl:for-each select="$contents//mnx:item[@display = 'true' and normalize-space(@id) != '']">
876
876
 
877
- <fo:block role="TOCI">
878
- <xsl:if test="@level = 1">
879
- <xsl:attribute name="margin-top">14pt</xsl:attribute>
880
- </xsl:if>
881
- <xsl:if test="@level = 1 or @parent = 'annex'">
882
- <xsl:attribute name="font-size">12pt</xsl:attribute>
883
- </xsl:if>
884
- <xsl:if test="@level &gt;= 2"> <!-- and not(@parent = 'annex') -->
885
- <xsl:attribute name="font-size">10pt</xsl:attribute>
886
- </xsl:if>
877
+ <fo:block xsl:use-attribute-sets="toc-item-style">
878
+
879
+ <xsl:call-template name="refine_toc-item-style"/>
887
880
 
888
881
  <xsl:choose>
889
882
  <xsl:when test="@level = 1">
@@ -909,7 +902,7 @@
909
902
  <xsl:value-of select="java:toUpperCase(java:java.lang.String.new($sectionTitle))"/>
910
903
  <xsl:text> </xsl:text>
911
904
  <fo:inline keep-together.within-line="always">
912
- <fo:leader leader-pattern="dots"/>
905
+ <fo:leader xsl:use-attribute-sets="toc-leader-style"/>
913
906
  <fo:inline><fo:page-number-citation ref-id="{@id}"/></fo:inline>
914
907
  </fo:inline>
915
908
  </fo:basic-link>
@@ -935,7 +928,7 @@
935
928
  <xsl:apply-templates select="mnx:title"/>
936
929
  <xsl:text> </xsl:text>
937
930
  <fo:inline keep-together.within-line="always">
938
- <fo:leader leader-pattern="dots"/>
931
+ <fo:leader xsl:use-attribute-sets="toc-leader-style"/>
939
932
  <fo:inline><fo:page-number-citation ref-id="{@id}"/></fo:inline>
940
933
  </fo:inline>
941
934
  </fo:basic-link>
@@ -987,7 +980,7 @@
987
980
  <xsl:copy-of select="title/node()"/>
988
981
  <xsl:text> </xsl:text>
989
982
  <fo:inline keep-together.within-line="always">
990
- <fo:leader leader-pattern="dots"/>
983
+ <fo:leader xsl:use-attribute-sets="toc-leader-style"/>
991
984
  <fo:page-number-citation ref-id="{@id}"/>
992
985
  </fo:inline>
993
986
  </fo:basic-link>
@@ -1005,22 +998,17 @@
1005
998
  <xsl:template match="mn:preface//mn:clause[@type = 'toc']/mn:fmt-title" priority="3">
1006
999
  <xsl:variable name="title-toc">
1007
1000
  <xsl:apply-templates/>
1008
- <!-- <xsl:call-template name="getTitle">
1009
- <xsl:with-param name="name" select="'title-toc'"/>
1010
- </xsl:call-template> -->
1011
1001
  </xsl:variable>
1012
1002
 
1013
- <fo:block-container margin-left="-18mm">
1003
+ <fo:block-container margin-left="-18mm" margin-bottom="40pt">
1014
1004
  <fo:block-container margin-left="0mm">
1015
- <fo:block margin-bottom="40pt">
1016
- <fo:block font-size="33pt" margin-bottom="4pt" role="H1">
1017
- <xsl:call-template name="addLetterSpacing">
1018
- <xsl:with-param name="text" select="java:toUpperCase(java:java.lang.String.new($title-toc))"/>
1019
- <xsl:with-param name="letter-spacing" select="1.1"/>
1020
- </xsl:call-template>
1021
- </fo:block>
1022
- <xsl:call-template name="insertBigHorizontalLine"/>
1005
+ <fo:block xsl:use-attribute-sets="toc-title-style">
1006
+ <xsl:call-template name="addLetterSpacing">
1007
+ <xsl:with-param name="text" select="java:toUpperCase(java:java.lang.String.new($title-toc))"/>
1008
+ <xsl:with-param name="letter-spacing" select="1.1"/>
1009
+ </xsl:call-template>
1023
1010
  </fo:block>
1011
+ <xsl:call-template name="insertBigHorizontalLine"/>
1024
1012
  </fo:block-container>
1025
1013
  </fo:block-container>
1026
1014
  </xsl:template>
@@ -1967,7 +1955,7 @@
1967
1955
  </xsl:template>
1968
1956
 
1969
1957
  <xsl:template name="insertFootnoteSeparator">
1970
- <fo:static-content flow-name="xsl-footnote-separator">
1958
+ <fo:static-content flow-name="xsl-footnote-separator" role="artifact">
1971
1959
  <fo:block>
1972
1960
  <fo:leader leader-pattern="rule" leader-length="20%" color="{$color_design}"/>
1973
1961
  </fo:block>
@@ -7065,6 +7053,16 @@
7065
7053
  </xsl:variable>
7066
7054
  <xsl:variable name="quot">"</xsl:variable>
7067
7055
  <xsl:variable name="styles_">
7056
+ <!-- PDF: Borderless tables https://github.com/metanorma/metanorma-jis/issues/344 -->
7057
+ <xsl:if test="@plain = 'true' or ancestor::mn:table/@plain = 'true'">
7058
+ <style name="border-top">none</style>
7059
+ <style name="border-right">none</style>
7060
+ <style name="border-left">none</style>
7061
+ <style name="border-bottom">none</style>
7062
+ <style name="color">inherit</style>
7063
+ <style name="background-color">transparent</style>
7064
+ </xsl:if>
7065
+
7068
7066
  <xsl:for-each select="xalan:nodeset($styles__)/mnx:item">
7069
7067
  <xsl:variable name="key" select="normalize-space(substring-before(., ':'))"/>
7070
7068
  <xsl:variable name="value" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
@@ -9089,7 +9087,10 @@
9089
9087
 
9090
9088
  <xsl:call-template name="setNamedDestination"/>
9091
9089
 
9092
- <fo:block-container id="{@id}" xsl:use-attribute-sets="note-style" role="SKIP">
9090
+ <fo:block-container xsl:use-attribute-sets="note-style" role="SKIP">
9091
+ <xsl:if test="not(parent::mn:references)">
9092
+ <xsl:copy-of select="@id"/>
9093
+ </xsl:if>
9093
9094
 
9094
9095
  <xsl:call-template name="setBlockSpanAll"/>
9095
9096
 
@@ -11546,7 +11547,7 @@
11546
11547
 
11547
11548
  <xsl:template name="insertFootnoteSeparatorCommon">
11548
11549
  <xsl:param name="leader_length">30%</xsl:param>
11549
- <fo:static-content flow-name="xsl-footnote-separator">
11550
+ <fo:static-content flow-name="xsl-footnote-separator" role="artifact">
11550
11551
  <fo:block>
11551
11552
  <fo:leader leader-pattern="rule" leader-length="{$leader_length}"/>
11552
11553
  </fo:block>
@@ -11789,8 +11790,8 @@
11789
11790
  </xsl:template> <!-- bibitem -->
11790
11791
 
11791
11792
  <!-- Bibliography (non-normative references) -->
11792
- <xsl:template match="mn:references[not(@normative='true')]/mn:bibitem" name="bibitem_non_normative" priority="2">
11793
- <xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][self::mn:bibitem] and 1 = 1)"/> <!-- current bibiitem is non-first --> <!-- $namespace = 'csd' or $namespace = 'gb' or $namespace = 'iec' or $namespace = 'ieee' or $namespace = 'iso' or $namespace = 'jcgm' or $namespace = 'm3d' or
11793
+ <xsl:template match="mn:references[not(@normative='true')]/mn:bibitem | mn:references[not(@normative='true')]/mn:note" name="bibitem_non_normative" priority="2">
11794
+ <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 --> <!-- $namespace = 'csd' or $namespace = 'gb' or $namespace = 'iec' or $namespace = 'ieee' or $namespace = 'iso' or $namespace = 'jcgm' or $namespace = 'm3d' or
11794
11795
  $namespace = 'mpfd' or $namespace = 'ogc' or $namespace = 'ogc-white-paper' -->
11795
11796
  <!-- Example: [1] ISO 9:1995, Information and documentation – Transliteration of Cyrillic characters into Latin characters – Slavic and non-Slavic languages -->
11796
11797
  <xsl:call-template name="setNamedDestination"/>
@@ -11842,7 +11843,7 @@
11842
11843
  </fo:list-item>
11843
11844
  </xsl:otherwise>
11844
11845
  </xsl:choose>
11845
- <xsl:apply-templates select="following-sibling::*[1][self::mn:bibitem]">
11846
+ <xsl:apply-templates select="following-sibling::*[1]"> <!-- [self::mn:bibitem] -->
11846
11847
  <xsl:with-param name="skip">false</xsl:with-param>
11847
11848
  </xsl:apply-templates>
11848
11849
  </xsl:template>
@@ -11859,8 +11860,26 @@
11859
11860
  </xsl:apply-templates>
11860
11861
  <xsl:apply-templates select="mn:formattedref"/>
11861
11862
  <!-- end bibitem processing -->
11863
+
11864
+ <xsl:call-template name="processBibliographyNote"/>
11862
11865
  </xsl:template> <!-- processBibitem (bibitem) -->
11863
11866
 
11867
+ <xsl:template name="processBibliographyNote">
11868
+ <xsl:if test="self::mn:note">
11869
+ <xsl:variable name="note_node">
11870
+ <xsl:element name="{local-name(..)}" namespace="{$namespace_full}"> <!-- save parent context node for determining styles -->
11871
+ <xsl:copy> <!-- skip @id -->
11872
+ <xsl:copy-of select="node()"/>
11873
+ </xsl:copy>
11874
+ </xsl:element>
11875
+ </xsl:variable>
11876
+ <!-- <xsl:for-each select="xalan:nodeset($note_node)//mn:note">
11877
+ <xsl:call-template name="note"/>
11878
+ </xsl:for-each> -->
11879
+ <xsl:call-template name="note"/>
11880
+ </xsl:if>
11881
+ </xsl:template>
11882
+
11864
11883
  <xsl:template match="mn:title" mode="title">
11865
11884
  <fo:inline><xsl:apply-templates/></fo:inline>
11866
11885
  </xsl:template>
@@ -12406,6 +12425,77 @@
12406
12425
  <!-- End Form's elements processing -->
12407
12426
  <!-- =================== -->
12408
12427
 
12428
+ <xsl:attribute-set name="toc-style">
12429
+ </xsl:attribute-set>
12430
+
12431
+ <xsl:template name="refine_toc-style">
12432
+ </xsl:template>
12433
+
12434
+ <xsl:attribute-set name="toc-title-style">
12435
+ <xsl:attribute name="font-size">33pt</xsl:attribute>
12436
+ <xsl:attribute name="margin-bottom">4pt</xsl:attribute>
12437
+ <xsl:attribute name="role">H1</xsl:attribute>
12438
+ </xsl:attribute-set>
12439
+
12440
+ <xsl:template name="refine_toc-title-style">
12441
+ </xsl:template>
12442
+
12443
+ <xsl:attribute-set name="toc-title-page-style">
12444
+ </xsl:attribute-set> <!-- toc-title-page-style -->
12445
+
12446
+ <xsl:template name="refine_toc-title-page-style">
12447
+ </xsl:template>
12448
+
12449
+ <xsl:attribute-set name="toc-item-block-style">
12450
+ </xsl:attribute-set>
12451
+
12452
+ <xsl:template name="refine_toc-item-block-style">
12453
+ </xsl:template>
12454
+
12455
+ <xsl:attribute-set name="toc-item-style">
12456
+ <xsl:attribute name="role">TOCI</xsl:attribute>
12457
+ </xsl:attribute-set> <!-- END: toc-item-style -->
12458
+
12459
+ <xsl:template name="refine_toc-item-style">
12460
+ <xsl:if test="@level = 1">
12461
+ <xsl:attribute name="margin-top">14pt</xsl:attribute>
12462
+ </xsl:if>
12463
+ <xsl:if test="@level = 1 or @parent = 'annex'">
12464
+ <xsl:attribute name="font-size">12pt</xsl:attribute>
12465
+ </xsl:if>
12466
+ <xsl:if test="@level &gt;= 2"> <!-- and not(@parent = 'annex') -->
12467
+ <xsl:attribute name="font-size">10pt</xsl:attribute>
12468
+ </xsl:if>
12469
+ </xsl:template> <!-- END: refine_toc-item-style -->
12470
+
12471
+ <xsl:attribute-set name="toc-leader-style">
12472
+ <xsl:attribute name="leader-pattern">dots</xsl:attribute>
12473
+ </xsl:attribute-set> <!-- END: toc-leader-style -->
12474
+
12475
+ <xsl:attribute-set name="toc-pagenumber-style">
12476
+ </xsl:attribute-set>
12477
+
12478
+ <!-- List of Figures, Tables -->
12479
+ <xsl:attribute-set name="toc-listof-title-style">
12480
+ <xsl:attribute name="margin-left">-18mm</xsl:attribute>
12481
+ <xsl:attribute name="keep-with-next">always</xsl:attribute>
12482
+ <xsl:attribute name="margin-bottom">10pt</xsl:attribute>
12483
+ <xsl:attribute name="space-before">36pt</xsl:attribute>
12484
+ <xsl:attribute name="role">SKIP</xsl:attribute>
12485
+ </xsl:attribute-set>
12486
+
12487
+ <xsl:template name="refine_toc-listof-title-style">
12488
+ </xsl:template>
12489
+
12490
+ <xsl:attribute-set name="toc-listof-item-block-style">
12491
+ </xsl:attribute-set>
12492
+
12493
+ <xsl:attribute-set name="toc-listof-item-style">
12494
+ <xsl:attribute name="role">TOCI</xsl:attribute>
12495
+ <xsl:attribute name="text-align-last">justify</xsl:attribute>
12496
+ <xsl:attribute name="margin-top">2pt</xsl:attribute>
12497
+ </xsl:attribute-set>
12498
+
12409
12499
  <xsl:template name="processPrefaceSectionsDefault_Contents">
12410
12500
  <xsl:variable name="nodes_preface_">
12411
12501
  <xsl:for-each select="/*/mn:preface/*[not(self::mn:note or self::mn:admonition or @type = 'toc')]">
@@ -12743,7 +12833,7 @@
12743
12833
  </xsl:if>
12744
12834
 
12745
12835
  <xsl:for-each select="$contents_nodes/mnx:doc">
12746
- <fo:bookmark internal-destination="{contents/mnx:item[@display = 'true'][1]/@id}" starting-state="hide">
12836
+ <fo:bookmark internal-destination="{mnx:contents/mnx:item[@display = 'true'][1]/@id}" starting-state="hide">
12747
12837
  <xsl:if test="@bundle = 'true'">
12748
12838
  <xsl:attribute name="internal-destination"><xsl:value-of select="@firstpage_id"/></xsl:attribute>
12749
12839
  </xsl:if>
@@ -12777,7 +12867,7 @@
12777
12867
  </xsl:choose>
12778
12868
  </fo:bookmark-title>
12779
12869
 
12780
- <xsl:apply-templates select="contents/mnx:item" mode="bookmark"/>
12870
+ <xsl:apply-templates select="mnx:contents/mnx:item" mode="bookmark"/>
12781
12871
 
12782
12872
  <xsl:call-template name="insertFigureBookmarks">
12783
12873
  <xsl:with-param name="contents" select="mnx:contents"/>