metanorma-ogc 2.6.11 → 2.6.12

Sign up to get free protection for your applications and to get access to all the features.
@@ -158,23 +158,23 @@
158
158
  <xsl:variable name="toc_recommendations_">
159
159
  <xsl:for-each select="//ogc:table[.//ogc:p[@class = 'RecommendationTitle']]">
160
160
  <xsl:variable name="table_id" select="@id"/>
161
- <recommendation alt-text="{.//ogc:p[@class = 'RecommendationTitle'][1]/text()}">
161
+ <recommendation alt-text="{.//ogc:p[@class = 'RecommendationTitle'][1]}">
162
162
  <xsl:copy-of select="@id"/>
163
163
  <xsl:variable name="title">
164
- <xsl:apply-templates select=".//ogc:p[@class = 'RecommendationTitle'][ancestor::ogc:table[1][@id= $table_id]]/node()"/>
164
+ <xsl:apply-templates select=".//ogc:p[@class = 'RecommendationTitle'][ancestor::ogc:table[1][@id= $table_id]]/ogc:fmt-name/node()"/>
165
165
  <xsl:if test=".//ogc:p[@class = 'RecommendationLabel'][ancestor::ogc:table[1][@id= $table_id]]/node()">
166
166
  <xsl:text>: </xsl:text>
167
167
  <xsl:variable name="recommendationLabel">
168
- <tt><xsl:copy-of select=".//ogc:p[@class = 'RecommendationLabel'][ancestor::ogc:table[1][@id= $table_id]]/node()"/></tt>
168
+ <tt><xsl:copy-of select=".//ogc:p[@class = 'RecommendationLabel'][ancestor::ogc:table[1][@id= $table_id]]/ogc:fmt-name/node()"/></tt>
169
169
  </xsl:variable>
170
170
  <xsl:apply-templates select="xalan:nodeset($recommendationLabel)/node()"/>
171
171
  </xsl:if>
172
172
  </xsl:variable>
173
173
  <xsl:variable name="bookmark">
174
- <xsl:value-of select="normalize-space(.//ogc:p[@class = 'RecommendationTitle'][ancestor::ogc:table[1][@id= $table_id]]/node())"/>
174
+ <xsl:value-of select="normalize-space(.//ogc:p[@class = 'RecommendationTitle'][ancestor::ogc:table[1][@id= $table_id]]/ogc:fmt-name)"/>
175
175
  <xsl:if test=".//ogc:p[@class = 'RecommendationLabel'][ancestor::ogc:table[1][@id= $table_id]]/node()">
176
176
  <xsl:text>: </xsl:text>
177
- <xsl:value-of select="normalize-space(.//ogc:p[@class = 'RecommendationLabel'][ancestor::ogc:table[1][@id= $table_id]]/node())"/>
177
+ <xsl:value-of select="normalize-space(.//ogc:p[@class = 'RecommendationLabel'][ancestor::ogc:table[1][@id= $table_id]]/ogc:fmt-name)"/>
178
178
  </xsl:if>
179
179
  </xsl:variable>
180
180
  <xsl:variable name="regex_str" select="'^([^0-9]+) (\d+).*'"/>
@@ -7368,9 +7368,14 @@
7368
7368
 
7369
7369
  <xsl:variable name="simple-table">
7370
7370
 
7371
+ <xsl:variable name="table_without_semantic_elements">
7372
+ <xsl:apply-templates mode="update_xml_pres"/>
7373
+ </xsl:variable>
7374
+
7371
7375
  <!-- Step 0. replace <br/> to <p>...</p> -->
7372
7376
  <xsl:variable name="table_without_br">
7373
- <xsl:apply-templates mode="table-without-br"/>
7377
+ <!-- <xsl:apply-templates mode="table-without-br"/> -->
7378
+ <xsl:apply-templates select="xalan:nodeset($table_without_semantic_elements)" mode="table-without-br"/>
7374
7379
  </xsl:variable>
7375
7380
 
7376
7381
  <!-- Step 1. colspan processing -->
@@ -13428,16 +13433,30 @@
13428
13433
 
