metanorma-iho 1.2.1 → 1.2.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. checksums.yaml +4 -4
  2. data/README.adoc +1 -1
  3. data/lib/isodoc/iho/iho.specification.xsl +75 -42
  4. data/lib/isodoc/iho/iho.standard.xsl +75 -42
  5. data/lib/metanorma/iho/basicdoc.rng +1 -1
  6. data/lib/metanorma/iho/isodoc.rng +1 -59
  7. data/lib/metanorma/iho/version.rb +1 -1
  8. data/metanorma-iho.gemspec +1 -1
  9. metadata +3 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: de5b87c7f048d73869e48dc8d13e8ee88c157b61e7918451d08aeff9fbcf9de5
4
- data.tar.gz: d0c0a3cd504f0237963e8229017d50ecbd115f00d1c5271b35d47f9f776163ff
3
+ metadata.gz: 2df05b7790e02fb4929bd6ce176e09c0ee52f96b7dc7ddc9d3846f0b38c2f2b5
4
+ data.tar.gz: e4cb99c1d3318dfa11ce21bdd1d90708cda57707ca11c83d0f3e15449161aaf9
5
5
  SHA512:
6
- metadata.gz: abf166b6da0b2b9164bf5ed37d2a11704134f59e5b8abf78b23970dfa8349b97830bb6180f39d820bc569e38d643b3b97bd4b385ee1583429a65f1344fdcac0a
7
- data.tar.gz: afc91a749a3fb3abb5d21aa2428f8699c7883448b057c678287c7703c731671a1dbe0f9d2aee4608339fd393f79480f145484a24a765bfd16fd85cad3cbe0f85
6
+ metadata.gz: 9850ce72a8bd8c9b6e20903cce0362966a06f0122410d80eee03017b1bda19cc72c0c5962506d8ca1790e0ec797c7adeb763e7d08b5c0ed20ccf78d6f5117e7b
7
+ data.tar.gz: 169911f45d356bd0f03148cc295a01a525daa19efe41f86475f09a01a639a6f9b682dc3afa215a03155960c2d1f249de2f7d8ea72e845c89ff549f277664ab3f
data/README.adoc CHANGED
@@ -2,7 +2,7 @@
2
2
 
3
3
  image:https://img.shields.io/gem/v/metanorma-iho.svg["Gem Version", link="https://rubygems.org/gems/metanorma-iho"]
4
4
  image:https://github.com/metanorma/metanorma-iso/workflows/rake/badge.svg["Build Status", link="https://github.com/metanorma/metanorma-iso/actions?workflow=rake"]
5
- image:https://codeclimate.com/github/metanorma/metanorma-iho/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/metanorma/metanorma-iho"]
5
+ // image:https://codeclimate.com/github/metanorma/metanorma-iho/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/metanorma/metanorma-iho"]
6
6
  image:https://img.shields.io/github/issues-pr-raw/metanorma/metanorma-iho.svg["Pull Requests", link="https://github.com/metanorma/metanorma-iho/pulls"]
7
7
  image:https://img.shields.io/github/commits-since/metanorma/metanorma-iho/latest.svg["Commits since latest",link="https://github.com/metanorma/metanorma-iho/releases"]
8
8
 
data/lib/isodoc/iho/iho.specification.xsl CHANGED
@@ -548,20 +548,20 @@
548
548
 
549
549
  <xsl:template name="insertListOf_Title">
550
550
  <xsl:param name="title"/>
551
- <fo:block role="TOCI" font-weight="bold" margin-top="6pt" keep-with-next="always">
551
+ <fo:block xsl:use-attribute-sets="toc-listof-title-style">
552
552
  <xsl:value-of select="$title"/>
553
553
  </fo:block>
554
554
  </xsl:template>
555
555
 
556
556
  <xsl:template name="insertListOf_Item">
557
- <fo:block role="TOCI" text-align-last="justify" margin-left="12mm" text-indent="-12mm">
557
+ <fo:block xsl:use-attribute-sets="toc-listof-item-style">
558
558
  <fo:basic-link internal-destination="{@id}">
559
559
  <xsl:call-template name="setAltText">
560
560
  <xsl:with-param name="value" select="@alt-text"/>
561
561
  </xsl:call-template>
562
562
  <xsl:apply-templates select="." mode="contents"/>
563
563
  <fo:inline keep-together.within-line="always">
564
- <fo:leader font-size="9pt" font-weight="normal" leader-pattern="dots"/>
564
+ <fo:leader xsl:use-attribute-sets="toc-leader-style"/>
565
565
  <fo:inline><fo:page-number-citation ref-id="{@id}"/></fo:inline>
566
566
  </fo:inline>
567
567
  </fo:basic-link>
@@ -604,7 +604,7 @@
604
604
  </xsl:call-template>
