metanorma-itu 2.1.3 → 2.1.4

Sign up to get free protection for your applications and to get access to all the features.
@@ -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
 
@@ -4475,99 +4484,107 @@
4475
4484
  </xsl:choose>
4476
4485
  </xsl:variable>
4477
4486
 
4478
- <fo:table keep-with-previous="always">
4479
- <xsl:for-each select="xalan:nodeset($table_attributes)/table_attributes/@*">
4480
- <xsl:variable name="name" select="local-name()"/>
4487
+
4488
+ <xsl:variable name="tableWithNotesAndFootnotes">
4489
+
4490
+ <fo:table keep-with-previous="always">
4491
+ <xsl:for-each select="xalan:nodeset($table_attributes)/table_attributes/@*">
4492
+ <xsl:variable name="name" select="local-name()"/>
4493
+ <xsl:choose>
4494
+ <xsl:when test="$name = 'border-top'">
4495
+ <xsl:attribute name="{$name}">0pt solid black</xsl:attribute>
4496
+ </xsl:when>
4497
+ <xsl:when test="$name = 'border'">
4498
+ <xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
4499
+ <xsl:attribute name="border-top">0pt solid black</xsl:attribute>
4500
+ </xsl:when>
4501
+ <xsl:otherwise>
4502
+ <xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
4503
+ </xsl:otherwise>
4504
+ </xsl:choose>
4505
+ </xsl:for-each>
4506
+
4507
+
4508
+ <xsl:if test="$doctype = 'service-publication'">
4509
+ <xsl:attribute name="border">none</xsl:attribute>
4510
+ <xsl:attribute name="font-family">Arial</xsl:attribute>
4511
+ <xsl:attribute name="font-size">8pt</xsl:attribute>
4512
+ </xsl:if>
4513
+
4514
+
4481
4515
  <xsl:choose>
4482
- <xsl:when test="$name = 'border-top'">
4483
- <xsl:attribute name="{$name}">0pt solid black</xsl:attribute>
4484
- </xsl:when>
4485
- <xsl:when test="$name = 'border'">
4486
- <xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
4487
- <xsl:attribute name="border-top">0pt solid black</xsl:attribute>
4516
+ <xsl:when test="xalan:nodeset($colgroup)//*[local-name()='col']">
4517
+ <xsl:for-each select="xalan:nodeset($colgroup)//*[local-name()='col']">
4518
+ <fo:table-column column-width="{@width}"/>
4519
+ </xsl:for-each>
4488
4520
  </xsl:when>
4489
4521
  <xsl:otherwise>
4490
- <xsl:attribute name="{$name}"><xsl:value-of select="."/></xsl:attribute>
4522
+ <!-- $colwidths=<xsl:copy-of select="$colwidths"/> -->
4523
+ <xsl:call-template name="insertTableColumnWidth">
4524
+ <xsl:with-param name="colwidths" select="$colwidths"/>
4525
+ </xsl:call-template>
4491
4526
  </xsl:otherwise>
4492
4527
  </xsl:choose>
4493
- </xsl:for-each>
4494
-
4495
-
4496
- <xsl:if test="$doctype = 'service-publication'">
4497
- <xsl:attribute name="border">none</xsl:attribute>
4498
- <xsl:attribute name="font-family">Arial</xsl:attribute>
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
-
4528
+
4529
+ <fo:table-body>
4530
+ <fo:table-row>
4531
+ <fo:table-cell xsl:use-attribute-sets="table-footer-cell-style" number-columns-spanned="{$cols-count}">
4532
+
4533
+
4522
4534
 
4523
-
4524
- <xsl:if test="ancestor::*[local-name()='preface']">
4525
- <xsl:if test="$doctype != 'service-publication'">
4526
- <xsl:attribute name="border">solid black 0pt</xsl:attribute>
4535
+
4536
+ <xsl:if test="ancestor::*[local-name()='preface']">
4537
+ <xsl:if test="$doctype != 'service-publication'">
4538
+ <xsl:attribute name="border">solid black 0pt</xsl:attribute>
4539
+ </xsl:if>
4540
+ </xsl:if>
4541
+ <xsl:if test="$doctype = 'service-publication'">
4542
+ <xsl:attribute name="border">none</xsl:attribute>
4527
4543
  </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
4544
 
4552
-
4553
-
4554
- <!-- horizontal row separator -->
4555
-
4556
-
4557
- <!-- fn processing -->
4558
-
4559
- <xsl:call-template name="table_fn_display"/>
4560
4545
 