13429
13434
  <xsl:template match="*[local-name() = 'fmt-name']"/>
13430
13435
  <xsl:template match="*[local-name() = 'fmt-name']" mode="update_xml_step1">
13431
- <xsl:element name="name" namespace="{$namespace_full}">
13432
- <xsl:copy-of select="@*"/>
13433
- <xsl:apply-templates mode="update_xml_step1"/>
13434
- </xsl:element>
13436
+ <xsl:choose>
13437
+ <xsl:when test="local-name(..) = 'p' and ancestor::*[local-name() = 'table']">
13438
+ <xsl:apply-templates mode="update_xml_step1"/>
13439
+ </xsl:when>
13440
+ <xsl:otherwise>
13441
+ <xsl:element name="name" namespace="{$namespace_full}">
13442
+ <xsl:copy-of select="@*"/>
13443
+ <xsl:apply-templates mode="update_xml_step1"/>
13444
+ </xsl:element>
13445
+ </xsl:otherwise>
13446
+ </xsl:choose>
13435
13447
  </xsl:template>
13436
13448
  <xsl:template match="*[local-name() = 'fmt-name']" mode="update_xml_pres">
13437
- <xsl:element name="name" namespace="{$namespace_full}">
13438
- <xsl:copy-of select="@*"/>
13439
- <xsl:apply-templates mode="update_xml_pres"/>
13440
- </xsl:element>
13449
+ <xsl:choose>
13450
+ <xsl:when test="local-name(..) = 'p' and ancestor::*[local-name() = 'table']">
13451
+ <xsl:apply-templates mode="update_xml_step1"/>
13452
+ </xsl:when>
13453
+ <xsl:otherwise>
13454
+ <xsl:element name="name" namespace="{$namespace_full}">
13455
+ <xsl:copy-of select="@*"/>
13456
+ <xsl:apply-templates mode="update_xml_pres"/>
13457
+ </xsl:element>
13458
+ </xsl:otherwise>
13459
+ </xsl:choose>
13441
13460
  </xsl:template>
13442
13461
 
13443
13462
  <xsl:template match="*[local-name() = 'fmt-preferred']"/>
@@ -13535,6 +13554,9 @@
13535
13554
  <xsl:apply-templates mode="update_xml_pres"/>
13536
13555
  </xsl:template>
13537
13556
 
13557
+ <xsl:template match="*[local-name() = 'semx']">
13558
+ <xsl:apply-templates/>
13559
+ </xsl:template>
13538
13560
  <xsl:template match="*[local-name() = 'semx']" mode="update_xml_step1">
13539
13561
  <xsl:apply-templates mode="update_xml_step1"/>
13540
13562
  </xsl:template>
@@ -158,23 +158,23 @@
158
158
  <xsl:variable name="toc_recommendations_">
159
159
  <xsl:for-each select="//ogc:table[.//ogc:p[@class = 'RecommendationTitle']]">
160
160
  <xsl:variable name="table_id" select="@id"/>
161
- <recommendation alt-text="{.//ogc:p[@class = 'RecommendationTitle'][1]/text()}">
161
+ <recommendation alt-text="{.//ogc:p[@class = 'RecommendationTitle'][1]}">
162
162
  <xsl:copy-of select="@id"/>
163
163
  <xsl:variable name="title">
164
- <xsl:apply-templates select=".//ogc:p[@class = 'RecommendationTitle'][ancestor::ogc:table[1][@id= $table_id]]/node()"/>
164
+ <xsl:apply-templates select=".//ogc:p[@class = 'RecommendationTitle'][ancestor::ogc:table[1][@id= $table_id]]/ogc:fmt-name/node()"/>
165
165
  <xsl:if test=".//ogc:p[@class = 'RecommendationLabel'][ancestor::ogc:table[1][@id= $table_id]]/node()">
166
166
  <xsl:text>: </xsl:text>
167
167
  <xsl:variable name="recommendationLabel">