605
605
  </xsl:template>
606
606
 
607
- <xsl:template match="mn:preface//mn:clause[@type = 'toc']" priority="4">
607
+ <xsl:template match="mn:preface//mn:clause[@type = 'toc']" name="toc" priority="4">
608
608
  <!-- Table of Contents -->
609
609
  <fo:block>
610
610
 
@@ -618,25 +618,14 @@
618
618
 
619
619
  <xsl:if test="count(*) = 1 and mn:fmt-title"> <!-- if there isn't user ToC -->
620
620
 
621
- <fo:block line-height="115%" role="TOC">
621
+ <fo:block role="TOC" xsl:use-attribute-sets="toc-style">
622
622
 
623
623
  <xsl:for-each select="$contents//mnx:item[@display = 'true']"><!-- [not(@level = 2 and starts-with(@section, '0'))] skip clause from preface -->
624
624
  <fo:block role="TOCI">
625
- <fo:list-block>
626
- <xsl:attribute name="provisional-distance-between-starts">
627
- <xsl:choose>
628
- <xsl:when test="@level &gt;= 1 and @root = 'preface'">0mm</xsl:when>
629
- <xsl:when test="@level &gt;= 1 and @root = 'annex' and not(@type = 'annex')">13mm</xsl:when>
630
- <xsl:when test="@level &gt;= 1 and not(@type = 'annex')">
631
- <xsl:choose>
632
- <xsl:when test="$toc_level = 3">12.9mm</xsl:when>
633
- <xsl:when test="$toc_level &gt; 3">15mm</xsl:when>
634
- <xsl:otherwise>10mm</xsl:otherwise>
635
- </xsl:choose>
636
- </xsl:when>
637
- <xsl:otherwise>0mm</xsl:otherwise>
638
- </xsl:choose>
639
- </xsl:attribute>
625
+ <fo:list-block xsl:use-attribute-sets="toc-item-block-style">
626
+
627
+ <xsl:call-template name="refine_toc-item-block-style"/>
628
+
640
629
  <fo:list-item>
641
630
  <fo:list-item-label end-indent="label-end()">
642
631
  <fo:block id="__internal_layout__toc_sectionnum_{generate-id()}">
@@ -646,11 +635,11 @@
646
635
  </fo:block>
647
636
  </fo:list-item-label>
648
637
  <fo:list-item-body start-indent="body-start()">
649
- <fo:block text-align-last="justify" margin-left="12mm" text-indent="-12mm">
638
+ <fo:block xsl:use-attribute-sets="toc-item-style">
650
639
  <fo:basic-link internal-destination="{@id}" fox:alt-text="{mnx:title}">
651
640
  <xsl:apply-templates select="mnx:title"/>
652
641
  <fo:inline keep-together.within-line="always">
653
- <fo:leader font-size="9pt" font-weight="normal" leader-pattern="dots"/>
642
+ <fo:leader xsl:use-attribute-sets="toc-leader-style"/>
654
643
  <fo:inline><fo:page-number-citation ref-id="{@id}"/></fo:inline>
655
644
  </fo:inline>
656
645
  </fo:basic-link>
@@ -662,31 +651,31 @@
662
651
  </xsl:for-each>
663
652
 
664
653
  <!-- List of Tables -->
665
- <xsl:if test="$contents//mnx:tables/mnx:table">
666
- <xsl:call-template name="insertListOf_Title">
667
- <xsl:with-param name="title" select="$title-list-tables"/>
668
- </xsl:call-template>
669
- <xsl:for-each select="$contents//mnx:tables/mnx:table">
670
- <xsl:call-template name="insertListOf_Item"/>
671
- </xsl:for-each>
672
- </xsl:if>
654
+ <xsl:for-each select="$contents//mnx:tables/mnx:table">
655
+ <xsl:if test="position() = 1">
656
+ <xsl:call-template name="insertListOf_Title">
657
+ <xsl:with-param name="title" select="$title-list-tables"/>
658
+ </xsl:call-template>
659
+ </xsl:if>
660
+ <xsl:call-template name="insertListOf_Item"/>
661
+ </xsl:for-each>
673
662
 
674
663
  <!-- List of Figures -->
675
- <xsl:if test="$contents//mnx:figures/mnx:figure">
676
- <xsl:call-template name="insertListOf_Title">
677
- <xsl:with-param name="title" select="$title-list-figures"/>
678
- </xsl:call-template>
679
- <xsl:for-each select="$contents//mnx:figures/mnx:figure">
680
- <xsl:call-template name="insertListOf_Item"/>
681
- </xsl:for-each>
682
- </xsl:if>
664
+ <xsl:for-each select="$contents//mnx:figures/mnx:figure">
665
+ <xsl:if test="position() = 1">
666
+ <xsl:call-template name="insertListOf_Title">
667
+ <xsl:with-param name="title" select="$title-list-figures"/>
668
+ </xsl:call-template>
669
+ </xsl:if>
670
+ <xsl:call-template name="insertListOf_Item"/>
671
+ </xsl:for-each>
683
672
  </fo:block>
