metanorma-iso 3.1.0 → 3.1.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (21) hide show
  1. checksums.yaml +4 -4
  2. data/README.adoc +1 -1
  3. data/lib/isodoc/iso/i18n-de.yaml +64 -0
  4. data/lib/isodoc/iso/i18n-en.yaml +2 -0
  5. data/lib/isodoc/iso/i18n-fr.yaml +46 -11
  6. data/lib/isodoc/iso/i18n-ru.yaml +61 -0
  7. data/lib/isodoc/iso/iso.amendment.xsl +591 -364
  8. data/lib/isodoc/iso/iso.international-standard.xsl +591 -364
  9. data/lib/isodoc/iso/metadata.rb +28 -21
  10. data/lib/isodoc/iso/presentation_bibdata.rb +2 -0
  11. data/lib/isodoc/iso/xref.rb +8 -12
  12. data/lib/metanorma/iso/basicdoc.rng +6 -6
  13. data/lib/metanorma/iso/front_contributor.rb +145 -21
  14. data/lib/metanorma/iso/front_id.rb +1 -7
  15. data/lib/metanorma/iso/isodoc.rng +8 -60
  16. data/lib/metanorma/iso/validate_requirements.rb +34 -36
  17. data/lib/metanorma/iso/validate_style.rb +9 -4
  18. data/lib/metanorma/iso/version.rb +1 -1
  19. data/lib/relaton/render/config.yml +1 -1
  20. data/metanorma-iso.gemspec +1 -1
  21. metadata +3 -3
data/lib/isodoc/iso/iso.amendment.xsl CHANGED
@@ -257,16 +257,11 @@
257
257
  </xsl:choose>
258
258
  </xsl:variable>
259
259
 
260
- <xsl:variable name="document-master-reference">
261
- <xsl:choose>
262
- <xsl:when test="$stage-abbreviation != ''">-publishedISO</xsl:when>
263
- <xsl:otherwise/>
264
- </xsl:choose>
265
- </xsl:variable>
260
+ <xsl:variable name="document-master-reference_addon"><xsl:if test="$stage-abbreviation = ''">-nonpublished</xsl:if></xsl:variable>
266
261
 
267
262
  <xsl:variable name="force-page-count-preface">
268
263
  <xsl:choose>
269
- <xsl:when test="$document-master-reference != ''">end-on-even</xsl:when>
264
+ <xsl:when test="$document-master-reference_addon = ''">end-on-even</xsl:when>
270
265
  <xsl:otherwise>no-force</xsl:otherwise>
271
266
  </xsl:choose>
272
267
  </xsl:variable>
@@ -326,10 +321,19 @@
326
321
  </xsl:for-each>
327
322
  </xsl:variable>
328
323
 
329
- <xsl:variable name="editorialgroup_">
324
+ <xsl:variable name="approvalgroup_">
330
325
  <!-- Example: ISO/TC 46/SC 2 -->
331
326
  <!-- ISO/SG SMART/SG TS/AG 1 -->
332
- <xsl:variable name="approvalgroup" select="normalize-space(/mn:metanorma/mn:bibdata/mn:ext/mn:approvalgroup/@identifier)"/>
327
+ <!-- <xsl:variable name="approvalgroup" select="normalize-space(/mn:metanorma/mn:bibdata/mn:ext/mn:approvalgroup/@identifier)"/> -->
328
+ <xsl:variable name="contributor_authorizer_">
329
+ <xsl:copy-of select="/mn:metanorma/mn:bibdata/mn:contributor[mn:role[@type = 'authorizer' and mn:description[normalize-space(@language) = ''] = 'Technical committee']]"/>
330
+ </xsl:variable>
331
+ <xsl:variable name="contributor_authorizer" select="xalan:nodeset($contributor_authorizer_)"/>
332
+ <xsl:variable name="organization_abbreviation" select="normalize-space($contributor_authorizer/mn:contributor/mn:organization/mn:abbreviation)"/>
333
+ <xsl:variable name="approvalgroup">
334
+ <xsl:if test="$organization_abbreviation = 'ISO' or contains($organization_abbreviation, 'ISO/') or contains($organization_abbreviation, '/ISO')"><xsl:value-of select="concat($organization_abbreviation, '/')"/></xsl:if>
335
+ <xsl:value-of select="normalize-space($contributor_authorizer/mn:contributor/mn:organization/mn:subdivision/mn:identifier[@type = 'full'])"/>
336
+ </xsl:variable>
333
337
  <xsl:variable name="parts_by_slash">
334
338
  <xsl:call-template name="split">
335
339
  <xsl:with-param name="pText" select="$approvalgroup"/>
@@ -370,7 +374,7 @@
370
374
  </xsl:choose>
371
375
  </xsl:for-each>
372
376
  </xsl:variable>
373
- <xsl:variable name="editorialgroup" select="xalan:nodeset($editorialgroup_)"/>
377
+ <xsl:variable name="approvalgroup" select="xalan:nodeset($approvalgroup_)"/>
374
378
 
375
379
  <xsl:variable name="secretariat_">
376
380
  <xsl:variable name="value" select="normalize-space(/mn:metanorma/mn:bibdata/mn:ext/mn:editorialgroup/mn:secretariat)"/>
@@ -443,7 +447,7 @@
443
447
  <xsl:variable name="marginTopBottom_cover_page_2024">9.9</xsl:variable>
444
448
 
445
449
  <!-- cover page -->
446
- <fo:simple-page-master master-name="cover-page" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
450
+ <fo:simple-page-master master-name="cover-page-nonpublished" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
447
451
  <fo:region-body margin-top="25.4mm" margin-bottom="25.4mm" margin-left="31.7mm" margin-right="31.7mm"/>
448
452
  <fo:region-before region-name="cover-page-header" extent="25.4mm"/>
449
453
  <fo:region-after/>
@@ -459,24 +463,24 @@
459
463
  <fo:region-end region-name="cover-right-region" extent="18.5mm"/>
460
464
  </fo:simple-page-master>
461
465
 
462
- <fo:simple-page-master master-name="cover-page-publishedISO-odd" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
466
+ <fo:simple-page-master master-name="cover-page-odd" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
463
467
  <fo:region-body margin-top="12.7mm" margin-bottom="75mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm"/>
464
468
  <fo:region-before region-name="cover-page-header" extent="12.7mm"/>
465
469
  <fo:region-after region-name="cover-page-footer" extent="75mm" display-align="after"/>
466
470
  <fo:region-start region-name="cover-left-region" extent="{$marginLeftRight1}mm"/>
467
471
  <fo:region-end region-name="cover-right-region" extent="{$marginLeftRight2}mm"/>
468
472
  </fo:simple-page-master>
469
- <fo:simple-page-master master-name="cover-page-publishedISO-even" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
473
+ <fo:simple-page-master master-name="cover-page-even" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
470
474
  <fo:region-body margin-top="12.7mm" margin-bottom="75mm" margin-left="{$marginLeftRight2}mm" margin-right="{$marginLeftRight1}mm"/>
471
475
  <fo:region-before region-name="cover-page-header" extent="12.7mm"/>
472
476
  <fo:region-after region-name="cover-page-footer" extent="75mm" display-align="after"/>
473
477
  <fo:region-start region-name="cover-left-region" extent="{$marginLeftRight2}mm"/>
474
478
  <fo:region-end region-name="cover-right-region" extent="{$marginLeftRight1}mm"/>
475
479
  </fo:simple-page-master>
476
- <fo:page-sequence-master master-name="cover-page-publishedISO">
480
+ <fo:page-sequence-master master-name="cover-page">
477
481
  <fo:repeatable-page-master-alternatives>
478
- <fo:conditional-page-master-reference odd-or-even="even" master-reference="cover-page-publishedISO-even"/>
479
- <fo:conditional-page-master-reference odd-or-even="odd" master-reference="cover-page-publishedISO-odd"/>
482
+ <fo:conditional-page-master-reference odd-or-even="even" master-reference="cover-page-even"/>
483
+ <fo:conditional-page-master-reference odd-or-even="odd" master-reference="cover-page-odd"/>
480
484
  </fo:repeatable-page-master-alternatives>
481
485
  </fo:page-sequence-master>
482
486
 
@@ -514,14 +518,14 @@
514
518
 
515
519
  <!-- contents pages -->
516
520
  <!-- odd pages -->
517
- <fo:simple-page-master master-name="odd" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
521
+ <fo:simple-page-master master-name="odd-nonpublished" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
518
522
  <fo:region-body margin-top="27.4mm" margin-bottom="{$marginBottom}mm" margin-left="19mm" margin-right="19mm"/>
519
523
  <fo:region-before region-name="header-odd" extent="27.4mm"/> <!-- display-align="center" -->
520
524
  <fo:region-after region-name="footer-odd" extent="{$marginBottom - 2}mm"/>
521
525
  <fo:region-start region-name="left-region" extent="19mm"/>
522
526
  <fo:region-end region-name="right-region" extent="19mm"/>
523
527
  </fo:simple-page-master>
524
- <fo:simple-page-master master-name="odd-landscape" page-width="{$pageHeight}mm" page-height="{$pageWidth}mm">
528
+ <fo:simple-page-master master-name="odd-nonpublished-landscape" page-width="{$pageHeight}mm" page-height="{$pageWidth}mm">
525
529
  <fo:region-body margin-top="27.4mm" margin-bottom="{$marginBottom}mm" margin-left="19mm" margin-right="19mm"/>
526
530
  <fo:region-before region-name="header-odd" extent="27.4mm"/>
527
531
  <fo:region-after region-name="footer-odd" extent="{$marginBottom - 2}mm"/>
@@ -529,42 +533,42 @@
529
533
  <fo:region-end region-name="right-region" extent="19mm"/>
530
534
  </fo:simple-page-master>
531
535
  <!-- even pages -->
532
- <fo:simple-page-master master-name="even" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
536
+ <fo:simple-page-master master-name="even-nonpublished" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
533
537
  <fo:region-body margin-top="27.4mm" margin-bottom="{$marginBottom}mm" margin-left="19mm" margin-right="19mm"/>
534
538
  <fo:region-before region-name="header-even" extent="27.4mm"/> <!-- display-align="center" -->
535
539
  <fo:region-after region-name="footer-even" extent="{$marginBottom - 2}mm"/>
536
540
  <fo:region-start region-name="left-region" extent="19mm"/>
537
541
  <fo:region-end region-name="right-region" extent="19mm"/>
538
542
  </fo:simple-page-master>
539
- <fo:simple-page-master master-name="even-landscape" page-width="{$pageHeight}mm" page-height="{$pageWidth}mm">
543
+ <fo:simple-page-master master-name="even-nonpublished-landscape" page-width="{$pageHeight}mm" page-height="{$pageWidth}mm">
540
544
  <fo:region-body margin-top="27.4mm" margin-bottom="{$marginBottom}mm" margin-left="19mm" margin-right="19mm"/>
541
545
  <fo:region-before region-name="header-even" extent="27.4mm"/> <!-- display-align="center" -->
542
546
  <fo:region-after region-name="footer-even" extent="{$marginBottom - 2}mm"/>
543
547
  <fo:region-start region-name="left-region" extent="19mm"/>
544
548
  <fo:region-end region-name="right-region" extent="19mm"/>
545
549
  </fo:simple-page-master>
546
- <fo:page-sequence-master master-name="preface">
550
+ <fo:page-sequence-master master-name="preface-nonpublished">
547
551
  <fo:repeatable-page-master-alternatives>
548
- <fo:conditional-page-master-reference odd-or-even="even" master-reference="even"/>
549
- <fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd"/>
552
+ <fo:conditional-page-master-reference odd-or-even="even" master-reference="even-nonpublished"/>
553
+ <fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd-nonpublished"/>
550
554
  </fo:repeatable-page-master-alternatives>
551
555
  </fo:page-sequence-master>
552
- <fo:page-sequence-master master-name="preface-landscape">
556
+ <fo:page-sequence-master master-name="preface-nonpublished-landscape">
553
557
  <fo:repeatable-page-master-alternatives>
554
- <fo:conditional-page-master-reference odd-or-even="even" master-reference="even-landscape"/>
555
- <fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd-landscape"/>
558
+ <fo:conditional-page-master-reference odd-or-even="even" master-reference="even-nonpublished-landscape"/>
559
+ <fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd-nonpublished-landscape"/>
556
560
  </fo:repeatable-page-master-alternatives>
