metanorma-ogc 2.6.9 → 2.6.11

Sign up to get free protection for your applications and to get access to all the features.
@@ -776,8 +776,21 @@
776
776
 
777
777
  <!-- <xsl:strip-space elements="ogc:xref"/> -->
778
778
 
779
- <xsl:variable name="namespace_full" select="namespace-uri(/*)"/> <!-- example: https://www.metanorma.org/ns/iso -->
780
- <xsl:variable name="root_element" select="local-name(/*)"/> <!-- example: iso-standard -->
779
+ <xsl:variable name="namespace_full_">
780
+ <xsl:choose>
781
+ <xsl:when test="local-name(/*) = 'metanorma-collection'"><xsl:value-of select="namespace-uri(//*[contains(local-name(), '-standard')][1])"/></xsl:when>
782
+ <xsl:otherwise><xsl:value-of select="namespace-uri(/*)"/></xsl:otherwise><!-- example: https://www.metanorma.org/ns/iso -->
783
+ </xsl:choose>
784
+ </xsl:variable>
785
+ <xsl:variable name="namespace_full" select="normalize-space($namespace_full_)"/>
786
+
787
+ <xsl:variable name="root_element_">
788
+ <xsl:choose>
789
+ <xsl:when test="local-name(/*) = 'metanorma-collection'"><xsl:value-of select="local-name(//*[contains(local-name(), '-standard')][1])"/></xsl:when>
790
+ <xsl:otherwise><xsl:value-of select="local-name(/*)"/></xsl:otherwise><!-- example: iso-standard -->
791
+ </xsl:choose>
792
+ </xsl:variable>
793
+ <xsl:variable name="root_element" select="normalize-space($root_element_)"/>
781
794
 
782
795
  <xsl:variable name="document_scheme" select="normalize-space(//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name'] = 'document-scheme']/*[local-name() = 'value'])"/>
783
796
 
@@ -2013,6 +2026,9 @@
2013
2026
 
2014
2027
  </xsl:attribute-set>
2015
2028
 
2029
+ <xsl:attribute-set name="related-block-style" use-attribute-sets="preferred-block-style">
2030
+ </xsl:attribute-set>
2031
+
2016
2032
  <xsl:attribute-set name="definition-style">
2017
2033
 
2018
2034
  <xsl:attribute name="space-after">6pt</xsl:attribute>
@@ -4293,7 +4309,9 @@
4293
4309
  <xsl:with-param name="element">
4294
4310
  <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 -->
4295
4311
  <fo:inline role="Lbl"> <!-- need for https://github.com/metanorma/metanorma-iso/issues/1003 -->
4312
+
4296
4313
  <xsl:copy-of select="$current_fn_number_text"/>
4314
+
4297
4315
  </fo:inline>
4298
4316
  </fo:basic-link>
4299
4317
  </xsl:with-param>
@@ -4312,8 +4330,7 @@
4312
4330
 
4313
4331
  <fo:block-container xsl:use-attribute-sets="fn-container-body-style" role="SKIP">
4314
4332
 
4315
- <fo:block xsl:use-attribute-sets="fn-body-style" role="SKIP">
4316
-
4333
+ <xsl:variable name="fn_block">
4317
4334
  <xsl:call-template name="refine_fn-body-style"/>
4318
4335
 
4319
4336
  <fo:inline id="{$ref_id}" xsl:use-attribute-sets="fn-body-num-style" role="Lbl">
@@ -4321,9 +4338,15 @@
4321
4338
  <xsl:call-template name="refine_fn-body-num-style"/>
4322
4339
 
4323
4340
  <xsl:value-of select="$current_fn_number_text"/>
4341
+
4324
4342
  </fo:inline>
4325
4343
  <xsl:apply-templates/>
4326
- </fo:block>
4344
+ </xsl:variable>
4345
+
4346
+ <fo:block xsl:use-attribute-sets="fn-body-style" role="SKIP">
4347
+ <xsl:copy-of select="$fn_block"/>
4348
+ </fo:block>
4349
+
4327
4350
  </fo:block-container>
