metanorma-iso 2.9.4 → 2.9.5

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: 04e8a6e12c2d31b25893f7989e56136cffdd5f5b7454c3efc4d2028e65915654
4
- data.tar.gz: 7f33792d10112a1cc967ea5a33e4fbe5d85e75f4044302be995d37774aa83a91
3
+ metadata.gz: 1fe83bad2a7399c95b11c24d60ba37fb5068570bb7da9af1cf0bee99380dfc3f
4
+ data.tar.gz: a7b5bee127f589a01fbe2d4161c2ab1dfc3b7f2c03ca96d9294871dbbd25640c
5
5
  SHA512:
6
- metadata.gz: 109dd7d18991f5fad55c38188719e142046b50ffe5d95e8c90928018081572a7b1db1df7a2cd8f42a3f69747052039a3d1af5eb6783c6867a8d0807b3a9cde24
7
- data.tar.gz: 79e315175efdc57d53e46885cd0d4fd687b3012a84d7d15fd9c9684736814ebc3fff485fc29e7531d4e208bf8c1690d7a5e237da496179afaae47f5e861061cb
6
+ metadata.gz: 2990837a34da1911b1070d458e735411235e6d2619993a95f2db33608ade897e289d4bb22e13897e5cfa5fd8b1ad60d129d5c65b5a85821dd556be724b202ca1
7
+ data.tar.gz: 808778fb664c374ce55a916da7b7e3389614ccd5a78297d525aed3926005256edceab2f72b80a4b50f194cdf270706fd4ec89071176b1f29b2484bd870fb9cf7
@@ -7015,6 +7015,9 @@
7015
7015
 
7016
7016
  </xsl:attribute-set>
7017
7017
 
7018
+ <xsl:attribute-set name="related-block-style" use-attribute-sets="preferred-block-style">
7019
+ </xsl:attribute-set>
7020
+
7018
7021
  <xsl:attribute-set name="definition-style">
7019
7022
 
7020
7023
  <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
@@ -9364,7 +9367,9 @@
9364
9367
  <xsl:with-param name="element">
9365
9368
  <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 -->
9366
9369
  <fo:inline role="Lbl"> <!-- need for https://github.com/metanorma/metanorma-iso/issues/1003 -->
9370
+
9367
9371
  <xsl:copy-of select="$current_fn_number_text"/>
9372
+
9368
9373
  </fo:inline>
9369
9374
  </fo:basic-link>
9370
9375
  </xsl:with-param>
@@ -9383,8 +9388,7 @@
9383
9388
 
9384
9389
  <fo:block-container xsl:use-attribute-sets="fn-container-body-style" role="SKIP">
9385
9390
 
9386
- <fo:block xsl:use-attribute-sets="fn-body-style" role="SKIP">
9387
-
9391
+ <xsl:variable name="fn_block">
9388
9392
  <xsl:call-template name="refine_fn-body-style"/>
9389
9393
 
9390
9394
  <fo:inline id="{$ref_id}" xsl:use-attribute-sets="fn-body-num-style" role="Lbl">
@@ -9392,9 +9396,15 @@
9392
9396
  <xsl:call-template name="refine_fn-body-num-style"/>
9393
9397
 
9394
9398
  <xsl:value-of select="$current_fn_number_text"/>
9399
+
9395
9400
  </fo:inline>
9396
9401
  <xsl:apply-templates/>
9397
- </fo:block>
9402
+ </xsl:variable>
9403
+
9404
+ <fo:block xsl:use-attribute-sets="fn-body-style" role="SKIP">
9405
+ <xsl:copy-of select="$fn_block"/>
9406
+ </fo:block>
9407
+
9398
9408
  </fo:block-container>
9399
9409
  </fo:footnote-body>
9400
9410
  </fo:footnote>
@@ -15583,14 +15593,17 @@
15583
15593
  </fo:block>
15584
15594
  </xsl:template>
15585
15595
 
15586
- <xsl:template match="*[local-name() = 'domain']">
15596
+ <!-- <xsl:template match="*[local-name() = 'domain']"> -->
15587
15597
  <!-- https://github.com/metanorma/isodoc/issues/607
15588
15598
  <fo:inline xsl:use-attribute-sets="domain-style">&lt;<xsl:apply-templates/>&gt;</fo:inline>
15589
15599
  <xsl:text> </xsl:text> -->
15590
- <xsl:if test="not(@hidden = 'true')">
15600
+ <!-- <xsl:if test="not(@hidden = 'true')">
15591
15601
  <xsl:apply-templates/>
15592
15602
  </xsl:if>
15593
- </xsl:template>
15603
+ </xsl:template> -->
15604
+
15605
+ <!-- https://github.com/metanorma/isodoc/issues/632#issuecomment-2567163931 -->
15606
+ <xsl:template match="*[local-name() = 'domain']"/>
15594
15607
 
15595
15608
  <xsl:template match="*[local-name() = 'admitted']">
15596
15609
  <fo:block xsl:use-attribute-sets="admitted-style">
