metanorma-iho 1.0.14 → 1.0.15

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 7cdfebb993b782a2c17eaf34610fd07f8351425743814f3e57167d7991af5edf
4
- data.tar.gz: cde48a080e752f287ce934c1fd8f9786b2cf03dc18e8083fcb310c9e5ca77945
3
+ metadata.gz: 0561e6cbb1ff1586a4e0e3c5143cc7c87c48c7c5c5a7c230ab938f4f1141850f
4
+ data.tar.gz: a7a70da3cdb547116274144edb2494698522f268d9e4f129dec48a2e9603c3a6
5
5
  SHA512:
6
- metadata.gz: b9018d84334f416d6e26d10ee6b447c37758e401803f76499c1d337bf1e6b26b76a824aeab8854bc3708be49f7778df72ca37375a31e3305f08eb6d594a2df2f
7
- data.tar.gz: 5be59f0634e3fbcd8abf2b31c114f47554e6a7a4889a7308510c4852ef903b5b833019f617f3209e3fa0ffaec765a40e45db604f5ae3ee9f135cd3bd7f13b045
6
+ metadata.gz: 6660e7a259bb87be6c1256d35497929c920b9978b87e98ef9a275ef937b0f5ace36218c45a38d24b3d360d48d7bc2e3640a2882aac06a4ed67e524d3dc2b08ca
7
+ data.tar.gz: a45059fd657f642c498f44c3f647d6ecb084356d8362c90b7a7ce1099a9c5e205801200fea6bcfcfed715798aaf0c70476514f58153622aebc8ce2dca7c6658a
@@ -2066,6 +2066,9 @@
2066
2066
 
2067
2067
  </xsl:attribute-set>
2068
2068
 
2069
+ <xsl:attribute-set name="related-block-style" use-attribute-sets="preferred-block-style">
2070
+ </xsl:attribute-set>
2071
+
2069
2072
  <xsl:attribute-set name="definition-style">
2070
2073
 
2071
2074
  <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
@@ -4305,7 +4308,9 @@
4305
4308
  <xsl:with-param name="element">
4306
4309
  <fo:basic-link internal-destination="{$ref_id}" fox:alt-text="footnote {$current_fn_number}"> <!-- note: role="Lbl" removed in https://github.com/metanorma/mn2pdf/issues/291 -->
4307
4310
  <fo:inline role="Lbl"> <!-- need for https://github.com/metanorma/metanorma-iso/issues/1003 -->
4311
+
4308
4312
  <xsl:copy-of select="$current_fn_number_text"/>
4313
+
4309
4314
  </fo:inline>
4310
4315
  </fo:basic-link>
4311
4316
  </xsl:with-param>
@@ -4324,8 +4329,7 @@
4324
4329
 
4325
4330
  <fo:block-container xsl:use-attribute-sets="fn-container-body-style" role="SKIP">
4326
4331
 
4327
- <fo:block xsl:use-attribute-sets="fn-body-style" role="SKIP">
4328
-
4332
+ <xsl:variable name="fn_block">
4329
4333
  <xsl:call-template name="refine_fn-body-style"/>
4330
4334
 
4331
4335
  <fo:inline id="{$ref_id}" xsl:use-attribute-sets="fn-body-num-style" role="Lbl">
@@ -4333,9 +4337,15 @@
4333
4337
  <xsl:call-template name="refine_fn-body-num-style"/>
4334
4338
 
4335
4339
  <xsl:value-of select="$current_fn_number_text"/>
4340
+
4336
4341
  </fo:inline>
4337
4342
  <xsl:apply-templates/>
4338
- </fo:block>
4343
+ </xsl:variable>
4344
+
4345
+ <fo:block xsl:use-attribute-sets="fn-body-style" role="SKIP">
4346
+ <xsl:copy-of select="$fn_block"/>
4347
+ </fo:block>
4348
+
4339
4349
  </fo:block-container>
4340
4350
  </fo:footnote-body>
4341
4351
  </fo:footnote>
@@ -10446,14 +10456,17 @@
10446
10456
  </fo:block>
10447
10457
  </xsl:template>
10448
10458
 
10449
- <xsl:template match="*[local-name() = 'domain']">
10459
+ <!-- <xsl:template match="*[local-name() = 'domain']"> -->
10450
10460
  <!-- https://github.com/metanorma/isodoc/issues/607
10451
10461
  <fo:inline xsl:use-attribute-sets="domain-style">&lt;<xsl:apply-templates/>&gt;</fo:inline>
10452
10462
  <xsl:text> </xsl:text> -->
10453
- <xsl:if test="not(@hidden = 'true')">
10463
+ <!-- <xsl:if test="not(@hidden = 'true')">
10454
10464
  <xsl:apply-templates/>
10455
10465
  </xsl:if>
10456
- </xsl:template>
10466
+ </xsl:template> -->
10467
+
10468
+ <!-- https://github.com/metanorma/isodoc/issues/632#issuecomment-2567163931 -->
10469
+ <xsl:template match="*[local-name() = 'domain']"/>
10457
10470
 
10458
10471
  <xsl:template match="*[local-name() = 'admitted']">
10459
10472
  <fo:block xsl:use-attribute-sets="admitted-style">
@@ -10468,9 +10481,11 @@
10468
10481
  </xsl:template>
10469
10482
 
10470
10483
  <xsl:template name="setStyle_preferred">
