metanorma-ogc 1.3.6 → 1.3.7

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: ad3456994609c7561163566d0be10cf0770f4f3423871dbefcf24657d5e551a7
4
- data.tar.gz: 79a4f0da33d0194fb0684483977dcf75355f0660749d8bc649e710f72e31ae95
3
+ metadata.gz: 390c8c2832913f515a1abb08358f4b5bb91ff39e507cffee4ee0539f481f69cd
4
+ data.tar.gz: dfb5bc1463751a80084b5ea31de579f3021b2b12ff638e56356cfdab49f8544c
5
5
  SHA512:
6
- metadata.gz: 35342c6a703f8a6a3bb910cdceea76ae6500d0423c248b51efd55b5a850f25be5e645c89c8fe09a1f662a817a693dea123074c434afd7bfaadb05dc7d2ad6eb2
7
- data.tar.gz: a7c312698494e453a5f12ac8450d2ebe182a8b708dbaef2352a5eeec9054a3151695cd3a2efce1f7f4d0d3e05a6050278932567d9e7da7c63c28b1ba438efc55
6
+ metadata.gz: c7adb184dd688ab8cb4b7ff196c899468928d4c805791313ac74da37e36a781f02df71af3a22fdea2c484c39fc9dc89aa01040737e07df618e0fce677b298c88
7
+ data.tar.gz: 61c90e5a53d7e09c04593c0a435d4860f55a5823d896b98d9c216c4a38147cd113330e90c83c242b45bca4b8abdb811a884325d484227c7e3ca2bcae6f4a170a
@@ -204,6 +204,18 @@
204
204
  </zeroOrMore>
205
205
  </element>
206
206
  </define>
207
+ <define name="dt">
208
+ <element name="dt">
209
+ <optional>
210
+ <attribute name="id">
211
+ <data type="ID"/>
212
+ </attribute>
213
+ </optional>
214
+ <zeroOrMore>
215
+ <ref name="TextElement"/>
216
+ </zeroOrMore>
217
+ </element>
218
+ </define>
207
219
  <define name="example">
208
220
  <element name="example">
209
221
  <attribute name="id">
@@ -899,7 +911,7 @@
899
911
  </include>
900
912
  <!-- end overrides -->
901
913
  <define name="docsubtype">
902
- <element name="docsubtype">
914
+ <element name="subdoctype">
903
915
  <ref name="DocumentSubtype"/>
904
916
  </element>
905
917
  </define>
@@ -954,6 +966,16 @@
954
966
  </define>
955
967
  <define name="concept">
956
968
  <element name="concept">
969
+ <optional>
970
+ <attribute name="ital">
971
+ <data type="boolean"/>
972
+ </attribute>
973
+ </optional>
974
+ <optional>
975
+ <attribute name="ref">
976
+ <data type="boolean"/>
977
+ </attribute>
978
+ </optional>
957
979
  <optional>
958
980
  <element name="refterm">
959
981
  <zeroOrMore>
@@ -998,6 +1020,9 @@
998
1020
  </attribute>
999
1021
  <attribute name="name"/>
1000
1022
  <attribute name="action"/>
1023
+ <optional>
1024
+ <attribute name="class"/>
1025
+ </optional>
1001
1026
  <zeroOrMore>
1002
1027
  <choice>
1003
1028
  <ref name="TextElement"/>
@@ -1490,26 +1515,26 @@
1490
1515
  <optional>
1491
1516
  <ref name="section-title"/>
1492
1517
  </optional>
1493
- <group>
1518
+ <choice>
1494
1519
  <choice>
1495
1520
  <group>
1496
- <zeroOrMore>
1521
+ <oneOrMore>
1497
1522
  <ref name="BasicBlock"/>
1498
- </zeroOrMore>
1523
+ </oneOrMore>
1499
1524
  <zeroOrMore>
1500
1525
  <ref name="note"/>