@@ -15605,9 +15618,11 @@
15605
15618
  </xsl:template>
15606
15619
 
15607
15620
  <xsl:template name="setStyle_preferred">
15608
- <xsl:if test="*[local-name() = 'strong']">
15609
- <xsl:attribute name="font-weight">normal</xsl:attribute>
15610
- </xsl:if>
15621
+
15622
+ <xsl:if test="*[local-name() = 'strong']">
15623
+ <xsl:attribute name="font-weight">normal</xsl:attribute>
15624
+ </xsl:if>
15625
+
15611
15626
  </xsl:template>
15612
15627
 
15613
15628
  <!-- regarding ISO 10241-1:2011, If there is more than one preferred term, each preferred term follows the previous one on a new line. -->
@@ -15617,6 +15632,17 @@
15617
15632
  </xsl:template>
15618
15633
  <!-- End Preferred, admitted, deprecated -->
15619
15634
 
15635
+ <xsl:template match="*[local-name() = 'fmt-related']">
15636
+ <fo:block role="SKIP" xsl:use-attribute-sets="related-block-style">
15637
+ <xsl:apply-templates/>
15638
+ </fo:block>
15639
+ </xsl:template>
15640
+ <xsl:template match="*[local-name() = 'fmt-related']/*[local-name() = 'p']" priority="4">
15641
+ <fo:block>
15642
+ <xsl:apply-templates/>
15643
+ </fo:block>
15644
+ </xsl:template>
15645
+
15620
15646
  <!-- ========== -->
15621
15647
  <!-- definition -->
15622
15648
  <!-- ========== -->
@@ -16577,6 +16603,7 @@
16577
16603
 
16578
16604
  <!-- Normative references -->
16579
16605
  <xsl:template match="*[local-name() = 'references'][@normative='true']/*[local-name() = 'bibitem']" name="bibitem" priority="2">
16606
+ <xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][local-name() = 'bibitem'] and 1 = 1)"/> <!-- current bibiitem is non-first -->
16580
16607
 
16581
16608
  <fo:block id="{@id}" xsl:use-attribute-sets="bibitem-normative-style">
16582
16609
 
@@ -17299,7 +17326,8 @@
17299
17326
  <!-- add @id - first element with @id plus '_element_name' -->
17300
17327
  <xsl:variable name="prefix_id_" select="(.//*[@id])[1]/@id"/>
17301
17328
  <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>
17302
- <xsl:attribute name="id"><xsl:value-of select="$prefix_id"/>_<xsl:value-of select="local-name()"/></xsl:attribute>
17329
+ <xsl:variable name="document_suffix" select="ancestor::*[contains(local-name(), '-standard')]/@document_suffix"/>
17330
+ <xsl:attribute name="id"><xsl:value-of select="concat($prefix_id, '_', local-name(), '_', $document_suffix)"/></xsl:attribute>
17303
17331
  </xsl:if>
17304
17332
  </xsl:template>
17305
17333
 
@@ -17356,6 +17384,31 @@
17356
17384
  <xsl:template match="*[local-name() = 'name'][following-sibling::*[1][local-name() = 'fmt-name']]" mode="update_xml_pres"/>
17357
17385
  <xsl:template match="*[local-name() = 'section-title'][following-sibling::*[1][local-name() = 'p'][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_step1"/>
17358
17386
  <xsl:template match="*[local-name() = 'section-title'][following-sibling::*[1][local-name() = 'p'][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_pres"/>