10471
- <xsl:if test="*[local-name() = 'strong']">
10472
- <xsl:attribute name="font-weight">normal</xsl:attribute>
10473
- </xsl:if>
10484
+
10485
+ <xsl:if test="*[local-name() = 'strong']">
10486
+ <xsl:attribute name="font-weight">normal</xsl:attribute>
10487
+ </xsl:if>
10488
+
10474
10489
  </xsl:template>
10475
10490
 
10476
10491
  <!-- regarding ISO 10241-1:2011, If there is more than one preferred term, each preferred term follows the previous one on a new line. -->
@@ -10480,6 +10495,17 @@
10480
10495
  </xsl:template>
10481
10496
  <!-- End Preferred, admitted, deprecated -->
10482
10497
 
10498
+ <xsl:template match="*[local-name() = 'fmt-related']">
10499
+ <fo:block role="SKIP" xsl:use-attribute-sets="related-block-style">
10500
+ <xsl:apply-templates/>
10501
+ </fo:block>
10502
+ </xsl:template>
10503
+ <xsl:template match="*[local-name() = 'fmt-related']/*[local-name() = 'p']" priority="4">
10504
+ <fo:block>
10505
+ <xsl:apply-templates/>
10506
+ </fo:block>
10507
+ </xsl:template>
10508
+
10483
10509
  <!-- ========== -->
10484
10510
  <!-- definition -->
10485
10511
  <!-- ========== -->
@@ -11380,6 +11406,7 @@
11380
11406
 
11381
11407
  <!-- Normative references -->
11382
11408
  <xsl:template match="*[local-name() = 'references'][@normative='true']/*[local-name() = 'bibitem']" name="bibitem" priority="2">
11409
+ <xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][local-name() = 'bibitem'] and 1 = 1)"/> <!-- current bibiitem is non-first -->
11383
11410
 
11384
11411
  <fo:list-block id="{@id}" xsl:use-attribute-sets="bibitem-normative-list-style">
11385
11412
 
@@ -12101,7 +12128,8 @@
12101
12128
  <!-- add @id - first element with @id plus '_element_name' -->
12102
12129
  <xsl:variable name="prefix_id_" select="(.//*[@id])[1]/@id"/>
12103
12130
  <xsl:variable name="prefix_id"><xsl:value-of select="$prefix_id_"/><xsl:if test="normalize-space($prefix_id_) = ''"><xsl:value-of select="generate-id()"/></xsl:if></xsl:variable>
12104
- <xsl:attribute name="id"><xsl:value-of select="$prefix_id"/>_<xsl:value-of select="local-name()"/></xsl:attribute>
12131
+ <xsl:variable name="document_suffix" select="ancestor::*[contains(local-name(), '-standard')]/@document_suffix"/>
12132
+ <xsl:attribute name="id"><xsl:value-of select="concat($prefix_id, '_', local-name(), '_', $document_suffix)"/></xsl:attribute>
12105
12133
  </xsl:if>
12106
12134
  </xsl:template>
12107
12135
 
@@ -12158,6 +12186,31 @@
12158
12186
  <xsl:template match="*[local-name() = 'name'][following-sibling::*[1][local-name() = 'fmt-name']]" mode="update_xml_pres"/>
12159
12187
  <xsl:template match="*[local-name() = 'section-title'][following-sibling::*[1][local-name() = 'p'][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_step1"/>
12160
12188
  <xsl:template match="*[local-name() = 'section-title'][following-sibling::*[1][local-name() = 'p'][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_pres"/>
12189
+ <!-- <xsl:template match="*[local-name() = 'preferred'][following-sibling::*[not(local-name() = 'preferred')][1][local-name() = 'fmt-preferred']]" mode="update_xml_step1"/> -->
12190
+ <xsl:template match="*[local-name() = 'preferred']" mode="update_xml_step1"/>
12191
+ <!-- <xsl:template match="*[local-name() = 'preferred'][following-sibling::*[not(local-name() = 'preferred')][1][local-name() = 'fmt-preferred']]" mode="update_xml_pres"/> -->
12192
+ <xsl:template match="*[local-name() = 'preferred']" mode="update_xml_pres"/>
12193
+ <!-- <xsl:template match="*[local-name() = 'admitted'][following-sibling::*[not(local-name() = 'admitted')][1][local-name() = 'fmt-admitted']]" mode="update_xml_step1"/> -->
12194
+ <xsl:template match="*[local-name() = 'admitted']" mode="update_xml_step1"/>
12195
+ <!-- <xsl:template match="*[local-name() = 'admitted'][following-sibling::*[not(local-name() = 'admitted')][1][local-name() = 'fmt-admitted']]" mode="update_xml_pres"/> -->
12196
+ <xsl:template match="*[local-name() = 'admitted']" mode="update_xml_pres"/>
12197
+ <!-- <xsl:template match="*[local-name() = 'deprecates'][following-sibling::*[not(local-name() = 'deprecates')][1][local-name() = 'fmt-deprecates']]" mode="update_xml_step1"/> -->
12198
+ <xsl:template match="*[local-name() = 'deprecates']" mode="update_xml_step1"/>
12199
+ <xsl:template match="*[local-name() = 'related']" mode="update_xml_step1"/>
12200
+ <!-- <xsl:template match="*[local-name() = 'deprecates'][following-sibling::*[not(local-name() = 'deprecates')][1][local-name() = 'fmt-deprecates']]" mode="update_xml_pres"/> -->
12201
+ <xsl:template match="*[local-name() = 'deprecates']" mode="update_xml_pres"/>
12202
+ <xsl:template match="*[local-name() = 'related']" mode="update_xml_pres"/>
12203
+ <!-- <xsl:template match="*[local-name() = 'definition'][following-sibling::*[1][local-name() = 'fmt-definition']]" mode="update_xml_step1"/> -->
12204
+ <xsl:template match="*[local-name() = 'definition']" mode="update_xml_step1"/>
12205
+ <!-- <xsl:template match="*[local-name() = 'definition'][following-sibling::*[1][local-name() = 'fmt-definition']]" mode="update_xml_pres"/> -->
12206
+ <xsl:template match="*[local-name() = 'definition']" mode="update_xml_pres"/>
12207
+ <!-- <xsl:template match="*[local-name() = 'termsource'][following-sibling::*[1][local-name() = 'fmt-termsource']]" mode="update_xml_step1"/> -->
12208
+ <xsl:template match="*[local-name() = 'termsource']" mode="update_xml_step1"/>
12209
+ <!-- <xsl:template match="*[local-name() = 'termsource'][following-sibling::*[1][local-name() = 'fmt-termsource']]" mode="update_xml_pres"/> -->
12210
+ <xsl:template match="*[local-name() = 'termsource']" mode="update_xml_pres"/>
12211
+
12212
+ <xsl:template match="*[local-name() = 'term'][@unnumbered = 'true'][not(.//*[starts-with(local-name(), 'fmt-')])]" mode="update_xml_step1"/>
12213
+ <xsl:template match="*[local-name() = 'term'][@unnumbered = 'true'][not(.//*[starts-with(local-name(), 'fmt-')])]" mode="update_xml_pres"/>
12161
12214
 