684
673
  </xsl:if>
685
674
  </fo:block>
686
675
  </xsl:template>
687
676
 
688
677
  <xsl:template match="mn:preface//mn:clause[@type = 'toc']/mn:fmt-title" priority="3">
689
- <fo:block font-weight="bold" margin-bottom="7.5pt" font-size="12pt" margin-top="4pt" role="SKIP">
678
+ <fo:block xsl:use-attribute-sets="toc-title-style">
690
679
  <fo:block-container width="18.3mm" border-bottom="1.25pt solid black" role="SKIP">
691
680
  <fo:block line-height="75%">
692
681
  <!-- <xsl:call-template name="getLocalizedString">
@@ -10675,7 +10664,7 @@
10675
10664
 
10676
10665
  <xsl:template name="insertFootnoteSeparatorCommon">
10677
10666
  <xsl:param name="leader_length">30%</xsl:param>
10678
- <fo:static-content flow-name="xsl-footnote-separator">
10667
+ <fo:static-content flow-name="xsl-footnote-separator" role="artifact">
10679
10668
  <fo:block>
10680
10669
  <fo:leader leader-pattern="rule" leader-length="{$leader_length}"/>
10681
10670
  </fo:block>
@@ -11551,31 +11540,65 @@
11551
11540
  <!-- =================== -->
11552
11541
 
11553
11542
  <xsl:attribute-set name="toc-style">
11543
+ <xsl:attribute name="line-height">115%</xsl:attribute>
11554
11544
  </xsl:attribute-set>
11555
11545
 
11556
11546
  <xsl:template name="refine_toc-style">
11557
11547
  </xsl:template>
11558
11548
 
11559
11549
  <xsl:attribute-set name="toc-title-style">
11550
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
11551
+ <xsl:attribute name="font-size">12pt</xsl:attribute>
11552
+ <xsl:attribute name="margin-top">4pt</xsl:attribute>
11553
+ <xsl:attribute name="margin-bottom">7.5pt</xsl:attribute>
11554
+ <xsl:attribute name="role">SKIP</xsl:attribute>
11560
11555
  </xsl:attribute-set>
11561
11556
 
11557
+ <xsl:template name="refine_toc-title-style">
11558
+ </xsl:template>
11559
+
11562
11560
  <xsl:attribute-set name="toc-title-page-style">
11563
11561
  </xsl:attribute-set> <!-- toc-title-page-style -->
11564
11562
 
11563
+ <xsl:template name="refine_toc-title-page-style">
11564
+ </xsl:template>
11565
+
11565
11566
  <xsl:attribute-set name="toc-item-block-style">
11567
+ <xsl:attribute name="provisional-distance-between-starts">10mm</xsl:attribute>
11566
11568
  </xsl:attribute-set>
11567
11569
 
11568
11570
  <xsl:template name="refine_toc-item-block-style">
11571
+ <xsl:attribute name="provisional-distance-between-starts">
11572
+ <xsl:choose>
11573
+ <xsl:when test="@level &gt;= 1 and @root = 'preface'">0mm</xsl:when>
11574
+ <xsl:when test="@level &gt;= 1 and @root = 'annex' and not(@type = 'annex')">13mm</xsl:when>
11575
+ <xsl:when test="@level &gt;= 1 and not(@type = 'annex')">
11576
+ <xsl:choose>
11577
+ <xsl:when test="$toc_level = 3">12.9mm</xsl:when>
11578
+ <xsl:when test="$toc_level &gt; 3">15mm</xsl:when>
11579
+ <xsl:otherwise>10mm</xsl:otherwise>
11580
+ </xsl:choose>
11581
+ </xsl:when>
11582
+ <xsl:otherwise>0mm</xsl:otherwise>
11583
+ </xsl:choose>
11584
+ </xsl:attribute>
11569
11585
  </xsl:template>
11570
11586
 
11571
11587
  <xsl:attribute-set name="toc-item-style">
11572
11588
  <xsl:attribute name="role">TOCI</xsl:attribute>
11589
+ <xsl:attribute name="role">SKIP</xsl:attribute>
11590
+ <xsl:attribute name="text-align-last">justify</xsl:attribute>
11591
+ <xsl:attribute name="margin-left">12mm</xsl:attribute>
11592
+ <xsl:attribute name="text-indent">-12mm</xsl:attribute>
11573
11593
  </xsl:attribute-set> <!-- END: toc-item-style -->