17387
+ <!-- <xsl:template match="*[local-name() = 'preferred'][following-sibling::*[not(local-name() = 'preferred')][1][local-name() = 'fmt-preferred']]" mode="update_xml_step1"/> -->
17388
+ <xsl:template match="*[local-name() = 'preferred']" mode="update_xml_step1"/>
17389
+ <!-- <xsl:template match="*[local-name() = 'preferred'][following-sibling::*[not(local-name() = 'preferred')][1][local-name() = 'fmt-preferred']]" mode="update_xml_pres"/> -->
17390
+ <xsl:template match="*[local-name() = 'preferred']" mode="update_xml_pres"/>
17391
+ <!-- <xsl:template match="*[local-name() = 'admitted'][following-sibling::*[not(local-name() = 'admitted')][1][local-name() = 'fmt-admitted']]" mode="update_xml_step1"/> -->
17392
+ <xsl:template match="*[local-name() = 'admitted']" mode="update_xml_step1"/>
17393
+ <!-- <xsl:template match="*[local-name() = 'admitted'][following-sibling::*[not(local-name() = 'admitted')][1][local-name() = 'fmt-admitted']]" mode="update_xml_pres"/> -->
17394
+ <xsl:template match="*[local-name() = 'admitted']" mode="update_xml_pres"/>
17395
+ <!-- <xsl:template match="*[local-name() = 'deprecates'][following-sibling::*[not(local-name() = 'deprecates')][1][local-name() = 'fmt-deprecates']]" mode="update_xml_step1"/> -->
17396
+ <xsl:template match="*[local-name() = 'deprecates']" mode="update_xml_step1"/>
17397
+ <xsl:template match="*[local-name() = 'related']" mode="update_xml_step1"/>
17398
+ <!-- <xsl:template match="*[local-name() = 'deprecates'][following-sibling::*[not(local-name() = 'deprecates')][1][local-name() = 'fmt-deprecates']]" mode="update_xml_pres"/> -->
17399
+ <xsl:template match="*[local-name() = 'deprecates']" mode="update_xml_pres"/>
17400
+ <xsl:template match="*[local-name() = 'related']" mode="update_xml_pres"/>
17401
+ <!-- <xsl:template match="*[local-name() = 'definition'][following-sibling::*[1][local-name() = 'fmt-definition']]" mode="update_xml_step1"/> -->
17402
+ <xsl:template match="*[local-name() = 'definition']" mode="update_xml_step1"/>
17403
+ <!-- <xsl:template match="*[local-name() = 'definition'][following-sibling::*[1][local-name() = 'fmt-definition']]" mode="update_xml_pres"/> -->
17404
+ <xsl:template match="*[local-name() = 'definition']" mode="update_xml_pres"/>
17405
+ <!-- <xsl:template match="*[local-name() = 'termsource'][following-sibling::*[1][local-name() = 'fmt-termsource']]" mode="update_xml_step1"/> -->
17406
+ <xsl:template match="*[local-name() = 'termsource']" mode="update_xml_step1"/>
17407
+ <!-- <xsl:template match="*[local-name() = 'termsource'][following-sibling::*[1][local-name() = 'fmt-termsource']]" mode="update_xml_pres"/> -->
17408
+ <xsl:template match="*[local-name() = 'termsource']" mode="update_xml_pres"/>
17409
+
17410
+ <xsl:template match="*[local-name() = 'term'][@unnumbered = 'true'][not(.//*[starts-with(local-name(), 'fmt-')])]" mode="update_xml_step1"/>
17411
+ <xsl:template match="*[local-name() = 'term'][@unnumbered = 'true'][not(.//*[starts-with(local-name(), 'fmt-')])]" mode="update_xml_pres"/>
17359
17412
 
17360
17413
  <xsl:template match="*[local-name() = 'p'][@type = 'section-title' or @type = 'floating-title'][preceding-sibling::*[1][local-name() = 'section-title']]" mode="update_xml_step1">
17361
17414
  <xsl:copy>
@@ -17400,6 +17453,94 @@
17400
17453
  </xsl:element>
17401
17454
  </xsl:template>
17402
17455
 
