metanorma-iho 0.5.7 → 0.5.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/lib/isodoc/iho/iho.specification.xsl +73 -13
  3. data/lib/isodoc/iho/iho.standard.xsl +73 -13
  4. data/lib/metanorma/iho/biblio.rng +25 -2
  5. data/lib/metanorma/iho/version.rb +1 -1
  6. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 3e45ecf864f0b42669794eec9b18c1ae434315fa26884f8f50845ab24a4ccc6e
4
- data.tar.gz: a232f5193d979b9cba430bf07b90475c230a7c6732064363d153bc9d89514b34
3
+ metadata.gz: 5fdf0696be05175e238e5926f6b67e87039e7b1bbb0446ff150b2460cc3a1f42
4
+ data.tar.gz: 4ae00994e31e579045e33a1da2f6308f1b6d405414ef6edce683059b92819390
5
5
  SHA512:
6
- metadata.gz: 8e42bdf9cc060ab2e68e80bc33e61c697e98ffc931552a603153e843fda40e4e6d43abecddec2baa9b59708a0ea487ddbc90df5063f523d8c07f0b77ad096b46
7
- data.tar.gz: 2fbddcf7e8a77d87201792d70f258d866c4c409f6217b10f1ff94803e886f03a5d341af41c3f63a2fa15408f63f9acf0763eb82212e28649ae19596a9323e59d
6
+ metadata.gz: 4ed77af30eda911b772f889e4f05df483580a115ac4b9f31273aa20c3709f15536b71cee7f6fbe3e7280969cc507aa68f9311918d870a3ad91c7bc3129fccf45
7
+ data.tar.gz: ba7cf27357fd7562d69ec19356436cdbe8f7eb5f98360bf302abba414cfa476169c11b8fabab87ffefb60c7a5f1fa0f16e4eddf8ac30a27704efaaee8bf63b95
data/lib/isodoc/iho/iho.specification.xsl CHANGED
@@ -33,7 +33,13 @@
33
33
  <xsl:template match="/">
34
34
 
35
35
  <xsl:variable name="xslfo">
36
- <fo:root xsl:use-attribute-sets="root-style" xml:lang="{$lang}">
36
+ <fo:root xml:lang="{$lang}">
37
+ <xsl:variable name="root-style">
38
+ <root-style xsl:use-attribute-sets="root-style"/>
39
+ </xsl:variable>
40
+ <xsl:call-template name="insertRootStyle">
41
+ <xsl:with-param name="root-style" select="$root-style"/>
42
+ </xsl:call-template>
37
43
  <fo:layout-master-set>
38
44
  <!-- cover page -->
39
45
  <fo:simple-page-master master-name="cover" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
@@ -921,7 +927,30 @@
921
927
 
922
928
 
923
929
 
924
- </xsl:attribute-set><xsl:attribute-set name="copyright-statement-style">
930
+ </xsl:attribute-set><xsl:template name="insertRootStyle">
931
+ <xsl:param name="root-style"/>
932
+ <xsl:variable name="root-style_" select="xalan:nodeset($root-style)"/>
933
+
934
+ <xsl:variable name="additional_fonts_">
935
+ <xsl:for-each select="//*[local-name() = 'misc-container'][1]/*[local-name() = 'presentation-metadata'][*[local-name() = 'name'] = 'fonts']/*[local-name() = 'value']">
936
+ <xsl:value-of select="."/><xsl:if test="position() != last()">, </xsl:if>
937
+ </xsl:for-each>
938
+ </xsl:variable>
939
+ <xsl:variable name="additional_fonts" select="normalize-space($additional_fonts_)"/>
940
+
941
+ <xsl:for-each select="$root-style_/root-style/@*">
942
+ <xsl:choose>
943
+ <xsl:when test="local-name() = 'font-family' and $additional_fonts != ''">
944
+ <xsl:attribute name="{local-name()}">
945
+ <xsl:value-of select="."/>, <xsl:value-of select="$additional_fonts"/>
946
+ </xsl:attribute>
947
+ </xsl:when>
948
+ <xsl:otherwise>
949
+ <xsl:copy-of select="."/>
950
+ </xsl:otherwise>
951
+ </xsl:choose>
952
+ </xsl:for-each>
953
+ </xsl:template><xsl:attribute-set name="copyright-statement-style">
925
954
 