168
- <tt><xsl:copy-of select=".//ogc:p[@class = 'RecommendationLabel'][ancestor::ogc:table[1][@id= $table_id]]/node()"/></tt>
168
+ <tt><xsl:copy-of select=".//ogc:p[@class = 'RecommendationLabel'][ancestor::ogc:table[1][@id= $table_id]]/ogc:fmt-name/node()"/></tt>
169
169
  </xsl:variable>
170
170
  <xsl:apply-templates select="xalan:nodeset($recommendationLabel)/node()"/>
171
171
  </xsl:if>
172
172
  </xsl:variable>
173
173
  <xsl:variable name="bookmark">
174
- <xsl:value-of select="normalize-space(.//ogc:p[@class = 'RecommendationTitle'][ancestor::ogc:table[1][@id= $table_id]]/node())"/>
174
+ <xsl:value-of select="normalize-space(.//ogc:p[@class = 'RecommendationTitle'][ancestor::ogc:table[1][@id= $table_id]]/ogc:fmt-name)"/>
175
175
  <xsl:if test=".//ogc:p[@class = 'RecommendationLabel'][ancestor::ogc:table[1][@id= $table_id]]/node()">
176
176
  <xsl:text>: </xsl:text>
177
- <xsl:value-of select="normalize-space(.//ogc:p[@class = 'RecommendationLabel'][ancestor::ogc:table[1][@id= $table_id]]/node())"/>
177
+ <xsl:value-of select="normalize-space(.//ogc:p[@class = 'RecommendationLabel'][ancestor::ogc:table[1][@id= $table_id]]/ogc:fmt-name)"/>
178
178
  </xsl:if>
179
179
  </xsl:variable>
180
180
  <xsl:variable name="regex_str" select="'^([^0-9]+) (\d+).*'"/>
@@ -7368,9 +7368,14 @@
7368
7368
 
7369
7369
  <xsl:variable name="simple-table">
7370
7370
 
7371
+ <xsl:variable name="table_without_semantic_elements">
7372
+ <xsl:apply-templates mode="update_xml_pres"/>
7373
+ </xsl:variable>
7374
+
7371
7375
  <!-- Step 0. replace <br/> to <p>...</p> -->
7372
7376
  <xsl:variable name="table_without_br">
7373
- <xsl:apply-templates mode="table-without-br"/>
7377
+ <!-- <xsl:apply-templates mode="table-without-br"/> -->
7378
+ <xsl:apply-templates select="xalan:nodeset($table_without_semantic_elements)" mode="table-without-br"/>
7374
7379
  </xsl:variable>
7375
7380
 
7376
7381
  <!-- Step 1. colspan processing -->
@@ -13428,16 +13433,30 @@
13428
13433
 
13429
13434
  <xsl:template match="*[local-name() = 'fmt-name']"/>
13430
13435
  <xsl:template match="*[local-name() = 'fmt-name']" mode="update_xml_step1">
13431
- <xsl:element name="name" namespace="{$namespace_full}">
13432
- <xsl:copy-of select="@*"/>
13433
- <xsl:apply-templates mode="update_xml_step1"/>
13434
- </xsl:element>
13436
+ <xsl:choose>
13437
+ <xsl:when test="local-name(..) = 'p' and ancestor::*[local-name() = 'table']">
13438
+ <xsl:apply-templates mode="update_xml_step1"/>
13439
+ </xsl:when>
13440
+ <xsl:otherwise>
13441
+ <xsl:element name="name" namespace="{$namespace_full}">
13442
+ <xsl:copy-of select="@*"/>
13443
+ <xsl:apply-templates mode="update_xml_step1"/>
13444
+ </xsl:element>
13445
+ </xsl:otherwise>
13446
+ </xsl:choose>
13435
13447
  </xsl:template>
13436
13448
  <xsl:template match="*[local-name() = 'fmt-name']" mode="update_xml_pres">