17456
+ <xsl:template match="*[local-name() = 'fmt-preferred']"/>
17457
+ <xsl:template match="*[local-name() = 'fmt-preferred'][*[local-name() = 'p']]" mode="update_xml_step1">
17458
+ <xsl:apply-templates mode="update_xml_step1"/>
17459
+ </xsl:template>
17460
+ <xsl:template match="*[local-name() = 'fmt-preferred'][not(*[local-name() = 'p'])] | *[local-name() = 'fmt-preferred']/*[local-name() = 'p']" mode="update_xml_step1">
17461
+ <xsl:element name="preferred" namespace="{$namespace_full}">
17462
+ <xsl:copy-of select="@*"/>
17463
+ <xsl:apply-templates mode="update_xml_step1"/>
17464
+ </xsl:element>
17465
+ </xsl:template>
17466
+ <xsl:template match="*[local-name() = 'fmt-preferred'][*[local-name() = 'p']]" mode="update_xml_pres">
17467
+ <xsl:apply-templates mode="update_xml_pres"/>
17468
+ </xsl:template>
17469
+ <xsl:template match="*[local-name() = 'fmt-preferred'][not(*[local-name() = 'p'])] | *[local-name() = 'fmt-preferred']/*[local-name() = 'p']" mode="update_xml_pres">
17470
+ <xsl:element name="preferred" namespace="{$namespace_full}">
17471
+ <xsl:copy-of select="@*"/>
17472
+ <xsl:apply-templates mode="update_xml_pres"/>
17473
+ </xsl:element>
17474
+ </xsl:template>
17475
+
17476
+ <xsl:template match="*[local-name() = 'fmt-admitted']"/>
17477
+ <xsl:template match="*[local-name() = 'fmt-admitted'][*[local-name() = 'p']]" mode="update_xml_step1">
17478
+ <xsl:apply-templates mode="update_xml_step1"/>
17479
+ </xsl:template>
17480
+ <xsl:template match="*[local-name() = 'fmt-admitted'][not(*[local-name() = 'p'])] | *[local-name() = 'fmt-admitted']/*[local-name() = 'p']" mode="update_xml_step1">
17481
+ <xsl:element name="admitted" namespace="{$namespace_full}">
17482
+ <xsl:copy-of select="@*"/>
17483
+ <xsl:apply-templates mode="update_xml_step1"/>
17484
+ </xsl:element>
17485
+ </xsl:template>
17486
+ <xsl:template match="*[local-name() = 'fmt-admitted'][*[local-name() = 'p']]" mode="update_xml_pres">
17487
+ <xsl:apply-templates mode="update_xml_pres"/>
17488
+ </xsl:template>
17489
+ <xsl:template match="*[local-name() = 'fmt-admitted'][not(*[local-name() = 'p'])] | *[local-name() = 'fmt-admitted']/*[local-name() = 'p']" mode="update_xml_pres">
17490
+ <xsl:element name="admitted" namespace="{$namespace_full}">
17491
+ <xsl:copy-of select="@*"/>
17492
+ <xsl:apply-templates mode="update_xml_pres"/>
17493
+ </xsl:element>
17494
+ </xsl:template>
17495
+
17496
+ <xsl:template match="*[local-name() = 'fmt-deprecates']"/>
17497
+ <xsl:template match="*[local-name() = 'fmt-deprecates'][*[local-name() = 'p']]" mode="update_xml_step1">
17498
+ <xsl:apply-templates mode="update_xml_step1"/>
17499
+ </xsl:template>
17500
+ <xsl:template match="*[local-name() = 'fmt-deprecates'][not(*[local-name() = 'p'])] | *[local-name() = 'fmt-deprecates']/*[local-name() = 'p']" mode="update_xml_step1">
17501
+ <xsl:element name="deprecates" namespace="{$namespace_full}">
17502
+ <xsl:copy-of select="@*"/>
17503
+ <xsl:apply-templates mode="update_xml_step1"/>
17504
+ </xsl:element>
17505
+ </xsl:template>
17506
+ <xsl:template match="*[local-name() = 'fmt-deprecates'][*[local-name() = 'p']]" mode="update_xml_pres">
17507
+ <xsl:apply-templates mode="update_xml_pres"/>
17508
+ </xsl:template>
17509
+ <xsl:template match="*[local-name() = 'fmt-deprecates'][not(*[local-name() = 'p'])] | *[local-name() = 'fmt-deprecates']/*[local-name() = 'p']" mode="update_xml_pres">
17510
+ <xsl:element name="deprecates" namespace="{$namespace_full}">
17511
+ <xsl:copy-of select="@*"/>
17512
+ <xsl:apply-templates mode="update_xml_pres"/>
17513
+ </xsl:element>
17514
+ </xsl:template>
17515
+
17516
+ <xsl:template match="*[local-name() = 'fmt-definition']"/>
17517
+ <xsl:template match="*[local-name() = 'fmt-definition']" mode="update_xml_step1">
17518
+ <xsl:element name="definition" namespace="{$namespace_full}">
17519
+ <xsl:copy-of select="@*"/>
17520
+ <xsl:apply-templates mode="update_xml_step1"/>
17521
+ </xsl:element>
17522
+ </xsl:template>
17523
+ <xsl:template match="*[local-name() = 'fmt-definition']" mode="update_xml_pres">
17524
+ <xsl:element name="definition" namespace="{$namespace_full}">
17525
+ <xsl:copy-of select="@*"/>
17526
+ <xsl:apply-templates mode="update_xml_pres"/>
17527
+ </xsl:element>
17528
+ </xsl:template>
17529
+
17530
+ <xsl:template match="*[local-name() = 'fmt-termsource']"/>
17531
+ <xsl:template match="*[local-name() = 'fmt-termsource']" mode="update_xml_step1">
17532
+ <xsl:element name="termsource" namespace="{$namespace_full}">
17533
+ <xsl:copy-of select="@*"/>
17534
+ <xsl:apply-templates mode="update_xml_step1"/>
17535
+ </xsl:element>
17536
+ </xsl:template>
17537
+ <xsl:template match="*[local-name() = 'fmt-termsource']" mode="update_xml_pres">
17538
+ <xsl:element name="termsource" namespace="{$namespace_full}">
17539
+ <xsl:copy-of select="@*"/>
17540
+ <xsl:apply-templates mode="update_xml_pres"/>
17541
+ </xsl:element>
17542
+ </xsl:template>
17543
+
17403
17544
  <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">
17404
17545
  <xsl:apply-templates mode="update_xml_step1"/>
17405
17546
  </xsl:template>
@@ -18665,7 +18806,7 @@
18665
18806
  </xsl:template>
18666
18807
 
18667
18808
  <xsl:template name="namespaceCheck">