926
955
  </xsl:attribute-set><xsl:attribute-set name="copyright-statement-title-style">
927
956
 
@@ -1443,7 +1472,7 @@
1443
1472
 
1444
1473
 
1445
1474
 
1446
- </xsl:attribute-set><xsl:attribute-set name="termnote-name-style">
1475
+ </xsl:attribute-set><xsl:attribute-set name="termnote-name-style">
1447
1476
 
1448
1477
 
1449
1478
 
@@ -3821,24 +3850,28 @@
3821
3850
  </xsl:template><xsl:template name="add-zero-spaces-equal">
3822
3851
  <xsl:param name="text" select="."/>
3823
3852
  <xsl:variable name="zero-space-after-equals">==========</xsl:variable>
3853
+ <xsl:variable name="regex_zero-space-after-equals">(==========)</xsl:variable>
3824
3854
  <xsl:variable name="zero-space-after-equal">=</xsl:variable>
3855
+ <xsl:variable name="regex_zero-space-after-equal">(=)</xsl:variable>
3825
3856
  <xsl:variable name="zero-space">​</xsl:variable>
3826
3857
  <xsl:choose>
3827
3858
  <xsl:when test="contains($text, $zero-space-after-equals)">
3828
- <xsl:value-of select="substring-before($text, $zero-space-after-equals)"/>
3859
+ <!-- <xsl:value-of select="substring-before($text, $zero-space-after-equals)"/>
3829
3860
  <xsl:value-of select="$zero-space-after-equals"/>
3830
3861
  <xsl:value-of select="$zero-space"/>
3831
3862
  <xsl:call-template name="add-zero-spaces-equal">
3832
3863
  <xsl:with-param name="text" select="substring-after($text, $zero-space-after-equals)"/>
3833
- </xsl:call-template>
3864
+ </xsl:call-template> -->
3865
+ <xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),$regex_zero-space-after-equals,concat('$1',$zero_width_space))"/>
3834
3866
  </xsl:when>
3835
3867
  <xsl:when test="contains($text, $zero-space-after-equal)">
3836
- <xsl:value-of select="substring-before($text, $zero-space-after-equal)"/>
3868
+ <!-- <xsl:value-of select="substring-before($text, $zero-space-after-equal)"/>
3837
3869
  <xsl:value-of select="$zero-space-after-equal"/>
3838
3870
  <xsl:value-of select="$zero-space"/>
3839
3871
  <xsl:call-template name="add-zero-spaces-equal">
3840
3872
  <xsl:with-param name="text" select="substring-after($text, $zero-space-after-equal)"/>
3841
- </xsl:call-template>
3873
+ </xsl:call-template> -->
3874
+ <xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),$regex_zero-space-after-equal,concat('$1',$zero_width_space))"/>
3842
3875
  </xsl:when>
3843
3876
  <xsl:otherwise>
3844
3877
  <xsl:value-of select="$text"/>
@@ -4318,7 +4351,12 @@
4318
4351
 
4319
4352
  <fo:inline xsl:use-attribute-sets="termnote-name-style">
4320
4353
 
4354
+ <xsl:if test="not(*[local-name() = 'name']/following-sibling::node()[1][self::text()][normalize-space()=''])">
4355
+ <xsl:attribute name="padding-right">1mm</xsl:attribute>
4356
+ </xsl:if>
4357
+
4321
4358
 
4359
+
4322
4360
 
4323
4361
  <!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
4324
4362
  <!-- <xsl:if test="*[not(local-name()='name')][1][node()[normalize-space() != ''][1][local-name() = 'add'] and node()[normalize-space() != ''][last()][local-name() = 'add']]"> -->
@@ -5296,17 +5334,15 @@
5296
5334
 
5297
5335
  <!-- split text by zero-width space -->
5298
5336
  <xsl:variable name="text_step4">
5299
- <xsl:call-template name="split">
5337
+ <xsl:call-template name="split_for_interspers">
5300
5338
  <xsl:with-param name="pText" select="$text_step3"/>
5301
5339
  <xsl:with-param name="sep" select="$zero_width_space"/>