11574
11594
 
11575
11595
  <xsl:template name="refine_toc-item-style">
11576
11596
  </xsl:template> <!-- END: refine_toc-item-style -->
11577
11597
 
11578
11598
  <xsl:attribute-set name="toc-leader-style">
11599
+ <xsl:attribute name="font-size">9pt</xsl:attribute>
11600
+ <xsl:attribute name="font-weight">normal</xsl:attribute>
11601
+ <xsl:attribute name="leader-pattern">dots</xsl:attribute>
11579
11602
  </xsl:attribute-set> <!-- END: toc-leader-style -->
11580
11603
 
11581
11604
  <xsl:attribute-set name="toc-pagenumber-style">
@@ -11583,13 +11606,23 @@
11583
11606
 
11584
11607
  <!-- List of Figures, Tables -->
11585
11608
  <xsl:attribute-set name="toc-listof-title-style">
11609
+ <xsl:attribute name="role">TOCI</xsl:attribute>
11610
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
11611
+ <xsl:attribute name="margin-top">6pt</xsl:attribute>
11612
+ <xsl:attribute name="keep-with-next">always</xsl:attribute>
11586
11613
  </xsl:attribute-set>
11587
11614
 
11615
+ <xsl:template name="refine_toc-listof-title-style">
11616
+ </xsl:template>
11617
+
11588
11618
  <xsl:attribute-set name="toc-listof-item-block-style">
11589
11619
  </xsl:attribute-set>
11590
11620
 
11591
11621
  <xsl:attribute-set name="toc-listof-item-style">
11592
11622
  <xsl:attribute name="role">TOCI</xsl:attribute>
11623
+ <xsl:attribute name="text-align-last">justify</xsl:attribute>
11624
+ <xsl:attribute name="margin-left">12mm</xsl:attribute>
11625
+ <xsl:attribute name="text-indent">-12mm</xsl:attribute>
11593
11626
  </xsl:attribute-set>
11594
11627
 
11595
11628
  <xsl:template name="processPrefaceSectionsDefault_Contents">
@@ -11929,7 +11962,7 @@
11929
11962
  </xsl:if>
11930
11963
 
11931
11964
  <xsl:for-each select="$contents_nodes/mnx:doc">
11932
- <fo:bookmark internal-destination="{contents/mnx:item[@display = 'true'][1]/@id}" starting-state="hide">
11965
+ <fo:bookmark internal-destination="{mnx:contents/mnx:item[@display = 'true'][1]/@id}" starting-state="hide">
11933
11966
  <xsl:if test="@bundle = 'true'">
11934
11967
  <xsl:attribute name="internal-destination"><xsl:value-of select="@firstpage_id"/></xsl:attribute>
11935
11968
  </xsl:if>
@@ -11963,7 +11996,7 @@
11963
11996
  </xsl:choose>
11964
11997
  </fo:bookmark-title>
11965
11998
 
11966
- <xsl:apply-templates select="contents/mnx:item" mode="bookmark"/>
11999
+ <xsl:apply-templates select="mnx:contents/mnx:item" mode="bookmark"/>
11967
12000
 
11968
12001
  <xsl:call-template name="insertFigureBookmarks">
11969
12002
  <xsl:with-param name="contents" select="mnx:contents"/>
data/lib/isodoc/iho/iho.standard.xsl CHANGED
@@ -548,20 +548,20 @@
548
548
 
549
549
  <xsl:template name="insertListOf_Title">
550
550
  <xsl:param name="title"/>
551
- <fo:block role="TOCI" font-weight="bold" margin-top="6pt" keep-with-next="always">
551
+ <fo:block xsl:use-attribute-sets="toc-listof-title-style">
552
552
  <xsl:value-of select="$title"/>
553
553
  </fo:block>
554
554
  </xsl:template>
555
555
 
556
556
  <xsl:template name="insertListOf_Item">
557
- <fo:block role="TOCI" text-align-last="justify" margin-left="12mm" text-indent="-12mm">
557
+ <fo:block xsl:use-attribute-sets="toc-listof-item-style">
558
558
  <fo:basic-link internal-destination="{@id}">
559
559
  <xsl:call-template name="setAltText">
560
560
  <xsl:with-param name="value" select="@alt-text"/>
561
561
  </xsl:call-template>
562
562
  <xsl:apply-templates select="." mode="contents"/>
563
563
  <fo:inline keep-together.within-line="always">
564
- <fo:leader font-size="9pt" font-weight="normal" leader-pattern="dots"/>
564
+ <fo:leader xsl:use-attribute-sets="toc-leader-style"/>
565
565
  <fo:inline><fo:page-number-citation ref-id="{@id}"/></fo:inline>
566
566
  </fo:inline>
567
567
  </fo:basic-link>