4561
-
4562
-
4563
- <!-- for PAS display Notes after footnotes -->
4564
-
4565
-
4566
- </fo:table-cell>
4567
- </fo:table-row>
4568
- </fo:table-body>
4569
-
4570
- </fo:table>
4546
+ <!-- fn will be processed inside 'note' processing -->
4547
+
4548
+
4549
+
4550
+
4551
+
4552
+ <xsl:if test="$doctype = 'service-publication'">
4553
+ <fo:block margin-top="7pt" margin-bottom="2pt"><fo:inline>____________</fo:inline></fo:block>
4554
+ </xsl:if>
4555
+
4556
+
4557
+ <!-- for BSI (not PAS) display Notes before footnotes -->
4558
+
4559
+
4560
+ <!-- except gb and bsi -->
4561
+
4562
+ <xsl:apply-templates select="../*[local-name()='note']"/>
4563
+
4564
+
4565
+
4566
+ <!-- horizontal row separator -->
4567
+
4568
+
4569
+ <!-- fn processing -->
4570
+
4571
+ <xsl:call-template name="table_fn_display"/>
4572
+
4573
+
4574
+
4575
+ <!-- for PAS display Notes after footnotes -->
4576
+
4577
+
4578
+ </fo:table-cell>
4579
+ </fo:table-row>
4580
+ </fo:table-body>
4581
+
4582
+ </fo:table>
4583
+ </xsl:variable>
4584
+
4585
+ <xsl:if test="normalize-space($tableWithNotesAndFootnotes) != ''">
4586
+ <xsl:copy-of select="$tableWithNotesAndFootnotes"/>
4587
+ </xsl:if>
4571
4588
 
4572
4589
 
4573
4590
 
@@ -4888,6 +4905,7 @@
4888
4905
  <xsl:variable name="footnote_inline">
4889
4906
  <fo:inline xsl:use-attribute-sets="fn-num-style">
4890
4907
 
4908
+
4891
4909
  <fo:basic-link internal-destination="{$ref_id}" fox:alt-text="footnote {$current_fn_number}">
4892
4910
  <xsl:value-of select="$current_fn_number_text"/>
4893
4911
  </fo:basic-link>
@@ -4909,12 +4927,16 @@
4909
4927
  <fo:block xsl:use-attribute-sets="fn-body-style">
4910
4928
 
4911
4929
 
4930
+
4912
4931
  <xsl:if test="$doctype = 'service-publication'">
4913
4932
  <xsl:attribute name="font-size">10pt</xsl:attribute>
4914
4933
  </xsl:if>
4915
4934
 
4916
4935
  <fo:inline id="{$ref_id}" xsl:use-attribute-sets="fn-body-num-style">
4917
4936
 
4937
+
4938
+
4939
+
4918
4940
  <xsl:value-of select="$current_fn_number_text"/>
4919
4941
  </fo:inline>
4920
4942
  <xsl:apply-templates/>
@@ -6621,6 +6643,8 @@
6621
6643
 
6622
6644
 
6623
6645
 
6646
+
6647
+
6624
6648
  <xsl:choose>
6625
6649
  <xsl:when test="$target_text = ''">
6626
6650
  <xsl:apply-templates/>
@@ -6832,6 +6856,7 @@
6832
6856
 
6833
6857
 
6834
6858
 
6859
+
6835
6860
  <!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
6836
6861
  <!-- <xsl:if test="*[not(local-name()='name')][1][node()[normalize-space() != ''][1][local-name() = 'add'] and node()[normalize-space() != ''][last()][local-name() = 'add']]"> -->
6837
6862
  <xsl:if test="*[not(local-name()='name')][1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
@@ -6853,6 +6878,7 @@
6853
6878
  </xsl:when>
6854
6879
  <xsl:otherwise>
6855
6880
 
6881
+
6856
6882
 
6857
6883
  <xsl:text> – </xsl:text>
6858
6884
 
@@ -6872,6 +6898,7 @@
6872
6898
  </xsl:when>
6873
6899
  <xsl:otherwise>
6874
6900
 
6901
+
6875
6902
 
6876
6903
  <xsl:text> – </xsl:text>
6877
6904
 
@@ -7650,6 +7677,9 @@
7650
7677
  <fo:block xsl:use-attribute-sets="figure-name-style">
7651
7678
 
7652
7679
 
7680
+
7681
+
7682
+
7653
7683
  <xsl:apply-templates/>
7654
7684
  </fo:block>
7655
7685
  </xsl:if>
@@ -7710,7 +7740,7 @@
7710
7740
  <xsl:apply-templates/>
7711
7741
  </xsl:otherwise>
7712
7742
  </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">
7743
+ </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
7744
  <xsl:value-of select="."/>