4328
4351
  </fo:footnote-body>
4329
4352
  </fo:footnote>
@@ -5725,6 +5748,12 @@
5725
5748
  </xsl:if>
5726
5749
  </xsl:template>
5727
5750
 
5751
+ <xsl:template match="*[local-name()='strike']">
5752
+ <fo:inline text-decoration="line-through">
5753
+ <xsl:apply-templates/>
5754
+ </fo:inline>
5755
+ </xsl:template>
5756
+
5728
5757
  <xsl:template match="*[local-name() = 'pagebreak']">
5729
5758
  <fo:block break-after="page"/>
5730
5759
  <fo:block> </fo:block>
@@ -10365,14 +10394,17 @@
10365
10394
  </fo:block>
10366
10395
  </xsl:template>
10367
10396
 
10368
- <xsl:template match="*[local-name() = 'domain']">
10397
+ <!-- <xsl:template match="*[local-name() = 'domain']"> -->
10369
10398
  <!-- https://github.com/metanorma/isodoc/issues/607
10370
10399
  <fo:inline xsl:use-attribute-sets="domain-style">&lt;<xsl:apply-templates/>&gt;</fo:inline>
10371
10400
  <xsl:text> </xsl:text> -->
10372
- <xsl:if test="not(@hidden = 'true')">
10401
+ <!-- <xsl:if test="not(@hidden = 'true')">
10373
10402
  <xsl:apply-templates/>
10374
10403
  </xsl:if>
10375
- </xsl:template>
10404
+ </xsl:template> -->
10405
+
10406
+ <!-- https://github.com/metanorma/isodoc/issues/632#issuecomment-2567163931 -->
10407
+ <xsl:template match="*[local-name() = 'domain']"/>
10376
10408
 
10377
10409
  <xsl:template match="*[local-name() = 'admitted']">
10378
10410
  <fo:block xsl:use-attribute-sets="admitted-style">
@@ -10387,9 +10419,11 @@
10387
10419
  </xsl:template>
10388
10420
 
10389
10421
  <xsl:template name="setStyle_preferred">
10390
- <xsl:if test="*[local-name() = 'strong']">
10391
- <xsl:attribute name="font-weight">normal</xsl:attribute>
10392
- </xsl:if>
10422
+
10423
+ <xsl:if test="*[local-name() = 'strong']">
10424
+ <xsl:attribute name="font-weight">normal</xsl:attribute>
10425
+ </xsl:if>
10426
+
10393
10427
  </xsl:template>
10394
10428
 
10395
10429
  <!-- regarding ISO 10241-1:2011, If there is more than one preferred term, each preferred term follows the previous one on a new line. -->
@@ -10399,6 +10433,17 @@
10399
10433
  </xsl:template>
10400
10434
  <!-- End Preferred, admitted, deprecated -->
10401
10435
 
10436
+ <xsl:template match="*[local-name() = 'fmt-related']">
10437
+ <fo:block role="SKIP" xsl:use-attribute-sets="related-block-style">
10438
+ <xsl:apply-templates/>
10439
+ </fo:block>
10440
+ </xsl:template>
10441
+ <xsl:template match="*[local-name() = 'fmt-related']/*[local-name() = 'p']" priority="4">
10442
+ <fo:block>
10443
+ <xsl:apply-templates/>
10444
+ </fo:block>
10445
+ </xsl:template>
10446
+
10402
10447
  <!-- ========== -->
10403
10448
  <!-- definition -->
10404
10449
  <!-- ========== -->
@@ -11303,6 +11348,7 @@
11303
11348
 
11304
11349
  <!-- Normative references -->
11305
11350
  <xsl:template match="*[local-name() = 'references'][@normative='true']/*[local-name() = 'bibitem']" name="bibitem" priority="2">