@@ -604,7 +604,7 @@
604
604
  </xsl:call-template>
605
605
  </xsl:template>
606
606
 
607
- <xsl:template match="mn:preface//mn:clause[@type = 'toc']" priority="4">
607
+ <xsl:template match="mn:preface//mn:clause[@type = 'toc']" name="toc" priority="4">
608
608
  <!-- Table of Contents -->
609
609
  <fo:block>
610
610
 
@@ -618,25 +618,14 @@
618
618
 
619
619
  <xsl:if test="count(*) = 1 and mn:fmt-title"> <!-- if there isn't user ToC -->
620
620
 
621
- <fo:block line-height="115%" role="TOC">
621
+ <fo:block role="TOC" xsl:use-attribute-sets="toc-style">
622
622
 
623
623
  <xsl:for-each select="$contents//mnx:item[@display = 'true']"><!-- [not(@level = 2 and starts-with(@section, '0'))] skip clause from preface -->
624
624
  <fo:block role="TOCI">
625
- <fo:list-block>
626
- <xsl:attribute name="provisional-distance-between-starts">
627
- <xsl:choose>
628
- <xsl:when test="@level &gt;= 1 and @root = 'preface'">0mm</xsl:when>
629
- <xsl:when test="@level &gt;= 1 and @root = 'annex' and not(@type = 'annex')">13mm</xsl:when>
630
- <xsl:when test="@level &gt;= 1 and not(@type = 'annex')">
631
- <xsl:choose>
632
- <xsl:when test="$toc_level = 3">12.9mm</xsl:when>
633
- <xsl:when test="$toc_level &gt; 3">15mm</xsl:when>
634
- <xsl:otherwise>10mm</xsl:otherwise>
635
- </xsl:choose>
636
- </xsl:when>
637
- <xsl:otherwise>0mm</xsl:otherwise>
638
- </xsl:choose>
639
- </xsl:attribute>
625
+ <fo:list-block xsl:use-attribute-sets="toc-item-block-style">
626
+
627
+ <xsl:call-template name="refine_toc-item-block-style"/>
628
+
640
629
  <fo:list-item>
641
630
  <fo:list-item-label end-indent="label-end()">
642
631
  <fo:block id="__internal_layout__toc_sectionnum_{generate-id()}">
@@ -646,11 +635,11 @@
646
635
  </fo:block>
647
636
  </fo:list-item-label>
648
637
  <fo:list-item-body start-indent="body-start()">
649
- <fo:block text-align-last="justify" margin-left="12mm" text-indent="-12mm">
638
+ <fo:block xsl:use-attribute-sets="toc-item-style">
650
639
  <fo:basic-link internal-destination="{@id}" fox:alt-text="{mnx:title}">
651
640
  <xsl:apply-templates select="mnx:title"/>
652
641
  <fo:inline keep-together.within-line="always">
653
- <fo:leader font-size="9pt" font-weight="normal" leader-pattern="dots"/>
642
+ <fo:leader xsl:use-attribute-sets="toc-leader-style"/>
654
643
  <fo:inline><fo:page-number-citation ref-id="{@id}"/></fo:inline>
655
644
  </fo:inline>
656
645
  </fo:basic-link>
@@ -662,31 +651,31 @@
662
651
  </xsl:for-each>
663
652
 
664
653
  <!-- List of Tables -->
665
- <xsl:if test="$contents//mnx:tables/mnx:table">
666
- <xsl:call-template name="insertListOf_Title">
667
- <xsl:with-param name="title" select="$title-list-tables"/>
668
- </xsl:call-template>
669
- <xsl:for-each select="$contents//mnx:tables/mnx:table">
670
- <xsl:call-template name="insertListOf_Item"/>
671
- </xsl:for-each>
672
- </xsl:if>
654
+ <xsl:for-each select="$contents//mnx:tables/mnx:table">
655
+ <xsl:if test="position() = 1">
656
+ <xsl:call-template name="insertListOf_Title">
657
+ <xsl:with-param name="title" select="$title-list-tables"/>
658
+ </xsl:call-template>
659
+ </xsl:if>
660
+ <xsl:call-template name="insertListOf_Item"/>
661
+ </xsl:for-each>
673
662
 
674
663
  <!-- List of Figures -->
675
- <xsl:if test="$contents//mnx:figures/mnx:figure">
676
- <xsl:call-template name="insertListOf_Title">
677
- <xsl:with-param name="title" select="$title-list-figures"/>
678
- </xsl:call-template>
679
- <xsl:for-each select="$contents//mnx:figures/mnx:figure">
680
- <xsl:call-template name="insertListOf_Item"/>
681
- </xsl:for-each>
682
- </xsl:if>
664
+ <xsl:for-each select="$contents//mnx:figures/mnx:figure">
665
+ <xsl:if test="position() = 1">
666
+ <xsl:call-template name="insertListOf_Title">
667
+ <xsl:with-param name="title" select="$title-list-figures"/>
668
+ </xsl:call-template>
669
+ </xsl:if>
670
+ <xsl:call-template name="insertListOf_Item"/>
671
+ </xsl:for-each>
683
672
  </fo:block>