5302
- <xsl:with-param name="normalize-space">false</xsl:with-param>
5303
- <xsl:with-param name="keep_sep">true</xsl:with-param>
5304
5340
  </xsl:call-template>
5305
5341
  </xsl:variable>
5306
5342
 
5307
- <xsl:for-each select="xalan:nodeset($text_step4)/item">
5343
+ <xsl:for-each select="xalan:nodeset($text_step4)/node()">
5308
5344
  <xsl:choose>
5309
- <xsl:when test="string-length() &gt; 30"> <!-- word with length more than 30 will be interspersed with zero-width space -->
5345
+ <xsl:when test="local-name() = 'interspers'"> <!-- word with length more than 30 will be interspersed with zero-width space -->
5310
5346
  <xsl:call-template name="interspers">
5311
5347
  <xsl:with-param name="str" select="."/>
5312
5348
  </xsl:call-template>
@@ -5317,6 +5353,30 @@
5317
5353
  </xsl:choose>
5318
5354
  </xsl:for-each>
5319
5355
 
5356
+ </xsl:template><xsl:variable name="interspers_tag_open">###interspers123###</xsl:variable><xsl:variable name="interspers_tag_close">###/interspers123###</xsl:variable><xsl:template name="split_for_interspers">
5357
+ <xsl:param name="pText" select="."/>
5358
+ <xsl:param name="sep" select="','"/>
5359
+ <!-- word with length more than 30 will be interspersed with zero-width space -->
5360
+ <xsl:variable name="regex" select="concat('([^', $zero_width_space, ']{31,})')"/> <!-- sequence of characters (more 31), that doesn't contains zero-width space -->
5361
+ <xsl:variable name="text" select="java:replaceAll(java:java.lang.String.new($pText),$regex,concat($interspers_tag_open,'$1',$interspers_tag_close))"/>
5362
+ <xsl:call-template name="replace_tag_interspers">
5363
+ <xsl:with-param name="text" select="$text"/>
5364
+ </xsl:call-template>
5365
+ </xsl:template><xsl:template name="replace_tag_interspers">
5366
+ <xsl:param name="text"/>
5367
+ <xsl:choose>
5368
+ <xsl:when test="contains($text, $interspers_tag_open)">
5369
+ <xsl:value-of select="substring-before($text, $interspers_tag_open)"/>
5370
+ <xsl:variable name="text_after" select="substring-after($text, $interspers_tag_open)"/>
5371
+ <interspers>
5372
+ <xsl:value-of select="substring-before($text_after, $interspers_tag_close)"/>
5373
+ </interspers>
5374
+ <xsl:call-template name="replace_tag_interspers">
5375
+ <xsl:with-param name="text" select="substring-after($text_after, $interspers_tag_close)"/>
5376
+ </xsl:call-template>
5377
+ </xsl:when>
5378
+ <xsl:otherwise><xsl:value-of select="$text"/></xsl:otherwise>
5379
+ </xsl:choose>
5320
5380
  </xsl:template><xsl:template name="interspers">
5321
5381
  <xsl:param name="str"/>
5322
5382
  <xsl:param name="char" select="$zero_width_space"/>
@@ -5764,7 +5824,7 @@
5764
5824
  </xsl:otherwise>
5765
5825
  </xsl:choose> -->
5766
5826
  </fo:block>