11351
+ <xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][local-name() = 'bibitem'] and 1 = 1)"/> <!-- current bibiitem is non-first -->
11306
11352
 
11307
11353
  <fo:block id="{@id}" xsl:use-attribute-sets="bibitem-normative-style">
11308
11354
 
@@ -12026,7 +12072,8 @@
12026
12072
  <!-- add @id - first element with @id plus '_element_name' -->
12027
12073
  <xsl:variable name="prefix_id_" select="(.//*[@id])[1]/@id"/>
12028
12074
  <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>
12029
- <xsl:attribute name="id"><xsl:value-of select="$prefix_id"/>_<xsl:value-of select="local-name()"/></xsl:attribute>
12075
+ <xsl:variable name="document_suffix" select="ancestor::*[contains(local-name(), '-standard')]/@document_suffix"/>
12076
+ <xsl:attribute name="id"><xsl:value-of select="concat($prefix_id, '_', local-name(), '_', $document_suffix)"/></xsl:attribute>
12030
12077
  </xsl:if>
12031
12078
  </xsl:template>
12032
12079
 
@@ -12083,6 +12130,31 @@
12083
12130
  <xsl:template match="*[local-name() = 'name'][following-sibling::*[1][local-name() = 'fmt-name']]" mode="update_xml_pres"/>
12084
12131
  <xsl:template match="*[local-name() = 'section-title'][following-sibling::*[1][local-name() = 'p'][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_step1"/>
12085
12132
  <xsl:template match="*[local-name() = 'section-title'][following-sibling::*[1][local-name() = 'p'][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_pres"/>
12133
+ <!-- <xsl:template match="*[local-name() = 'preferred'][following-sibling::*[not(local-name() = 'preferred')][1][local-name() = 'fmt-preferred']]" mode="update_xml_step1"/> -->
12134
+ <xsl:template match="*[local-name() = 'preferred']" mode="update_xml_step1"/>
12135
+ <!-- <xsl:template match="*[local-name() = 'preferred'][following-sibling::*[not(local-name() = 'preferred')][1][local-name() = 'fmt-preferred']]" mode="update_xml_pres"/> -->
12136
+ <xsl:template match="*[local-name() = 'preferred']" mode="update_xml_pres"/>
12137
+ <!-- <xsl:template match="*[local-name() = 'admitted'][following-sibling::*[not(local-name() = 'admitted')][1][local-name() = 'fmt-admitted']]" mode="update_xml_step1"/> -->
12138
+ <xsl:template match="*[local-name() = 'admitted']" mode="update_xml_step1"/>
12139
+ <!-- <xsl:template match="*[local-name() = 'admitted'][following-sibling::*[not(local-name() = 'admitted')][1][local-name() = 'fmt-admitted']]" mode="update_xml_pres"/> -->
12140
+ <xsl:template match="*[local-name() = 'admitted']" mode="update_xml_pres"/>
12141
+ <!-- <xsl:template match="*[local-name() = 'deprecates'][following-sibling::*[not(local-name() = 'deprecates')][1][local-name() = 'fmt-deprecates']]" mode="update_xml_step1"/> -->
12142
+ <xsl:template match="*[local-name() = 'deprecates']" mode="update_xml_step1"/>
12143
+ <xsl:template match="*[local-name() = 'related']" mode="update_xml_step1"/>
12144
+ <!-- <xsl:template match="*[local-name() = 'deprecates'][following-sibling::*[not(local-name() = 'deprecates')][1][local-name() = 'fmt-deprecates']]" mode="update_xml_pres"/> -->
12145
+ <xsl:template match="*[local-name() = 'deprecates']" mode="update_xml_pres"/>
12146
+ <xsl:template match="*[local-name() = 'related']" mode="update_xml_pres"/>
12147
+ <!-- <xsl:template match="*[local-name() = 'definition'][following-sibling::*[1][local-name() = 'fmt-definition']]" mode="update_xml_step1"/> -->
12148
+ <xsl:template match="*[local-name() = 'definition']" mode="update_xml_step1"/>
12149
+ <!-- <xsl:template match="*[local-name() = 'definition'][following-sibling::*[1][local-name() = 'fmt-definition']]" mode="update_xml_pres"/> -->
12150
+ <xsl:template match="*[local-name() = 'definition']" mode="update_xml_pres"/>
12151
+ <!-- <xsl:template match="*[local-name() = 'termsource'][following-sibling::*[1][local-name() = 'fmt-termsource']]" mode="update_xml_step1"/> -->
12152
+ <xsl:template match="*[local-name() = 'termsource']" mode="update_xml_step1"/>
12153
+ <!-- <xsl:template match="*[local-name() = 'termsource'][following-sibling::*[1][local-name() = 'fmt-termsource']]" mode="update_xml_pres"/> -->
12154
+ <xsl:template match="*[local-name() = 'termsource']" mode="update_xml_pres"/>
12155
+
12156
+ <xsl:template match="*[local-name() = 'term'][@unnumbered = 'true'][not(.//*[starts-with(local-name(), 'fmt-')])]" mode="update_xml_step1"/>
12157
+ <xsl:template match="*[local-name() = 'term'][@unnumbered = 'true'][not(.//*[starts-with(local-name(), 'fmt-')])]" mode="update_xml_pres"/>
12086
12158
 