13437
- <xsl:element name="name" namespace="{$namespace_full}">
13438
- <xsl:copy-of select="@*"/>
13439
- <xsl:apply-templates mode="update_xml_pres"/>
13440
- </xsl:element>
13449
+ <xsl:choose>
13450
+ <xsl:when test="local-name(..) = 'p' and ancestor::*[local-name() = 'table']">
13451
+ <xsl:apply-templates mode="update_xml_step1"/>
13452
+ </xsl:when>
13453
+ <xsl:otherwise>
13454
+ <xsl:element name="name" namespace="{$namespace_full}">
13455
+ <xsl:copy-of select="@*"/>
13456
+ <xsl:apply-templates mode="update_xml_pres"/>
13457
+ </xsl:element>
13458
+ </xsl:otherwise>
13459
+ </xsl:choose>
13441
13460
  </xsl:template>
13442
13461
 
13443
13462
  <xsl:template match="*[local-name() = 'fmt-preferred']"/>
@@ -13535,6 +13554,9 @@
13535
13554
  <xsl:apply-templates mode="update_xml_pres"/>
13536
13555
  </xsl:template>
13537
13556
 
13557
+ <xsl:template match="*[local-name() = 'semx']">
13558
+ <xsl:apply-templates/>
13559
+ </xsl:template>
13538
13560
  <xsl:template match="*[local-name() = 'semx']" mode="update_xml_step1">
13539
13561
  <xsl:apply-templates mode="update_xml_step1"/>
13540
13562
  </xsl:template>
@@ -158,23 +158,23 @@
158
158
  <xsl:variable name="toc_recommendations_">
159
159
  <xsl:for-each select="//ogc:table[.//ogc:p[@class = 'RecommendationTitle']]">
160
160
  <xsl:variable name="table_id" select="@id"/>
161
- <recommendation alt-text="{.//ogc:p[@class = 'RecommendationTitle'][1]/text()}">
161
+ <recommendation alt-text="{.//ogc:p[@class = 'RecommendationTitle'][1]}">
162
162
  <xsl:copy-of select="@id"/>
163
163
  <xsl:variable name="title">
164
- <xsl:apply-templates select=".//ogc:p[@class = 'RecommendationTitle'][ancestor::ogc:table[1][@id= $table_id]]/node()"/>
164
+ <xsl:apply-templates select=".//ogc:p[@class = 'RecommendationTitle'][ancestor::ogc:table[1][@id= $table_id]]/ogc:fmt-name/node()"/>
165
165
  <xsl:if test=".//ogc:p[@class = 'RecommendationLabel'][ancestor::ogc:table[1][@id= $table_id]]/node()">
166
166
  <xsl:text>: </xsl:text>
167
167
  <xsl:variable name="recommendationLabel">
168
- <tt><xsl:copy-of select=".//ogc:p[@class = 'RecommendationLabel'][ancestor::ogc:table[1][@id= $table_id]]/node()"/></tt>
168
+ <tt><xsl:copy-of select=".//ogc:p[@class = 'RecommendationLabel'][ancestor::ogc:table[1][@id= $table_id]]/ogc:fmt-name/node()"/></tt>
169
169
  </xsl:variable>
170
170
  <xsl:apply-templates select="xalan:nodeset($recommendationLabel)/node()"/>
171
171
  </xsl:if>
172
172
  </xsl:variable>
173
173
  <xsl:variable name="bookmark">
174
- <xsl:value-of select="normalize-space(.//ogc:p[@class = 'RecommendationTitle'][ancestor::ogc:table[1][@id= $table_id]]/node())"/>
174
+ <xsl:value-of select="normalize-space(.//ogc:p[@class = 'RecommendationTitle'][ancestor::ogc:table[1][@id= $table_id]]/ogc:fmt-name)"/>
175
175
  <xsl:if test=".//ogc:p[@class = 'RecommendationLabel'][ancestor::ogc:table[1][@id= $table_id]]/node()">
176
176
  <xsl:text>: </xsl:text>
177
- <xsl:value-of select="normalize-space(.//ogc:p[@class = 'RecommendationLabel'][ancestor::ogc:table[1][@id= $table_id]]/node())"/>
177
+ <xsl:value-of select="normalize-space(.//ogc:p[@class = 'RecommendationLabel'][ancestor::ogc:table[1][@id= $table_id]]/ogc:fmt-name)"/>
178
178
  </xsl:if>
179
179
  </xsl:variable>
180
180
  <xsl:variable name="regex_str" select="'^([^0-9]+) (\d+).*'"/>