5767
- </xsl:template><xsl:template match="*[local-name() = 'termsource']/text()[starts-with(., '[SOURCE: Adapted from: ')]" priority="2">
5827
+ </xsl:template><xsl:template match="*[local-name() = 'termsource']/text()[starts-with(., '[SOURCE: Adapted from: ') or starts-with(., '[SOURCE: Quoted from: ') or starts-with(., '[SOURCE: Modified from: ')]" priority="2">
5768
5828
  <xsl:text>[</xsl:text><xsl:value-of select="substring-after(., '[SOURCE: ')"/>
5769
5829
  </xsl:template><xsl:template match="*[local-name() = 'termsource']/text()">
5770
5830
  <xsl:if test="normalize-space() != ''">
data/lib/isodoc/iho/iho.standard.xsl CHANGED
@@ -33,7 +33,13 @@
33
33
  <xsl:template match="/">
34
34
 
35
35
  <xsl:variable name="xslfo">
36
- <fo:root xsl:use-attribute-sets="root-style" xml:lang="{$lang}">
36
+ <fo:root xml:lang="{$lang}">
37
+ <xsl:variable name="root-style">
38
+ <root-style xsl:use-attribute-sets="root-style"/>
39
+ </xsl:variable>
40
+ <xsl:call-template name="insertRootStyle">
41
+ <xsl:with-param name="root-style" select="$root-style"/>
42
+ </xsl:call-template>
37
43
  <fo:layout-master-set>
38
44
  <!-- cover page -->
39
45
  <fo:simple-page-master master-name="cover" page-width="{$pageWidth}mm" page-height="{$pageHeight}mm">
@@ -921,7 +927,30 @@
921
927
 
922
928
 
923
929
 
924
- </xsl:attribute-set><xsl:attribute-set name="copyright-statement-style">
930
+ </xsl:attribute-set><xsl:template name="insertRootStyle">
931
+ <xsl:param name="root-style"/>
932
+ <xsl:variable name="root-style_" select="xalan:nodeset($root-style)"/>
933
+
934
+ <xsl:variable name="additional_fonts_">
935
+ <xsl:for-each select="//*[local-name() = 'misc-container'][1]/*[local-name() = 'presentation-metadata'][*[local-name() = 'name'] = 'fonts']/*[local-name() = 'value']">
936
+ <xsl:value-of select="."/><xsl:if test="position() != last()">, </xsl:if>
937
+ </xsl:for-each>
938
+ </xsl:variable>
939
+ <xsl:variable name="additional_fonts" select="normalize-space($additional_fonts_)"/>
940
+
941
+ <xsl:for-each select="$root-style_/root-style/@*">
942
+ <xsl:choose>
943
+ <xsl:when test="local-name() = 'font-family' and $additional_fonts != ''">
944
+ <xsl:attribute name="{local-name()}">
945
+ <xsl:value-of select="."/>, <xsl:value-of select="$additional_fonts"/>
946
+ </xsl:attribute>
947
+ </xsl:when>
948
+ <xsl:otherwise>
949
+ <xsl:copy-of select="."/>
950
+ </xsl:otherwise>
951
+ </xsl:choose>
952
+ </xsl:for-each>
953
+ </xsl:template><xsl:attribute-set name="copyright-statement-style">
925
954
 
926
955
  </xsl:attribute-set><xsl:attribute-set name="copyright-statement-title-style">
927
956
 
@@ -1443,7 +1472,7 @@
1443
1472
 
1444
1473
 
1445
1474
 
1446
- </xsl:attribute-set><xsl:attribute-set name="termnote-name-style">
1475
+ </xsl:attribute-set><xsl:attribute-set name="termnote-name-style">
1447
1476
 
1448
1477
 
1449
1478
 
@@ -3821,24 +3850,28 @@
3821
3850
  </xsl:template><xsl:template name="add-zero-spaces-equal">
3822
3851
  <xsl:param name="text" select="."/>
3823
3852
  <xsl:variable name="zero-space-after-equals">==========</xsl:variable>
3853
+ <xsl:variable name="regex_zero-space-after-equals">(==========)</xsl:variable>
3824
3854
  <xsl:variable name="zero-space-after-equal">=</xsl:variable>
3855
+ <xsl:variable name="regex_zero-space-after-equal">(=)</xsl:variable>
3825
3856
  <xsl:variable name="zero-space">​</xsl:variable>
3826
3857
  <xsl:choose>
3827
3858
  <xsl:when test="contains($text, $zero-space-after-equals)">
3828
- <xsl:value-of select="substring-before($text, $zero-space-after-equals)"/>
3859
+ <!-- <xsl:value-of select="substring-before($text, $zero-space-after-equals)"/>
3829
3860
  <xsl:value-of select="$zero-space-after-equals"/>
3830
3861
  <xsl:value-of select="$zero-space"/>
3831
3862
  <xsl:call-template name="add-zero-spaces-equal">
3832
3863
  <xsl:with-param name="text" select="substring-after($text, $zero-space-after-equals)"/>
3833
- </xsl:call-template>
3864
+ </xsl:call-template> -->
3865
+ <xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),$regex_zero-space-after-equals,concat('$1',$zero_width_space))"/>
3834
3866
  </xsl:when>