557
561
  </fo:page-sequence-master>
558
- <fo:page-sequence-master master-name="document">
562
+ <fo:page-sequence-master master-name="document-nonpublished">
559
563
  <fo:repeatable-page-master-alternatives>
560
- <fo:conditional-page-master-reference odd-or-even="even" master-reference="even"/>
561
- <fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd"/>
564
+ <fo:conditional-page-master-reference odd-or-even="even" master-reference="even-nonpublished"/>
565
+ <fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd-nonpublished"/>
562
566
  </fo:repeatable-page-master-alternatives>
563
567
  </fo:page-sequence-master>
564
- <fo:page-sequence-master master-name="document-landscape">
568
+ <fo:page-sequence-master master-name="document-nonpublished-landscape">
565
569
  <fo:repeatable-page-master-alternatives>
566
- <fo:conditional-page-master-reference odd-or-even="even" master-reference="even-landscape"/>
567
- <fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd-landscape"/>
570
+ <fo:conditional-page-master-reference odd-or-even="even" master-reference="even-nonpublished-landscape"/>
571
+ <fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd-nonpublished-landscape"/>
568
572
  </fo:repeatable-page-master-alternatives>
569
573
  </fo:page-sequence-master>
570
574
 
@@ -599,7 +603,7 @@
599
603
  </fo:page-sequence-master>
600
604
 
601
605
  <!-- first page -->
602
- <fo:simple-page-master master-name="first-publishedISO" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
606
+ <fo:simple-page-master master-name="firstpage" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
603
607
  <fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm" column-count="{$layout_columns}" column-gap="{$column_gap}"/>
604
608
  <fo:region-before region-name="header-first" extent="{$marginTop}mm">
605
609
  <xsl:if test="(($layoutVersion = '1987' and $doctype = 'technical-report') or ($layoutVersion = '1979' and $doctype = 'addendum'))">
@@ -611,7 +615,7 @@
611
615
  <fo:region-end region-name="right-region" extent="{$marginLeftRight2}mm"/>
612
616
  </fo:simple-page-master>
613
617
  <!-- odd pages -->
614
- <fo:simple-page-master master-name="odd-publishedISO" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
618
+ <fo:simple-page-master master-name="odd" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
615
619
  <fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm" column-count="{$layout_columns}" column-gap="{$column_gap}"/>
616
620
  <fo:region-before region-name="header-odd" extent="{$marginTop}mm">
617
621
  <xsl:if test="$layoutVersion = '1951'">
@@ -623,7 +627,7 @@
623
627
  <fo:region-end region-name="right-region" extent="{$marginLeftRight2}mm"/>
624
628
  </fo:simple-page-master>
625
629
 
626
- <fo:simple-page-master master-name="odd-publishedISO-landscape" page-width="{$pageHeight}mm" page-height="{$pageWidth}mm">
630
+ <fo:simple-page-master master-name="odd-landscape" page-width="{$pageHeight}mm" page-height="{$pageWidth}mm">
627
631
  <fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight1}mm" margin-right="{$marginLeftRight2}mm" column-count="{$layout_columns}" column-gap="{$column_gap}"/>
628
632
  <fo:region-before region-name="header-odd" extent="{$marginTop}mm"/> <!-- display-align="center" -->
629
633
  <fo:region-after region-name="footer-odd" extent="{$marginBottom - 2}mm"/>
@@ -631,7 +635,7 @@
631
635
  <fo:region-end region-name="right-region" extent="{$marginLeftRight2}mm"/>
632
636
  </fo:simple-page-master>
633
637
  <!-- even pages -->
634
- <fo:simple-page-master master-name="even-publishedISO" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
638
+ <fo:simple-page-master master-name="even" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
635
639
  <fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight2}mm" margin-right="{$marginLeftRight1}mm" column-count="{$layout_columns}" column-gap="{$column_gap}"/>
636
640
  <fo:region-before region-name="header-even" extent="{$marginTop}mm">
637
641
  <xsl:if test="$layoutVersion = '1951'">
@@ -644,7 +648,7 @@
644
648
  </fo:simple-page-master>
645
649
 
646
650
  <!-- for 1951 layout only -->
647
- <fo:simple-page-master master-name="even-last-publishedISO" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
651
+ <fo:simple-page-master master-name="even-last" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
648
652
  <fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight2}mm" margin-right="{$marginLeftRight1}mm" column-count="{$layout_columns}" column-gap="{$column_gap}"/>
649
653
  <fo:region-before region-name="header-even" extent="{$marginTop}mm" precedence="true"/>
650
654
  <fo:region-after region-name="footer-even-last" extent="{$marginBottom - 2}mm"/>
@@ -652,7 +656,7 @@
652
656
  <fo:region-end region-name="right-region" extent="{$marginLeftRight1}mm"/>
653
657
  </fo:simple-page-master>
654
658
 
655
- <fo:simple-page-master master-name="even-publishedISO-landscape" page-width="{$pageHeight}mm" page-height="{$pageWidth}mm">
659
+ <fo:simple-page-master master-name="even-landscape" page-width="{$pageHeight}mm" page-height="{$pageWidth}mm">
656
660
  <fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight2}mm" margin-right="{$marginLeftRight1}mm" column-count="{$layout_columns}" column-gap="{$column_gap}"/>
657
661
  <fo:region-before region-name="header-even" extent="{$marginTop}mm"/>
658
662
  <fo:region-after region-name="footer-even" extent="{$marginBottom - 2}mm"/>
@@ -666,18 +670,18 @@
666
670
  <fo:region-start region-name="left" extent="{$marginLeftRight2}mm"/>
667
671
  <fo:region-end region-name="right" extent="{$marginLeftRight1}mm"/>
668
672
  </fo:simple-page-master>
669
- <fo:page-sequence-master master-name="preface-publishedISO">
673
+ <fo:page-sequence-master master-name="preface">
670
674
  <fo:repeatable-page-master-alternatives>
671
675
  <fo:conditional-page-master-reference master-reference="blankpage" blank-or-not-blank="blank"/>
672
- <fo:conditional-page-master-reference odd-or-even="even" master-reference="even-publishedISO"/>
673
- <fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd-publishedISO"/>
676
+ <fo:conditional-page-master-reference odd-or-even="even" master-reference="even"/>
677
+ <fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd"/>
674
678
  </fo:repeatable-page-master-alternatives>
675
679
  </fo:page-sequence-master>
676
- <fo:page-sequence-master master-name="preface-publishedISO-landscape">
680
+ <fo:page-sequence-master master-name="preface-landscape">
677
681
  <fo:repeatable-page-master-alternatives>
678
682
  <fo:conditional-page-master-reference master-reference="blankpage" blank-or-not-blank="blank"/>
679
- <fo:conditional-page-master-reference odd-or-even="even" master-reference="even-publishedISO-landscape"/>
680
- <fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd-publishedISO-landscape"/>
683
+ <fo:conditional-page-master-reference odd-or-even="even" master-reference="even-landscape"/>
684
+ <fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd-landscape"/>
681
685
  </fo:repeatable-page-master-alternatives>
682
686
  </fo:page-sequence-master>
683
687
 
@@ -692,59 +696,59 @@
692
696
  <fo:page-sequence-master master-name="preface-1987_TR">
693
697
  <fo:repeatable-page-master-alternatives>
694
698
  <fo:conditional-page-master-reference master-reference="first-preface_1987_TR" page-position="first"/>
695
- <fo:conditional-page-master-reference odd-or-even="even" master-reference="even-publishedISO"/>
696
- <fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd-publishedISO"/>
699
+ <fo:conditional-page-master-reference odd-or-even="even" master-reference="even"/>
700
+ <fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd"/>
697
701
  </fo:repeatable-page-master-alternatives>
698
702
  </fo:page-sequence-master>
699
703
 
700
- <fo:page-sequence-master master-name="document-publishedISO_first_sequence">
704
+ <fo:page-sequence-master master-name="document_first_sequence">
701
705
  <fo:repeatable-page-master-alternatives>
702
706
  <xsl:if test="not($layoutVersion = '1951')">
703
- <fo:conditional-page-master-reference master-reference="first-publishedISO" page-position="first"/>
707
+ <fo:conditional-page-master-reference master-reference="firstpage" page-position="first"/>
704
708
  </xsl:if>
705
709
  <xsl:if test="$layoutVersion = '1951'">
706
- <fo:conditional-page-master-reference page-position="last" master-reference="even-last-publishedISO"/> <!-- odd-or-even="even" -->
710
+ <fo:conditional-page-master-reference page-position="last" master-reference="even-last"/> <!-- odd-or-even="even" -->
707
711
  </xsl:if>
708
- <fo:conditional-page-master-reference odd-or-even="even" master-reference="even-publishedISO"/>
709
- <fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd-publishedISO"/>
712
+ <fo:conditional-page-master-reference odd-or-even="even" master-reference="even"/>
713
+ <fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd"/>
710
714
  </fo:repeatable-page-master-alternatives>
711
715
  </fo:page-sequence-master>
712
716
 
713
- <fo:page-sequence-master master-name="document-publishedISO">
717
+ <fo:page-sequence-master master-name="document">
714
718
  <fo:repeatable-page-master-alternatives>
715
719
  <xsl:if test="$layoutVersion = '1951'">
716
- <fo:conditional-page-master-reference page-position="last" master-reference="even-last-publishedISO"/> <!-- odd-or-even="even" -->
720
+ <fo:conditional-page-master-reference page-position="last" master-reference="even-last"/> <!-- odd-or-even="even" -->
717
721
  </xsl:if>
718
- <fo:conditional-page-master-reference odd-or-even="even" master-reference="even-publishedISO"/>
719
- <fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd-publishedISO"/>
722
+ <fo:conditional-page-master-reference odd-or-even="even" master-reference="even"/>
723
+ <fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd"/>
720
724
  </fo:repeatable-page-master-alternatives>
721
725
  </fo:page-sequence-master>
722
726
 
723
- <fo:page-sequence-master master-name="document-publishedISO-landscape_first_sequence">
727
+ <fo:page-sequence-master master-name="document-landscape_first_sequence">
724
728
  <fo:repeatable-page-master-alternatives>
725
729
  <xsl:if test="not($layoutVersion = '1951')">
726
- <fo:conditional-page-master-reference master-reference="first-publishedISO" page-position="first"/>
730
+ <fo:conditional-page-master-reference master-reference="firstpage" page-position="first"/>
727
731
  </xsl:if>
728
- <fo:conditional-page-master-reference odd-or-even="even" master-reference="even-publishedISO-landscape"/>
729
- <fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd-publishedISO-landscape"/>
732
+ <fo:conditional-page-master-reference odd-or-even="even" master-reference="even-landscape"/>
733
+ <fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd-landscape"/>
730
734
  </fo:repeatable-page-master-alternatives>
731
735
  </fo:page-sequence-master>
732
- <fo:page-sequence-master master-name="document-publishedISO-landscape">
736
+ <fo:page-sequence-master master-name="document-landscape">
733
737
  <fo:repeatable-page-master-alternatives>
734
- <fo:conditional-page-master-reference odd-or-even="even" master-reference="even-publishedISO-landscape"/>
735
- <fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd-publishedISO-landscape"/>
738
+ <fo:conditional-page-master-reference odd-or-even="even" master-reference="even-landscape"/>
739
+ <fo:conditional-page-master-reference odd-or-even="odd" master-reference="odd-landscape"/>
736
740
  </fo:repeatable-page-master-alternatives>
737
741
  </fo:page-sequence-master>
738
742
 
739
- <fo:simple-page-master master-name="last-page" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
743
+ <fo:simple-page-master master-name="back-page" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
740
744
  <fo:region-body margin-top="{$marginTop}mm" margin-bottom="{$marginBottom}mm" margin-left="{$marginLeftRight2}mm" margin-right="{$marginLeftRight1}mm"/>
741
745
  <fo:region-before region-name="header-even" extent="{$marginTop}mm"/>
742
- <fo:region-after region-name="last-page-footer" extent="{$marginBottom - 2}mm"/>
746
+ <fo:region-after region-name="back-page-footer" extent="{$marginBottom - 2}mm"/>
743
747
  <fo:region-start region-name="left-region" extent="{$marginLeftRight2}mm"/>