1501
1526
  </zeroOrMore>
1502
1527
  </group>
1503
1528
  <ref name="amend"/>
1504
1529
  </choice>
1505
- <zeroOrMore>
1530
+ <oneOrMore>
1506
1531
  <choice>
1507
1532
  <ref name="clause-subsection"/>
1508
1533
  <ref name="terms"/>
1509
1534
  <ref name="definitions"/>
1510
1535
  </choice>
1511
- </zeroOrMore>
1512
- </group>
1536
+ </oneOrMore>
1537
+ </choice>
1513
1538
  </define>
1514
1539
  <define name="Annex-Section">
1515
1540
  <optional>
@@ -2677,6 +2677,7 @@
2677
2677
 
2678
2678
 
2679
2679
 
2680
+
2680
2681
  <!-- fn will be processed inside 'note' processing -->
2681
2682
 
2682
2683
 
@@ -2687,6 +2688,10 @@
2687
2688
 
2688
2689
 
2689
2690
 
2691
+
2692
+ <!-- for BSI (not PAS) display Notes before footnotes -->
2693
+
2694
+
2690
2695
  <!-- except gb -->
2691
2696
 
2692
2697
  <xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
@@ -2712,6 +2717,10 @@
2712
2717
  <!-- fn processing -->
2713
2718
  <xsl:call-template name="fn_display"/>
2714
2719
 
2720
+
2721
+ <!-- for PAS display Notes after footnotes -->
2722
+
2723
+
2715
2724
  </fo:table-cell>
2716
2725
  </fo:table-row>
2717
2726
  </fo:table-body>
@@ -2769,6 +2778,7 @@
2769
2778
  <xsl:if test="$parent-name = 'tfoot'">
2770
2779
 
2771
2780
 
2781
+
2772
2782
  </xsl:if>
2773
2783
 
2774
2784
 
@@ -2913,8 +2923,13 @@
2913
2923
 
2914
2924
 
2915
2925
 
2926
+
2927
+ <!-- Table's note name (NOTE, for example) -->
2928
+
2916
2929
  <fo:inline padding-right="2mm">
2917
2930
 
2931
+
2932
+
2918
2933
 
2919
2934
 
2920
2935
 
@@ -2922,6 +2937,8 @@
2922
2937
 
2923
2938
  </fo:inline>
2924
2939
 
2940
+
2941
+
2925
2942
  <xsl:apply-templates mode="process"/>
2926
2943
  </fo:block>
2927
2944
 
@@ -2947,6 +2964,8 @@
2947
2964
  <xsl:variable name="reference" select="@reference"/>
2948
2965
  <xsl:if test="not(preceding-sibling::*[@reference = $reference])"> <!-- only unique reference puts in note-->
2949
2966
  <fo:block margin-bottom="12pt">
2967
+
2968
+
2950
2969
 
2951
2970
 
2952
2971
 
@@ -2966,6 +2985,7 @@
2966
2985
  <xsl:value-of select="@reference"/>
2967
2986
 
2968
2987
 
2988
+
2969
2989
  </fo:inline>
2970
2990
  <fo:inline>
2971
2991
 
@@ -3122,6 +3142,7 @@
3122
3142
 
3123
3143
  <xsl:value-of select="@reference"/>
3124
3144
 
3145
+
3125
3146
  </fo:basic-link>
3126
3147
  </fo:inline>
3127
3148
  </xsl:template><xsl:template match="*[local-name()='fn']/*[local-name()='p']">
@@ -4134,6 +4155,7 @@
4134
4155
 
4135
4156
 
4136
4157
 
4158
+
4137
4159
  <fo:block-container margin-left="0mm">
4138
4160
 
4139
4161
 
@@ -5390,9 +5412,10 @@
5390
5412
 
5391
5413
 
5392
5414
  </xsl:if>
5393
-
5415
+
5416
+
5417
+
5394
5418
  <fo:basic-link internal-destination="{@bibitemid}" fox:alt-text="{@citeas}">
