metanorma-ogc 2.6.10 → 2.6.11
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/isodoc/ogc/ogc.abstract-specification-topic.xsl +158 -14
- data/lib/isodoc/ogc/ogc.best-practice.xsl +158 -14
- data/lib/isodoc/ogc/ogc.change-request-supporting-document.xsl +158 -14
- data/lib/isodoc/ogc/ogc.community-practice.xsl +158 -14
- data/lib/isodoc/ogc/ogc.community-standard.xsl +158 -14
- data/lib/isodoc/ogc/ogc.discussion-paper.xsl +158 -14
- data/lib/isodoc/ogc/ogc.draft-standard.xsl +158 -14
- data/lib/isodoc/ogc/ogc.engineering-report.xsl +158 -14
- data/lib/isodoc/ogc/ogc.other.xsl +158 -14
- data/lib/isodoc/ogc/ogc.policy.xsl +158 -14
- data/lib/isodoc/ogc/ogc.reference-model.xsl +158 -14
- data/lib/isodoc/ogc/ogc.release-notes.xsl +158 -14
- data/lib/isodoc/ogc/ogc.standard.xsl +158 -14
- data/lib/isodoc/ogc/ogc.test-suite.xsl +158 -14
- data/lib/isodoc/ogc/ogc.user-guide.xsl +158 -14
- data/lib/isodoc/ogc/ogc.white-paper.xsl +155 -11
- data/lib/isodoc/ogc/presentation_xml_convert.rb +15 -3
- data/lib/metanorma/ogc/biblio.rng +3 -3
- data/lib/metanorma/ogc/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 1c236820b15f1ea7e11470e96e91eb0fe23b2d6e36655d35f08b0c2266486e1a
|
4
|
+
data.tar.gz: b398e486a7281d6b58c8cce648877a2cbc7e1f9b8429ec42761565943bf3a4dd
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: a83230f83b7a7f9f2e135ee5b87cef038f7f2ed22cafc343095b2176626a712e33054449a54ff3abc8ef9a157c06ea4df9e9c436a394061500cb1509d3594532
|
7
|
+
data.tar.gz: bbcc9c0d90cce488c06d023732257255508accacf8c916e960bdaf2824b356b01fe85e1c42ac913659d4eb1a8dc23104b946b99ce833d085fd162982377707a2
|
@@ -897,12 +897,12 @@
|
|
897
897
|
<fo:list-item-body start-indent="body-start()">
|
898
898
|
<fo:block text-align-last="justify" margin-left="12mm" text-indent="-12mm">
|
899
899
|
<fo:basic-link internal-destination="{@id}">
|
900
|
-
<xsl:call-template name="setAltText">
|
901
|
-
<xsl:with-param name="value" select="text()"/>
|
902
|
-
</xsl:call-template>
|
903
900
|
<xsl:variable name="sectionTitle">
|
904
901
|
<xsl:apply-templates select="title"/>
|
905
902
|
</xsl:variable>
|
903
|
+
<xsl:call-template name="setAltText">
|
904
|
+
<xsl:with-param name="value" select="concat(@section, $sectionTitle)"/>
|
905
|
+
</xsl:call-template>
|
906
906
|
<xsl:value-of select="java:toUpperCase(java:java.lang.String.new($sectionTitle))"/>
|
907
907
|
<xsl:text> </xsl:text>
|
908
908
|
<fo:inline keep-together.within-line="always">
|
@@ -3264,6 +3264,9 @@
|
|
3264
3264
|
|
3265
3265
|
</xsl:attribute-set>
|
3266
3266
|
|
3267
|
+
<xsl:attribute-set name="related-block-style" use-attribute-sets="preferred-block-style">
|
3268
|
+
</xsl:attribute-set>
|
3269
|
+
|
3267
3270
|
<xsl:attribute-set name="definition-style">
|
3268
3271
|
|
3269
3272
|
<xsl:attribute name="space-after">6pt</xsl:attribute>
|
@@ -5538,7 +5541,9 @@
|
|
5538
5541
|
<xsl:with-param name="element">
|
5539
5542
|
<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 -->
|
5540
5543
|
<fo:inline role="Lbl"> <!-- need for https://github.com/metanorma/metanorma-iso/issues/1003 -->
|
5544
|
+
|
5541
5545
|
<xsl:copy-of select="$current_fn_number_text"/>
|
5546
|
+
|
5542
5547
|
</fo:inline>
|
5543
5548
|
</fo:basic-link>
|
5544
5549
|
</xsl:with-param>
|
@@ -5557,8 +5562,7 @@
|
|
5557
5562
|
|
5558
5563
|
<fo:block-container xsl:use-attribute-sets="fn-container-body-style" role="SKIP">
|
5559
5564
|
|
5560
|
-
<
|
5561
|
-
|
5565
|
+
<xsl:variable name="fn_block">
|
5562
5566
|
<xsl:call-template name="refine_fn-body-style"/>
|
5563
5567
|
|
5564
5568
|
<fo:inline id="{$ref_id}" xsl:use-attribute-sets="fn-body-num-style" role="Lbl">
|
@@ -5566,9 +5570,15 @@
|
|
5566
5570
|
<xsl:call-template name="refine_fn-body-num-style"/>
|
5567
5571
|
|
5568
5572
|
<xsl:value-of select="$current_fn_number_text"/>
|
5573
|
+
|
5569
5574
|
</fo:inline>
|
5570
5575
|
<xsl:apply-templates/>
|
5571
|
-
</
|
5576
|
+
</xsl:variable>
|
5577
|
+
|
5578
|
+
<fo:block xsl:use-attribute-sets="fn-body-style" role="SKIP">
|
5579
|
+
<xsl:copy-of select="$fn_block"/>
|
5580
|
+
</fo:block>
|
5581
|
+
|
5572
5582
|
</fo:block-container>
|
5573
5583
|
</fo:footnote-body>
|
5574
5584
|
</fo:footnote>
|
@@ -11625,14 +11635,17 @@
|
|
11625
11635
|
</fo:block>
|
11626
11636
|
</xsl:template>
|
11627
11637
|
|
11628
|
-
<xsl:template match="*[local-name() = 'domain']">
|
11638
|
+
<!-- <xsl:template match="*[local-name() = 'domain']"> -->
|
11629
11639
|
<!-- https://github.com/metanorma/isodoc/issues/607
|
11630
11640
|
<fo:inline xsl:use-attribute-sets="domain-style"><<xsl:apply-templates/>></fo:inline>
|
11631
11641
|
<xsl:text> </xsl:text> -->
|
11632
|
-
<xsl:if test="not(@hidden = 'true')">
|
11642
|
+
<!-- <xsl:if test="not(@hidden = 'true')">
|
11633
11643
|
<xsl:apply-templates/>
|
11634
11644
|
</xsl:if>
|
11635
|
-
</xsl:template>
|
11645
|
+
</xsl:template> -->
|
11646
|
+
|
11647
|
+
<!-- https://github.com/metanorma/isodoc/issues/632#issuecomment-2567163931 -->
|
11648
|
+
<xsl:template match="*[local-name() = 'domain']"/>
|
11636
11649
|
|
11637
11650
|
<xsl:template match="*[local-name() = 'admitted']">
|
11638
11651
|
<fo:block xsl:use-attribute-sets="admitted-style">
|
@@ -11647,9 +11660,11 @@
|
|
11647
11660
|
</xsl:template>
|
11648
11661
|
|
11649
11662
|
<xsl:template name="setStyle_preferred">
|
11650
|
-
|
11651
|
-
|
11652
|
-
|
11663
|
+
|
11664
|
+
<xsl:if test="*[local-name() = 'strong']">
|
11665
|
+
<xsl:attribute name="font-weight">normal</xsl:attribute>
|
11666
|
+
</xsl:if>
|
11667
|
+
|
11653
11668
|
</xsl:template>
|
11654
11669
|
|
11655
11670
|
<!-- regarding ISO 10241-1:2011, If there is more than one preferred term, each preferred term follows the previous one on a new line. -->
|
@@ -11659,6 +11674,17 @@
|
|
11659
11674
|
</xsl:template>
|
11660
11675
|
<!-- End Preferred, admitted, deprecated -->
|
11661
11676
|
|
11677
|
+
<xsl:template match="*[local-name() = 'fmt-related']">
|
11678
|
+
<fo:block role="SKIP" xsl:use-attribute-sets="related-block-style">
|
11679
|
+
<xsl:apply-templates/>
|
11680
|
+
</fo:block>
|
11681
|
+
</xsl:template>
|
11682
|
+
<xsl:template match="*[local-name() = 'fmt-related']/*[local-name() = 'p']" priority="4">
|
11683
|
+
<fo:block>
|
11684
|
+
<xsl:apply-templates/>
|
11685
|
+
</fo:block>
|
11686
|
+
</xsl:template>
|
11687
|
+
|
11662
11688
|
<!-- ========== -->
|
11663
11689
|
<!-- definition -->
|
11664
11690
|
<!-- ========== -->
|
@@ -12563,6 +12589,7 @@
|
|
12563
12589
|
|
12564
12590
|
<!-- Normative references -->
|
12565
12591
|
<xsl:template match="*[local-name() = 'references'][@normative='true']/*[local-name() = 'bibitem']" name="bibitem" priority="2">
|
12592
|
+
<xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][local-name() = 'bibitem'] and 1 = 1)"/> <!-- current bibiitem is non-first -->
|
12566
12593
|
|
12567
12594
|
<fo:block id="{@id}" xsl:use-attribute-sets="bibitem-normative-style">
|
12568
12595
|
|
@@ -13286,7 +13313,8 @@
|
|
13286
13313
|
<!-- add @id - first element with @id plus '_element_name' -->
|
13287
13314
|
<xsl:variable name="prefix_id_" select="(.//*[@id])[1]/@id"/>
|
13288
13315
|
<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>
|
13289
|
-
<xsl:
|
13316
|
+
<xsl:variable name="document_suffix" select="ancestor::*[contains(local-name(), '-standard')]/@document_suffix"/>
|
13317
|
+
<xsl:attribute name="id"><xsl:value-of select="concat($prefix_id, '_', local-name(), '_', $document_suffix)"/></xsl:attribute>
|
13290
13318
|
</xsl:if>
|
13291
13319
|
</xsl:template>
|
13292
13320
|
|
@@ -13343,6 +13371,31 @@
|
|
13343
13371
|
<xsl:template match="*[local-name() = 'name'][following-sibling::*[1][local-name() = 'fmt-name']]" mode="update_xml_pres"/>
|
13344
13372
|
<xsl:template match="*[local-name() = 'section-title'][following-sibling::*[1][local-name() = 'p'][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_step1"/>
|
13345
13373
|
<xsl:template match="*[local-name() = 'section-title'][following-sibling::*[1][local-name() = 'p'][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_pres"/>
|
13374
|
+
<!-- <xsl:template match="*[local-name() = 'preferred'][following-sibling::*[not(local-name() = 'preferred')][1][local-name() = 'fmt-preferred']]" mode="update_xml_step1"/> -->
|
13375
|
+
<xsl:template match="*[local-name() = 'preferred']" mode="update_xml_step1"/>
|
13376
|
+
<!-- <xsl:template match="*[local-name() = 'preferred'][following-sibling::*[not(local-name() = 'preferred')][1][local-name() = 'fmt-preferred']]" mode="update_xml_pres"/> -->
|
13377
|
+
<xsl:template match="*[local-name() = 'preferred']" mode="update_xml_pres"/>
|
13378
|
+
<!-- <xsl:template match="*[local-name() = 'admitted'][following-sibling::*[not(local-name() = 'admitted')][1][local-name() = 'fmt-admitted']]" mode="update_xml_step1"/> -->
|
13379
|
+
<xsl:template match="*[local-name() = 'admitted']" mode="update_xml_step1"/>
|
13380
|
+
<!-- <xsl:template match="*[local-name() = 'admitted'][following-sibling::*[not(local-name() = 'admitted')][1][local-name() = 'fmt-admitted']]" mode="update_xml_pres"/> -->
|
13381
|
+
<xsl:template match="*[local-name() = 'admitted']" mode="update_xml_pres"/>
|
13382
|
+
<!-- <xsl:template match="*[local-name() = 'deprecates'][following-sibling::*[not(local-name() = 'deprecates')][1][local-name() = 'fmt-deprecates']]" mode="update_xml_step1"/> -->
|
13383
|
+
<xsl:template match="*[local-name() = 'deprecates']" mode="update_xml_step1"/>
|
13384
|
+
<xsl:template match="*[local-name() = 'related']" mode="update_xml_step1"/>
|
13385
|
+
<!-- <xsl:template match="*[local-name() = 'deprecates'][following-sibling::*[not(local-name() = 'deprecates')][1][local-name() = 'fmt-deprecates']]" mode="update_xml_pres"/> -->
|
13386
|
+
<xsl:template match="*[local-name() = 'deprecates']" mode="update_xml_pres"/>
|
13387
|
+
<xsl:template match="*[local-name() = 'related']" mode="update_xml_pres"/>
|
13388
|
+
<!-- <xsl:template match="*[local-name() = 'definition'][following-sibling::*[1][local-name() = 'fmt-definition']]" mode="update_xml_step1"/> -->
|
13389
|
+
<xsl:template match="*[local-name() = 'definition']" mode="update_xml_step1"/>
|
13390
|
+
<!-- <xsl:template match="*[local-name() = 'definition'][following-sibling::*[1][local-name() = 'fmt-definition']]" mode="update_xml_pres"/> -->
|
13391
|
+
<xsl:template match="*[local-name() = 'definition']" mode="update_xml_pres"/>
|
13392
|
+
<!-- <xsl:template match="*[local-name() = 'termsource'][following-sibling::*[1][local-name() = 'fmt-termsource']]" mode="update_xml_step1"/> -->
|
13393
|
+
<xsl:template match="*[local-name() = 'termsource']" mode="update_xml_step1"/>
|
13394
|
+
<!-- <xsl:template match="*[local-name() = 'termsource'][following-sibling::*[1][local-name() = 'fmt-termsource']]" mode="update_xml_pres"/> -->
|
13395
|
+
<xsl:template match="*[local-name() = 'termsource']" mode="update_xml_pres"/>
|
13396
|
+
|
13397
|
+
<xsl:template match="*[local-name() = 'term'][@unnumbered = 'true'][not(.//*[starts-with(local-name(), 'fmt-')])]" mode="update_xml_step1"/>
|
13398
|
+
<xsl:template match="*[local-name() = 'term'][@unnumbered = 'true'][not(.//*[starts-with(local-name(), 'fmt-')])]" mode="update_xml_pres"/>
|
13346
13399
|
|
13347
13400
|
<xsl:template match="*[local-name() = 'p'][@type = 'section-title' or @type = 'floating-title'][preceding-sibling::*[1][local-name() = 'section-title']]" mode="update_xml_step1">
|
13348
13401
|
<xsl:copy>
|
@@ -13387,6 +13440,94 @@
|
|
13387
13440
|
</xsl:element>
|
13388
13441
|
</xsl:template>
|
13389
13442
|
|
13443
|
+
<xsl:template match="*[local-name() = 'fmt-preferred']"/>
|
13444
|
+
<xsl:template match="*[local-name() = 'fmt-preferred'][*[local-name() = 'p']]" mode="update_xml_step1">
|
13445
|
+
<xsl:apply-templates mode="update_xml_step1"/>
|
13446
|
+
</xsl:template>
|
13447
|
+
<xsl:template match="*[local-name() = 'fmt-preferred'][not(*[local-name() = 'p'])] | *[local-name() = 'fmt-preferred']/*[local-name() = 'p']" mode="update_xml_step1">
|
13448
|
+
<xsl:element name="preferred" namespace="{$namespace_full}">
|
13449
|
+
<xsl:copy-of select="@*"/>
|
13450
|
+
<xsl:apply-templates mode="update_xml_step1"/>
|
13451
|
+
</xsl:element>
|
13452
|
+
</xsl:template>
|
13453
|
+
<xsl:template match="*[local-name() = 'fmt-preferred'][*[local-name() = 'p']]" mode="update_xml_pres">
|
13454
|
+
<xsl:apply-templates mode="update_xml_pres"/>
|
13455
|
+
</xsl:template>
|
13456
|
+
<xsl:template match="*[local-name() = 'fmt-preferred'][not(*[local-name() = 'p'])] | *[local-name() = 'fmt-preferred']/*[local-name() = 'p']" mode="update_xml_pres">
|
13457
|
+
<xsl:element name="preferred" namespace="{$namespace_full}">
|
13458
|
+
<xsl:copy-of select="@*"/>
|
13459
|
+
<xsl:apply-templates mode="update_xml_pres"/>
|
13460
|
+
</xsl:element>
|
13461
|
+
</xsl:template>
|
13462
|
+
|
13463
|
+
<xsl:template match="*[local-name() = 'fmt-admitted']"/>
|
13464
|
+
<xsl:template match="*[local-name() = 'fmt-admitted'][*[local-name() = 'p']]" mode="update_xml_step1">
|
13465
|
+
<xsl:apply-templates mode="update_xml_step1"/>
|
13466
|
+
</xsl:template>
|
13467
|
+
<xsl:template match="*[local-name() = 'fmt-admitted'][not(*[local-name() = 'p'])] | *[local-name() = 'fmt-admitted']/*[local-name() = 'p']" mode="update_xml_step1">
|
13468
|
+
<xsl:element name="admitted" namespace="{$namespace_full}">
|
13469
|
+
<xsl:copy-of select="@*"/>
|
13470
|
+
<xsl:apply-templates mode="update_xml_step1"/>
|
13471
|
+
</xsl:element>
|
13472
|
+
</xsl:template>
|
13473
|
+
<xsl:template match="*[local-name() = 'fmt-admitted'][*[local-name() = 'p']]" mode="update_xml_pres">
|
13474
|
+
<xsl:apply-templates mode="update_xml_pres"/>
|
13475
|
+
</xsl:template>
|
13476
|
+
<xsl:template match="*[local-name() = 'fmt-admitted'][not(*[local-name() = 'p'])] | *[local-name() = 'fmt-admitted']/*[local-name() = 'p']" mode="update_xml_pres">
|
13477
|
+
<xsl:element name="admitted" namespace="{$namespace_full}">
|
13478
|
+
<xsl:copy-of select="@*"/>
|
13479
|
+
<xsl:apply-templates mode="update_xml_pres"/>
|
13480
|
+
</xsl:element>
|
13481
|
+
</xsl:template>
|
13482
|
+
|
13483
|
+
<xsl:template match="*[local-name() = 'fmt-deprecates']"/>
|
13484
|
+
<xsl:template match="*[local-name() = 'fmt-deprecates'][*[local-name() = 'p']]" mode="update_xml_step1">
|
13485
|
+
<xsl:apply-templates mode="update_xml_step1"/>
|
13486
|
+
</xsl:template>
|
13487
|
+
<xsl:template match="*[local-name() = 'fmt-deprecates'][not(*[local-name() = 'p'])] | *[local-name() = 'fmt-deprecates']/*[local-name() = 'p']" mode="update_xml_step1">
|
13488
|
+
<xsl:element name="deprecates" namespace="{$namespace_full}">
|
13489
|
+
<xsl:copy-of select="@*"/>
|
13490
|
+
<xsl:apply-templates mode="update_xml_step1"/>
|
13491
|
+
</xsl:element>
|
13492
|
+
</xsl:template>
|
13493
|
+
<xsl:template match="*[local-name() = 'fmt-deprecates'][*[local-name() = 'p']]" mode="update_xml_pres">
|
13494
|
+
<xsl:apply-templates mode="update_xml_pres"/>
|
13495
|
+
</xsl:template>
|
13496
|
+
<xsl:template match="*[local-name() = 'fmt-deprecates'][not(*[local-name() = 'p'])] | *[local-name() = 'fmt-deprecates']/*[local-name() = 'p']" mode="update_xml_pres">
|
13497
|
+
<xsl:element name="deprecates" namespace="{$namespace_full}">
|
13498
|
+
<xsl:copy-of select="@*"/>
|
13499
|
+
<xsl:apply-templates mode="update_xml_pres"/>
|
13500
|
+
</xsl:element>
|
13501
|
+
</xsl:template>
|
13502
|
+
|
13503
|
+
<xsl:template match="*[local-name() = 'fmt-definition']"/>
|
13504
|
+
<xsl:template match="*[local-name() = 'fmt-definition']" mode="update_xml_step1">
|
13505
|
+
<xsl:element name="definition" namespace="{$namespace_full}">
|
13506
|
+
<xsl:copy-of select="@*"/>
|
13507
|
+
<xsl:apply-templates mode="update_xml_step1"/>
|
13508
|
+
</xsl:element>
|
13509
|
+
</xsl:template>
|
13510
|
+
<xsl:template match="*[local-name() = 'fmt-definition']" mode="update_xml_pres">
|
13511
|
+
<xsl:element name="definition" namespace="{$namespace_full}">
|
13512
|
+
<xsl:copy-of select="@*"/>
|
13513
|
+
<xsl:apply-templates mode="update_xml_pres"/>
|
13514
|
+
</xsl:element>
|
13515
|
+
</xsl:template>
|
13516
|
+
|
13517
|
+
<xsl:template match="*[local-name() = 'fmt-termsource']"/>
|
13518
|
+
<xsl:template match="*[local-name() = 'fmt-termsource']" mode="update_xml_step1">
|
13519
|
+
<xsl:element name="termsource" namespace="{$namespace_full}">
|
13520
|
+
<xsl:copy-of select="@*"/>
|
13521
|
+
<xsl:apply-templates mode="update_xml_step1"/>
|
13522
|
+
</xsl:element>
|
13523
|
+
</xsl:template>
|
13524
|
+
<xsl:template match="*[local-name() = 'fmt-termsource']" mode="update_xml_pres">
|
13525
|
+
<xsl:element name="termsource" namespace="{$namespace_full}">
|
13526
|
+
<xsl:copy-of select="@*"/>
|
13527
|
+
<xsl:apply-templates mode="update_xml_pres"/>
|
13528
|
+
</xsl:element>
|
13529
|
+
</xsl:template>
|
13530
|
+
|
13390
13531
|
<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">
|
13391
13532
|
<xsl:apply-templates mode="update_xml_step1"/>
|
13392
13533
|
</xsl:template>
|
@@ -14518,7 +14659,7 @@
|
|
14518
14659
|
</xsl:template>
|
14519
14660
|
|
14520
14661
|
<xsl:template name="namespaceCheck">
|
14521
|
-
<xsl:variable name="documentNS" select="namespace-uri(/*)
|
14662
|
+
<xsl:variable name="documentNS" select="$namespace_full"/> <!-- namespace-uri(/*) -->
|
14522
14663
|
<xsl:variable name="XSLNS">
|
14523
14664
|
|
14524
14665
|
<xsl:value-of select="document('')//*/namespace::ogc"/>
|
@@ -14608,6 +14749,9 @@
|
|
14608
14749
|
<xsl:when test="$formatted = 'true' and string-length($bibdata_updated) != ''">
|
14609
14750
|
<xsl:apply-templates select="xalan:nodeset($bibdata_updated)//*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
|
14610
14751
|
</xsl:when>
|
14752
|
+
<xsl:when test="string-length($bibdata_updated) != ''">
|
14753
|
+
<xsl:value-of select="xalan:nodeset($bibdata_updated)//*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
|
14754
|
+
</xsl:when>
|
14611
14755
|
<xsl:when test="$formatted = 'true'">
|
14612
14756
|
<xsl:apply-templates select="xalan:nodeset($bibdata)//*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
|
14613
14757
|
</xsl:when>
|
@@ -897,12 +897,12 @@
|
|
897
897
|
<fo:list-item-body start-indent="body-start()">
|
898
898
|
<fo:block text-align-last="justify" margin-left="12mm" text-indent="-12mm">
|
899
899
|
<fo:basic-link internal-destination="{@id}">
|
900
|
-
<xsl:call-template name="setAltText">
|
901
|
-
<xsl:with-param name="value" select="text()"/>
|
902
|
-
</xsl:call-template>
|
903
900
|
<xsl:variable name="sectionTitle">
|
904
901
|
<xsl:apply-templates select="title"/>
|
905
902
|
</xsl:variable>
|
903
|
+
<xsl:call-template name="setAltText">
|
904
|
+
<xsl:with-param name="value" select="concat(@section, $sectionTitle)"/>
|
905
|
+
</xsl:call-template>
|
906
906
|
<xsl:value-of select="java:toUpperCase(java:java.lang.String.new($sectionTitle))"/>
|
907
907
|
<xsl:text> </xsl:text>
|
908
908
|
<fo:inline keep-together.within-line="always">
|
@@ -3264,6 +3264,9 @@
|
|
3264
3264
|
|
3265
3265
|
</xsl:attribute-set>
|
3266
3266
|
|
3267
|
+
<xsl:attribute-set name="related-block-style" use-attribute-sets="preferred-block-style">
|
3268
|
+
</xsl:attribute-set>
|
3269
|
+
|
3267
3270
|
<xsl:attribute-set name="definition-style">
|
3268
3271
|
|
3269
3272
|
<xsl:attribute name="space-after">6pt</xsl:attribute>
|
@@ -5538,7 +5541,9 @@
|
|
5538
5541
|
<xsl:with-param name="element">
|
5539
5542
|
<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 -->
|
5540
5543
|
<fo:inline role="Lbl"> <!-- need for https://github.com/metanorma/metanorma-iso/issues/1003 -->
|
5544
|
+
|
5541
5545
|
<xsl:copy-of select="$current_fn_number_text"/>
|
5546
|
+
|
5542
5547
|
</fo:inline>
|
5543
5548
|
</fo:basic-link>
|
5544
5549
|
</xsl:with-param>
|
@@ -5557,8 +5562,7 @@
|
|
5557
5562
|
|
5558
5563
|
<fo:block-container xsl:use-attribute-sets="fn-container-body-style" role="SKIP">
|
5559
5564
|
|
5560
|
-
<
|
5561
|
-
|
5565
|
+
<xsl:variable name="fn_block">
|
5562
5566
|
<xsl:call-template name="refine_fn-body-style"/>
|
5563
5567
|
|
5564
5568
|
<fo:inline id="{$ref_id}" xsl:use-attribute-sets="fn-body-num-style" role="Lbl">
|
@@ -5566,9 +5570,15 @@
|
|
5566
5570
|
<xsl:call-template name="refine_fn-body-num-style"/>
|
5567
5571
|
|
5568
5572
|
<xsl:value-of select="$current_fn_number_text"/>
|
5573
|
+
|
5569
5574
|
</fo:inline>
|
5570
5575
|
<xsl:apply-templates/>
|
5571
|
-
</
|
5576
|
+
</xsl:variable>
|
5577
|
+
|
5578
|
+
<fo:block xsl:use-attribute-sets="fn-body-style" role="SKIP">
|
5579
|
+
<xsl:copy-of select="$fn_block"/>
|
5580
|
+
</fo:block>
|
5581
|
+
|
5572
5582
|
</fo:block-container>
|
5573
5583
|
</fo:footnote-body>
|
5574
5584
|
</fo:footnote>
|
@@ -11625,14 +11635,17 @@
|
|
11625
11635
|
</fo:block>
|
11626
11636
|
</xsl:template>
|
11627
11637
|
|
11628
|
-
<xsl:template match="*[local-name() = 'domain']">
|
11638
|
+
<!-- <xsl:template match="*[local-name() = 'domain']"> -->
|
11629
11639
|
<!-- https://github.com/metanorma/isodoc/issues/607
|
11630
11640
|
<fo:inline xsl:use-attribute-sets="domain-style"><<xsl:apply-templates/>></fo:inline>
|
11631
11641
|
<xsl:text> </xsl:text> -->
|
11632
|
-
<xsl:if test="not(@hidden = 'true')">
|
11642
|
+
<!-- <xsl:if test="not(@hidden = 'true')">
|
11633
11643
|
<xsl:apply-templates/>
|
11634
11644
|
</xsl:if>
|
11635
|
-
</xsl:template>
|
11645
|
+
</xsl:template> -->
|
11646
|
+
|
11647
|
+
<!-- https://github.com/metanorma/isodoc/issues/632#issuecomment-2567163931 -->
|
11648
|
+
<xsl:template match="*[local-name() = 'domain']"/>
|
11636
11649
|
|
11637
11650
|
<xsl:template match="*[local-name() = 'admitted']">
|
11638
11651
|
<fo:block xsl:use-attribute-sets="admitted-style">
|
@@ -11647,9 +11660,11 @@
|
|
11647
11660
|
</xsl:template>
|
11648
11661
|
|
11649
11662
|
<xsl:template name="setStyle_preferred">
|
11650
|
-
|
11651
|
-
|
11652
|
-
|
11663
|
+
|
11664
|
+
<xsl:if test="*[local-name() = 'strong']">
|
11665
|
+
<xsl:attribute name="font-weight">normal</xsl:attribute>
|
11666
|
+
</xsl:if>
|
11667
|
+
|
11653
11668
|
</xsl:template>
|
11654
11669
|
|
11655
11670
|
<!-- regarding ISO 10241-1:2011, If there is more than one preferred term, each preferred term follows the previous one on a new line. -->
|
@@ -11659,6 +11674,17 @@
|
|
11659
11674
|
</xsl:template>
|
11660
11675
|
<!-- End Preferred, admitted, deprecated -->
|
11661
11676
|
|
11677
|
+
<xsl:template match="*[local-name() = 'fmt-related']">
|
11678
|
+
<fo:block role="SKIP" xsl:use-attribute-sets="related-block-style">
|
11679
|
+
<xsl:apply-templates/>
|
11680
|
+
</fo:block>
|
11681
|
+
</xsl:template>
|
11682
|
+
<xsl:template match="*[local-name() = 'fmt-related']/*[local-name() = 'p']" priority="4">
|
11683
|
+
<fo:block>
|
11684
|
+
<xsl:apply-templates/>
|
11685
|
+
</fo:block>
|
11686
|
+
</xsl:template>
|
11687
|
+
|
11662
11688
|
<!-- ========== -->
|
11663
11689
|
<!-- definition -->
|
11664
11690
|
<!-- ========== -->
|
@@ -12563,6 +12589,7 @@
|
|
12563
12589
|
|
12564
12590
|
<!-- Normative references -->
|
12565
12591
|
<xsl:template match="*[local-name() = 'references'][@normative='true']/*[local-name() = 'bibitem']" name="bibitem" priority="2">
|
12592
|
+
<xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][local-name() = 'bibitem'] and 1 = 1)"/> <!-- current bibiitem is non-first -->
|
12566
12593
|
|
12567
12594
|
<fo:block id="{@id}" xsl:use-attribute-sets="bibitem-normative-style">
|
12568
12595
|
|
@@ -13286,7 +13313,8 @@
|
|
13286
13313
|
<!-- add @id - first element with @id plus '_element_name' -->
|
13287
13314
|
<xsl:variable name="prefix_id_" select="(.//*[@id])[1]/@id"/>
|
13288
13315
|
<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>
|
13289
|
-
<xsl:
|
13316
|
+
<xsl:variable name="document_suffix" select="ancestor::*[contains(local-name(), '-standard')]/@document_suffix"/>
|
13317
|
+
<xsl:attribute name="id"><xsl:value-of select="concat($prefix_id, '_', local-name(), '_', $document_suffix)"/></xsl:attribute>
|
13290
13318
|
</xsl:if>
|
13291
13319
|
</xsl:template>
|
13292
13320
|
|
@@ -13343,6 +13371,31 @@
|
|
13343
13371
|
<xsl:template match="*[local-name() = 'name'][following-sibling::*[1][local-name() = 'fmt-name']]" mode="update_xml_pres"/>
|
13344
13372
|
<xsl:template match="*[local-name() = 'section-title'][following-sibling::*[1][local-name() = 'p'][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_step1"/>
|
13345
13373
|
<xsl:template match="*[local-name() = 'section-title'][following-sibling::*[1][local-name() = 'p'][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_pres"/>
|
13374
|
+
<!-- <xsl:template match="*[local-name() = 'preferred'][following-sibling::*[not(local-name() = 'preferred')][1][local-name() = 'fmt-preferred']]" mode="update_xml_step1"/> -->
|
13375
|
+
<xsl:template match="*[local-name() = 'preferred']" mode="update_xml_step1"/>
|
13376
|
+
<!-- <xsl:template match="*[local-name() = 'preferred'][following-sibling::*[not(local-name() = 'preferred')][1][local-name() = 'fmt-preferred']]" mode="update_xml_pres"/> -->
|
13377
|
+
<xsl:template match="*[local-name() = 'preferred']" mode="update_xml_pres"/>
|
13378
|
+
<!-- <xsl:template match="*[local-name() = 'admitted'][following-sibling::*[not(local-name() = 'admitted')][1][local-name() = 'fmt-admitted']]" mode="update_xml_step1"/> -->
|
13379
|
+
<xsl:template match="*[local-name() = 'admitted']" mode="update_xml_step1"/>
|
13380
|
+
<!-- <xsl:template match="*[local-name() = 'admitted'][following-sibling::*[not(local-name() = 'admitted')][1][local-name() = 'fmt-admitted']]" mode="update_xml_pres"/> -->
|
13381
|
+
<xsl:template match="*[local-name() = 'admitted']" mode="update_xml_pres"/>
|
13382
|
+
<!-- <xsl:template match="*[local-name() = 'deprecates'][following-sibling::*[not(local-name() = 'deprecates')][1][local-name() = 'fmt-deprecates']]" mode="update_xml_step1"/> -->
|
13383
|
+
<xsl:template match="*[local-name() = 'deprecates']" mode="update_xml_step1"/>
|
13384
|
+
<xsl:template match="*[local-name() = 'related']" mode="update_xml_step1"/>
|
13385
|
+
<!-- <xsl:template match="*[local-name() = 'deprecates'][following-sibling::*[not(local-name() = 'deprecates')][1][local-name() = 'fmt-deprecates']]" mode="update_xml_pres"/> -->
|
13386
|
+
<xsl:template match="*[local-name() = 'deprecates']" mode="update_xml_pres"/>
|
13387
|
+
<xsl:template match="*[local-name() = 'related']" mode="update_xml_pres"/>
|
13388
|
+
<!-- <xsl:template match="*[local-name() = 'definition'][following-sibling::*[1][local-name() = 'fmt-definition']]" mode="update_xml_step1"/> -->
|
13389
|
+
<xsl:template match="*[local-name() = 'definition']" mode="update_xml_step1"/>
|
13390
|
+
<!-- <xsl:template match="*[local-name() = 'definition'][following-sibling::*[1][local-name() = 'fmt-definition']]" mode="update_xml_pres"/> -->
|
13391
|
+
<xsl:template match="*[local-name() = 'definition']" mode="update_xml_pres"/>
|
13392
|
+
<!-- <xsl:template match="*[local-name() = 'termsource'][following-sibling::*[1][local-name() = 'fmt-termsource']]" mode="update_xml_step1"/> -->
|
13393
|
+
<xsl:template match="*[local-name() = 'termsource']" mode="update_xml_step1"/>
|
13394
|
+
<!-- <xsl:template match="*[local-name() = 'termsource'][following-sibling::*[1][local-name() = 'fmt-termsource']]" mode="update_xml_pres"/> -->
|
13395
|
+
<xsl:template match="*[local-name() = 'termsource']" mode="update_xml_pres"/>
|
13396
|
+
|
13397
|
+
<xsl:template match="*[local-name() = 'term'][@unnumbered = 'true'][not(.//*[starts-with(local-name(), 'fmt-')])]" mode="update_xml_step1"/>
|
13398
|
+
<xsl:template match="*[local-name() = 'term'][@unnumbered = 'true'][not(.//*[starts-with(local-name(), 'fmt-')])]" mode="update_xml_pres"/>
|
13346
13399
|
|
13347
13400
|
<xsl:template match="*[local-name() = 'p'][@type = 'section-title' or @type = 'floating-title'][preceding-sibling::*[1][local-name() = 'section-title']]" mode="update_xml_step1">
|
13348
13401
|
<xsl:copy>
|
@@ -13387,6 +13440,94 @@
|
|
13387
13440
|
</xsl:element>
|
13388
13441
|
</xsl:template>
|
13389
13442
|
|
13443
|
+
<xsl:template match="*[local-name() = 'fmt-preferred']"/>
|
13444
|
+
<xsl:template match="*[local-name() = 'fmt-preferred'][*[local-name() = 'p']]" mode="update_xml_step1">
|
13445
|
+
<xsl:apply-templates mode="update_xml_step1"/>
|
13446
|
+
</xsl:template>
|
13447
|
+
<xsl:template match="*[local-name() = 'fmt-preferred'][not(*[local-name() = 'p'])] | *[local-name() = 'fmt-preferred']/*[local-name() = 'p']" mode="update_xml_step1">
|
13448
|
+
<xsl:element name="preferred" namespace="{$namespace_full}">
|
13449
|
+
<xsl:copy-of select="@*"/>
|
13450
|
+
<xsl:apply-templates mode="update_xml_step1"/>
|
13451
|
+
</xsl:element>
|
13452
|
+
</xsl:template>
|
13453
|
+
<xsl:template match="*[local-name() = 'fmt-preferred'][*[local-name() = 'p']]" mode="update_xml_pres">
|
13454
|
+
<xsl:apply-templates mode="update_xml_pres"/>
|
13455
|
+
</xsl:template>
|
13456
|
+
<xsl:template match="*[local-name() = 'fmt-preferred'][not(*[local-name() = 'p'])] | *[local-name() = 'fmt-preferred']/*[local-name() = 'p']" mode="update_xml_pres">
|
13457
|
+
<xsl:element name="preferred" namespace="{$namespace_full}">
|
13458
|
+
<xsl:copy-of select="@*"/>
|
13459
|
+
<xsl:apply-templates mode="update_xml_pres"/>
|
13460
|
+
</xsl:element>
|
13461
|
+
</xsl:template>
|
13462
|
+
|
13463
|
+
<xsl:template match="*[local-name() = 'fmt-admitted']"/>
|
13464
|
+
<xsl:template match="*[local-name() = 'fmt-admitted'][*[local-name() = 'p']]" mode="update_xml_step1">
|
13465
|
+
<xsl:apply-templates mode="update_xml_step1"/>
|
13466
|
+
</xsl:template>
|
13467
|
+
<xsl:template match="*[local-name() = 'fmt-admitted'][not(*[local-name() = 'p'])] | *[local-name() = 'fmt-admitted']/*[local-name() = 'p']" mode="update_xml_step1">
|
13468
|
+
<xsl:element name="admitted" namespace="{$namespace_full}">
|
13469
|
+
<xsl:copy-of select="@*"/>
|
13470
|
+
<xsl:apply-templates mode="update_xml_step1"/>
|
13471
|
+
</xsl:element>
|
13472
|
+
</xsl:template>
|
13473
|
+
<xsl:template match="*[local-name() = 'fmt-admitted'][*[local-name() = 'p']]" mode="update_xml_pres">
|
13474
|
+
<xsl:apply-templates mode="update_xml_pres"/>
|
13475
|
+
</xsl:template>
|
13476
|
+
<xsl:template match="*[local-name() = 'fmt-admitted'][not(*[local-name() = 'p'])] | *[local-name() = 'fmt-admitted']/*[local-name() = 'p']" mode="update_xml_pres">
|
13477
|
+
<xsl:element name="admitted" namespace="{$namespace_full}">
|
13478
|
+
<xsl:copy-of select="@*"/>
|
13479
|
+
<xsl:apply-templates mode="update_xml_pres"/>
|
13480
|
+
</xsl:element>
|
13481
|
+
</xsl:template>
|
13482
|
+
|
13483
|
+
<xsl:template match="*[local-name() = 'fmt-deprecates']"/>
|
13484
|
+
<xsl:template match="*[local-name() = 'fmt-deprecates'][*[local-name() = 'p']]" mode="update_xml_step1">
|
13485
|
+
<xsl:apply-templates mode="update_xml_step1"/>
|
13486
|
+
</xsl:template>
|
13487
|
+
<xsl:template match="*[local-name() = 'fmt-deprecates'][not(*[local-name() = 'p'])] | *[local-name() = 'fmt-deprecates']/*[local-name() = 'p']" mode="update_xml_step1">
|
13488
|
+
<xsl:element name="deprecates" namespace="{$namespace_full}">
|
13489
|
+
<xsl:copy-of select="@*"/>
|
13490
|
+
<xsl:apply-templates mode="update_xml_step1"/>
|
13491
|
+
</xsl:element>
|
13492
|
+
</xsl:template>
|
13493
|
+
<xsl:template match="*[local-name() = 'fmt-deprecates'][*[local-name() = 'p']]" mode="update_xml_pres">
|
13494
|
+
<xsl:apply-templates mode="update_xml_pres"/>
|
13495
|
+
</xsl:template>
|
13496
|
+
<xsl:template match="*[local-name() = 'fmt-deprecates'][not(*[local-name() = 'p'])] | *[local-name() = 'fmt-deprecates']/*[local-name() = 'p']" mode="update_xml_pres">
|
13497
|
+
<xsl:element name="deprecates" namespace="{$namespace_full}">
|
13498
|
+
<xsl:copy-of select="@*"/>
|
13499
|
+
<xsl:apply-templates mode="update_xml_pres"/>
|
13500
|
+
</xsl:element>
|
13501
|
+
</xsl:template>
|
13502
|
+
|
13503
|
+
<xsl:template match="*[local-name() = 'fmt-definition']"/>
|
13504
|
+
<xsl:template match="*[local-name() = 'fmt-definition']" mode="update_xml_step1">
|
13505
|
+
<xsl:element name="definition" namespace="{$namespace_full}">
|
13506
|
+
<xsl:copy-of select="@*"/>
|
13507
|
+
<xsl:apply-templates mode="update_xml_step1"/>
|
13508
|
+
</xsl:element>
|
13509
|
+
</xsl:template>
|
13510
|
+
<xsl:template match="*[local-name() = 'fmt-definition']" mode="update_xml_pres">
|
13511
|
+
<xsl:element name="definition" namespace="{$namespace_full}">
|
13512
|
+
<xsl:copy-of select="@*"/>
|
13513
|
+
<xsl:apply-templates mode="update_xml_pres"/>
|
13514
|
+
</xsl:element>
|
13515
|
+
</xsl:template>
|
13516
|
+
|
13517
|
+
<xsl:template match="*[local-name() = 'fmt-termsource']"/>
|
13518
|
+
<xsl:template match="*[local-name() = 'fmt-termsource']" mode="update_xml_step1">
|
13519
|
+
<xsl:element name="termsource" namespace="{$namespace_full}">
|
13520
|
+
<xsl:copy-of select="@*"/>
|
13521
|
+
<xsl:apply-templates mode="update_xml_step1"/>
|
13522
|
+
</xsl:element>
|
13523
|
+
</xsl:template>
|
13524
|
+
<xsl:template match="*[local-name() = 'fmt-termsource']" mode="update_xml_pres">
|
13525
|
+
<xsl:element name="termsource" namespace="{$namespace_full}">
|
13526
|
+
<xsl:copy-of select="@*"/>
|
13527
|
+
<xsl:apply-templates mode="update_xml_pres"/>
|
13528
|
+
</xsl:element>
|
13529
|
+
</xsl:template>
|
13530
|
+
|
13390
13531
|
<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">
|
13391
13532
|
<xsl:apply-templates mode="update_xml_step1"/>
|
13392
13533
|
</xsl:template>
|
@@ -14518,7 +14659,7 @@
|
|
14518
14659
|
</xsl:template>
|
14519
14660
|
|
14520
14661
|
<xsl:template name="namespaceCheck">
|
14521
|
-
<xsl:variable name="documentNS" select="namespace-uri(/*)
|
14662
|
+
<xsl:variable name="documentNS" select="$namespace_full"/> <!-- namespace-uri(/*) -->
|
14522
14663
|
<xsl:variable name="XSLNS">
|
14523
14664
|
|
14524
14665
|
<xsl:value-of select="document('')//*/namespace::ogc"/>
|
@@ -14608,6 +14749,9 @@
|
|
14608
14749
|
<xsl:when test="$formatted = 'true' and string-length($bibdata_updated) != ''">
|
14609
14750
|
<xsl:apply-templates select="xalan:nodeset($bibdata_updated)//*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
|
14610
14751
|
</xsl:when>
|
14752
|
+
<xsl:when test="string-length($bibdata_updated) != ''">
|
14753
|
+
<xsl:value-of select="xalan:nodeset($bibdata_updated)//*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
|
14754
|
+
</xsl:when>
|
14611
14755
|
<xsl:when test="$formatted = 'true'">
|
14612
14756
|
<xsl:apply-templates select="xalan:nodeset($bibdata)//*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
|
14613
14757
|
</xsl:when>
|