744
748
  <fo:region-end region-name="right-region" extent="{$marginLeftRight1}mm"/>
745
749
  </fo:simple-page-master>
746
750
 
747
- <fo:simple-page-master master-name="last-page_2024" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
751
+ <fo:simple-page-master master-name="back-page_2024" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
748
752
  <fo:region-body margin-top="{$marginTopBottom_cover_page_2024}mm" margin-bottom="{$marginTopBottom_cover_page_2024}mm" margin-left="{$marginLeftRight_cover_page_2024}mm" margin-right="{$marginLeftRight_cover_page_2024}mm"/>
749
753
  <fo:region-before region-name="header" extent="{$marginTopBottom_cover_page_2024}mm"/>
750
754
  <fo:region-after region-name="footer" extent="{$marginTopBottom_cover_page_2024}mm"/>
@@ -818,7 +822,7 @@
818
822
  <xsl:with-param name="root-style" select="$root-style"/>
819
823
  </xsl:call-template>
820
824
 
821
- <xsl:if test="$layoutVersion = '2024'">
825
+ <xsl:if test="$layoutVersion = '2024' and /mn:metanorma/mn:bibdata/mn:contributor[mn:role/@type = 'author']/mn:organization/mn:abbreviation = 'ISO'">
822
826
  <xsl:attribute name="color">rgb(35,31,32)</xsl:attribute>
823
827
  </xsl:if>
824
828
 
@@ -886,12 +890,10 @@
886
890
 
887
891
  <xsl:choose>
888
892
  <xsl:when test="$layoutVersion = '1951'">
889
- <fo:page-sequence master-reference="document{$document-master-reference}" initial-page-number="auto" force-page-count="no-force">
890
- <fo:static-content flow-name="xsl-footnote-separator">
891
- <fo:block>
892
- <fo:leader leader-pattern="rule" leader-length="30%"/>
893
- </fo:block>
894
- </fo:static-content>
893
+ <fo:page-sequence master-reference="document{$document-master-reference_addon}" initial-page-number="auto" force-page-count="no-force">
894
+
895
+ <xsl:call-template name="insertFootnoteSeparatorCommon"/>
896
+
895
897
  <xsl:call-template name="insertHeaderFooter">
896
898
  <xsl:with-param name="is_header">false</xsl:with-param>
897
899
  <xsl:with-param name="insert_footer_last">false</xsl:with-param>
@@ -1069,7 +1071,7 @@
1069
1071
  <fo:page-sequence format="i" force-page-count="no-force">
1070
1072
 
1071
1073
  <xsl:attribute name="master-reference">
1072
- <xsl:value-of select="concat('preface',$document-master-reference)"/>
1074
+ <xsl:value-of select="concat('preface',$document-master-reference_addon)"/>
1073
1075
  <xsl:call-template name="getPageSequenceOrientation"/>
1074
1076
  </xsl:attribute>
1075
1077
 
@@ -1081,7 +1083,7 @@
1081
1083
  <xsl:attribute name="master-reference">preface-1972-1998</xsl:attribute>
1082
1084
  </xsl:if>
1083
1085
  <xsl:if test="$layoutVersion = '2024'">
1084
- <fo:static-content flow-name="xsl-footnote-separator">
1086
+ <fo:static-content flow-name="xsl-footnote-separator" role="artifact">
1085
1087
  <fo:block margin-bottom="6pt">
1086
1088
  <fo:leader leader-pattern="rule" leader-length="51mm" rule-thickness="0.5pt"/>
1087
1089
  </fo:block>
@@ -1091,7 +1093,7 @@
1091
1093
  <xsl:with-param name="font-weight">normal</xsl:with-param>
1092
1094
  <xsl:with-param name="is_footer">true</xsl:with-param>
1093
1095
  </xsl:call-template>
1094
- <fo:flow flow-name="xsl-region-body" line-height="115%">
1096
+ <fo:flow flow-name="xsl-region-body" line-height="115%" role="SKIP">
1095
1097
 
1096
1098
  <xsl:if test="position() = 1">
1097
1099
 
@@ -1218,14 +1220,14 @@
1218
1220
  <!-- BODY -->
1219
1221
  <fo:page-sequence force-page-count="no-force">
1220
1222
 
1221
- <!-- Example: msster-reference document-publishedISO-landscape_first_sequence -->
1223
+ <!-- Example: msster-reference document-landscape_first_sequence -->
1222
1224
  <xsl:attribute name="master-reference">
1223
- <xsl:value-of select="concat('document',$document-master-reference)"/>
1225
+ <xsl:value-of select="concat('document',$document-master-reference_addon)"/>
1224
1226
  <!-- <xsl:variable name="previous_orientation" select="preceding-sibling::page_sequence[@orientation][1]/@orientation"/>
1225
1227
  <xsl:if test="(@orientation = 'landscape' or $previous_orientation = 'landscape') and not(@orientation = 'portrait')">-<xsl:value-of select="@orientation"/></xsl:if> -->
1226
1228
  <xsl:call-template name="getPageSequenceOrientation"/>
1227
1229
  <xsl:if test="position() = 1">
1228
- <xsl:if test="normalize-space($document-master-reference) != ''">_first_sequence</xsl:if>
1230
+ <xsl:if test="normalize-space($document-master-reference_addon) = ''">_first_sequence</xsl:if>
1229
1231
  </xsl:if>
1230
1232
  </xsl:attribute>
1231
1233
  <xsl:if test="position() = 1">
@@ -1235,7 +1237,7 @@
1235
1237
  <xsl:attribute name="initial-page-number">auto</xsl:attribute>
1236
1238
  <xsl:attribute name="force-page-count">end-on-even</xsl:attribute>
1237
1239
  </xsl:if>
1238
- <fo:static-content flow-name="xsl-footnote-separator">
1240
+ <fo:static-content flow-name="xsl-footnote-separator" role="artifact">
1239
1241
  <fo:block>
1240
1242
  <xsl:if test="$layoutVersion = '2024'">
1241
1243
  <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
@@ -1254,7 +1256,7 @@
1254
1256
  <xsl:with-param name="border_around_page" select="$border_around_page"/>
1255
1257
  <xsl:with-param name="insert_header_first" select="normalize-space(position() = 1)"/>
1256
1258
  </xsl:call-template>
1257
- <fo:flow flow-name="xsl-region-body">
1259
+ <fo:flow flow-name="xsl-region-body" role="SKIP">
1258
1260
 
1259
1261
  <!-- Information and documentation — Codes for transcription systems -->
1260
1262
  <!-- <fo:block-container>
@@ -1879,10 +1881,18 @@
1879
1881
  </xsl:choose>
1880
1882
  </xsl:when>
1881
1883
  <!-- <xsl:when test="$stage-abbreviation = 'FDAmd' or $stage-abbreviation = 'FDAM'"><xsl:value-of select="$doctype_uppercased"/></xsl:when> -->
1882
- <xsl:when test="$stagename-header-coverpage != ''">
1884
+ <xsl:when test="$stagename-header-coverpage != '' or normalize-space($stagename_localized_coverpage) != ''">
1883
1885
  <xsl:attribute name="margin-top">12pt</xsl:attribute>
1884
1886
 
1885
- <xsl:value-of select="$stagename-header-coverpage"/>
1887
+ <xsl:choose>
1888
+ <xsl:when test="normalize-space($stagename_localized_coverpage) != ''">
1889
+ <!-- FINAL DRAFT<br/>International Standard-->
1890
+ <xsl:apply-templates select="xalan:nodeset($stagename_localized_coverpage)/node()"/>
1891
+ </xsl:when>
1892
+ <xsl:otherwise>
1893
+ <xsl:value-of select="$stagename-header-coverpage"/>
1894
+ </xsl:otherwise>
1895
+ </xsl:choose>
1886
1896
 
1887
1897
  <!-- if there is iteration number, then print it -->
1888
1898
  <xsl:variable name="iteration" select="number(/mn:metanorma/mn:bibdata/mn:status/mn:iteration)"/>
@@ -1896,6 +1906,7 @@
1896
1906
  <xsl:when test="$doctype = 'amendment'">
1897
1907
  <xsl:value-of select="$updates-document-type_str"/>
1898
1908
  </xsl:when>
1909
+ <xsl:when test="normalize-space($stagename_localized_coverpage) != ''"/>
1899
1910
  <xsl:otherwise>
1900
1911
  <xsl:value-of select="$doctype_localized"/>
1901
1912
  </xsl:otherwise>
@@ -1978,108 +1989,128 @@
1978
1989
  </fo:block>
1979
1990
  </fo:block-container>
1980
1991
  </fo:table-cell>
1981
- <fo:table-cell number-columns-spanned="2" padding-left="6mm">
1982
- <fo:block margin-top="2.5mm" line-height="1.1" role="SKIP">
1992
+ <fo:table-cell number-columns-spanned="2" number-rows-spanned="2" padding-left="6mm">
1983
1993
 
1984
- <xsl:if test="not($stage-abbreviation = 'DIS' or $stage-abbreviation = 'DAMD' or $stage-abbreviation = 'DAM')">
1985
- <xsl:variable name="edition_and_date">
1986
- <xsl:call-template name="insertEditionAndDate"/>
1987
- </xsl:variable>
1988
- <xsl:if test="normalize-space($edition_and_date) != ''">
1989
- <fo:block font-size="18pt" font-weight="bold" margin-bottom="3mm">
1990
- <xsl:value-of select="$edition_and_date"/>
1991
- </fo:block>
1992
- </xsl:if>
1993
- </xsl:if>
1994
+ <fo:table width="100%" table-layout="fixed">
1995
+ <fo:table-body>
1996
+ <fo:table-row height="85mm">
1997
+ <fo:table-cell>
1994
1998
 
1995
- <xsl:if test="$doctype = 'amendment'"> <!-- and not($stage-abbreviation = 'FDAMD' or $stage-abbreviation = 'FDAM') -->
1996
- <fo:block font-size="15pt" font-weight="bold" margin-bottom="3mm">
1997
- <xsl:value-of select="$doctype_uppercased"/>
1998
- <xsl:text> </xsl:text>
1999
- <xsl:variable name="amendment-number" select="/mn:metanorma/mn:bibdata/mn:ext/mn:structuredidentifier/mn:project-number/@amendment"/>
2000
- <xsl:if test="normalize-space($amendment-number) != ''">
2001
- <xsl:value-of select="$amendment-number"/><xsl:text> </xsl:text>
2002
- </xsl:if>
2003
- </fo:block>
2004
- <!-- </xsl:if>
2005
-
2006
- <xsl:if test="$doctype = 'amendment' and not($stage-abbreviation = 'FDAMD' or $stage-abbreviation = 'FDAM')"> -->
2007
- <xsl:if test="/mn:metanorma/mn:bibdata/mn:date[@type = 'updated']">
2008
- <fo:block font-size="18pt" font-weight="bold" margin-bottom="3mm">
2009
- <xsl:value-of select="/mn:metanorma/mn:bibdata/mn:date[@type = 'updated']"/>
2010
- </fo:block>
2011
- </xsl:if>
2012
- </xsl:if>
1999
+ <fo:block margin-top="2.5mm" line-height="1.1" role="SKIP">
2013
2000
 
2014
- <xsl:variable name="date_corrected" select="normalize-space(/mn:metanorma/mn:bibdata/mn:date[@type = 'corrected'])"/>
2015
- <xsl:if test="$date_corrected != ''">
2016
- <fo:block font-size="18pt" font-weight="bold" margin-bottom="3mm">
2017
- <xsl:value-of select="$i18n_corrected_version"/>
2018
- <xsl:value-of select="$linebreak"/>
2019
- <xsl:value-of select="$date_corrected"/>
2020
- </fo:block>
2021
- </xsl:if>
2001
+ <xsl:if test="not($stage-abbreviation = 'DIS' or $stage-abbreviation = 'DAMD' or $stage-abbreviation = 'DAM')">
2002
+ <xsl:variable name="edition_and_date">
2003
+ <xsl:call-template name="insertEditionAndDate"/>
2004
+ </xsl:variable>
2005
+ <xsl:if test="normalize-space($edition_and_date) != ''">
2006
+ <fo:block font-size="18pt" font-weight="bold" margin-bottom="3mm">
2007
+ <xsl:value-of select="$edition_and_date"/>
2008
+ </fo:block>
2009
+ </xsl:if>
2010
+ </xsl:if>
2022
2011
 