12162
12215
  <xsl:template match="*[local-name() = 'p'][@type = 'section-title' or @type = 'floating-title'][preceding-sibling::*[1][local-name() = 'section-title']]" mode="update_xml_step1">
12163
12216
  <xsl:copy>
@@ -12202,6 +12255,94 @@
12202
12255
  </xsl:element>
12203
12256
  </xsl:template>
12204
12257
 
12258
+ <xsl:template match="*[local-name() = 'fmt-preferred']"/>
12259
+ <xsl:template match="*[local-name() = 'fmt-preferred'][*[local-name() = 'p']]" mode="update_xml_step1">
12260
+ <xsl:apply-templates mode="update_xml_step1"/>
12261
+ </xsl:template>
12262
+ <xsl:template match="*[local-name() = 'fmt-preferred'][not(*[local-name() = 'p'])] | *[local-name() = 'fmt-preferred']/*[local-name() = 'p']" mode="update_xml_step1">
12263
+ <xsl:element name="preferred" namespace="{$namespace_full}">
12264
+ <xsl:copy-of select="@*"/>
12265
+ <xsl:apply-templates mode="update_xml_step1"/>
12266
+ </xsl:element>
12267
+ </xsl:template>
12268
+ <xsl:template match="*[local-name() = 'fmt-preferred'][*[local-name() = 'p']]" mode="update_xml_pres">
12269
+ <xsl:apply-templates mode="update_xml_pres"/>
12270
+ </xsl:template>
12271
+ <xsl:template match="*[local-name() = 'fmt-preferred'][not(*[local-name() = 'p'])] | *[local-name() = 'fmt-preferred']/*[local-name() = 'p']" mode="update_xml_pres">
12272
+ <xsl:element name="preferred" namespace="{$namespace_full}">
12273
+ <xsl:copy-of select="@*"/>
12274
+ <xsl:apply-templates mode="update_xml_pres"/>
12275
+ </xsl:element>
12276
+ </xsl:template>
12277
+
12278
+ <xsl:template match="*[local-name() = 'fmt-admitted']"/>
12279
+ <xsl:template match="*[local-name() = 'fmt-admitted'][*[local-name() = 'p']]" mode="update_xml_step1">
12280
+ <xsl:apply-templates mode="update_xml_step1"/>
12281
+ </xsl:template>
12282
+ <xsl:template match="*[local-name() = 'fmt-admitted'][not(*[local-name() = 'p'])] | *[local-name() = 'fmt-admitted']/*[local-name() = 'p']" mode="update_xml_step1">
12283
+ <xsl:element name="admitted" namespace="{$namespace_full}">
12284
+ <xsl:copy-of select="@*"/>
12285
+ <xsl:apply-templates mode="update_xml_step1"/>
12286
+ </xsl:element>
12287
+ </xsl:template>
12288
+ <xsl:template match="*[local-name() = 'fmt-admitted'][*[local-name() = 'p']]" mode="update_xml_pres">
12289
+ <xsl:apply-templates mode="update_xml_pres"/>
12290
+ </xsl:template>
12291
+ <xsl:template match="*[local-name() = 'fmt-admitted'][not(*[local-name() = 'p'])] | *[local-name() = 'fmt-admitted']/*[local-name() = 'p']" mode="update_xml_pres">
12292
+ <xsl:element name="admitted" namespace="{$namespace_full}">
12293
+ <xsl:copy-of select="@*"/>
12294
+ <xsl:apply-templates mode="update_xml_pres"/>
12295
+ </xsl:element>
12296
+ </xsl:template>
12297
+
12298
+ <xsl:template match="*[local-name() = 'fmt-deprecates']"/>
12299
+ <xsl:template match="*[local-name() = 'fmt-deprecates'][*[local-name() = 'p']]" mode="update_xml_step1">
12300
+ <xsl:apply-templates mode="update_xml_step1"/>
12301
+ </xsl:template>
12302
+ <xsl:template match="*[local-name() = 'fmt-deprecates'][not(*[local-name() = 'p'])] | *[local-name() = 'fmt-deprecates']/*[local-name() = 'p']" mode="update_xml_step1">
12303
+ <xsl:element name="deprecates" namespace="{$namespace_full}">
12304
+ <xsl:copy-of select="@*"/>
12305
+ <xsl:apply-templates mode="update_xml_step1"/>
12306
+ </xsl:element>
12307
+ </xsl:template>
12308
+ <xsl:template match="*[local-name() = 'fmt-deprecates'][*[local-name() = 'p']]" mode="update_xml_pres">
12309
+ <xsl:apply-templates mode="update_xml_pres"/>
12310
+ </xsl:template>
12311
+ <xsl:template match="*[local-name() = 'fmt-deprecates'][not(*[local-name() = 'p'])] | *[local-name() = 'fmt-deprecates']/*[local-name() = 'p']" mode="update_xml_pres">
12312
+ <xsl:element name="deprecates" namespace="{$namespace_full}">
12313
+ <xsl:copy-of select="@*"/>
12314
+ <xsl:apply-templates mode="update_xml_pres"/>
12315
+ </xsl:element>
12316
+ </xsl:template>
12317
+
12318
+ <xsl:template match="*[local-name() = 'fmt-definition']"/>
12319
+ <xsl:template match="*[local-name() = 'fmt-definition']" mode="update_xml_step1">
12320
+ <xsl:element name="definition" namespace="{$namespace_full}">
12321
+ <xsl:copy-of select="@*"/>
12322
+ <xsl:apply-templates mode="update_xml_step1"/>
12323
+ </xsl:element>
12324
+ </xsl:template>
12325
+ <xsl:template match="*[local-name() = 'fmt-definition']" mode="update_xml_pres">
12326
+ <xsl:element name="definition" namespace="{$namespace_full}">
12327
+ <xsl:copy-of select="@*"/>
12328
+ <xsl:apply-templates mode="update_xml_pres"/>
12329
+ </xsl:element>
12330
+ </xsl:template>
12331
+
12332
+ <xsl:template match="*[local-name() = 'fmt-termsource']"/>
12333
+ <xsl:template match="*[local-name() = 'fmt-termsource']" mode="update_xml_step1">
12334
+ <xsl:element name="termsource" namespace="{$namespace_full}">
12335
+ <xsl:copy-of select="@*"/>
12336
+ <xsl:apply-templates mode="update_xml_step1"/>
12337
+ </xsl:element>
12338
+ </xsl:template>
12339
+ <xsl:template match="*[local-name() = 'fmt-termsource']" mode="update_xml_pres">
12340
+ <xsl:element name="termsource" namespace="{$namespace_full}">
12341
+ <xsl:copy-of select="@*"/>
12342
+ <xsl:apply-templates mode="update_xml_pres"/>
12343
+ </xsl:element>
12344
+ </xsl:template>
12345
+
12205
12346
  <xsl:template match="*[local-name() = 'span'][ @class = 'fmt-caption-label' or @class = 'fmt-element-name' or @class = 'fmt-caption-delim' or @class = 'fmt-autonum-delim']" mode="update_xml_step1" priority="3">
