metanorma-m3aawg 2.1.12 → 2.1.13

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 7063dbb2d2913a6dd0f2c6dc57e59093d49a47fe58054e7466627471480d16f5
4
- data.tar.gz: a2e88be007d2b2f03cb10e0f1e8a14b52bdf0885d561109a3877f6eb42323bbb
3
+ metadata.gz: d5b8c3d7e27582b20e5e6b8725212baa48bff45fa298dde59c8afd95ce0c6775
4
+ data.tar.gz: 7ba9d594b639b19da595734528e26b136036853c19391d82458a4eaaaab9abd9
5
5
  SHA512:
6
- metadata.gz: 6a59bb5425e6fad085e9ecf00b1db6fb6c509a47ea0c49abeb30be44e62dcef94f53f33738dd7d11c87e4e99db4113bb070d95bbbb7fc06188849e561055053c
7
- data.tar.gz: 9b3445fa1af9b8e0f71aab50dd18827e0e0f18b562fa2f627fc3180ecf226c372529f6f9ebff4cfc2c73755f0417cc421153a8a48abff3030c33b559165af4c5
6
+ metadata.gz: 9017b3236d99750942c3ac5233ee6edfcdc7a31310b411246bdb2812180993a7075cfe1cd5ab3717a69341316c7e6e7917dc53dc5ef33615684fef3cc6678b46
7
+ data.tar.gz: fd596ce924a0c26e69c3d731e9e4acb78e5292b75ac6270125650dbe943ba407b0ba341a345609d804bd302bf1aa7a6f56b87a3ca42550c049daa24efa118ee1
@@ -281,6 +281,12 @@ div.colophon {
281
281
  padding-left: 30px; }
282
282
  #toc .h3, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) .h3 {
283
283
  padding-left: 50px; }
284
+ #toc .h4, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) .h4 {
285
+ padding-left: 70px; }
286
+ #toc .h5, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) .h5 {
287
+ padding-left: 90px; }
288
+ #toc .h6, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) .h6 {
289
+ padding-left: 110px; }
284
290
  #toc .toc-active, #toc li:hover, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) .toc-active, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover {
285
291
  background: #69C5DC;
286
292
  box-shadow: inset -5px 0px 10px -5px #69C5DC !important; }
@@ -595,6 +595,156 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3 {
595
595
  font-weight: bold;
596
596
  mso-bidi-font-weight: normal; }
597
597
 
598
+ p.MsoToc4, li.MsoToc4, div.MsoToc4 {
599
+ mso-style-noshow: yes;
600
+ mso-style-priority: 39;
601
+ mso-style-unhide: no;
602
+ mso-style-name: "TOC 4";
603
+ mso-style-parent: "TOC 3";
604
+ mso-style-next: Normal;
605
+ margin-top: 0cm;
606
+ margin-right: 25.0pt;
607
+ margin-bottom: 0cm;
608
+ margin-left: 36.0pt;
609
+ margin-bottom: .0001pt;
610
+ text-indent: -36.0pt;
611
+ line-height: 12.0pt;
612
+ mso-pagination: widow-orphan;
613
+ mso-hyphenate: none;
614
+ tab-stops: 20.15pt 47.9pt right dotted 487.6pt;
615
+ font-size: 10.5pt;
616
+ font-family: {{bodyfont}};
617
+ mso-fareast-font-family: {{bodyfont}};
618
+ mso-bidi-font-family: {{bodyfont}};
619
+ mso-ansi-language: EN-GB;
620
+ font-weight: bold;
621
+ mso-bidi-font-weight: normal; }
622
+
623
+ p.MsoToc5, li.MsoToc5, div.MsoToc5 {
624
+ mso-style-noshow: yes;
625
+ mso-style-priority: 39;
626
+ mso-style-unhide: no;
627
+ mso-style-name: "TOC 5";
628
+ mso-style-parent: "TOC 4";
629
+ mso-style-next: Normal;
630
+ margin-top: 0cm;
631
+ margin-right: 25.0pt;
632
+ margin-bottom: 0cm;
633
+ margin-left: 36.0pt;
634
+ margin-bottom: .0001pt;
635
+ text-indent: -36.0pt;
636
+ line-height: 12.0pt;
637
+ mso-pagination: widow-orphan;
638
+ mso-hyphenate: none;
639
+ tab-stops: 20.15pt 47.9pt right dotted 487.6pt;
640
+ font-size: 10.5pt;
641
+ font-family: {{bodyfont}};
642
+ mso-fareast-font-family: {{bodyfont}};
643
+ mso-bidi-font-family: {{bodyfont}};
644
+ mso-ansi-language: EN-GB;
645
+ font-weight: bold;
646
+ mso-bidi-font-weight: normal; }
647
+
648
+ p.MsoToc6, li.MsoToc6, div.MsoToc6 {
649
+ mso-style-noshow: yes;
650
+ mso-style-priority: 39;
651
+ mso-style-unhide: no;
652
+ mso-style-name: "TOC 6";
653
+ mso-style-parent: "TOC 5";
654
+ mso-style-next: Normal;
655
+ margin-top: 0cm;
656
+ margin-right: 25.0pt;
657
+ margin-bottom: 0cm;
658
+ margin-left: 36.0pt;
659
+ margin-bottom: .0001pt;
660
+ text-indent: -36.0pt;
661
+ line-height: 12.0pt;
662
+ mso-pagination: widow-orphan;
663
+ mso-hyphenate: none;
664
+ tab-stops: 20.15pt 55.0pt right dotted 487.6pt;
665
+ font-size: 10.5pt;
666
+ font-family: {{bodyfont}};
667
+ mso-fareast-font-family: {{bodyfont}};
668
+ mso-bidi-font-family: {{bodyfont}};
669
+ mso-ansi-language: EN-GB;
670
+ font-weight: bold;
671
+ mso-bidi-font-weight: normal; }
672
+
673
+ p.MsoToc7, li.MsoToc7, div.MsoToc7 {
674
+ mso-style-noshow: yes;
675
+ mso-style-priority: 39;
676
+ mso-style-unhide: no;
677
+ mso-style-name: "TOC 7";
678
+ mso-style-parent: "TOC 6";
679
+ mso-style-next: Normal;
680
+ margin-top: 0cm;
681
+ margin-right: 25.0pt;
682
+ margin-bottom: 0cm;
683
+ margin-left: 36.0pt;
684
+ margin-bottom: .0001pt;
685
+ text-indent: -36.0pt;
686
+ line-height: 12.0pt;
687
+ mso-pagination: widow-orphan;
688
+ mso-hyphenate: none;
689
+ tab-stops: 20.15pt 62.7pt right dotted 487.6pt;
690
+ font-size: 10.5pt;
691
+ font-family: {{bodyfont}};
692
+ mso-fareast-font-family: {{bodyfont}};
693
+ mso-bidi-font-family: {{bodyfont}};
694
+ mso-ansi-language: EN-GB;
695
+ font-weight: bold;
696
+ mso-bidi-font-weight: normal; }
697
+
698
+ p.MsoToc8, li.MsoToc8, div.MsoToc8 {
699
+ mso-style-noshow: yes;
700
+ mso-style-priority: 39;
701
+ mso-style-unhide: no;
702
+ mso-style-name: "TOC 8";
703
+ mso-style-parent: "TOC 7";
704
+ mso-style-next: Normal;
705
+ margin-top: 0cm;
706
+ margin-right: 25.0pt;
707
+ margin-bottom: 0cm;
708
+ margin-left: 36.0pt;
709
+ margin-bottom: .0001pt;
710
+ text-indent: -36.0pt;
711
+ line-height: 12.0pt;
712
+ mso-pagination: widow-orphan;
713
+ mso-hyphenate: none;
714
+ tab-stops: 20.15pt 70.3pt right dotted 487.6pt;
715
+ font-size: 10.5pt;
716
+ font-family: {{bodyfont}};
717
+ mso-fareast-font-family: {{bodyfont}};
718
+ mso-bidi-font-family: {{bodyfont}};
719
+ mso-ansi-language: EN-GB;
720
+ font-weight: bold;
721
+ mso-bidi-font-weight: normal; }
722
+
723
+ p.MsoToc9, li.MsoToc9, div.MsoToc9 {
724
+ mso-style-noshow: yes;
725
+ mso-style-priority: 39;
726
+ mso-style-unhide: no;
727
+ mso-style-name: "TOC 9";
728
+ mso-style-parent: "TOC 8";
729
+ mso-style-next: Normal;
730
+ margin-top: 0cm;
731
+ margin-right: 25.0pt;
732
+ margin-bottom: 0cm;
733
+ margin-left: 36.0pt;
734
+ margin-bottom: .0001pt;
735
+ text-indent: -36.0pt;
736
+ line-height: 12.0pt;
737
+ mso-pagination: widow-orphan;
738
+ mso-hyphenate: none;
739
+ tab-stops: 20.15pt 78.0pt right dotted 487.6pt;
740
+ font-size: 10.5pt;
741
+ font-family: {{bodyfont}};
742
+ mso-fareast-font-family: {{bodyfont}};
743
+ mso-bidi-font-family: {{bodyfont}};
744
+ mso-ansi-language: EN-GB;
745
+ font-weight: bold;
746
+ mso-bidi-font-weight: normal; }
747
+
598
748
  span.MsoFootnoteReference {
599
749
  mso-style-priority: 99;
600
750
  mso-style-name: "Footnote Reference";
@@ -558,6 +558,150 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3
558
558
  mso-ansi-language:EN-GB;
559
559
  font-weight:bold;
560
560
  mso-bidi-font-weight:normal;}