2023
- <xsl:if test="$stage-abbreviation = 'DIS' or $stage-abbreviation = 'DAMD' or $stage-abbreviation = 'DAM' or $stagename_abbreviation = 'DIS' or $stage-abbreviation = 'FDIS' or $stage-abbreviation = 'FDAMD' or $stage-abbreviation = 'FDAM' or $stagename_abbreviation = 'FDIS' or $stage-abbreviation = 'NWIP' or $stage-abbreviation = 'NP' or $stage-abbreviation = 'PWI' or $stage-abbreviation = 'AWI' or $stage-abbreviation = 'WD' or $stage-abbreviation = 'CD'">
2024
- <xsl:if test="normalize-space($editorialgroup) != ''">
2025
- <fo:block margin-bottom="3mm">
2026
- <xsl:copy-of select="$editorialgroup"/>
2027
- </fo:block>
2028
- </xsl:if>
2029
- <xsl:if test="normalize-space($secretariat) != ''">
2030
- <fo:block margin-bottom="3mm">
2031
- <xsl:copy-of select="$secretariat"/>
2032
- </fo:block>
2033
- </xsl:if>
2034
- </xsl:if>
2012
+ <xsl:if test="$doctype = 'amendment'"> <!-- and not($stage-abbreviation = 'FDAMD' or $stage-abbreviation = 'FDAM') -->
2013
+ <fo:block font-size="15pt" font-weight="bold" margin-bottom="3mm">
2014
+ <xsl:value-of select="$doctype_uppercased"/>
2015
+ <xsl:text> </xsl:text>
2016
+ <xsl:variable name="amendment-number" select="/mn:metanorma/mn:bibdata/mn:ext/mn:structuredidentifier/mn:project-number/@amendment"/>
2017
+ <xsl:if test="normalize-space($amendment-number) != ''">
2018
+ <xsl:value-of select="$amendment-number"/><xsl:text> </xsl:text>
2019
+ </xsl:if>
2020
+ </fo:block>
2021
+ <!-- </xsl:if>
2022
+
2023
+ <xsl:if test="$doctype = 'amendment' and not($stage-abbreviation = 'FDAMD' or $stage-abbreviation = 'FDAM')"> -->
2024
+ <xsl:if test="/mn:metanorma/mn:bibdata/mn:date[@type = 'updated']">
2025
+ <fo:block font-size="18pt" font-weight="bold" margin-bottom="3mm">
2026
+ <xsl:value-of select="/mn:metanorma/mn:bibdata/mn:date[@type = 'updated']"/>
2027
+ </fo:block>
2028
+ </xsl:if>
2029
+ </xsl:if>
2035
2030
 
2036
- <xsl:if test="$stage-abbreviation = 'DIS' or $stage-abbreviation = 'DAMD' or $stage-abbreviation = 'DAM' or $stagename_abbreviation = 'DIS' or $stage-abbreviation = 'FDIS' or $stage-abbreviation = 'FDAMD' or $stage-abbreviation = 'FDAM' or $stagename_abbreviation = 'FDIS'">
2031
+ <xsl:variable name="date_corrected" select="normalize-space(/mn:metanorma/mn:bibdata/mn:date[@type = 'corrected'])"/>
2032
+ <xsl:if test="$date_corrected != ''">
2033
+ <fo:block font-size="18pt" font-weight="bold" margin-bottom="3mm">
2034
+ <xsl:value-of select="$i18n_corrected_version"/>
2035
+ <xsl:value-of select="$linebreak"/>
2036
+ <xsl:value-of select="$date_corrected"/>
2037
+ </fo:block>
2038
+ </xsl:if>
2037
2039
 
2038
- <fo:block margin-bottom="3mm">
2039
- <!-- Voting begins on: -->
2040
- <xsl:value-of select="concat($i18n_voting_begins_on, ':')"/>
2041
- <fo:block font-weight="bold">
2042
- <xsl:variable name="v_date">
2043
- <xsl:call-template name="split">
2044
- <xsl:with-param name="pText">
2045
- <xsl:call-template name="insertVoteStarted"/>
2046
- </xsl:with-param>
2047
- <xsl:with-param name="sep" select="'-'"/>
2048
- <xsl:with-param name="keep_sep">true</xsl:with-param>
2049
- </xsl:call-template>
2050
- </xsl:variable>
2051
- <xsl:for-each select="xalan:nodeset($v_date)/mnx:item">
2052
- <xsl:choose>
2053
- <xsl:when test=". = '-'"><fo:inline font-weight="normal"><xsl:value-of select="."/></fo:inline></xsl:when>
2054
- <xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
2055
- </xsl:choose>
2056
- </xsl:for-each>
2057
- </fo:block>
2058
- </fo:block>
2040
+ <xsl:if test="$stage-abbreviation = 'DIS' or $stage-abbreviation = 'DAMD' or $stage-abbreviation = 'DAM' or $stagename_abbreviation = 'DIS' or $stage-abbreviation = 'FDIS' or $stage-abbreviation = 'FDAMD' or $stage-abbreviation = 'FDAM' or $stagename_abbreviation = 'FDIS' or $stage-abbreviation = 'NWIP' or $stage-abbreviation = 'NP' or $stage-abbreviation = 'PWI' or $stage-abbreviation = 'AWI' or $stage-abbreviation = 'WD' or $stage-abbreviation = 'CD'">
2041
+ <xsl:if test="normalize-space($approvalgroup) != ''">
2042
+ <fo:block margin-bottom="3mm">
2043
+ <xsl:copy-of select="$approvalgroup"/>
2044
+ </fo:block>
2045
+ </xsl:if>
2046
+ <xsl:if test="normalize-space($secretariat) != ''">
2047
+ <fo:block margin-bottom="3mm">
2048
+ <xsl:copy-of select="$secretariat"/>
2049
+ </fo:block>
2050
+ </xsl:if>
2051
+ </xsl:if>
2059
2052
 
2060
- <fo:block margin-bottom="3mm">
2061
- <!-- Voting terminates on: -->
2062
- <xsl:value-of select="concat($i18n_voting_terminates_on, ':')"/>
2063
- <fo:block font-weight="bold">
2064
- <xsl:variable name="v_date">
2065
- <xsl:call-template name="split">
2066
- <xsl:with-param name="pText">
2067
- <xsl:call-template name="insertVoteEnded"/>
2068
- </xsl:with-param>
2069
- <xsl:with-param name="sep" select="'-'"/>
2070
- <xsl:with-param name="keep_sep">true</xsl:with-param>
2071
- </xsl:call-template>
2072
- </xsl:variable>
2073
- <xsl:for-each select="xalan:nodeset($v_date)/mnx:item">
2074
- <xsl:choose>
2075
- <xsl:when test=". = '-'"><fo:inline font-weight="normal"><xsl:value-of select="."/></fo:inline></xsl:when>
2076
- <xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
2077
- </xsl:choose>
2078
- </xsl:for-each>
2079
- </fo:block>
2080
- </fo:block>
2081
- </xsl:if>
2082
- </fo:block>
2053
+ <xsl:if test="$stage-abbreviation = 'DIS' or $stage-abbreviation = 'DAMD' or $stage-abbreviation = 'DAM' or $stagename_abbreviation = 'DIS' or $stage-abbreviation = 'FDIS' or $stage-abbreviation = 'FDAMD' or $stage-abbreviation = 'FDAM' or $stagename_abbreviation = 'FDIS'">
2054
+
2055
+ <fo:block margin-bottom="3mm">
2056
+ <!-- Voting begins on: -->
2057
+ <xsl:value-of select="concat($i18n_voting_begins_on, ':')"/>
2058
+ <fo:block font-weight="bold">
2059
+ <xsl:variable name="v_date">
2060
+ <xsl:call-template name="split">
2061
+ <xsl:with-param name="pText">
2062
+ <xsl:call-template name="insertVoteStarted"/>
2063
+ </xsl:with-param>
2064
+ <xsl:with-param name="sep" select="'-'"/>
2065
+ <xsl:with-param name="keep_sep">true</xsl:with-param>
2066
+ </xsl:call-template>
2067
+ </xsl:variable>
2068
+ <xsl:for-each select="xalan:nodeset($v_date)/mnx:item">
2069
+ <xsl:choose>
2070
+ <xsl:when test=". = '-'"><fo:inline font-weight="normal"><xsl:value-of select="."/></fo:inline></xsl:when>
2071
+ <xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
2072
+ </xsl:choose>
2073
+ </xsl:for-each>
2074
+ </fo:block>
2075
+ </fo:block>
2076
+
2077
+ <fo:block margin-bottom="3mm">
2078
+ <!-- Voting terminates on: -->
2079
+ <xsl:value-of select="concat($i18n_voting_terminates_on, ':')"/>
2080
+ <fo:block font-weight="bold">
2081
+ <xsl:variable name="v_date">
2082
+ <xsl:call-template name="split">
2083
+ <xsl:with-param name="pText">
2084
+ <xsl:call-template name="insertVoteEnded"/>
2085
+ </xsl:with-param>
2086
+ <xsl:with-param name="sep" select="'-'"/>
2087
+ <xsl:with-param name="keep_sep">true</xsl:with-param>
2088
+ </xsl:call-template>
2089
+ </xsl:variable>
2090
+ <xsl:for-each select="xalan:nodeset($v_date)/mnx:item">
2091
+ <xsl:choose>
2092
+ <xsl:when test=". = '-'"><fo:inline font-weight="normal"><xsl:value-of select="."/></fo:inline></xsl:when>
2093
+ <xsl:otherwise><xsl:value-of select="."/></xsl:otherwise>
2094
+ </xsl:choose>
2095
+ </xsl:for-each>
2096
+ </fo:block>
2097
+ </fo:block>
2098
+ </xsl:if>
2099
+ </fo:block>
2100
+ </fo:table-cell>
2101
+ </fo:table-row>
2102
+ <fo:table-row height="85mm">
2103
+ <fo:table-cell padding-left="-1mm" display-align="after">
2104
+ <fo:block font-size="7pt" margin-right="20mm" font-family="Cambria">
2105
+ <xsl:if test="$lang = 'ru'">
2106
+ <xsl:attribute name="margin-right">10mm</xsl:attribute>
2107
+ </xsl:if>
2108
+ <xsl:call-template name="insertDraftComments"/>
2109
+ </fo:block>
2110
+ </fo:table-cell>
2111
+ </fo:table-row>
2112
+ </fo:table-body>
2113
+ </fo:table>
2083
2114
 
2084
2115
  </fo:table-cell>
2085
2116
  </fo:table-row>
@@ -2152,14 +2183,7 @@
2152
2183
  </xsl:if>
2153
2184
  </fo:block>
2154
2185
  </fo:table-cell>
2155
- <fo:table-cell number-columns-spanned="2" padding-top="-3mm" padding-left="5mm" display-align="after">
2156
- <xsl:if test="$lang = 'fr'">
2157
- <xsl:attribute name="padding-top">-18mm</xsl:attribute>
2158
- </xsl:if>
2159
- <fo:block font-size="7pt" margin-right="20mm" font-family="Cambria">
2160
- <xsl:call-template name="insertDraftComments"/>
2161
- </fo:block>
2162
- </fo:table-cell>
2186
+
2163
2187
  </fo:table-row>
2164
2188
 
2165
2189
  <fo:table-row height="13mm">
@@ -2189,7 +2213,7 @@
2189
2213
  </xsl:when> <!-- END: $layoutVersion = '2024' -->
2190
2214
 
2191
2215
  <xsl:when test="$stage-abbreviation != ''">
2192
- <fo:page-sequence master-reference="cover-page-publishedISO" force-page-count="no-force">
2216
+ <fo:page-sequence master-reference="cover-page" force-page-count="no-force">
2193
2217
  <fo:static-content flow-name="cover-page-footer" font-size="10pt">
2194
2218
  <xsl:if test="$layoutVersion = '1989'">
2195
2219
  <xsl:attribute name="font-size">9pt</xsl:attribute>
@@ -2204,10 +2228,14 @@
2204
2228
  <xsl:if test="$stage-abbreviation = 'DAMD' or $stage-abbreviation = 'DAM'">
2205
2229
  <xsl:attribute name="font-size">7pt</xsl:attribute>
