metanorma-ribose 2.5.9 → 2.5.11

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: c2ce34357fcbe779b956860fb3d3da2ebca0f0a709520854f213f7bfd156f771
4
- data.tar.gz: dc2499f9ac4065e5587d87cdbd23213de19be6520bcf256eaf1b389225f156dd
3
+ metadata.gz: 1156484096c30a068a71bc24161bcbdcb4bf9849db623f12cfd2900bfa7ea05b
4
+ data.tar.gz: e853754d1770ea8ce4915c61592504056393e90a4d4a915a0201be23f612deba
5
5
  SHA512:
6
- metadata.gz: 2ec6784ba3c09413d4fa57fd359e1a65831a80092d79728c8a1a25eb678e92b118334ae3d0bc72d80da8f9b437a4d6b5ead1e8c915dcb368c9449d66da616256
7
- data.tar.gz: a22da98d2becdb55928d9fbd7fd12516e4f74cf41c44dfc8971ce49a2262fe37c45a11a2651080ada49604e42222931d51dff3fb819d79317873d1d6e36697e3
6
+ metadata.gz: c40bf640bdf8084e28ad5de4a8a5b9343a0c5559eb78e82a64ca3b5f7913a29c4166774d22415b1aa57ee4f8575cf212efe62555922b4f649e879fdbba88db32
7
+ data.tar.gz: 51e7de395fc02e90cc392808431fb49134cdfa0d052253566e7ed10097e97bd99ee55c4b577e8036311c30bc2828e4f016f3adfe0be4f4aec35a2495d02555e3
@@ -17,12 +17,19 @@ module IsoDoc
17
17
 
18
18
  def middle_title(docxml); end
19
19
 
20
- def termsource1(elem)
20
+ # KILL
21
+ def termsource1xx(elem)
21
22
  elem.children = l10n("<strong>#{@i18n.source}:</strong> " \
22
23
  "#{to_xml(elem.children).strip}")
23
24
  elem&.next_element&.name == "termsource" and elem.next = "; "
24
25
  end
25
26
 
27
+ def termsource_label(elem, sources)
28
+ elem.replace(l10n("<strong>#{@i18n.source}</strong>: #{sources}"))
29
+ end
30
+
31
+ def designation_boldface(desgn); end
32
+
26
33
  def preface_rearrange(doc)
27
34
  preface_move(doc.xpath(ns("//preface/abstract")),
28
35
  %w(foreword executivesummary introduction clause acknowledgements), doc)
@@ -1324,8 +1324,21 @@
1324
1324
 
1325
1325
  <!-- <xsl:strip-space elements="ribose:xref"/> -->
1326
1326
 
1327
- <xsl:variable name="namespace_full" select="namespace-uri(/*)"/> <!-- example: https://www.metanorma.org/ns/iso -->
1328
- <xsl:variable name="root_element" select="local-name(/*)"/> <!-- example: iso-standard -->
1327
+ <xsl:variable name="namespace_full_">
1328
+ <xsl:choose>
1329
+ <xsl:when test="local-name(/*) = 'metanorma-collection'"><xsl:value-of select="namespace-uri(//*[contains(local-name(), '-standard')][1])"/></xsl:when>
1330
+ <xsl:otherwise><xsl:value-of select="namespace-uri(/*)"/></xsl:otherwise><!-- example: https://www.metanorma.org/ns/iso -->
1331
+ </xsl:choose>
1332
+ </xsl:variable>
1333
+ <xsl:variable name="namespace_full" select="normalize-space($namespace_full_)"/>
1334
+
1335
+ <xsl:variable name="root_element_">
1336
+ <xsl:choose>
1337
+ <xsl:when test="local-name(/*) = 'metanorma-collection'"><xsl:value-of select="local-name(//*[contains(local-name(), '-standard')][1])"/></xsl:when>
1338
+ <xsl:otherwise><xsl:value-of select="local-name(/*)"/></xsl:otherwise><!-- example: iso-standard -->
1339
+ </xsl:choose>
1340
+ </xsl:variable>
1341
+ <xsl:variable name="root_element" select="normalize-space($root_element_)"/>
1329
1342
 