561
+ p.MsoToc4, li.MsoToc4, div.MsoToc4
562
+ {mso-style-noshow:yes;
563
+ mso-style-priority:39;
564
+ mso-style-unhide:no;
565
+ mso-style-name:"TOC 4";
566
+ mso-style-parent:"TOC 3";
567
+ mso-style-next:Normal;
568
+ margin-top:0cm;
569
+ margin-right:25.0pt;
570
+ margin-bottom:0cm;
571
+ margin-left:36.0pt;
572
+ margin-bottom:.0001pt;
573
+ text-indent:-36.0pt;
574
+ line-height:12.0pt;
575
+ mso-pagination:widow-orphan;
576
+ mso-hyphenate:none;
577
+ tab-stops:20.15pt 47.9pt right dotted 487.6pt;
578
+ font-size:10.5pt;
579
+ font-family:$bodyfont;
580
+ mso-fareast-font-family:$bodyfont;
581
+ mso-bidi-font-family:$bodyfont;
582
+ mso-ansi-language:EN-GB;
583
+ font-weight:bold;
584
+ mso-bidi-font-weight:normal;}
585
+ p.MsoToc5, li.MsoToc5, div.MsoToc5
586
+ {mso-style-noshow:yes;
587
+ mso-style-priority:39;
588
+ mso-style-unhide:no;
589
+ mso-style-name:"TOC 5";
590
+ mso-style-parent:"TOC 4";
591
+ mso-style-next:Normal;
592
+ margin-top:0cm;
593
+ margin-right:25.0pt;
594
+ margin-bottom:0cm;
595
+ margin-left:36.0pt;
596
+ margin-bottom:.0001pt;
597
+ text-indent:-36.0pt;
598
+ line-height:12.0pt;
599
+ mso-pagination:widow-orphan;
600
+ mso-hyphenate:none;
601
+ tab-stops:20.15pt 47.9pt right dotted 487.6pt;
602
+ font-size:10.5pt;
603
+ font-family:$bodyfont;
604
+ mso-fareast-font-family:$bodyfont;
605
+ mso-bidi-font-family:$bodyfont;
606
+ mso-ansi-language:EN-GB;
607
+ font-weight:bold;
608
+ mso-bidi-font-weight:normal;}
609
+ p.MsoToc6, li.MsoToc6, div.MsoToc6
610
+ {mso-style-noshow:yes;
611
+ mso-style-priority:39;
612
+ mso-style-unhide:no;
613
+ mso-style-name:"TOC 6";
614
+ mso-style-parent:"TOC 5";
615
+ mso-style-next:Normal;
616
+ margin-top:0cm;
617
+ margin-right:25.0pt;
618
+ margin-bottom:0cm;
619
+ margin-left:36.0pt;
620
+ margin-bottom:.0001pt;
621
+ text-indent:-36.0pt;
622
+ line-height:12.0pt;
623
+ mso-pagination:widow-orphan;
624
+ mso-hyphenate:none;
625
+ tab-stops:20.15pt 55.0pt right dotted 487.6pt;
626
+ font-size:10.5pt;
627
+ font-family:$bodyfont;
628
+ mso-fareast-font-family:$bodyfont;
629
+ mso-bidi-font-family:$bodyfont;
630
+ mso-ansi-language:EN-GB;
631
+ font-weight:bold;
632
+ mso-bidi-font-weight:normal;}
633
+ p.MsoToc7, li.MsoToc7, div.MsoToc7
634
+ {mso-style-noshow:yes;
635
+ mso-style-priority:39;
636
+ mso-style-unhide:no;
637
+ mso-style-name:"TOC 7";
638
+ mso-style-parent:"TOC 6";
639
+ mso-style-next:Normal;
640
+ margin-top:0cm;
641
+ margin-right:25.0pt;
642
+ margin-bottom:0cm;
643
+ margin-left:36.0pt;
644
+ margin-bottom:.0001pt;
645
+ text-indent:-36.0pt;
646
+ line-height:12.0pt;
647
+ mso-pagination:widow-orphan;
648
+ mso-hyphenate:none;
649
+ tab-stops:20.15pt 62.7pt right dotted 487.6pt;
650
+ font-size:10.5pt;
651
+ font-family:$bodyfont;
652
+ mso-fareast-font-family:$bodyfont;
653
+ mso-bidi-font-family:$bodyfont;
654
+ mso-ansi-language:EN-GB;
655
+ font-weight:bold;
656
+ mso-bidi-font-weight:normal;}
657
+ p.MsoToc8, li.MsoToc8, div.MsoToc8
658
+ {mso-style-noshow:yes;
659
+ mso-style-priority:39;
660
+ mso-style-unhide:no;
661
+ mso-style-name:"TOC 8";
662
+ mso-style-parent:"TOC 7";
663
+ mso-style-next:Normal;
664
+ margin-top:0cm;
665
+ margin-right:25.0pt;
666
+ margin-bottom:0cm;
667
+ margin-left:36.0pt;
668
+ margin-bottom:.0001pt;
669
+ text-indent:-36.0pt;
670
+ line-height:12.0pt;
671
+ mso-pagination:widow-orphan;
672
+ mso-hyphenate:none;
673
+ tab-stops:20.15pt 70.3pt right dotted 487.6pt;
674
+ font-size:10.5pt;
675
+ font-family:$bodyfont;
676
+ mso-fareast-font-family:$bodyfont;
677
+ mso-bidi-font-family:$bodyfont;
678
+ mso-ansi-language:EN-GB;
679
+ font-weight:bold;
680
+ mso-bidi-font-weight:normal;}
681
+ p.MsoToc9, li.MsoToc9, div.MsoToc9
682
+ {mso-style-noshow:yes;
683
+ mso-style-priority:39;
684
+ mso-style-unhide:no;
685
+ mso-style-name:"TOC 9";
686
+ mso-style-parent:"TOC 8";
687
+ mso-style-next:Normal;
688
+ margin-top:0cm;
689
+ margin-right:25.0pt;
690
+ margin-bottom:0cm;
691
+ margin-left:36.0pt;
692
+ margin-bottom:.0001pt;
693
+ text-indent:-36.0pt;
694
+ line-height:12.0pt;
695
+ mso-pagination:widow-orphan;
696
+ mso-hyphenate:none;
697
+ tab-stops:20.15pt 78.0pt right dotted 487.6pt;
698
+ font-size:10.5pt;
699
+ font-family:$bodyfont;
700
+ mso-fareast-font-family:$bodyfont;
701
+ mso-bidi-font-family:$bodyfont;
702
+ mso-ansi-language:EN-GB;
703
+ font-weight:bold;
704
+ mso-bidi-font-weight:normal;}
561
705
  span.MsoFootnoteReference