12206
12347
  <xsl:apply-templates mode="update_xml_step1"/>
12207
12348
  </xsl:template>
@@ -13333,7 +13474,7 @@
13333
13474
  </xsl:template>
13334
13475
 
13335
13476
  <xsl:template name="namespaceCheck">
13336
- <xsl:variable name="documentNS" select="namespace-uri(/*)"/>
13477
+ <xsl:variable name="documentNS" select="$namespace_full"/> <!-- namespace-uri(/*) -->
13337
13478
  <xsl:variable name="XSLNS">
13338
13479
 
13339
13480
  <xsl:value-of select="document('')//*/namespace::iho"/>
@@ -13423,6 +13564,9 @@
13423
13564
  <xsl:when test="$formatted = 'true' and string-length($bibdata_updated) != ''">
13424
13565
  <xsl:apply-templates select="xalan:nodeset($bibdata_updated)//*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
13425
13566
  </xsl:when>
13567
+ <xsl:when test="string-length($bibdata_updated) != ''">
13568
+ <xsl:value-of select="xalan:nodeset($bibdata_updated)//*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
13569
+ </xsl:when>
13426
13570
  <xsl:when test="$formatted = 'true'">
13427
13571
  <xsl:apply-templates select="xalan:nodeset($bibdata)//*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
13428
13572
  </xsl:when>
@@ -2066,6 +2066,9 @@
2066
2066
 
2067
2067
  </xsl:attribute-set>
2068
2068
 
2069
+ <xsl:attribute-set name="related-block-style" use-attribute-sets="preferred-block-style">
2070
+ </xsl:attribute-set>
2071
+
2069
2072
  <xsl:attribute-set name="definition-style">
2070
2073
 
2071
2074
  <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
@@ -4305,7 +4308,9 @@
4305
4308
  <xsl:with-param name="element">
4306
4309
  <fo:basic-link internal-destination="{$ref_id}" fox:alt-text="footnote {$current_fn_number}"> <!-- note: role="Lbl" removed in https://github.com/metanorma/mn2pdf/issues/291 -->
4307
4310
  <fo:inline role="Lbl"> <!-- need for https://github.com/metanorma/metanorma-iso/issues/1003 -->
4311
+
4308
4312
  <xsl:copy-of select="$current_fn_number_text"/>
4313
+
4309
4314
  </fo:inline>
4310
4315
  </fo:basic-link>
4311
4316
  </xsl:with-param>
@@ -4324,8 +4329,7 @@
4324
4329
 
4325
4330
  <fo:block-container xsl:use-attribute-sets="fn-container-body-style" role="SKIP">
4326
4331
 
4327
- <fo:block xsl:use-attribute-sets="fn-body-style" role="SKIP">
4328
-
4332
+ <xsl:variable name="fn_block">
4329
4333
  <xsl:call-template name="refine_fn-body-style"/>
4330
4334
 
4331
4335
  <fo:inline id="{$ref_id}" xsl:use-attribute-sets="fn-body-num-style" role="Lbl">
@@ -4333,9 +4337,15 @@
4333
4337
  <xsl:call-template name="refine_fn-body-num-style"/>
4334
4338
 
4335
4339
  <xsl:value-of select="$current_fn_number_text"/>
4340
+
4336
4341
  </fo:inline>
4337
4342
  <xsl:apply-templates/>
4338
- </fo:block>
4343
+ </xsl:variable>
4344
+
4345
+ <fo:block xsl:use-attribute-sets="fn-body-style" role="SKIP">
4346
+ <xsl:copy-of select="$fn_block"/>
4347
+ </fo:block>
4348
+
4339
4349
  </fo:block-container>
4340
4350
  </fo:footnote-body>
4341
4351
  </fo:footnote>
@@ -10446,14 +10456,17 @@
10446
10456
  </fo:block>
10447
10457
  </xsl:template>
10448
10458
 
10449
- <xsl:template match="*[local-name() = 'domain']">
10459
+ <!-- <xsl:template match="*[local-name() = 'domain']"> -->
10450
10460
  <!-- https://github.com/metanorma/isodoc/issues/607
10451
10461
  <fo:inline xsl:use-attribute-sets="domain-style">&lt;<xsl:apply-templates/>&gt;</fo:inline>
10452
10462
  <xsl:text> </xsl:text> -->
10453
- <xsl:if test="not(@hidden = 'true')">
10463
+ <!-- <xsl:if test="not(@hidden = 'true')">
10454
10464
  <xsl:apply-templates/>
10455
10465
  </xsl:if>
10456
- </xsl:template>
10466
+ </xsl:template> -->
10467
+
10468
+ <!-- https://github.com/metanorma/isodoc/issues/632#issuecomment-2567163931 -->
10469
+ <xsl:template match="*[local-name() = 'domain']"/>
10457
10470
 
10458
10471
  <xsl:template match="*[local-name() = 'admitted']">
10459
10472
  <fo:block xsl:use-attribute-sets="admitted-style">
@@ -10468,9 +10481,11 @@
10468
10481
  </xsl:template>
10469
10482
 
10470
10483
  <xsl:template name="setStyle_preferred">
10471
- <xsl:if test="*[local-name() = 'strong']">
10472
- <xsl:attribute name="font-weight">normal</xsl:attribute>
10473
- </xsl:if>
10484
+
10485
+ <xsl:if test="*[local-name() = 'strong']">
10486
+ <xsl:attribute name="font-weight">normal</xsl:attribute>
10487
+ </xsl:if>
10488
+
10474
10489
  </xsl:template>
10475
10490
 
10476
10491
  <!-- regarding ISO 10241-1:2011, If there is more than one preferred term, each preferred term follows the previous one on a new line. -->
@@ -10480,6 +10495,17 @@
10480
10495
  </xsl:template>
10481
10496
  <!-- End Preferred, admitted, deprecated -->
10482
10497
 
10498
+ <xsl:template match="*[local-name() = 'fmt-related']">
10499
+ <fo:block role="SKIP" xsl:use-attribute-sets="related-block-style">
10500
+ <xsl:apply-templates/>
10501
+ </fo:block>
10502
+ </xsl:template>
10503
+ <xsl:template match="*[local-name() = 'fmt-related']/*[local-name() = 'p']" priority="4">
10504
+ <fo:block>
10505
+ <xsl:apply-templates/>
10506
+ </fo:block>
10507
+ </xsl:template>
10508
+
10483
10509
  <!-- ========== -->
10484
10510
  <!-- definition -->
10485
10511
  <!-- ========== -->
@@ -11380,6 +11406,7 @@
11380
11406
 
11381
11407
  <!-- Normative references -->
11382
11408
  <xsl:template match="*[local-name() = 'references'][@normative='true']/*[local-name() = 'bibitem']" name="bibitem" priority="2">
11409
+ <xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][local-name() = 'bibitem'] and 1 = 1)"/> <!-- current bibiitem is non-first -->
11383
11410
 