1330
1343
  <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'])"/>
1331
1344
 
@@ -2557,6 +2570,9 @@
2557
2570
 
2558
2571
  </xsl:attribute-set>
2559
2572
 
2573
+ <xsl:attribute-set name="related-block-style" use-attribute-sets="preferred-block-style">
2574
+ </xsl:attribute-set>
2575
+
2560
2576
  <xsl:attribute-set name="definition-style">
2561
2577
 
2562
2578
  <xsl:attribute name="keep-with-previous">always</xsl:attribute>
@@ -4815,7 +4831,9 @@
4815
4831
  <xsl:with-param name="element">
4816
4832
  <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 -->
4817
4833
  <fo:inline role="Lbl"> <!-- need for https://github.com/metanorma/metanorma-iso/issues/1003 -->
4834
+
4818
4835
  <xsl:copy-of select="$current_fn_number_text"/>
4836
+
4819
4837
  </fo:inline>
4820
4838
  </fo:basic-link>
4821
4839
  </xsl:with-param>
@@ -4834,8 +4852,7 @@
4834
4852
 
4835
4853
  <fo:block-container xsl:use-attribute-sets="fn-container-body-style" role="SKIP">
4836
4854
 
4837
- <fo:block xsl:use-attribute-sets="fn-body-style" role="SKIP">
4838
-
4855
+ <xsl:variable name="fn_block">
4839
4856
  <xsl:call-template name="refine_fn-body-style"/>
4840
4857
 
4841
4858
  <fo:inline id="{$ref_id}" xsl:use-attribute-sets="fn-body-num-style" role="Lbl">
@@ -4843,9 +4860,15 @@
4843
4860
  <xsl:call-template name="refine_fn-body-num-style"/>
4844
4861
 
4845
4862
  <xsl:value-of select="$current_fn_number_text"/>
4863
+
4846
4864
  </fo:inline>
4847
4865
  <xsl:apply-templates/>
4848
- </fo:block>
4866
+ </xsl:variable>
4867
+
4868
+ <fo:block xsl:use-attribute-sets="fn-body-style" role="SKIP">
4869
+ <xsl:copy-of select="$fn_block"/>
4870
+ </fo:block>
4871
+
4849
4872
  </fo:block-container>
4850
4873
  </fo:footnote-body>
4851
4874
  </fo:footnote>
@@ -6244,6 +6267,12 @@
6244
6267
  </xsl:if>
6245
6268
  </xsl:template>
6246
6269
 
6270
+ <xsl:template match="*[local-name()='strike']">
6271
+ <fo:inline text-decoration="line-through">
6272
+ <xsl:apply-templates/>
6273
+ </fo:inline>
6274
+ </xsl:template>
6275
+
6247
6276
  <xsl:template match="*[local-name() = 'pagebreak']">
6248
6277
  <fo:block break-after="page"/>
6249
6278
  <fo:block> </fo:block>
@@ -10889,14 +10918,17 @@
10889
10918
  </fo:block>
10890
10919
  </xsl:template>
10891
10920
 
10892
- <xsl:template match="*[local-name() = 'domain']">
10921
+ <!-- <xsl:template match="*[local-name() = 'domain']"> -->
10893
10922
  <!-- https://github.com/metanorma/isodoc/issues/607
10894
10923
  <fo:inline xsl:use-attribute-sets="domain-style">&lt;<xsl:apply-templates/>&gt;</fo:inline>
10895
10924
  <xsl:text> </xsl:text> -->
10896
- <xsl:if test="not(@hidden = 'true')">
10925
+ <!-- <xsl:if test="not(@hidden = 'true')">
10897
10926
  <xsl:apply-templates/>
10898
10927
  </xsl:if>
10899
- </xsl:template>
10928
+ </xsl:template> -->
10929
+
10930
+ <!-- https://github.com/metanorma/isodoc/issues/632#issuecomment-2567163931 -->
10931
+ <xsl:template match="*[local-name() = 'domain']"/>
10900
10932
 
10901
10933
  <xsl:template match="*[local-name() = 'admitted']">
10902
10934
  <fo:block xsl:use-attribute-sets="admitted-style">