12087
12159
  <xsl:template match="*[local-name() = 'p'][@type = 'section-title' or @type = 'floating-title'][preceding-sibling::*[1][local-name() = 'section-title']]" mode="update_xml_step1">
12088
12160
  <xsl:copy>
@@ -12127,6 +12199,94 @@
12127
12199
  </xsl:element>
12128
12200
  </xsl:template>
12129
12201
 
12202
+ <xsl:template match="*[local-name() = 'fmt-preferred']"/>
12203
+ <xsl:template match="*[local-name() = 'fmt-preferred'][*[local-name() = 'p']]" mode="update_xml_step1">
12204
+ <xsl:apply-templates mode="update_xml_step1"/>
12205
+ </xsl:template>
12206
+ <xsl:template match="*[local-name() = 'fmt-preferred'][not(*[local-name() = 'p'])] | *[local-name() = 'fmt-preferred']/*[local-name() = 'p']" mode="update_xml_step1">
12207
+ <xsl:element name="preferred" namespace="{$namespace_full}">
12208
+ <xsl:copy-of select="@*"/>
12209
+ <xsl:apply-templates mode="update_xml_step1"/>
12210
+ </xsl:element>
12211
+ </xsl:template>
12212
+ <xsl:template match="*[local-name() = 'fmt-preferred'][*[local-name() = 'p']]" mode="update_xml_pres">
12213
+ <xsl:apply-templates mode="update_xml_pres"/>
12214
+ </xsl:template>
12215
+ <xsl:template match="*[local-name() = 'fmt-preferred'][not(*[local-name() = 'p'])] | *[local-name() = 'fmt-preferred']/*[local-name() = 'p']" mode="update_xml_pres">
12216
+ <xsl:element name="preferred" namespace="{$namespace_full}">
12217
+ <xsl:copy-of select="@*"/>
12218
+ <xsl:apply-templates mode="update_xml_pres"/>
12219
+ </xsl:element>
12220
+ </xsl:template>
12221
+
12222
+ <xsl:template match="*[local-name() = 'fmt-admitted']"/>
12223
+ <xsl:template match="*[local-name() = 'fmt-admitted'][*[local-name() = 'p']]" mode="update_xml_step1">
12224
+ <xsl:apply-templates mode="update_xml_step1"/>
12225
+ </xsl:template>
12226
+ <xsl:template match="*[local-name() = 'fmt-admitted'][not(*[local-name() = 'p'])] | *[local-name() = 'fmt-admitted']/*[local-name() = 'p']" mode="update_xml_step1">
12227
+ <xsl:element name="admitted" namespace="{$namespace_full}">
12228
+ <xsl:copy-of select="@*"/>
12229
+ <xsl:apply-templates mode="update_xml_step1"/>
12230
+ </xsl:element>
12231
+ </xsl:template>
12232
+ <xsl:template match="*[local-name() = 'fmt-admitted'][*[local-name() = 'p']]" mode="update_xml_pres">
12233
+ <xsl:apply-templates mode="update_xml_pres"/>
12234
+ </xsl:template>
12235
+ <xsl:template match="*[local-name() = 'fmt-admitted'][not(*[local-name() = 'p'])] | *[local-name() = 'fmt-admitted']/*[local-name() = 'p']" mode="update_xml_pres">
12236
+ <xsl:element name="admitted" namespace="{$namespace_full}">
12237
+ <xsl:copy-of select="@*"/>
12238
+ <xsl:apply-templates mode="update_xml_pres"/>
12239
+ </xsl:element>
12240
+ </xsl:template>
12241
+
12242
+ <xsl:template match="*[local-name() = 'fmt-deprecates']"/>
12243
+ <xsl:template match="*[local-name() = 'fmt-deprecates'][*[local-name() = 'p']]" mode="update_xml_step1">
12244
+ <xsl:apply-templates mode="update_xml_step1"/>
12245
+ </xsl:template>
12246
+ <xsl:template match="*[local-name() = 'fmt-deprecates'][not(*[local-name() = 'p'])] | *[local-name() = 'fmt-deprecates']/*[local-name() = 'p']" mode="update_xml_step1">
12247
+ <xsl:element name="deprecates" namespace="{$namespace_full}">
12248
+ <xsl:copy-of select="@*"/>
12249
+ <xsl:apply-templates mode="update_xml_step1"/>
12250
+ </xsl:element>
12251
+ </xsl:template>
12252
+ <xsl:template match="*[local-name() = 'fmt-deprecates'][*[local-name() = 'p']]" mode="update_xml_pres">
12253
+ <xsl:apply-templates mode="update_xml_pres"/>
12254
+ </xsl:template>
12255
+ <xsl:template match="*[local-name() = 'fmt-deprecates'][not(*[local-name() = 'p'])] | *[local-name() = 'fmt-deprecates']/*[local-name() = 'p']" mode="update_xml_pres">
12256
+ <xsl:element name="deprecates" namespace="{$namespace_full}">
12257
+ <xsl:copy-of select="@*"/>
12258
+ <xsl:apply-templates mode="update_xml_pres"/>
12259
+ </xsl:element>
12260
+ </xsl:template>
12261
+
12262
+ <xsl:template match="*[local-name() = 'fmt-definition']"/>
12263
+ <xsl:template match="*[local-name() = 'fmt-definition']" mode="update_xml_step1">
12264
+ <xsl:element name="definition" namespace="{$namespace_full}">
12265
+ <xsl:copy-of select="@*"/>
12266
+ <xsl:apply-templates mode="update_xml_step1"/>
12267
+ </xsl:element>
12268
+ </xsl:template>
12269
+ <xsl:template match="*[local-name() = 'fmt-definition']" mode="update_xml_pres">
12270
+ <xsl:element name="definition" namespace="{$namespace_full}">
12271
+ <xsl:copy-of select="@*"/>
12272
+ <xsl:apply-templates mode="update_xml_pres"/>
12273
+ </xsl:element>
12274
+ </xsl:template>
12275
+
12276
+ <xsl:template match="*[local-name() = 'fmt-termsource']"/>
12277
+ <xsl:template match="*[local-name() = 'fmt-termsource']" mode="update_xml_step1">
12278
+ <xsl:element name="termsource" namespace="{$namespace_full}">
12279
+ <xsl:copy-of select="@*"/>
12280
+ <xsl:apply-templates mode="update_xml_step1"/>
12281
+ </xsl:element>
12282
+ </xsl:template>
12283
+ <xsl:template match="*[local-name() = 'fmt-termsource']" mode="update_xml_pres">
12284
+ <xsl:element name="termsource" namespace="{$namespace_full}">
12285
+ <xsl:copy-of select="@*"/>
12286
+ <xsl:apply-templates mode="update_xml_pres"/>
12287
+ </xsl:element>
12288
+ </xsl:template>
12289
+
12130
12290
  <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">