11384
11411
  <fo:list-block id="{@id}" xsl:use-attribute-sets="bibitem-normative-list-style">
11385
11412
 
@@ -12101,7 +12128,8 @@
12101
12128
  <!-- add @id - first element with @id plus '_element_name' -->
12102
12129
  <xsl:variable name="prefix_id_" select="(.//*[@id])[1]/@id"/>
12103
12130
  <xsl:variable name="prefix_id"><xsl:value-of select="$prefix_id_"/><xsl:if test="normalize-space($prefix_id_) = ''"><xsl:value-of select="generate-id()"/></xsl:if></xsl:variable>
12104
- <xsl:attribute name="id"><xsl:value-of select="$prefix_id"/>_<xsl:value-of select="local-name()"/></xsl:attribute>
12131
+ <xsl:variable name="document_suffix" select="ancestor::*[contains(local-name(), '-standard')]/@document_suffix"/>
12132
+ <xsl:attribute name="id"><xsl:value-of select="concat($prefix_id, '_', local-name(), '_', $document_suffix)"/></xsl:attribute>
12105
12133
  </xsl:if>
12106
12134
  </xsl:template>
12107
12135
 
@@ -12158,6 +12186,31 @@
12158
12186
  <xsl:template match="*[local-name() = 'name'][following-sibling::*[1][local-name() = 'fmt-name']]" mode="update_xml_pres"/>
