metanorma-un 0.9.3 → 0.9.4

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 (7) hide show
  1. checksums.yaml +4 -4
  2. data/lib/isodoc/un/un.plenary-attachment.xsl +113 -71
  3. data/lib/isodoc/un/un.plenary.xsl +113 -71
  4. data/lib/isodoc/un/un.recommendation.xsl +113 -71
  5. data/lib/metanorma/un/isodoc.rng +16 -0
  6. data/lib/metanorma/un/version.rb +1 -1
  7. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 7a19302629920120d5bd3ef41ad5caf321914a49faf45ddff3646b8f5e2224e2
4
- data.tar.gz: 7ffc87968fbd90b21ea9fdf3007f17db5695a48575284302bd79696b35ac0fce
3
+ metadata.gz: df3815b88029cc96a399f52d78b99f3beee7b1c520bd26c5701e5ad87886541b
4
+ data.tar.gz: 7fc79df9dcec92fed9716a91670d69ca9b0a90b4a324148ef58d789ffb762c88
5
5
  SHA512:
6
- metadata.gz: 65dbc51a9c7d6d3c3c5f08d4cbeed51c56ca86fd95a65f08ecf6a7a33baf6f2869ed7410c8820248d3aac77eeac40f84c26dec6a4e6823dde1e5af096611b470
7
- data.tar.gz: 84051bf8dce10c80c15a6fbf2bf7eeaf156264b8692a72316ec1a7684d6b48aabc73f35a3427bf0d3f7b7f6d32e1c7310d29aa8f60e7d91aca5f968d53edf873
6
+ metadata.gz: d5b31dad2389adc30a7e7b5f3c07afd1d86d606cbe066e28e0f37dd4ab89720b7379c683e524b09a72d8ba7a3f25ea049a7b364a93d4ee6978fec2e62af8b69f
7
+ data.tar.gz: 663176c19ae386e3a973e23c734c7152e5f4528d9226224664dd07aca227739054513d74a079556402ffb838d5958d8190786b88f4a2c4a53e5a90e6209df866
data/lib/isodoc/un/un.plenary-attachment.xsl CHANGED
@@ -1080,7 +1080,10 @@
1080
1080
 
1081
1081
  </xsl:attribute-set><xsl:attribute-set name="requirement-style">
1082
1082
 
1083
+
1083
1084
  </xsl:attribute-set><xsl:attribute-set name="requirement-name-style">
1085
+ <xsl:attribute name="keep-with-next">always</xsl:attribute>
1086
+
1084
1087
 
1085
1088
  </xsl:attribute-set><xsl:attribute-set name="requirement-label-style">
1086
1089
 
@@ -1179,6 +1182,7 @@
1179
1182
 
1180
1183
 
1181
1184
 
1185
+
1182
1186
 
1183
1187
 
1184
1188
  </xsl:attribute-set><xsl:variable name="table-border_">
@@ -1525,7 +1529,8 @@
1525
1529
 
1526
1530
 
1527
1531
 
1528
-
1532
+
1533
+
1529
1534
 
1530
1535
 
1531
1536
 
@@ -1541,6 +1546,7 @@
1541
1546
  </xsl:attribute-set><xsl:attribute-set name="termnote-style">
1542
1547
 
1543
1548
 
1549
+
1544
1550
 
1545
1551
 
1546
1552
 
@@ -1980,7 +1986,10 @@
1980
1986
 
1981
1987
 
1982
1988
 
1983
-
1989
+ <!-- <xsl:if test="$namespace = 'ieee'">
1990
+ <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
1991
+ <xsl:attribute name="provisional-distance-between-starts">9.5mm</xsl:attribute>
1992
+ </xsl:if> -->
1984
1993
 
1985
1994
 
1986
1995
 
@@ -3167,80 +3176,88 @@
3167
3176
  </xsl:choose>
3168
3177
  </xsl:variable>
3169
3178
 
3170
- <fo:table keep-with-previous="always">
3171
- <xsl:for-each select="xalan:nodeset($table_attributes)/table_attributes/@*">
3172
- <xsl:variable name="name" select="local-name()"/>
3179
+
3180
+ <xsl:variable name="tableWithNotesAndFootnotes">
3181
+
3182
+ <fo:table keep-with-previous="always">
3183
+ <xsl:for-each select="xalan:nodeset($table_attributes)/table_attributes/@*">
3184
+ <xsl:variable name="name" select="local-name()"/>
3185
+ <xsl:choose>
3186
+ <xsl:when test="$name = 'border-top'">
3187
+ <xsl:attribute name="{$name}">0pt solid black</xsl:attribute>
3188
+ </xsl:when>
3189
+ <xsl:when test="$name = 'border'">
3190
+ <xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
3191
+ <xsl:attribute name="border-top">0pt solid black</xsl:attribute>
3192
+ </xsl:when>
3193
+ <xsl:otherwise>
3194
+ <xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
3195
+ </xsl:otherwise>
3196
+ </xsl:choose>
3197
+ </xsl:for-each>
3198
+
3199
+
3200
+
3173
3201
  <xsl:choose>
3174
- <xsl:when test="$name = 'border-top'">
3175
- <xsl:attribute name="{$name}">0pt solid black</xsl:attribute>
3176
- </xsl:when>
3177
- <xsl:when test="$name = 'border'">
3178
- <xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
3179
- <xsl:attribute name="border-top">0pt solid black</xsl:attribute>
3202
+ <xsl:when test="xalan:nodeset($colgroup)//*[local-name()='col']">
3203
+ <xsl:for-each select="xalan:nodeset($colgroup)//*[local-name()='col']">
3204
+ <fo:table-column column-width="{@width}"/>
3205
+ </xsl:for-each>
3180
3206
  </xsl:when>
3181
3207
  <xsl:otherwise>