684
673
  </xsl:if>
685
674
  </fo:block>
686
675
  </xsl:template>
687
676
 
688
677
  <xsl:template match="mn:preface//mn:clause[@type = 'toc']/mn:fmt-title" priority="3">
689
- <fo:block font-weight="bold" margin-bottom="7.5pt" font-size="12pt" margin-top="4pt" role="SKIP">
678
+ <fo:block xsl:use-attribute-sets="toc-title-style">
690
679
  <fo:block-container width="18.3mm" border-bottom="1.25pt solid black" role="SKIP">
691
680
  <fo:block line-height="75%">
692
681
  <!-- <xsl:call-template name="getLocalizedString">
@@ -10675,7 +10664,7 @@
10675
10664
 
10676
10665
  <xsl:template name="insertFootnoteSeparatorCommon">
10677
10666
  <xsl:param name="leader_length">30%</xsl:param>
10678
- <fo:static-content flow-name="xsl-footnote-separator">
10667
+ <fo:static-content flow-name="xsl-footnote-separator" role="artifact">
10679
10668
  <fo:block>
10680
10669
  <fo:leader leader-pattern="rule" leader-length="{$leader_length}"/>
10681
10670
  </fo:block>
@@ -11551,31 +11540,65 @@
11551
11540
  <!-- =================== -->
11552
11541
 
11553
11542
  <xsl:attribute-set name="toc-style">
11543
+ <xsl:attribute name="line-height">115%</xsl:attribute>
11554
11544
  </xsl:attribute-set>
11555
11545
 
11556
11546
  <xsl:template name="refine_toc-style">
11557
11547
  </xsl:template>
11558
11548
 
11559
11549
  <xsl:attribute-set name="toc-title-style">
11550
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
11551
+ <xsl:attribute name="font-size">12pt</xsl:attribute>
11552
+ <xsl:attribute name="margin-top">4pt</xsl:attribute>
11553
+ <xsl:attribute name="margin-bottom">7.5pt</xsl:attribute>
11554
+ <xsl:attribute name="role">SKIP</xsl:attribute>
11560
11555
  </xsl:attribute-set>
11561
11556
 
11557
+ <xsl:template name="refine_toc-title-style">
11558
+ </xsl:template>
11559
+
11562
11560
  <xsl:attribute-set name="toc-title-page-style">
11563
11561
  </xsl:attribute-set> <!-- toc-title-page-style -->
11564
11562
 
11563
+ <xsl:template name="refine_toc-title-page-style">
11564
+ </xsl:template>
11565
+
11565
11566
  <xsl:attribute-set name="toc-item-block-style">
11567
+ <xsl:attribute name="provisional-distance-between-starts">10mm</xsl:attribute>
11566
11568
  </xsl:attribute-set>
11567
11569
 
11568
11570
  <xsl:template name="refine_toc-item-block-style">
11571
+ <xsl:attribute name="provisional-distance-between-starts">
11572
+ <xsl:choose>
11573
+ <xsl:when test="@level &gt;= 1 and @root = 'preface'">0mm</xsl:when>
11574
+ <xsl:when test="@level &gt;= 1 and @root = 'annex' and not(@type = 'annex')">13mm</xsl:when>
11575
+ <xsl:when test="@level &gt;= 1 and not(@type = 'annex')">
11576
+ <xsl:choose>
11577
+ <xsl:when test="$toc_level = 3">12.9mm</xsl:when>
11578
+ <xsl:when test="$toc_level &gt; 3">15mm</xsl:when>
11579
+ <xsl:otherwise>10mm</xsl:otherwise>
11580
+ </xsl:choose>
11581
+ </xsl:when>
11582
+ <xsl:otherwise>0mm</xsl:otherwise>
11583
+ </xsl:choose>
11584
+ </xsl:attribute>
11569
11585
  </xsl:template>
11570
11586
 
11571
11587
  <xsl:attribute-set name="toc-item-style">
11572
11588
  <xsl:attribute name="role">TOCI</xsl:attribute>
11589
+ <xsl:attribute name="role">SKIP</xsl:attribute>
11590
+ <xsl:attribute name="text-align-last">justify</xsl:attribute>
11591
+ <xsl:attribute name="margin-left">12mm</xsl:attribute>
11592
+ <xsl:attribute name="text-indent">-12mm</xsl:attribute>
11573
11593
  </xsl:attribute-set> <!-- END: toc-item-style -->