2206
2230
  </xsl:if>
2207
- <!-- margin-top="-30mm" -->
2208
- <fo:block> <!-- margin-top="-100mm" -->
2231
+ <!-- <fo:block>
2209
2232
  <xsl:call-template name="insertDraftComments"/>
2210
- </fo:block>
2233
+ </fo:block> -->
2234
+ <fo:block-container position="absolute" top="-47mm" width="52mm" height="100mm" role="SKIP">
2235
+ <fo:block>
2236
+ <xsl:call-template name="insertDraftComments"/>
2237
+ </fo:block>
2238
+ </fo:block-container>
2211
2239
  </fo:table-cell>
2212
2240
  <fo:table-cell role="SKIP">
2213
2241
  <fo:block role="SKIP"><fo:wrapper role="artifact"> </fo:wrapper></fo:block>
@@ -2257,46 +2285,10 @@
2257
2285
  </xsl:choose>
2258
2286
  </xsl:variable>
2259
2287
 
2260
- <xsl:for-each select="/mn:metanorma/mn:bibdata/mn:copyright/mn:owner/mn:organization">
2261
- <xsl:choose>
2262
- <xsl:when test="mn:logo/mn:image">
2263
- <xsl:apply-templates select="mn:logo/mn:image"/>
2264
- </xsl:when>
2265
- <xsl:when test="mn:abbreviation = 'ISO'">
2266
- <xsl:choose>
2267
- <xsl:when test="$layoutVersion = '1989' and $revision_date_num &lt; 19930101">
2268
- <fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-ISO-Logo-1987))}" content-height="{$content-height}mm" content-width="scale-to-fit" scaling="uniform" fox:alt-text="Image ISO Logo"/>
2269
- </xsl:when>
2270
- <xsl:otherwise>
2271
- <fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-ISO-Logo))}" content-height="{$content-height}mm" content-width="scale-to-fit" scaling="uniform" fox:alt-text="Image ISO Logo"/>
2272
- </xsl:otherwise>
2273
- </xsl:choose>
2274
- </xsl:when>
2275
- <xsl:when test="mn:abbreviation = 'IEC'">
2276
- <xsl:choose>
2277
- <xsl:when test="$layoutVersion = '1989' and $revision_date_num &lt; 19930101">
2278
- <fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-IEC-Logo-1989))}" content-height="{$content-height}mm" content-width="scale-to-fit" scaling="uniform" fox:alt-text="Image IEC Logo"/>
2279
- </xsl:when>
2280
- <xsl:otherwise>
2281
- <fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-IEC-Logo))}" content-height="{$content-height}mm" content-width="scale-to-fit" scaling="uniform" fox:alt-text="Image IEC Logo"/>
2282
- </xsl:otherwise>
2283
- </xsl:choose>
2284
- </xsl:when>
2285
- <xsl:when test="mn:abbreviation = 'IEEE'"/>
2286
- <xsl:when test="mn:abbreviation = 'IDF' or mn:name = 'IDF'">
2287
- <fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-IDF-Logo))}" content-height="{$content-height}mm" content-width="scale-to-fit" scaling="uniform" fox:alt-text="Image IDF Logo"/>
2288
- </xsl:when>
2289
- <xsl:otherwise/>
2290
- </xsl:choose>
2291
- <xsl:if test="position() != last()">
2292
- <fo:inline padding-right="1mm" role="SKIP"> </fo:inline>
2293
- </xsl:if>
2294
- </xsl:for-each>
2295
- <xsl:if test="$copyrightAbbrIEEE != ''">
2296
- <fo:block>
2297
- <fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-IEEE-Logo))}" content-height="11mm" content-width="scale-to-fit" scaling="uniform" fox:alt-text="Image {@alt}"/>
2298
- </fo:block>
2299
- </xsl:if>
2288
+ <xsl:call-template name="insertLogoImages">
2289
+ <xsl:with-param name="content-height" select="$content-height"/>
2290
+ </xsl:call-template>
2291
+
2300
2292
  </fo:block>
2301
2293
  </fo:table-cell>
2302
2294
  <fo:table-cell display-align="center" role="SKIP">
@@ -2354,7 +2346,7 @@
2354
2346
  </fo:table-cell>
2355
2347
  <fo:table-cell>
2356
2348
  <fo:block margin-bottom="3mm">
2357
- <xsl:copy-of select="$editorialgroup"/>
2349
+ <xsl:copy-of select="$approvalgroup"/>
2358
2350
  </fo:block>
2359
2351
  </fo:table-cell>
2360
2352
  <fo:table-cell>
@@ -2587,7 +2579,7 @@
2587
2579
  <fo:table-row role="SKIP">
2588
2580
  <fo:table-cell role="SKIP">
2589
2581
  <fo:block>
2590
- <xsl:copy-of select="$editorialgroup"/>
2582
+ <xsl:copy-of select="$approvalgroup"/>
2591
2583
  </fo:block>
2592
2584
  </fo:table-cell>
2593
2585
  <fo:table-cell role="SKIP">
@@ -2617,7 +2609,7 @@
2617
2609
  <xsl:if test="$stage-abbreviation = 'FDIS' or $stage-abbreviation = 'FDAMD' or $stage-abbreviation = 'FDAM' or $stagename_abbreviation = 'FDIS'">
2618
2610
  <fo:block-container border="0.5mm solid black" width="51mm" role="SKIP">
2619
2611
  <fo:block margin="2mm" role="SKIP">
2620
- <fo:block margin-bottom="8pt"><xsl:copy-of select="$editorialgroup"/></fo:block>
2612
+ <fo:block margin-bottom="8pt"><xsl:copy-of select="$approvalgroup"/></fo:block>
2621
2613
  <fo:block margin-bottom="6pt"><xsl:copy-of select="$secretariat"/></fo:block>
2622
2614
  <fo:block margin-bottom="6pt">
2623
2615
  <!-- Voting begins on: -->
@@ -2821,7 +2813,7 @@
2821
2813
  </fo:page-sequence>
2822
2814
  </xsl:when> <!-- $isPublished = 'true' -->
2823
2815
  <xsl:otherwise>
2824
- <fo:page-sequence master-reference="cover-page" force-page-count="no-force">
2816
+ <fo:page-sequence master-reference="cover-page-nonpublished" force-page-count="no-force">
2825
2817
  <fo:static-content flow-name="cover-page-header" font-size="10pt">
2826
2818
  <fo:block-container height="24mm" display-align="before">
2827
2819
  <fo:block padding-top="12.5mm">
@@ -2856,10 +2848,10 @@
2856
2848
  </xsl:otherwise>
2857
2849
  </xsl:choose>
2858
2850
 
2859
- <xsl:if test="normalize-space($editorialgroup) != ''">
2851
+ <xsl:if test="normalize-space($approvalgroup) != ''">
2860
2852
  <!-- ISO/TC 34/SC 4/WG 3 -->
2861
2853
  <fo:block margin-bottom="12pt">
2862
- <xsl:copy-of select="$editorialgroup"/>
2854
+ <xsl:copy-of select="$approvalgroup"/>
2863
2855
  </fo:block>
2864
2856
  </xsl:if>
2865
2857
 
@@ -2969,86 +2961,137 @@
2969
2961
  </xsl:choose>
2970
2962
  </xsl:template>
2971
2963
 
2972
- <xsl:template name="insertLogoImages2024">
2973
- <xsl:variable name="content-height">20</xsl:variable>
2974
- <xsl:for-each select="/mn:metanorma/mn:bibdata/mn:copyright/mn:owner/mn:organization">
2975
- <xsl:variable name="owner_number" select="count(ancestor::mn:copyright/preceding-sibling::mn:copyright) + 1"/>
2976
- <!-- https://github.com/metanorma/metanorma-iso/issues/1386 -->
2977
- <xsl:variable name="logo_width_">
2978
- <xsl:for-each select="/mn:metanorma/mn:metanorma-extension/mn:presentation-metadata/*[starts-with(local-name(), 'logo-publisher-pdf-width-')]">
2979
- <xsl:if test="local-name() = concat('logo-publisher-pdf-width-', $owner_number)">
2980
- <xsl:value-of select="."/>
2964
+ <xsl:template name="insertLogoImages">
2965
+ <xsl:param name="content-height"/>
2966
+ <xsl:choose>
2967
+ <xsl:when test="mn:metanorma/mn:bibdata/mn:contributor[mn:role[@type = 'author']/mn:description[normalize-space(@language) = ''] = 'Technical committee']/mn:organization">
2968
+ <xsl:for-each select="mn:metanorma/mn:bibdata/mn:contributor[mn:role[@type = 'author']/mn:description[normalize-space(@language) = ''] = 'Technical committee']/mn:organization">
2969
+
2970
+ <xsl:variable name="items">
2971
+ <xsl:call-template name="split_abbreviation"/>
2972
+ </xsl:variable>
2973
+
2974
+ <xsl:for-each select="xalan:nodeset($items)//mnx:item">
2975
+ <xsl:call-template name="insertLogoImage">
2976
+ <xsl:with-param name="content-height" select="$content-height"/>
2977
+ </xsl:call-template>
2978
+ <xsl:if test="position() != last()">
2979
+ <fo:inline padding-right="1mm" role="SKIP"> </fo:inline>
2980
+ </xsl:if>
2981
+ </xsl:for-each>
2982
+ <xsl:if test="position() != last()">
2983
+ <fo:inline padding-right="1mm" role="SKIP"> </fo:inline>
2981
2984
  </xsl:if>
2982
2985
  </xsl:for-each>
2983
- </xsl:variable>
2984
- <xsl:variable name="logo_width">
2985
- <xsl:choose>
2986
- <xsl:when test="normalize-space($logo_width_) != '' and normalize-space(translate($logo_width_, '1234567890', '')) = ''"><xsl:value-of select="$logo_width_"/>px</xsl:when>
2987
- <xsl:otherwise><xsl:value-of select="$logo_width_"/></xsl:otherwise>
2988
- </xsl:choose>
2989
- </xsl:variable>
2990
- <xsl:variable name="logo_height_">
2991
- <xsl:for-each select="/mn:metanorma/mn:metanorma-extension/mn:presentation-metadata/*[starts-with(local-name(), 'logo-publisher-pdf-height-')]">
2992
- <xsl:if test="local-name() = concat('logo-publisher-pdf-height-', $owner_number)">
2993
- <xsl:value-of select="."/>
2986
+ </xsl:when>
2987
+ <xsl:otherwise>
2988
+ <xsl:for-each select="/mn:metanorma/mn:bibdata/mn:copyright/mn:owner/mn:organization">
2989
+ <xsl:call-template name="insertLogoImage">
2990
+ <xsl:with-param name="content-height" select="$content-height"/>
2991
+ </xsl:call-template>
2992
+ <xsl:if test="position() != last()">
2993
+ <fo:inline padding-right="1mm" role="SKIP"> </fo:inline>
2994
2994
  </xsl:if>
2995
2995
  </xsl:for-each>
2996
- </xsl:variable>
2997
- <xsl:variable name="logo_height">
2998
- <xsl:choose>
2999
- <xsl:when test="normalize-space($logo_height_) != '' and normalize-space(translate($logo_height_, '1234567890', '')) = ''"><xsl:value-of select="$logo_height_"/>px</xsl:when>
3000
- <xsl:otherwise><xsl:value-of select="$logo_height_"/></xsl:otherwise>
3001
- </xsl:choose>
3002
- </xsl:variable>
3003
- <!-- <fo:block>logo_width=<xsl:value-of select="$logo_width"/></fo:block>
3004
- <fo:block>logo_height=<xsl:value-of select="$logo_height"/></fo:block> -->
2996
+ </xsl:otherwise>
2997
+ </xsl:choose>
2998
+ <xsl:if test="$copyrightAbbrIEEE != ''">
2999
+ <fo:block>
3000
+ <fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-IEEE-Logo))}" content-height="11mm" content-width="scale-to-fit" scaling="uniform" fox:alt-text="Image {@alt}"/>
3001
+ </fo:block>
3002
+ </xsl:if>
3003
+ </xsl:template>
3004
+
3005
+ <xsl:template name="split_abbreviation">
3006
+ <xsl:variable name="items">
3005
3007
  <xsl:choose>