12131
12291
  <xsl:apply-templates mode="update_xml_step1"/>
12132
12292
  </xsl:template>
@@ -13258,7 +13418,7 @@
13258
13418
  </xsl:template>
13259
13419
 
13260
13420
  <xsl:template name="namespaceCheck">
13261
- <xsl:variable name="documentNS" select="namespace-uri(/*)"/>
13421
+ <xsl:variable name="documentNS" select="$namespace_full"/> <!-- namespace-uri(/*) -->
13262
13422
  <xsl:variable name="XSLNS">
13263
13423
 
13264
13424
  <xsl:value-of select="document('')//*/namespace::ogc"/>
@@ -13348,6 +13508,9 @@
13348
13508
  <xsl:when test="$formatted = 'true' and string-length($bibdata_updated) != ''">
13349
13509
  <xsl:apply-templates select="xalan:nodeset($bibdata_updated)//*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
13350
13510
  </xsl:when>
13511
+ <xsl:when test="string-length($bibdata_updated) != ''">
13512
+ <xsl:value-of select="xalan:nodeset($bibdata_updated)//*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
13513
+ </xsl:when>
13351
13514
  <xsl:when test="$formatted = 'true'">
13352
13515
  <xsl:apply-templates select="xalan:nodeset($bibdata)//*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
13353
13516
  </xsl:when>
@@ -145,7 +145,8 @@ module IsoDoc
145
145
  %i(arabic alphabet roman alphabet_upper roman_upper)[(idx - 1) % 5]
146
146
  end
147
147
 
148
- def termsource1(elem)
148
+ # KILL
149
+ def termsource1xx(elem)
149
150
  while elem&.next_element&.name == "termsource"
150
151
  elem << "; #{to_xml(elem.next_element.remove.children)}"
151
152
  end
@@ -153,6 +154,11 @@ module IsoDoc
153
154
  "#{to_xml(elem.children).strip}]")