11574
11594
 
11575
11595
  <xsl:template name="refine_toc-item-style">
11576
11596
  </xsl:template> <!-- END: refine_toc-item-style -->
11577
11597
 
11578
11598
  <xsl:attribute-set name="toc-leader-style">
11599
+ <xsl:attribute name="font-size">9pt</xsl:attribute>
11600
+ <xsl:attribute name="font-weight">normal</xsl:attribute>
11601
+ <xsl:attribute name="leader-pattern">dots</xsl:attribute>
11579
11602
  </xsl:attribute-set> <!-- END: toc-leader-style -->
11580
11603
 
11581
11604
  <xsl:attribute-set name="toc-pagenumber-style">
@@ -11583,13 +11606,23 @@
11583
11606
 
11584
11607
  <!-- List of Figures, Tables -->
11585
11608
  <xsl:attribute-set name="toc-listof-title-style">
11609
+ <xsl:attribute name="role">TOCI</xsl:attribute>
11610
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
11611
+ <xsl:attribute name="margin-top">6pt</xsl:attribute>
11612
+ <xsl:attribute name="keep-with-next">always</xsl:attribute>
11586
11613
  </xsl:attribute-set>
11587
11614
 
11615
+ <xsl:template name="refine_toc-listof-title-style">
11616
+ </xsl:template>
11617
+
11588
11618
  <xsl:attribute-set name="toc-listof-item-block-style">
11589
11619
  </xsl:attribute-set>
11590
11620
 
11591
11621
  <xsl:attribute-set name="toc-listof-item-style">
11592
11622
  <xsl:attribute name="role">TOCI</xsl:attribute>
11623
+ <xsl:attribute name="text-align-last">justify</xsl:attribute>
11624
+ <xsl:attribute name="margin-left">12mm</xsl:attribute>
11625
+ <xsl:attribute name="text-indent">-12mm</xsl:attribute>
11593
11626
  </xsl:attribute-set>
11594
11627
 
11595
11628
  <xsl:template name="processPrefaceSectionsDefault_Contents">
@@ -11929,7 +11962,7 @@
11929
11962
  </xsl:if>
11930
11963
 
11931
11964
  <xsl:for-each select="$contents_nodes/mnx:doc">
11932
- <fo:bookmark internal-destination="{contents/mnx:item[@display = 'true'][1]/@id}" starting-state="hide">
11965
+ <fo:bookmark internal-destination="{mnx:contents/mnx:item[@display = 'true'][1]/@id}" starting-state="hide">
11933
11966
  <xsl:if test="@bundle = 'true'">
11934
11967
  <xsl:attribute name="internal-destination"><xsl:value-of select="@firstpage_id"/></xsl:attribute>
11935
11968
  </xsl:if>
@@ -11963,7 +11996,7 @@
11963
11996
  </xsl:choose>
11964
11997
  </fo:bookmark-title>
11965
11998
 
11966
- <xsl:apply-templates select="contents/mnx:item" mode="bookmark"/>
11999
+ <xsl:apply-templates select="mnx:contents/mnx:item" mode="bookmark"/>
11967
12000
 
11968
12001
  <xsl:call-template name="insertFigureBookmarks">
11969
12002
  <xsl:with-param name="contents" select="mnx:contents"/>
data/lib/metanorma/iho/basicdoc.rng CHANGED
@@ -1291,13 +1291,13 @@ Restricted recursively to contain only other such inline elements with no identi
1291
1291
  <ref name="pure_strike"/>
1292
1292
  <ref name="pure_smallcap"/>
1293
1293
  <ref name="br"/>
1294
+ <ref name="stem"/>
1294
1295
  </choice>
1295
1296
  </define>
1296
1297
  <define name="NestedTextElement">
1297
1298
  <a:documentation>Contents of TextElement tags: leaves out tags that should occur only at top level of block: bookmark image hr pagebreak</a:documentation>
1298
1299
  <choice>
1299
1300
  <ref name="PureTextElement"/>
1300
- <ref name="stem"/>
1301
1301
  <ref name="eref"/>
1302
1302
  <ref name="xref"/>
1303
1303
  <ref name="hyperlink"/>
data/lib/metanorma/iho/isodoc.rng CHANGED
@@ -42,36 +42,6 @@ All IdRefType instances point not to `@id` in Semantic XML, which is the Content
42
42
  but to `@anchor`, the user-supplied cross-reference</a:documentation>
43
43
  <text/>
44
44
  </define>