12159
12187
  <xsl:template match="*[local-name() = 'section-title'][following-sibling::*[1][local-name() = 'p'][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_step1"/>
12160
12188
  <xsl:template match="*[local-name() = 'section-title'][following-sibling::*[1][local-name() = 'p'][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_pres"/>
12189
+ <!-- <xsl:template match="*[local-name() = 'preferred'][following-sibling::*[not(local-name() = 'preferred')][1][local-name() = 'fmt-preferred']]" mode="update_xml_step1"/> -->
12190
+ <xsl:template match="*[local-name() = 'preferred']" mode="update_xml_step1"/>
12191
+ <!-- <xsl:template match="*[local-name() = 'preferred'][following-sibling::*[not(local-name() = 'preferred')][1][local-name() = 'fmt-preferred']]" mode="update_xml_pres"/> -->
12192
+ <xsl:template match="*[local-name() = 'preferred']" mode="update_xml_pres"/>
12193
+ <!-- <xsl:template match="*[local-name() = 'admitted'][following-sibling::*[not(local-name() = 'admitted')][1][local-name() = 'fmt-admitted']]" mode="update_xml_step1"/> -->
12194
+ <xsl:template match="*[local-name() = 'admitted']" mode="update_xml_step1"/>
12195
+ <!-- <xsl:template match="*[local-name() = 'admitted'][following-sibling::*[not(local-name() = 'admitted')][1][local-name() = 'fmt-admitted']]" mode="update_xml_pres"/> -->
12196
+ <xsl:template match="*[local-name() = 'admitted']" mode="update_xml_pres"/>
12197
+ <!-- <xsl:template match="*[local-name() = 'deprecates'][following-sibling::*[not(local-name() = 'deprecates')][1][local-name() = 'fmt-deprecates']]" mode="update_xml_step1"/> -->
12198
+ <xsl:template match="*[local-name() = 'deprecates']" mode="update_xml_step1"/>
12199
+ <xsl:template match="*[local-name() = 'related']" mode="update_xml_step1"/>
12200
+ <!-- <xsl:template match="*[local-name() = 'deprecates'][following-sibling::*[not(local-name() = 'deprecates')][1][local-name() = 'fmt-deprecates']]" mode="update_xml_pres"/> -->
12201
+ <xsl:template match="*[local-name() = 'deprecates']" mode="update_xml_pres"/>
12202
+ <xsl:template match="*[local-name() = 'related']" mode="update_xml_pres"/>
12203
+ <!-- <xsl:template match="*[local-name() = 'definition'][following-sibling::*[1][local-name() = 'fmt-definition']]" mode="update_xml_step1"/> -->
12204
+ <xsl:template match="*[local-name() = 'definition']" mode="update_xml_step1"/>
12205
+ <!-- <xsl:template match="*[local-name() = 'definition'][following-sibling::*[1][local-name() = 'fmt-definition']]" mode="update_xml_pres"/> -->
12206
+ <xsl:template match="*[local-name() = 'definition']" mode="update_xml_pres"/>
12207
+ <!-- <xsl:template match="*[local-name() = 'termsource'][following-sibling::*[1][local-name() = 'fmt-termsource']]" mode="update_xml_step1"/> -->
12208
+ <xsl:template match="*[local-name() = 'termsource']" mode="update_xml_step1"/>
12209
+ <!-- <xsl:template match="*[local-name() = 'termsource'][following-sibling::*[1][local-name() = 'fmt-termsource']]" mode="update_xml_pres"/> -->
12210
+ <xsl:template match="*[local-name() = 'termsource']" mode="update_xml_pres"/>
12211
+
12212
+ <xsl:template match="*[local-name() = 'term'][@unnumbered = 'true'][not(.//*[starts-with(local-name(), 'fmt-')])]" mode="update_xml_step1"/>
12213
+ <xsl:template match="*[local-name() = 'term'][@unnumbered = 'true'][not(.//*[starts-with(local-name(), 'fmt-')])]" mode="update_xml_pres"/>
12161
12214
 
12162
12215
  <xsl:template match="*[local-name() = 'p'][@type = 'section-title' or @type = 'floating-title'][preceding-sibling::*[1][local-name() = 'section-title']]" mode="update_xml_step1">