3182
- <xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
3208
+ <!-- $colwidths=<xsl:copy-of select="$colwidths"/> -->
3209
+ <xsl:call-template name="insertTableColumnWidth">
3210
+ <xsl:with-param name="colwidths" select="$colwidths"/>
3211
+ </xsl:call-template>
3183
3212
  </xsl:otherwise>
3184
3213
  </xsl:choose>
3185
- </xsl:for-each>
3186
-
3187
-
3188
-
3189
- <xsl:choose>
3190
- <xsl:when test="xalan:nodeset($colgroup)//*[local-name()='col']">
3191
- <xsl:for-each select="xalan:nodeset($colgroup)//*[local-name()='col']">
3192
- <fo:table-column column-width="{@width}"/>
3193
- </xsl:for-each>
3194
- </xsl:when>
3195
- <xsl:otherwise>
3196
- <!-- $colwidths=<xsl:copy-of select="$colwidths"/> -->
3197
- <xsl:call-template name="insertTableColumnWidth">
3198
- <xsl:with-param name="colwidths" select="$colwidths"/>
3199
- </xsl:call-template>
3200
- </xsl:otherwise>
3201
- </xsl:choose>
3202
-
3203
- <fo:table-body>
3204
- <fo:table-row>
3205
- <fo:table-cell xsl:use-attribute-sets="table-footer-cell-style" number-columns-spanned="{$cols-count}">
3206
-
3207
-
3214
+
3215
+ <fo:table-body>
3216
+ <fo:table-row>
3217
+ <fo:table-cell xsl:use-attribute-sets="table-footer-cell-style" number-columns-spanned="{$cols-count}">
3218
+
3219
+
3208
3220
 
3209
-
3210
-
3211
- <!-- fn will be processed inside 'note' processing -->
3212
-
3213
-
3214
-
3215
-
3216
-
3217
-
3218
- <!-- for BSI (not PAS) display Notes before footnotes -->
3219
-
3220
-
3221
- <!-- except gb and bsi -->
3222
-
3223
- <xsl:apply-templates select="../*[local-name()='note']"/>
3224
3221
 
3225
-
3226
-
3227
- <!-- horizontal row separator -->
3228
-
3229
-
3230
- <!-- fn processing -->
3231
-
3232
- <xsl:call-template name="table_fn_display"/>
3233
3222
 
3234
-
3235
-
3236
- <!-- for PAS display Notes after footnotes -->
3237
-
3238
-
3239
- </fo:table-cell>
3240
- </fo:table-row>
3241
- </fo:table-body>
3242
-
3243
- </fo:table>
3223
+ <!-- fn will be processed inside 'note' processing -->
3224
+
3225
+
3226
+
3227
+
3228
+
3229
+
3230
+ <!-- for BSI (not PAS) display Notes before footnotes -->
3231
+
3232
+
3233
+ <!-- except gb and bsi -->
3234
+
3235
+ <xsl:apply-templates select="../*[local-name()='note']"/>
3236
+
3237
+
3238
+
3239
+ <!-- horizontal row separator -->
3240
+
3241
+
3242
+ <!-- fn processing -->
3243
+
3244
+ <xsl:call-template name="table_fn_display"/>
3245
+
3246
+
3247
+
3248
+ <!-- for PAS display Notes after footnotes -->
3249
+
3250
+
3251
+ </fo:table-cell>
3252
+ </fo:table-row>
3253
+ </fo:table-body>
3254
+
3255
+ </fo:table>
3256
+ </xsl:variable>
3257
+
3258
+ <xsl:if test="normalize-space($tableWithNotesAndFootnotes) != ''">
3259
+ <xsl:copy-of select="$tableWithNotesAndFootnotes"/>
3260
+ </xsl:if>
3244
3261
 
3245
3262
 
3246
3263
 
@@ -3542,6 +3559,7 @@
3542
3559
  <xsl:variable name="footnote_inline">
3543
3560
  <fo:inline xsl:use-attribute-sets="fn-num-style">
3544
3561
 
3562
+
3545
3563
  <fo:basic-link internal-destination="{$ref_id}" fox:alt-text="footnote {$current_fn_number}">
3546
3564
  <xsl:value-of select="$current_fn_number_text"/>
3547
3565
  </fo:basic-link>
@@ -3563,8 +3581,12 @@
3563
3581
  <fo:block xsl:use-attribute-sets="fn-body-style">
3564
3582
 
3565
3583
 
3584
+
3566
3585
  <fo:inline id="{$ref_id}" xsl:use-attribute-sets="fn-body-num-style">
3567
3586
 
3587
+
3588
+
3589
+
3568
3590
  <xsl:value-of select="$current_fn_number_text"/>
3569
3591
  </fo:inline>
3570
3592
  <xsl:apply-templates/>
@@ -5249,6 +5271,8 @@
5249
5271
 
5250
5272
 
5251
5273
 
5274
+
5275
+
5252
5276
  <xsl:choose>
5253
5277
  <xsl:when test="$target_text = ''">
5254
5278
  <xsl:apply-templates/>
@@ -5470,6 +5494,7 @@
5470
5494
 
5471
5495
 
5472
5496
 
5497
+
5473
5498
  <!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
5474
5499
  <!-- <xsl:if test="*[not(local-name()='name')][1][node()[normalize-space() != ''][1][local-name() = 'add'] and node()[normalize-space() != ''][last()][local-name() = 'add']]"> -->
5475
5500
  <xsl:if test="*[not(local-name()='name')][1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
@@ -5491,6 +5516,7 @@
5491
5516
  </xsl:when>
5492
5517
  <xsl:otherwise>
5493
5518
 
5519
+
5494
5520
  <xsl:text>:</xsl:text>
5495
5521
 
5496
5522
 
@@ -5510,6 +5536,7 @@
5510
5536
  </xsl:when>
