metanorma-plateau 1.1.5 → 1.1.7
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/lib/isodoc/plateau/init.rb +1 -1
- data/lib/isodoc/plateau/plateau.international-standard.xsl +258 -263
- data/lib/isodoc/plateau/presentation_xml_convert.rb +0 -2
- data/lib/metanorma/plateau/biblio.rng +1 -1
- data/lib/metanorma/plateau/cleanup.rb +4 -2
- data/lib/metanorma/plateau/isodoc.rng +35 -10
- data/lib/metanorma/plateau/version.rb +1 -1
- data/metanorma-plateau.gemspec +1 -1
- metadata +6 -6
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: dc668fc3016f9b8a7396df9d79751fe7e0262923b7074b778553d775ccbac26e
|
|
4
|
+
data.tar.gz: ad93f003c5395ef1a0bcdcc26b1afd8aa8c149e031a87cf03671c59f3fffc836
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 982c770bf96dbb3a95b71936c0f48327d3741be40fce1854b0569e7a63b069e7d242f0d7bbd5e31f69fbca607788e5ee3091035fa5ee5049f59196d415926445
|
|
7
|
+
data.tar.gz: e0f1fc46ed7623320d33c4af36febe6e67a37ebf0a802abef630e1c109289df9427f240e2e16a93e730ecca96fe2181680778363207c0985319dddb8d56a7ce1
|
data/lib/isodoc/plateau/init.rb
CHANGED
|
@@ -252,6 +252,8 @@
|
|
|
252
252
|
<xsl:with-param name="num" select="$num"/>
|
|
253
253
|
</xsl:call-template>
|
|
254
254
|
|
|
255
|
+
<xsl:call-template name="inner-cover-page"/>
|
|
256
|
+
|
|
255
257
|
<!-- ========================== -->
|
|
256
258
|
<!-- Preface and contents pages -->
|
|
257
259
|
<!-- ========================== -->
|
|
@@ -584,145 +586,155 @@
|
|
|
584
586
|
|
|
585
587
|
<xsl:template name="cover-page">
|
|
586
588
|
<xsl:param name="num"/>
|
|
587
|
-
<
|
|
588
|
-
|
|
589
|
-
|
|
590
|
-
|
|
591
|
-
|
|
592
|
-
|
|
593
|
-
<xsl:attribute name="font-family">Noto Sans</xsl:attribute>
|
|
594
|
-
</xsl:if>
|
|
595
|
-
|
|
596
|
-
<fo:static-content flow-name="header" role="artifact" id="__internal_layout__coverpage_header_{generate-id()}">
|
|
597
|
-
<!-- background cover image -->
|
|
598
|
-
<xsl:call-template name="insertBackgroundPageImage"/>
|
|
599
|
-
</fo:static-content>
|
|
600
|
-
|
|
601
|
-
<fo:static-content flow-name="footer" role="artifact">
|
|
602
|
-
<fo:block-container>
|
|
603
|
-
<fo:table table-layout="fixed" width="100%">
|
|
604
|
-
<fo:table-column column-width="proportional-column-width(140)"/>
|
|
605
|
-
<fo:table-column column-width="proportional-column-width(13.5)"/>
|
|
606
|
-
<xsl:choose>
|
|
607
|
-
<xsl:when test="$doctype = 'technical-report'">
|
|
608
|
-
<fo:table-column column-width="proportional-column-width(20)"/>
|
|
609
|
-
</xsl:when>
|
|
610
|
-
<xsl:otherwise>
|
|
611
|
-
<fo:table-column column-width="proportional-column-width(11)"/>
|
|
612
|
-
</xsl:otherwise>
|
|
613
|
-
</xsl:choose>
|
|
614
|
-
<fo:table-body>
|
|
615
|
-
<fo:table-row>
|
|
616
|
-
<fo:table-cell>
|
|
617
|
-
<fo:block font-size="28pt" font-family="Noto Sans JP">
|
|
618
|
-
<xsl:if test="$doctype = 'annex'">
|
|
619
|
-
<xsl:attribute name="text-indent">-7mm</xsl:attribute>
|
|
620
|
-
<xsl:value-of select="concat('（', $i18n_doctype_dict_annex)"/>
|
|
621
|
-
<fo:inline letter-spacing="-3mm">）</fo:inline>
|
|
622
|
-
</xsl:if>
|
|
623
|
-
<xsl:if test="$doctype = 'technical-report'">
|
|
624
|
-
<xsl:attribute name="font-size">18pt</xsl:attribute>
|
|
625
|
-
<xsl:attribute name="line-height">1.8</xsl:attribute>
|
|
626
|
-
</xsl:if>
|
|
627
|
-
<xsl:variable name="title">
|
|
628
|
-
<xsl:apply-templates select="/*/mn:bibdata/mn:title[@language = 'ja' and @type = 'title-main']/node()"/>
|
|
629
|
-
</xsl:variable>
|
|
630
|
-
<xsl:copy-of select="$title"/>
|
|
631
|
-
<xsl:if test="$doctype = 'technical-report'">
|
|
632
|
-
<xsl:choose>
|
|
633
|
-
<xsl:when test="string-length($title) > 60">
|
|
634
|
-
<fo:inline> <xsl:value-of select="$i18n_doctype_dict_technical_report"/></fo:inline>
|
|
635
|
-
</xsl:when>
|
|
636
|
-
<xsl:otherwise>
|
|
637
|
-
<fo:block><xsl:value-of select="$i18n_doctype_dict_technical_report"/></fo:block>
|
|
638
|
-
</xsl:otherwise>
|
|
639
|
-
</xsl:choose>
|
|
640
|
-
</xsl:if>
|
|
641
|
-
</fo:block>
|
|
642
|
-
<fo:block font-size="14pt" margin-top="3mm">
|
|
643
|
-
<xsl:if test="$doctype = 'technical-report'">
|
|
644
|
-
<xsl:attribute name="font-size">9pt</xsl:attribute>
|
|
645
|
-
<xsl:attribute name="margin-top">1mm</xsl:attribute>
|
|
646
|
-
</xsl:if>
|
|
647
|
-
<xsl:apply-templates select="/*/mn:bibdata/mn:title[@language = 'en' and @type = 'title-main']/node()"/>
|
|
648
|
-
</fo:block>
|
|
649
|
-
</fo:table-cell>
|
|
650
|
-
<fo:table-cell text-align="right" font-size="8.5pt" padding-top="3mm" padding-right="2mm">
|
|
651
|
-
<xsl:if test="$doctype = 'technical-report'">
|
|
652
|
-
<xsl:attribute name="font-size">9.5pt</xsl:attribute>
|
|
653
|
-
<xsl:attribute name="padding-top">2mm</xsl:attribute>
|
|
654
|
-
</xsl:if>
|
|
655
|
-
<fo:block>series</fo:block>
|
|
656
|
-
<fo:block>No.</fo:block>
|
|
657
|
-
</fo:table-cell>
|
|
658
|
-
<fo:table-cell text-align="right">
|
|
659
|
-
<xsl:if test="$doctype = 'technical-report'">
|
|
660
|
-
<xsl:attribute name="text-align">center</xsl:attribute>
|
|
661
|
-
</xsl:if>
|
|
662
|
-
<fo:block font-size="32pt">
|
|
663
|
-
<xsl:if test="$doctype = 'technical-report'">
|
|
664
|
-
<xsl:attribute name="font-size">28pt</xsl:attribute>
|
|
665
|
-
</xsl:if>
|
|
666
|
-
<xsl:variable name="docnumber" select="/*/mn:bibdata/mn:docnumber"/>
|
|
667
|
-
<xsl:if test="string-length($docnumber) = 1">0</xsl:if><xsl:value-of select="$docnumber"/>
|
|
668
|
-
</fo:block>
|
|
669
|
-
</fo:table-cell>
|
|
670
|
-
</fo:table-row>
|
|
671
|
-
</fo:table-body>
|
|
672
|
-
</fo:table>
|
|
673
|
-
</fo:block-container>
|
|
674
|
-
</fo:static-content>
|
|
589
|
+
<xsl:choose>
|
|
590
|
+
<xsl:when test="/mn:metanorma/mn:metanorma-extension/mn:presentation-metadata[mn:name = 'coverpage-image']/mn:value/mn:image and normalize-space(/mn:metanorma/mn:metanorma-extension/mn:presentation-metadata/mn:full-coverpage-replacement) = 'true'">
|
|
591
|
+
<xsl:call-template name="insertCoverPageFullImage"/>
|
|
592
|
+
</xsl:when>
|
|
593
|
+
<xsl:otherwise>
|
|
594
|
+
<fo:page-sequence master-reference="cover-page" force-page-count="no-force" font-family="Noto Sans Condensed">
|
|
675
595
|
|
|
676
|
-
|
|
677
|
-
|
|
678
|
-
<xsl:if test="$doctype = 'technical-report'">
|
|
679
|
-
<xsl:attribute name="margin-left">5.5mm</xsl:attribute>
|
|
596
|
+
<xsl:if test="$doctype = 'annex'">
|
|
597
|
+
<xsl:attribute name="color">white</xsl:attribute>
|
|
680
598
|
</xsl:if>
|
|
681
|
-
<fo:instream-foreign-object content-width="24mm" fox:alt-text="PLATEAU Logo">
|
|
682
|
-
<xsl:if test="$doctype = 'technical-report'">
|
|
683
|
-
<xsl:attribute name="content-width">20.5mm</xsl:attribute>
|
|
684
|
-
</xsl:if>
|
|
685
|
-
<xsl:choose>
|
|
686
|
-
<xsl:when test="$doctype = 'annex'">
|
|
687
|
-
<xsl:copy-of select="$PLATEAU-Logo-inverted"/>
|
|
688
|
-
</xsl:when>
|
|
689
|
-
<xsl:otherwise>
|
|
690
|
-
<xsl:copy-of select="$PLATEAU-Logo"/>
|
|
691
|
-
</xsl:otherwise>
|
|
692
|
-
</xsl:choose>
|
|
693
|
-
</fo:instream-foreign-object>
|
|
694
|
-
</fo:block>
|
|
695
|
-
<fo:block-container reference-orientation="-90" width="205mm" height="36mm" margin-top="6mm">
|
|
696
599
|
<xsl:if test="$doctype = 'technical-report'">
|
|
697
|
-
<xsl:attribute name="
|
|
600
|
+
<xsl:attribute name="font-family">Noto Sans</xsl:attribute>
|
|
698
601
|
</xsl:if>
|
|
699
|
-
<fo:block font-size="21.2pt" margin-top="7mm">
|
|
700
|
-
<xsl:if test="$doctype = 'technical-report'">
|
|
701
|
-
<xsl:attribute name="font-size">16pt</xsl:attribute>
|
|
702
|
-
<xsl:attribute name="margin-top">8mm</xsl:attribute>
|
|
703
|
-
</xsl:if>
|
|
704
|
-
<xsl:apply-templates select="/*/mn:bibdata/mn:title[@language = 'en' and @type = 'title-intro']/node()"/>
|
|
705
|
-
</fo:block>
|
|
706
|
-
<fo:block font-family="Noto Sans JP" font-size="14.2pt" margin-top="2mm">
|
|
707
|
-
<xsl:if test="$doctype = 'annex'">
|
|
708
|
-
<xsl:attribute name="text-indent">-3.5mm</xsl:attribute>
|
|
709
|
-
<xsl:value-of select="concat('（', $i18n_doctype_dict_annex)"/>
|
|
710
|
-
<fo:inline letter-spacing="-1mm">）</fo:inline>
|
|
711
|
-
</xsl:if>
|
|
712
|
-
<xsl:if test="$doctype = 'technical-report'">
|
|
713
|
-
<xsl:attribute name="font-size">12pt</xsl:attribute>
|
|
714
|
-
</xsl:if>
|
|
715
|
-
<xsl:apply-templates select="/*/mn:bibdata/mn:title[@language = 'ja' and @type = 'title-intro']/node()"/>
|
|
716
|
-
</fo:block>
|
|
717
|
-
</fo:block-container>
|
|
718
|
-
</fo:static-content>
|
|
719
602
|
|
|
720
|
-
|
|
721
|
-
|
|
722
|
-
|
|
723
|
-
|
|
603
|
+
<fo:static-content flow-name="header" role="artifact" id="__internal_layout__coverpage_header_{generate-id()}">
|
|
604
|
+
<!-- background cover image -->
|
|
605
|
+
<xsl:call-template name="insertBackgroundPageImage"/>
|
|
606
|
+
</fo:static-content>
|
|
607
|
+
|
|
608
|
+
<fo:static-content flow-name="footer" role="artifact">
|
|
609
|
+
<fo:block-container>
|
|
610
|
+
<fo:table table-layout="fixed" width="100%">
|
|
611
|
+
<fo:table-column column-width="proportional-column-width(140)"/>
|
|
612
|
+
<fo:table-column column-width="proportional-column-width(13.5)"/>
|
|
613
|
+
<xsl:choose>
|
|
614
|
+
<xsl:when test="$doctype = 'technical-report'">
|
|
615
|
+
<fo:table-column column-width="proportional-column-width(20)"/>
|
|
616
|
+
</xsl:when>
|
|
617
|
+
<xsl:otherwise>
|
|
618
|
+
<fo:table-column column-width="proportional-column-width(11)"/>
|
|
619
|
+
</xsl:otherwise>
|
|
620
|
+
</xsl:choose>
|
|
621
|
+
<fo:table-body>
|
|
622
|
+
<fo:table-row>
|
|
623
|
+
<fo:table-cell>
|
|
624
|
+
<fo:block font-size="28pt" font-family="Noto Sans JP">
|
|
625
|
+
<xsl:if test="$doctype = 'annex'">
|
|
626
|
+
<xsl:attribute name="text-indent">-7mm</xsl:attribute>
|
|
627
|
+
<xsl:value-of select="concat('（', $i18n_doctype_dict_annex)"/>
|
|
628
|
+
<fo:inline letter-spacing="-3mm">）</fo:inline>
|
|
629
|
+
</xsl:if>
|
|
630
|
+
<xsl:if test="$doctype = 'technical-report'">
|
|
631
|
+
<xsl:attribute name="font-size">18pt</xsl:attribute>
|
|
632
|
+
<xsl:attribute name="line-height">1.8</xsl:attribute>
|
|
633
|
+
</xsl:if>
|
|
634
|
+
<xsl:variable name="title">
|
|
635
|
+
<xsl:apply-templates select="/*/mn:bibdata/mn:title[@language = 'ja' and @type = 'title-main']/node()"/>
|
|
636
|
+
</xsl:variable>
|
|
637
|
+
<xsl:copy-of select="$title"/>
|
|
638
|
+
<xsl:if test="$doctype = 'technical-report'">
|
|
639
|
+
<xsl:choose>
|
|
640
|
+
<xsl:when test="string-length($title) > 60">
|
|
641
|
+
<fo:inline> <xsl:value-of select="$i18n_doctype_dict_technical_report"/></fo:inline>
|
|
642
|
+
</xsl:when>
|
|
643
|
+
<xsl:otherwise>
|
|
644
|
+
<fo:block><xsl:value-of select="$i18n_doctype_dict_technical_report"/></fo:block>
|
|
645
|
+
</xsl:otherwise>
|
|
646
|
+
</xsl:choose>
|
|
647
|
+
</xsl:if>
|
|
648
|
+
</fo:block>
|
|
649
|
+
<fo:block font-size="14pt" margin-top="3mm">
|
|
650
|
+
<xsl:if test="$doctype = 'technical-report'">
|
|
651
|
+
<xsl:attribute name="font-size">9pt</xsl:attribute>
|
|
652
|
+
<xsl:attribute name="margin-top">1mm</xsl:attribute>
|
|
653
|
+
</xsl:if>
|
|
654
|
+
<xsl:apply-templates select="/*/mn:bibdata/mn:title[@language = 'en' and @type = 'title-main']/node()"/>
|
|
655
|
+
</fo:block>
|
|
656
|
+
</fo:table-cell>
|
|
657
|
+
<fo:table-cell text-align="right" font-size="8.5pt" padding-top="3mm" padding-right="2mm">
|
|
658
|
+
<xsl:if test="$doctype = 'technical-report'">
|
|
659
|
+
<xsl:attribute name="font-size">9.5pt</xsl:attribute>
|
|
660
|
+
<xsl:attribute name="padding-top">2mm</xsl:attribute>
|
|
661
|
+
</xsl:if>
|
|
662
|
+
<fo:block>series</fo:block>
|
|
663
|
+
<fo:block>No.</fo:block>
|
|
664
|
+
</fo:table-cell>
|
|
665
|
+
<fo:table-cell text-align="right">
|
|
666
|
+
<xsl:if test="$doctype = 'technical-report'">
|
|
667
|
+
<xsl:attribute name="text-align">center</xsl:attribute>
|
|
668
|
+
</xsl:if>
|
|
669
|
+
<fo:block font-size="32pt">
|
|
670
|
+
<xsl:if test="$doctype = 'technical-report'">
|
|
671
|
+
<xsl:attribute name="font-size">28pt</xsl:attribute>
|
|
672
|
+
</xsl:if>
|
|
673
|
+
<xsl:variable name="docnumber" select="/*/mn:bibdata/mn:docnumber"/>
|
|
674
|
+
<xsl:if test="string-length($docnumber) = 1">0</xsl:if><xsl:value-of select="$docnumber"/>
|
|
675
|
+
</fo:block>
|
|
676
|
+
</fo:table-cell>
|
|
677
|
+
</fo:table-row>
|
|
678
|
+
</fo:table-body>
|
|
679
|
+
</fo:table>
|
|
680
|
+
</fo:block-container>
|
|
681
|
+
</fo:static-content>
|
|
682
|
+
|
|
683
|
+
<fo:static-content flow-name="left-region" role="artifact" id="__internal_layout__coverpage_left_region_{generate-id()}">
|
|
684
|
+
<fo:block text-align="center" margin-top="14.5mm" margin-left="2mm">
|
|
685
|
+
<xsl:if test="$doctype = 'technical-report'">
|
|
686
|
+
<xsl:attribute name="margin-left">5.5mm</xsl:attribute>
|
|
687
|
+
</xsl:if>
|
|
688
|
+
<fo:instream-foreign-object content-width="24mm" fox:alt-text="PLATEAU Logo">
|
|
689
|
+
<xsl:if test="$doctype = 'technical-report'">
|
|
690
|
+
<xsl:attribute name="content-width">20.5mm</xsl:attribute>
|
|
691
|
+
</xsl:if>
|
|
692
|
+
<xsl:choose>
|
|
693
|
+
<xsl:when test="$doctype = 'annex'">
|
|
694
|
+
<xsl:copy-of select="$PLATEAU-Logo-inverted"/>
|
|
695
|
+
</xsl:when>
|
|
696
|
+
<xsl:otherwise>
|
|
697
|
+
<xsl:copy-of select="$PLATEAU-Logo"/>
|
|
698
|
+
</xsl:otherwise>
|
|
699
|
+
</xsl:choose>
|
|
700
|
+
</fo:instream-foreign-object>
|
|
701
|
+
</fo:block>
|
|
702
|
+
<fo:block-container reference-orientation="-90" width="205mm" height="36mm" margin-top="6mm">
|
|
703
|
+
<xsl:if test="$doctype = 'technical-report'">
|
|
704
|
+
<xsl:attribute name="margin-top">2mm</xsl:attribute>
|
|
705
|
+
</xsl:if>
|
|
706
|
+
<fo:block font-size="21.2pt" margin-top="7mm">
|
|
707
|
+
<xsl:if test="$doctype = 'technical-report'">
|
|
708
|
+
<xsl:attribute name="font-size">16pt</xsl:attribute>
|
|
709
|
+
<xsl:attribute name="margin-top">8mm</xsl:attribute>
|
|
710
|
+
</xsl:if>
|
|
711
|
+
<xsl:apply-templates select="/*/mn:bibdata/mn:title[@language = 'en' and @type = 'title-intro']/node()"/>
|
|
712
|
+
</fo:block>
|
|
713
|
+
<fo:block font-family="Noto Sans JP" font-size="14.2pt" margin-top="2mm">
|
|
714
|
+
<xsl:if test="$doctype = 'annex'">
|
|
715
|
+
<xsl:attribute name="text-indent">-3.5mm</xsl:attribute>
|
|
716
|
+
<xsl:value-of select="concat('（', $i18n_doctype_dict_annex)"/>
|
|
717
|
+
<fo:inline letter-spacing="-1mm">）</fo:inline>
|
|
718
|
+
</xsl:if>
|
|
719
|
+
<xsl:if test="$doctype = 'technical-report'">
|
|
720
|
+
<xsl:attribute name="font-size">12pt</xsl:attribute>
|
|
721
|
+
</xsl:if>
|
|
722
|
+
<xsl:apply-templates select="/*/mn:bibdata/mn:title[@language = 'ja' and @type = 'title-intro']/node()"/>
|
|
723
|
+
</fo:block>
|
|
724
|
+
</fo:block-container>
|
|
725
|
+
</fo:static-content>
|
|
726
|
+
|
|
727
|
+
<fo:flow flow-name="xsl-region-body">
|
|
728
|
+
<fo:block id="firstpage_id_{$num}"> </fo:block>
|
|
729
|
+
</fo:flow>
|
|
730
|
+
</fo:page-sequence>
|
|
731
|
+
</xsl:otherwise>
|
|
732
|
+
</xsl:choose>
|
|
724
733
|
</xsl:template> <!-- cover-page -->
|
|
725
734
|
|
|
735
|
+
<xsl:template name="inner-cover-page">
|
|
736
|
+
</xsl:template>
|
|
737
|
+
|
|
726
738
|
<xsl:template match="mn:p[@class = 'JapaneseIndustrialStandard']" priority="4"/>
|
|
727
739
|
<xsl:template match="mn:p[@class = 'StandardNumber']" priority="4"/>
|
|
728
740
|
<xsl:template match="mn:p[@class = 'IDT']" priority="4"/>
|
|
@@ -1579,7 +1591,7 @@
|
|
|
1579
1591
|
</xsl:template>
|
|
1580
1592
|
|
|
1581
1593
|
<!-- <name>注記 1</name> to <name>注記<font_en> 1</font_en></name> -->
|
|
1582
|
-
<xsl:template match="mn:title/text() | mn:fmt-title/text() | mn:note/mn:name/text() | mn:note/mn:fmt-name/text() | mn:termnote/mn:name/text() | mn:termnote/mn:fmt-name/text() | mn:table/mn:name/text() | mn:table/mn:fmt-name/text() | mn:figure/mn:name/text() | mn:figure/mn:fmt-name/text() | mn:termexample/mn:name/text() | mn:termexample/mn:fmt-name/text() | mn:xref//text() | mn:fmt-xref//text() | mn:origin/text() | mn:fmt-origin/text()" mode="update_xml_step1">
|
|
1594
|
+
<xsl:template match="mn:title/text() | mn:fmt-title/text() | mn:note/mn:name/text() | mn:note/mn:fmt-name/text() | mn:termnote/mn:name/text() | mn:termnote/mn:fmt-name/text() | mn:table/mn:name/text() | mn:table/mn:fmt-name/text() | mn:figure/mn:name/text() | mn:figure/mn:fmt-name/text() | mn:termexample/mn:name/text() | mn:termexample/mn:fmt-name/text() | mn:xref//text() | mn:fmt-xref//text() | mn:origin/text() | mn:fmt-origin/text() | mn:fmt-link/text()" mode="update_xml_step1">
|
|
1583
1595
|
<xsl:variable name="text_en_" select="java:replaceAll(java:java.lang.String.new(.), $regex_en, concat($tag_font_en_bold_open,'$1',$tag_font_en_bold_close))"/>
|
|
1584
1596
|
<xsl:variable name="text_en">
|
|
1585
1597
|
<xsl:element name="text" namespace="{$namespace_full}">
|
|
@@ -1839,32 +1851,7 @@
|
|
|
1839
1851
|
|
|
1840
1852
|
<xsl:template name="insertHeaderFooter">
|
|
1841
1853
|
<xsl:call-template name="insertHeader"/>
|
|
1842
|
-
<
|
|
1843
|
-
<xsl:choose>
|
|
1844
|
-
<xsl:when test="$doctype = 'technical-report'">
|
|
1845
|
-
<fo:block-container height="23mm" display-align="after">
|
|
1846
|
-
<fo:block text-align="center" margin-bottom="16mm">
|
|
1847
|
-
<xsl:if test="$vertical_layout = 'true'">
|
|
1848
|
-
<xsl:attribute name="margin-bottom">0mm</xsl:attribute>
|
|
1849
|
-
</xsl:if>
|
|
1850
|
-
<xsl:text>- </xsl:text>
|
|
1851
|
-
<fo:page-number/>
|
|
1852
|
-
<xsl:text> -</xsl:text>
|
|
1853
|
-
</fo:block>
|
|
1854
|
-
</fo:block-container>
|
|
1855
|
-
</xsl:when>
|
|
1856
|
-
<xsl:otherwise>
|
|
1857
|
-
<fo:block-container height="24mm" display-align="after">
|
|
1858
|
-
<fo:block text-align="center" margin-bottom="16mm">
|
|
1859
|
-
<xsl:if test="$vertical_layout = 'true'">
|
|
1860
|
-
<xsl:attribute name="margin-bottom">0mm</xsl:attribute>
|
|
1861
|
-
</xsl:if>
|
|
1862
|
-
<fo:page-number/>
|
|
1863
|
-
</fo:block>
|
|
1864
|
-
</fo:block-container>
|
|
1865
|
-
</xsl:otherwise>
|
|
1866
|
-
</xsl:choose>
|
|
1867
|
-
</fo:static-content>
|
|
1854
|
+
<xsl:call-template name="insertFooter"/>
|
|
1868
1855
|
</xsl:template>
|
|
1869
1856
|
|
|
1870
1857
|
<xsl:template name="insertHeader">
|
|
@@ -1879,6 +1866,24 @@
|
|
|
1879
1866
|
</xsl:if>
|
|
1880
1867
|
</xsl:template>
|
|
1881
1868
|
|
|
1869
|
+
<xsl:template name="insertFooter">
|
|
1870
|
+
<fo:static-content flow-name="footer">
|
|
1871
|
+
<fo:block-container height="24mm" display-align="after">
|
|
1872
|
+
<xsl:if test="$doctype = 'technical-report'">
|
|
1873
|
+
<xsl:attribute name="height">23mm</xsl:attribute>
|
|
1874
|
+
</xsl:if>
|
|
1875
|
+
<fo:block text-align="center" margin-bottom="16mm">
|
|
1876
|
+
<xsl:if test="$vertical_layout = 'true'">
|
|
1877
|
+
<xsl:attribute name="margin-bottom">0mm</xsl:attribute>
|
|
1878
|
+
</xsl:if>
|
|
1879
|
+
<xsl:if test="$doctype = 'technical-report'"><xsl:text>- </xsl:text></xsl:if>
|
|
1880
|
+
<fo:page-number/>
|
|
1881
|
+
<xsl:if test="$doctype = 'technical-report'"><xsl:text> -</xsl:text></xsl:if>
|
|
1882
|
+
</fo:block>
|
|
1883
|
+
</fo:block-container>
|
|
1884
|
+
</fo:static-content>
|
|
1885
|
+
</xsl:template>
|
|
1886
|
+
|
|
1882
1887
|
<xsl:template name="back-page">
|
|
1883
1888
|
<xsl:choose>
|
|
1884
1889
|
<xsl:when test="$doctype = 'technical-report'">
|
|
@@ -3769,7 +3774,6 @@
|
|
|
3769
3774
|
</xsl:attribute-set> <!-- feedback-statement-title-style -->
|
|
3770
3775
|
|
|
3771
3776
|
<xsl:template name="refine_feedback-statement-title-style">
|
|
3772
|
-
|
|
3773
3777
|
</xsl:template>
|
|
3774
3778
|
|
|
3775
3779
|
<xsl:attribute-set name="feedback-statement-p-style">
|
|
@@ -5402,91 +5406,85 @@
|
|
|
5402
5406
|
<xsl:template name="refine_term-style">
|
|
5403
5407
|
</xsl:template>
|
|
5404
5408
|
|
|
5405
|
-
<xsl:attribute-set name="term-
|
|
5409
|
+
<xsl:attribute-set name="term-number-style">
|
|
5406
5410
|
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
|
5407
5411
|
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
|
5408
5412
|
<xsl:attribute name="font-weight">normal</xsl:attribute>
|
|
5409
5413
|
<xsl:attribute name="space-after">2pt</xsl:attribute>
|
|
5410
5414
|
</xsl:attribute-set> <!-- term-name-style -->
|
|
5411
5415
|
|
|
5412
|
-
<xsl:template name="refine_term-
|
|
5413
|
-
</xsl:template>
|
|
5414
|
-
|
|
5415
|
-
<xsl:attribute-set name="preferred-style">
|
|
5416
|
-
</xsl:attribute-set> <!-- preferred-style -->
|
|
5417
|
-
|
|
5418
|
-
<xsl:template name="refine_preferred-style">
|
|
5416
|
+
<xsl:template name="refine_term-number-style">
|
|
5419
5417
|
</xsl:template>
|
|
5420
5418
|
|
|
5421
|
-
<xsl:attribute-set name="preferred-block-style">
|
|
5419
|
+
<xsl:attribute-set name="term-preferred-block-style">
|
|
5422
5420
|
</xsl:attribute-set> <!-- preferred-block-style -->
|
|
5423
5421
|
|
|
5424
|
-
<xsl:template name="
|
|
5422
|
+
<xsl:template name="refine_term-preferred-block-style">
|
|
5425
5423
|
</xsl:template>
|
|
5426
5424
|
|
|
5427
|
-
<xsl:attribute-set name="preferred-
|
|
5425
|
+
<xsl:attribute-set name="term-preferred-style">
|
|
5428
5426
|
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
|
5429
5427
|
<xsl:attribute name="font-weight">bold</xsl:attribute>
|
|
5430
5428
|
<xsl:attribute name="font-weight">normal</xsl:attribute>
|
|
5431
5429
|
</xsl:attribute-set> <!-- preferred-term-style -->
|
|
5432
5430
|
|
|
5433
|
-
<xsl:template name="
|
|
5431
|
+
<xsl:template name="refine_term-preferred-style">
|
|
5434
5432
|
<xsl:if test="mn:strong">
|
|
5435
5433
|
<xsl:attribute name="font-weight">normal</xsl:attribute>
|
|
5436
5434
|
</xsl:if>
|
|
5437
5435
|
</xsl:template>
|
|
5438
5436
|
|
|
5439
|
-
<xsl:attribute-set name="domain-style">
|
|
5440
|
-
</xsl:attribute-set> <!-- domain-style -->
|
|
5437
|
+
<xsl:attribute-set name="term-domain-style">
|
|
5438
|
+
</xsl:attribute-set> <!-- term-domain-style -->
|
|
5441
5439
|
|
|
5442
|
-
<xsl:template name="
|
|
5440
|
+
<xsl:template name="refine_term-domain-style">
|
|
5443
5441
|
</xsl:template>
|
|
5444
5442
|
|
|
5445
|
-
<xsl:attribute-set name="admitted-style">
|
|
5446
|
-
</xsl:attribute-set> <!-- admitted-style -->
|
|
5443
|
+
<xsl:attribute-set name="term-admitted-style">
|
|
5444
|
+
</xsl:attribute-set> <!-- term-admitted-style -->
|
|
5447
5445
|
|
|
5448
|
-
<xsl:template name="
|
|
5446
|
+
<xsl:template name="refine_term-admitted-style">
|
|
5449
5447
|
</xsl:template>
|
|
5450
5448
|
|
|
5451
|
-
<xsl:attribute-set name="deprecates-style">
|
|
5452
|
-
</xsl:attribute-set> <!-- deprecates-style -->
|
|
5449
|
+
<xsl:attribute-set name="term-deprecates-style">
|
|
5450
|
+
</xsl:attribute-set> <!-- term-deprecates-style -->
|
|
5453
5451
|
|
|
5454
|
-
<xsl:template name="
|
|
5452
|
+
<xsl:template name="refine_term-deprecates-style">
|
|
5455
5453
|
</xsl:template>
|
|
5456
5454
|
|
|
5457
|
-
<xsl:attribute-set name="related-block-style" use-attribute-sets="preferred-block-style">
|
|
5455
|
+
<xsl:attribute-set name="term-related-block-style" use-attribute-sets="term-preferred-block-style">
|
|
5458
5456
|
</xsl:attribute-set>
|
|
5459
5457
|
|
|
5460
|
-
<xsl:template name="
|
|
5458
|
+
<xsl:template name="refine_term-related-block-style">
|
|
5461
5459
|
</xsl:template>
|
|
5462
5460
|
|
|
5463
|
-
<xsl:attribute-set name="definition-style">
|
|
5461
|
+
<xsl:attribute-set name="term-definition-style">
|
|
5464
5462
|
<xsl:attribute name="space-before">2pt</xsl:attribute>
|
|
5465
5463
|
<xsl:attribute name="space-after">2pt</xsl:attribute>
|
|
5466
|
-
</xsl:attribute-set> <!-- definition-style -->
|
|
5464
|
+
</xsl:attribute-set> <!-- term-definition-style -->
|
|
5467
5465
|
|
|
5468
|
-
<xsl:template name="
|
|
5466
|
+
<xsl:template name="refine_term-definition-style">
|
|
5469
5467
|
</xsl:template>
|
|
5470
5468
|
|
|
5471
|
-
<xsl:attribute-set name="termsource-style">
|
|
5472
|
-
</xsl:attribute-set> <!-- termsource-style -->
|
|
5469
|
+
<xsl:attribute-set name="term-termsource-style">
|
|
5470
|
+
</xsl:attribute-set> <!-- term-termsource-style -->
|
|
5473
5471
|
|
|
5474
|
-
<xsl:template name="
|
|
5472
|
+
<xsl:template name="refine_term-termsource-style">
|
|
5475
5473
|
<xsl:if test="ancestor::mn:table">
|
|
5476
5474
|
<xsl:attribute name="margin-bottom">1pt</xsl:attribute>
|
|
5477
5475
|
</xsl:if>
|
|
5478
|
-
</xsl:template> <!--
|
|
5476
|
+
</xsl:template> <!-- refine_term-termsource-style -->
|
|
5479
5477
|
|
|
5480
|
-
<xsl:attribute-set name="termsource-text-style">
|
|
5481
|
-
</xsl:attribute-set> <!-- termsource-text-style -->
|
|
5478
|
+
<xsl:attribute-set name="term-termsource-text-style">
|
|
5479
|
+
</xsl:attribute-set> <!-- term-termsource-text-style -->
|
|
5482
5480
|
|
|
5483
|
-
<xsl:template name="
|
|
5481
|
+
<xsl:template name="refine_term-termsource-text-style">
|
|
5484
5482
|
</xsl:template>
|
|
5485
5483
|
|
|
5486
|
-
<xsl:attribute-set name="origin-style">
|
|
5487
|
-
</xsl:attribute-set> <!-- origin-style -->
|
|
5484
|
+
<xsl:attribute-set name="term-origin-style">
|
|
5485
|
+
</xsl:attribute-set> <!-- term-origin-style -->
|
|
5488
5486
|
|
|
5489
|
-
<xsl:template name="
|
|
5487
|
+
<xsl:template name="refine_term-origin-style">
|
|
5490
5488
|
</xsl:template>
|
|
5491
5489
|
|
|
5492
5490
|
<!-- ====== -->
|
|
@@ -5530,9 +5528,9 @@
|
|
|
5530
5528
|
<!-- modification -->
|
|
5531
5529
|
<!-- ====== -->
|
|
5532
5530
|
<xsl:template match="mn:fmt-termsource" name="termsource">
|
|
5533
|
-
<fo:block xsl:use-attribute-sets="termsource-style">
|
|
5531
|
+
<fo:block xsl:use-attribute-sets="term-termsource-style">
|
|
5534
5532
|
|
|
5535
|
-
<xsl:call-template name="
|
|
5533
|
+
<xsl:call-template name="refine_term-termsource-style"/>
|
|
5536
5534
|
|
|
5537
5535
|
<!-- Example: [SOURCE: ISO 5127:2017, 3.1.6.02] -->
|
|
5538
5536
|
<xsl:variable name="termsource_text">
|
|
@@ -5580,8 +5578,8 @@
|
|
|
5580
5578
|
|
|
5581
5579
|
<!-- text SOURCE: -->
|
|
5582
5580
|
<xsl:template match="mn:fmt-termsource/mn:strong[1][following-sibling::*[1][self::mn:fmt-origin]]/text()">
|
|
5583
|
-
<fo:inline xsl:use-attribute-sets="termsource-text-style">
|
|
5584
|
-
<xsl:call-template name="
|
|
5581
|
+
<fo:inline xsl:use-attribute-sets="term-termsource-text-style">
|
|
5582
|
+
<xsl:call-template name="refine_term-termsource-text-style"/>
|
|
5585
5583
|
<xsl:value-of select="."/>
|
|
5586
5584
|
</fo:inline>
|
|
5587
5585
|
</xsl:template>
|
|
@@ -5593,8 +5591,8 @@
|
|
|
5593
5591
|
<xsl:if test="normalize-space(@citeas) = ''">
|
|
5594
5592
|
<xsl:attribute name="fox:alt-text"><xsl:value-of select="@bibitemid"/></xsl:attribute>
|
|
5595
5593
|
</xsl:if>
|
|
5596
|
-
<fo:inline xsl:use-attribute-sets="origin-style">
|
|
5597
|
-
<xsl:call-template name="
|
|
5594
|
+
<fo:inline xsl:use-attribute-sets="term-origin-style">
|
|
5595
|
+
<xsl:call-template name="refine_term-origin-style"/>
|
|
5598
5596
|
<xsl:apply-templates/>
|
|
5599
5597
|
</fo:inline>
|
|
5600
5598
|
</fo:basic-link>
|
|
@@ -5642,14 +5640,14 @@
|
|
|
5642
5640
|
<xsl:variable name="levelTerm">
|
|
5643
5641
|
<xsl:call-template name="getLevelTermName"/>
|
|
5644
5642
|
</xsl:variable>
|
|
5645
|
-
<fo:block font-size="{normalize-space($font-size)}" role="H{$levelTerm}" xsl:use-attribute-sets="preferred-block-style">
|
|
5643
|
+
<fo:block font-size="{normalize-space($font-size)}" role="H{$levelTerm}" xsl:use-attribute-sets="term-preferred-block-style">
|
|
5646
5644
|
|
|
5647
|
-
<xsl:call-template name="
|
|
5645
|
+
<xsl:call-template name="refine_term-preferred-block-style"/>
|
|
5648
5646
|
|
|
5649
5647
|
<xsl:if test="parent::mn:term and not(preceding-sibling::mn:fmt-preferred)"> <!-- if first preffered in term, then display term's name -->
|
|
5650
5648
|
|
|
5651
|
-
<fo:block xsl:use-attribute-sets="term-
|
|
5652
|
-
<xsl:call-template name="refine_term-
|
|
5649
|
+
<fo:block xsl:use-attribute-sets="term-number-style" role="SKIP">
|
|
5650
|
+
<xsl:call-template name="refine_term-number-style"/>
|
|
5653
5651
|
|
|
5654
5652
|
<xsl:for-each select="ancestor::mn:term[1]/mn:fmt-name"><!-- change context -->
|
|
5655
5653
|
<xsl:call-template name="setIDforNamedDestination"/>
|
|
@@ -5659,8 +5657,8 @@
|
|
|
5659
5657
|
</fo:block>
|
|
5660
5658
|
</xsl:if>
|
|
5661
5659
|
|
|
5662
|
-
<fo:block xsl:use-attribute-sets="preferred-
|
|
5663
|
-
<xsl:call-template name="
|
|
5660
|
+
<fo:block xsl:use-attribute-sets="term-preferred-style" role="SKIP">
|
|
5661
|
+
<xsl:call-template name="refine_term-preferred-style"/>
|
|
5664
5662
|
|
|
5665
5663
|
<xsl:apply-templates/>
|
|
5666
5664
|
</fo:block>
|
|
@@ -5680,15 +5678,15 @@
|
|
|
5680
5678
|
<xsl:template match="mn:domain"/>
|
|
5681
5679
|
|
|
5682
5680
|
<xsl:template match="mn:fmt-admitted">
|
|
5683
|
-
<fo:block xsl:use-attribute-sets="admitted-style">
|
|
5684
|
-
<xsl:call-template name="
|
|
5681
|
+
<fo:block xsl:use-attribute-sets="term-admitted-style">
|
|
5682
|
+
<xsl:call-template name="refine_term-admitted-style"/>
|
|
5685
5683
|
<xsl:apply-templates/>
|
|
5686
5684
|
</fo:block>
|
|
5687
5685
|
</xsl:template>
|
|
5688
5686
|
|
|
5689
5687
|
<xsl:template match="mn:fmt-deprecates">
|
|
5690
|
-
<fo:block xsl:use-attribute-sets="deprecates-style">
|
|
5691
|
-
<xsl:call-template name="
|
|
5688
|
+
<fo:block xsl:use-attribute-sets="term-deprecates-style">
|
|
5689
|
+
<xsl:call-template name="refine_term-deprecates-style"/>
|
|
5692
5690
|
<xsl:apply-templates/>
|
|
5693
5691
|
</fo:block>
|
|
5694
5692
|
</xsl:template>
|
|
@@ -5701,8 +5699,8 @@
|
|
|
5701
5699
|
<!-- End Preferred, admitted, deprecated -->
|
|
5702
5700
|
|
|
5703
5701
|
<xsl:template match="mn:fmt-related">
|
|
5704
|
-
<fo:block role="SKIP" xsl:use-attribute-sets="related-block-style">
|
|
5705
|
-
<xsl:call-template name="
|
|
5702
|
+
<fo:block role="SKIP" xsl:use-attribute-sets="term-related-block-style">
|
|
5703
|
+
<xsl:call-template name="refine_term-related-block-style"/>
|
|
5706
5704
|
<xsl:apply-templates/>
|
|
5707
5705
|
</fo:block>
|
|
5708
5706
|
</xsl:template>
|
|
@@ -5716,8 +5714,8 @@
|
|
|
5716
5714
|
<!-- definition -->
|
|
5717
5715
|
<!-- ========== -->
|
|
5718
5716
|
<xsl:template match="mn:fmt-definition">
|
|
5719
|
-
<fo:block xsl:use-attribute-sets="definition-style" role="SKIP">
|
|
5720
|
-
<xsl:call-template name="
|
|
5717
|
+
<fo:block xsl:use-attribute-sets="term-definition-style" role="SKIP">
|
|
5718
|
+
<xsl:call-template name="refine_term-definition-style"/>
|
|
5721
5719
|
<xsl:apply-templates/>
|
|
5722
5720
|
</fo:block>
|
|
5723
5721
|
</xsl:template>
|
|
@@ -9592,15 +9590,23 @@
|
|
|
9592
9590
|
</xsl:attribute-set> <!-- quote-style -->
|
|
9593
9591
|
|
|
9594
9592
|
<xsl:template name="refine_quote-style">
|
|
9595
|
-
</xsl:template>
|
|
9593
|
+
</xsl:template> <!-- refine_quote-style -->
|
|
9596
9594
|
|
|
9597
9595
|
<xsl:attribute-set name="quote-source-style">
|
|
9598
9596
|
<xsl:attribute name="text-align">right</xsl:attribute>
|
|
9599
|
-
</xsl:attribute-set>
|
|
9597
|
+
</xsl:attribute-set> <!-- quote-source-style -->
|
|
9600
9598
|
|
|
9601
9599
|
<xsl:template name="refine_quote-source-style">
|
|
9602
9600
|
</xsl:template>
|
|
9603
9601
|
|
|
9602
|
+
<xsl:attribute-set name="source-style">
|
|
9603
|
+
<xsl:attribute name="space-after">8pt</xsl:attribute>
|
|
9604
|
+
</xsl:attribute-set> <!-- source-style -->
|
|
9605
|
+
|
|
9606
|
+
<xsl:template name="refine_source-style">
|
|
9607
|
+
|
|
9608
|
+
</xsl:template> <!-- refine_source-style -->
|
|
9609
|
+
|
|
9604
9610
|
<!-- ====== -->
|
|
9605
9611
|
<!-- quote -->
|
|
9606
9612
|
<!-- source -->
|
|
@@ -9648,7 +9654,9 @@
|
|
|
9648
9654
|
</xsl:if>
|
|
9649
9655
|
<xsl:choose>
|
|
9650
9656
|
<xsl:when test="not(parent::quote)">
|
|
9651
|
-
<fo:block>
|
|
9657
|
+
<fo:block xsl:use-attribute-sets="source-style">
|
|
9658
|
+
<xsl:call-template name="refine_source-style"/>
|
|
9659
|
+
|
|
9652
9660
|
<xsl:call-template name="insert_basic_link">
|
|
9653
9661
|
<xsl:with-param name="element">
|
|
9654
9662
|
<fo:basic-link internal-destination="{@bibitemid}" fox:alt-text="{@citeas}">
|
|
@@ -11762,7 +11770,7 @@
|
|
|
11762
11770
|
|
|
11763
11771
|
<xsl:template name="refine_fn-reference-style">
|
|
11764
11772
|
<!-- https://github.com/metanorma/metanorma-ieee/issues/595 -->
|
|
11765
|
-
<xsl:if test="preceding-sibling::node()[normalize-space() != ''][1][self::mn:fn]"
|
|
11773
|
+
<xsl:if test="preceding-sibling::node()[normalize-space() != ''][1][self::mn:fn]">, </xsl:if><!-- <xsl:if test="$namespace = 'bsi' or $namespace = 'pas'"></xsl:if> -->
|
|
11766
11774
|
</xsl:template> <!-- refine_fn-reference-style -->
|
|
11767
11775
|
|
|
11768
11776
|
<xsl:attribute-set name="fn-style">
|
|
@@ -11773,7 +11781,9 @@
|
|
|
11773
11781
|
</xsl:template>
|
|
11774
11782
|
|
|
11775
11783
|
<xsl:attribute-set name="fn-num-style">
|
|
11784
|
+
<xsl:attribute name="role">Reference</xsl:attribute>
|
|
11776
11785
|
<xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
|
|
11786
|
+
<xsl:attribute name="font-size">65%</xsl:attribute>
|
|
11777
11787
|
<xsl:attribute name="font-size">6pt</xsl:attribute>
|
|
11778
11788
|
<xsl:attribute name="baseline-shift">25%</xsl:attribute>
|
|
11779
11789
|
</xsl:attribute-set> <!-- fn-num-style -->
|
|
@@ -11845,33 +11855,16 @@
|
|
|
11845
11855
|
<xsl:variable name="ref_id" select="@target"/>
|
|
11846
11856
|
|
|
11847
11857
|
<xsl:variable name="footnote_inline">
|
|
11848
|
-
<fo:inline
|
|
11858
|
+
<fo:inline xsl:use-attribute-sets="fn-num-style">
|
|
11849
11859
|
|
|
11850
|
-
<xsl:
|
|
11851
|
-
<xsl:choose>
|
|
11852
|
-
<xsl:when test="ancestor::mn:bibitem">
|
|
11853
|
-
<fn_styles xsl:use-attribute-sets="bibitem-note-fn-style">
|
|
11854
|
-
<xsl:call-template name="refine_bibitem-note-fn-style"/>
|
|
11855
|
-
</fn_styles>
|
|
11856
|
-
</xsl:when>
|
|
11857
|
-
<xsl:otherwise>
|
|
11858
|
-
<fn_styles xsl:use-attribute-sets="fn-num-style">
|
|
11859
|
-
<xsl:call-template name="refine_fn-num-style"/>
|
|
11860
|
-
</fn_styles>
|
|
11861
|
-
</xsl:otherwise>
|
|
11862
|
-
</xsl:choose>
|
|
11863
|
-
</xsl:variable>
|
|
11864
|
-
|
|
11865
|
-
<xsl:for-each select="xalan:nodeset($fn_styles)/fn_styles/@*">
|
|
11866
|
-
<xsl:copy-of select="."/>
|
|
11867
|
-
</xsl:for-each>
|
|
11860
|
+
<xsl:call-template name="refine_fn-num-style"/>
|
|
11868
11861
|
|
|
11869
11862
|
<!-- https://github.com/metanorma/metanorma-ieee/issues/595 -->
|
|
11870
11863
|
<!-- <xsl:if test="following-sibling::node()[normalize-space() != ''][1][self::mn:fn]">
|
|
11871
11864
|
<xsl:attribute name="padding-right">0.5mm</xsl:attribute>
|
|
11872
11865
|
</xsl:if> -->
|
|
11873
11866
|
|
|
11874
|
-
<xsl:if test="preceding-sibling::node()[normalize-space() != ''][1][self::mn:fn]"
|
|
11867
|
+
<xsl:if test="preceding-sibling::node()[normalize-space() != ''][1][self::mn:fn]">, </xsl:if>
|
|
11875
11868
|
|
|
11876
11869
|
<xsl:call-template name="insert_basic_link">
|
|
11877
11870
|
<xsl:with-param name="element">
|
|
@@ -12164,29 +12157,6 @@
|
|
|
12164
12157
|
<xsl:template name="refine_bibitem-non-normative-list-body-style">
|
|
12165
12158
|
</xsl:template>
|
|
12166
12159
|
|
|
12167
|
-
<!-- footnote reference number for bibitem, in the text -->
|
|
12168
|
-
<xsl:attribute-set name="bibitem-note-fn-style">
|
|
12169
|
-
<xsl:attribute name="keep-with-previous.within-line">always</xsl:attribute>
|
|
12170
|
-
<xsl:attribute name="font-size">65%</xsl:attribute>
|
|
12171
|
-
<xsl:attribute name="font-size">6pt</xsl:attribute>
|
|
12172
|
-
<xsl:attribute name="baseline-shift">25%</xsl:attribute>
|
|
12173
|
-
</xsl:attribute-set> <!-- bibitem-note-fn-style -->
|
|
12174
|
-
|
|
12175
|
-
<xsl:template name="refine_bibitem-note-fn-style">
|
|
12176
|
-
</xsl:template>
|
|
12177
|
-
|
|
12178
|
-
<!-- footnote number on the page bottom -->
|
|
12179
|
-
<xsl:attribute-set name="bibitem-note-fn-number-style">
|
|
12180
|
-
<xsl:attribute name="keep-with-next.within-line">always</xsl:attribute>
|
|
12181
|
-
</xsl:attribute-set> <!-- bibitem-note-fn-number-style -->
|
|
12182
|
-
|
|
12183
|
-
<!-- footnote body (text) on the page bottom -->
|
|
12184
|
-
<xsl:attribute-set name="bibitem-note-fn-body-style">
|
|
12185
|
-
<xsl:attribute name="font-size">10pt</xsl:attribute>
|
|
12186
|
-
<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
|
|
12187
|
-
<xsl:attribute name="start-indent">0pt</xsl:attribute>
|
|
12188
|
-
</xsl:attribute-set> <!-- bibitem-note-fn-body-style -->
|
|
12189
|
-
|
|
12190
12160
|
<xsl:attribute-set name="references-non-normative-style">
|
|
12191
12161
|
</xsl:attribute-set> <!-- references-non-normative-style -->
|
|
12192
12162
|
|
|
@@ -14535,6 +14505,17 @@
|
|
|
14535
14505
|
</xsl:attribute-set>
|
|
14536
14506
|
|
|
14537
14507
|
<xsl:template name="refine_clause-style">
|
|
14508
|
+
<!-- commented for https://github.com/metanorma/metanorma-ribose/issues/421 -->
|
|
14509
|
+
<!-- <xsl:if test="$namespace = 'rsd'">
|
|
14510
|
+
<xsl:variable name="level">
|
|
14511
|
+
<xsl:call-template name="getLevel">
|
|
14512
|
+
<xsl:with-param name="depth" select="mn:fmt-title/@depth"/>
|
|
14513
|
+
</xsl:call-template>
|
|
14514
|
+
</xsl:variable>
|
|
14515
|
+
<xsl:if test="$level >= 4">
|
|
14516
|
+
<xsl:attribute name="margin-left">13mm</xsl:attribute>
|
|
14517
|
+
</xsl:if>
|
|
14518
|
+
</xsl:if> -->
|
|
14538
14519
|
</xsl:template>
|
|
14539
14520
|
|
|
14540
14521
|
<!-- main sections -->
|
|
@@ -15617,6 +15598,20 @@
|
|
|
15617
15598
|
</fo:block-container>
|
|
15618
15599
|
</xsl:template>
|
|
15619
15600
|
|
|
15601
|
+
<!-- for https://github.com/metanorma/mn-native-pdf/issues/845 -->
|
|
15602
|
+
<xsl:template name="insertCoverPageFullImage">
|
|
15603
|
+
<xsl:param name="name">coverpage-image</xsl:param>
|
|
15604
|
+
<xsl:for-each select="//mn:metanorma/mn:metanorma-extension/mn:presentation-metadata[mn:name = $name][1]/mn:value/mn:image">
|
|
15605
|
+
<fo:page-sequence master-reference="cover-page" force-page-count="no-force">
|
|
15606
|
+
<fo:flow flow-name="xsl-region-body">
|
|
15607
|
+
<xsl:call-template name="insertBackgroundPageImage">
|
|
15608
|
+
<xsl:with-param name="number" select="position()"/>
|
|
15609
|
+
</xsl:call-template>
|
|
15610
|
+
</fo:flow>
|
|
15611
|
+
</fo:page-sequence>
|
|
15612
|
+
</xsl:for-each>
|
|
15613
|
+
</xsl:template>
|
|
15614
|
+
|
|
15620
15615
|
<xsl:template name="insertPageImage">
|
|
15621
15616
|
<xsl:param name="svg_content_height" select="$pageHeight"/>
|
|
15622
15617
|
<xsl:param name="bitmap_width" select="$pageWidth"/>
|
|
@@ -36,14 +36,12 @@ module IsoDoc
|
|
|
36
36
|
source1(elem, :para)
|
|
37
37
|
# if we haven't already removed it...
|
|
38
38
|
elem.parent or return
|
|
39
|
-
# elem.parent.next = "<p>#{to_xml(elem.remove)}</p>"
|
|
40
39
|
elem.parent.next = elem.remove
|
|
41
40
|
end
|
|
42
41
|
|
|
43
42
|
def listsource(elem, ancestor)
|
|
44
43
|
source1(elem, ancestor)
|
|
45
44
|
elem.parent or return
|
|
46
|
-
# elem.parent.next = "<p>#{to_xml(elem.remove)}</p>"
|
|
47
45
|
elem.parent.next = elem.remove
|
|
48
46
|
end
|
|
49
47
|
|
|
@@ -869,7 +869,7 @@ depending on whether the items exist as independent documents, or are parts of a
|
|
|
869
869
|
</zeroOrMore>
|
|
870
870
|
</element>
|
|
871
871
|
</define>
|
|
872
|
-
<define name="BibItemType"
|
|
872
|
+
<define name="BibItemType">
|
|
873
873
|
<a:documentation>Type of bibliographic item.
|
|
874
874
|
The value list complies with the types provided in ISO 690:2021.
|
|
875
875
|
NOTE: These values represent a strict superset to BibTeX
|
|
@@ -1,14 +1,16 @@
|
|
|
1
1
|
module Metanorma
|
|
2
2
|
module Plateau
|
|
3
|
+
# after term def processed, process source after paragraphs so that
|
|
4
|
+
# the moving of paragraphs there does not nclude termdef
|
|
3
5
|
class Converter < Jis::Converter
|
|
4
|
-
def
|
|
6
|
+
def termdef_cleanup(xmldoc)
|
|
7
|
+
super
|
|
5
8
|
xmldoc.xpath("//source").each do |s|
|
|
6
9
|
p = s.previous_element or next
|
|
7
10
|
%w[p ol ul dl].include? p.name or next
|
|
8
11
|
s.delete("type")
|
|
9
12
|
s.parent = p
|
|
10
13
|
end
|
|
11
|
-
super
|
|
12
14
|
end
|
|
13
15
|
|
|
14
16
|
# Abandoned in favour of JIS ordering
|
|
@@ -311,17 +311,28 @@ and is intended to be referenced by a callout within the source code</a:document
|
|
|
311
311
|
</ref>
|
|
312
312
|
</optional>
|
|
313
313
|
<choice>
|
|
314
|
-
<a:documentation>Content of the figure</a:documentation>
|
|
315
|
-
<ref name="image"
|
|
314
|
+
<a:documentation>Content of the figure </a:documentation>
|
|
315
|
+
<ref name="image">
|
|
316
|
+
<a:documentation>by default the content of a figure is a media file</a:documentation>
|
|
317
|
+
</ref>
|
|
316
318
|
<ref name="video"/>
|
|
317
319
|
<ref name="audio"/>
|
|
318
|
-
<ref name="pre"
|
|
320
|
+
<ref name="pre">
|
|
321
|
+
<a:documentation>figures can contain ASCII art</a:documentation>
|
|
322
|
+
</ref>
|
|
319
323
|
<oneOrMore>
|
|
320
|
-
<ref name="paragraph-with-footnote"
|
|
324
|
+
<ref name="paragraph-with-footnote">
|
|
325
|
+
<a:documentation>figures can contain discursive art</a:documentation>
|
|
326
|
+
</ref>
|
|
321
327
|
</oneOrMore>
|
|
322
328
|
<zeroOrMore>
|
|
323
|
-
<ref name="figure"
|
|
329
|
+
<ref name="figure">
|
|
330
|
+
<a:documentation>subfigures, nested directly within a figure</a:documentation>
|
|
331
|
+
</ref>
|
|
324
332
|
</zeroOrMore>
|
|
333
|
+
<ref name="table">
|
|
334
|
+
<a:documentation>Table is understood in this context to be a tabular arrangement of subfigures</a:documentation>
|
|
335
|
+
</ref>
|
|
325
336
|
</choice>
|
|
326
337
|
<zeroOrMore>
|
|
327
338
|
<ref name="fn">
|
|
@@ -354,17 +365,28 @@ and is intended to be referenced by a callout within the source code</a:document
|
|
|
354
365
|
</ref>
|
|
355
366
|
</optional>
|
|
356
367
|
<choice>
|
|
357
|
-
<a:documentation>Content of the figure</a:documentation>
|
|
358
|
-
<ref name="image-no-id"
|
|
368
|
+
<a:documentation>Content of the figure </a:documentation>
|
|
369
|
+
<ref name="image-no-id">
|
|
370
|
+
<a:documentation>by default the content of a figure is a media file</a:documentation>
|
|
371
|
+
</ref>
|
|
359
372
|
<ref name="video-no-id"/>
|
|
360
373
|
<ref name="audio-no-id"/>
|
|
361
|
-
<ref name="pre-no-id"
|
|
374
|
+
<ref name="pre-no-id">
|
|
375
|
+
<a:documentation>figures can contain ASCII art</a:documentation>
|
|
376
|
+
</ref>
|
|
362
377
|
<oneOrMore>
|
|
363
|
-
<ref name="paragraph-with-footnote-no-id"
|
|
378
|
+
<ref name="paragraph-with-footnote-no-id">
|
|
379
|
+
<a:documentation>figures can contain discursive art</a:documentation>
|
|
380
|
+
</ref>
|
|
364
381
|
</oneOrMore>
|
|
365
382
|
<zeroOrMore>
|
|
366
|
-
<ref name="figure-no-id"
|
|
383
|
+
<ref name="figure-no-id">
|
|
384
|
+
<a:documentation>subfigures, nested directly within a figure</a:documentation>
|
|
385
|
+
</ref>
|
|
367
386
|
</zeroOrMore>
|
|
387
|
+
<ref name="table-no-id">
|
|
388
|
+
<a:documentation>Table is understood in this context to be a tabular arrangement of subfigures</a:documentation>
|
|
389
|
+
</ref>
|
|
368
390
|
</choice>
|
|
369
391
|
<zeroOrMore>
|
|
370
392
|
<ref name="fn">
|
|
@@ -876,6 +898,9 @@ titlecase, or lowercase</a:documentation>
|
|
|
876
898
|
<data type="boolean"/>
|
|
877
899
|
</attribute>
|
|
878
900
|
</optional>
|
|
901
|
+
<ref name="LocalizedStringAttributes">
|
|
902
|
+
<a:documentation>Specify language of bibitem, can be used to render it with language-specific bibliographic style</a:documentation>
|
|
903
|
+
</ref>
|
|
879
904
|
<ref name="ReducedBibliographicItem"/>
|
|
880
905
|
</element>
|
|
881
906
|
</define>
|
data/metanorma-plateau.gemspec
CHANGED
|
@@ -45,5 +45,5 @@ spec.add_development_dependency "rubocop-performance"
|
|
|
45
45
|
spec.add_development_dependency "simplecov", "~> 0.15"
|
|
46
46
|
spec.add_development_dependency "timecop", "~> 0.9"
|
|
47
47
|
spec.add_development_dependency "webmock"
|
|
48
|
-
spec.add_development_dependency "canon"
|
|
48
|
+
spec.add_development_dependency "canon", "= 0.1.3"
|
|
49
49
|
end
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: metanorma-plateau
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.1.
|
|
4
|
+
version: 1.1.7
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Ribose Inc.
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2025-
|
|
11
|
+
date: 2025-10-13 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: metanorma-jis
|
|
@@ -224,16 +224,16 @@ dependencies:
|
|
|
224
224
|
name: canon
|
|
225
225
|
requirement: !ruby/object:Gem::Requirement
|
|
226
226
|
requirements:
|
|
227
|
-
- -
|
|
227
|
+
- - '='
|
|
228
228
|
- !ruby/object:Gem::Version
|
|
229
|
-
version:
|
|
229
|
+
version: 0.1.3
|
|
230
230
|
type: :development
|
|
231
231
|
prerelease: false
|
|
232
232
|
version_requirements: !ruby/object:Gem::Requirement
|
|
233
233
|
requirements:
|
|
234
|
-
- -
|
|
234
|
+
- - '='
|
|
235
235
|
- !ruby/object:Gem::Version
|
|
236
|
-
version:
|
|
236
|
+
version: 0.1.3
|
|
237
237
|
description: |
|
|
238
238
|
Metanorma standards authoring environment for MLIT Project PLATEAU.
|
|
239
239
|
|