@@ -10911,9 +10943,10 @@
10911
10943
  </xsl:template>
10912
10944
 
10913
10945
  <xsl:template name="setStyle_preferred">
10914
- <xsl:if test="*[local-name() = 'strong']">
10915
- <xsl:attribute name="font-weight">normal</xsl:attribute>
10916
- </xsl:if>
10946
+
10947
+ <xsl:attribute name="font-weight">normal</xsl:attribute>
10948
+ <xsl:attribute name="color">black</xsl:attribute>
10949
+
10917
10950
  </xsl:template>
10918
10951
 
10919
10952
  <!-- regarding ISO 10241-1:2011, If there is more than one preferred term, each preferred term follows the previous one on a new line. -->
@@ -10923,6 +10956,17 @@
10923
10956
  </xsl:template>
10924
10957
  <!-- End Preferred, admitted, deprecated -->
10925
10958
 
10959
+ <xsl:template match="*[local-name() = 'fmt-related']">
10960
+ <fo:block role="SKIP" xsl:use-attribute-sets="related-block-style">
10961
+ <xsl:apply-templates/>
10962
+ </fo:block>
10963
+ </xsl:template>
10964
+ <xsl:template match="*[local-name() = 'fmt-related']/*[local-name() = 'p']" priority="4">
10965
+ <fo:block>
10966
+ <xsl:apply-templates/>
10967
+ </fo:block>
10968
+ </xsl:template>
10969
+
10926
10970
  <!-- ========== -->
10927
10971
  <!-- definition -->
10928
10972
  <!-- ========== -->
@@ -11829,6 +11873,7 @@
11829
11873
 
11830
11874
  <!-- Normative references -->
11831
11875
  <xsl:template match="*[local-name() = 'references'][@normative='true']/*[local-name() = 'bibitem']" name="bibitem" priority="2">
11876
+ <xsl:param name="skip" select="normalize-space(preceding-sibling::*[1][local-name() = 'bibitem'] and 1 = 1)"/> <!-- current bibiitem is non-first -->
11832
11877
 
11833
11878
  <fo:block id="{@id}" xsl:use-attribute-sets="bibitem-normative-style">
11834
11879
 
@@ -12542,7 +12587,8 @@
12542
12587
  <!-- add @id - first element with @id plus '_element_name' -->
12543
12588
  <xsl:variable name="prefix_id_" select="(.//*[@id])[1]/@id"/>
12544
12589
  <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>
12545
- <xsl:attribute name="id"><xsl:value-of select="$prefix_id"/>_<xsl:value-of select="local-name()"/></xsl:attribute>
12590
+ <xsl:variable name="document_suffix" select="ancestor::*[contains(local-name(), '-standard')]/@document_suffix"/>
12591
+ <xsl:attribute name="id"><xsl:value-of select="concat($prefix_id, '_', local-name(), '_', $document_suffix)"/></xsl:attribute>
12546
12592
  </xsl:if>
12547
12593
  </xsl:template>
12548
12594
 
@@ -12599,6 +12645,31 @@
12599
12645
  <xsl:template match="*[local-name() = 'name'][following-sibling::*[1][local-name() = 'fmt-name']]" mode="update_xml_pres"/>
12600
12646
  <xsl:template match="*[local-name() = 'section-title'][following-sibling::*[1][local-name() = 'p'][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_step1"/>
12601
12647
  <xsl:template match="*[local-name() = 'section-title'][following-sibling::*[1][local-name() = 'p'][@type = 'section-title' or @type = 'floating-title']]" mode="update_xml_pres"/>