5511
5537
  <xsl:otherwise>
5512
5538
 
5539
+
5513
5540
 
5514
5541
  <xsl:text> – </xsl:text>
5515
5542
 
@@ -6288,6 +6315,9 @@
6288
6315
  <fo:block xsl:use-attribute-sets="figure-name-style">
6289
6316
 
6290
6317
 
6318
+
6319
+
6320
+
6291
6321
  <xsl:apply-templates/>
6292
6322
  </fo:block>
6293
6323
  </xsl:if>
@@ -6348,7 +6378,7 @@
6348
6378
  <xsl:apply-templates/>
6349
6379
  </xsl:otherwise>
6350
6380
  </xsl:choose>
6351
- </xsl:template><xsl:template match="*[local-name() = 'fn']" mode="contents"/><xsl:template match="*[local-name() = 'fn']" mode="bookmarks"/><xsl:template match="*[local-name() = 'fn']" mode="contents_item"/><xsl:template match="*[local-name() = 'xref']" mode="contents">
6381
+ </xsl:template><xsl:template match="*[local-name() = 'fn']" mode="contents"/><xsl:template match="*[local-name() = 'fn']" mode="bookmarks"/><xsl:template match="*[local-name() = 'fn']" mode="contents_item"/><xsl:template match="*[local-name() = 'xref'] | *[local-name() = 'eref']" mode="contents">
6352
6382
  <xsl:value-of select="."/>
6353
6383
  </xsl:template><xsl:template match="*[local-name() = 'review']" mode="contents_item"/><xsl:template match="*[local-name() = 'tab']" mode="contents_item">
6354
6384
  <xsl:text> </xsl:text>
@@ -6424,6 +6454,9 @@
6424
6454
  <!-- 9 -->
6425
6455
 
6426
6456
 
6457
+ <!-- <xsl:if test="$namespace = 'ieee'">
6458
+ <xsl:if test="$doctype = 'standard' and $stage = 'published'">8</xsl:if>
6459
+ </xsl:if> -->
6427
6460
 
6428
6461
 
6429
6462
 
@@ -6868,10 +6901,14 @@
6868
6901
  </xsl:template><xsl:template match="*[local-name() = 'termexample']/*[local-name() = 'p']">
6869
6902
  <xsl:variable name="element">inline
6870
6903
 
6904
+
6871
6905
  </xsl:variable>
6872
6906
  <xsl:choose>
6873
6907
  <xsl:when test="contains($element, 'block')">
6874
6908
  <fo:block xsl:use-attribute-sets="example-p-style">
6909
+
6910
+
6911
+
6875
6912
  <xsl:apply-templates/>
6876
6913
  </fo:block>
6877
6914
  </xsl:when>
@@ -6979,6 +7016,7 @@
6979
7016
  </xsl:if>
6980
7017
  <fo:block xsl:use-attribute-sets="example-p-style">
6981
7018
 
7019
+
6982
7020
  <xsl:if test="$num = 1">
6983
7021
  <xsl:attribute name="margin-left">5mm</xsl:attribute>
6984
7022
  </xsl:if>
@@ -7139,6 +7177,8 @@
7139
7177
 
7140
7178
 
7141
7179
 
7180
+
7181
+
7142
7182
  <fo:basic-link fox:alt-text="{@citeas}">
7143
7183
  <xsl:if test="normalize-space(@citeas) = ''">
7144
7184
  <xsl:attribute name="fox:alt-text"><xsl:value-of select="."/></xsl:attribute>
@@ -7562,6 +7602,8 @@
7562
7602
 
7563
7603
 
7564
7604
 
7605
+
7606
+
7565
7607
  <!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
7566
7608
  <xsl:if test="*[1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
7567
7609
  <xsl:call-template name="append_add-style"/>
@@ -7817,7 +7859,7 @@
7817
7859
  </fo:block>
7818
7860
 
7819
7861
 
7820
- </xsl:template><xsl:template match="*[local-name() = 'references'][not(@normative='true')]/*[local-name() = 'bibitem']" priority="2">
7862
+ </xsl:template><xsl:template match="*[local-name() = 'references'][not(@normative='true')]/*[local-name() = 'bibitem']" name="bibitem_non_normative" priority="2">
7821
7863
 
7822
7864
 
7823
7865
  <fo:block id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-style">
@@ -8557,7 +8599,7 @@
8557
8599
  <dc:description>
8558
8600
  <xsl:variable name="abstract">
8559
8601
 
8560
- <xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*[local-name() = 'abstract']//text()"/>
8602
+ <xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*[local-name() = 'abstract']//text()[not(ancestor::*[local-name() = 'title'])]"/>
8561
8603
 
8562
8604
  </xsl:variable>
8563
8605
  <xsl:value-of select="normalize-space($abstract)"/>
data/lib/isodoc/un/un.plenary.xsl CHANGED
@@ -1080,7 +1080,10 @@
1080
1080
 
1081
1081
  </xsl:attribute-set><xsl:attribute-set name="requirement-style">
1082
1082
 
1083
+
1083
1084
  </xsl:attribute-set><xsl:attribute-set name="requirement-name-style">
1085
+ <xsl:attribute name="keep-with-next">always</xsl:attribute>
1086
+
1084
1087
 
1085
1088
  </xsl:attribute-set><xsl:attribute-set name="requirement-label-style">
1086
1089
 
@@ -1179,6 +1182,7 @@
1179
1182
 
1180
1183
 
1181
1184
 
1185
+
1182
1186
 
1183
1187
 
1184
1188
  </xsl:attribute-set><xsl:variable name="table-border_">
@@ -1525,7 +1529,8 @@
1525
1529
 
1526
1530
 
1527
1531
 
1528
-
1532
+
1533
+
1529
1534
 
1530
1535
 