154
155
  end
155
156
 
157
+ def termsource_label(elem, sources)
158
+ elem.replace(l10n("[<strong>#{@i18n.source}:</strong> " \
159
+ "#{sources}]"))
160
+ end
161
+
156
162
  def bibliography_bibitem_number_skip(bibitem)
157
163
  implicit_reference(bibitem) ||
158
164
  bibitem.at(ns(".//docidentifier[@type = 'metanorma-ordinal']")) ||
@@ -181,13 +187,19 @@ module IsoDoc
181
187
  end
182
188
 
183
189
  def deprecates(elem)
184
- elem << "&#xa0;<span class='DeprecatedLabel'>#{@i18n.deprecated}</span>"
190
+ elem.xpath(ns(".//semx[@element = 'deprecates']")).each do |s|
191
+ s.next = "&#xa0;<span class='DeprecatedLabel'>#{@i18n.deprecated}</span>"
192
+ end
185
193
  end
186
194
 
187
195
  def admits(elem)
188
- elem << "&#xa0;<span class='AdmittedLabel'>#{@i18n.admitted}</span>"
196
+ elem.xpath(ns(".//semx[@element = 'admitted']")).each do |s|
197
+ s.next = "&#xa0;<span class='AdmittedLabel'>#{@i18n.admitted}</span>"
198
+ end
189
199
  end
190
200
 
201
+ #def designation_boldface(desgn); end
202
+
191
203
  def source_label(elem)
192
204
  labelled_ancestor(elem) and return
193
205
  #lbl = "<span class='fmt-element-name'>#{lower2cap @i18n.sourcecode}</span>"