3006
- <xsl:when test="mn:logo/mn:image">
3007
- <xsl:choose>
3008
- <xsl:when test="normalize-space($logo_width) != '' or normalize-space($logo_height) != ''">
3009
- <xsl:variable name="logo_image">
3010
- <xsl:for-each select="mn:logo/mn:image"> <!-- set context to logo/image -->
3011
- <xsl:element name="logo" namespace="{$namespace_full}">
3012
- <xsl:element name="image" namespace="{$namespace_full}">
3013
- <xsl:copy-of select="@*"/>
3014
- <xsl:if test="$logo_width != ''">
3015
- <xsl:attribute name="width"><xsl:value-of select="$logo_width"/></xsl:attribute>
3016
- </xsl:if>
3017
- <xsl:if test="$logo_height != ''">
3018
- <xsl:attribute name="height"><xsl:value-of select="$logo_height"/></xsl:attribute>
3019
- </xsl:if>
3020
- <xsl:copy-of select="node()"/>
3021
- </xsl:element>
3022
- </xsl:element>
3023
- </xsl:for-each>
3024
- </xsl:variable>
3025
- <xsl:apply-templates select="xalan:nodeset($logo_image)//mn:logo/mn:image"/>
3026
- </xsl:when>
3027
- <xsl:otherwise>
3028
- <xsl:apply-templates select="mn:logo/mn:image"/>
3029
- </xsl:otherwise>
3030
- </xsl:choose>
3031
- </xsl:when>
3032
- <xsl:when test="mn:abbreviation = 'ISO'">
3033
- <fo:instream-foreign-object content-height="{$content-height}mm" fox:alt-text="Image ISO Logo">
3034
- <xsl:copy-of select="$Image-ISO-Logo-SVG"/>
3035
- </fo:instream-foreign-object>
3036
- </xsl:when>
3037
- <xsl:when test="mn:abbreviation = 'IEC'">
3038
- <fo:instream-foreign-object content-height="{$content-height}mm" fox:alt-text="Image IEC Logo">
3039
- <xsl:copy-of select="$Image-IEC-Logo-SVG"/>
3040
- </fo:instream-foreign-object>
3041
- </xsl:when>
3042
- <xsl:when test="mn:abbreviation = 'IEEE'"/>
3043
- <xsl:when test="mn:abbreviation = 'IDF' or mn:name = 'IDF'">
3044
- <fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-IDF-Logo))}" content-height="{$content-height}mm" content-width="scale-to-fit" scaling="uniform" fox:alt-text="Image IDF Logo"/>
3008
+ <!-- ISO/IEC -->
3009
+ <xsl:when test="contains(mn:abbreviation, '/')">
3010
+ <xsl:call-template name="split">
3011
+ <xsl:with-param name="pText" select="mn:abbreviation"/>
3012
+ <xsl:with-param name="sep">/</xsl:with-param>
3013
+ </xsl:call-template>
3045
3014
  </xsl:when>
3046
- <xsl:otherwise/>
3015
+ <xsl:otherwise>
3016
+ <mnx:item><xsl:value-of select="mn:abbreviation"/></mnx:item>
3017
+ </xsl:otherwise>
3047
3018
  </xsl:choose>
3048
- <xsl:if test="position() != last()">
3049
- <fo:inline padding-right="1mm" role="SKIP"> </fo:inline>
3050
- </xsl:if>
3019
+ </xsl:variable>
3020
+ <xsl:for-each select="xalan:nodeset($items)//mnx:item">
3021
+ <xsl:copy>
3022
+ <mn:abbreviation><xsl:value-of select="."/></mn:abbreviation>
3023
+ </xsl:copy>
3051
3024
  </xsl:for-each>
3025
+ </xsl:template>
3026
+
3027
+ <xsl:template name="insertLogoImage">
3028
+ <xsl:param name="content-height"/>
3029
+ <xsl:choose>
3030
+ <xsl:when test="mn:logo/mn:image">
3031
+ <xsl:apply-templates select="mn:logo/mn:image"/>
3032
+ </xsl:when>
3033
+ <xsl:when test="mn:abbreviation = 'ISO'">
3034
+ <xsl:choose>
3035
+ <xsl:when test="$layoutVersion = '1989' and $revision_date_num &lt; 19930101">
3036
+ <fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-ISO-Logo-1987))}" content-height="{$content-height}mm" content-width="scale-to-fit" scaling="uniform" fox:alt-text="Image ISO Logo"/>
3037
+ </xsl:when>
3038
+ <xsl:otherwise>
3039
+ <fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-ISO-Logo))}" content-height="{$content-height}mm" content-width="scale-to-fit" scaling="uniform" fox:alt-text="Image ISO Logo"/>
3040
+ </xsl:otherwise>
3041
+ </xsl:choose>
3042
+ </xsl:when>
3043
+ <xsl:when test="mn:abbreviation = 'IEC'">
3044
+ <xsl:choose>
3045
+ <xsl:when test="$layoutVersion = '1989' and $revision_date_num &lt; 19930101">
3046
+ <fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-IEC-Logo-1989))}" content-height="{$content-height}mm" content-width="scale-to-fit" scaling="uniform" fox:alt-text="Image IEC Logo"/>
3047
+ </xsl:when>
3048
+ <xsl:otherwise>
3049
+ <fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-IEC-Logo))}" content-height="{$content-height}mm" content-width="scale-to-fit" scaling="uniform" fox:alt-text="Image IEC Logo"/>
3050
+ </xsl:otherwise>
3051
+ </xsl:choose>
3052
+ </xsl:when>
3053
+ <xsl:when test="mn:abbreviation = 'IEEE'"/>
3054
+ <xsl:when test="mn:abbreviation = 'IDF' or mn:name = 'IDF'">
3055
+ <fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-IDF-Logo))}" content-height="{$content-height}mm" content-width="scale-to-fit" scaling="uniform" fox:alt-text="Image IDF Logo"/>
3056
+ </xsl:when>
3057
+ <xsl:otherwise/>
3058
+ </xsl:choose>
3059
+ </xsl:template>
3060
+
3061
+ <xsl:template name="insertLogoImages2024">
3062
+ <xsl:variable name="content-height">20</xsl:variable>
3063
+ <xsl:choose>
3064
+ <xsl:when test="mn:metanorma/mn:bibdata/mn:contributor[mn:role[@type = 'author']/mn:description[normalize-space(@language) = ''] = 'Technical committee']/mn:organization">
3065
+ <xsl:for-each select="mn:metanorma/mn:bibdata/mn:contributor[mn:role[@type = 'author']/mn:description[normalize-space(@language) = ''] = 'Technical committee']/mn:organization">
3066
+
3067
+ <xsl:variable name="items">
3068
+ <xsl:call-template name="split_abbreviation"/>
3069
+ </xsl:variable>
3070
+
3071
+ <xsl:for-each select="xalan:nodeset($items)//mnx:item">
3072
+ <xsl:call-template name="insertLogoImage2024">
3073
+ <xsl:with-param name="content-height" select="$content-height"/>
3074
+ </xsl:call-template>
3075
+ <xsl:if test="position() != last()">
3076
+ <fo:inline padding-right="1mm" role="SKIP"> </fo:inline>
3077
+ </xsl:if>
3078
+ </xsl:for-each>
3079
+ <xsl:if test="position() != last()">
3080
+ <fo:inline padding-right="1mm" role="SKIP"> </fo:inline>
3081
+ </xsl:if>
3082
+ </xsl:for-each>
3083
+ </xsl:when>
3084
+ <xsl:otherwise>
3085
+ <xsl:for-each select="/mn:metanorma/mn:bibdata/mn:copyright/mn:owner/mn:organization">
3086
+ <xsl:call-template name="insertLogoImage2024">
3087
+ <xsl:with-param name="content-height" select="$content-height"/>
3088
+ </xsl:call-template>
3089
+ <xsl:if test="position() != last()">
3090
+ <fo:inline padding-right="1mm" role="SKIP"> </fo:inline>
3091
+ </xsl:if>
3092
+ </xsl:for-each>
3093
+ </xsl:otherwise>
3094
+ </xsl:choose>
3052
3095
  <xsl:if test="$copyrightAbbrIEEE != ''">
3053
3096
  <fo:block margin-top="2mm">
3054
3097
  <fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-IEEE-Logo2))}" content-width="{$content-height * 2 + 2}mm" content-height="scale-to-fit" scaling="uniform" fox:alt-text="Image IEEE Logo"/>
@@ -3056,6 +3099,84 @@
3056
3099
  </xsl:if>
3057
3100
  </xsl:template>
3058
3101
 
3102
+ <xsl:template name="insertLogoImage2024">
3103
+ <xsl:param name="content-height"/>
3104
+ <xsl:variable name="owner_number" select="count(ancestor::mn:copyright/preceding-sibling::mn:copyright) + 1"/>
3105
+ <!-- https://github.com/metanorma/metanorma-iso/issues/1386 -->
3106
+ <xsl:variable name="logo_width_">
3107
+ <xsl:for-each select="/mn:metanorma/mn:metanorma-extension/mn:presentation-metadata/*[starts-with(local-name(), 'logo-publisher-pdf-width-')]">
3108
+ <xsl:if test="local-name() = concat('logo-publisher-pdf-width-', $owner_number)">
3109
+ <xsl:value-of select="."/>
3110
+ </xsl:if>
3111
+ </xsl:for-each>
3112
+ </xsl:variable>
3113
+ <xsl:variable name="logo_width">
3114
+ <xsl:choose>
3115
+ <xsl:when test="normalize-space($logo_width_) != '' and normalize-space(translate($logo_width_, '1234567890', '')) = ''"><xsl:value-of select="$logo_width_"/>px</xsl:when>
3116
+ <xsl:otherwise><xsl:value-of select="$logo_width_"/></xsl:otherwise>
3117
+ </xsl:choose>
3118
+ </xsl:variable>
3119
+ <xsl:variable name="logo_height_">
3120
+ <xsl:for-each select="/mn:metanorma/mn:metanorma-extension/mn:presentation-metadata/*[starts-with(local-name(), 'logo-publisher-pdf-height-')]">
3121
+ <xsl:if test="local-name() = concat('logo-publisher-pdf-height-', $owner_number)">
3122
+ <xsl:value-of select="."/>
3123
+ </xsl:if>
3124
+ </xsl:for-each>
3125
+ </xsl:variable>
3126
+ <xsl:variable name="logo_height">
3127
+ <xsl:choose>
3128
+ <xsl:when test="normalize-space($logo_height_) != '' and normalize-space(translate($logo_height_, '1234567890', '')) = ''"><xsl:value-of select="$logo_height_"/>px</xsl:when>
3129
+ <xsl:otherwise><xsl:value-of select="$logo_height_"/></xsl:otherwise>
3130
+ </xsl:choose>
3131
+ </xsl:variable>
3132
+ <!-- <fo:block>logo_width=<xsl:value-of select="$logo_width"/></fo:block>
3133
+ <fo:block>logo_height=<xsl:value-of select="$logo_height"/></fo:block> -->
3134
+ <xsl:choose>
3135
+ <xsl:when test="mn:logo/mn:image">
3136
+ <xsl:choose>
3137
+ <xsl:when test="normalize-space($logo_width) != '' or normalize-space($logo_height) != ''">
3138
+ <xsl:variable name="logo_image">
3139
+ <xsl:for-each select="mn:logo/mn:image"> <!-- set context to logo/image -->
3140
+ <xsl:element name="logo" namespace="{$namespace_full}">
3141
+ <xsl:element name="image" namespace="{$namespace_full}">
3142
+ <xsl:copy-of select="@*"/>
3143
+ <xsl:if test="$logo_width != ''">
3144
+ <xsl:attribute name="width"><xsl:value-of select="$logo_width"/></xsl:attribute>
3145
+ </xsl:if>
3146
+ <xsl:if test="$logo_height != ''">
3147
+ <xsl:attribute name="height"><xsl:value-of select="$logo_height"/></xsl:attribute>
3148
+ </xsl:if>
3149
+ <xsl:copy-of select="node()"/>
3150
+ </xsl:element>
3151
+ </xsl:element>
3152
+ </xsl:for-each>
3153
+ </xsl:variable>
3154
+ <xsl:apply-templates select="xalan:nodeset($logo_image)//mn:logo/mn:image"/>
3155
+ </xsl:when>
3156
+ <xsl:otherwise>
3157
+ <xsl:apply-templates select="mn:logo/mn:image"/>
3158
+ </xsl:otherwise>
3159
+ </xsl:choose>
3160
+ </xsl:when>
3161
+ <xsl:when test="mn:abbreviation = 'ISO'">
3162
+ <fo:instream-foreign-object content-height="{$content-height}mm" fox:alt-text="Image ISO Logo">
3163
+ <xsl:copy-of select="$Image-ISO-Logo-SVG"/>
3164
+ </fo:instream-foreign-object>
3165
+ </xsl:when>
3166
+ <xsl:when test="mn:abbreviation = 'IEC'">
3167
+ <fo:instream-foreign-object content-height="{$content-height}mm" fox:alt-text="Image IEC Logo">
3168
+ <xsl:copy-of select="$Image-IEC-Logo-SVG"/>
3169
+ </fo:instream-foreign-object>
3170
+ </xsl:when>
3171
+ <xsl:when test="mn:abbreviation = 'IEEE'"/>
3172
+ <xsl:when test="mn:abbreviation = 'IDF' or mn:name = 'IDF'">
3173
+ <fo:external-graphic src="{concat('data:image/png;base64,', normalize-space($Image-IDF-Logo))}" content-height="{$content-height}mm" content-width="scale-to-fit" scaling="uniform" fox:alt-text="Image IDF Logo"/>
3174
+ </xsl:when>
3175
+ <xsl:otherwise/>
3176
+ </xsl:choose>
3177
+
3178
+ </xsl:template>
3179
+
3059
3180
  <xsl:template name="insertTitlesLangMain">