1531
1536
 
@@ -1541,6 +1546,7 @@
1541
1546
  </xsl:attribute-set><xsl:attribute-set name="termnote-style">
1542
1547
 
1543
1548
 
1549
+
1544
1550
 
1545
1551
 
1546
1552
 
@@ -1980,7 +1986,10 @@
1980
1986
 
1981
1987
 
1982
1988
 
1983
-
1989
+ <!-- <xsl:if test="$namespace = 'ieee'">
1990
+ <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
1991
+ <xsl:attribute name="provisional-distance-between-starts">9.5mm</xsl:attribute>
1992
+ </xsl:if> -->
1984
1993
 
1985
1994
 
1986
1995
 
@@ -3167,80 +3176,88 @@
3167
3176
  </xsl:choose>
3168
3177
  </xsl:variable>
3169
3178
 
3170
- <fo:table keep-with-previous="always">
3171
- <xsl:for-each select="xalan:nodeset($table_attributes)/table_attributes/@*">
3172
- <xsl:variable name="name" select="local-name()"/>
3179
+
3180
+ <xsl:variable name="tableWithNotesAndFootnotes">
3181
+
3182
+ <fo:table keep-with-previous="always">
3183
+ <xsl:for-each select="xalan:nodeset($table_attributes)/table_attributes/@*">
3184
+ <xsl:variable name="name" select="local-name()"/>
3185
+ <xsl:choose>
3186
+ <xsl:when test="$name = 'border-top'">
3187
+ <xsl:attribute name="{$name}">0pt solid black</xsl:attribute>
3188
+ </xsl:when>
3189
+ <xsl:when test="$name = 'border'">
3190
+ <xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
3191
+ <xsl:attribute name="border-top">0pt solid black</xsl:attribute>
3192
+ </xsl:when>
3193
+ <xsl:otherwise>
3194
+ <xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
3195
+ </xsl:otherwise>
3196
+ </xsl:choose>
3197
+ </xsl:for-each>
3198
+
3199
+
3200
+
3173
3201
  <xsl:choose>
3174
- <xsl:when test="$name = 'border-top'">
3175
- <xsl:attribute name="{$name}">0pt solid black</xsl:attribute>
3176
- </xsl:when>
3177
- <xsl:when test="$name = 'border'">
3178
- <xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
3179
- <xsl:attribute name="border-top">0pt solid black</xsl:attribute>
3202
+ <xsl:when test="xalan:nodeset($colgroup)//*[local-name()='col']">
3203
+ <xsl:for-each select="xalan:nodeset($colgroup)//*[local-name()='col']">
3204
+ <fo:table-column column-width="{@width}"/>
3205
+ </xsl:for-each>
3180
3206
  </xsl:when>
3181
3207
  <xsl:otherwise>
3182
- <xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
3208
+ <!-- $colwidths=<xsl:copy-of select="$colwidths"/> -->
3209
+ <xsl:call-template name="insertTableColumnWidth">
3210
+ <xsl:with-param name="colwidths" select="$colwidths"/>
3211
+ </xsl:call-template>
3183
3212
  </xsl:otherwise>
3184
3213
  </xsl:choose>
3185
- </xsl:for-each>
3186
-
3187
-
3188
-
3189
- <xsl:choose>
3190
- <xsl:when test="xalan:nodeset($colgroup)//*[local-name()='col']">
3191
- <xsl:for-each select="xalan:nodeset($colgroup)//*[local-name()='col']">
3192
- <fo:table-column column-width="{@width}"/>
3193
- </xsl:for-each>
3194
- </xsl:when>
3195
- <xsl:otherwise>
3196
- <!-- $colwidths=<xsl:copy-of select="$colwidths"/> -->
3197
- <xsl:call-template name="insertTableColumnWidth">
3198
- <xsl:with-param name="colwidths" select="$colwidths"/>
3199
- </xsl:call-template>
3200
- </xsl:otherwise>
3201
- </xsl:choose>
3202
-
3203
- <fo:table-body>
3204
- <fo:table-row>
3205
- <fo:table-cell xsl:use-attribute-sets="table-footer-cell-style" number-columns-spanned="{$cols-count}">
3206
-
3207
-
3214
+
3215
+ <fo:table-body>
3216
+ <fo:table-row>
3217
+ <fo:table-cell xsl:use-attribute-sets="table-footer-cell-style" number-columns-spanned="{$cols-count}">
3218
+
3219
+
3208
3220
 
3209
-
3210
-
3211
- <!-- fn will be processed inside 'note' processing -->
3212
-
3213
-
3214
-
3215
-
3216
-
3217
-
3218
- <!-- for BSI (not PAS) display Notes before footnotes -->
3219
-
3220
-
3221
- <!-- except gb and bsi -->
3222
-
3223
- <xsl:apply-templates select="../*[local-name()='note']"/>
3224
3221
 
3225
-
3226
-
3227
- <!-- horizontal row separator -->
3228
-
3229
-
3230
- <!-- fn processing -->
3231
-
3232
- <xsl:call-template name="table_fn_display"/>
3233
3222
 
3234
-
3235
-
3236
- <!-- for PAS display Notes after footnotes -->
3237
-
3238
-
3239
- </fo:table-cell>
3240
- </fo:table-row>
3241
- </fo:table-body>
3242
-
3243
- </fo:table>
3223
+ <!-- fn will be processed inside 'note' processing -->
3224
+
3225
+
3226
+
3227
+
3228
+
3229
+
3230
+ <!-- for BSI (not PAS) display Notes before footnotes -->
3231
+
3232
+
3233
+ <!-- except gb and bsi -->
3234
+
3235
+ <xsl:apply-templates select="../*[local-name()='note']"/>
3236
+
3237
+
3238
+
3239
+ <!-- horizontal row separator -->
3240
+
3241
+
3242
+ <!-- fn processing -->
3243
+
3244
+ <xsl:call-template name="table_fn_display"/>
3245
+
3246
+
3247
+
3248
+ <!-- for PAS display Notes after footnotes -->
3249
+
3250
+
3251
+ </fo:table-cell>
3252
+ </fo:table-row>
3253
+ </fo:table-body>
3254
+
3255
+ </fo:table>
3256
+ </xsl:variable>
3257
+
3258
+ <xsl:if test="normalize-space($tableWithNotesAndFootnotes) != ''">
3259
+ <xsl:copy-of select="$tableWithNotesAndFootnotes"/>
3260
+ </xsl:if>
3244
3261
 