18668
- <xsl:variable name="documentNS" select="namespace-uri(/*)"/>
18809
+ <xsl:variable name="documentNS" select="$namespace_full"/> <!-- namespace-uri(/*) -->
18669
18810
  <xsl:variable name="XSLNS">
18670
18811
 
18671
18812
  <xsl:value-of select="document('')//*/namespace::iso"/>
@@ -18755,6 +18896,9 @@
18755
18896
  <xsl:when test="$formatted = 'true' and string-length($bibdata_updated) != ''">
18756
18897
  <xsl:apply-templates select="xalan:nodeset($bibdata_updated)//*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
18757
18898
  </xsl:when>
18899
+ <xsl:when test="string-length($bibdata_updated) != ''">
18900
+ <xsl:value-of select="xalan:nodeset($bibdata_updated)//*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
18901
+ </xsl:when>
18758
18902
  <xsl:when test="$formatted = 'true'">
18759
18903
  <xsl:apply-templates select="xalan:nodeset($bibdata)//*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
18760
18904
  </xsl:when>
@@ -7015,6 +7015,9 @@
7015
7015
 
7016
7016
  </xsl:attribute-set>
7017
7017
 
7018
+ <xsl:attribute-set name="related-block-style" use-attribute-sets="preferred-block-style">
7019
+ </xsl:attribute-set>
7020
+
7018
7021
  <xsl:attribute-set name="definition-style">
7019
7022
 
7020
7023
  <xsl:attribute name="margin-bottom">6pt</xsl:attribute>
@@ -9364,7 +9367,9 @@
9364
9367
  <xsl:with-param name="element">
9365
9368
  <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 -->
9366
9369
  <fo:inline role="Lbl"> <!-- need for https://github.com/metanorma/metanorma-iso/issues/1003 -->
9370
+
9367
9371
  <xsl:copy-of select="$current_fn_number_text"/>
9372
+
9368
9373
  </fo:inline>
9369
9374
  </fo:basic-link>
9370
9375
  </xsl:with-param>
@@ -9383,8 +9388,7 @@
9383
9388
 
9384
9389
  <fo:block-container xsl:use-attribute-sets="fn-container-body-style" role="SKIP">
9385
9390
 
9386
- <fo:block xsl:use-attribute-sets="fn-body-style" role="SKIP">
9387
-
9391
+ <xsl:variable name="fn_block">
9388
9392
  <xsl:call-template name="refine_fn-body-style"/>
9389
9393
 
9390
9394
  <fo:inline id="{$ref_id}" xsl:use-attribute-sets="fn-body-num-style" role="Lbl">
@@ -9392,9 +9396,15 @@
9392
9396
  <xsl:call-template name="refine_fn-body-num-style"/>
9393
9397
 
9394
9398
  <xsl:value-of select="$current_fn_number_text"/>
9399
+
9395
9400
  </fo:inline>
9396
9401
  <xsl:apply-templates/>
9397
- </fo:block>
9402
+ </xsl:variable>
9403
+
9404
+ <fo:block xsl:use-attribute-sets="fn-body-style" role="SKIP">
9405
+ <xsl:copy-of select="$fn_block"/>
9406
+ </fo:block>
9407
+
9398
9408
  </fo:block-container>
9399
9409
  </fo:footnote-body>
9400
9410
  </fo:footnote>
@@ -15583,14 +15593,17 @@
15583
15593
  </fo:block>
15584
15594
  </xsl:template>
15585
15595
 
15586
- <xsl:template match="*[local-name() = 'domain']">
15596
+ <!-- <xsl:template match="*[local-name() = 'domain']"> -->
15587
15597
  <!-- https://github.com/metanorma/isodoc/issues/607
15588
15598
  <fo:inline xsl:use-attribute-sets="domain-style">&lt;<xsl:apply-templates/>&gt;</fo:inline>
15589
15599
  <xsl:text> </xsl:text> -->
15590
- <xsl:if test="not(@hidden = 'true')">
15600
+ <!-- <xsl:if test="not(@hidden = 'true')">
15591
15601
  <xsl:apply-templates/>
15592
15602
  </xsl:if>
15593
- </xsl:template>
15603
+ </xsl:template> -->
15604
+
15605
+ <!-- https://github.com/metanorma/isodoc/issues/632#issuecomment-2567163931 -->
15606
+ <xsl:template match="*[local-name() = 'domain']"/>
15594
15607
 
15595
15608
  <xsl:template match="*[local-name() = 'admitted']">
15596
15609
  <fo:block xsl:use-attribute-sets="admitted-style">
@@ -15605,9 +15618,11 @@
15605
15618
  </xsl:template>
15606
15619
 
15607
15620
  <xsl:template name="setStyle_preferred">
15608
- <xsl:if test="*[local-name() = 'strong']">
15609
- <xsl:attribute name="font-weight">normal</xsl:attribute>
15610
- </xsl:if>
15621
+
15622
+ <xsl:if test="*[local-name() = 'strong']">
15623
+ <xsl:attribute name="font-weight">normal</xsl:attribute>
15624
+ </xsl:if>
15625
+
15611
15626
  </xsl:template>
15612
15627
 
15613
15628
  <!-- regarding ISO 10241-1:2011, If there is more than one preferred term, each preferred term follows the previous one on a new line. -->
@@ -15617,6 +15632,17 @@
15617
15632
  </xsl:template>
15618
15633
  <!-- End Preferred, admitted, deprecated -->
15619
15634
 
15635
+ <xsl:template match="*[local-name() = 'fmt-related']">
15636
+ <fo:block role="SKIP" xsl:use-attribute-sets="related-block-style">
15637
+ <xsl:apply-templates/>
15638
+ </fo:block>
15639
+ </xsl:template>
15640
+ <xsl:template match="*[local-name() = 'fmt-related']/*[local-name() = 'p']" priority="4">
15641
+ <fo:block>
15642
+ <xsl:apply-templates/>
15643
+ </fo:block>
15644
+ </xsl:template>
15645
+
15620
15646
  <!-- ========== -->
15621
15647
  <!-- definition -->
15622
15648
  <!-- ========== -->
@@ -16577,6 +16603,7 @@
16577
16603
 
16578
16604
  <!-- Normative references -->
16579
16605
  <xsl:template match="*[local-name() = 'references'][@normative='true']/*[local-name() = 'bibitem']" name="bibitem" priority="2">
16606
+ <xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][local-name() = 'bibitem'] and 1 = 1)"/> <!-- current bibiitem is non-first -->
16580
16607
 
