metanorma-itu 2.6.5 → 2.6.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/itu/base_convert.rb +0 -36
- data/lib/isodoc/itu/html/_coverpage.css +0 -2
- data/lib/isodoc/itu/html/htmlstyle.css +0 -2
- data/lib/isodoc/itu/itu.implementers-guide.xsl +259 -231
- data/lib/isodoc/itu/itu.in-force.xsl +259 -231
- data/lib/isodoc/itu/itu.recommendation-annex.xsl +259 -231
- data/lib/isodoc/itu/itu.recommendation-supplement.xsl +259 -231
- data/lib/isodoc/itu/itu.recommendation.xsl +259 -231
- data/lib/isodoc/itu/itu.resolution.xsl +259 -231
- data/lib/isodoc/itu/itu.service-publication.xsl +259 -231
- data/lib/isodoc/itu/itu.technical-paper.xsl +259 -231
- data/lib/isodoc/itu/itu.technical-report.xsl +259 -231
- data/lib/isodoc/itu/presentation_section.rb +4 -2
- data/lib/isodoc/itu/presentation_xml_convert.rb +1 -1
- data/lib/metanorma/itu/basicdoc.rng +9 -5
- data/lib/metanorma/itu/cleanup.rb +5 -5
- data/lib/metanorma/itu/cleanup_section.rb +9 -9
- data/lib/metanorma/itu/converter.rb +10 -10
- data/lib/metanorma/itu/isodoc.rng +145 -5
- data/lib/metanorma/itu/processor.rb +7 -7
- data/lib/metanorma/itu/version.rb +1 -1
- metadata +2 -2
|
@@ -495,267 +495,271 @@
|
|
|
495
495
|
<fo:block id="firstpage_id_{$num}"> </fo:block>
|
|
496
496
|
</fo:block-container>
|
|
497
497
|
|
|
498
|
-
<fo:block-container
|
|
498
|
+
<fo:block-container margin-right="15.7mm">
|
|
499
499
|
|
|
500
|
-
<
|
|
500
|
+
<fo:block-container font-size="22pt" font-weight="bold" color="{$color_cover_title}" margin-right="0mm">
|
|
501
501
|
|
|
502
|
-
|
|
502
|
+
<xsl:call-template name="setWritingMode"/>
|
|
503
503
|
|
|
504
|
-
<xsl:
|
|
505
|
-
|
|
506
|
-
|
|
507
|
-
|
|
508
|
-
|
|
509
|
-
<xsl:value-of select="/itu:metanorma/itu:bibdata/itu:title[@type = 'subtitle' and @language = $lang]"/>
|
|
510
|
-
</fo:block>
|
|
511
|
-
<!-- https://github.com/metanorma/metanorma-itu/issues/474#issuecomment-1966298384 -->
|
|
512
|
-
<xsl:variable name="title_slogan" select="normalize-space(/itu:metanorma/itu:bibdata/itu:title[@type = 'slogan'])"/>
|
|
513
|
-
<xsl:if test="$title_slogan != ''">
|
|
514
|
-
<fo:block margin-top="2mm" font-family="Adelle Devanagari" font-size="26pt">
|
|
515
|
-
<xsl:choose>
|
|
516
|
-
<xsl:when test="$lang = 'ar'"><xsl:attribute name="font-family">Traditional Arabic</xsl:attribute></xsl:when>
|
|
517
|
-
<xsl:when test="$lang = 'zh'"><xsl:attribute name="font-family">STKaiti</xsl:attribute></xsl:when>
|
|
518
|
-
<!-- <xsl:otherwise><xsl:attribute name="font-style">italic</xsl:attribute></xsl:otherwise> -->
|
|
519
|
-
</xsl:choose>
|
|
520
|
-
<xsl:value-of select="$title_slogan"/>
|
|
504
|
+
<xsl:choose>
|
|
505
|
+
|
|
506
|
+
<xsl:when test="$doctype = 'service-publication'"> <!-- Flagship -->
|
|
507
|
+
<fo:block margin-top="11.5mm" font-size="34pt">
|
|
508
|
+
<xsl:value-of select="/itu:metanorma/itu:bibdata/itu:title[@type = 'main' and @language = $lang]"/>
|
|
521
509
|
</fo:block>
|
|
522
|
-
|
|
523
|
-
|
|
524
|
-
<xsl:if test="$year_published != ''">
|
|
525
|
-
<!-- Examples:
|
|
526
|
-
2020 edition
|
|
527
|
-
Édition 2020
|
|
528
|
-
Edición 2020
|
|
529
|
-
طبعة 2020
|
|
530
|
-
2020 年版
|
|
531
|
-
Издание 2020 года -->
|
|
532
|
-
<fo:block margin-top="3mm" font-size="22pt">
|
|
533
|
-
<xsl:choose>
|
|
534
|
-
<xsl:when test="$lang = 'en' or $lang = 'ar' or $lang = 'zh'">
|
|
535
|
-
<xsl:value-of select="concat($year_published, ' ', $i18n_edition)"/>
|
|
536
|
-
</xsl:when>
|
|
537
|
-
<xsl:otherwise>
|
|
538
|
-
<xsl:value-of select="concat($i18n_edition_Capitalized, ' ', $year_published)"/>
|
|
539
|
-
<xsl:if test="$lang = 'ru'"> года</xsl:if>
|
|
540
|
-
</xsl:otherwise>
|
|
541
|
-
</xsl:choose>
|
|
510
|
+
<fo:block margin-top="2mm" font-size="26pt">
|
|
511
|
+
<xsl:value-of select="/itu:metanorma/itu:bibdata/itu:title[@type = 'subtitle' and @language = $lang]"/>
|
|
542
512
|
</fo:block>
|
|
543
|
-
|
|
544
|
-
|
|
545
|
-
|
|
546
|
-
|
|
547
|
-
|
|
548
|
-
|
|
549
|
-
|
|
550
|
-
|
|
551
|
-
|
|
552
|
-
<xsl:
|
|
553
|
-
|
|
554
|
-
</xsl:when>
|
|
555
|
-
<xsl:when test="$doctype = 'implementers-guide'">
|
|
556
|
-
<xsl:value-of select="$docidentifier_ITU_left_part"/>
|
|
557
|
-
<xsl:text> </xsl:text>
|
|
558
|
-
<xsl:value-of select="/itu:metanorma/itu:bibdata/itu:docidentifier[@type='ITU-Recommendation']"/>
|
|
559
|
-
<xsl:text> </xsl:text>
|
|
560
|
-
<xsl:value-of select="/itu:metanorma/itu:bibdata/itu:ext/itu:doctype[@language = $lang]"/>
|
|
561
|
-
</xsl:when>
|
|
562
|
-
<xsl:when test="$doctype = 'resolution'">
|
|
563
|
-
<xsl:value-of select="$doctypeTitle"/>
|
|
564
|
-
<xsl:text> </xsl:text>
|
|
565
|
-
<xsl:value-of select="$docidentifier_ITU_left_part"/>
|
|
566
|
-
</xsl:when>
|
|
567
|
-
<xsl:otherwise>
|
|
568
|
-
<xsl:value-of select="$doctypeTitle"/>
|
|
569
|
-
<xsl:text> </xsl:text>
|
|
570
|
-
<xsl:value-of select="$docidentifier_ITU"/>
|
|
571
|
-
</xsl:otherwise>
|
|
572
|
-
</xsl:choose>
|
|
573
|
-
</fo:block>
|
|
574
|
-
|
|
575
|
-
<fo:block-container font-size="14pt" margin-top="1mm" margin-right="2mm">
|
|
576
|
-
<xsl:if test="$bureau = 'T'">
|
|
577
|
-
<xsl:attribute name="text-align">end</xsl:attribute>
|
|
513
|
+
<!-- https://github.com/metanorma/metanorma-itu/issues/474#issuecomment-1966298384 -->
|
|
514
|
+
<xsl:variable name="title_slogan" select="normalize-space(/itu:metanorma/itu:bibdata/itu:title[@type = 'slogan'])"/>
|
|
515
|
+
<xsl:if test="$title_slogan != ''">
|
|
516
|
+
<fo:block margin-top="2mm" font-family="Adelle Devanagari" font-size="26pt">
|
|
517
|
+
<xsl:choose>
|
|
518
|
+
<xsl:when test="$lang = 'ar'"><xsl:attribute name="font-family">Traditional Arabic</xsl:attribute></xsl:when>
|
|
519
|
+
<xsl:when test="$lang = 'zh'"><xsl:attribute name="font-family">STKaiti</xsl:attribute></xsl:when>
|
|
520
|
+
<!-- <xsl:otherwise><xsl:attribute name="font-style">italic</xsl:attribute></xsl:otherwise> -->
|
|
521
|
+
</xsl:choose>
|
|
522
|
+
<xsl:value-of select="$title_slogan"/>
|
|
523
|
+
</fo:block>
|
|
578
524
|
</xsl:if>
|
|
579
|
-
<
|
|
580
|
-
|
|
581
|
-
|
|
582
|
-
|
|
583
|
-
|
|
584
|
-
|
|
585
|
-
|
|
586
|
-
|
|
587
|
-
|
|
588
|
-
|
|
589
|
-
</fo:block-container>
|
|
590
|
-
</xsl:if>
|
|
591
|
-
<xsl:if test="$provisionalIdentifier != ''">
|
|
592
|
-
<fo:block-container>
|
|
593
|
-
<xsl:call-template name="setWritingMode"/>
|
|
594
|
-
<fo:block>Provisional identifier: <xsl:value-of select="$provisionalIdentifier"/>
|
|
595
|
-
</fo:block>
|
|
596
|
-
</fo:block-container>
|
|
597
|
-
</xsl:if>
|
|
598
|
-
<xsl:if test="$annexid != ''">
|
|
599
|
-
<fo:block-container>
|
|
600
|
-
<xsl:call-template name="setWritingMode"/>
|
|
601
|
-
<fo:block>
|
|
602
|
-
<xsl:value-of select="$i18n_annex"/>
|
|
603
|
-
<xsl:text> </xsl:text>
|
|
604
|
-
<xsl:value-of select="$annexid"/>
|
|
605
|
-
</fo:block>
|
|
606
|
-
</fo:block-container>
|
|
607
|
-
</xsl:if>
|
|
608
|
-
<xsl:if test="$isAmendment != ''">
|
|
609
|
-
<fo:block-container>
|
|
610
|
-
<xsl:call-template name="setWritingMode"/>
|
|
611
|
-
<fo:block><xsl:value-of select="$isAmendment"/></fo:block>
|
|
612
|
-
</fo:block-container>
|
|
613
|
-
</xsl:if>
|
|
614
|
-
<xsl:if test="$isCorrigendum != ''">
|
|
615
|
-
<fo:block-container>
|
|
616
|
-
<xsl:call-template name="setWritingMode"/>
|
|
617
|
-
<fo:block><xsl:value-of select="$isCorrigendum"/></fo:block>
|
|
618
|
-
</fo:block-container>
|
|
619
|
-
</xsl:if>
|
|
620
|
-
|
|
621
|
-
<!-- Date, example: (11/2018) -->
|
|
525
|
+
<xsl:variable name="year_published" select="substring($date_published,1,4)"/>
|
|
526
|
+
<xsl:if test="$year_published != ''">
|
|
527
|
+
<!-- Examples:
|
|
528
|
+
2020 edition
|
|
529
|
+
Édition 2020
|
|
530
|
+
Edición 2020
|
|
531
|
+
طبعة 2020
|
|
532
|
+
2020 年版
|
|
533
|
+
Издание 2020 года -->
|
|
534
|
+
<fo:block margin-top="3mm" font-size="22pt">
|
|
622
535
|
<xsl:choose>
|
|
623
|
-
<xsl:when test="
|
|
624
|
-
<xsl:
|
|
625
|
-
<xsl:with-param name="date" select="/itu:metanorma/itu:bibdata/itu:version/itu:revision-date"/>
|
|
626
|
-
<xsl:with-param name="inParenthesis">true</xsl:with-param>
|
|
627
|
-
</xsl:call-template>
|
|
536
|
+
<xsl:when test="$lang = 'en' or $lang = 'ar' or $lang = 'zh'">
|
|
537
|
+
<xsl:value-of select="concat($year_published, ' ', $i18n_edition)"/>
|
|
628
538
|
</xsl:when>
|
|
629
539
|
<xsl:otherwise>
|
|
630
|
-
<xsl:
|
|
631
|
-
|
|
632
|
-
</xsl:call-template>
|
|
540
|
+
<xsl:value-of select="concat($i18n_edition_Capitalized, ' ', $year_published)"/>
|
|
541
|
+
<xsl:if test="$lang = 'ru'"> года</xsl:if>
|
|
633
542
|
</xsl:otherwise>
|
|
634
543
|
</xsl:choose>
|
|
635
|
-
</xsl:variable>
|
|
636
|
-
<fo:block>
|
|
637
|
-
<xsl:copy-of select="$additional_block"/>
|
|
638
|
-
<xsl:if test="normalize-space($additional_block) = ''"> </xsl:if>
|
|
639
544
|
</fo:block>
|
|
640
|
-
</
|
|
641
|
-
</
|
|
545
|
+
</xsl:if>
|
|
546
|
+
</xsl:when> <!-- $doctype = 'service-publication' -->
|
|
642
547
|
|
|
643
|
-
<xsl:
|
|
644
|
-
<fo:block margin-
|
|
645
|
-
<xsl:
|
|
548
|
+
<xsl:otherwise>
|
|
549
|
+
<fo:block margin-top="11.5mm">
|
|
550
|
+
<xsl:choose>
|
|
551
|
+
<xsl:when test="$doctype = 'technical-report' or $doctype = 'technical-paper'">
|
|
552
|
+
<!-- Example: ITU-T Technical Paper -->
|
|
553
|
+
<xsl:value-of select="$docidentifier_ITU_left_part"/>
|
|
554
|
+
<xsl:text> </xsl:text>
|
|
555
|
+
<xsl:value-of select="$doctypeTitle"/>
|
|
556
|
+
</xsl:when>
|
|
557
|
+
<xsl:when test="$doctype = 'implementers-guide'">
|
|
558
|
+
<xsl:value-of select="$docidentifier_ITU_left_part"/>
|
|
559
|
+
<xsl:text> </xsl:text>
|
|
560
|
+
<xsl:value-of select="/itu:metanorma/itu:bibdata/itu:docidentifier[@type='ITU-Recommendation']"/>
|
|
561
|
+
<xsl:text> </xsl:text>
|
|
562
|
+
<xsl:value-of select="/itu:metanorma/itu:bibdata/itu:ext/itu:doctype[@language = $lang]"/>
|
|
563
|
+
</xsl:when>
|
|
564
|
+
<xsl:when test="$doctype = 'resolution'">
|
|
565
|
+
<xsl:value-of select="$doctypeTitle"/>
|
|
566
|
+
<xsl:text> </xsl:text>
|
|
567
|
+
<xsl:value-of select="$docidentifier_ITU_left_part"/>
|
|
568
|
+
</xsl:when>
|
|
569
|
+
<xsl:otherwise>
|
|
570
|
+
<xsl:value-of select="$doctypeTitle"/>
|
|
571
|
+
<xsl:text> </xsl:text>
|
|
572
|
+
<xsl:value-of select="$docidentifier_ITU"/>
|
|
573
|
+
</xsl:otherwise>
|
|
574
|
+
</xsl:choose>
|
|
646
575
|
</fo:block>
|
|
647
|
-
</xsl:if>
|
|
648
|
-
|
|
649
|
-
<!-- Series: -->
|
|
650
|
-
<xsl:variable name="series">
|
|
651
|
-
<xsl:call-template name="insertSeriesTitleMain">
|
|
652
|
-
<xsl:with-param name="i18n_series" select="$i18n_series"/>
|
|
653
|
-
</xsl:call-template>
|
|
654
|
-
<xsl:choose>
|
|
655
|
-
<xsl:when test="$doctype = 'recommendation-supplement'"/>
|
|
656
|
-
<xsl:otherwise>
|
|
657
|
-
<xsl:if test="/itu:metanorma/itu:bibdata/itu:series">
|
|
658
|
-
<fo:block font-weight="normal" margin-top="4mm">
|
|
659
|
-
<xsl:call-template name="insertSeriesTitleAdditional"/>
|
|
660
|
-
</fo:block>
|
|
661
|
-
</xsl:if>
|
|
662
|
-
</xsl:otherwise>
|
|
663
|
-
</xsl:choose>
|
|
664
|
-
</xsl:variable>
|
|
665
576
|
|
|
666
|
-
|
|
667
|
-
|
|
577
|
+
<fo:block-container font-size="14pt" margin-top="1mm" margin-right="2mm">
|
|
578
|
+
<xsl:if test="$bureau = 'T'">
|
|
579
|
+
<xsl:attribute name="text-align">end</xsl:attribute>
|
|
580
|
+
<xsl:attribute name="margin-right">-13.7mm</xsl:attribute>
|
|
581
|
+
</xsl:if>
|
|
668
582
|
<fo:block-container margin-right="0mm">
|
|
669
|
-
|
|
670
|
-
|
|
671
|
-
|
|
583
|
+
|
|
584
|
+
<xsl:variable name="additional_block">
|
|
585
|
+
<!-- Examples:
|
|
586
|
+
Amendment 1
|
|
587
|
+
Supplement 37 -->
|
|
588
|
+
<xsl:if test="$TDnumber != ''">
|
|
589
|
+
<fo:block-container>
|
|
590
|
+
<xsl:call-template name="setWritingMode"/>
|
|
591
|
+
<fo:block>TD number: <xsl:value-of select="$TDnumber"/></fo:block>
|
|
592
|
+
</fo:block-container>
|
|
593
|
+
</xsl:if>
|
|
594
|
+
<xsl:if test="$provisionalIdentifier != ''">
|
|
595
|
+
<fo:block-container>
|
|
596
|
+
<xsl:call-template name="setWritingMode"/>
|
|
597
|
+
<fo:block>Provisional identifier: <xsl:value-of select="$provisionalIdentifier"/>
|
|
598
|
+
</fo:block>
|
|
599
|
+
</fo:block-container>
|
|
600
|
+
</xsl:if>
|
|
601
|
+
<xsl:if test="$annexid != ''">
|
|
602
|
+
<fo:block-container>
|
|
603
|
+
<xsl:call-template name="setWritingMode"/>
|
|
604
|
+
<fo:block>
|
|
605
|
+
<xsl:value-of select="$i18n_annex"/>
|
|
606
|
+
<xsl:text> </xsl:text>
|
|
607
|
+
<xsl:value-of select="$annexid"/>
|
|
608
|
+
</fo:block>
|
|
609
|
+
</fo:block-container>
|
|
610
|
+
</xsl:if>
|
|
611
|
+
<xsl:if test="$isAmendment != ''">
|
|
612
|
+
<fo:block-container>
|
|
613
|
+
<xsl:call-template name="setWritingMode"/>
|
|
614
|
+
<fo:block><xsl:value-of select="$isAmendment"/></fo:block>
|
|
615
|
+
</fo:block-container>
|
|
616
|
+
</xsl:if>
|
|
617
|
+
<xsl:if test="$isCorrigendum != ''">
|
|
618
|
+
<fo:block-container>
|
|
619
|
+
<xsl:call-template name="setWritingMode"/>
|
|
620
|
+
<fo:block><xsl:value-of select="$isCorrigendum"/></fo:block>
|
|
621
|
+
</fo:block-container>
|
|
622
|
+
</xsl:if>
|
|
623
|
+
|
|
624
|
+
<!-- Date, example: (11/2018) -->
|
|
625
|
+
<xsl:choose>
|
|
626
|
+
<xsl:when test="($doctype = 'technical-report' or $doctype = 'technical-paper') and /itu:metanorma/itu:bibdata/itu:version/itu:revision-date">
|
|
627
|
+
<xsl:call-template name="formatMeetingDate">
|
|
628
|
+
<xsl:with-param name="date" select="/itu:metanorma/itu:bibdata/itu:version/itu:revision-date"/>
|
|
629
|
+
<xsl:with-param name="inParenthesis">true</xsl:with-param>
|
|
630
|
+
</xsl:call-template>
|
|
631
|
+
</xsl:when>
|
|
632
|
+
<xsl:otherwise>
|
|
633
|
+
<xsl:call-template name="formatDate">
|
|
634
|
+
<xsl:with-param name="date" select="$date_published"/>
|
|
635
|
+
</xsl:call-template>
|
|
636
|
+
</xsl:otherwise>
|
|
637
|
+
</xsl:choose>
|
|
638
|
+
</xsl:variable>
|
|
672
639
|
<fo:block>
|
|
673
|
-
<
|
|
640
|
+
<xsl:copy-of select="$additional_block"/>
|
|
641
|
+
<xsl:if test="normalize-space($additional_block) = ''"> </xsl:if>
|
|
674
642
|
</fo:block>
|
|
675
643
|
</fo:block-container>
|
|
676
|
-
</fo:block-container>
|
|
677
|
-
</xsl:if>
|
|
644
|
+
</fo:block-container> <!-- end of additional block -->
|
|
678
645
|
|
|
679
|
-
|
|
680
|
-
|
|
681
|
-
|
|
682
|
-
|
|
683
|
-
<xsl:value-of select="$docnumber"/>
|
|
646
|
+
<xsl:if test="$doctype = 'resolution'">
|
|
647
|
+
<fo:block margin-bottom="6pt">
|
|
648
|
+
<xsl:call-template name="insertMeetingInfo"/>
|
|
649
|
+
</fo:block>
|
|
684
650
|
</xsl:if>
|
|
685
|
-
</fo:block>
|
|
686
651
|
|
|
687
|
-
|
|
688
|
-
<xsl:
|
|
689
|
-
<xsl:
|
|
690
|
-
|
|
691
|
-
|
|
692
|
-
|
|
693
|
-
|
|
694
|
-
|
|
695
|
-
|
|
696
|
-
|
|
697
|
-
|
|
652
|
+
<!-- Series: -->
|
|
653
|
+
<xsl:variable name="series">
|
|
654
|
+
<xsl:call-template name="insertSeriesTitleMain">
|
|
655
|
+
<xsl:with-param name="i18n_series" select="$i18n_series"/>
|
|
656
|
+
</xsl:call-template>
|
|
657
|
+
<xsl:choose>
|
|
658
|
+
<xsl:when test="$doctype = 'recommendation-supplement'"/>
|
|
659
|
+
<xsl:otherwise>
|
|
660
|
+
<xsl:if test="/itu:metanorma/itu:bibdata/itu:series">
|
|
661
|
+
<fo:block font-weight="normal" margin-top="4mm">
|
|
662
|
+
<xsl:call-template name="insertSeriesTitleAdditional"/>
|
|
663
|
+
</fo:block>
|
|
664
|
+
</xsl:if>
|
|
665
|
+
</xsl:otherwise>
|
|
666
|
+
</xsl:choose>
|
|
667
|
+
</xsl:variable>
|
|
668
|
+
|
|
669
|
+
<xsl:if test="normalize-space($series) != ''">
|
|
670
|
+
<fo:block-container margin-right="5mm">
|
|
671
|
+
<fo:block-container margin-right="0mm">
|
|
672
|
+
<fo:block font-size="18pt" margin-top="5mm">
|
|
673
|
+
<xsl:copy-of select="$series"/>
|
|
674
|
+
</fo:block>
|
|
675
|
+
<fo:block>
|
|
676
|
+
<fo:leader leader-pattern="rule" rule-thickness="1pt" leader-length="100%"/>
|
|
677
|
+
</fo:block>
|
|
678
|
+
</fo:block-container>
|
|
679
|
+
</fo:block-container>
|
|
698
680
|
</xsl:if>
|
|
699
|
-
<xsl:value-of select="/itu:metanorma/itu:bibdata/itu:title[@type = 'main' and @language = $lang]"/>
|
|
700
|
-
</fo:block>
|
|
701
681
|
|
|
702
|
-
|
|
703
|
-
|
|
704
|
-
|
|
705
|
-
|
|
706
|
-
|
|
707
|
-
<xsl:value-of select="$annexid"/>
|
|
708
|
-
<xsl:value-of select="$en_dash_separator"/>
|
|
709
|
-
<xsl:value-of select="."/>
|
|
710
|
-
</fo:block>
|
|
711
|
-
</xsl:for-each>
|
|
712
|
-
|
|
713
|
-
<!-- Example: Amendment 1 - ... -->
|
|
714
|
-
<xsl:if test="$isAmendment != ''">
|
|
715
|
-
<fo:block margin-top="3mm" role="H1">
|
|
716
|
-
<xsl:value-of select="$isAmendment"/>
|
|
717
|
-
<xsl:variable name="title_amendment" select="normalize-space(/itu:metanorma/itu:bibdata/itu:title[@type = 'amendment'])"/>
|
|
718
|
-
<xsl:if test="$title_amendment != ''">
|
|
719
|
-
<xsl:value-of select="$en_dash_separator"/>
|
|
720
|
-
<xsl:value-of select="$title_amendment"/>
|
|
682
|
+
<fo:block role="H1">
|
|
683
|
+
<!-- margin-top="24mm" -->
|
|
684
|
+
<xsl:if test="($doctype = 'technical-report' or $doctype = 'technical-paper') and $docnumber != ''">
|
|
685
|
+
<xsl:attribute name="margin-top">3mm</xsl:attribute>
|
|
686
|
+
<xsl:value-of select="$docnumber"/>
|
|
721
687
|
</xsl:if>
|
|
722
688
|
</fo:block>
|
|
723
|
-
|
|
724
|
-
|
|
725
|
-
|
|
726
|
-
|
|
727
|
-
|
|
728
|
-
|
|
729
|
-
<xsl:if test="$
|
|
689
|
+
|
|
690
|
+
<fo:block margin-top="3pt">
|
|
691
|
+
<xsl:if test="$doctype = 'implementers-guide'">
|
|
692
|
+
<xsl:value-of select="/itu:metanorma/itu:bibdata/itu:ext/itu:doctype[@language = $lang]"/>
|
|
693
|
+
<xsl:text> for </xsl:text>
|
|
694
|
+
</xsl:if>
|
|
695
|
+
<xsl:if test="$doctype = 'resolution'">
|
|
696
|
+
<!-- Resolution 1 -->
|
|
697
|
+
<xsl:value-of select="$doctypeTitle"/>
|
|
698
|
+
<xsl:text> </xsl:text>
|
|
699
|
+
<xsl:value-of select="/itu:metanorma/itu:bibdata/itu:ext/itu:structuredidentifier/itu:docnumber"/>
|
|
730
700
|
<xsl:value-of select="$en_dash_separator"/>
|
|
731
|
-
<xsl:value-of select="$title_corrigendum"/>
|
|
732
701
|
</xsl:if>
|
|
702
|
+
<xsl:value-of select="/itu:metanorma/itu:bibdata/itu:title[@type = 'main' and @language = $lang]"/>
|
|
733
703
|
</fo:block>
|
|
734
|
-
</xsl:if>
|
|
735
704
|
|
|
736
|
-
|
|
737
|
-
<
|
|
738
|
-
<fo:block
|
|
739
|
-
<
|
|
740
|
-
|
|
741
|
-
|
|
705
|
+
<!-- Example: Annex F1 - ... -->
|
|
706
|
+
<xsl:for-each select="/itu:metanorma/itu:bibdata/itu:title[@type = 'annex' and @language = $lang]">
|
|
707
|
+
<fo:block font-size="18pt" margin-top="3mm" role="H1">
|
|
708
|
+
<xsl:value-of select="$i18n_annex"/>
|
|
709
|
+
<xsl:text> </xsl:text>
|
|
710
|
+
<xsl:value-of select="$annexid"/>
|
|
711
|
+
<xsl:value-of select="$en_dash_separator"/>
|
|
712
|
+
<xsl:value-of select="."/>
|
|
713
|
+
</fo:block>
|
|
714
|
+
</xsl:for-each>
|
|
715
|
+
|
|
716
|
+
<!-- Example: Amendment 1 - ... -->
|
|
717
|
+
<xsl:if test="$isAmendment != ''">
|
|
718
|
+
<fo:block margin-top="3mm" role="H1">
|
|
719
|
+
<xsl:value-of select="$isAmendment"/>
|
|
720
|
+
<xsl:variable name="title_amendment" select="normalize-space(/itu:metanorma/itu:bibdata/itu:title[@type = 'amendment'])"/>
|
|
721
|
+
<xsl:if test="$title_amendment != ''">
|
|
722
|
+
<xsl:value-of select="$en_dash_separator"/>
|
|
723
|
+
<xsl:value-of select="$title_amendment"/>
|
|
724
|
+
</xsl:if>
|
|
725
|
+
</fo:block>
|
|
726
|
+
</xsl:if>
|
|
727
|
+
<!-- Example: Corrigendum 1 - ... -->
|
|
728
|
+
<xsl:if test="$isCorrigendum != ''">
|
|
729
|
+
<fo:block margin-top="3mm" role="H1">
|
|
730
|
+
<xsl:value-of select="$isCorrigendum"/>
|
|
731
|
+
<xsl:variable name="title_corrigendum" select="normalize-space(/itu:metanorma/itu:bibdata/itu:title[@type = 'corrigendum'])"/>
|
|
732
|
+
<xsl:if test="$title_corrigendum != ''">
|
|
733
|
+
<xsl:value-of select="$en_dash_separator"/>
|
|
734
|
+
<xsl:value-of select="$title_corrigendum"/>
|
|
735
|
+
</xsl:if>
|
|
736
|
+
</fo:block>
|
|
737
|
+
</xsl:if>
|
|
738
|
+
|
|
739
|
+
<xsl:if test="/itu:metanorma/itu:boilerplate/itu:legal-statement/itu:clause[starts-with(@id, 'draft-warning')]">
|
|
740
|
+
<fo:block-container margin-left="1mm" margin-right="1mm" border="0.7mm solid black" margin-top="5mm">
|
|
741
|
+
<fo:block-container margin-left="1mm" margin-right="1mm">
|
|
742
|
+
<fo:block padding-top="3mm">
|
|
743
|
+
<xsl:apply-templates select="/itu:metanorma/itu:boilerplate/itu:legal-statement/itu:clause[starts-with(@id, 'draft-warning')]" mode="caution"/>
|
|
744
|
+
</fo:block>
|
|
745
|
+
</fo:block-container>
|
|
742
746
|
</fo:block-container>
|
|
743
|
-
</
|
|
744
|
-
</xsl:if>
|
|
747
|
+
</xsl:if>
|
|
745
748
|
|
|
746
|
-
|
|
747
|
-
|
|
748
|
-
|
|
749
|
-
|
|
750
|
-
|
|
751
|
-
|
|
752
|
-
|
|
753
|
-
|
|
754
|
-
|
|
755
|
-
|
|
749
|
+
<xsl:if test="$doctype = 'recommendation-supplement'">
|
|
750
|
+
<fo:block font-size="16pt" margin-top="3mm">
|
|
751
|
+
<xsl:if test="/itu:metanorma/itu:bibdata/itu:status/itu:stage = 'draft'">Draft </xsl:if>
|
|
752
|
+
<xsl:text>ITU-</xsl:text>
|
|
753
|
+
<xsl:value-of select="$bureau"/>
|
|
754
|
+
<xsl:text> </xsl:text>
|
|
755
|
+
<xsl:value-of select="/itu:metanorma/itu:bibdata/itu:docidentifier[@type = 'ITU-Supplement']"/>
|
|
756
|
+
</fo:block>
|
|
757
|
+
</xsl:if>
|
|
758
|
+
</xsl:otherwise>
|
|
756
759
|
|
|
757
|
-
|
|
760
|
+
</xsl:choose>
|
|
758
761
|
|
|
762
|
+
</fo:block-container>
|
|
759
763
|
</fo:block-container>
|
|
760
764
|
</fo:flow>
|
|
761
765
|
</fo:page-sequence>
|
|
@@ -2973,7 +2977,7 @@
|
|
|
2973
2977
|
</style>
|
|
2974
2978
|
<g>
|
|
2975
2979
|
<g>
|
|
2976
|
-
<rect x="0
|
|
2980
|
+
<rect x="0" y="0.6" class="st0" width="612" height="16.5"/>
|
|
2977
2981
|
</g>
|
|
2978
2982
|
<xsl:choose>
|
|
2979
2983
|
<xsl:when test="$lang = 'ar'">
|
|
@@ -3323,6 +3327,7 @@
|
|
|
3323
3327
|
<xsl:variable name="hair_space"> </xsl:variable>
|
|
3324
3328
|
<xsl:variable name="en_dash">–</xsl:variable>
|
|
3325
3329
|
<xsl:variable name="em_dash">—</xsl:variable>
|
|
3330
|
+
<xsl:variable name="nonbreak_space_em_dash_space"> — </xsl:variable>
|
|
3326
3331
|
<xsl:variable name="cr"> </xsl:variable>
|
|
3327
3332
|
<xsl:variable name="lf">
|
|
3328
3333
|
</xsl:variable>
|
|
@@ -11479,11 +11484,11 @@
|
|
|
11479
11484
|
</xsl:template>
|
|
11480
11485
|
|
|
11481
11486
|
<!-- figure/fn -->
|
|
11482
|
-
<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'fn']" priority="2"/>
|
|
11487
|
+
<xsl:template match="*[local-name() = 'figure'][not(@class = 'pseudocode')]/*[local-name() = 'fn']" priority="2"/>
|
|
11483
11488
|
<!-- figure/note -->
|
|
11484
|
-
<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'note']" priority="2"/>
|
|
11489
|
+
<xsl:template match="*[local-name() = 'figure'][not(@class = 'pseudocode')]/*[local-name() = 'note']" priority="2"/>
|
|
11485
11490
|
<!-- figure/example -->
|
|
11486
|
-
<xsl:template match="*[local-name() = 'figure']/*[local-name() = 'example']" priority="2"/>
|
|
11491
|
+
<xsl:template match="*[local-name() = 'figure'][not(@class = 'pseudocode')]/*[local-name() = 'example']" priority="2"/>
|
|
11487
11492
|
|
|
11488
11493
|
<!-- figure/note[@type = 'units'] -->
|
|
11489
11494
|
<!-- image/note[@type = 'units'] -->
|
|
@@ -15024,6 +15029,9 @@
|
|
|
15024
15029
|
<xsl:template match="*[local-name() = 'quote']/*[local-name() = 'author']" mode="update_xml_pres"/>
|
|
15025
15030
|
<xsl:template match="*[local-name() = 'amend']" mode="update_xml_step1"/>
|
|
15026
15031
|
<xsl:template match="*[local-name() = 'amend']" mode="update_xml_pres"/>
|
|
15032
|
+
<!-- https://github.com/metanorma/isodoc/issues/687 -->
|
|
15033
|
+
<xsl:template match="*[local-name() = 'source']" mode="update_xml_step1"/>
|
|
15034
|
+
<xsl:template match="*[local-name() = 'source']" mode="update_xml_pres"/>
|
|
15027
15035
|
|
|
15028
15036
|
<xsl:template match="*[local-name() = 'metanorma-extension']/*[local-name() = 'attachment']" mode="update_xml_step1">
|
|
15029
15037
|
<xsl:copy>
|
|
@@ -15306,6 +15314,20 @@
|
|
|
15306
15314
|
</xsl:element>
|
|
15307
15315
|
</xsl:template>
|
|
15308
15316
|
|
|
15317
|
+
<xsl:template match="*[local-name() = 'fmt-source']"/>
|
|
15318
|
+
<xsl:template match="*[local-name() = 'fmt-source']" mode="update_xml_step1">
|
|
15319
|
+
<xsl:element name="source" namespace="{$namespace_full}">
|
|
15320
|
+
<xsl:copy-of select="@*"/>
|
|
15321
|
+
<xsl:apply-templates mode="update_xml_step1"/>
|
|
15322
|
+
</xsl:element>
|
|
15323
|
+
</xsl:template>
|
|
15324
|
+
<xsl:template match="*[local-name() = 'fmt-source']" mode="update_xml_pres">
|
|
15325
|
+
<xsl:element name="source" namespace="{$namespace_full}">
|
|
15326
|
+
<xsl:copy-of select="@*"/>
|
|
15327
|
+
<xsl:apply-templates mode="update_xml_pres"/>
|
|
15328
|
+
</xsl:element>
|
|
15329
|
+
</xsl:template>
|
|
15330
|
+
|
|
15309
15331
|
<xsl:template match="*[local-name() = 'span'][ @class = 'fmt-caption-label' or @class = 'fmt-element-name' or @class = 'fmt-caption-delim' or @class = 'fmt-autonum-delim']" mode="update_xml_step1" priority="3">
|
|
15310
15332
|
<xsl:apply-templates mode="update_xml_step1"/>
|
|
15311
15333
|
</xsl:template>
|
|
@@ -16665,6 +16687,12 @@
|
|
|
16665
16687
|
</xsl:if>
|
|
16666
16688
|
</xsl:template>
|
|
16667
16689
|
|
|
16690
|
+
<xsl:template name="setIDforNamedDestinationInline">
|
|
16691
|
+
<xsl:if test="@named_dest">
|
|
16692
|
+
<fo:inline><xsl:call-template name="setIDforNamedDestination"/></fo:inline>
|
|
16693
|
+
</xsl:if>
|
|
16694
|
+
</xsl:template>
|
|
16695
|
+
|
|
16668
16696
|
<xsl:template name="setNamedDestination">
|
|
16669
16697
|
<!-- skip GUID, e.g. _33eac3cb-9663-4291-ae26-1d4b6f4635fc -->
|
|
16670
16698
|
<xsl:if test="@id and normalize-space(java:matches(java:java.lang.String.new(@id), '_[0-9a-z]{8}-[0-9a-z]{4}-[0-9a-z]{4}-[0-9a-z]{4}-[0-9a-z]{12}')) = 'false'">
|
|
@@ -56,7 +56,7 @@ module IsoDoc
|
|
|
56
56
|
|
|
57
57
|
def middle_title(isoxml)
|
|
58
58
|
s = isoxml.at(ns("//sections")) or return
|
|
59
|
-
isoxml.at(ns("//note[@type = 'title-footnote']"))
|
|
59
|
+
# isoxml.at(ns("//note[@type = 'title-footnote']"))
|
|
60
60
|
case @doctype
|
|
61
61
|
when "resolution"
|
|
62
62
|
middle_title_resolution(isoxml, s.children.first)
|
|
@@ -102,7 +102,9 @@ module IsoDoc
|
|
|
102
102
|
ret = ""
|
|
103
103
|
isoxml.xpath(ns("//note[@type = 'title-footnote']"))
|
|
104
104
|
.each_with_index do |f, i|
|
|
105
|
-
ret +=
|
|
105
|
+
ret += <<~FN.strip
|
|
106
|
+
<fn id='_#{UUIDTools::UUID.random_create}' reference='H#{i}'>#{f.remove.children.to_xml}</fn>
|
|
107
|
+
FN
|
|
106
108
|
end
|
|
107
109
|
ret
|
|
108
110
|
end
|