3245
3262
 
3246
3263
 
@@ -3542,6 +3559,7 @@
3542
3559
  <xsl:variable name="footnote_inline">
3543
3560
  <fo:inline xsl:use-attribute-sets="fn-num-style">
3544
3561
 
3562
+
3545
3563
  <fo:basic-link internal-destination="{$ref_id}" fox:alt-text="footnote {$current_fn_number}">
3546
3564
  <xsl:value-of select="$current_fn_number_text"/>
3547
3565
  </fo:basic-link>
@@ -3563,8 +3581,12 @@
3563
3581
  <fo:block xsl:use-attribute-sets="fn-body-style">
3564
3582
 
3565
3583
 
3584
+
3566
3585
  <fo:inline id="{$ref_id}" xsl:use-attribute-sets="fn-body-num-style">
3567
3586
 
3587
+
3588
+
3589
+
3568
3590
  <xsl:value-of select="$current_fn_number_text"/>
3569
3591
  </fo:inline>
3570
3592
  <xsl:apply-templates/>
@@ -5249,6 +5271,8 @@
5249
5271
 
5250
5272
 
5251
5273
 
5274
+
5275
+
5252
5276
  <xsl:choose>
5253
5277
  <xsl:when test="$target_text = ''">
5254
5278
  <xsl:apply-templates/>
@@ -5470,6 +5494,7 @@
5470
5494
 
5471
5495
 
5472
5496
 
5497
+
5473
5498
  <!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
5474
5499
  <!-- <xsl:if test="*[not(local-name()='name')][1][node()[normalize-space() != ''][1][local-name() = 'add'] and node()[normalize-space() != ''][last()][local-name() = 'add']]"> -->
5475
5500
  <xsl:if test="*[not(local-name()='name')][1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
@@ -5491,6 +5516,7 @@
5491
5516
  </xsl:when>
5492
5517
  <xsl:otherwise>
5493
5518
 
5519
+
5494
5520
  <xsl:text>:</xsl:text>
5495
5521
 
5496
5522
 
@@ -5510,6 +5536,7 @@
5510
5536
  </xsl:when>
5511
5537
  <xsl:otherwise>
5512
5538
 
5539
+
5513
5540
 
5514
5541
  <xsl:text> – </xsl:text>
5515
5542
 
@@ -6288,6 +6315,9 @@
6288
6315
  <fo:block xsl:use-attribute-sets="figure-name-style">
6289
6316
 
6290
6317
 
6318
+
6319
+
6320
+
6291
6321
  <xsl:apply-templates/>
6292
6322
  </fo:block>
6293
6323
  </xsl:if>
@@ -6348,7 +6378,7 @@
6348
6378
  <xsl:apply-templates/>
6349
6379
  </xsl:otherwise>
6350
6380
  </xsl:choose>
6351
- </xsl:template><xsl:template match="*[local-name() = 'fn']" mode="contents"/><xsl:template match="*[local-name() = 'fn']" mode="bookmarks"/><xsl:template match="*[local-name() = 'fn']" mode="contents_item"/><xsl:template match="*[local-name() = 'xref']" mode="contents">
6381
+ </xsl:template><xsl:template match="*[local-name() = 'fn']" mode="contents"/><xsl:template match="*[local-name() = 'fn']" mode="bookmarks"/><xsl:template match="*[local-name() = 'fn']" mode="contents_item"/><xsl:template match="*[local-name() = 'xref'] | *[local-name() = 'eref']" mode="contents">
6352
6382
  <xsl:value-of select="."/>
6353
6383
  </xsl:template><xsl:template match="*[local-name() = 'review']" mode="contents_item"/><xsl:template match="*[local-name() = 'tab']" mode="contents_item">
6354
6384
  <xsl:text> </xsl:text>
@@ -6424,6 +6454,9 @@
6424
6454
  <!-- 9 -->
6425
6455
 
6426
6456
 
6457
+ <!-- <xsl:if test="$namespace = 'ieee'">
6458
+ <xsl:if test="$doctype = 'standard' and $stage = 'published'">8</xsl:if>
6459
+ </xsl:if> -->
6427
6460
 
6428
6461
 
6429
6462
 
@@ -6868,10 +6901,14 @@
6868
6901
  </xsl:template><xsl:template match="*[local-name() = 'termexample']/*[local-name() = 'p']">
6869
6902
  <xsl:variable name="element">inline
6870
6903
 
6904
+
6871
6905
  </xsl:variable>
6872
6906
  <xsl:choose>
6873
6907
  <xsl:when test="contains($element, 'block')">
6874
6908
  <fo:block xsl:use-attribute-sets="example-p-style">
6909
+
6910
+
6911
+
6875
6912
  <xsl:apply-templates/>
6876
6913
  </fo:block>
6877
6914
  </xsl:when>
@@ -6979,6 +7016,7 @@
6979
7016
  </xsl:if>
6980
7017
  <fo:block xsl:use-attribute-sets="example-p-style">
6981
7018
 
7019
+
6982
7020
  <xsl:if test="$num = 1">
6983
7021
  <xsl:attribute name="margin-left">5mm</xsl:attribute>