12648
+ <!-- <xsl:template match="*[local-name() = 'preferred'][following-sibling::*[not(local-name() = 'preferred')][1][local-name() = 'fmt-preferred']]" mode="update_xml_step1"/> -->
12649
+ <xsl:template match="*[local-name() = 'preferred']" mode="update_xml_step1"/>
12650
+ <!-- <xsl:template match="*[local-name() = 'preferred'][following-sibling::*[not(local-name() = 'preferred')][1][local-name() = 'fmt-preferred']]" mode="update_xml_pres"/> -->
12651
+ <xsl:template match="*[local-name() = 'preferred']" mode="update_xml_pres"/>
12652
+ <!-- <xsl:template match="*[local-name() = 'admitted'][following-sibling::*[not(local-name() = 'admitted')][1][local-name() = 'fmt-admitted']]" mode="update_xml_step1"/> -->
12653
+ <xsl:template match="*[local-name() = 'admitted']" mode="update_xml_step1"/>
12654
+ <!-- <xsl:template match="*[local-name() = 'admitted'][following-sibling::*[not(local-name() = 'admitted')][1][local-name() = 'fmt-admitted']]" mode="update_xml_pres"/> -->
12655
+ <xsl:template match="*[local-name() = 'admitted']" mode="update_xml_pres"/>
12656
+ <!-- <xsl:template match="*[local-name() = 'deprecates'][following-sibling::*[not(local-name() = 'deprecates')][1][local-name() = 'fmt-deprecates']]" mode="update_xml_step1"/> -->
12657
+ <xsl:template match="*[local-name() = 'deprecates']" mode="update_xml_step1"/>
12658
+ <xsl:template match="*[local-name() = 'related']" mode="update_xml_step1"/>
12659
+ <!-- <xsl:template match="*[local-name() = 'deprecates'][following-sibling::*[not(local-name() = 'deprecates')][1][local-name() = 'fmt-deprecates']]" mode="update_xml_pres"/> -->
12660
+ <xsl:template match="*[local-name() = 'deprecates']" mode="update_xml_pres"/>
12661
+ <xsl:template match="*[local-name() = 'related']" mode="update_xml_pres"/>
12662
+ <!-- <xsl:template match="*[local-name() = 'definition'][following-sibling::*[1][local-name() = 'fmt-definition']]" mode="update_xml_step1"/> -->
12663
+ <xsl:template match="*[local-name() = 'definition']" mode="update_xml_step1"/>
12664
+ <!-- <xsl:template match="*[local-name() = 'definition'][following-sibling::*[1][local-name() = 'fmt-definition']]" mode="update_xml_pres"/> -->
12665
+ <xsl:template match="*[local-name() = 'definition']" mode="update_xml_pres"/>
12666
+ <!-- <xsl:template match="*[local-name() = 'termsource'][following-sibling::*[1][local-name() = 'fmt-termsource']]" mode="update_xml_step1"/> -->
12667
+ <xsl:template match="*[local-name() = 'termsource']" mode="update_xml_step1"/>
12668
+ <!-- <xsl:template match="*[local-name() = 'termsource'][following-sibling::*[1][local-name() = 'fmt-termsource']]" mode="update_xml_pres"/> -->
12669
+ <xsl:template match="*[local-name() = 'termsource']" mode="update_xml_pres"/>
12670
+
12671
+ <xsl:template match="*[local-name() = 'term'][@unnumbered = 'true'][not(.//*[starts-with(local-name(), 'fmt-')])]" mode="update_xml_step1"/>
12672
+ <xsl:template match="*[local-name() = 'term'][@unnumbered = 'true'][not(.//*[starts-with(local-name(), 'fmt-')])]" mode="update_xml_pres"/>
12602
12673
 
12603
12674
  <xsl:template match="*[local-name() = 'p'][@type = 'section-title' or @type = 'floating-title'][preceding-sibling::*[1][local-name() = 'section-title']]" mode="update_xml_step1">
12604
12675
  <xsl:copy>
@@ -12643,6 +12714,94 @@
12643
12714
  </xsl:element>
12644
12715
  </xsl:template>
12645
12716
 