12163
12216
  <xsl:copy>
@@ -12202,6 +12255,94 @@
12202
12255
  </xsl:element>
12203
12256
  </xsl:template>
12204
12257
 
12258
+ <xsl:template match="*[local-name() = 'fmt-preferred']"/>
12259
+ <xsl:template match="*[local-name() = 'fmt-preferred'][*[local-name() = 'p']]" mode="update_xml_step1">
12260
+ <xsl:apply-templates mode="update_xml_step1"/>
12261
+ </xsl:template>
12262
+ <xsl:template match="*[local-name() = 'fmt-preferred'][not(*[local-name() = 'p'])] | *[local-name() = 'fmt-preferred']/*[local-name() = 'p']" mode="update_xml_step1">
12263
+ <xsl:element name="preferred" namespace="{$namespace_full}">
12264
+ <xsl:copy-of select="@*"/>
12265
+ <xsl:apply-templates mode="update_xml_step1"/>
12266
+ </xsl:element>
12267
+ </xsl:template>
12268
+ <xsl:template match="*[local-name() = 'fmt-preferred'][*[local-name() = 'p']]" mode="update_xml_pres">
12269
+ <xsl:apply-templates mode="update_xml_pres"/>
12270
+ </xsl:template>
12271
+ <xsl:template match="*[local-name() = 'fmt-preferred'][not(*[local-name() = 'p'])] | *[local-name() = 'fmt-preferred']/*[local-name() = 'p']" mode="update_xml_pres">
12272
+ <xsl:element name="preferred" namespace="{$namespace_full}">
12273
+ <xsl:copy-of select="@*"/>
12274
+ <xsl:apply-templates mode="update_xml_pres"/>
12275
+ </xsl:element>
12276
+ </xsl:template>
12277
+
12278
+ <xsl:template match="*[local-name() = 'fmt-admitted']"/>
12279
+ <xsl:template match="*[local-name() = 'fmt-admitted'][*[local-name() = 'p']]" mode="update_xml_step1">
12280
+ <xsl:apply-templates mode="update_xml_step1"/>
12281
+ </xsl:template>
12282
+ <xsl:template match="*[local-name() = 'fmt-admitted'][not(*[local-name() = 'p'])] | *[local-name() = 'fmt-admitted']/*[local-name() = 'p']" mode="update_xml_step1">
12283
+ <xsl:element name="admitted" namespace="{$namespace_full}">
12284
+ <xsl:copy-of select="@*"/>
12285
+ <xsl:apply-templates mode="update_xml_step1"/>
12286
+ </xsl:element>
12287
+ </xsl:template>
12288
+ <xsl:template match="*[local-name() = 'fmt-admitted'][*[local-name() = 'p']]" mode="update_xml_pres">
12289
+ <xsl:apply-templates mode="update_xml_pres"/>
12290
+ </xsl:template>
12291
+ <xsl:template match="*[local-name() = 'fmt-admitted'][not(*[local-name() = 'p'])] | *[local-name() = 'fmt-admitted']/*[local-name() = 'p']" mode="update_xml_pres">
12292
+ <xsl:element name="admitted" namespace="{$namespace_full}">
12293
+ <xsl:copy-of select="@*"/>
12294
+ <xsl:apply-templates mode="update_xml_pres"/>
12295
+ </xsl:element>
12296
+ </xsl:template>
12297
+
12298
+ <xsl:template match="*[local-name() = 'fmt-deprecates']"/>
12299
+ <xsl:template match="*[local-name() = 'fmt-deprecates'][*[local-name() = 'p']]" mode="update_xml_step1">
12300
+ <xsl:apply-templates mode="update_xml_step1"/>
12301
+ </xsl:template>
12302
+ <xsl:template match="*[local-name() = 'fmt-deprecates'][not(*[local-name() = 'p'])] | *[local-name() = 'fmt-deprecates']/*[local-name() = 'p']" mode="update_xml_step1">
12303
+ <xsl:element name="deprecates" namespace="{$namespace_full}">
12304
+ <xsl:copy-of select="@*"/>
12305
+ <xsl:apply-templates mode="update_xml_step1"/>
12306
+ </xsl:element>
12307
+ </xsl:template>
12308
+ <xsl:template match="*[local-name() = 'fmt-deprecates'][*[local-name() = 'p']]" mode="update_xml_pres">
12309
+ <xsl:apply-templates mode="update_xml_pres"/>
12310
+ </xsl:template>
12311
+ <xsl:template match="*[local-name() = 'fmt-deprecates'][not(*[local-name() = 'p'])] | *[local-name() = 'fmt-deprecates']/*[local-name() = 'p']" mode="update_xml_pres">
12312
+ <xsl:element name="deprecates" namespace="{$namespace_full}">
12313
+ <xsl:copy-of select="@*"/>
12314
+ <xsl:apply-templates mode="update_xml_pres"/>
12315
+ </xsl:element>
12316
+ </xsl:template>
12317
+
12318
+ <xsl:template match="*[local-name() = 'fmt-definition']"/>
12319
+ <xsl:template match="*[local-name() = 'fmt-definition']" mode="update_xml_step1">
12320
+ <xsl:element name="definition" namespace="{$namespace_full}">
12321
+ <xsl:copy-of select="@*"/>
12322
+ <xsl:apply-templates mode="update_xml_step1"/>
12323
+ </xsl:element>
12324
+ </xsl:template>
12325
+ <xsl:template match="*[local-name() = 'fmt-definition']" mode="update_xml_pres">
12326
+ <xsl:element name="definition" namespace="{$namespace_full}">
12327
+ <xsl:copy-of select="@*"/>
12328
+ <xsl:apply-templates mode="update_xml_pres"/>
12329
+ </xsl:element>
12330
+ </xsl:template>
12331
+
12332
+ <xsl:template match="*[local-name() = 'fmt-termsource']"/>
12333
+ <xsl:template match="*[local-name() = 'fmt-termsource']" mode="update_xml_step1">
12334
+ <xsl:element name="termsource" namespace="{$namespace_full}">
12335
+ <xsl:copy-of select="@*"/>
12336
+ <xsl:apply-templates mode="update_xml_step1"/>
12337
+ </xsl:element>
12338
+ </xsl:template>
12339
+ <xsl:template match="*[local-name() = 'fmt-termsource']" mode="update_xml_pres">
12340
+ <xsl:element name="termsource" namespace="{$namespace_full}">
12341
+ <xsl:copy-of select="@*"/>
12342
+ <xsl:apply-templates mode="update_xml_pres"/>
12343
+ </xsl:element>
12344
+ </xsl:template>
12345
+
12205
12346
  <xsl:template match="*[local-name() = 'span'][ @class = 'fmt-caption-label' or @class = 'fmt-element-name' or @class = 'fmt-caption-delim' or @class = 'fmt-autonum-delim']" mode="update_xml_step1" priority="3">