6984
7022
  </xsl:if>
@@ -7139,6 +7177,8 @@
7139
7177
 
7140
7178
 
7141
7179
 
7180
+
7181
+
7142
7182
  <fo:basic-link fox:alt-text="{@citeas}">
7143
7183
  <xsl:if test="normalize-space(@citeas) = ''">
7144
7184
  <xsl:attribute name="fox:alt-text"><xsl:value-of select="."/></xsl:attribute>
@@ -7562,6 +7602,8 @@
7562
7602
 
7563
7603
 
7564
7604
 
7605
+
7606
+
7565
7607
  <!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
7566
7608
  <xsl:if test="*[1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
7567
7609
  <xsl:call-template name="append_add-style"/>
@@ -7817,7 +7859,7 @@
7817
7859
  </fo:block>
7818
7860
 
7819
7861
 
7820
- </xsl:template><xsl:template match="*[local-name() = 'references'][not(@normative='true')]/*[local-name() = 'bibitem']" priority="2">
7862
+ </xsl:template><xsl:template match="*[local-name() = 'references'][not(@normative='true')]/*[local-name() = 'bibitem']" name="bibitem_non_normative" priority="2">
7821
7863
 
7822
7864
 
7823
7865
  <fo:block id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-style">
@@ -8557,7 +8599,7 @@
8557
8599
  <dc:description>
8558
8600
  <xsl:variable name="abstract">
8559
8601
 
8560
- <xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*[local-name() = 'abstract']//text()"/>
8602
+ <xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*[local-name() = 'abstract']//text()[not(ancestor::*[local-name() = 'title'])]"/>
8561
8603
 
8562
8604
  </xsl:variable>
8563
8605
  <xsl:value-of select="normalize-space($abstract)"/>
data/lib/isodoc/un/un.recommendation.xsl CHANGED
@@ -1150,7 +1150,10 @@
1150
1150
 
1151
1151
  </xsl:attribute-set><xsl:attribute-set name="requirement-style">
1152
1152
 
1153
+
1153
1154
  </xsl:attribute-set><xsl:attribute-set name="requirement-name-style">
1155
+ <xsl:attribute name="keep-with-next">always</xsl:attribute>
1156
+
1154
1157
 
1155
1158
  </xsl:attribute-set><xsl:attribute-set name="requirement-label-style">
1156
1159
 
@@ -1249,6 +1252,7 @@
1249
1252
 
1250
1253
 
1251
1254
 
1255
+
1252
1256
 
1253
1257
 
1254
1258
  </xsl:attribute-set><xsl:variable name="table-border_">
@@ -1577,7 +1581,8 @@
1577
1581
 
1578
1582
 
1579
1583
 
1580
-
1584
+
1585
+
1581
1586
 
1582
1587
 
1583
1588
 
@@ -1596,6 +1601,7 @@
1596
1601
  </xsl:attribute-set><xsl:attribute-set name="termnote-style">
1597
1602
 
1598
1603
 
1604
+
1599
1605
 
1600
1606
 
1601
1607
 
@@ -2039,7 +2045,10 @@
2039
2045
 
2040
2046
 
2041
2047
 
2042
-
2048
+ <!-- <xsl:if test="$namespace = 'ieee'">
2049
+ <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
2050
+ <xsl:attribute name="provisional-distance-between-starts">9.5mm</xsl:attribute>
2051
+ </xsl:if> -->
2043
2052
 
2044
2053
 
2045
2054
 
@@ -3235,80 +3244,88 @@
3235
3244
  </xsl:choose>
3236
3245
  </xsl:variable>
3237
3246
 
3238
- <fo:table keep-with-previous="always">
3239
- <xsl:for-each select="xalan:nodeset($table_attributes)/table_attributes/@*">
3240
- <xsl:variable name="name" select="local-name()"/>
3247
+
3248
+ <xsl:variable name="tableWithNotesAndFootnotes">
3249
+
3250
+ <fo:table keep-with-previous="always">
3251
+ <xsl:for-each select="xalan:nodeset($table_attributes)/table_attributes/@*">
3252
+ <xsl:variable name="name" select="local-name()"/>
3253
+ <xsl:choose>
3254
+ <xsl:when test="$name = 'border-top'">
3255
+ <xsl:attribute name="{$name}">0pt solid black</xsl:attribute>
3256
+ </xsl:when>
3257
+ <xsl:when test="$name = 'border'">
3258
+ <xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
3259
+ <xsl:attribute name="border-top">0pt solid black</xsl:attribute>
3260
+ </xsl:when>
3261
+ <xsl:otherwise>
3262
+ <xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
3263
+ </xsl:otherwise>
3264
+ </xsl:choose>
3265
+ </xsl:for-each>
3266
+
3267
+
3268
+
3241
3269
  <xsl:choose>
3242
- <xsl:when test="$name = 'border-top'">
3243
- <xsl:attribute name="{$name}">0pt solid black</xsl:attribute>
3244
- </xsl:when>
3245
- <xsl:when test="$name = 'border'">
3246
- <xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
3247
- <xsl:attribute name="border-top">0pt solid black</xsl:attribute>
3270
+ <xsl:when test="xalan:nodeset($colgroup)//*[local-name()='col']">
3271
+ <xsl:for-each select="xalan:nodeset($colgroup)//*[local-name()='col']">
3272
+ <fo:table-column column-width="{@width}"/>
3273
+ </xsl:for-each>
3248
3274
  </xsl:when>
3249
3275
  <xsl:otherwise>
3250
- <xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
3276
+ <!-- $colwidths=<xsl:copy-of select="$colwidths"/> -->
3277
+ <xsl:call-template name="insertTableColumnWidth">
3278
+ <xsl:with-param name="colwidths" select="$colwidths"/>
3279
+ </xsl:call-template>
3251
3280
  </xsl:otherwise>