5395
-
5396
5419
  <xsl:if test="normalize-space(@citeas) = ''">
5397
5420
  <xsl:attribute name="fox:alt-text"><xsl:value-of select="."/></xsl:attribute>
5398
5421
  </xsl:if>
@@ -5401,6 +5424,7 @@
5401
5424
 
5402
5425
 
5403
5426
 
5427
+
5404
5428
  </xsl:if>
5405
5429
 
5406
5430
  <xsl:apply-templates/>
@@ -6461,4 +6485,100 @@
6461
6485
  <xsl:otherwise><xsl:value-of select="$default"/></xsl:otherwise>
6462
6486
  </xsl:choose>
6463
6487
  </xsl:attribute>
6488
+ </xsl:template><xsl:template name="number-to-words">
6489
+ <xsl:param name="number"/>
6490
+ <xsl:param name="first"/>
6491
+ <xsl:if test="$number != ''">
6492
+ <xsl:variable name="words">
6493
+ <words>
6494
+ <word cardinal="1">One-</word>
6495
+ <word ordinal="1">First </word>
6496
+ <word cardinal="2">Two-</word>
6497
+ <word ordinal="2">Second </word>
6498
+ <word cardinal="3">Three-</word>
6499
+ <word ordinal="3">Third </word>
6500
+ <word cardinal="4">Four-</word>
6501
+ <word ordinal="4">Fourth </word>
6502
+ <word cardinal="5">Five-</word>
6503
+ <word ordinal="5">Fifth </word>
6504
+ <word cardinal="6">Six-</word>
6505
+ <word ordinal="6">Sixth </word>
6506
+ <word cardinal="7">Seven-</word>
6507
+ <word ordinal="7">Seventh </word>
6508
+ <word cardinal="8">Eight-</word>
6509
+ <word ordinal="8">Eighth </word>
6510
+ <word cardinal="9">Nine-</word>
6511
+ <word ordinal="9">Ninth </word>
6512
+ <word ordinal="10">Tenth </word>
6513
+ <word ordinal="11">Eleventh </word>
6514
+ <word ordinal="12">Twelfth </word>
6515
+ <word ordinal="13">Thirteenth </word>
6516
+ <word ordinal="14">Fourteenth </word>
6517
+ <word ordinal="15">Fifteenth </word>
6518
+ <word ordinal="16">Sixteenth </word>
6519
+ <word ordinal="17">Seventeenth </word>
6520
+ <word ordinal="18">Eighteenth </word>
6521
+ <word ordinal="19">Nineteenth </word>
6522
+ <word cardinal="20">Twenty-</word>
6523
+ <word ordinal="20">Twentieth </word>
6524
+ <word cardinal="30">Thirty-</word>
6525
+ <word ordinal="30">Thirtieth </word>
6526
+ <word cardinal="40">Forty-</word>
6527
+ <word ordinal="40">Fortieth </word>
6528
+ <word cardinal="50">Fifty-</word>
6529
+ <word ordinal="50">Fiftieth </word>
6530
+ <word cardinal="60">Sixty-</word>
6531
+ <word ordinal="60">Sixtieth </word>
6532
+ <word cardinal="70">Seventy-</word>
6533
+ <word ordinal="70">Seventieth </word>
6534
+ <word cardinal="80">Eighty-</word>
6535
+ <word ordinal="80">Eightieth </word>
6536
+ <word cardinal="90">Ninety-</word>
6537
+ <word ordinal="90">Ninetieth </word>
6538
+ <word cardinal="100">Hundred-</word>
6539
+ <word ordinal="100">Hundredth </word>
6540
+ </words>
6541
+ </xsl:variable>
6542
+
6543
+ <xsl:variable name="ordinal" select="xalan:nodeset($words)//word[@ordinal = $number]/text()"/>
6544
+
6545
+ <xsl:variable name="value">
6546
+ <xsl:choose>
6547
+ <xsl:when test="$ordinal != ''">
6548
+ <xsl:value-of select="$ordinal"/>
6549
+ </xsl:when>
6550
+ <xsl:otherwise>
6551
+ <xsl:choose>
6552
+ <xsl:when test="$number &lt; 100">
6553
+ <xsl:variable name="decade" select="concat(substring($number,1,1), '0')"/>
6554
+ <xsl:variable name="digit" select="substring($number,2)"/>
6555
+ <xsl:value-of select="xalan:nodeset($words)//word[@cardinal = $decade]/text()"/>
6556
+ <xsl:value-of select="xalan:nodeset($words)//word[@ordinal = $digit]/text()"/>
6557
+ </xsl:when>
6558
+ <xsl:otherwise>
6559
+ <!-- more 100 -->
6560
+ <xsl:variable name="hundred" select="substring($number,1,1)"/>
6561
+ <xsl:variable name="digits" select="number(substring($number,2))"/>
6562
+ <xsl:value-of select="xalan:nodeset($words)//word[@cardinal = $hundred]/text()"/>
6563
+ <xsl:value-of select="xalan:nodeset($words)//word[@cardinal = '100']/text()"/>
6564
+ <xsl:call-template name="number-to-words">
6565
+ <xsl:with-param name="number" select="$digits"/>
6566
+ </xsl:call-template>
6567
+ </xsl:otherwise>
6568
+ </xsl:choose>
6569
+ </xsl:otherwise>
6570
+ </xsl:choose>
6571
+ </xsl:variable>
6572
+ <xsl:choose>
6573
+ <xsl:when test="$first = 'true'">
6574
+ <xsl:variable name="value_lc" select="java:toLowerCase(java:java.lang.String.new($value))"/>
6575
+ <xsl:call-template name="capitalize">
6576
+ <xsl:with-param name="str" select="$value_lc"/>
6577
+ </xsl:call-template>
6578
+ </xsl:when>
6579
+ <xsl:otherwise>
6580
+ <xsl:value-of select="$value"/>
6581
+ </xsl:otherwise>
6582
+ </xsl:choose>
6583
+ </xsl:if>
6464
6584
  </xsl:template></xsl:stylesheet>
