metanorma-itu 2.1.3 → 2.1.5.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/isodoc/itu/itu.implementers-guide.xsl +157 -92
- data/lib/isodoc/itu/itu.in-force.xsl +157 -92
- data/lib/isodoc/itu/itu.recommendation-annex.xsl +157 -92
- data/lib/isodoc/itu/itu.recommendation-supplement.xsl +157 -92
- data/lib/isodoc/itu/itu.recommendation.xsl +157 -92
- data/lib/isodoc/itu/itu.resolution.xsl +157 -92
- data/lib/isodoc/itu/itu.service-publication.xsl +157 -92
- data/lib/isodoc/itu/itu.technical-paper.xsl +157 -92
- data/lib/isodoc/itu/itu.technical-report.xsl +157 -92
- data/lib/isodoc/itu/presentation_xml_convert.rb +6 -0
- data/lib/metanorma/itu/isodoc.rng +26 -0
- data/lib/metanorma/itu/version.rb +1 -1
- metadata +2 -2
@@ -2378,7 +2378,10 @@
|
|
2378
2378
|
|
2379
2379
|
</xsl:attribute-set><xsl:attribute-set name="requirement-style">
|
2380
2380
|
|
2381
|
+
|
2381
2382
|
</xsl:attribute-set><xsl:attribute-set name="requirement-name-style">
|
2383
|
+
<xsl:attribute name="keep-with-next">always</xsl:attribute>
|
2384
|
+
|
2382
2385
|
|
2383
2386
|
</xsl:attribute-set><xsl:attribute-set name="requirement-label-style">
|
2384
2387
|
|
@@ -2477,6 +2480,7 @@
|
|
2477
2480
|
|
2478
2481
|
|
2479
2482
|
|
2483
|
+
|
2480
2484
|
|
2481
2485
|
|
2482
2486
|
</xsl:attribute-set><xsl:variable name="table-border_">
|
@@ -2812,7 +2816,8 @@
|
|
2812
2816
|
|
2813
2817
|
|
2814
2818
|
|
2815
|
-
|
2819
|
+
|
2820
|
+
|
2816
2821
|
|
2817
2822
|
|
2818
2823
|
|
@@ -2827,6 +2832,7 @@
|
|
2827
2832
|
</xsl:attribute-set><xsl:attribute-set name="termnote-style">
|
2828
2833
|
|
2829
2834
|
|
2835
|
+
|
2830
2836
|
|
2831
2837
|
|
2832
2838
|
|
@@ -3260,7 +3266,10 @@
|
|
3260
3266
|
|
3261
3267
|
|
3262
3268
|
|
3263
|
-
|
3269
|
+
<!-- <xsl:if test="$namespace = 'ieee'">
|
3270
|
+
<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
|
3271
|
+
<xsl:attribute name="provisional-distance-between-starts">9.5mm</xsl:attribute>
|
3272
|
+
</xsl:if> -->
|
3264
3273
|
|
3265
3274
|
|
3266
3275
|
|
@@ -3295,6 +3304,7 @@
|
|
3295
3304
|
</xsl:attribute-set><xsl:attribute-set name="bibitem-normative-list-body-style">
|
3296
3305
|
|
3297
3306
|
|
3307
|
+
|
3298
3308
|
<xsl:attribute name="margin-top">6pt</xsl:attribute>
|
3299
3309
|
<xsl:attribute name="margin-left">14mm</xsl:attribute>
|
3300
3310
|
<xsl:attribute name="text-indent">-14mm</xsl:attribute>
|
@@ -3302,6 +3312,7 @@
|
|
3302
3312
|
</xsl:attribute-set><xsl:attribute-set name="bibitem-non-normative-list-body-style">
|
3303
3313
|
|
3304
3314
|
|
3315
|
+
|
3305
3316
|
<xsl:attribute name="margin-top">6pt</xsl:attribute>
|
3306
3317
|
<xsl:attribute name="margin-left">14mm</xsl:attribute>
|
3307
3318
|
<xsl:attribute name="text-indent">-14mm</xsl:attribute>
|
@@ -3946,6 +3957,14 @@
|
|
3946
3957
|
|
3947
3958
|
|
3948
3959
|
|
3960
|
+
<xsl:if test="*[local-name()='bookmark']"> <!-- special case: table/bookmark -->
|
3961
|
+
<fo:block keep-with-previous="always" line-height="0.1">
|
3962
|
+
<xsl:for-each select="*[local-name()='bookmark']">
|
3963
|
+
<xsl:call-template name="bookmark"/>
|
3964
|
+
</xsl:for-each>
|
3965
|
+
</fo:block>
|
3966
|
+
</xsl:if>
|
3967
|
+
|
3949
3968
|
</fo:block-container>
|
3950
3969
|
</xsl:variable>
|
3951
3970
|
|
@@ -4475,99 +4494,107 @@
|
|
4475
4494
|
</xsl:choose>
|
4476
4495
|
</xsl:variable>
|
4477
4496
|
|
4478
|
-
|
4479
|
-
|
4480
|
-
|
4497
|
+
|
4498
|
+
<xsl:variable name="tableWithNotesAndFootnotes">
|
4499
|
+
|
4500
|
+
<fo:table keep-with-previous="always">
|
4501
|
+
<xsl:for-each select="xalan:nodeset($table_attributes)/table_attributes/@*">
|
4502
|
+
<xsl:variable name="name" select="local-name()"/>
|
4503
|
+
<xsl:choose>
|
4504
|
+
<xsl:when test="$name = 'border-top'">
|
4505
|
+
<xsl:attribute name="{$name}">0pt solid black</xsl:attribute>
|
4506
|
+
</xsl:when>
|
4507
|
+
<xsl:when test="$name = 'border'">
|
4508
|
+
<xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
|
4509
|
+
<xsl:attribute name="border-top">0pt solid black</xsl:attribute>
|
4510
|
+
</xsl:when>
|
4511
|
+
<xsl:otherwise>
|
4512
|
+
<xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
|
4513
|
+
</xsl:otherwise>
|
4514
|
+
</xsl:choose>
|
4515
|
+
</xsl:for-each>
|
4516
|
+
|
4517
|
+
|
4518
|
+
<xsl:if test="$doctype = 'service-publication'">
|
4519
|
+
<xsl:attribute name="border">none</xsl:attribute>
|
4520
|
+
<xsl:attribute name="font-family">Arial</xsl:attribute>
|
4521
|
+
<xsl:attribute name="font-size">8pt</xsl:attribute>
|
4522
|
+
</xsl:if>
|
4523
|
+
|
4524
|
+
|
4481
4525
|
<xsl:choose>
|
4482
|
-
<xsl:when test="$name
|
4483
|
-
<xsl:
|
4484
|
-
|
4485
|
-
|
4486
|
-
<xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
|
4487
|
-
<xsl:attribute name="border-top">0pt solid black</xsl:attribute>
|
4526
|
+
<xsl:when test="xalan:nodeset($colgroup)//*[local-name()='col']">
|
4527
|
+
<xsl:for-each select="xalan:nodeset($colgroup)//*[local-name()='col']">
|
4528
|
+
<fo:table-column column-width="{@width}"/>
|
4529
|
+
</xsl:for-each>
|
4488
4530
|
</xsl:when>
|
4489
4531
|
<xsl:otherwise>
|
4490
|
-
|
4532
|
+
<!-- $colwidths=<xsl:copy-of select="$colwidths"/> -->
|
4533
|
+
<xsl:call-template name="insertTableColumnWidth">
|
4534
|
+
<xsl:with-param name="colwidths" select="$colwidths"/>
|
4535
|
+
</xsl:call-template>
|
4491
4536
|
</xsl:otherwise>
|
4492
4537
|
</xsl:choose>
|
4493
|
-
|
4494
|
-
|
4495
|
-
|
4496
|
-
|
4497
|
-
|
4498
|
-
|
4499
|
-
<xsl:attribute name="font-size">8pt</xsl:attribute>
|
4500
|
-
</xsl:if>
|
4501
|
-
|
4502
|
-
|
4503
|
-
<xsl:choose>
|
4504
|
-
<xsl:when test="xalan:nodeset($colgroup)//*[local-name()='col']">
|
4505
|
-
<xsl:for-each select="xalan:nodeset($colgroup)//*[local-name()='col']">
|
4506
|
-
<fo:table-column column-width="{@width}"/>
|
4507
|
-
</xsl:for-each>
|
4508
|
-
</xsl:when>
|
4509
|
-
<xsl:otherwise>
|
4510
|
-
<!-- $colwidths=<xsl:copy-of select="$colwidths"/> -->
|
4511
|
-
<xsl:call-template name="insertTableColumnWidth">
|
4512
|
-
<xsl:with-param name="colwidths" select="$colwidths"/>
|
4513
|
-
</xsl:call-template>
|
4514
|
-
</xsl:otherwise>
|
4515
|
-
</xsl:choose>
|
4516
|
-
|
4517
|
-
<fo:table-body>
|
4518
|
-
<fo:table-row>
|
4519
|
-
<fo:table-cell xsl:use-attribute-sets="table-footer-cell-style" number-columns-spanned="{$cols-count}">
|
4520
|
-
|
4521
|
-
|
4538
|
+
|
4539
|
+
<fo:table-body>
|
4540
|
+
<fo:table-row>
|
4541
|
+
<fo:table-cell xsl:use-attribute-sets="table-footer-cell-style" number-columns-spanned="{$cols-count}">
|
4542
|
+
|
4543
|
+
|
4522
4544
|
|
4523
|
-
|
4524
|
-
|
4525
|
-
|
4526
|
-
|
4545
|
+
|
4546
|
+
<xsl:if test="ancestor::*[local-name()='preface']">
|
4547
|
+
<xsl:if test="$doctype != 'service-publication'">
|
4548
|
+
<xsl:attribute name="border">solid black 0pt</xsl:attribute>
|
4549
|
+
</xsl:if>
|
4550
|
+
</xsl:if>
|
4551
|
+
<xsl:if test="$doctype = 'service-publication'">
|
4552
|
+
<xsl:attribute name="border">none</xsl:attribute>
|
4527
4553
|
</xsl:if>
|
4528
|
-
</xsl:if>
|
4529
|
-
<xsl:if test="$doctype = 'service-publication'">
|
4530
|
-
<xsl:attribute name="border">none</xsl:attribute>
|
4531
|
-
</xsl:if>
|
4532
|
-
|
4533
|
-
|
4534
|
-
<!-- fn will be processed inside 'note' processing -->
|
4535
|
-
|
4536
|
-
|
4537
|
-
|
4538
|
-
|
4539
|
-
|
4540
|
-
<xsl:if test="$doctype = 'service-publication'">
|
4541
|
-
<fo:block margin-top="7pt" margin-bottom="2pt"><fo:inline>____________</fo:inline></fo:block>
|
4542
|
-
</xsl:if>
|
4543
|
-
|
4544
|
-
|
4545
|
-
<!-- for BSI (not PAS) display Notes before footnotes -->
|
4546
|
-
|
4547
|
-
|
4548
|
-
<!-- except gb and bsi -->
|
4549
|
-
|
4550
|
-
<xsl:apply-templates select="../*[local-name()='note']"/>
|
4551
4554
|
|
4552
|
-
|
4553
|
-
|
4554
|
-
<!-- horizontal row separator -->
|
4555
|
-
|
4556
|
-
|
4557
|
-
<!-- fn processing -->
|
4558
|
-
|
4559
|
-
<xsl:call-template name="table_fn_display"/>
|
4560
4555
|
|
4561
|
-
|
4562
|
-
|
4563
|
-
|
4564
|
-
|
4565
|
-
|
4566
|
-
|
4567
|
-
|
4568
|
-
|
4569
|
-
|
4570
|
-
|
4556
|
+
<!-- fn will be processed inside 'note' processing -->
|
4557
|
+
|
4558
|
+
|
4559
|
+
|
4560
|
+
|
4561
|
+
|
4562
|
+
<xsl:if test="$doctype = 'service-publication'">
|
4563
|
+
<fo:block margin-top="7pt" margin-bottom="2pt"><fo:inline>____________</fo:inline></fo:block>
|
4564
|
+
</xsl:if>
|
4565
|
+
|
4566
|
+
|
4567
|
+
<!-- for BSI (not PAS) display Notes before footnotes -->
|
4568
|
+
|
4569
|
+
|
4570
|
+
<!-- except gb and bsi -->
|
4571
|
+
|
4572
|
+
<xsl:apply-templates select="../*[local-name()='note']"/>
|
4573
|
+
|
4574
|
+
|
4575
|
+
|
4576
|
+
<!-- horizontal row separator -->
|
4577
|
+
|
4578
|
+
|
4579
|
+
<!-- fn processing -->
|
4580
|
+
|
4581
|
+
<xsl:call-template name="table_fn_display"/>
|
4582
|
+
|
4583
|
+
|
4584
|
+
|
4585
|
+
<!-- for PAS display Notes after footnotes -->
|
4586
|
+
|
4587
|
+
|
4588
|
+
</fo:table-cell>
|
4589
|
+
</fo:table-row>
|
4590
|
+
</fo:table-body>
|
4591
|
+
|
4592
|
+
</fo:table>
|
4593
|
+
</xsl:variable>
|
4594
|
+
|
4595
|
+
<xsl:if test="normalize-space($tableWithNotesAndFootnotes) != ''">
|
4596
|
+
<xsl:copy-of select="$tableWithNotesAndFootnotes"/>
|
4597
|
+
</xsl:if>
|
4571
4598
|
|
4572
4599
|
|
4573
4600
|
|
@@ -4888,6 +4915,7 @@
|
|
4888
4915
|
<xsl:variable name="footnote_inline">
|
4889
4916
|
<fo:inline xsl:use-attribute-sets="fn-num-style">
|
4890
4917
|
|
4918
|
+
|
4891
4919
|
<fo:basic-link internal-destination="{$ref_id}" fox:alt-text="footnote {$current_fn_number}">
|
4892
4920
|
<xsl:value-of select="$current_fn_number_text"/>
|
4893
4921
|
</fo:basic-link>
|
@@ -4909,12 +4937,16 @@
|
|
4909
4937
|
<fo:block xsl:use-attribute-sets="fn-body-style">
|
4910
4938
|
|
4911
4939
|
|
4940
|
+
|
4912
4941
|
<xsl:if test="$doctype = 'service-publication'">
|
4913
4942
|
<xsl:attribute name="font-size">10pt</xsl:attribute>
|
4914
4943
|
</xsl:if>
|
4915
4944
|
|
4916
4945
|
<fo:inline id="{$ref_id}" xsl:use-attribute-sets="fn-body-num-style">
|
4917
4946
|
|
4947
|
+
|
4948
|
+
|
4949
|
+
|
4918
4950
|
<xsl:value-of select="$current_fn_number_text"/>
|
4919
4951
|
</fo:inline>
|
4920
4952
|
<xsl:apply-templates/>
|
@@ -6621,6 +6653,8 @@
|
|
6621
6653
|
|
6622
6654
|
|
6623
6655
|
|
6656
|
+
|
6657
|
+
|
6624
6658
|
<xsl:choose>
|
6625
6659
|
<xsl:when test="$target_text = ''">
|
6626
6660
|
<xsl:apply-templates/>
|
@@ -6832,6 +6866,7 @@
|
|
6832
6866
|
|
6833
6867
|
|
6834
6868
|
|
6869
|
+
|
6835
6870
|
<!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
|
6836
6871
|
<!-- <xsl:if test="*[not(local-name()='name')][1][node()[normalize-space() != ''][1][local-name() = 'add'] and node()[normalize-space() != ''][last()][local-name() = 'add']]"> -->
|
6837
6872
|
<xsl:if test="*[not(local-name()='name')][1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
|
@@ -6853,6 +6888,7 @@
|
|
6853
6888
|
</xsl:when>
|
6854
6889
|
<xsl:otherwise>
|
6855
6890
|
|
6891
|
+
|
6856
6892
|
|
6857
6893
|
<xsl:text> – </xsl:text>
|
6858
6894
|
|
@@ -6872,6 +6908,7 @@
|
|
6872
6908
|
</xsl:when>
|
6873
6909
|
<xsl:otherwise>
|
6874
6910
|
|
6911
|
+
|
6875
6912
|
|
6876
6913
|
<xsl:text> – </xsl:text>
|
6877
6914
|
|
@@ -7650,6 +7687,9 @@
|
|
7650
7687
|
<fo:block xsl:use-attribute-sets="figure-name-style">
|
7651
7688
|
|
7652
7689
|
|
7690
|
+
|
7691
|
+
|
7692
|
+
|
7653
7693
|
<xsl:apply-templates/>
|
7654
7694
|
</fo:block>
|
7655
7695
|
</xsl:if>
|
@@ -7710,7 +7750,7 @@
|
|
7710
7750
|
<xsl:apply-templates/>
|
7711
7751
|
</xsl:otherwise>
|
7712
7752
|
</xsl:choose>
|
7713
|
-
</xsl:template><xsl:template match="*[local-name() = 'fn']" mode="contents"/><xsl:template match="*[local-name() = 'fn']" mode="bookmarks"/><xsl:template match="*[local-name() = 'fn']" mode="contents_item"/><xsl:template match="*[local-name() = 'xref']" mode="contents">
|
7753
|
+
</xsl:template><xsl:template match="*[local-name() = 'fn']" mode="contents"/><xsl:template match="*[local-name() = 'fn']" mode="bookmarks"/><xsl:template match="*[local-name() = 'fn']" mode="contents_item"/><xsl:template match="*[local-name() = 'xref'] | *[local-name() = 'eref']" mode="contents">
|
7714
7754
|
<xsl:value-of select="."/>
|
7715
7755
|
</xsl:template><xsl:template match="*[local-name() = 'review']" mode="contents_item"/><xsl:template match="*[local-name() = 'tab']" mode="contents_item">
|
7716
7756
|
<xsl:text> </xsl:text>
|
@@ -7786,6 +7826,9 @@
|
|
7786
7826
|
<!-- 9 -->
|
7787
7827
|
|
7788
7828
|
|
7829
|
+
<!-- <xsl:if test="$namespace = 'ieee'">
|
7830
|
+
<xsl:if test="$current_template = 'standard'">8</xsl:if>
|
7831
|
+
</xsl:if> -->
|
7789
7832
|
10
|
7790
7833
|
|
7791
7834
|
|
@@ -8230,10 +8273,14 @@
|
|
8230
8273
|
</xsl:template><xsl:template match="*[local-name() = 'termexample']/*[local-name() = 'p']">
|
8231
8274
|
<xsl:variable name="element">inline
|
8232
8275
|
|
8276
|
+
|
8233
8277
|
</xsl:variable>
|
8234
8278
|
<xsl:choose>
|
8235
8279
|
<xsl:when test="contains($element, 'block')">
|
8236
8280
|
<fo:block xsl:use-attribute-sets="example-p-style">
|
8281
|
+
|
8282
|
+
|
8283
|
+
|
8237
8284
|
<xsl:apply-templates/>
|
8238
8285
|
</fo:block>
|
8239
8286
|
</xsl:when>
|
@@ -8341,6 +8388,7 @@
|
|
8341
8388
|
</xsl:if>
|
8342
8389
|
<fo:block xsl:use-attribute-sets="example-p-style">
|
8343
8390
|
|
8391
|
+
|
8344
8392
|
<xsl:apply-templates/>
|
8345
8393
|
</fo:block>
|
8346
8394
|
</fo:block-container>
|
@@ -8497,6 +8545,8 @@
|
|
8497
8545
|
|
8498
8546
|
|
8499
8547
|
|
8548
|
+
|
8549
|
+
|
8500
8550
|
<fo:basic-link fox:alt-text="{@citeas}">
|
8501
8551
|
<xsl:if test="normalize-space(@citeas) = ''">
|
8502
8552
|
<xsl:attribute name="fox:alt-text"><xsl:value-of select="."/></xsl:attribute>
|
@@ -8924,6 +8974,8 @@
|
|
8924
8974
|
|
8925
8975
|
|
8926
8976
|
|
8977
|
+
|
8978
|
+
|
8927
8979
|
<!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
|
8928
8980
|
<xsl:if test="*[1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
|
8929
8981
|
<xsl:call-template name="append_add-style"/>
|
@@ -9108,7 +9160,7 @@
|
|
9108
9160
|
</xsl:template><xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'li']/text()">
|
9109
9161
|
<!-- to split by '_' and other chars -->
|
9110
9162
|
<xsl:call-template name="add-zero-spaces-java"/>
|
9111
|
-
</xsl:template><xsl:template match="*[local-name() = 'bookmark']" name="bookmark">
|
9163
|
+
</xsl:template><xsl:template match="*[local-name() = 'table']/*[local-name() = 'bookmark']" priority="2"/><xsl:template match="*[local-name() = 'bookmark']" name="bookmark">
|
9112
9164
|
<!-- <fo:inline id="{@id}" font-size="1pt"/> -->
|
9113
9165
|
<fo:inline id="{@id}" font-size="1pt"><xsl:value-of select="$hair_space"/></fo:inline>
|
9114
9166
|
<!-- we need to add zero-width space, otherwise this fo:inline is missing in IF xml -->
|
@@ -9181,7 +9233,7 @@
|
|
9181
9233
|
</fo:block>
|
9182
9234
|
|
9183
9235
|
|
9184
|
-
</xsl:template><xsl:template match="*[local-name() = 'references'][not(@normative='true')]/*[local-name() = 'bibitem']" priority="2">
|
9236
|
+
</xsl:template><xsl:template match="*[local-name() = 'references'][not(@normative='true')]/*[local-name() = 'bibitem']" name="bibitem_non_normative" priority="2">
|
9185
9237
|
|
9186
9238
|
|
9187
9239
|
<fo:block id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-style">
|
@@ -9892,6 +9944,7 @@
|
|
9892
9944
|
</xsl:call-template>
|
9893
9945
|
</xsl:template><xsl:template name="insertKeywords">
|
9894
9946
|
<xsl:param name="sorting" select="'true'"/>
|
9947
|
+
<xsl:param name="meta" select="'false'"/>
|
9895
9948
|
<xsl:param name="charAtEnd" select="'.'"/>
|
9896
9949
|
<xsl:param name="charDelim" select="', '"/>
|
9897
9950
|
<xsl:choose>
|
@@ -9899,6 +9952,7 @@
|
|
9899
9952
|
<xsl:for-each select="//*[contains(local-name(), '-standard')]/*[local-name() = 'bibdata']//*[local-name() = 'keyword']">
|
9900
9953
|
<xsl:sort data-type="text" order="ascending"/>
|
9901
9954
|
<xsl:call-template name="insertKeyword">
|
9955
|
+
<xsl:with-param name="meta" select="$meta"/>
|
9902
9956
|
<xsl:with-param name="charAtEnd" select="$charAtEnd"/>
|
9903
9957
|
<xsl:with-param name="charDelim" select="$charDelim"/>
|
9904
9958
|
</xsl:call-template>
|
@@ -9907,6 +9961,7 @@
|
|
9907
9961
|
<xsl:otherwise>
|
9908
9962
|
<xsl:for-each select="//*[contains(local-name(), '-standard')]/*[local-name() = 'bibdata']//*[local-name() = 'keyword']">
|
9909
9963
|
<xsl:call-template name="insertKeyword">
|
9964
|
+
<xsl:with-param name="meta" select="$meta"/>
|
9910
9965
|
<xsl:with-param name="charAtEnd" select="$charAtEnd"/>
|
9911
9966
|
<xsl:with-param name="charDelim" select="$charDelim"/>
|
9912
9967
|
</xsl:call-template>
|
@@ -9916,7 +9971,15 @@
|
|
9916
9971
|
</xsl:template><xsl:template name="insertKeyword">
|
9917
9972
|
<xsl:param name="charAtEnd"/>
|
9918
9973
|
<xsl:param name="charDelim"/>
|
9919
|
-
<xsl:
|
9974
|
+
<xsl:param name="meta"/>
|
9975
|
+
<xsl:choose>
|
9976
|
+
<xsl:when test="$meta = 'true'">
|
9977
|
+
<xsl:value-of select="."/>
|
9978
|
+
</xsl:when>
|
9979
|
+
<xsl:otherwise>
|
9980
|
+
<xsl:apply-templates/>
|
9981
|
+
</xsl:otherwise>
|
9982
|
+
</xsl:choose>
|
9920
9983
|
<xsl:choose>
|
9921
9984
|
<xsl:when test="position() != last()"><xsl:value-of select="$charDelim"/></xsl:when>
|
9922
9985
|
<xsl:otherwise><xsl:value-of select="$charAtEnd"/></xsl:otherwise>
|
@@ -9961,13 +10024,15 @@
|
|
9961
10024
|
<dc:description>
|
9962
10025
|
<xsl:variable name="abstract">
|
9963
10026
|
|
9964
|
-
<xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*[local-name() = 'abstract']//text()"/>
|
10027
|
+
<xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*[local-name() = 'abstract']//text()[not(ancestor::*[local-name() = 'title'])]"/>
|
9965
10028
|
|
9966
10029
|
</xsl:variable>
|
9967
10030
|
<xsl:value-of select="normalize-space($abstract)"/>
|
9968
10031
|
</dc:description>
|
9969
10032
|
<pdf:Keywords>
|
9970
|
-
<xsl:call-template name="insertKeywords"
|
10033
|
+
<xsl:call-template name="insertKeywords">
|
10034
|
+
<xsl:with-param name="meta">true</xsl:with-param>
|
10035
|
+
</xsl:call-template>
|
9971
10036
|
</pdf:Keywords>
|
9972
10037
|
</rdf:Description>
|
9973
10038
|
<rdf:Description xmlns:xmp="http://ns.adobe.com/xap/1.0/" rdf:about="">
|