3835
3867
  <xsl:when test="contains($text, $zero-space-after-equal)">
3836
- <xsl:value-of select="substring-before($text, $zero-space-after-equal)"/>
3868
+ <!-- <xsl:value-of select="substring-before($text, $zero-space-after-equal)"/>
3837
3869
  <xsl:value-of select="$zero-space-after-equal"/>
3838
3870
  <xsl:value-of select="$zero-space"/>
3839
3871
  <xsl:call-template name="add-zero-spaces-equal">
3840
3872
  <xsl:with-param name="text" select="substring-after($text, $zero-space-after-equal)"/>
3841
- </xsl:call-template>
3873
+ </xsl:call-template> -->
3874
+ <xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),$regex_zero-space-after-equal,concat('$1',$zero_width_space))"/>
3842
3875
  </xsl:when>
3843
3876
  <xsl:otherwise>
3844
3877
  <xsl:value-of select="$text"/>
@@ -4318,7 +4351,12 @@
4318
4351
 
4319
4352
  <fo:inline xsl:use-attribute-sets="termnote-name-style">
4320
4353
 
4354
+ <xsl:if test="not(*[local-name() = 'name']/following-sibling::node()[1][self::text()][normalize-space()=''])">
4355
+ <xsl:attribute name="padding-right">1mm</xsl:attribute>
4356
+ </xsl:if>
4357
+
4321
4358
 
4359
+
4322
4360
 
4323
4361
  <!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
4324
4362
  <!-- <xsl:if test="*[not(local-name()='name')][1][node()[normalize-space() != ''][1][local-name() = 'add'] and node()[normalize-space() != ''][last()][local-name() = 'add']]"> -->
@@ -5296,17 +5334,15 @@
5296
5334
 
5297
5335
  <!-- split text by zero-width space -->
5298
5336
  <xsl:variable name="text_step4">
5299
- <xsl:call-template name="split">
5337
+ <xsl:call-template name="split_for_interspers">
5300
5338
  <xsl:with-param name="pText" select="$text_step3"/>
5301
5339
  <xsl:with-param name="sep" select="$zero_width_space"/>
5302
- <xsl:with-param name="normalize-space">false</xsl:with-param>
5303
- <xsl:with-param name="keep_sep">true</xsl:with-param>
5304
5340
  </xsl:call-template>
5305
5341
  </xsl:variable>
5306
5342
 
5307
- <xsl:for-each select="xalan:nodeset($text_step4)/item">
5343
+ <xsl:for-each select="xalan:nodeset($text_step4)/node()">
5308
5344
  <xsl:choose>
5309
- <xsl:when test="string-length() &gt; 30"> <!-- word with length more than 30 will be interspersed with zero-width space -->
5345
+ <xsl:when test="local-name() = 'interspers'"> <!-- word with length more than 30 will be interspersed with zero-width space -->
5310
5346
  <xsl:call-template name="interspers">
5311
5347
  <xsl:with-param name="str" select="."/>
5312
5348
  </xsl:call-template>
@@ -5317,6 +5353,30 @@
5317
5353
  </xsl:choose>
5318
5354
  </xsl:for-each>
5319
5355
 
5356
+ </xsl:template><xsl:variable name="interspers_tag_open">###interspers123###</xsl:variable><xsl:variable name="interspers_tag_close">###/interspers123###</xsl:variable><xsl:template name="split_for_interspers">
5357
+ <xsl:param name="pText" select="."/>
5358
+ <xsl:param name="sep" select="','"/>
5359
+ <!-- word with length more than 30 will be interspersed with zero-width space -->
5360
+ <xsl:variable name="regex" select="concat('([^', $zero_width_space, ']{31,})')"/> <!-- sequence of characters (more 31), that doesn't contains zero-width space -->
5361
+ <xsl:variable name="text" select="java:replaceAll(java:java.lang.String.new($pText),$regex,concat($interspers_tag_open,'$1',$interspers_tag_close))"/>
5362
+ <xsl:call-template name="replace_tag_interspers">
5363
+ <xsl:with-param name="text" select="$text"/>
5364
+ </xsl:call-template>
5365
+ </xsl:template><xsl:template name="replace_tag_interspers">
5366
+ <xsl:param name="text"/>
5367
+ <xsl:choose>
5368
+ <xsl:when test="contains($text, $interspers_tag_open)">
5369
+ <xsl:value-of select="substring-before($text, $interspers_tag_open)"/>
5370
+ <xsl:variable name="text_after" select="substring-after($text, $interspers_tag_open)"/>
5371
+ <interspers>
5372
+ <xsl:value-of select="substring-before($text_after, $interspers_tag_close)"/>
5373
+ </interspers>
5374
+ <xsl:call-template name="replace_tag_interspers">
5375
+ <xsl:with-param name="text" select="substring-after($text_after, $interspers_tag_close)"/>
5376
+ </xsl:call-template>
5377
+ </xsl:when>
5378
+ <xsl:otherwise><xsl:value-of select="$text"/></xsl:otherwise>
5379
+ </xsl:choose>
5320
5380
  </xsl:template><xsl:template name="interspers">