3252
3281
  </xsl:choose>
3253
- </xsl:for-each>
3254
-
3255
-
3256
-
3257
- <xsl:choose>
3258
- <xsl:when test="xalan:nodeset($colgroup)//*[local-name()='col']">
3259
- <xsl:for-each select="xalan:nodeset($colgroup)//*[local-name()='col']">
3260
- <fo:table-column column-width="{@width}"/>
3261
- </xsl:for-each>
3262
- </xsl:when>
3263
- <xsl:otherwise>
3264
- <!-- $colwidths=<xsl:copy-of select="$colwidths"/> -->
3265
- <xsl:call-template name="insertTableColumnWidth">
3266
- <xsl:with-param name="colwidths" select="$colwidths"/>
3267
- </xsl:call-template>
3268
- </xsl:otherwise>
3269
- </xsl:choose>
3270
-
3271
- <fo:table-body>
3272
- <fo:table-row>
3273
- <fo:table-cell xsl:use-attribute-sets="table-footer-cell-style" number-columns-spanned="{$cols-count}">
3274
-
3275
-
3282
+
3283
+ <fo:table-body>
3284
+ <fo:table-row>
3285
+ <fo:table-cell xsl:use-attribute-sets="table-footer-cell-style" number-columns-spanned="{$cols-count}">
3286
+
3287
+
3276
3288
 
3277
-
3278
-
3279
- <!-- fn will be processed inside 'note' processing -->
3280
-
3281
-
3282
-
3283
-
3284
-
3285
-
3286
- <!-- for BSI (not PAS) display Notes before footnotes -->
3287
-
3288
-
3289
- <!-- except gb and bsi -->
3290
-
3291
- <xsl:apply-templates select="../*[local-name()='note']"/>
3292
3289
 
3293
-
3294
-
3295
- <!-- horizontal row separator -->
3296
-
3297
-
3298
- <!-- fn processing -->
3299
-
3300
- <xsl:call-template name="table_fn_display"/>
3301
3290
 
3302
-
3303
-
3304
- <!-- for PAS display Notes after footnotes -->
3305
-
3306
-
3307
- </fo:table-cell>
3308
- </fo:table-row>
3309
- </fo:table-body>
3310
-
3311
- </fo:table>
3291
+ <!-- fn will be processed inside 'note' processing -->
3292
+
3293
+
3294
+
3295
+
3296
+
3297
+
3298
+ <!-- for BSI (not PAS) display Notes before footnotes -->
3299
+
3300
+
3301
+ <!-- except gb and bsi -->
3302
+
3303
+ <xsl:apply-templates select="../*[local-name()='note']"/>
3304
+
3305
+
3306
+
3307
+ <!-- horizontal row separator -->
3308
+
3309
+
3310
+ <!-- fn processing -->
3311
+
3312
+ <xsl:call-template name="table_fn_display"/>
3313
+
3314
+
3315
+
3316
+ <!-- for PAS display Notes after footnotes -->
3317
+
3318
+
3319
+ </fo:table-cell>
3320
+ </fo:table-row>
3321
+ </fo:table-body>
3322
+
3323
+ </fo:table>
3324
+ </xsl:variable>
3325
+
3326
+ <xsl:if test="normalize-space($tableWithNotesAndFootnotes) != ''">
3327
+ <xsl:copy-of select="$tableWithNotesAndFootnotes"/>
3328
+ </xsl:if>
3312
3329
 
3313
3330
 
3314
3331
 
@@ -3626,6 +3643,7 @@
3626
3643
  <xsl:variable name="footnote_inline">
3627
3644
  <fo:inline xsl:use-attribute-sets="fn-num-style">
3628
3645
 
3646
+
3629
3647
  <fo:basic-link internal-destination="{$ref_id}" fox:alt-text="footnote {$current_fn_number}">
3630
3648
  <xsl:value-of select="$current_fn_number_text"/>
3631
3649
  </fo:basic-link>
@@ -3647,8 +3665,12 @@
3647
3665
  <fo:block xsl:use-attribute-sets="fn-body-style">
3648
3666
 
3649
3667
 
3668
+
3650
3669
  <fo:inline id="{$ref_id}" xsl:use-attribute-sets="fn-body-num-style">
3651
3670
 
3671
+
3672
+
3673
+
3652
3674
  <xsl:value-of select="$current_fn_number_text"/>
3653
3675
  </fo:inline>
3654
3676
  <xsl:apply-templates/>
@@ -5333,6 +5355,8 @@
5333
5355
 
5334
5356
 
5335
5357
 
5358
+
5359
+
5336
5360
  <xsl:choose>
5337
5361
  <xsl:when test="$target_text = ''">
5338
5362
  <xsl:apply-templates/>
@@ -5558,6 +5582,7 @@
5558
5582
 
5559
5583
 
5560
5584
 
5585
+
5561
5586
  <!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
5562
5587
  <!-- <xsl:if test="*[not(local-name()='name')][1][node()[normalize-space() != ''][1][local-name() = 'add'] and node()[normalize-space() != ''][last()][local-name() = 'add']]"> -->
5563
5588
  <xsl:if test="*[not(local-name()='name')][1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
@@ -5579,6 +5604,7 @@
5579
5604
  </xsl:when>
5580
5605
  <xsl:otherwise>
5581
5606
 
5607
+
5582
5608
  <xsl:text>:</xsl:text>
5583
5609
 
5584
5610
 
@@ -5598,6 +5624,7 @@
5598
5624
  </xsl:when>
5599
5625
  <xsl:otherwise>
5600
5626
 
5627
+
5601
5628
 
5602
5629
  <xsl:text> – </xsl:text>
5603
5630
 
@@ -6381,6 +6408,9 @@
6381
6408
  <fo:block xsl:use-attribute-sets="figure-name-style">