16581
16608
  <fo:block id="{@id}" xsl:use-attribute-sets="bibitem-normative-style">
16582
16609
 
@@ -17299,7 +17326,8 @@
17299
17326
  <!-- add @id - first element with @id plus '_element_name' -->
17300
17327
  <xsl:variable name="prefix_id_" select="(.//*[@id])[1]/@id"/>
17301
17328
  <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>
17302
- <xsl:attribute name="id"><xsl:value-of select="$prefix_id"/>_<xsl:value-of select="local-name()"/></xsl:attribute>
17329
+ <xsl:variable name="document_suffix" select="ancestor::*[contains(local-name(), '-standard')]/@document_suffix"/>
17330
+ <xsl:attribute name="id"><xsl:value-of select="concat($prefix_id, '_', local-name(), '_', $document_suffix)"/></xsl:attribute>
17303
17331
  </xsl:if>
17304
17332
  </xsl:template>
17305
17333
 
@@ -17356,6 +17384,31 @@
17356
17384
  <xsl:template match="*[local-name() = 'name'][following-sibling::*[1][local-name() = 'fmt-name']]" mode="update_xml_pres"/>
17357
17385
  <xsl:template match="*[local-name() = 'section-title'][following-sibling::*[1][local-name() = 'p'][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_step1"/>
17358
17386
  <xsl:template match="*[local-name() = 'section-title'][following-sibling::*[1][local-name() = 'p'][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_pres"/>
17387
+ <!-- <xsl:template match="*[local-name() = 'preferred'][following-sibling::*[not(local-name() = 'preferred')][1][local-name() = 'fmt-preferred']]" mode="update_xml_step1"/> -->
17388
+ <xsl:template match="*[local-name() = 'preferred']" mode="update_xml_step1"/>
17389
+ <!-- <xsl:template match="*[local-name() = 'preferred'][following-sibling::*[not(local-name() = 'preferred')][1][local-name() = 'fmt-preferred']]" mode="update_xml_pres"/> -->
17390
+ <xsl:template match="*[local-name() = 'preferred']" mode="update_xml_pres"/>
17391
+ <!-- <xsl:template match="*[local-name() = 'admitted'][following-sibling::*[not(local-name() = 'admitted')][1][local-name() = 'fmt-admitted']]" mode="update_xml_step1"/> -->
17392
+ <xsl:template match="*[local-name() = 'admitted']" mode="update_xml_step1"/>
17393
+ <!-- <xsl:template match="*[local-name() = 'admitted'][following-sibling::*[not(local-name() = 'admitted')][1][local-name() = 'fmt-admitted']]" mode="update_xml_pres"/> -->
17394
+ <xsl:template match="*[local-name() = 'admitted']" mode="update_xml_pres"/>
17395
+ <!-- <xsl:template match="*[local-name() = 'deprecates'][following-sibling::*[not(local-name() = 'deprecates')][1][local-name() = 'fmt-deprecates']]" mode="update_xml_step1"/> -->
17396
+ <xsl:template match="*[local-name() = 'deprecates']" mode="update_xml_step1"/>
17397
+ <xsl:template match="*[local-name() = 'related']" mode="update_xml_step1"/>
17398
+ <!-- <xsl:template match="*[local-name() = 'deprecates'][following-sibling::*[not(local-name() = 'deprecates')][1][local-name() = 'fmt-deprecates']]" mode="update_xml_pres"/> -->
17399
+ <xsl:template match="*[local-name() = 'deprecates']" mode="update_xml_pres"/>
17400
+ <xsl:template match="*[local-name() = 'related']" mode="update_xml_pres"/>
17401
+ <!-- <xsl:template match="*[local-name() = 'definition'][following-sibling::*[1][local-name() = 'fmt-definition']]" mode="update_xml_step1"/> -->
17402
+ <xsl:template match="*[local-name() = 'definition']" mode="update_xml_step1"/>
17403
+ <!-- <xsl:template match="*[local-name() = 'definition'][following-sibling::*[1][local-name() = 'fmt-definition']]" mode="update_xml_pres"/> -->
17404
+ <xsl:template match="*[local-name() = 'definition']" mode="update_xml_pres"/>
17405
+ <!-- <xsl:template match="*[local-name() = 'termsource'][following-sibling::*[1][local-name() = 'fmt-termsource']]" mode="update_xml_step1"/> -->
17406
+ <xsl:template match="*[local-name() = 'termsource']" mode="update_xml_step1"/>
17407
+ <!-- <xsl:template match="*[local-name() = 'termsource'][following-sibling::*[1][local-name() = 'fmt-termsource']]" mode="update_xml_pres"/> -->
17408
+ <xsl:template match="*[local-name() = 'termsource']" mode="update_xml_pres"/>
17409
+
17410
+ <xsl:template match="*[local-name() = 'term'][@unnumbered = 'true'][not(.//*[starts-with(local-name(), 'fmt-')])]" mode="update_xml_step1"/>
17411
+ <xsl:template match="*[local-name() = 'term'][@unnumbered = 'true'][not(.//*[starts-with(local-name(), 'fmt-')])]" mode="update_xml_pres"/>
17359
17412
 