12717
+ <xsl:template match="*[local-name() = 'fmt-preferred']"/>
12718
+ <xsl:template match="*[local-name() = 'fmt-preferred'][*[local-name() = 'p']]" mode="update_xml_step1">
12719
+ <xsl:apply-templates mode="update_xml_step1"/>
12720
+ </xsl:template>
12721
+ <xsl:template match="*[local-name() = 'fmt-preferred'][not(*[local-name() = 'p'])] | *[local-name() = 'fmt-preferred']/*[local-name() = 'p']" mode="update_xml_step1">
12722
+ <xsl:element name="preferred" namespace="{$namespace_full}">
12723
+ <xsl:copy-of select="@*"/>
12724
+ <xsl:apply-templates mode="update_xml_step1"/>
12725
+ </xsl:element>
12726
+ </xsl:template>
12727
+ <xsl:template match="*[local-name() = 'fmt-preferred'][*[local-name() = 'p']]" mode="update_xml_pres">
12728
+ <xsl:apply-templates mode="update_xml_pres"/>
12729
+ </xsl:template>
12730
+ <xsl:template match="*[local-name() = 'fmt-preferred'][not(*[local-name() = 'p'])] | *[local-name() = 'fmt-preferred']/*[local-name() = 'p']" mode="update_xml_pres">
12731
+ <xsl:element name="preferred" namespace="{$namespace_full}">
12732
+ <xsl:copy-of select="@*"/>
12733
+ <xsl:apply-templates mode="update_xml_pres"/>
12734
+ </xsl:element>
12735
+ </xsl:template>
12736
+
12737
+ <xsl:template match="*[local-name() = 'fmt-admitted']"/>
12738
+ <xsl:template match="*[local-name() = 'fmt-admitted'][*[local-name() = 'p']]" mode="update_xml_step1">
12739
+ <xsl:apply-templates mode="update_xml_step1"/>
12740
+ </xsl:template>
12741
+ <xsl:template match="*[local-name() = 'fmt-admitted'][not(*[local-name() = 'p'])] | *[local-name() = 'fmt-admitted']/*[local-name() = 'p']" mode="update_xml_step1">
12742
+ <xsl:element name="admitted" namespace="{$namespace_full}">
12743
+ <xsl:copy-of select="@*"/>
12744
+ <xsl:apply-templates mode="update_xml_step1"/>
12745
+ </xsl:element>
12746
+ </xsl:template>
12747
+ <xsl:template match="*[local-name() = 'fmt-admitted'][*[local-name() = 'p']]" mode="update_xml_pres">
12748
+ <xsl:apply-templates mode="update_xml_pres"/>
12749
+ </xsl:template>
12750
+ <xsl:template match="*[local-name() = 'fmt-admitted'][not(*[local-name() = 'p'])] | *[local-name() = 'fmt-admitted']/*[local-name() = 'p']" mode="update_xml_pres">
12751
+ <xsl:element name="admitted" namespace="{$namespace_full}">
12752
+ <xsl:copy-of select="@*"/>
12753
+ <xsl:apply-templates mode="update_xml_pres"/>
12754
+ </xsl:element>
12755
+ </xsl:template>
12756
+
12757
+ <xsl:template match="*[local-name() = 'fmt-deprecates']"/>
12758
+ <xsl:template match="*[local-name() = 'fmt-deprecates'][*[local-name() = 'p']]" mode="update_xml_step1">
12759
+ <xsl:apply-templates mode="update_xml_step1"/>
12760
+ </xsl:template>
12761
+ <xsl:template match="*[local-name() = 'fmt-deprecates'][not(*[local-name() = 'p'])] | *[local-name() = 'fmt-deprecates']/*[local-name() = 'p']" mode="update_xml_step1">
12762
+ <xsl:element name="deprecates" namespace="{$namespace_full}">
12763
+ <xsl:copy-of select="@*"/>
12764
+ <xsl:apply-templates mode="update_xml_step1"/>
12765
+ </xsl:element>
12766
+ </xsl:template>
12767
+ <xsl:template match="*[local-name() = 'fmt-deprecates'][*[local-name() = 'p']]" mode="update_xml_pres">
12768
+ <xsl:apply-templates mode="update_xml_pres"/>
12769
+ </xsl:template>
12770
+ <xsl:template match="*[local-name() = 'fmt-deprecates'][not(*[local-name() = 'p'])] | *[local-name() = 'fmt-deprecates']/*[local-name() = 'p']" mode="update_xml_pres">
12771
+ <xsl:element name="deprecates" namespace="{$namespace_full}">
12772
+ <xsl:copy-of select="@*"/>
12773
+ <xsl:apply-templates mode="update_xml_pres"/>
12774
+ </xsl:element>
12775
+ </xsl:template>
12776
+
12777
+ <xsl:template match="*[local-name() = 'fmt-definition']"/>
12778
+ <xsl:template match="*[local-name() = 'fmt-definition']" mode="update_xml_step1">
12779
+ <xsl:element name="definition" namespace="{$namespace_full}">
12780
+ <xsl:copy-of select="@*"/>
12781
+ <xsl:apply-templates mode="update_xml_step1"/>
12782
+ </xsl:element>
12783
+ </xsl:template>
12784
+ <xsl:template match="*[local-name() = 'fmt-definition']" mode="update_xml_pres">
12785
+ <xsl:element name="definition" namespace="{$namespace_full}">
12786
+ <xsl:copy-of select="@*"/>
12787
+ <xsl:apply-templates mode="update_xml_pres"/>
12788
+ </xsl:element>
12789
+ </xsl:template>
12790
+
12791
+ <xsl:template match="*[local-name() = 'fmt-termsource']"/>
12792
+ <xsl:template match="*[local-name() = 'fmt-termsource']" mode="update_xml_step1">
12793
+ <xsl:element name="termsource" namespace="{$namespace_full}">
12794
+ <xsl:copy-of select="@*"/>
12795
+ <xsl:apply-templates mode="update_xml_step1"/>
12796
+ </xsl:element>
12797
+ </xsl:template>
12798
+ <xsl:template match="*[local-name() = 'fmt-termsource']" mode="update_xml_pres">
12799
+ <xsl:element name="termsource" namespace="{$namespace_full}">
12800
+ <xsl:copy-of select="@*"/>
12801
+ <xsl:apply-templates mode="update_xml_pres"/>
12802
+ </xsl:element>
12803
+ </xsl:template>
12804
+
12646
12805
  <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">