@@ -2677,6 +2677,7 @@
2677
2677
 
2678
2678
 
2679
2679
 
2680
+
2680
2681
  <!-- fn will be processed inside 'note' processing -->
2681
2682
 
2682
2683
 
@@ -2687,6 +2688,10 @@
2687
2688
 
2688
2689
 
2689
2690
 
2691
+
2692
+ <!-- for BSI (not PAS) display Notes before footnotes -->
2693
+
2694
+
2690
2695
  <!-- except gb -->
2691
2696
 
2692
2697
  <xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
@@ -2712,6 +2717,10 @@
2712
2717
  <!-- fn processing -->
2713
2718
  <xsl:call-template name="fn_display"/>
2714
2719
 
2720
+
2721
+ <!-- for PAS display Notes after footnotes -->
2722
+
2723
+
2715
2724
  </fo:table-cell>
2716
2725
  </fo:table-row>
2717
2726
  </fo:table-body>
@@ -2769,6 +2778,7 @@
2769
2778
  <xsl:if test="$parent-name = 'tfoot'">
2770
2779
 
2771
2780
 
2781
+
2772
2782
  </xsl:if>
2773
2783
 
2774
2784
 
@@ -2913,8 +2923,13 @@
2913
2923
 
2914
2924
 
2915
2925
 
2926
+
2927
+ <!-- Table's note name (NOTE, for example) -->
2928
+
2916
2929
  <fo:inline padding-right="2mm">
2917
2930
 
2931
+
2932
+
2918
2933
 
2919
2934
 
2920
2935
 
@@ -2922,6 +2937,8 @@
2922
2937
 