6382
6409
 
6383
6410
 
6411
+
6412
+
6413
+
6384
6414
  <xsl:apply-templates/>
6385
6415
  </fo:block>
6386
6416
  </xsl:if>
@@ -6441,7 +6471,7 @@
6441
6471
  <xsl:apply-templates/>
6442
6472
  </xsl:otherwise>
6443
6473
  </xsl:choose>
6444
- </xsl:template><xsl:template match="*[local-name() = 'fn']" mode="contents"/><xsl:template match="*[local-name() = 'fn']" mode="bookmarks"/><xsl:template match="*[local-name() = 'fn']" mode="contents_item"/><xsl:template match="*[local-name() = 'xref']" mode="contents">
6474
+ </xsl:template><xsl:template match="*[local-name() = 'fn']" mode="contents"/><xsl:template match="*[local-name() = 'fn']" mode="bookmarks"/><xsl:template match="*[local-name() = 'fn']" mode="contents_item"/><xsl:template match="*[local-name() = 'xref'] | *[local-name() = 'eref']" mode="contents">
6445
6475
  <xsl:value-of select="."/>
6446
6476
  </xsl:template><xsl:template match="*[local-name() = 'review']" mode="contents_item"/><xsl:template match="*[local-name() = 'tab']" mode="contents_item">
6447
6477
  <xsl:text> </xsl:text>
@@ -6517,6 +6547,9 @@
6517
6547
  <!-- 9 -->
6518
6548
 
6519
6549
 
6550
+ <!-- <xsl:if test="$namespace = 'ieee'">
6551
+ <xsl:if test="$doctype = 'standard' and $stage = 'published'">8</xsl:if>
6552
+ </xsl:if> -->
6520
6553
 
6521
6554
 
6522
6555
 
@@ -6961,10 +6994,14 @@
6961
6994
  </xsl:template><xsl:template match="*[local-name() = 'termexample']/*[local-name() = 'p']">
6962
6995
  <xsl:variable name="element">inline
6963
6996
 
6997
+
6964
6998
  </xsl:variable>
6965
6999
  <xsl:choose>
6966
7000
  <xsl:when test="contains($element, 'block')">
6967
7001
  <fo:block xsl:use-attribute-sets="example-p-style">
7002
+
7003
+
7004
+
6968
7005
  <xsl:apply-templates/>
6969
7006
  </fo:block>
6970
7007
  </xsl:when>
@@ -7072,6 +7109,7 @@
7072
7109
  </xsl:if>
7073
7110
  <fo:block xsl:use-attribute-sets="example-p-style">
7074
7111
 
7112
+
7075
7113
  <xsl:if test="$num = 1">
7076
7114
  <xsl:attribute name="margin-left">5mm</xsl:attribute>
7077
7115
  </xsl:if>
@@ -7232,6 +7270,8 @@
7232
7270
 
7233
7271
 
7234
7272
 
7273
+
7274
+
7235
7275
  <fo:basic-link fox:alt-text="{@citeas}">
7236
7276
  <xsl:if test="normalize-space(@citeas) = ''">
7237
7277
  <xsl:attribute name="fox:alt-text"><xsl:value-of select="."/></xsl:attribute>
@@ -7655,6 +7695,8 @@
7655
7695
 
7656
7696
 
7657
7697
 
7698
+
7699
+
7658
7700
  <!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
7659
7701
  <xsl:if test="*[1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
7660
7702
  <xsl:call-template name="append_add-style"/>
@@ -7910,7 +7952,7 @@
7910
7952
  </fo:block>
7911
7953
 
7912
7954
 
7913
- </xsl:template><xsl:template match="*[local-name() = 'references'][not(@normative='true')]/*[local-name() = 'bibitem']" priority="2">
7955
+ </xsl:template><xsl:template match="*[local-name() = 'references'][not(@normative='true')]/*[local-name() = 'bibitem']" name="bibitem_non_normative" priority="2">
7914
7956
 
7915
7957
 
7916
7958
  <fo:block id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-style">
@@ -8652,7 +8694,7 @@
8652
8694
  <dc:description>
8653
8695
  <xsl:variable name="abstract">
8654
8696
 
8655
- <xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*[local-name() = 'abstract']//text()"/>
8697
+ <xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*[local-name() = 'abstract']//text()[not(ancestor::*[local-name() = 'title'])]"/>
8656
8698
 
8657
8699
  </xsl:variable>
8658
8700
  <xsl:value-of select="normalize-space($abstract)"/>
data/lib/metanorma/un/isodoc.rng CHANGED
@@ -69,6 +69,17 @@
69
69
  </zeroOrMore>
70
70
  </element>
71
71
  </define>
72
+ <define name="AdmonitionType">
73
+ <choice>
74
+ <value>warning</value>
75
+ <value>note</value>
76
+ <value>tip</value>
77
+ <value>important</value>
78
+ <value>caution</value>
79
+ <value>statement</value>
80
+ <value>editorial</value>
81
+ </choice>
82
+ </define>
72
83
  <define name="index">
73
84
  <element name="index">
74
85
  <optional>
@@ -116,6 +127,11 @@
116
127
  <data type="boolean"/>
117
128
  </attribute>
118
129
  </optional>
130
+ <optional>
131
+ <attribute name="suppress_identifier">
132
+ <data type="boolean"/>
133
+ </attribute>
134
+ </optional>
119
135
  <ref name="BibliographicItem"/>
120
136
  </element>
121
137
  </define>
data/lib/metanorma/un/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module UN
3
- VERSION = "0.9.3".freeze
3
+ VERSION = "0.9.4".freeze
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-un
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.9.3
4
+ version: 0.9.4
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-06-21 00:00:00.000000000 Z
11
+ date: 2022-07-04 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: iso-639