17360
17413
  <xsl:template match="*[local-name() = 'p'][@type = 'section-title' or @type = 'floating-title'][preceding-sibling::*[1][local-name() = 'section-title']]" mode="update_xml_step1">
17361
17414
  <xsl:copy>
@@ -17400,6 +17453,94 @@
17400
17453
  </xsl:element>
17401
17454
  </xsl:template>
17402
17455
 
17456
+ <xsl:template match="*[local-name() = 'fmt-preferred']"/>
17457
+ <xsl:template match="*[local-name() = 'fmt-preferred'][*[local-name() = 'p']]" mode="update_xml_step1">
17458
+ <xsl:apply-templates mode="update_xml_step1"/>
17459
+ </xsl:template>
17460
+ <xsl:template match="*[local-name() = 'fmt-preferred'][not(*[local-name() = 'p'])] | *[local-name() = 'fmt-preferred']/*[local-name() = 'p']" mode="update_xml_step1">
17461
+ <xsl:element name="preferred" namespace="{$namespace_full}">
17462
+ <xsl:copy-of select="@*"/>
17463
+ <xsl:apply-templates mode="update_xml_step1"/>
17464
+ </xsl:element>
17465
+ </xsl:template>
17466
+ <xsl:template match="*[local-name() = 'fmt-preferred'][*[local-name() = 'p']]" mode="update_xml_pres">
17467
+ <xsl:apply-templates mode="update_xml_pres"/>
17468
+ </xsl:template>
17469
+ <xsl:template match="*[local-name() = 'fmt-preferred'][not(*[local-name() = 'p'])] | *[local-name() = 'fmt-preferred']/*[local-name() = 'p']" mode="update_xml_pres">
17470
+ <xsl:element name="preferred" namespace="{$namespace_full}">
17471
+ <xsl:copy-of select="@*"/>
17472
+ <xsl:apply-templates mode="update_xml_pres"/>
17473
+ </xsl:element>
17474
+ </xsl:template>
17475
+
17476
+ <xsl:template match="*[local-name() = 'fmt-admitted']"/>
17477
+ <xsl:template match="*[local-name() = 'fmt-admitted'][*[local-name() = 'p']]" mode="update_xml_step1">
17478
+ <xsl:apply-templates mode="update_xml_step1"/>
17479
+ </xsl:template>
17480
+ <xsl:template match="*[local-name() = 'fmt-admitted'][not(*[local-name() = 'p'])] | *[local-name() = 'fmt-admitted']/*[local-name() = 'p']" mode="update_xml_step1">
17481
+ <xsl:element name="admitted" namespace="{$namespace_full}">
17482
+ <xsl:copy-of select="@*"/>
17483
+ <xsl:apply-templates mode="update_xml_step1"/>
17484
+ </xsl:element>
17485
+ </xsl:template>
17486
+ <xsl:template match="*[local-name() = 'fmt-admitted'][*[local-name() = 'p']]" mode="update_xml_pres">
17487
+ <xsl:apply-templates mode="update_xml_pres"/>
17488
+ </xsl:template>
17489
+ <xsl:template match="*[local-name() = 'fmt-admitted'][not(*[local-name() = 'p'])] | *[local-name() = 'fmt-admitted']/*[local-name() = 'p']" mode="update_xml_pres">
17490
+ <xsl:element name="admitted" namespace="{$namespace_full}">
17491
+ <xsl:copy-of select="@*"/>
17492
+ <xsl:apply-templates mode="update_xml_pres"/>
17493
+ </xsl:element>
17494
+ </xsl:template>
17495
+
17496
+ <xsl:template match="*[local-name() = 'fmt-deprecates']"/>
17497
+ <xsl:template match="*[local-name() = 'fmt-deprecates'][*[local-name() = 'p']]" mode="update_xml_step1">
17498
+ <xsl:apply-templates mode="update_xml_step1"/>
17499
+ </xsl:template>
17500
+ <xsl:template match="*[local-name() = 'fmt-deprecates'][not(*[local-name() = 'p'])] | *[local-name() = 'fmt-deprecates']/*[local-name() = 'p']" mode="update_xml_step1">
17501
+ <xsl:element name="deprecates" namespace="{$namespace_full}">
17502
+ <xsl:copy-of select="@*"/>
17503
+ <xsl:apply-templates mode="update_xml_step1"/>
17504
+ </xsl:element>
17505
+ </xsl:template>
17506
+ <xsl:template match="*[local-name() = 'fmt-deprecates'][*[local-name() = 'p']]" mode="update_xml_pres">
17507
+ <xsl:apply-templates mode="update_xml_pres"/>
17508
+ </xsl:template>
17509
+ <xsl:template match="*[local-name() = 'fmt-deprecates'][not(*[local-name() = 'p'])] | *[local-name() = 'fmt-deprecates']/*[local-name() = 'p']" mode="update_xml_pres">
17510
+ <xsl:element name="deprecates" namespace="{$namespace_full}">
17511
+ <xsl:copy-of select="@*"/>
17512
+ <xsl:apply-templates mode="update_xml_pres"/>
17513
+ </xsl:element>
17514
+ </xsl:template>
17515
+
17516
+ <xsl:template match="*[local-name() = 'fmt-definition']"/>
17517
+ <xsl:template match="*[local-name() = 'fmt-definition']" mode="update_xml_step1">
17518
+ <xsl:element name="definition" namespace="{$namespace_full}">
17519
+ <xsl:copy-of select="@*"/>
17520
+ <xsl:apply-templates mode="update_xml_step1"/>
17521
+ </xsl:element>
17522
+ </xsl:template>
17523
+ <xsl:template match="*[local-name() = 'fmt-definition']" mode="update_xml_pres">
17524
+ <xsl:element name="definition" namespace="{$namespace_full}">
17525
+ <xsl:copy-of select="@*"/>
17526
+ <xsl:apply-templates mode="update_xml_pres"/>
17527
+ </xsl:element>
17528
+ </xsl:template>
17529
+
17530
+ <xsl:template match="*[local-name() = 'fmt-termsource']"/>
17531
+ <xsl:template match="*[local-name() = 'fmt-termsource']" mode="update_xml_step1">
17532
+ <xsl:element name="termsource" namespace="{$namespace_full}">
17533
+ <xsl:copy-of select="@*"/>
17534
+ <xsl:apply-templates mode="update_xml_step1"/>
17535
+ </xsl:element>
17536
+ </xsl:template>
17537
+ <xsl:template match="*[local-name() = 'fmt-termsource']" mode="update_xml_pres">
17538
+ <xsl:element name="termsource" namespace="{$namespace_full}">
17539
+ <xsl:copy-of select="@*"/>
17540
+ <xsl:apply-templates mode="update_xml_pres"/>
17541
+ </xsl:element>
17542
+ </xsl:template>
17543
+
17403
17544
  <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">