2923
2938
  </fo:inline>
2924
2939
 
2940
+
2941
+
2925
2942
  <xsl:apply-templates mode="process"/>
2926
2943
  </fo:block>
2927
2944
 
@@ -2947,6 +2964,8 @@
2947
2964
  <xsl:variable name="reference" select="@reference"/>
2948
2965
  <xsl:if test="not(preceding-sibling::*[@reference = $reference])"> <!-- only unique reference puts in note-->
2949
2966
  <fo:block margin-bottom="12pt">
2967
+
2968
+
2950
2969
 
2951
2970
 
2952
2971
 
@@ -2966,6 +2985,7 @@
2966
2985
  <xsl:value-of select="@reference"/>
2967
2986
 
2968
2987
 
2988
+
2969
2989
  </fo:inline>
2970
2990
  <fo:inline>
2971
2991
 
@@ -3122,6 +3142,7 @@
3122
3142
 
3123
3143
  <xsl:value-of select="@reference"/>
3124
3144
 
3145
+
3125
3146
  </fo:basic-link>
3126
3147
  </fo:inline>
3127
3148
  </xsl:template><xsl:template match="*[local-name()='fn']/*[local-name()='p']">
@@ -4134,6 +4155,7 @@
4134
4155
 
4135
4156
 
4136
4157
 
4158
+
4137
4159
  <fo:block-container margin-left="0mm">
4138
4160
 
4139
4161
 
@@ -5390,9 +5412,10 @@
5390
5412
 
5391
5413
 
5392
5414
  </xsl:if>
5393
-
5415
+
5416
+
5417
+
5394
5418
  <fo:basic-link internal-destination="{@bibitemid}" fox:alt-text="{@citeas}">
5395
-
5396
5419
  <xsl:if test="normalize-space(@citeas) = ''">
5397
5420
  <xsl:attribute name="fox:alt-text"><xsl:value-of select="."/></xsl:attribute>
5398
5421
  </xsl:if>
@@ -5401,6 +5424,7 @@
5401
5424
 
5402
5425
 
5403
5426
 
5427
+
5404
5428
  </xsl:if>
5405
5429
 
5406
5430
  <xsl:apply-templates/>
@@ -6461,4 +6485,100 @@
6461
6485
  <xsl:otherwise><xsl:value-of select="$default"/></xsl:otherwise>
6462
6486
  </xsl:choose>
6463
6487
  </xsl:attribute>