45
- <define name="index-primary">
46
- <element name="primary">
47
- <oneOrMore>
48
- <choice>
49
- <ref name="PureTextElement"/>
50
- <ref name="stem"/>
51
- </choice>
52
- </oneOrMore>
53
- </element>
54
- </define>
55
- <define name="index-secondary">
56
- <element name="secondary">
57
- <oneOrMore>
58
- <choice>
59
- <ref name="PureTextElement"/>
60
- <ref name="stem"/>
61
- </choice>
62
- </oneOrMore>
63
- </element>
64
- </define>
65
- <define name="index-tertiary">
66
- <element name="tertiary">
67
- <oneOrMore>
68
- <choice>
69
- <ref name="PureTextElement"/>
70
- <ref name="stem"/>
71
- </choice>
72
- </oneOrMore>
73
- </element>
74
- </define>
75
45
  <define name="review">
76
46
  <a:documentation>Generalise BasicDoc element from just review comments, to general annotations;
77
47
  the type attribute defaults to `review` for reviews</a:documentation>
@@ -592,28 +562,6 @@ normative or informative references, some split references into sections organiz
592
562
  </oneOrMore>
593
563
  </element>
594
564
  </define>
595
- <define name="sub">
596
- <a:documentation>Subscript text. Corresponds to HTML `sub</a:documentation>
597
- <element name="sub">
598
- <zeroOrMore>
599
- <choice>
600
- <ref name="PureTextElement"/>
601
- <ref name="stem"/>
602
- </choice>
603
- </zeroOrMore>
604
- </element>
605
- </define>
606
- <define name="sup">
607
- <a:documentation>Superscript text. Corresponds to HTML `sup`</a:documentation>
608
- <element name="sup">
609
- <zeroOrMore>
610
- <choice>
611
- <ref name="PureTextElement"/>
612
- <ref name="stem"/>
613
- </choice>
614
- </zeroOrMore>
615
- </element>
616
- </define>
617
565
  <define name="pagebreak">
618
566
  <a:documentation>Page break. Only applicable in paged layouts (e.g. PDF, Word), and not flow layouts (e.g. HTML)</a:documentation>
619
567
  <element name="pagebreak">
@@ -1094,7 +1042,6 @@ That concept may be defined as a term within the current document, or it may be
1094
1042
  <zeroOrMore>
1095
1043
  <choice>
1096
1044
  <ref name="PureTextElement"/>
1097
- <ref name="stem"/>
1098
1045
  <ref name="index"/>
1099
1046
  <ref name="index-xref"/>
1100
1047
  </choice>
@@ -1107,7 +1054,6 @@ That concept may be defined as a term within the current document, or it may be
1107
1054
  <zeroOrMore>
1108
1055
  <choice>
1109
1056
  <ref name="PureTextElement"/>
1110
- <ref name="stem"/>
1111
1057
  <ref name="index"/>
1112
1058
  <ref name="index-xref"/>
1113
1059
  </choice>
@@ -2025,10 +1971,7 @@ used in document amendments</a:documentation>
2025
1971
  <element name="name">
2026
1972
  <a:documentation>The symbolic form of the designation</a:documentation>
2027
1973
  <oneOrMore>
2028
- <choice>
2029
- <ref name="PureTextElement"/>
2030
- <ref name="stem"/>
2031
- </choice>
1974
+ <ref name="PureTextElement"/>
2032
1975
  </oneOrMore>
2033
1976
  </element>
2034
1977
  </element>
@@ -2081,7 +2024,6 @@ used in document amendments</a:documentation>
2081
2024
  <zeroOrMore>
2082
2025
  <choice>
2083
2026
  <ref name="PureTextElement"/>
2084
- <ref name="stem"/>
2085
2027
  <ref name="index"/>
2086
2028
  <ref name="index-xref"/>
2087
2029
  </choice>
data/lib/metanorma/iho/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module Iho
3
- VERSION = "1.2.1".freeze
3
+ VERSION = "1.2.2".freeze
4
4
  end
5
5
  end
data/metanorma-iho.gemspec CHANGED
@@ -40,5 +40,5 @@ spec.add_development_dependency "rubocop-performance"
40
40
  spec.add_development_dependency "sassc-embedded", "~> 1"
41
41
  spec.add_development_dependency "simplecov", "~> 0.15"
42
42
  spec.add_development_dependency "timecop", "~> 0.9"
43
- spec.add_development_dependency "xml-c14n"
43
+ spec.add_development_dependency "canon"
44
44
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-iho
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.1
4
+ version: 1.2.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2025-07-21 00:00:00.000000000 Z
11
+ date: 2025-08-04 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: metanorma-generic
@@ -179,7 +179,7 @@ dependencies:
179
179
  - !ruby/object:Gem::Version
180
180
  version: '0.9'
181
181
  - !ruby/object:Gem::Dependency
182
- name: xml-c14n
182
+ name: canon
183
183
  requirement: !ruby/object:Gem::Requirement
184
184
  requirements:
185
185
  - - ">="