12647
12806
  <xsl:apply-templates mode="update_xml_step1"/>
12648
12807
  </xsl:template>
@@ -13774,7 +13933,7 @@
13774
13933
  </xsl:template>
13775
13934
 
13776
13935
  <xsl:template name="namespaceCheck">
13777
- <xsl:variable name="documentNS" select="namespace-uri(/*)"/>
13936
+ <xsl:variable name="documentNS" select="$namespace_full"/> <!-- namespace-uri(/*) -->
13778
13937
  <xsl:variable name="XSLNS">
13779
13938
 
13780
13939
  <xsl:value-of select="document('')//*/namespace::ribose"/>
@@ -13864,6 +14023,9 @@
13864
14023
  <xsl:when test="$formatted = 'true' and string-length($bibdata_updated) != ''">
13865
14024
  <xsl:apply-templates select="xalan:nodeset($bibdata_updated)//*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
13866
14025
  </xsl:when>
14026
+ <xsl:when test="string-length($bibdata_updated) != ''">
14027
+ <xsl:value-of select="xalan:nodeset($bibdata_updated)//*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
14028
+ </xsl:when>
13867
14029
  <xsl:when test="$formatted = 'true'">
13868
14030
  <xsl:apply-templates select="xalan:nodeset($bibdata)//*[local-name() = 'localized-string'][@key = $key and @language = $curr_lang]"/>
13869
14031
  </xsl:when>
@@ -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 Ribose
3
- VERSION = "2.5.9".freeze
3
+ VERSION = "2.5.11".freeze
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-ribose
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.5.9
4
+ version: 2.5.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: metanorma-generic
@@ -239,7 +239,7 @@ homepage: https://github.com/metanorma/metanorma-ribose
239
239
  licenses:
240
240
  - BSD-2-Clause
241
241
  metadata: {}
242
- post_install_message:
242
+ post_install_message:
243
243
  rdoc_options: []
244
244
  require_paths:
245
245
  - lib
@@ -255,7 +255,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
255
255
  version: '0'
256
256
  requirements: []
257
257
  rubygems_version: 3.3.27
258
- signing_key:
258
+ signing_key:
259
259
  specification_version: 4
260
260
  summary: metanorma-ribose lets you write Ribose standards in AsciiDoc.
261
261
  test_files: []