@@ -267,11 +267,11 @@ Detailed in https://www.relaton.org/model/creator/</a:documentation>
267
267
  <a:documentation>An identifier of the person according to an international identifier scheme</a:documentation>
268
268
  </ref>
269
269
  </zeroOrMore>
270
- <zeroOrMore>
270
+ <optional>
271
271
  <ref name="contact">
272
272
  <a:documentation>Contact information for the person, including URI, address, phone number, and email</a:documentation>
273
273
  </ref>
274
- </zeroOrMore>
274
+ </optional>
275
275
  </element>
276
276
  </define>
277
277
  <define name="fullname">
@@ -454,11 +454,11 @@ real names (if the person is named with a pseudonym or user name); previous lega
454
454
  <a:documentation>An identifier of the organization according to an international identifier scheme</a:documentation>
455
455
  </ref>
456
456
  </zeroOrMore>
457
- <zeroOrMore>
457
+ <optional>
458
458
  <ref name="contact">
459
459
  <a:documentation>Contact information for the organization, including address, phone number, and email</a:documentation>
460
460
  </ref>
461
- </zeroOrMore>
461
+ </optional>
462
462
  <optional>
463
463
  <ref name="logo">
464
464
  <a:documentation>A logo for the organization</a:documentation>
@@ -540,12 +540,18 @@ real names (if the person is named with a pseudonym or user name); previous lega
540
540
  <!-- TODO may change -->
541
541
  <define name="contact">
542
542
  <a:documentation>Contact information for a person or organization</a:documentation>
543
- <choice>
543
+ <zeroOrMore>
544
544
  <ref name="address"/>
545
+ </zeroOrMore>
546
+ <zeroOrMore>
545
547
  <ref name="phone"/>
548
+ </zeroOrMore>
549
+ <zeroOrMore>
546
550
  <ref name="email"/>
551
+ </zeroOrMore>
552
+ <zeroOrMore>
547
553
  <ref name="uri"/>
548
- </choice>
554
+ </zeroOrMore>
549
555
  </define>
550
556
  <define name="phone">
551
557
  <a:documentation>The phone number associated with a person or organization</a:documentation>
@@ -1271,17 +1277,17 @@ for which this claim of validity is made, if applicable</a:documentation>
1271
1277
  </define>
1272
1278
  <define name="validityBegins">
1273
1279
  <element name="validityBegins">
1274
- <ref name="ISO8601DateTime"/>
1280
+ <ref name="ISO8601Date"/>
1275
1281
  </element>
1276
1282
  </define>
1277
1283
  <define name="validityEnds">
1278
1284
  <element name="validityEnds">
1279
- <ref name="ISO8601DateTime"/>
1285
+ <ref name="ISO8601Date"/>
1280
1286
  </element>
1281
1287
  </define>
1282
1288
  <define name="validityRevision">
1283
1289
  <element name="revision">
1284
- <ref name="ISO8601DateTime"/>
1290
+ <ref name="ISO8601Date"/>
1285
1291
  </element>
1286
1292
  </define>
1287
1293
  <define name="TypedTitleString">
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module Ogc
3
- VERSION = "2.6.9".freeze
3
+ VERSION = "2.6.11".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.9
4
+ version: 2.6.11
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
- autorequire:
8
+ autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2024-12-23 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: iso-639
@@ -315,7 +315,7 @@ homepage: https://github.com/metanorma/metanorma-ogc
315
315
  licenses:
316
316
  - BSD-2-Clause
317
317
  metadata: {}
318
- post_install_message:
318
+ post_install_message:
319
319
  rdoc_options: []
320
320
  require_paths:
321
321
  - lib
@@ -331,7 +331,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
331
331
  version: '0'
332
332
  requirements: []
333
333
  rubygems_version: 3.3.27
334
- signing_key:
334
+ signing_key:
335
335
  specification_version: 4
336
336
  summary: Metanorma for the Open Geospatial Consortium.
337
337
  test_files: []