6488
+ </xsl:template><xsl:template name="number-to-words">
6489
+ <xsl:param name="number"/>
6490
+ <xsl:param name="first"/>
6491
+ <xsl:if test="$number != ''">
6492
+ <xsl:variable name="words">
6493
+ <words>
6494
+ <word cardinal="1">One-</word>
6495
+ <word ordinal="1">First </word>
6496
+ <word cardinal="2">Two-</word>
6497
+ <word ordinal="2">Second </word>
6498
+ <word cardinal="3">Three-</word>
6499
+ <word ordinal="3">Third </word>
6500
+ <word cardinal="4">Four-</word>
6501
+ <word ordinal="4">Fourth </word>
6502
+ <word cardinal="5">Five-</word>
6503
+ <word ordinal="5">Fifth </word>
6504
+ <word cardinal="6">Six-</word>
6505
+ <word ordinal="6">Sixth </word>
6506
+ <word cardinal="7">Seven-</word>
6507
+ <word ordinal="7">Seventh </word>
6508
+ <word cardinal="8">Eight-</word>
6509
+ <word ordinal="8">Eighth </word>
6510
+ <word cardinal="9">Nine-</word>
6511
+ <word ordinal="9">Ninth </word>
6512
+ <word ordinal="10">Tenth </word>
6513
+ <word ordinal="11">Eleventh </word>
6514
+ <word ordinal="12">Twelfth </word>
6515
+ <word ordinal="13">Thirteenth </word>
6516
+ <word ordinal="14">Fourteenth </word>
6517
+ <word ordinal="15">Fifteenth </word>
6518
+ <word ordinal="16">Sixteenth </word>
6519
+ <word ordinal="17">Seventeenth </word>
6520
+ <word ordinal="18">Eighteenth </word>
6521
+ <word ordinal="19">Nineteenth </word>
6522
+ <word cardinal="20">Twenty-</word>
6523
+ <word ordinal="20">Twentieth </word>
6524
+ <word cardinal="30">Thirty-</word>
6525
+ <word ordinal="30">Thirtieth </word>
6526
+ <word cardinal="40">Forty-</word>
6527
+ <word ordinal="40">Fortieth </word>
6528
+ <word cardinal="50">Fifty-</word>
6529
+ <word ordinal="50">Fiftieth </word>
6530
+ <word cardinal="60">Sixty-</word>
6531
+ <word ordinal="60">Sixtieth </word>
6532
+ <word cardinal="70">Seventy-</word>
6533
+ <word ordinal="70">Seventieth </word>
6534
+ <word cardinal="80">Eighty-</word>
6535
+ <word ordinal="80">Eightieth </word>
6536
+ <word cardinal="90">Ninety-</word>
6537
+ <word ordinal="90">Ninetieth </word>
6538
+ <word cardinal="100">Hundred-</word>
6539
+ <word ordinal="100">Hundredth </word>
6540
+ </words>
6541
+ </xsl:variable>
6542
+
6543
+ <xsl:variable name="ordinal" select="xalan:nodeset($words)//word[@ordinal = $number]/text()"/>
6544
+
6545
+ <xsl:variable name="value">
6546
+ <xsl:choose>
6547
+ <xsl:when test="$ordinal != ''">
6548
+ <xsl:value-of select="$ordinal"/>
6549
+ </xsl:when>
6550
+ <xsl:otherwise>
6551
+ <xsl:choose>
6552
+ <xsl:when test="$number &lt; 100">
6553
+ <xsl:variable name="decade" select="concat(substring($number,1,1), '0')"/>
6554
+ <xsl:variable name="digit" select="substring($number,2)"/>
6555
+ <xsl:value-of select="xalan:nodeset($words)//word[@cardinal = $decade]/text()"/>
6556
+ <xsl:value-of select="xalan:nodeset($words)//word[@ordinal = $digit]/text()"/>
6557
+ </xsl:when>
6558
+ <xsl:otherwise>
6559
+ <!-- more 100 -->
6560
+ <xsl:variable name="hundred" select="substring($number,1,1)"/>
6561
+ <xsl:variable name="digits" select="number(substring($number,2))"/>
6562
+ <xsl:value-of select="xalan:nodeset($words)//word[@cardinal = $hundred]/text()"/>
6563
+ <xsl:value-of select="xalan:nodeset($words)//word[@cardinal = '100']/text()"/>
6564
+ <xsl:call-template name="number-to-words">
6565
+ <xsl:with-param name="number" select="$digits"/>
6566
+ </xsl:call-template>
6567
+ </xsl:otherwise>
6568
+ </xsl:choose>
6569
+ </xsl:otherwise>
6570
+ </xsl:choose>
6571
+ </xsl:variable>
6572
+ <xsl:choose>
6573
+ <xsl:when test="$first = 'true'">
6574
+ <xsl:variable name="value_lc" select="java:toLowerCase(java:java.lang.String.new($value))"/>
6575
+ <xsl:call-template name="capitalize">
6576
+ <xsl:with-param name="str" select="$value_lc"/>
6577
+ </xsl:call-template>
6578
+ </xsl:when>
6579
+ <xsl:otherwise>
6580
+ <xsl:value-of select="$value"/>
6581
+ </xsl:otherwise>
6582
+ </xsl:choose>
6583
+ </xsl:if>
6464
6584
  </xsl:template></xsl:stylesheet>