12206
12347
  <xsl:apply-templates mode="update_xml_step1"/>
12207
12348
  </xsl:template>
@@ -13333,7 +13474,7 @@
13333
13474
  </xsl:template>
13334
13475
 
13335
13476
  <xsl:template name="namespaceCheck">
13336
- <xsl:variable name="documentNS" select="namespace-uri(/*)"/>
13477
+ <xsl:variable name="documentNS" select="$namespace_full"/> <!-- namespace-uri(/*) -->
13337
13478
  <xsl:variable name="XSLNS">
13338
13479
 
13339
13480
  <xsl:value-of select="document('')//*/namespace::iho"/>
@@ -13423,6 +13564,9 @@
13423
13564
  <xsl:when test="$formatted = 'true' and string-length($bibdata_updated) != ''">
13424
13565
  <xsl:apply-templates select="xalan:nodeset($bibdata_updated)//*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
13425
13566
  </xsl:when>
13567
+ <xsl:when test="string-length($bibdata_updated) != ''">
13568
+ <xsl:value-of select="xalan:nodeset($bibdata_updated)//*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
13569
+ </xsl:when>
13426
13570
  <xsl:when test="$formatted = 'true'">
13427
13571
  <xsl:apply-templates select="xalan:nodeset($bibdata)//*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
13428
13572
  </xsl:when>
@@ -124,6 +124,7 @@ _bib)
124
124
 
125
125
  def term1(elem); end
126
126
 
127
+ # KILL
127
128
  def termsource1(elem)
128
129
  elem.parent.nil? and return
129
130
  while elem&.next_element&.name == "termsource"
@@ -135,6 +136,32 @@ _bib)
135
136
  defn.elements.last << s
136
137
  end
137
138
 
139
+ def termsource1(elem)
140
+ elem.parent.nil? and return
141
+ super
142
+ end
143
+
144
+ def termsource_label(elem, sources)
145
+ elem.at("./ancestor::xmlns:term") or return
146
+ elem.replace(l10n("[#{sources}]"))
147
+ end
148
+
149
+ def termcleanup(docxml)
150
+ collapse_term docxml
151
+ super
152
+ end
153
+
154
+ def collapse_term(docxml)
155
+ docxml.xpath(ns("//term")).each { |t| collapse_term1(t) }
156
+ end
157
+
158
+ def collapse_term1(term)
159
+ defn = term.at(ns("./fmt-definition")) or return
160
+ source = term.at(ns("./fmt-termsource")) or return
161
+ defn.elements.last << source.children
162
+ source.remove
163
+ end
164
+
138
165
  def clausedelim
139
166
  ""
140
167
  end
@@ -1277,17 +1277,17 @@ for which this claim of validity is made, if applicable</a:documentation>
1277
1277
  </define>
1278
1278
  <define name="validityBegins">
1279
1279
  <element name="validityBegins">
1280
- <ref name="ISO8601DateTime"/>
1280
+ <ref name="ISO8601Date"/>
1281
1281
  </element>
1282
1282
  </define>
1283
1283
  <define name="validityEnds">
1284
1284
  <element name="validityEnds">
1285
- <ref name="ISO8601DateTime"/>
1285
+ <ref name="ISO8601Date"/>
1286
1286
  </element>
1287
1287
  </define>
1288
1288
  <define name="validityRevision">
1289
1289
  <element name="revision">
1290
- <ref name="ISO8601DateTime"/>
1290
+ <ref name="ISO8601Date"/>
1291
1291
  </element>
1292
1292
  </define>
1293
1293
  <define name="TypedTitleString">
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module Iho
3
- VERSION = "1.0.14".freeze
3
+ VERSION = "1.0.15".freeze
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-iho
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.14
4
+ version: 1.0.15
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2025-01-07 00:00:00.000000000 Z
11
+ date: 2025-01-20 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: metanorma-generic