@@ -7368,9 +7368,14 @@
7368
7368
 
7369
7369
  <xsl:variable name="simple-table">
7370
7370
 
7371
+ <xsl:variable name="table_without_semantic_elements">
7372
+ <xsl:apply-templates mode="update_xml_pres"/>
7373
+ </xsl:variable>
7374
+
7371
7375
  <!-- Step 0. replace <br/> to <p>...</p> -->
7372
7376
  <xsl:variable name="table_without_br">
7373
- <xsl:apply-templates mode="table-without-br"/>
7377
+ <!-- <xsl:apply-templates mode="table-without-br"/> -->
7378
+ <xsl:apply-templates select="xalan:nodeset($table_without_semantic_elements)" mode="table-without-br"/>
7374
7379
  </xsl:variable>
7375
7380
 
7376
7381
  <!-- Step 1. colspan processing -->
@@ -13428,16 +13433,30 @@
13428
13433
 
13429
13434
  <xsl:template match="*[local-name() = 'fmt-name']"/>
13430
13435
  <xsl:template match="*[local-name() = 'fmt-name']" mode="update_xml_step1">
13431
- <xsl:element name="name" namespace="{$namespace_full}">
13432
- <xsl:copy-of select="@*"/>
13433
- <xsl:apply-templates mode="update_xml_step1"/>
13434
- </xsl:element>
13436
+ <xsl:choose>
13437
+ <xsl:when test="local-name(..) = 'p' and ancestor::*[local-name() = 'table']">
13438
+ <xsl:apply-templates mode="update_xml_step1"/>
13439
+ </xsl:when>
13440
+ <xsl:otherwise>
13441
+ <xsl:element name="name" namespace="{$namespace_full}">
13442
+ <xsl:copy-of select="@*"/>
13443
+ <xsl:apply-templates mode="update_xml_step1"/>
13444
+ </xsl:element>
13445
+ </xsl:otherwise>
13446
+ </xsl:choose>
13435
13447
  </xsl:template>
13436
13448
  <xsl:template match="*[local-name() = 'fmt-name']" mode="update_xml_pres">
13437
- <xsl:element name="name" namespace="{$namespace_full}">
13438
- <xsl:copy-of select="@*"/>
13439
- <xsl:apply-templates mode="update_xml_pres"/>
13440
- </xsl:element>
13449
+ <xsl:choose>
13450
+ <xsl:when test="local-name(..) = 'p' and ancestor::*[local-name() = 'table']">
13451
+ <xsl:apply-templates mode="update_xml_step1"/>
13452
+ </xsl:when>
13453
+ <xsl:otherwise>
13454
+ <xsl:element name="name" namespace="{$namespace_full}">
13455
+ <xsl:copy-of select="@*"/>
13456
+ <xsl:apply-templates mode="update_xml_pres"/>
13457
+ </xsl:element>
13458
+ </xsl:otherwise>
13459
+ </xsl:choose>
13441
13460
  </xsl:template>
13442
13461
 
13443
13462
  <xsl:template match="*[local-name() = 'fmt-preferred']"/>
@@ -13535,6 +13554,9 @@
13535
13554
  <xsl:apply-templates mode="update_xml_pres"/>
13536
13555
  </xsl:template>
13537
13556
 
13557
+ <xsl:template match="*[local-name() = 'semx']">
13558
+ <xsl:apply-templates/>
13559
+ </xsl:template>
13538
13560
  <xsl:template match="*[local-name() = 'semx']" mode="update_xml_step1">
13539
13561
  <xsl:apply-templates mode="update_xml_step1"/>
13540
13562
  </xsl:template>
@@ -6129,9 +6129,14 @@
6129
6129
 
6130
6130
  <xsl:variable name="simple-table">
6131
6131
 
6132
+ <xsl:variable name="table_without_semantic_elements">
6133
+ <xsl:apply-templates mode="update_xml_pres"/>
6134
+ </xsl:variable>
6135
+
6132
6136
  <!-- Step 0. replace <br/> to <p>...</p> -->
6133
6137
  <xsl:variable name="table_without_br">