562
706
  {mso-style-priority:99;
563
707
  mso-style-name:"Footnote Reference";
@@ -635,6 +635,8 @@
635
635
  <xsl:text>iVBORw0KGgoAAAANSUhEUgAAAjUAAAA8CAYAAACehUt5AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA99pVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgeG1wTU06T3JpZ2luYWxEb2N1bWVudElEPSJ1dWlkOmZhZjViZGQ1LWJhM2QtMTFkYS1hZDMxLWQzM2Q3NTE4MmYxYiIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDo1QjFGQUNFRDVCODYxMUU0OUZCN0FCODI3QzkxM0M3RiIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDo1QjFGQUNFQzVCODYxMUU0OUZCN0FCODI3QzkxM0M3RiIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M2IChXaW5kb3dzKSI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkMwOEQ1MzE4OTE1NUU0MTE4ODdFRjlCOTFBMkJDOUNFIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjg1QjAy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</xsl:text>
636
636
  </xsl:variable>
637
637
 
638
+ <xsl:strip-space elements="m3d:xref"/>
639
+
638
640
  <!-- external parameters -->
639
641
 
640
642
  <xsl:param name="svg_images"/> <!-- svg images array -->
@@ -2008,17 +2010,22 @@
2008
2010
  </xsl:for-each>
2009
2011
  </xsl:template>
2010
2012
 
2013
+ <xsl:variable name="regex_standard_reference">([A-Z]{2,}(/[A-Z]{2,})* \d+(-\d+)*(:\d{4})?)</xsl:variable>
2011
2014
  <xsl:variable name="tag_fo_inline_keep-together_within-line_open">###fo:inline keep-together_within-line###</xsl:variable>
2012
2015
  <xsl:variable name="tag_fo_inline_keep-together_within-line_close">###/fo:inline keep-together_within-line###</xsl:variable>
2013
2016
  <xsl:template match="text()" name="text">
2014
2017
 
2015
- <xsl:variable name="regex_standard_reference">([A-Z]{2,}(/[A-Z]{2,})* \d+(-\d+)*(:\d{4})?)</xsl:variable>
2016
- <xsl:variable name="text" select="java:replaceAll(java:java.lang.String.new(.),$regex_standard_reference,concat($tag_fo_inline_keep-together_within-line_open,'$1',$tag_fo_inline_keep-together_within-line_close))"/>
2017
- <xsl:call-template name="replace_fo_inline_tags">
2018
- <xsl:with-param name="tag_open" select="$tag_fo_inline_keep-together_within-line_open"/>
2019
- <xsl:with-param name="tag_close" select="$tag_fo_inline_keep-together_within-line_close"/>
2020
- <xsl:with-param name="text" select="$text"/>
2021
- </xsl:call-template>
2018
+ <xsl:choose>
2019
+ <xsl:when test="ancestor::*[local-name() = 'table']"><xsl:value-of select="."/></xsl:when>
2020
+ <xsl:otherwise>
2021
+ <xsl:variable name="text" select="java:replaceAll(java:java.lang.String.new(.),$regex_standard_reference,concat($tag_fo_inline_keep-together_within-line_open,'$1',$tag_fo_inline_keep-together_within-line_close))"/>
2022
+ <xsl:call-template name="replace_fo_inline_tags">
2023
+ <xsl:with-param name="tag_open" select="$tag_fo_inline_keep-together_within-line_open"/>
2024
+ <xsl:with-param name="tag_close" select="$tag_fo_inline_keep-together_within-line_close"/>
2025
+ <xsl:with-param name="text" select="$text"/>
2026
+ </xsl:call-template>
2027
+ </xsl:otherwise>
2028
+ </xsl:choose>
2022
2029
 
2023
2030
  </xsl:template>
2024
2031
 
@@ -2391,7 +2398,7 @@
2391
2398
 
2392
2399
  <!-- centered table when table name is centered (see table-name-style) -->
2393
2400
 
2394
- <fo:table table-layout="fixed" width="100%">
2401
+ <fo:table table-layout="fixed" width="100%" xsl:use-attribute-sets="table-container-style">
2395
2402
  <fo:table-column column-width="proportional-column-width(1)"/>
2396
2403
  <fo:table-column column-width="{@width}"/>
2397
2404
  <fo:table-column column-width="proportional-column-width(1)"/>
@@ -3044,7 +3051,7 @@
3044
3051
  <xsl:template match="*[local-name()='tr']">
3045
3052
  <fo:table-row xsl:use-attribute-sets="table-body-row-style">
3046
3053
 
3047
- <xsl:if test="*[local-name() = 'th']">
3054
+ <xsl:if test="count(*) = count(*[local-name() = 'th'])"> <!-- row contains 'th' only -->
3048
3055
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
3049
3056
  </xsl:if>
3050
3057
 
@@ -4003,7 +4010,8 @@
4003
4010
  <xsl:copy-of select="node()"/>
4004
4011
  </td>
4005
4012
  <td>
4006
- <xsl:copy-of select="following-sibling::*[local-name()='dd'][1]/node()[not(local-name() = 'dl')]"/>
4013
+ <!-- <xsl:copy-of select="following-sibling::*[local-name()='dd'][1]/node()[not(local-name() = 'dl')]"/> -->
4014
+ <xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]/node()[not(local-name() = 'dl')]" mode="dl_if"/>
4007
4015
  <!-- get paragraphs from nested 'dl' -->