3060
3181
  <xsl:apply-templates select="/mn:metanorma/mn:bibdata/mn:title[@language = $lang and @type = 'title-intro']"/>
3061
3182
  <xsl:apply-templates select="/mn:metanorma/mn:bibdata/mn:title[@language = $lang and @type = 'title-main']"/>
@@ -3251,7 +3372,7 @@
3251
3372
  </xsl:if>
3252
3373
  </xsl:template>
3253
3374
 
3254
- <xsl:template match="mn:preface//mn:clause[@type = 'toc']" priority="3">
3375
+ <xsl:template match="mn:preface//mn:clause[@type = 'toc']" name="toc" priority="3">
3255
3376
  <xsl:choose>
3256
3377
  <xsl:when test="$isGenerateTableIF = 'true'"/>
3257
3378
  <xsl:when test="$toc_level = 0"/>
@@ -3259,16 +3380,9 @@
3259
3380
  <xsl:when test="$layoutVersion = '1987' and $doctype = 'technical-report'"/>
3260
3381
  <xsl:otherwise>
3261
3382
 
3262
- <fo:block-container font-weight="bold">
3263
-
3264
- <xsl:if test="$layoutVersion = '1987'">
3265
- <xsl:attribute name="font-size">9pt</xsl:attribute>
3266
- <xsl:attribute name="font-weight">normal</xsl:attribute>
3267
- </xsl:if>
3383
+ <fo:block-container xsl:use-attribute-sets="toc-style">
3268
3384
 
3269
- <xsl:if test="$layoutVersion = '1972' or $layoutVersion = '1979' or $layoutVersion = '1987' or ($layoutVersion = '1989' and $revision_date_num &lt;= 19981231)">
3270
- <xsl:attribute name="margin-top">62mm</xsl:attribute>
3271
- </xsl:if>
3385
+ <xsl:call-template name="refine_toc-style"/>
3272
3386
 
3273
3387
  <!-- render 'Contents' outside if role="TOC" -->
3274
3388
  <xsl:apply-templates select="mn:fmt-title"/>
@@ -3299,20 +3413,9 @@
3299
3413
  </xsl:if>
3300
3414
  </xsl:if>
3301
3415
 
3302
- <fo:block role="TOCI">
3303
- <xsl:if test="@level = 1">
3304
- <xsl:attribute name="margin-top">5pt</xsl:attribute>
3305
- </xsl:if>
3306
- <xsl:if test="@level = 3">
3307
- <xsl:attribute name="margin-top">-0.7pt</xsl:attribute>
3308
- </xsl:if>
3416
+ <fo:block role="TOCI" xsl:use-attribute-sets="toc-item-style">
3309
3417
 
3310
- <xsl:if test="$layoutVersion = '1987'">
3311
- <xsl:if test="@type = 'section'">
3312
- <xsl:attribute name="margin-top">12pt</xsl:attribute>
3313
- </xsl:if>
3314
- <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
3315
- </xsl:if>
3418
+ <xsl:call-template name="refine_toc-item-style"/>
3316
3419
 
3317
3420
  <fo:basic-link internal-destination="{@id}" fox:alt-text="{@section} {mnx:title}"> <!-- link at this level needs for PDF structure tags -->
3318
3421
 
@@ -3385,7 +3488,7 @@
3385
3488
  <xsl:apply-templates select="mnx:title"/>
3386
3489
 
3387
3490
  <fo:inline keep-together.within-line="always" role="SKIP">
3388
- <fo:leader font-size="9pt" font-weight="normal" leader-pattern="dots"/>
3491
+ <fo:leader xsl:use-attribute-sets="toc-leader-style"/>
3389
3492
  <fo:inline role="SKIP">
3390
3493
  <xsl:if test="@level = 1 and @type = 'annex'">
3391
3494
  <xsl:attribute name="font-weight">bold</xsl:attribute>
@@ -3409,24 +3512,24 @@
3409
3512
  </xsl:for-each>
3410
3513
 
3411
3514
  <!-- List of Tables -->
3412
- <xsl:if test="$contents//mnx:tables/mnx:table">
3413
- <xsl:call-template name="insertListOf_Title">
3414
- <xsl:with-param name="title" select="$title-list-tables"/>
3415
- </xsl:call-template>
3416
- <xsl:for-each select="$contents//mnx:tables/mnx:table">
3417
- <xsl:call-template name="insertListOf_Item"/>
3418
- </xsl:for-each>
3419
- </xsl:if>
3515
+ <xsl:for-each select="$contents//mnx:tables/mnx:table">
3516
+ <xsl:if test="position() = 1">
3517
+ <xsl:call-template name="insertListOf_Title">
3518
+ <xsl:with-param name="title" select="$title-list-tables"/>
3519
+ </xsl:call-template>
3520
+ </xsl:if>
3521
+ <xsl:call-template name="insertListOf_Item"/>
3522
+ </xsl:for-each>
3420
3523
 
3421
3524
  <!-- List of Figures -->
3422
- <xsl:if test="$contents//mnx:figures/mnx:figure">
3423
- <xsl:call-template name="insertListOf_Title">
3424
- <xsl:with-param name="title" select="$title-list-figures"/>
3425
- </xsl:call-template>
3426
- <xsl:for-each select="$contents//mnx:figures/mnx:figure">
3427
- <xsl:call-template name="insertListOf_Item"/>
3428
- </xsl:for-each>
3429
- </xsl:if>
3525
+ <xsl:for-each select="$contents//mnx:figures/mnx:figure">
3526
+ <xsl:if test="position() = 1">
3527
+ <xsl:call-template name="insertListOf_Title">
3528
+ <xsl:with-param name="title" select="$title-list-figures"/>
3529
+ </xsl:call-template>
3530
+ </xsl:if>
3531
+ <xsl:call-template name="insertListOf_Item"/>
3532
+ </xsl:for-each>
3430
3533
 
3431
3534
  </xsl:if>
3432
3535
  </fo:block>
@@ -3436,11 +3539,11 @@
3436
3539
  </xsl:template>
3437
3540
 
3438
3541
  <xsl:template match="mn:preface//mn:clause[@type = 'toc']/mn:fmt-title" priority="3">
3439
- <fo:block text-align-last="justify" font-size="16pt" margin-top="10pt" margin-bottom="18pt">
3542
+ <fo:block xsl:use-attribute-sets="toc-title-style">
3440
3543
  <xsl:if test="$layoutVersion = '2024'">
3441
3544
  <xsl:attribute name="margin-top">0</xsl:attribute>
3442
3545
  </xsl:if>
3443
- <fo:inline font-size="16pt" font-weight="bold" role="SKIP">
3546
+ <fo:inline role="SKIP">
3444
3547
  <xsl:if test="$layoutVersion = '1987'">
3445
3548
  <xsl:attribute name="font-size">14pt</xsl:attribute>
3446
3549
  </xsl:if>
@@ -3453,9 +3556,9 @@
3453
3556
  </xsl:call-template> -->
3454
3557
  <xsl:apply-templates/>
3455
3558
  </fo:inline>
3456
- <fo:inline keep-together.within-line="always" role="SKIP">
3559
+ <fo:inline font-weight="normal" keep-together.within-line="always" role="SKIP">
3457
3560
  <fo:leader leader-pattern="space"/>
3458
- <fo:inline font-weight="normal" font-size="10pt" role="SKIP">
3561
+ <fo:inline xsl:use-attribute-sets="toc-title-page-style">
3459
3562
  <xsl:if test="$layoutVersion = '1987'">
3460
3563
  <xsl:attribute name="font-size">8pt</xsl:attribute>
3461
3564
  </xsl:if>
@@ -3488,20 +3591,20 @@
3488
3591
 
3489
3592
  <xsl:template name="insertListOf_Title">
3490
3593
  <xsl:param name="title"/>
3491
- <fo:block role="TOCI" margin-top="5pt" keep-with-next="always">
3594
+ <fo:block xsl:use-attribute-sets="toc-listof-title-style">
3492
3595
  <xsl:value-of select="$title"/>
3493
3596
  </fo:block>
3494
3597
  </xsl:template>
3495
3598
 
3496
3599
  <xsl:template name="insertListOf_Item">
3497
- <fo:block role="TOCI" font-weight="normal" text-align-last="justify" margin-left="12mm">
3600
+ <fo:block xsl:use-attribute-sets="toc-listof-item-style">
3498
3601
  <fo:basic-link internal-destination="{@id}">
3499
3602
  <xsl:call-template name="setAltText">
3500
3603
  <xsl:with-param name="value" select="@alt-text"/>
3501
3604
  </xsl:call-template>
3502
3605
  <xsl:apply-templates select="." mode="contents"/>
3503
3606
  <fo:inline keep-together.within-line="always">
3504
- <fo:leader font-size="9pt" font-weight="normal" leader-pattern="dots"/>
3607
+ <fo:leader xsl:use-attribute-sets="toc-leader-style"/>
3505
3608
  <fo:inline><fo:page-number-citation ref-id="{@id}"/></fo:inline>
3506
3609
  </fo:inline>
3507
3610
  </fo:basic-link>
@@ -5398,9 +5501,9 @@
5398
5501
  </xsl:template>
5399
5502
 
5400
5503
  <xsl:template name="insertLastPage">
5401
- <fo:page-sequence master-reference="last-page" force-page-count="no-force">
5504
+ <fo:page-sequence master-reference="back-page" force-page-count="no-force">
5402
5505
  <xsl:call-template name="insertHeaderEven"/>
5403
- <fo:static-content flow-name="last-page-footer" font-size="10pt">
5506
+ <fo:static-content flow-name="back-page-footer" font-size="10pt">
5404
5507
  <fo:table table-layout="fixed" width="100%">
5405
5508
  <fo:table-column column-width="33%"/>
5406
5509
  <fo:table-column column-width="33%"/>
@@ -5512,7 +5615,7 @@
5512
5615
  </xsl:template> <!-- END: insertLastPage -->
5513
5616
 
5514
5617
  <xsl:template name="insertLastPage_2024">
5515
- <fo:page-sequence master-reference="last-page_2024" force-page-count="no-force">
5618
+ <fo:page-sequence master-reference="back-page_2024" force-page-count="no-force">
5516
5619
  <fo:flow flow-name="xsl-region-body">
5517
5620
  <xsl:variable name="fo_last_page">
5518
5621
  <fo:table table-layout="fixed" width="100%" margin-bottom="-1mm">
@@ -11162,6 +11265,16 @@
11162
11265
  </xsl:variable>
11163
11266
  <xsl:variable name="quot">"</xsl:variable>
11164
11267
  <xsl:variable name="styles_">