7715
7745
  </xsl:template><xsl:template match="*[local-name() = 'review']" mode="contents_item"/><xsl:template match="*[local-name() = 'tab']" mode="contents_item">
7716
7746
  <xsl:text> </xsl:text>
@@ -7786,6 +7816,9 @@
7786
7816
  <!-- 9 -->
7787
7817
 
7788
7818
 
7819
+ <!-- <xsl:if test="$namespace = 'ieee'">
7820
+ <xsl:if test="$doctype = 'standard' and $stage = 'published'">8</xsl:if>
7821
+ </xsl:if> -->
7789
7822
  10
7790
7823
 
7791
7824
 
@@ -8230,10 +8263,14 @@
8230
8263
  </xsl:template><xsl:template match="*[local-name() = 'termexample']/*[local-name() = 'p']">
8231
8264
  <xsl:variable name="element">inline
8232
8265
 
8266
+
8233
8267
  </xsl:variable>
8234
8268
  <xsl:choose>
8235
8269
  <xsl:when test="contains($element, 'block')">
8236
8270
  <fo:block xsl:use-attribute-sets="example-p-style">
8271
+
8272
+
8273
+
8237
8274
  <xsl:apply-templates/>
8238
8275
  </fo:block>
8239
8276
  </xsl:when>
@@ -8341,6 +8378,7 @@
8341
8378
  </xsl:if>
8342
8379
  <fo:block xsl:use-attribute-sets="example-p-style">
8343
8380
 
8381
+
8344
8382
  <xsl:apply-templates/>
8345
8383
  </fo:block>
8346
8384
  </fo:block-container>
@@ -8497,6 +8535,8 @@
8497
8535
 
8498
8536
 
8499
8537
 
8538
+
8539
+
8500
8540
  <fo:basic-link fox:alt-text="{@citeas}">
8501
8541
  <xsl:if test="normalize-space(@citeas) = ''">
8502
8542
  <xsl:attribute name="fox:alt-text"><xsl:value-of select="."/></xsl:attribute>
@@ -8924,6 +8964,8 @@
8924
8964
 
8925
8965
 
8926
8966
 
8967
+
8968
+
8927
8969
  <!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
8928
8970
  <xsl:if test="*[1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
8929
8971
  <xsl:call-template name="append_add-style"/>
@@ -9181,7 +9223,7 @@
9181
9223
  </fo:block>
9182
9224
 
9183
9225
 
9184
- </xsl:template><xsl:template match="*[local-name() = 'references'][not(@normative='true')]/*[local-name() = 'bibitem']" priority="2">
9226
+ </xsl:template><xsl:template match="*[local-name() = 'references'][not(@normative='true')]/*[local-name() = 'bibitem']" name="bibitem_non_normative" priority="2">
9185
9227
 
9186
9228
 
9187
9229
  <fo:block id="{@id}" xsl:use-attribute-sets="bibitem-non-normative-style">
@@ -9961,7 +10003,7 @@
9961
10003
  <dc:description>
9962
10004
  <xsl:variable name="abstract">
9963
10005
 
9964
- <xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*[local-name() = 'abstract']//text()"/>
10006
+ <xsl:copy-of select="//*[contains(local-name(), '-standard')]/*[local-name() = 'preface']/*[local-name() = 'abstract']//text()[not(ancestor::*[local-name() = 'title'])]"/>
9965
10007
 
9966
10008
  </xsl:variable>
9967
10009
  <xsl:value-of select="normalize-space($abstract)"/>
@@ -69,6 +69,17 @@
69
69
  </zeroOrMore>
70
70
  </element>
71
71
  </define>
72
+ <define name="AdmonitionType">
73
+ <choice>
74
+ <value>warning</value>
75
+ <value>note</value>
76
+ <value>tip</value>
77
+ <value>important</value>
78
+ <value>caution</value>
79
+ <value>statement</value>
80
+ <value>editorial</value>
81
+ </choice>
82
+ </define>
72
83
  <define name="index">
73
84
  <element name="index">
74
85
  <optional>
@@ -116,6 +127,11 @@
116
127
  <data type="boolean"/>
117
128
  </attribute>
118
129
  </optional>
130
+ <optional>
131
+ <attribute name="suppress_identifier">
132
+ <data type="boolean"/>
133
+ </attribute>
134
+ </optional>
119
135
  <ref name="BibliographicItem"/>
120
136
  </element>
121
137
  </define>
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module ITU
3
- VERSION = "2.1.3".freeze
3
+ VERSION = "2.1.4".freeze
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-itu
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.1.3
4
+ version: 2.1.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2022-06-21 00:00:00.000000000 Z
11
+ date: 2022-07-04 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: htmlentities