17404
17545
  <xsl:apply-templates mode="update_xml_step1"/>
17405
17546
  </xsl:template>
@@ -18665,7 +18806,7 @@
18665
18806
  </xsl:template>
18666
18807
 
18667
18808
  <xsl:template name="namespaceCheck">
18668
- <xsl:variable name="documentNS" select="namespace-uri(/*)"/>
18809
+ <xsl:variable name="documentNS" select="$namespace_full"/> <!-- namespace-uri(/*) -->
18669
18810
  <xsl:variable name="XSLNS">
18670
18811
 
18671
18812
  <xsl:value-of select="document('')//*/namespace::iso"/>
@@ -18755,6 +18896,9 @@
18755
18896
  <xsl:when test="$formatted = 'true' and string-length($bibdata_updated) != ''">
18756
18897
  <xsl:apply-templates select="xalan:nodeset($bibdata_updated)//*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
18757
18898
  </xsl:when>
18899
+ <xsl:when test="string-length($bibdata_updated) != ''">
18900
+ <xsl:value-of select="xalan:nodeset($bibdata_updated)//*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
18901
+ </xsl:when>
18758
18902
  <xsl:when test="$formatted = 'true'">
18759
18903
  <xsl:apply-templates select="xalan:nodeset($bibdata)//*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
18760
18904
  </xsl:when>
@@ -10,6 +10,7 @@ module IsoDoc
10
10
  def concept(docxml)
11
11
  concept_term(docxml)
12
12
  docxml.xpath(ns("//concept")).each do |node|
13
+ node.ancestors("definition, termsource, related").empty? and
13
14
  concept_render(node, ital: "false", ref: "false",
14
15
  linkref: "true", linkmention: "false")
15
16
  end
@@ -19,7 +20,10 @@ module IsoDoc
19
20
  docxml.xpath(ns("//term")).each do |f|
20
21
  m = {}
21
22
  (f.xpath(ns(".//concept")) - f.xpath(ns(".//term//concept")))
22
- .each { |c| concept_term1(c, m) }
23
+ .each do |c|
24
+ c.ancestors("definition, termsource, related").empty? and
25
+ concept_term1(c, m)
26
+ end
23
27
  end
24
28
  end
25
29
 
@@ -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 Iso
3
- VERSION = "2.9.4".freeze
3
+ VERSION = "2.9.5".freeze
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-iso
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.9.4
4
+ version: 2.9.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: bin
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-standoc