metanorma-iho 1.2.0 → 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.
- checksums.yaml +4 -4
- data/README.adoc +1 -1
- data/lib/isodoc/iho/iho.specification.xsl +156 -49
- data/lib/isodoc/iho/iho.standard.xsl +156 -49
- data/lib/isodoc/iho/presentation_xml_convert.rb +3 -2
- data/lib/metanorma/iho/basicdoc.rng +6 -6
- data/lib/metanorma/iho/isodoc.rng +8 -60
- data/lib/metanorma/iho/version.rb +1 -1
- data/metanorma-iho.gemspec +2 -2
- metadata +5 -5
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 2df05b7790e02fb4929bd6ce176e09c0ee52f96b7dc7ddc9d3846f0b38c2f2b5
|
|
4
|
+
data.tar.gz: e4cb99c1d3318dfa11ce21bdd1d90708cda57707ca11c83d0f3e15449161aaf9
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
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
|
|
|
@@ -48,7 +48,7 @@
|
|
|
48
48
|
<xsl:template name="layout-master-set">
|
|
49
49
|
<fo:layout-master-set>
|
|
50
50
|
<!-- cover page -->
|
|
51
|
-
<fo:simple-page-master master-name="cover" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
51
|
+
<fo:simple-page-master master-name="cover-page" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
52
52
|
<fo:region-body margin-top="0mm" margin-bottom="5mm" margin-left="0mm" margin-right="5mm"/>
|
|
53
53
|
</fo:simple-page-master>
|
|
54
54
|
|
|
@@ -364,7 +364,7 @@
|
|
|
364
364
|
<xsl:template name="cover-page">
|
|
365
365
|
<!-- =========================== -->
|
|
366
366
|
<!-- Cover Page -->
|
|
367
|
-
<fo:page-sequence master-reference="cover">
|
|
367
|
+
<fo:page-sequence master-reference="cover-page">
|
|
368
368
|
<fo:flow flow-name="xsl-region-body">
|
|
369
369
|
|
|
370
370
|
<xsl:variable name="isCoverPageImage" select="normalize-space(/mn:metanorma/mn:metanorma-extension/mn:presentation-metadata[mn:name = 'coverpage-image']/mn:value/mn:image and 1 = 1)"/>
|
|
@@ -465,7 +465,8 @@
|
|
|
465
465
|
<fo:block font-size="28pt" role="H1" line-height="115%">
|
|
466
466
|
<xsl:copy-of select="$title-main"/>
|
|
467
467
|
<xsl:if test="normalize-space($title-main) = ''">
|
|
468
|
-
<xsl:copy-of select="$title-
|
|
468
|
+
<xsl:copy-of select="$title-main_"/>
|
|
469
|
+
<xsl:if test="normalize-space($title-main_) = ''"><xsl:copy-of select="$title-en"/></xsl:if>
|
|
469
470
|
</xsl:if>
|
|
470
471
|
</fo:block>
|
|
471
472
|
<xsl:if test="normalize-space($title-part) != ''">
|
|
@@ -547,20 +548,20 @@
|
|
|
547
548
|
|
|
548
549
|
<xsl:template name="insertListOf_Title">
|
|
549
550
|
<xsl:param name="title"/>
|
|
550
|
-
<fo:block
|
|
551
|
+
<fo:block xsl:use-attribute-sets="toc-listof-title-style">
|
|
551
552
|
<xsl:value-of select="$title"/>
|
|
552
553
|
</fo:block>
|
|
553
554
|
</xsl:template>
|
|
554
555
|
|
|
555
556
|
<xsl:template name="insertListOf_Item">
|
|
556
|
-
<fo:block
|
|
557
|
+
<fo:block xsl:use-attribute-sets="toc-listof-item-style">
|
|
557
558
|
<fo:basic-link internal-destination="{@id}">
|
|
558
559
|
<xsl:call-template name="setAltText">
|
|
559
560
|
<xsl:with-param name="value" select="@alt-text"/>
|
|
560
561
|
</xsl:call-template>
|
|
561
562
|
<xsl:apply-templates select="." mode="contents"/>
|
|
562
563
|
<fo:inline keep-together.within-line="always">
|
|
563
|
-
<fo:leader
|
|
564
|
+
<fo:leader xsl:use-attribute-sets="toc-leader-style"/>
|
|
564
565
|
<fo:inline><fo:page-number-citation ref-id="{@id}"/></fo:inline>
|
|
565
566
|
</fo:inline>
|
|
566
567
|
</fo:basic-link>
|
|
@@ -603,7 +604,7 @@
|
|
|
603
604
|
</xsl:call-template>
|
|
604
605
|
</xsl:template>
|
|
605
606
|
|
|
606
|
-
<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">
|
|
607
608
|
<!-- Table of Contents -->
|
|
608
609
|
<fo:block>
|
|
609
610
|
|
|
@@ -617,25 +618,14 @@
|
|
|
617
618
|
|
|
618
619
|
<xsl:if test="count(*) = 1 and mn:fmt-title"> <!-- if there isn't user ToC -->
|
|
619
620
|
|
|
620
|
-
<fo:block
|
|
621
|
+
<fo:block role="TOC" xsl:use-attribute-sets="toc-style">
|
|
621
622
|
|
|
622
623
|
<xsl:for-each select="$contents//mnx:item[@display = 'true']"><!-- [not(@level = 2 and starts-with(@section, '0'))] skip clause from preface -->
|
|
623
624
|
<fo:block role="TOCI">
|
|
624
|
-
<fo:list-block>
|
|
625
|
-
|
|
626
|
-
|
|
627
|
-
|
|
628
|
-
<xsl:when test="@level >= 1 and @root = 'annex' and not(@type = 'annex')">13mm</xsl:when>
|
|
629
|
-
<xsl:when test="@level >= 1 and not(@type = 'annex')">
|
|
630
|
-
<xsl:choose>
|
|
631
|
-
<xsl:when test="$toc_level = 3">12.9mm</xsl:when>
|
|
632
|
-
<xsl:when test="$toc_level > 3">15mm</xsl:when>
|
|
633
|
-
<xsl:otherwise>10mm</xsl:otherwise>
|
|
634
|
-
</xsl:choose>
|
|
635
|
-
</xsl:when>
|
|
636
|
-
<xsl:otherwise>0mm</xsl:otherwise>
|
|
637
|
-
</xsl:choose>
|
|
638
|
-
</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
|
+
|
|
639
629
|
<fo:list-item>
|
|
640
630
|
<fo:list-item-label end-indent="label-end()">
|
|
641
631
|
<fo:block id="__internal_layout__toc_sectionnum_{generate-id()}">
|
|
@@ -645,11 +635,11 @@
|
|
|
645
635
|
</fo:block>
|
|
646
636
|
</fo:list-item-label>
|
|
647
637
|
<fo:list-item-body start-indent="body-start()">
|
|
648
|
-
<fo:block
|
|
638
|
+
<fo:block xsl:use-attribute-sets="toc-item-style">
|
|
649
639
|
<fo:basic-link internal-destination="{@id}" fox:alt-text="{mnx:title}">
|
|
650
640
|
<xsl:apply-templates select="mnx:title"/>
|
|
651
641
|
<fo:inline keep-together.within-line="always">
|
|
652
|
-
<fo:leader
|
|
642
|
+
<fo:leader xsl:use-attribute-sets="toc-leader-style"/>
|
|
653
643
|
<fo:inline><fo:page-number-citation ref-id="{@id}"/></fo:inline>
|
|
654
644
|
</fo:inline>
|
|
655
645
|
</fo:basic-link>
|
|
@@ -661,31 +651,31 @@
|
|
|
661
651
|
</xsl:for-each>
|
|
662
652
|
|
|
663
653
|
<!-- List of Tables -->
|
|
664
|
-
<xsl:
|
|
665
|
-
<xsl:
|
|
666
|
-
<xsl:
|
|
667
|
-
|
|
668
|
-
|
|
669
|
-
|
|
670
|
-
|
|
671
|
-
</xsl:
|
|
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>
|
|
672
662
|
|
|
673
663
|
<!-- List of Figures -->
|
|
674
|
-
<xsl:
|
|
675
|
-
<xsl:
|
|
676
|
-
<xsl:
|
|
677
|
-
|
|
678
|
-
|
|
679
|
-
|
|
680
|
-
|
|
681
|
-
</xsl:
|
|
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>
|
|
682
672
|
</fo:block>
|
|
683
673
|
</xsl:if>
|
|
684
674
|
</fo:block>
|
|
685
675
|
</xsl:template>
|
|
686
676
|
|
|
687
677
|
<xsl:template match="mn:preface//mn:clause[@type = 'toc']/mn:fmt-title" priority="3">
|
|
688
|
-
<fo:block
|
|
678
|
+
<fo:block xsl:use-attribute-sets="toc-title-style">
|
|
689
679
|
<fo:block-container width="18.3mm" border-bottom="1.25pt solid black" role="SKIP">
|
|
690
680
|
<fo:block line-height="75%">
|
|
691
681
|
<!-- <xsl:call-template name="getLocalizedString">
|
|
@@ -6219,6 +6209,16 @@
|
|
|
6219
6209
|
</xsl:variable>
|
|
6220
6210
|
<xsl:variable name="quot">"</xsl:variable>
|
|
6221
6211
|
<xsl:variable name="styles_">
|
|
6212
|
+
<!-- PDF: Borderless tables https://github.com/metanorma/metanorma-jis/issues/344 -->
|
|
6213
|
+
<xsl:if test="@plain = 'true' or ancestor::mn:table/@plain = 'true'">
|
|
6214
|
+
<style name="border-top">none</style>
|
|
6215
|
+
<style name="border-right">none</style>
|
|
6216
|
+
<style name="border-left">none</style>
|
|
6217
|
+
<style name="border-bottom">none</style>
|
|
6218
|
+
<style name="color">inherit</style>
|
|
6219
|
+
<style name="background-color">transparent</style>
|
|
6220
|
+
</xsl:if>
|
|
6221
|
+
|
|
6222
6222
|
<xsl:for-each select="xalan:nodeset($styles__)/mnx:item">
|
|
6223
6223
|
<xsl:variable name="key" select="normalize-space(substring-before(., ':'))"/>
|
|
6224
6224
|
<xsl:variable name="value" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
|
|
@@ -8217,7 +8217,10 @@
|
|
|
8217
8217
|
|
|
8218
8218
|
<xsl:call-template name="setNamedDestination"/>
|
|
8219
8219
|
|
|
8220
|
-
<fo:block-container
|
|
8220
|
+
<fo:block-container xsl:use-attribute-sets="note-style" role="SKIP">
|
|
8221
|
+
<xsl:if test="not(parent::mn:references)">
|
|
8222
|
+
<xsl:copy-of select="@id"/>
|
|
8223
|
+
</xsl:if>
|
|
8221
8224
|
|
|
8222
8225
|
<xsl:call-template name="setBlockSpanAll"/>
|
|
8223
8226
|
|
|
@@ -10661,7 +10664,7 @@
|
|
|
10661
10664
|
|
|
10662
10665
|
<xsl:template name="insertFootnoteSeparatorCommon">
|
|
10663
10666
|
<xsl:param name="leader_length">30%</xsl:param>
|
|
10664
|
-
<fo:static-content flow-name="xsl-footnote-separator">
|
|
10667
|
+
<fo:static-content flow-name="xsl-footnote-separator" role="artifact">
|
|
10665
10668
|
<fo:block>
|
|
10666
10669
|
<fo:leader leader-pattern="rule" leader-length="{$leader_length}"/>
|
|
10667
10670
|
</fo:block>
|
|
@@ -10923,8 +10926,8 @@
|
|
|
10923
10926
|
</xsl:template> <!-- bibitem -->
|
|
10924
10927
|
|
|
10925
10928
|
<!-- Bibliography (non-normative references) -->
|
|
10926
|
-
<xsl:template match="mn:references[not(@normative='true')]/mn:bibitem" name="bibitem_non_normative" priority="2">
|
|
10927
|
-
<xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][self::mn:bibitem] and 1 = 1)"/> <!-- current bibiitem is non-first -->
|
|
10929
|
+
<xsl:template match="mn:references[not(@normative='true')]/mn:bibitem | mn:references[not(@normative='true')]/mn:note" name="bibitem_non_normative" priority="2">
|
|
10930
|
+
<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 -->
|
|
10928
10931
|
<xsl:call-template name="bibitem"/>
|
|
10929
10932
|
|
|
10930
10933
|
</xsl:template> <!-- references[not(@normative='true')]/bibitem -->
|
|
@@ -10954,7 +10957,7 @@
|
|
|
10954
10957
|
</fo:list-item>
|
|
10955
10958
|
</xsl:otherwise>
|
|
10956
10959
|
</xsl:choose>
|
|
10957
|
-
<xsl:apply-templates select="following-sibling::*[1][self::mn:bibitem]
|
|
10960
|
+
<xsl:apply-templates select="following-sibling::*[1]"> <!-- [self::mn:bibitem] -->
|
|
10958
10961
|
<xsl:with-param name="skip">false</xsl:with-param>
|
|
10959
10962
|
</xsl:apply-templates>
|
|
10960
10963
|
</xsl:template>
|
|
@@ -10971,8 +10974,26 @@
|
|
|
10971
10974
|
</xsl:apply-templates>
|
|
10972
10975
|
<xsl:apply-templates select="mn:formattedref"/>
|
|
10973
10976
|
<!-- end bibitem processing -->
|
|
10977
|
+
|
|
10978
|
+
<xsl:call-template name="processBibliographyNote"/>
|
|
10974
10979
|
</xsl:template> <!-- processBibitem (bibitem) -->
|
|
10975
10980
|
|
|
10981
|
+
<xsl:template name="processBibliographyNote">
|
|
10982
|
+
<xsl:if test="self::mn:note">
|
|
10983
|
+
<xsl:variable name="note_node">
|
|
10984
|
+
<xsl:element name="{local-name(..)}" namespace="{$namespace_full}"> <!-- save parent context node for determining styles -->
|
|
10985
|
+
<xsl:copy> <!-- skip @id -->
|
|
10986
|
+
<xsl:copy-of select="node()"/>
|
|
10987
|
+
</xsl:copy>
|
|
10988
|
+
</xsl:element>
|
|
10989
|
+
</xsl:variable>
|
|
10990
|
+
<!-- <xsl:for-each select="xalan:nodeset($note_node)//mn:note">
|
|
10991
|
+
<xsl:call-template name="note"/>
|
|
10992
|
+
</xsl:for-each> -->
|
|
10993
|
+
<xsl:call-template name="note"/>
|
|
10994
|
+
</xsl:if>
|
|
10995
|
+
</xsl:template>
|
|
10996
|
+
|
|
10976
10997
|
<xsl:template match="mn:title" mode="title">
|
|
10977
10998
|
<fo:inline><xsl:apply-templates/></fo:inline>
|
|
10978
10999
|
</xsl:template>
|
|
@@ -11518,6 +11539,92 @@
|
|
|
11518
11539
|
<!-- End Form's elements processing -->
|
|
11519
11540
|
<!-- =================== -->
|
|
11520
11541
|
|
|
11542
|
+
<xsl:attribute-set name="toc-style">
|
|
11543
|
+
<xsl:attribute name="line-height">115%</xsl:attribute>
|
|
11544
|
+
</xsl:attribute-set>
|
|
11545
|
+
|
|
11546
|
+
<xsl:template name="refine_toc-style">
|
|
11547
|
+
</xsl:template>
|
|
11548
|
+
|
|
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>
|
|
11555
|
+
</xsl:attribute-set>
|
|
11556
|
+
|
|
11557
|
+
<xsl:template name="refine_toc-title-style">
|
|
11558
|
+
</xsl:template>
|
|
11559
|
+
|
|
11560
|
+
<xsl:attribute-set name="toc-title-page-style">
|
|
11561
|
+
</xsl:attribute-set> <!-- toc-title-page-style -->
|
|
11562
|
+
|
|
11563
|
+
<xsl:template name="refine_toc-title-page-style">
|
|
11564
|
+
</xsl:template>
|
|
11565
|
+
|
|
11566
|
+
<xsl:attribute-set name="toc-item-block-style">
|
|
11567
|
+
<xsl:attribute name="provisional-distance-between-starts">10mm</xsl:attribute>
|
|
11568
|
+
</xsl:attribute-set>
|
|
11569
|
+
|
|
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 >= 1 and @root = 'preface'">0mm</xsl:when>
|
|
11574
|
+
<xsl:when test="@level >= 1 and @root = 'annex' and not(@type = 'annex')">13mm</xsl:when>
|
|
11575
|
+
<xsl:when test="@level >= 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 > 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>
|
|
11585
|
+
</xsl:template>
|
|
11586
|
+
|
|
11587
|
+
<xsl:attribute-set name="toc-item-style">
|
|
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>
|
|
11593
|
+
</xsl:attribute-set> <!-- END: toc-item-style -->
|
|
11594
|
+
|
|
11595
|
+
<xsl:template name="refine_toc-item-style">
|
|
11596
|
+
</xsl:template> <!-- END: refine_toc-item-style -->
|
|
11597
|
+
|
|
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>
|
|
11602
|
+
</xsl:attribute-set> <!-- END: toc-leader-style -->
|
|
11603
|
+
|
|
11604
|
+
<xsl:attribute-set name="toc-pagenumber-style">
|
|
11605
|
+
</xsl:attribute-set>
|
|
11606
|
+
|
|
11607
|
+
<!-- List of Figures, Tables -->
|
|
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>
|
|
11613
|
+
</xsl:attribute-set>
|
|
11614
|
+
|
|
11615
|
+
<xsl:template name="refine_toc-listof-title-style">
|
|
11616
|
+
</xsl:template>
|
|
11617
|
+
|
|
11618
|
+
<xsl:attribute-set name="toc-listof-item-block-style">
|
|
11619
|
+
</xsl:attribute-set>
|
|
11620
|
+
|
|
11621
|
+
<xsl:attribute-set name="toc-listof-item-style">
|
|
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>
|
|
11626
|
+
</xsl:attribute-set>
|
|
11627
|
+
|
|
11521
11628
|
<xsl:template name="processPrefaceSectionsDefault_Contents">
|
|
11522
11629
|
<xsl:variable name="nodes_preface_">
|
|
11523
11630
|
<xsl:for-each select="/*/mn:preface/*[not(self::mn:note or self::mn:admonition or @type = 'toc')]">
|
|
@@ -11855,7 +11962,7 @@
|
|
|
11855
11962
|
</xsl:if>
|
|
11856
11963
|
|
|
11857
11964
|
<xsl:for-each select="$contents_nodes/mnx:doc">
|
|
11858
|
-
<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">
|
|
11859
11966
|
<xsl:if test="@bundle = 'true'">
|
|
11860
11967
|
<xsl:attribute name="internal-destination"><xsl:value-of select="@firstpage_id"/></xsl:attribute>
|
|
11861
11968
|
</xsl:if>
|
|
@@ -11889,7 +11996,7 @@
|
|
|
11889
11996
|
</xsl:choose>
|
|
11890
11997
|
</fo:bookmark-title>
|
|
11891
11998
|
|
|
11892
|
-
<xsl:apply-templates select="contents/mnx:item" mode="bookmark"/>
|
|
11999
|
+
<xsl:apply-templates select="mnx:contents/mnx:item" mode="bookmark"/>
|
|
11893
12000
|
|
|
11894
12001
|
<xsl:call-template name="insertFigureBookmarks">
|
|
11895
12002
|
<xsl:with-param name="contents" select="mnx:contents"/>
|
|
@@ -48,7 +48,7 @@
|
|
|
48
48
|
<xsl:template name="layout-master-set">
|
|
49
49
|
<fo:layout-master-set>
|
|
50
50
|
<!-- cover page -->
|
|
51
|
-
<fo:simple-page-master master-name="cover" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
51
|
+
<fo:simple-page-master master-name="cover-page" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
|
|
52
52
|
<fo:region-body margin-top="0mm" margin-bottom="5mm" margin-left="0mm" margin-right="5mm"/>
|
|
53
53
|
</fo:simple-page-master>
|
|
54
54
|
|
|
@@ -364,7 +364,7 @@
|
|
|
364
364
|
<xsl:template name="cover-page">
|
|
365
365
|
<!-- =========================== -->
|
|
366
366
|
<!-- Cover Page -->
|
|
367
|
-
<fo:page-sequence master-reference="cover">
|
|
367
|
+
<fo:page-sequence master-reference="cover-page">
|
|
368
368
|
<fo:flow flow-name="xsl-region-body">
|
|
369
369
|
|
|
370
370
|
<xsl:variable name="isCoverPageImage" select="normalize-space(/mn:metanorma/mn:metanorma-extension/mn:presentation-metadata[mn:name = 'coverpage-image']/mn:value/mn:image and 1 = 1)"/>
|
|
@@ -465,7 +465,8 @@
|
|
|
465
465
|
<fo:block font-size="28pt" role="H1" line-height="115%">
|
|
466
466
|
<xsl:copy-of select="$title-main"/>
|
|
467
467
|
<xsl:if test="normalize-space($title-main) = ''">
|
|
468
|
-
<xsl:copy-of select="$title-
|
|
468
|
+
<xsl:copy-of select="$title-main_"/>
|
|
469
|
+
<xsl:if test="normalize-space($title-main_) = ''"><xsl:copy-of select="$title-en"/></xsl:if>
|
|
469
470
|
</xsl:if>
|
|
470
471
|
</fo:block>
|
|
471
472
|
<xsl:if test="normalize-space($title-part) != ''">
|
|
@@ -547,20 +548,20 @@
|
|
|
547
548
|
|
|
548
549
|
<xsl:template name="insertListOf_Title">
|
|
549
550
|
<xsl:param name="title"/>
|
|
550
|
-
<fo:block
|
|
551
|
+
<fo:block xsl:use-attribute-sets="toc-listof-title-style">
|
|
551
552
|
<xsl:value-of select="$title"/>
|
|
552
553
|
</fo:block>
|
|
553
554
|
</xsl:template>
|
|
554
555
|
|
|
555
556
|
<xsl:template name="insertListOf_Item">
|
|
556
|
-
<fo:block
|
|
557
|
+
<fo:block xsl:use-attribute-sets="toc-listof-item-style">
|
|
557
558
|
<fo:basic-link internal-destination="{@id}">
|
|
558
559
|
<xsl:call-template name="setAltText">
|
|
559
560
|
<xsl:with-param name="value" select="@alt-text"/>
|
|
560
561
|
</xsl:call-template>
|
|
561
562
|
<xsl:apply-templates select="." mode="contents"/>
|
|
562
563
|
<fo:inline keep-together.within-line="always">
|
|
563
|
-
<fo:leader
|
|
564
|
+
<fo:leader xsl:use-attribute-sets="toc-leader-style"/>
|
|
564
565
|
<fo:inline><fo:page-number-citation ref-id="{@id}"/></fo:inline>
|
|
565
566
|
</fo:inline>
|
|
566
567
|
</fo:basic-link>
|
|
@@ -603,7 +604,7 @@
|
|
|
603
604
|
</xsl:call-template>
|
|
604
605
|
</xsl:template>
|
|
605
606
|
|
|
606
|
-
<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">
|
|
607
608
|
<!-- Table of Contents -->
|
|
608
609
|
<fo:block>
|
|
609
610
|
|
|
@@ -617,25 +618,14 @@
|
|
|
617
618
|
|
|
618
619
|
<xsl:if test="count(*) = 1 and mn:fmt-title"> <!-- if there isn't user ToC -->
|
|
619
620
|
|
|
620
|
-
<fo:block
|
|
621
|
+
<fo:block role="TOC" xsl:use-attribute-sets="toc-style">
|
|
621
622
|
|
|
622
623
|
<xsl:for-each select="$contents//mnx:item[@display = 'true']"><!-- [not(@level = 2 and starts-with(@section, '0'))] skip clause from preface -->
|
|
623
624
|
<fo:block role="TOCI">
|
|
624
|
-
<fo:list-block>
|
|
625
|
-
|
|
626
|
-
|
|
627
|
-
|
|
628
|
-
<xsl:when test="@level >= 1 and @root = 'annex' and not(@type = 'annex')">13mm</xsl:when>
|
|
629
|
-
<xsl:when test="@level >= 1 and not(@type = 'annex')">
|
|
630
|
-
<xsl:choose>
|
|
631
|
-
<xsl:when test="$toc_level = 3">12.9mm</xsl:when>
|
|
632
|
-
<xsl:when test="$toc_level > 3">15mm</xsl:when>
|
|
633
|
-
<xsl:otherwise>10mm</xsl:otherwise>
|
|
634
|
-
</xsl:choose>
|
|
635
|
-
</xsl:when>
|
|
636
|
-
<xsl:otherwise>0mm</xsl:otherwise>
|
|
637
|
-
</xsl:choose>
|
|
638
|
-
</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
|
+
|
|
639
629
|
<fo:list-item>
|
|
640
630
|
<fo:list-item-label end-indent="label-end()">
|
|
641
631
|
<fo:block id="__internal_layout__toc_sectionnum_{generate-id()}">
|
|
@@ -645,11 +635,11 @@
|
|
|
645
635
|
</fo:block>
|
|
646
636
|
</fo:list-item-label>
|
|
647
637
|
<fo:list-item-body start-indent="body-start()">
|
|
648
|
-
<fo:block
|
|
638
|
+
<fo:block xsl:use-attribute-sets="toc-item-style">
|
|
649
639
|
<fo:basic-link internal-destination="{@id}" fox:alt-text="{mnx:title}">
|
|
650
640
|
<xsl:apply-templates select="mnx:title"/>
|
|
651
641
|
<fo:inline keep-together.within-line="always">
|
|
652
|
-
<fo:leader
|
|
642
|
+
<fo:leader xsl:use-attribute-sets="toc-leader-style"/>
|
|
653
643
|
<fo:inline><fo:page-number-citation ref-id="{@id}"/></fo:inline>
|
|
654
644
|
</fo:inline>
|
|
655
645
|
</fo:basic-link>
|
|
@@ -661,31 +651,31 @@
|
|
|
661
651
|
</xsl:for-each>
|
|
662
652
|
|
|
663
653
|
<!-- List of Tables -->
|
|
664
|
-
<xsl:
|
|
665
|
-
<xsl:
|
|
666
|
-
<xsl:
|
|
667
|
-
|
|
668
|
-
|
|
669
|
-
|
|
670
|
-
|
|
671
|
-
</xsl:
|
|
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>
|
|
672
662
|
|
|
673
663
|
<!-- List of Figures -->
|
|
674
|
-
<xsl:
|
|
675
|
-
<xsl:
|
|
676
|
-
<xsl:
|
|
677
|
-
|
|
678
|
-
|
|
679
|
-
|
|
680
|
-
|
|
681
|
-
</xsl:
|
|
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>
|
|
682
672
|
</fo:block>
|
|
683
673
|
</xsl:if>
|
|
684
674
|
</fo:block>
|
|
685
675
|
</xsl:template>
|
|
686
676
|
|
|
687
677
|
<xsl:template match="mn:preface//mn:clause[@type = 'toc']/mn:fmt-title" priority="3">
|
|
688
|
-
<fo:block
|
|
678
|
+
<fo:block xsl:use-attribute-sets="toc-title-style">
|
|
689
679
|
<fo:block-container width="18.3mm" border-bottom="1.25pt solid black" role="SKIP">
|
|
690
680
|
<fo:block line-height="75%">
|
|
691
681
|
<!-- <xsl:call-template name="getLocalizedString">
|
|
@@ -6219,6 +6209,16 @@
|
|
|
6219
6209
|
</xsl:variable>
|
|
6220
6210
|
<xsl:variable name="quot">"</xsl:variable>
|
|
6221
6211
|
<xsl:variable name="styles_">
|
|
6212
|
+
<!-- PDF: Borderless tables https://github.com/metanorma/metanorma-jis/issues/344 -->
|
|
6213
|
+
<xsl:if test="@plain = 'true' or ancestor::mn:table/@plain = 'true'">
|
|
6214
|
+
<style name="border-top">none</style>
|
|
6215
|
+
<style name="border-right">none</style>
|
|
6216
|
+
<style name="border-left">none</style>
|
|
6217
|
+
<style name="border-bottom">none</style>
|
|
6218
|
+
<style name="color">inherit</style>
|
|
6219
|
+
<style name="background-color">transparent</style>
|
|
6220
|
+
</xsl:if>
|
|
6221
|
+
|
|
6222
6222
|
<xsl:for-each select="xalan:nodeset($styles__)/mnx:item">
|
|
6223
6223
|
<xsl:variable name="key" select="normalize-space(substring-before(., ':'))"/>
|
|
6224
6224
|
<xsl:variable name="value" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
|
|
@@ -8217,7 +8217,10 @@
|
|
|
8217
8217
|
|
|
8218
8218
|
<xsl:call-template name="setNamedDestination"/>
|
|
8219
8219
|
|
|
8220
|
-
<fo:block-container
|
|
8220
|
+
<fo:block-container xsl:use-attribute-sets="note-style" role="SKIP">
|
|
8221
|
+
<xsl:if test="not(parent::mn:references)">
|
|
8222
|
+
<xsl:copy-of select="@id"/>
|
|
8223
|
+
</xsl:if>
|
|
8221
8224
|
|
|
8222
8225
|
<xsl:call-template name="setBlockSpanAll"/>
|
|
8223
8226
|
|
|
@@ -10661,7 +10664,7 @@
|
|
|
10661
10664
|
|
|
10662
10665
|
<xsl:template name="insertFootnoteSeparatorCommon">
|
|
10663
10666
|
<xsl:param name="leader_length">30%</xsl:param>
|
|
10664
|
-
<fo:static-content flow-name="xsl-footnote-separator">
|
|
10667
|
+
<fo:static-content flow-name="xsl-footnote-separator" role="artifact">
|
|
10665
10668
|
<fo:block>
|
|
10666
10669
|
<fo:leader leader-pattern="rule" leader-length="{$leader_length}"/>
|
|
10667
10670
|
</fo:block>
|
|
@@ -10923,8 +10926,8 @@
|
|
|
10923
10926
|
</xsl:template> <!-- bibitem -->
|
|
10924
10927
|
|
|
10925
10928
|
<!-- Bibliography (non-normative references) -->
|
|
10926
|
-
<xsl:template match="mn:references[not(@normative='true')]/mn:bibitem" name="bibitem_non_normative" priority="2">
|
|
10927
|
-
<xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][self::mn:bibitem] and 1 = 1)"/> <!-- current bibiitem is non-first -->
|
|
10929
|
+
<xsl:template match="mn:references[not(@normative='true')]/mn:bibitem | mn:references[not(@normative='true')]/mn:note" name="bibitem_non_normative" priority="2">
|
|
10930
|
+
<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 -->
|
|
10928
10931
|
<xsl:call-template name="bibitem"/>
|
|
10929
10932
|
|
|
10930
10933
|
</xsl:template> <!-- references[not(@normative='true')]/bibitem -->
|
|
@@ -10954,7 +10957,7 @@
|
|
|
10954
10957
|
</fo:list-item>
|
|
10955
10958
|
</xsl:otherwise>
|
|
10956
10959
|
</xsl:choose>
|
|
10957
|
-
<xsl:apply-templates select="following-sibling::*[1][self::mn:bibitem]
|
|
10960
|
+
<xsl:apply-templates select="following-sibling::*[1]"> <!-- [self::mn:bibitem] -->
|
|
10958
10961
|
<xsl:with-param name="skip">false</xsl:with-param>
|
|
10959
10962
|
</xsl:apply-templates>
|
|
10960
10963
|
</xsl:template>
|
|
@@ -10971,8 +10974,26 @@
|
|
|
10971
10974
|
</xsl:apply-templates>
|
|
10972
10975
|
<xsl:apply-templates select="mn:formattedref"/>
|
|
10973
10976
|
<!-- end bibitem processing -->
|
|
10977
|
+
|
|
10978
|
+
<xsl:call-template name="processBibliographyNote"/>
|
|
10974
10979
|
</xsl:template> <!-- processBibitem (bibitem) -->
|
|
10975
10980
|
|
|
10981
|
+
<xsl:template name="processBibliographyNote">
|
|
10982
|
+
<xsl:if test="self::mn:note">
|
|
10983
|
+
<xsl:variable name="note_node">
|
|
10984
|
+
<xsl:element name="{local-name(..)}" namespace="{$namespace_full}"> <!-- save parent context node for determining styles -->
|
|
10985
|
+
<xsl:copy> <!-- skip @id -->
|
|
10986
|
+
<xsl:copy-of select="node()"/>
|
|
10987
|
+
</xsl:copy>
|
|
10988
|
+
</xsl:element>
|
|
10989
|
+
</xsl:variable>
|
|
10990
|
+
<!-- <xsl:for-each select="xalan:nodeset($note_node)//mn:note">
|
|
10991
|
+
<xsl:call-template name="note"/>
|
|
10992
|
+
</xsl:for-each> -->
|
|
10993
|
+
<xsl:call-template name="note"/>
|
|
10994
|
+
</xsl:if>
|
|
10995
|
+
</xsl:template>
|
|
10996
|
+
|
|
10976
10997
|
<xsl:template match="mn:title" mode="title">
|
|
10977
10998
|
<fo:inline><xsl:apply-templates/></fo:inline>
|
|
10978
10999
|
</xsl:template>
|
|
@@ -11518,6 +11539,92 @@
|
|
|
11518
11539
|
<!-- End Form's elements processing -->
|
|
11519
11540
|
<!-- =================== -->
|
|
11520
11541
|
|
|
11542
|
+
<xsl:attribute-set name="toc-style">
|
|
11543
|
+
<xsl:attribute name="line-height">115%</xsl:attribute>
|
|
11544
|
+
</xsl:attribute-set>
|
|
11545
|
+
|
|
11546
|
+
<xsl:template name="refine_toc-style">
|
|
11547
|
+
</xsl:template>
|
|
11548
|
+
|
|
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>
|
|
11555
|
+
</xsl:attribute-set>
|
|
11556
|
+
|
|
11557
|
+
<xsl:template name="refine_toc-title-style">
|
|
11558
|
+
</xsl:template>
|
|
11559
|
+
|
|
11560
|
+
<xsl:attribute-set name="toc-title-page-style">
|
|
11561
|
+
</xsl:attribute-set> <!-- toc-title-page-style -->
|
|
11562
|
+
|
|
11563
|
+
<xsl:template name="refine_toc-title-page-style">
|
|
11564
|
+
</xsl:template>
|
|
11565
|
+
|
|
11566
|
+
<xsl:attribute-set name="toc-item-block-style">
|
|
11567
|
+
<xsl:attribute name="provisional-distance-between-starts">10mm</xsl:attribute>
|
|
11568
|
+
</xsl:attribute-set>
|
|
11569
|
+
|
|
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 >= 1 and @root = 'preface'">0mm</xsl:when>
|
|
11574
|
+
<xsl:when test="@level >= 1 and @root = 'annex' and not(@type = 'annex')">13mm</xsl:when>
|
|
11575
|
+
<xsl:when test="@level >= 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 > 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>
|
|
11585
|
+
</xsl:template>
|
|
11586
|
+
|
|
11587
|
+
<xsl:attribute-set name="toc-item-style">
|
|
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>
|
|
11593
|
+
</xsl:attribute-set> <!-- END: toc-item-style -->
|
|
11594
|
+
|
|
11595
|
+
<xsl:template name="refine_toc-item-style">
|
|
11596
|
+
</xsl:template> <!-- END: refine_toc-item-style -->
|
|
11597
|
+
|
|
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>
|
|
11602
|
+
</xsl:attribute-set> <!-- END: toc-leader-style -->
|
|
11603
|
+
|
|
11604
|
+
<xsl:attribute-set name="toc-pagenumber-style">
|
|
11605
|
+
</xsl:attribute-set>
|
|
11606
|
+
|
|
11607
|
+
<!-- List of Figures, Tables -->
|
|
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>
|
|
11613
|
+
</xsl:attribute-set>
|
|
11614
|
+
|
|
11615
|
+
<xsl:template name="refine_toc-listof-title-style">
|
|
11616
|
+
</xsl:template>
|
|
11617
|
+
|
|
11618
|
+
<xsl:attribute-set name="toc-listof-item-block-style">
|
|
11619
|
+
</xsl:attribute-set>
|
|
11620
|
+
|
|
11621
|
+
<xsl:attribute-set name="toc-listof-item-style">
|
|
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>
|
|
11626
|
+
</xsl:attribute-set>
|
|
11627
|
+
|
|
11521
11628
|
<xsl:template name="processPrefaceSectionsDefault_Contents">
|
|
11522
11629
|
<xsl:variable name="nodes_preface_">
|
|
11523
11630
|
<xsl:for-each select="/*/mn:preface/*[not(self::mn:note or self::mn:admonition or @type = 'toc')]">
|
|
@@ -11855,7 +11962,7 @@
|
|
|
11855
11962
|
</xsl:if>
|
|
11856
11963
|
|
|
11857
11964
|
<xsl:for-each select="$contents_nodes/mnx:doc">
|
|
11858
|
-
<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">
|
|
11859
11966
|
<xsl:if test="@bundle = 'true'">
|
|
11860
11967
|
<xsl:attribute name="internal-destination"><xsl:value-of select="@firstpage_id"/></xsl:attribute>
|
|
11861
11968
|
</xsl:if>
|
|
@@ -11889,7 +11996,7 @@
|
|
|
11889
11996
|
</xsl:choose>
|
|
11890
11997
|
</fo:bookmark-title>
|
|
11891
11998
|
|
|
11892
|
-
<xsl:apply-templates select="contents/mnx:item" mode="bookmark"/>
|
|
11999
|
+
<xsl:apply-templates select="mnx:contents/mnx:item" mode="bookmark"/>
|
|
11893
12000
|
|
|
11894
12001
|
<xsl:call-template name="insertFigureBookmarks">
|
|
11895
12002
|
<xsl:with-param name="contents" select="mnx:contents"/>
|
|
@@ -92,8 +92,9 @@ _bib)
|
|
|
92
92
|
end
|
|
93
93
|
|
|
94
94
|
def dochistory_description(item)
|
|
95
|
-
d = item.
|
|
96
|
-
d.
|
|
95
|
+
d = item.xpath(ns("./amend/description"))
|
|
96
|
+
d.empty? and return ""
|
|
97
|
+
d.map { |d1| semx_fmt_dup(d1).to_xml }.join("\n")
|
|
97
98
|
end
|
|
98
99
|
|
|
99
100
|
def ddMMMyyyy(isodate)
|
|
@@ -198,14 +198,14 @@ Applicable to modify and delete</a:documentation>
|
|
|
198
198
|
</zeroOrMore>
|
|
199
199
|
</element>
|
|
200
200
|
</optional>
|
|
201
|
-
<
|
|
201
|
+
<zeroOrMore>
|
|
202
202
|
<element name="description">
|
|
203
|
-
<a:documentation>Description of the change described in this block</a:documentation>
|
|
204
|
-
<
|
|
203
|
+
<a:documentation>Description(s) of the change described in this block</a:documentation>
|
|
204
|
+
<oneOrMore>
|
|
205
205
|
<ref name="BasicBlock"/>
|
|
206
|
-
</
|
|
206
|
+
</oneOrMore>
|
|
207
207
|
</element>
|
|
208
|
-
</
|
|
208
|
+
</zeroOrMore>
|
|
209
209
|
<optional>
|
|
210
210
|
<element name="newcontent">
|
|
211
211
|
<a:documentation>New content to be added to the document; applicable to add and modify</a:documentation>
|
|
@@ -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"/>
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
2
2
|
<grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
|
|
3
|
-
<!-- VERSION v2.0
|
|
3
|
+
<!-- VERSION v2.1.0 -->
|
|
4
4
|
|
|
5
5
|
<!--
|
|
6
6
|
ALERT: cannot have root comments, because of https://github.com/metanorma/metanorma/issues/437
|
|
@@ -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">
|
|
@@ -735,6 +683,12 @@ titlecase, or lowercase</a:documentation>
|
|
|
735
683
|
<ref name="BlockAttributes"/>
|
|
736
684
|
</define>
|
|
737
685
|
<define name="TableAttributes" combine="interleave">
|
|
686
|
+
<optional>
|
|
687
|
+
<attribute name="plain">
|
|
688
|
+
<a:documentation>Render as a plain attribute, with no shading or borders</a:documentation>
|
|
689
|
+
<data type="boolean"/>
|
|
690
|
+
</attribute>
|
|
691
|
+
</optional>
|
|
738
692
|
<optional>
|
|
739
693
|
<attribute name="width">
|
|
740
694
|
<a:documentation>Width of the table block in rendering</a:documentation>
|
|
@@ -1088,7 +1042,6 @@ That concept may be defined as a term within the current document, or it may be
|
|
|
1088
1042
|
<zeroOrMore>
|
|
1089
1043
|
<choice>
|
|
1090
1044
|
<ref name="PureTextElement"/>
|
|
1091
|
-
<ref name="stem"/>
|
|
1092
1045
|
<ref name="index"/>
|
|
1093
1046
|
<ref name="index-xref"/>
|
|
1094
1047
|
</choice>
|
|
@@ -1101,7 +1054,6 @@ That concept may be defined as a term within the current document, or it may be
|
|
|
1101
1054
|
<zeroOrMore>
|
|
1102
1055
|
<choice>
|
|
1103
1056
|
<ref name="PureTextElement"/>
|
|
1104
|
-
<ref name="stem"/>
|
|
1105
1057
|
<ref name="index"/>
|
|
1106
1058
|
<ref name="index-xref"/>
|
|
1107
1059
|
</choice>
|
|
@@ -2019,10 +1971,7 @@ used in document amendments</a:documentation>
|
|
|
2019
1971
|
<element name="name">
|
|
2020
1972
|
<a:documentation>The symbolic form of the designation</a:documentation>
|
|
2021
1973
|
<oneOrMore>
|
|
2022
|
-
<
|
|
2023
|
-
<ref name="PureTextElement"/>
|
|
2024
|
-
<ref name="stem"/>
|
|
2025
|
-
</choice>
|
|
1974
|
+
<ref name="PureTextElement"/>
|
|
2026
1975
|
</oneOrMore>
|
|
2027
1976
|
</element>
|
|
2028
1977
|
</element>
|
|
@@ -2075,7 +2024,6 @@ used in document amendments</a:documentation>
|
|
|
2075
2024
|
<zeroOrMore>
|
|
2076
2025
|
<choice>
|
|
2077
2026
|
<ref name="PureTextElement"/>
|
|
2078
|
-
<ref name="stem"/>
|
|
2079
2027
|
<ref name="index"/>
|
|
2080
2028
|
<ref name="index-xref"/>
|
|
2081
2029
|
</choice>
|
data/metanorma-iho.gemspec
CHANGED
|
@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
|
|
|
27
27
|
spec.require_paths = ["lib"]
|
|
28
28
|
spec.required_ruby_version = Gem::Requirement.new(">= 3.1.0")
|
|
29
29
|
|
|
30
|
-
spec.add_dependency "metanorma-generic", "~> 3.0
|
|
30
|
+
spec.add_dependency "metanorma-generic", "~> 3.1.0"
|
|
31
31
|
|
|
32
32
|
spec.add_development_dependency "debug"
|
|
33
33
|
spec.add_development_dependency "equivalent-xml", "~> 0.6"
|
|
@@ -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 "
|
|
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.
|
|
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-
|
|
11
|
+
date: 2025-08-04 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: metanorma-generic
|
|
@@ -16,14 +16,14 @@ dependencies:
|
|
|
16
16
|
requirements:
|
|
17
17
|
- - "~>"
|
|
18
18
|
- !ruby/object:Gem::Version
|
|
19
|
-
version: 3.0
|
|
19
|
+
version: 3.1.0
|
|
20
20
|
type: :runtime
|
|
21
21
|
prerelease: false
|
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
|
23
23
|
requirements:
|
|
24
24
|
- - "~>"
|
|
25
25
|
- !ruby/object:Gem::Version
|
|
26
|
-
version: 3.0
|
|
26
|
+
version: 3.1.0
|
|
27
27
|
- !ruby/object:Gem::Dependency
|
|
28
28
|
name: debug
|
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -179,7 +179,7 @@ dependencies:
|
|
|
179
179
|
- !ruby/object:Gem::Version
|
|
180
180
|
version: '0.9'
|
|
181
181
|
- !ruby/object:Gem::Dependency
|
|
182
|
-
name:
|
|
182
|
+
name: canon
|
|
183
183
|
requirement: !ruby/object:Gem::Requirement
|
|
184
184
|
requirements:
|
|
185
185
|
- - ">="
|