6134
- <xsl:apply-templates mode="table-without-br"/>
6138
+ <!-- <xsl:apply-templates mode="table-without-br"/> -->
6139
+ <xsl:apply-templates select="xalan:nodeset($table_without_semantic_elements)" mode="table-without-br"/>
6135
6140
  </xsl:variable>
6136
6141
 
6137
6142
  <!-- Step 1. colspan processing -->
@@ -12187,16 +12192,30 @@
12187
12192
 
12188
12193
  <xsl:template match="*[local-name() = 'fmt-name']"/>
12189
12194
  <xsl:template match="*[local-name() = 'fmt-name']" mode="update_xml_step1">
12190
- <xsl:element name="name" namespace="{$namespace_full}">
12191
- <xsl:copy-of select="@*"/>
12192
- <xsl:apply-templates mode="update_xml_step1"/>
12193
- </xsl:element>
12195
+ <xsl:choose>
12196
+ <xsl:when test="local-name(..) = 'p' and ancestor::*[local-name() = 'table']">
12197
+ <xsl:apply-templates mode="update_xml_step1"/>
12198
+ </xsl:when>
12199
+ <xsl:otherwise>
12200
+ <xsl:element name="name" namespace="{$namespace_full}">
12201
+ <xsl:copy-of select="@*"/>
12202
+ <xsl:apply-templates mode="update_xml_step1"/>
12203
+ </xsl:element>
12204
+ </xsl:otherwise>
12205
+ </xsl:choose>
12194
12206
  </xsl:template>
12195
12207
  <xsl:template match="*[local-name() = 'fmt-name']" mode="update_xml_pres">
12196
- <xsl:element name="name" namespace="{$namespace_full}">
12197
- <xsl:copy-of select="@*"/>
12198
- <xsl:apply-templates mode="update_xml_pres"/>
12199
- </xsl:element>
12208
+ <xsl:choose>
12209
+ <xsl:when test="local-name(..) = 'p' and ancestor::*[local-name() = 'table']">
12210
+ <xsl:apply-templates mode="update_xml_step1"/>
12211
+ </xsl:when>
12212
+ <xsl:otherwise>
12213
+ <xsl:element name="name" namespace="{$namespace_full}">
12214
+ <xsl:copy-of select="@*"/>
12215
+ <xsl:apply-templates mode="update_xml_pres"/>
12216
+ </xsl:element>
12217
+ </xsl:otherwise>
12218
+ </xsl:choose>
12200
12219
  </xsl:template>
12201
12220
 
12202
12221
  <xsl:template match="*[local-name() = 'fmt-preferred']"/>
@@ -12294,6 +12313,9 @@
12294
12313
  <xsl:apply-templates mode="update_xml_pres"/>
12295
12314
  </xsl:template>
12296
12315
 
12316
+ <xsl:template match="*[local-name() = 'semx']">
12317
+ <xsl:apply-templates/>
12318
+ </xsl:template>
12297
12319
  <xsl:template match="*[local-name() = 'semx']" mode="update_xml_step1">
12298
12320
  <xsl:apply-templates mode="update_xml_step1"/>
12299
12321
  </xsl:template>
@@ -947,6 +947,8 @@ May be electronic (e.g. Twitter direct message, email) or voice (e.g. a remark m
947
947
  typically cited as "personal communication")</a:documentation>
948
948
  <value>conversation</value>
949
949
  <a:documentation>An exchange of messages between two or more persons. May be electronic (e.g. web chat) or voice (e.g. phone call)</a:documentation>
950
+ <value>collection</value>
951
+ <a:documentation>A compound resource consisting of other resources, which are themselves presupposed to have their type specified..</a:documentation>
950
952
  <value>misc</value>
951
953
  <a:documentation>Bibliographic type not adequately described in the foregoing</a:documentation>
952
954
  </choice>
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module Ogc
3
- VERSION = "2.6.11".freeze
3
+ VERSION = "2.6.12".freeze
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-ogc
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.6.11
4
+ version: 2.6.12
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2025-01-20 00:00:00.000000000 Z
11
+ date: 2025-02-03 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: iso-639