5321
5381
  <xsl:param name="str"/>
5322
5382
  <xsl:param name="char" select="$zero_width_space"/>
@@ -5764,7 +5824,7 @@
5764
5824
  </xsl:otherwise>
5765
5825
  </xsl:choose> -->
5766
5826
  </fo:block>
5767
- </xsl:template><xsl:template match="*[local-name() = 'termsource']/text()[starts-with(., '[SOURCE: Adapted from: ')]" priority="2">
5827
+ </xsl:template><xsl:template match="*[local-name() = 'termsource']/text()[starts-with(., '[SOURCE: Adapted from: ') or starts-with(., '[SOURCE: Quoted from: ') or starts-with(., '[SOURCE: Modified from: ')]" priority="2">
5768
5828
  <xsl:text>[</xsl:text><xsl:value-of select="substring-after(., '[SOURCE: ')"/>
5769
5829
  </xsl:template><xsl:template match="*[local-name() = 'termsource']/text()">
5770
5830
  <xsl:if test="normalize-space() != ''">
data/lib/metanorma/iho/biblio.rng CHANGED
@@ -527,7 +527,7 @@
527
527
  </define>
528
528
  <define name="LocalityType">
529
529
  <data type="string">
530
- <param name="pattern">section|clause|part|paragraph|chapter|page|whole|table|annex|figure|note|list|example|volume|issue|time|anchor|locality:[a-zA-Z0-9_]+</param>
530
+ <param name="pattern">section|clause|part|paragraph|chapter|page|title|line|whole|table|annex|figure|note|list|example|volume|issue|time|anchor|locality:[a-zA-Z0-9_]+</param>
531
531
  </data>
532
532
  </define>
533
533
  <define name="referenceFrom">
@@ -677,6 +677,9 @@
677
677
  <zeroOrMore>
678
678
  <ref name="extent"/>
679
679
  </zeroOrMore>
680
+ <optional>
681
+ <ref name="bibliographic_size"/>
682
+ </optional>
680
683
  <zeroOrMore>
681
684
  <ref name="accesslocation"/>
682
685
  </zeroOrMore>
@@ -922,9 +925,29 @@
922
925
  <text/>
923
926
  </element>
924
927
  </define>
928
+ <define name="sizevalue">
929
+ <element name="value">
930
+ <attribute name="type"/>
931
+ <text/>
932
+ </element>
933
+ </define>
934
+ <define name="bibliographic_size">
935
+ <element name="size">
936
+ <oneOrMore>
937
+ <ref name="sizevalue"/>
938
+ </oneOrMore>
939
+ </element>
940
+ </define>
925
941
  <define name="extent">
926
942
  <element name="extent">
927
- <ref name="BibItemLocality"/>
943
+ <choice>
944
+ <zeroOrMore>
945
+ <ref name="locality"/>
946
+ </zeroOrMore>
947
+ <zeroOrMore>
948
+ <ref name="localityStack"/>
949
+ </zeroOrMore>
950
+ </choice>
928
951
  </element>
929
952
  </define>
930
953
  <define name="series">
data/lib/metanorma/iho/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module IHO
3
- VERSION = "0.5.7".freeze
3
+ VERSION = "0.5.8".freeze
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metanorma-iho
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.7
4
+ version: 0.5.8
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-04-04 00:00:00.000000000 Z
11
+ date: 2022-04-18 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: htmlentities