4008
4016
  <xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]/*[local-name() = 'dl']" mode="dl_if_nested"/>
4009
4017
  </td>
@@ -4011,6 +4019,53 @@
4011
4019
  </xsl:template>
4012
4020
  <xsl:template match="*[local-name()='dd']" mode="dl_if"/>
4013
4021
 
4022
+ <xsl:template match="*" mode="dl_if">
4023
+ <xsl:copy-of select="."/>
4024
+ </xsl:template>
4025
+
4026
+ <xsl:template match="*[local-name() = 'p']" mode="dl_if">
4027
+ <xsl:param name="indent"/>
4028
+ <p>
4029
+ <xsl:copy-of select="@*"/>
4030
+ <xsl:value-of select="$indent"/>
4031
+ <xsl:copy-of select="node()"/>
4032
+ </p>
4033
+
4034
+ </xsl:template>
4035
+
4036
+ <xsl:template match="*[local-name() = 'ul' or local-name() = 'ol']" mode="dl_if">
4037
+ <xsl:variable name="list_rendered_">
4038
+ <xsl:apply-templates select="."/>
4039
+ </xsl:variable>
4040
+ <xsl:variable name="list_rendered" select="xalan:nodeset($list_rendered_)"/>
4041
+
4042
+ <xsl:variable name="indent">
4043
+ <xsl:for-each select="($list_rendered//fo:block[not(.//fo:block)])[1]">
4044
+ <xsl:apply-templates select="ancestor::*[@provisional-distance-between-starts]/@provisional-distance-between-starts" mode="dl_if"/>
4045
+ </xsl:for-each>
4046
+ </xsl:variable>
4047
+
4048
+ <xsl:apply-templates mode="dl_if">
4049
+ <xsl:with-param name="indent" select="$indent"/>
4050
+ </xsl:apply-templates>
4051
+ </xsl:template>
4052
+
4053
+ <xsl:template match="*[local-name() = 'li']" mode="dl_if">
4054
+ <xsl:param name="indent"/>
4055
+ <xsl:apply-templates mode="dl_if">
4056
+ <xsl:with-param name="indent" select="$indent"/>
4057
+ </xsl:apply-templates>
4058
+ </xsl:template>
4059
+
4060
+ <xsl:template match="@provisional-distance-between-starts" mode="dl_if">
4061
+ <xsl:variable name="value" select="round(substring-before(.,'mm'))"/>
4062
+ <!-- emulate left indent for list item -->
4063
+ <xsl:call-template name="repeat">
4064
+ <xsl:with-param name="char" select="'x'"/>
4065
+ <xsl:with-param name="count" select="$value"/>
4066
+ </xsl:call-template>
4067
+ </xsl:template>
4068
+
4014
4069
  <xsl:template match="*[local-name()='dl']" mode="dl_if_nested">
4015
4070
  <xsl:for-each select="*[local-name() = 'dt']">
4016
4071
  <p>
@@ -4409,6 +4464,7 @@
4409
4464
  </word>
4410
4465
  <xsl:call-template name="tokenize_with_tags">
4411
4466
  <xsl:with-param name="text" select="substring-after($text, $separator)"/>
4467
+ <xsl:with-param name="tags" select="$tags"/>
4412
4468
  </xsl:call-template>
4413
4469
  </xsl:otherwise>
4414
4470
  </xsl:choose>
@@ -4448,8 +4504,18 @@
4448
4504
 
4449
4505
  <xsl:template name="add-zero-spaces-java">
4450
4506
  <xsl:param name="text" select="."/>
4451
- <!-- add zero-width space (#x200B) after characters: dash, dot, colon, equal, underscore, em dash, thin space -->
4452
- <xsl:value-of select="java:replaceAll(java:java.lang.String.new($text),'(-|\.|:|=|_|—| )','$1​')"/>
4507
+ <!-- add zero-width space (#x200B) after characters: dash, dot, colon, equal, underscore, em dash, thin space, arrow right -->
4508
+ <xsl:variable name="text1" select="java:replaceAll(java:java.lang.String.new($text),'(-|\.|:|=|_|—| |→)','$1​')"/>
4509
+ <!-- add zero-width space (#x200B) after characters: 'great than' -->
4510
+ <xsl:variable name="text2" select="java:replaceAll(java:java.lang.String.new($text1), '(\u003e)(?!\u003e)', '$1​')"/><!-- negative lookahead: 'great than' not followed by 'great than' -->
4511
+ <!-- add zero-width space (#x200B) before characters: 'less than' -->
4512
+ <xsl:variable name="text3" select="java:replaceAll(java:java.lang.String.new($text2), '(?&lt;!\u003c)(\u003c)', '​$1')"/> <!-- (?<!\u003c)(\u003c) --> <!-- negative lookbehind: 'less than' not preceeded by 'less than' -->
4513
+ <!-- add zero-width space (#x200B) before character: { -->
4514
+ <xsl:variable name="text4" select="java:replaceAll(java:java.lang.String.new($text3), '(?&lt;!\W)(\{)', '​$1')"/> <!-- negative lookbehind: '{' not preceeded by 'punctuation char' -->
4515
+ <!-- add zero-width space (#x200B) after character: , -->
4516
+ <xsl:variable name="text5" select="java:replaceAll(java:java.lang.String.new($text4), '(\,)(?!\d)', '$1​')"/> <!-- negative lookahead: ',' not followed by digit -->
4517
+
4518
+ <xsl:value-of select="$text5"/>
4453
4519
  </xsl:template>
4454
4520
 
4455
4521
  <xsl:template name="add-zero-spaces-link-java">
@@ -4595,7 +4661,7 @@
4595
4661
  </xsl:copy>
4596
4662
  </xsl:template>
4597
4663
 
4598
- <xsl:template match="*[local-name()='th' or local-name() = 'td'][not(*[local-name()='br']) and not(*[local-name()='p'])]" mode="table-without-br">
4664
+ <xsl:template match="*[local-name()='th' or local-name() = 'td'][not(*[local-name()='br']) and not(*[local-name()='p']) and not(*[local-name()='sourcecode'])]" mode="table-without-br">
4599
4665
  <xsl:copy>
4600
4666
  <xsl:copy-of select="@*"/>
4601
4667
  <p>
@@ -4643,6 +4709,28 @@
4643
4709
  </xsl:for-each>
4644
4710
  </xsl:template>
4645
4711
 
4712
+ <xsl:template match="*[local-name()='th' or local-name()='td']/*[local-name() = 'sourcecode']" mode="table-without-br">
4713
+ <xsl:apply-templates mode="table-without-br"/>
4714
+ </xsl:template>
4715
+
4716
+ <xsl:template match="*[local-name()='th' or local-name()='td']/*[local-name() = 'sourcecode']/text()[contains(., '&#13;') or contains(., '&#10;')]" mode="table-without-br">
4717
+
4718
+ <xsl:variable name="sep">###SOURCECODE_NEWLINE###</xsl:variable>
4719
+ <xsl:variable name="sourcecode_text" select="java:replaceAll(java:java.lang.String.new(.),'(&#13;&#10;|&#13;|&#10;)', $sep)"/>
4720
+ <xsl:variable name="items">
4721
+ <xsl:call-template name="split">
4722
+ <xsl:with-param name="pText" select="$sourcecode_text"/>
4723
+ <xsl:with-param name="sep" select="$sep"/>
4724
+ <xsl:with-param name="normalize-space">false</xsl:with-param>
4725
+ </xsl:call-template>
4726
+ </xsl:variable>
4727
+ <xsl:for-each select="xalan:nodeset($items)/*">
4728
+ <p>
4729
+ <sourcecode><xsl:copy-of select="node()"/></sourcecode>
4730
+ </p>
4731
+ </xsl:for-each>
4732
+ </xsl:template>
4733
+
4646
4734
  <!-- remove redundant white spaces -->
4647
4735
  <xsl:template match="text()[not(ancestor::*[local-name() = 'sourcecode'])]" mode="table-without-br">
4648
4736
  <xsl:variable name="text" select="translate(.,'&#9;&#10;&#13;','')"/>
@@ -4953,6 +5041,7 @@
4953
5041
  <xsl:if test="ancestor::*[local-name() = 'sub']"><tag>sub</tag></xsl:if>
4954
5042
  <xsl:if test="ancestor::*[local-name() = 'sup']"><tag>sup</tag></xsl:if>
4955
5043
  <xsl:if test="ancestor::*[local-name() = 'tt']"><tag>tt</tag></xsl:if>
5044
+ <xsl:if test="ancestor::*[local-name() = 'sourcecode']"><tag>sourcecode</tag></xsl:if>
4956
5045
  <xsl:if test="ancestor::*[local-name() = 'keep-together_within-line']"><tag>keep-together_within-line</tag></xsl:if>
4957
5046
  </tags>
4958
5047
  </xsl:template>
@@ -5436,6 +5525,12 @@
5436
5525
 
5437
5526
  <fo:block-container margin-left="0mm">
5438
5527
 
5528
+ <!-- <xsl:if test="$namespace = 'iho'">
5529
+ <xsl:if test="ancestor::iho:td">
5530
+ <xsl:attribute name="font-size">12pt</xsl:attribute>
5531
+ </xsl:if>
5532
+ </xsl:if> -->
5533
+
5439
5534
  <fo:block>
5440
5535
 
5441
5536
  <fo:inline xsl:use-attribute-sets="note-name-style">
@@ -6581,37 +6676,15 @@
6581
6676
  <!-- =============== -->
6582
6677
  <xsl:template match="*[local-name()='sourcecode']" name="sourcecode">
6583
6678
 
6584
- <fo:block-container xsl:use-attribute-sets="sourcecode-container-style">
6585
-
6586
- <xsl:if test="not(ancestor::*[local-name() = 'li']) or ancestor::*[local-name() = 'example']">
6587
- <xsl:attribute name="margin-left">0mm</xsl:attribute>
6588
- </xsl:if>
6589
-
6590
- <xsl:if test="ancestor::*[local-name() = 'example']">
6591
- <xsl:attribute name="margin-right">0mm</xsl:attribute>
6592
- </xsl:if>
6593
-
6594
- <xsl:copy-of select="@id"/>
6595
-
6596
- <xsl:if test="parent::*[local-name() = 'note']">
6597
- <xsl:attribute name="margin-left">
6598
- <xsl:choose>
6599
- <xsl:when test="not(ancestor::*[local-name() = 'table'])"><xsl:value-of select="$note-body-indent"/></xsl:when>
6600
- <xsl:otherwise><xsl:value-of select="$note-body-indent-table"/></xsl:otherwise>
6601
- </xsl:choose>
6602
- </xsl:attribute>
6603
-
6604
- </xsl:if>
6605
- <fo:block-container margin-left="0mm">
6679
+ <xsl:variable name="sourcecode_attributes">
6680
+ <xsl:element name="sourcecode_attributes" use-attribute-sets="sourcecode-style">
6681
+ <xsl:variable name="_font-size">
6606
6682
 
6607
- <fo:block xsl:use-attribute-sets="sourcecode-style">
6608
- <xsl:variable name="_font-size">
6683
+ <!-- 9 -->
6609
6684
 
6610
- <!-- 9 -->
6611
-
6612
- <!-- <xsl:if test="$namespace = 'ieee'">
6613
- <xsl:if test="$current_template = 'standard'">8</xsl:if>
6614
- </xsl:if> -->
6685
+ <!-- <xsl:if test="$namespace = 'ieee'">
6686
+ <xsl:if test="$current_template = 'standard'">8</xsl:if>
6687
+ </xsl:if> -->
6615
6688
 
6616
6689
  </xsl:variable>
6617
6690
 
@@ -6626,14 +6699,60 @@
6626
6699
  </xsl:choose>
6627
6700
  </xsl:attribute>
6628
6701
  </xsl:if>
6702
+ </xsl:element>
6703
+ </xsl:variable>
6629
6704
 
6705
+ <xsl:choose>
6706
+ <xsl:when test="$isGenerateTableIF = 'true' and (ancestor::*[local-name() = 'td'] or ancestor::*[local-name() = 'th'])">
6707
+ <xsl:for-each select="xalan:nodeset($sourcecode_attributes)/sourcecode_attributes/@*">
6708
+ <xsl:attribute name="{local-name()}">
6709
+ <xsl:value-of select="."/>
6710
+ </xsl:attribute>
6711
+ </xsl:for-each>
6630
6712
  <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
6631
- </fo:block>
6713
+ </xsl:when>
6632
6714
 
6633
- <xsl:apply-templates select="*[local-name()='name']"/> <!-- show sourcecode's name AFTER content -->
6715
+ <xsl:otherwise>
6716
+ <fo:block-container xsl:use-attribute-sets="sourcecode-container-style">
6634
6717
 
6635
- </fo:block-container>
6636
- </fo:block-container>
6718
+ <xsl:if test="not(ancestor::*[local-name() = 'li']) or ancestor::*[local-name() = 'example']">
6719
+ <xsl:attribute name="margin-left">0mm</xsl:attribute>
6720
+ </xsl:if>
6721
+
6722
+ <xsl:if test="ancestor::*[local-name() = 'example']">
6723
+ <xsl:attribute name="margin-right">0mm</xsl:attribute>
6724
+ </xsl:if>
6725
+
6726
+ <xsl:copy-of select="@id"/>
6727
+
6728
+ <xsl:if test="parent::*[local-name() = 'note']">
6729
+ <xsl:attribute name="margin-left">
6730
+ <xsl:choose>
6731
+ <xsl:when test="not(ancestor::*[local-name() = 'table'])"><xsl:value-of select="$note-body-indent"/></xsl:when>
6732
+ <xsl:otherwise><xsl:value-of select="$note-body-indent-table"/></xsl:otherwise>
6733
+ </xsl:choose>
6734
+ </xsl:attribute>
6735
+
6736
+ </xsl:if>
6737
+ <fo:block-container margin-left="0mm">
6738
+
6739
+ <fo:block xsl:use-attribute-sets="sourcecode-style">
6740
+
6741
+ <xsl:for-each select="xalan:nodeset($sourcecode_attributes)/sourcecode_attributes/@*">
6742
+ <xsl:attribute name="{local-name()}">
6743
+ <xsl:value-of select="."/>
6744
+ </xsl:attribute>
6745
+ </xsl:for-each>
6746
+
6747
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
6748
+ </fo:block>
6749
+
6750
+ <xsl:apply-templates select="*[local-name()='name']"/> <!-- show sourcecode's name AFTER content -->
6751
+
6752
+ </fo:block-container>
6753
+ </fo:block-container>
6754
+ </xsl:otherwise>
6755
+ </xsl:choose>
6637
6756
  </xsl:template>
6638
6757
 
6639
6758
  <xsl:template match="*[local-name()='sourcecode']/text()" priority="2">
@@ -8861,7 +8980,9 @@
8861
8980
  <!-- ===================================== -->
8862
8981
  <!-- Update xml -->
8863
8982
  <!-- ===================================== -->
8983
+ <!-- =========================================================================== -->
8864
8984
  <!-- STEP1: Re-order elements in 'preface', 'sections' based on @displayorder -->
8985
+ <!-- =========================================================================== -->
8865
8986
  <xsl:template match="@*|node()" mode="update_xml_step1">
8866
8987
  <xsl:copy>
8867
8988
  <xsl:apply-templates select="@*|node()" mode="update_xml_step1"/>
@@ -8953,10 +9074,15 @@
8953
9074
  <xsl:template match="*[local-name() = 'span']" mode="update_xml_step1">
8954
9075
  <xsl:apply-templates mode="update_xml_step1"/>
8955
9076
  </xsl:template>
8956
-
9077
+ <!-- =========================================================================== -->
8957
9078
  <!-- END STEP1: Re-order elements in 'preface', 'sections' based on @displayorder -->
9079
+ <!-- =========================================================================== -->
8958
9080
 
9081
+ <!-- =========================================================================== -->
8959
9082
  <!-- XML UPDATE STEP: enclose standard's name into tag 'keep-together_within-line' -->
9083
+ <!-- keep-together_within-line for: a/b, aaa/b, a/bbb, /b -->
9084
+ <!-- keep-together_within-line for: a.b, aaa.b, a.bbb, .b in table's cell ONLY -->
9085
+ <!-- =========================================================================== -->
8960
9086
  <!-- Example: <keep-together_within-line>ISO 10303-51</keep-together_within-line> -->
8961
9087
  <xsl:template match="@*|node()" mode="update_xml_enclose_keep-together_within-line">
8962
9088
  <xsl:copy>
@@ -8972,10 +9098,15 @@
8972
9098
  <xsl:template match="text()[not(ancestor::*[local-name() = 'bibdata'] or ancestor::*[local-name() = 'link'][not(contains(.,' '))] or ancestor::*[local-name() = 'sourcecode'] or ancestor::*[local-name() = 'math'] or starts-with(., 'http://') or starts-with(., 'https://') or starts-with(., 'www.') )]" name="keep_together_standard_number" mode="update_xml_enclose_keep-together_within-line">
8973
9099
 
8974
9100
  <!-- enclose standard's number into tag 'keep-together_within-line' -->
8975
- <xsl:variable name="regex_standard_reference">([A-Z]{2,}(/[A-Z]{2,})* \d+(-\d+)*(:\d{4})?)</xsl:variable>
8976
9101
  <xsl:variable name="tag_keep-together_within-line_open">###<xsl:value-of select="$element_name_keep-together_within-line"/>###</xsl:variable>
8977
9102
  <xsl:variable name="tag_keep-together_within-line_close">###/<xsl:value-of select="$element_name_keep-together_within-line"/>###</xsl:variable>
8978
- <xsl:variable name="text_" select="java:replaceAll(java:java.lang.String.new(.),$regex_standard_reference,concat($tag_keep-together_within-line_open,'$1',$tag_keep-together_within-line_close))"/>
9103
+ <xsl:variable name="text__" select="java:replaceAll(java:java.lang.String.new(.), $regex_standard_reference, concat($tag_keep-together_within-line_open,'$1',$tag_keep-together_within-line_close))"/>
9104
+ <xsl:variable name="text_">
9105
+ <xsl:choose>
9106
+ <xsl:when test="ancestor::*[local-name() = 'table']"><xsl:value-of select="."/></xsl:when> <!-- no need enclose standard's number into tag 'keep-together_within-line' in table cells -->
9107
+ <xsl:otherwise><xsl:value-of select="$text__"/></xsl:otherwise>
9108
+ </xsl:choose>
9109
+ </xsl:variable>
8979
9110
  <xsl:variable name="text"><text><xsl:call-template name="replace_text_tags">
8980
9111
  <xsl:with-param name="tag_open" select="$tag_keep-together_within-line_open"/>
8981
9112
  <xsl:with-param name="tag_close" select="$tag_keep-together_within-line_close"/>
@@ -8991,7 +9122,11 @@
8991
9122
  </xsl:variable>
8992
9123
 
8993
9124
  <!-- keep-together_within-line for: a/b, aaa/b, a/bbb, /b -->
8994
- <xsl:variable name="regex_solidus_units">((\b((\S{1,3}\/\S+)|(\S+\/\S{1,3}))\b)|(\/\S{1,3})\b)</xsl:variable>
9125
+ <!-- \S matches any non-whitespace character (equivalent to [^\r\n\t\f\v ]) -->
9126
+ <!-- <xsl:variable name="regex_solidus_units">((\b((\S{1,3}\/\S+)|(\S+\/\S{1,3}))\b)|(\/\S{1,3})\b)</xsl:variable> -->
9127
+ <!-- add &lt; and &gt; to \S -->
9128
+ <xsl:variable name="regex_S">[^\r\n\t\f\v \&lt;&gt;]</xsl:variable>
9129
+ <xsl:variable name="regex_solidus_units">((\b((<xsl:value-of select="$regex_S"/>{1,3}\/<xsl:value-of select="$regex_S"/>+)|(<xsl:value-of select="$regex_S"/>+\/<xsl:value-of select="$regex_S"/>{1,3}))\b)|(\/<xsl:value-of select="$regex_S"/>{1,3})\b)</xsl:variable>
8995
9130
  <xsl:variable name="text3">
8996
9131
  <text><xsl:for-each select="xalan:nodeset($text2)/text/node()">
8997
9132
  <xsl:choose>
@@ -9055,9 +9190,8 @@
9055
9190
  <xsl:otherwise><xsl:value-of select="$text"/></xsl:otherwise>
9056
9191
  </xsl:choose>
9057
9192
  </xsl:template>
9058
-
9059
9193
  <!-- ===================================== -->
9060
- <!-- End Update xml -->
9194
+ <!-- END XML UPDATE STEP: enclose standard's name into tag 'keep-together_within-line' -->
9061
9195
  <!-- ===================================== -->
9062
9196
 
9063
9197
  <!-- for correct rendering combining chars -->
@@ -635,6 +635,8 @@
635
635
  <xsl:text>iVBORw0KGgoAAAANSUhEUgAAAjUAAAA8CAYAAACehUt5AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA99pVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgeG1wTU06T3JpZ2luYWxEb2N1bWVudElEPSJ1dWlkOmZhZjViZGQ1LWJhM2QtMTFkYS1hZDMxLWQzM2Q3NTE4MmYxYiIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDo1QjFGQUNFRDVCODYxMUU0OUZCN0FCODI3QzkxM0M3RiIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDo1QjFGQUNFQzVCODYxMUU0OUZCN0FCODI3QzkxM0M3RiIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M2IChXaW5kb3dzKSI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkMwOEQ1MzE4OTE1NUU0MTE4ODdFRjlCOTFBMkJDOUNFIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjg1QjAy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</xsl:text>
636
636
  </xsl:variable>
637
637
 
638
+ <xsl:strip-space elements="m3d:xref"/>
639
+
638
640
  <!-- external parameters -->
639
641
 
640
642
  <xsl:param name="svg_images"/> <!-- svg images array -->
@@ -2008,17 +2010,22 @@
2008
2010
  </xsl:for-each>
2009
2011
  </xsl:template>
2010
2012
 
2013
+ <xsl:variable name="regex_standard_reference">([A-Z]{2,}(/[A-Z]{2,})* \d+(-\d+)*(:\d{4})?)</xsl:variable>
2011
2014
  <xsl:variable name="tag_fo_inline_keep-together_within-line_open">###fo:inline keep-together_within-line###</xsl:variable>
2012
2015
  <xsl:variable name="tag_fo_inline_keep-together_within-line_close">###/fo:inline keep-together_within-line###</xsl:variable>
2013
2016
  <xsl:template match="text()" name="text">
2014
2017
 
2015
- <xsl:variable name="regex_standard_reference">([A-Z]{2,}(/[A-Z]{2,})* \d+(-\d+)*(:\d{4})?)</xsl:variable>
2016
- <xsl:variable name="text" select="java:replaceAll(java:java.lang.String.new(.),$regex_standard_reference,concat($tag_fo_inline_keep-together_within-line_open,'$1',$tag_fo_inline_keep-together_within-line_close))"/>
2017
- <xsl:call-template name="replace_fo_inline_tags">
2018
- <xsl:with-param name="tag_open" select="$tag_fo_inline_keep-together_within-line_open"/>
2019
- <xsl:with-param name="tag_close" select="$tag_fo_inline_keep-together_within-line_close"/>
2020
- <xsl:with-param name="text" select="$text"/>
2021
- </xsl:call-template>
2018
+ <xsl:choose>
2019
+ <xsl:when test="ancestor::*[local-name() = 'table']"><xsl:value-of select="."/></xsl:when>
2020
+ <xsl:otherwise>
2021
+ <xsl:variable name="text" select="java:replaceAll(java:java.lang.String.new(.),$regex_standard_reference,concat($tag_fo_inline_keep-together_within-line_open,'$1',$tag_fo_inline_keep-together_within-line_close))"/>
2022
+ <xsl:call-template name="replace_fo_inline_tags">
2023
+ <xsl:with-param name="tag_open" select="$tag_fo_inline_keep-together_within-line_open"/>
2024
+ <xsl:with-param name="tag_close" select="$tag_fo_inline_keep-together_within-line_close"/>
2025
+ <xsl:with-param name="text" select="$text"/>
2026
+ </xsl:call-template>
2027
+ </xsl:otherwise>
2028
+ </xsl:choose>
2022
2029
 
2023
2030
  </xsl:template>
2024
2031
 
@@ -2391,7 +2398,7 @@
2391
2398
 
2392
2399
  <!-- centered table when table name is centered (see table-name-style) -->
2393
2400
 
2394
- <fo:table table-layout="fixed" width="100%">
2401
+ <fo:table table-layout="fixed" width="100%" xsl:use-attribute-sets="table-container-style">
2395
2402
  <fo:table-column column-width="proportional-column-width(1)"/>
2396
2403
  <fo:table-column column-width="{@width}"/>
2397
2404
  <fo:table-column column-width="proportional-column-width(1)"/>
@@ -3044,7 +3051,7 @@
3044
3051
  <xsl:template match="*[local-name()='tr']">
3045
3052
  <fo:table-row xsl:use-attribute-sets="table-body-row-style">
3046
3053
 
3047
- <xsl:if test="*[local-name() = 'th']">
3054
+ <xsl:if test="count(*) = count(*[local-name() = 'th'])"> <!-- row contains 'th' only -->
3048
3055
  <xsl:attribute name="keep-with-next">always</xsl:attribute>
3049
3056
  </xsl:if>
3050
3057
 
@@ -4003,7 +4010,8 @@
4003
4010
  <xsl:copy-of select="node()"/>
4004
4011
  </td>
4005
4012
  <td>
4006
- <xsl:copy-of select="following-sibling::*[local-name()='dd'][1]/node()[not(local-name() = 'dl')]"/>
4013
+ <!-- <xsl:copy-of select="following-sibling::*[local-name()='dd'][1]/node()[not(local-name() = 'dl')]"/> -->
4014
+ <xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]/node()[not(local-name() = 'dl')]" mode="dl_if"/>
4007
4015
  <!-- get paragraphs from nested 'dl' -->
4008
4016
  <xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]/*[local-name() = 'dl']" mode="dl_if_nested"/>
4009
4017
  </td>
@@ -4011,6 +4019,53 @@
4011
4019
  </xsl:template>
4012
4020
  <xsl:template match="*[local-name()='dd']" mode="dl_if"/>
4013
4021
 
4022
+ <xsl:template match="*" mode="dl_if">
4023
+ <xsl:copy-of select="."/>
4024
+ </xsl:template>
4025
+
4026
+ <xsl:template match="*[local-name() = 'p']" mode="dl_if">
4027
+ <xsl:param name="indent"/>
4028
+ <p>
4029
+ <xsl:copy-of select="@*"/>
4030
+ <xsl:value-of select="$indent"/>
4031
+ <xsl:copy-of select="node()"/>
4032
+ </p>
4033
+
4034
+ </xsl:template>
4035
+
4036
+ <xsl:template match="*[local-name() = 'ul' or local-name() = 'ol']" mode="dl_if">
4037
+ <xsl:variable name="list_rendered_">
4038
+ <xsl:apply-templates select="."/>
4039
+ </xsl:variable>
4040
+ <xsl:variable name="list_rendered" select="xalan:nodeset($list_rendered_)"/>
4041
+
4042
+ <xsl:variable name="indent">
4043
+ <xsl:for-each select="($list_rendered//fo:block[not(.//fo:block)])[1]">
4044
+ <xsl:apply-templates select="ancestor::*[@provisional-distance-between-starts]/@provisional-distance-between-starts" mode="dl_if"/>
4045
+ </xsl:for-each>
4046
+ </xsl:variable>
4047
+
4048
+ <xsl:apply-templates mode="dl_if">
4049
+ <xsl:with-param name="indent" select="$indent"/>
4050
+ </xsl:apply-templates>
4051
+ </xsl:template>
4052
+
4053
+ <xsl:template match="*[local-name() = 'li']" mode="dl_if">
4054
+ <xsl:param name="indent"/>
4055
+ <xsl:apply-templates mode="dl_if">
4056
+ <xsl:with-param name="indent" select="$indent"/>
4057
+ </xsl:apply-templates>
4058
+ </xsl:template>
4059
+
4060
+ <xsl:template match="@provisional-distance-between-starts" mode="dl_if">
4061
+ <xsl:variable name="value" select="round(substring-before(.,'mm'))"/>
4062
+ <!-- emulate left indent for list item -->
4063
+ <xsl:call-template name="repeat">
4064
+ <xsl:with-param name="char" select="'x'"/>
4065
+ <xsl:with-param name="count" select="$value"/>
4066
+ </xsl:call-template>
4067
+ </xsl:template>
4068
+
4014
4069
  <xsl:template match="*[local-name()='dl']" mode="dl_if_nested">
4015
4070
  <xsl:for-each select="*[local-name() = 'dt']">
4016
4071
  <p>
@@ -4409,6 +4464,7 @@
4409
4464
  </word>
4410
4465
  <xsl:call-template name="tokenize_with_tags">
4411
4466
  <xsl:with-param name="text" select="substring-after($text, $separator)"/>
4467
+ <xsl:with-param name="tags" select="$tags"/>
4412
4468
  </xsl:call-template>
4413
4469
  </xsl:otherwise>
4414
4470
  </xsl:choose>
@@ -4448,8 +4504,18 @@
4448
4504
 
4449
4505
  <xsl:template name="add-zero-spaces-java">
4450
4506
  <xsl:param name="text" select="."/>
4451
- <!-- add zero-width space (#x200B) after characters: dash, dot, colon, equal, underscore, em dash, thin space -->
4452
- <xsl:value-of select="java:replaceAll(java:java.lang.String.new($text),'(-|\.|:|=|_|—| )','$1​')"/>
4507
+ <!-- add zero-width space (#x200B) after characters: dash, dot, colon, equal, underscore, em dash, thin space, arrow right -->
4508
+ <xsl:variable name="text1" select="java:replaceAll(java:java.lang.String.new($text),'(-|\.|:|=|_|—| |→)','$1​')"/>
4509
+ <!-- add zero-width space (#x200B) after characters: 'great than' -->
4510
+ <xsl:variable name="text2" select="java:replaceAll(java:java.lang.String.new($text1), '(\u003e)(?!\u003e)', '$1​')"/><!-- negative lookahead: 'great than' not followed by 'great than' -->
4511
+ <!-- add zero-width space (#x200B) before characters: 'less than' -->
4512
+ <xsl:variable name="text3" select="java:replaceAll(java:java.lang.String.new($text2), '(?&lt;!\u003c)(\u003c)', '​$1')"/> <!-- (?<!\u003c)(\u003c) --> <!-- negative lookbehind: 'less than' not preceeded by 'less than' -->
4513
+ <!-- add zero-width space (#x200B) before character: { -->
4514
+ <xsl:variable name="text4" select="java:replaceAll(java:java.lang.String.new($text3), '(?&lt;!\W)(\{)', '​$1')"/> <!-- negative lookbehind: '{' not preceeded by 'punctuation char' -->
4515
+ <!-- add zero-width space (#x200B) after character: , -->
4516
+ <xsl:variable name="text5" select="java:replaceAll(java:java.lang.String.new($text4), '(\,)(?!\d)', '$1​')"/> <!-- negative lookahead: ',' not followed by digit -->
4517
+
4518
+ <xsl:value-of select="$text5"/>
4453
4519
  </xsl:template>
4454
4520
 
4455
4521
  <xsl:template name="add-zero-spaces-link-java">
@@ -4595,7 +4661,7 @@
4595
4661
  </xsl:copy>
4596
4662
  </xsl:template>
4597
4663
 
4598
- <xsl:template match="*[local-name()='th' or local-name() = 'td'][not(*[local-name()='br']) and not(*[local-name()='p'])]" mode="table-without-br">
4664
+ <xsl:template match="*[local-name()='th' or local-name() = 'td'][not(*[local-name()='br']) and not(*[local-name()='p']) and not(*[local-name()='sourcecode'])]" mode="table-without-br">
4599
4665
  <xsl:copy>
4600
4666
  <xsl:copy-of select="@*"/>
4601
4667
  <p>
@@ -4643,6 +4709,28 @@
4643
4709
  </xsl:for-each>
4644
4710
  </xsl:template>
4645
4711
 
4712
+ <xsl:template match="*[local-name()='th' or local-name()='td']/*[local-name() = 'sourcecode']" mode="table-without-br">
4713
+ <xsl:apply-templates mode="table-without-br"/>
4714
+ </xsl:template>
4715
+
4716
+ <xsl:template match="*[local-name()='th' or local-name()='td']/*[local-name() = 'sourcecode']/text()[contains(., '&#13;') or contains(., '&#10;')]" mode="table-without-br">
4717
+
4718
+ <xsl:variable name="sep">###SOURCECODE_NEWLINE###</xsl:variable>
4719
+ <xsl:variable name="sourcecode_text" select="java:replaceAll(java:java.lang.String.new(.),'(&#13;&#10;|&#13;|&#10;)', $sep)"/>
4720
+ <xsl:variable name="items">
4721
+ <xsl:call-template name="split">
4722
+ <xsl:with-param name="pText" select="$sourcecode_text"/>
4723
+ <xsl:with-param name="sep" select="$sep"/>
4724
+ <xsl:with-param name="normalize-space">false</xsl:with-param>
4725
+ </xsl:call-template>
4726
+ </xsl:variable>
4727
+ <xsl:for-each select="xalan:nodeset($items)/*">
4728
+ <p>
4729
+ <sourcecode><xsl:copy-of select="node()"/></sourcecode>
4730
+ </p>
4731
+ </xsl:for-each>
4732
+ </xsl:template>
4733
+
4646
4734
  <!-- remove redundant white spaces -->
4647
4735
  <xsl:template match="text()[not(ancestor::*[local-name() = 'sourcecode'])]" mode="table-without-br">
4648
4736
  <xsl:variable name="text" select="translate(.,'&#9;&#10;&#13;','')"/>
@@ -4953,6 +5041,7 @@
4953
5041
  <xsl:if test="ancestor::*[local-name() = 'sub']"><tag>sub</tag></xsl:if>
4954
5042
  <xsl:if test="ancestor::*[local-name() = 'sup']"><tag>sup</tag></xsl:if>
4955
5043
  <xsl:if test="ancestor::*[local-name() = 'tt']"><tag>tt</tag></xsl:if>
5044
+ <xsl:if test="ancestor::*[local-name() = 'sourcecode']"><tag>sourcecode</tag></xsl:if>
4956
5045
  <xsl:if test="ancestor::*[local-name() = 'keep-together_within-line']"><tag>keep-together_within-line</tag></xsl:if>
4957
5046
  </tags>
4958
5047
  </xsl:template>
@@ -5436,6 +5525,12 @@
5436
5525
 
5437
5526
  <fo:block-container margin-left="0mm">
5438
5527
 
5528
+ <!-- <xsl:if test="$namespace = 'iho'">
5529
+ <xsl:if test="ancestor::iho:td">
5530
+ <xsl:attribute name="font-size">12pt</xsl:attribute>
5531
+ </xsl:if>
5532
+ </xsl:if> -->
5533
+
5439
5534
  <fo:block>
5440
5535
 
5441
5536
  <fo:inline xsl:use-attribute-sets="note-name-style">
@@ -6581,37 +6676,15 @@
6581
6676
  <!-- =============== -->
6582
6677
  <xsl:template match="*[local-name()='sourcecode']" name="sourcecode">
6583
6678
 
6584
- <fo:block-container xsl:use-attribute-sets="sourcecode-container-style">
6585
-
6586
- <xsl:if test="not(ancestor::*[local-name() = 'li']) or ancestor::*[local-name() = 'example']">
6587
- <xsl:attribute name="margin-left">0mm</xsl:attribute>
6588
- </xsl:if>
6589
-
6590
- <xsl:if test="ancestor::*[local-name() = 'example']">
6591
- <xsl:attribute name="margin-right">0mm</xsl:attribute>
6592
- </xsl:if>
6593
-
6594
- <xsl:copy-of select="@id"/>
6595
-
6596
- <xsl:if test="parent::*[local-name() = 'note']">
6597
- <xsl:attribute name="margin-left">
6598
- <xsl:choose>
6599
- <xsl:when test="not(ancestor::*[local-name() = 'table'])"><xsl:value-of select="$note-body-indent"/></xsl:when>
6600
- <xsl:otherwise><xsl:value-of select="$note-body-indent-table"/></xsl:otherwise>
6601
- </xsl:choose>
6602
- </xsl:attribute>
6603
-
6604
- </xsl:if>
6605
- <fo:block-container margin-left="0mm">
6679
+ <xsl:variable name="sourcecode_attributes">
6680
+ <xsl:element name="sourcecode_attributes" use-attribute-sets="sourcecode-style">
6681
+ <xsl:variable name="_font-size">
6606
6682
 
6607
- <fo:block xsl:use-attribute-sets="sourcecode-style">
6608
- <xsl:variable name="_font-size">
6683
+ <!-- 9 -->
6609
6684
 
6610
- <!-- 9 -->
6611
-
6612
- <!-- <xsl:if test="$namespace = 'ieee'">
6613
- <xsl:if test="$current_template = 'standard'">8</xsl:if>
6614
- </xsl:if> -->
6685
+ <!-- <xsl:if test="$namespace = 'ieee'">
6686
+ <xsl:if test="$current_template = 'standard'">8</xsl:if>
6687
+ </xsl:if> -->
6615
6688
 
6616
6689
  </xsl:variable>
6617
6690
 
@@ -6626,14 +6699,60 @@
6626
6699
  </xsl:choose>
6627
6700
  </xsl:attribute>
6628
6701
  </xsl:if>
6702
+ </xsl:element>
6703
+ </xsl:variable>
6629
6704
 
6705
+ <xsl:choose>
6706
+ <xsl:when test="$isGenerateTableIF = 'true' and (ancestor::*[local-name() = 'td'] or ancestor::*[local-name() = 'th'])">
6707
+ <xsl:for-each select="xalan:nodeset($sourcecode_attributes)/sourcecode_attributes/@*">
6708
+ <xsl:attribute name="{local-name()}">
6709
+ <xsl:value-of select="."/>
6710
+ </xsl:attribute>
6711
+ </xsl:for-each>
6630
6712
  <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
6631
- </fo:block>
6713
+ </xsl:when>
6632
6714
 
6633
- <xsl:apply-templates select="*[local-name()='name']"/> <!-- show sourcecode's name AFTER content -->
6715
+ <xsl:otherwise>
6716
+ <fo:block-container xsl:use-attribute-sets="sourcecode-container-style">
6634
6717
 
6635
- </fo:block-container>
6636
- </fo:block-container>
6718
+ <xsl:if test="not(ancestor::*[local-name() = 'li']) or ancestor::*[local-name() = 'example']">
6719
+ <xsl:attribute name="margin-left">0mm</xsl:attribute>
6720
+ </xsl:if>
6721
+
6722
+ <xsl:if test="ancestor::*[local-name() = 'example']">
6723
+ <xsl:attribute name="margin-right">0mm</xsl:attribute>
6724
+ </xsl:if>
6725
+
6726
+ <xsl:copy-of select="@id"/>
6727
+
6728
+ <xsl:if test="parent::*[local-name() = 'note']">
6729
+ <xsl:attribute name="margin-left">
6730
+ <xsl:choose>
6731
+ <xsl:when test="not(ancestor::*[local-name() = 'table'])"><xsl:value-of select="$note-body-indent"/></xsl:when>
6732
+ <xsl:otherwise><xsl:value-of select="$note-body-indent-table"/></xsl:otherwise>
6733
+ </xsl:choose>
6734
+ </xsl:attribute>
6735
+
6736
+ </xsl:if>
6737
+ <fo:block-container margin-left="0mm">
6738
+
6739
+ <fo:block xsl:use-attribute-sets="sourcecode-style">
6740
+
6741
+ <xsl:for-each select="xalan:nodeset($sourcecode_attributes)/sourcecode_attributes/@*">
6742
+ <xsl:attribute name="{local-name()}">
6743
+ <xsl:value-of select="."/>
6744
+ </xsl:attribute>
6745
+ </xsl:for-each>
6746
+
6747
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
6748
+ </fo:block>
6749
+
6750
+ <xsl:apply-templates select="*[local-name()='name']"/> <!-- show sourcecode's name AFTER content -->
6751
+
6752
+ </fo:block-container>
6753
+ </fo:block-container>
6754
+ </xsl:otherwise>
6755
+ </xsl:choose>
6637
6756
  </xsl:template>
6638
6757
 
6639
6758
  <xsl:template match="*[local-name()='sourcecode']/text()" priority="2">
@@ -8861,7 +8980,9 @@
8861
8980
  <!-- ===================================== -->
8862
8981
  <!-- Update xml -->
8863
8982
  <!-- ===================================== -->
8983
+ <!-- =========================================================================== -->
8864
8984
  <!-- STEP1: Re-order elements in 'preface', 'sections' based on @displayorder -->
8985
+ <!-- =========================================================================== -->
8865
8986
  <xsl:template match="@*|node()" mode="update_xml_step1">
8866
8987
  <xsl:copy>
8867
8988
  <xsl:apply-templates select="@*|node()" mode="update_xml_step1"/>
@@ -8953,10 +9074,15 @@
8953
9074
  <xsl:template match="*[local-name() = 'span']" mode="update_xml_step1">
8954
9075
  <xsl:apply-templates mode="update_xml_step1"/>
8955
9076
  </xsl:template>
8956
-
9077
+ <!-- =========================================================================== -->
8957
9078
  <!-- END STEP1: Re-order elements in 'preface', 'sections' based on @displayorder -->
9079
+ <!-- =========================================================================== -->
8958
9080
 
9081
+ <!-- =========================================================================== -->
8959
9082
  <!-- XML UPDATE STEP: enclose standard's name into tag 'keep-together_within-line' -->
9083
+ <!-- keep-together_within-line for: a/b, aaa/b, a/bbb, /b -->
9084
+ <!-- keep-together_within-line for: a.b, aaa.b, a.bbb, .b in table's cell ONLY -->
9085
+ <!-- =========================================================================== -->
8960
9086
  <!-- Example: <keep-together_within-line>ISO 10303-51</keep-together_within-line> -->
8961
9087
  <xsl:template match="@*|node()" mode="update_xml_enclose_keep-together_within-line">
8962
9088
  <xsl:copy>
@@ -8972,10 +9098,15 @@
8972
9098
  <xsl:template match="text()[not(ancestor::*[local-name() = 'bibdata'] or ancestor::*[local-name() = 'link'][not(contains(.,' '))] or ancestor::*[local-name() = 'sourcecode'] or ancestor::*[local-name() = 'math'] or starts-with(., 'http://') or starts-with(., 'https://') or starts-with(., 'www.') )]" name="keep_together_standard_number" mode="update_xml_enclose_keep-together_within-line">
8973
9099
 
8974
9100
  <!-- enclose standard's number into tag 'keep-together_within-line' -->
8975
- <xsl:variable name="regex_standard_reference">([A-Z]{2,}(/[A-Z]{2,})* \d+(-\d+)*(:\d{4})?)</xsl:variable>
8976
9101
  <xsl:variable name="tag_keep-together_within-line_open">###<xsl:value-of select="$element_name_keep-together_within-line"/>###</xsl:variable>
8977
9102
  <xsl:variable name="tag_keep-together_within-line_close">###/<xsl:value-of select="$element_name_keep-together_within-line"/>###</xsl:variable>
8978
- <xsl:variable name="text_" select="java:replaceAll(java:java.lang.String.new(.),$regex_standard_reference,concat($tag_keep-together_within-line_open,'$1',$tag_keep-together_within-line_close))"/>
9103
+ <xsl:variable name="text__" select="java:replaceAll(java:java.lang.String.new(.), $regex_standard_reference, concat($tag_keep-together_within-line_open,'$1',$tag_keep-together_within-line_close))"/>
9104
+ <xsl:variable name="text_">
9105
+ <xsl:choose>
9106
+ <xsl:when test="ancestor::*[local-name() = 'table']"><xsl:value-of select="."/></xsl:when> <!-- no need enclose standard's number into tag 'keep-together_within-line' in table cells -->
9107
+ <xsl:otherwise><xsl:value-of select="$text__"/></xsl:otherwise>
9108
+ </xsl:choose>
9109
+ </xsl:variable>
8979
9110
  <xsl:variable name="text"><text><xsl:call-template name="replace_text_tags">
8980
9111
  <xsl:with-param name="tag_open" select="$tag_keep-together_within-line_open"/>
8981
9112
  <xsl:with-param name="tag_close" select="$tag_keep-together_within-line_close"/>
@@ -8991,7 +9122,11 @@
8991
9122
  </xsl:variable>
8992
9123
 
8993
9124
  <!-- keep-together_within-line for: a/b, aaa/b, a/bbb, /b -->
8994
- <xsl:variable name="regex_solidus_units">((\b((\S{1,3}\/\S+)|(\S+\/\S{1,3}))\b)|(\/\S{1,3})\b)</xsl:variable>
9125
+ <!-- \S matches any non-whitespace character (equivalent to [^\r\n\t\f\v ]) -->
9126
+ <!-- <xsl:variable name="regex_solidus_units">((\b((\S{1,3}\/\S+)|(\S+\/\S{1,3}))\b)|(\/\S{1,3})\b)</xsl:variable> -->
9127
+ <!-- add &lt; and &gt; to \S -->
9128
+ <xsl:variable name="regex_S">[^\r\n\t\f\v \&lt;&gt;]</xsl:variable>
9129
+ <xsl:variable name="regex_solidus_units">((\b((<xsl:value-of select="$regex_S"/>{1,3}\/<xsl:value-of select="$regex_S"/>+)|(<xsl:value-of select="$regex_S"/>+\/<xsl:value-of select="$regex_S"/>{1,3}))\b)|(\/<xsl:value-of select="$regex_S"/>{1,3})\b)</xsl:variable>
8995
9130
  <xsl:variable name="text3">
8996
9131
  <text><xsl:for-each select="xalan:nodeset($text2)/text/node()">
8997
9132
  <xsl:choose>
@@ -9055,9 +9190,8 @@
9055
9190
  <xsl:otherwise><xsl:value-of select="$text"/></xsl:otherwise>
9056
9191
  </xsl:choose>
9057
9192
  </xsl:template>
9058
-
9059
9193
  <!-- ===================================== -->
9060
- <!-- End Update xml -->
9194
+ <!-- END XML UPDATE STEP: enclose standard's name into tag 'keep-together_within-line' -->
9061
9195
  <!-- ===================================== -->
9062
9196
 
9063
9197
  <!-- for correct rendering combining chars -->
@@ -1152,7 +1152,7 @@
1152
1152
  <data type="boolean"/>
1153
1153
  </attribute>
1154
1154
  </optional>
1155
- <ref name="BibliographicItem"/>
1155
+ <ref name="ReducedBibliographicItem"/>
1156
1156
  </element>
1157
1157
  </define>
1158
1158
  <define name="image" combine="choice">
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module M3AAWG
3
- VERSION = "2.1.12".freeze
3
+ VERSION = "2.1.13".freeze
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-m3aawg
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.1.12
4
+ version: 2.1.13
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2022-11-07 00:00:00.000000000 Z
11
+ date: 2022-11-21 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: htmlentities