11268
+ <!-- PDF: Borderless tables https://github.com/metanorma/metanorma-jis/issues/344 -->
11269
+ <xsl:if test="@plain = 'true' or ancestor::mn:table/@plain = 'true'">
11270
+ <style name="border-top">none</style>
11271
+ <style name="border-right">none</style>
11272
+ <style name="border-left">none</style>
11273
+ <style name="border-bottom">none</style>
11274
+ <style name="color">inherit</style>
11275
+ <style name="background-color">transparent</style>
11276
+ </xsl:if>
11277
+
11165
11278
  <xsl:for-each select="xalan:nodeset($styles__)/mnx:item">
11166
11279
  <xsl:variable name="key" select="normalize-space(substring-before(., ':'))"/>
11167
11280
  <xsl:variable name="value" select="normalize-space(substring-after(translate(.,$quot,''), ':'))"/>
@@ -13221,7 +13334,10 @@
13221
13334
 
13222
13335
  <xsl:call-template name="setNamedDestination"/>
13223
13336
 
13224
- <fo:block-container id="{@id}" xsl:use-attribute-sets="note-style" role="SKIP">
13337
+ <fo:block-container xsl:use-attribute-sets="note-style" role="SKIP">
13338
+ <xsl:if test="not(parent::mn:references)">
13339
+ <xsl:copy-of select="@id"/>
13340
+ </xsl:if>
13225
13341
 
13226
13342
  <xsl:call-template name="setBlockSpanAll"/>
13227
13343
 
@@ -15783,7 +15899,7 @@
15783
15899
 
15784
15900
  <xsl:template name="insertFootnoteSeparatorCommon">
15785
15901
  <xsl:param name="leader_length">30%</xsl:param>
15786
- <fo:static-content flow-name="xsl-footnote-separator">
15902
+ <fo:static-content flow-name="xsl-footnote-separator" role="artifact">
15787
15903
  <fo:block>
15788
15904
  <fo:leader leader-pattern="rule" leader-length="{$leader_length}"/>
15789
15905
  </fo:block>
@@ -16034,8 +16150,8 @@
16034
16150
  </xsl:template>
16035
16151
 
16036
16152
  <!-- Bibliography (non-normative references) -->
16037
- <xsl:template match="mn:references[not(@normative='true')]/mn:bibitem" name="bibitem_non_normative" priority="2">
16038
- <xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][self::mn:bibitem] and 1 = 1)"/> <!-- current bibiitem is non-first -->
16153
+ <xsl:template match="mn:references[not(@normative='true')]/mn:bibitem | mn:references[not(@normative='true')]/mn:note" name="bibitem_non_normative" priority="2">
16154
+ <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 -->
16039
16155
  <xsl:choose>
16040
16156
  <xsl:when test="$skip = 'true'"><!-- skip bibitem --></xsl:when>
16041
16157
  <xsl:otherwise>
@@ -16073,7 +16189,7 @@
16073
16189
  </fo:list-item>
16074
16190
  </xsl:otherwise>
16075
16191
  </xsl:choose>
16076
- <xsl:apply-templates select="following-sibling::*[1][self::mn:bibitem]">
16192
+ <xsl:apply-templates select="following-sibling::*[1]"> <!-- [self::mn:bibitem] -->
16077
16193
  <xsl:with-param name="skip">false</xsl:with-param>
16078
16194
  </xsl:apply-templates>
16079
16195
  </xsl:template>
@@ -16090,8 +16206,26 @@
16090
16206
  </xsl:apply-templates>
16091
16207
  <xsl:apply-templates select="mn:formattedref"/>
16092
16208
  <!-- end bibitem processing -->
16209
+
16210
+ <xsl:call-template name="processBibliographyNote"/>
16093
16211
  </xsl:template> <!-- processBibitem (bibitem) -->
16094
16212
 
16213
+ <xsl:template name="processBibliographyNote">
16214
+ <xsl:if test="self::mn:note">
16215
+ <xsl:variable name="note_node">
16216
+ <xsl:element name="{local-name(..)}" namespace="{$namespace_full}"> <!-- save parent context node for determining styles -->
16217
+ <xsl:copy> <!-- skip @id -->
16218
+ <xsl:copy-of select="node()"/>
16219
+ </xsl:copy>
16220
+ </xsl:element>
16221
+ </xsl:variable>
16222
+ <!-- <xsl:for-each select="xalan:nodeset($note_node)//mn:note">
16223
+ <xsl:call-template name="note"/>
16224
+ </xsl:for-each> -->
16225
+ <xsl:call-template name="note"/>
16226
+ </xsl:if>
16227
+ </xsl:template>
16228
+
16095
16229
  <xsl:template match="mn:title" mode="title">
16096
16230
  <fo:inline><xsl:apply-templates/></fo:inline>
16097
16231
  </xsl:template>
@@ -16643,6 +16777,96 @@
16643
16777
  <!-- End Form's elements processing -->
16644
16778
  <!-- =================== -->
16645
16779
 
16780
+ <xsl:attribute-set name="toc-style">
16781
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
16782
+ </xsl:attribute-set>
16783
+
16784
+ <xsl:template name="refine_toc-style">
16785
+ <xsl:if test="$layoutVersion = '1987'">
16786
+ <xsl:attribute name="font-size">9pt</xsl:attribute>
16787
+ <xsl:attribute name="font-weight">normal</xsl:attribute>
16788
+ </xsl:if>
16789
+
16790
+ <xsl:if test="$layoutVersion = '1972' or $layoutVersion = '1979' or $layoutVersion = '1987' or ($layoutVersion = '1989' and $revision_date_num &lt;= 19981231)">
16791
+ <xsl:attribute name="margin-top">62mm</xsl:attribute>
16792
+ </xsl:if>
16793
+ </xsl:template>
16794
+
16795
+ <xsl:attribute-set name="toc-title-style">
16796
+ <xsl:attribute name="text-align-last">justify</xsl:attribute>
16797
+ <xsl:attribute name="font-size">16pt</xsl:attribute>
16798
+ <xsl:attribute name="font-weight">bold</xsl:attribute>
16799
+ <xsl:attribute name="margin-top">10pt</xsl:attribute>
16800
+ <xsl:attribute name="margin-bottom">18pt</xsl:attribute>
16801
+ </xsl:attribute-set>
16802
+
16803
+ <xsl:template name="refine_toc-title-style">
16804
+ </xsl:template>
16805
+
16806
+ <xsl:attribute-set name="toc-title-page-style">
16807
+ <xsl:attribute name="font-weight">normal</xsl:attribute>
16808
+ <xsl:attribute name="font-size">10pt</xsl:attribute>
16809
+ <xsl:attribute name="role">SKIP</xsl:attribute>
16810
+ </xsl:attribute-set> <!-- toc-title-page-style -->
16811
+
16812
+ <xsl:template name="refine_toc-title-page-style">
16813
+ </xsl:template>
16814
+
16815
+ <xsl:attribute-set name="toc-item-block-style">
16816
+ </xsl:attribute-set>
16817
+
16818
+ <xsl:template name="refine_toc-item-block-style">
16819
+ </xsl:template>
16820
+
16821
+ <xsl:attribute-set name="toc-item-style">
16822
+ <xsl:attribute name="role">TOCI</xsl:attribute>
16823
+ </xsl:attribute-set> <!-- END: toc-item-style -->
16824
+
16825
+ <xsl:template name="refine_toc-item-style">
16826
+ <xsl:if test="@level = 1">
16827
+ <xsl:attribute name="margin-top">5pt</xsl:attribute>
16828
+ </xsl:if>
16829
+ <xsl:if test="@level = 3">
16830
+ <xsl:attribute name="margin-top">-0.7pt</xsl:attribute>
16831
+ </xsl:if>
16832
+
16833
+ <xsl:if test="$layoutVersion = '1987'">
16834
+ <xsl:if test="@type = 'section'">
16835
+ <xsl:attribute name="margin-top">12pt</xsl:attribute>
16836
+ </xsl:if>
16837
+ <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
16838
+ </xsl:if>
16839
+ </xsl:template> <!-- END: refine_toc-item-style -->
16840
+
16841
+ <xsl:attribute-set name="toc-leader-style">
16842
+ <xsl:attribute name="font-size">9pt</xsl:attribute>
16843
+ <xsl:attribute name="font-weight">normal</xsl:attribute>
16844
+ <xsl:attribute name="leader-pattern">dots</xsl:attribute>
16845
+ </xsl:attribute-set> <!-- END: toc-leader-style -->
16846
+
16847
+ <xsl:attribute-set name="toc-pagenumber-style">
16848
+ </xsl:attribute-set>
16849
+
16850
+ <!-- List of Figures, Tables -->
16851
+ <xsl:attribute-set name="toc-listof-title-style">
16852
+ <xsl:attribute name="role">TOCI</xsl:attribute>
16853
+ <xsl:attribute name="margin-top">5pt</xsl:attribute>
16854
+ <xsl:attribute name="keep-with-next">always</xsl:attribute>
16855
+ </xsl:attribute-set>
16856
+
16857
+ <xsl:template name="refine_toc-listof-title-style">
16858
+ </xsl:template>
16859
+
16860
+ <xsl:attribute-set name="toc-listof-item-block-style">
16861
+ </xsl:attribute-set>
16862
+
16863
+ <xsl:attribute-set name="toc-listof-item-style">
16864
+ <xsl:attribute name="role">TOCI</xsl:attribute>
16865
+ <xsl:attribute name="font-weight">normal</xsl:attribute>
16866
+ <xsl:attribute name="text-align-last">justify</xsl:attribute>
16867
+ <xsl:attribute name="margin-left">12mm</xsl:attribute>
16868
+ </xsl:attribute-set>
16869
+
16646
16870
  <xsl:template name="processPrefaceSectionsDefault_Contents">
16647
16871
  <xsl:variable name="nodes_preface_">
16648
16872
  <xsl:for-each select="/*/mn:preface/*[not(self::mn:note or self::mn:admonition or @type = 'toc')]">
@@ -16980,7 +17204,7 @@
16980
17204
  </xsl:if>
16981
17205
 
16982
17206
  <xsl:for-each select="$contents_nodes/mnx:doc">
16983
- <fo:bookmark internal-destination="{contents/mnx:item[@display = 'true'][1]/@id}" starting-state="hide">
17207
+ <fo:bookmark internal-destination="{mnx:contents/mnx:item[@display = 'true'][1]/@id}" starting-state="hide">
16984
17208
  <xsl:if test="@bundle = 'true'">
16985
17209
  <xsl:attribute name="internal-destination"><xsl:value-of select="@firstpage_id"/></xsl:attribute>
16986
17210
  </xsl:if>
@@ -17014,7 +17238,7 @@
17014
17238
  </xsl:choose>
17015
17239
  </fo:bookmark-title>
17016
17240
 
17017
- <xsl:apply-templates select="contents/mnx:item" mode="bookmark"/>
17241
+ <xsl:apply-templates select="mnx:contents/mnx:item" mode="bookmark"/>
17018
17242
 
17019
17243
  <xsl:call-template name="insertFigureBookmarks">
17020
17244
  <xsl:with-param name="contents" select="mnx:contents"/>
@@ -18176,6 +18400,7 @@
18176
18400
  <xsl:if test="$pos &gt;= 2">
18177
18401
  <xsl:attribute name="space-before">18pt</xsl:attribute>
18178
18402
  </xsl:if>
18403
+ <xsl:attribute name="role">Sect</xsl:attribute>
18179
18404
  </xsl:template> <!-- sections_element_style -->
18180
18405
 
18181
18406
  <xsl:template match="//mn:metanorma/mn:preface/*" priority="2" name="preface_node"> <!-- /*/mn:preface/* -->
@@ -18189,6 +18414,7 @@
18189
18414
 
18190
18415
  <xsl:call-template name="setNamedDestination"/>
18191
18416
  <fo:block>
18417
+ <xsl:attribute name="role">Sect</xsl:attribute>
18192
18418
  <xsl:call-template name="setId"/>
18193
18419
  <xsl:call-template name="addReviewHelper"/>
18194
18420
  <xsl:apply-templates/>
@@ -18250,6 +18476,7 @@
18250
18476
  <xsl:call-template name="setNamedDestination"/>
18251
18477
 
18252
18478
  <fo:block id="{@id}">
18479
+ <xsl:attribute name="role">Sect</xsl:attribute>
18253
18480
 
18254
18481
  <xsl:call-template name="setBlockSpanAll"/>
18255
18482