metanorma-iho 0.7.14 → 0.8.1

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 (10) hide show
  1. checksums.yaml +4 -4
  2. data/lib/isodoc/iho/html_convert.rb +0 -17
  3. data/lib/isodoc/iho/iho.specification.xsl +70 -28
  4. data/lib/isodoc/iho/iho.standard.xsl +70 -28
  5. data/lib/isodoc/iho/presentation_xml_convert.rb +2 -0
  6. data/lib/isodoc/iho/xref.rb +11 -13
  7. data/lib/metanorma/iho/isodoc.rng +29 -4
  8. data/lib/metanorma/iho/version.rb +1 -1
  9. data/metanorma-iho.gemspec +1 -1
  10. metadata +4 -4
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: cbf9a1bfd7a68cc123adc041a0efb220a3771c652784026a284a124ed79333d2
4
- data.tar.gz: 9c79bbf9ed708071e41538de30f5bacf1cf297e6ee9b8ffd2044ac2090ebdbc8
3
+ metadata.gz: 045764e09ce11023d0771448aea315e18f72fa8f52cc4e6f354060fe2541e7bb
4
+ data.tar.gz: f17202fa6fddb19c8ac23054f775232ad5d225e1e0bfbb8f10f3f12590517c00
5
5
  SHA512:
6
- metadata.gz: 9e18eaf1bfa537e3afa2f43161881f0841757d07a065286fba2bc1f8ddb17319c8ce567225fe89950c0f070c9d0279e6d73bf5ed305591d2200aecd9b411b74f
7
- data.tar.gz: e4e898a3782cd148ba63daa180c87eb62b254fd7e977a8b66f94c3a0af18d937805b8f4f3622875401bfd8091f4fa392f8650e3ca180133e6f5072278ce6e566
6
+ metadata.gz: 9e6f5acf65061cd09e635415f6a1f6a59b0128e08d8acf2a05c2cb5fe1100e9b8a943ec4d16564e4ebfc6affa54456eea4ce2cd1956391cc062b7e321b01b3af
7
+ data.tar.gz: 3a5009d9ea547b6142fb92c1c997b75fa3ec993e79c37b6ece2b3c374edd412619303a7e086b4e1fbc10afe25bf51b6122ebce69884c8aa5586c96d75164075e
data/lib/isodoc/iho/html_convert.rb CHANGED
@@ -12,23 +12,6 @@ module IsoDoc
12
12
  Metanorma::IHO.configuration
13
13
  end
14
14
 
15
- =begin
16
- def make_body3(body, docxml)
17
- body.div **{ class: "main-section" } do |div3|
18
- boilerplate docxml, div3
19
- preface_block docxml, div3
20
- abstract docxml, div3
21
- foreword docxml, div3
22
- introduction docxml, div3
23
- preface docxml, div3
24
- acknowledgements docxml, div3
25
- middle docxml, div3
26
- footnotes div3
27
- comments div3
28
- end
29
- end
30
- =end
31
-
32
15
  include BaseConvert
33
16
  include Init
34
17
  end
data/lib/isodoc/iho/iho.specification.xsl CHANGED
@@ -1155,11 +1155,26 @@
1155
1155
  <xsl:value-of select="$font_extended"/><xsl:text>, </xsl:text>
1156
1156
  </xsl:if>
1157
1157
 
1158
- <xsl:value-of select="."/>
1158
+ <xsl:variable name="font_family" select="."/>
1159
1159
 
1160
- <xsl:if test="$additional_fonts != ''">
1161
- <xsl:text>, </xsl:text><xsl:value-of select="$additional_fonts"/>
1162
- </xsl:if>
1160
+ <xsl:choose>
1161
+ <xsl:when test="$additional_fonts = ''">
1162
+ <xsl:value-of select="$font_family"/>
1163
+ </xsl:when>
1164
+ <xsl:otherwise> <!-- $additional_fonts != '' -->
1165
+ <xsl:choose>
1166
+ <xsl:when test="contains($font_family, ',')">
1167
+ <xsl:value-of select="substring-before($font_family, ',')"/>
1168
+ <xsl:text>, </xsl:text><xsl:value-of select="$additional_fonts"/>
1169
+ <xsl:text>, </xsl:text><xsl:value-of select="substring-after($font_family, ',')"/>
1170
+ </xsl:when>
1171
+ <xsl:otherwise>
1172
+ <xsl:value-of select="$font_family"/>
1173
+ <xsl:text>, </xsl:text><xsl:value-of select="$additional_fonts"/>
1174
+ </xsl:otherwise>
1175
+ </xsl:choose>
1176
+ </xsl:otherwise>
1177
+ </xsl:choose>
1163
1178
  </xsl:attribute>
1164
1179
  </xsl:when>
1165
1180
  <xsl:otherwise>
@@ -3677,21 +3692,21 @@
3677
3692
 
3678
3693
  <xsl:template match="*[local-name()='table']/*[local-name()='note' or local-name() = 'example']" priority="2">
3679
3694
 
3680
- <fo:block xsl:use-attribute-sets="table-note-style">
3695
+ <fo:block xsl:use-attribute-sets="table-note-style">
3681
3696
 
3682
- <xsl:call-template name="refine_table-note-style"/>
3697
+ <xsl:call-template name="refine_table-note-style"/>
3683
3698
 
3684
- <!-- Table's note/example name (NOTE, for example) -->
3685
- <fo:inline xsl:use-attribute-sets="table-note-name-style">
3699
+ <!-- Table's note/example name (NOTE, for example) -->
3700
+ <fo:inline xsl:use-attribute-sets="table-note-name-style">
3686
3701
 
3687
- <xsl:call-template name="refine_table-note-name-style"/>
3702
+ <xsl:call-template name="refine_table-note-name-style"/>
3688
3703
 
3689
- <xsl:apply-templates select="*[local-name() = 'name']"/>
3704
+ <xsl:apply-templates select="*[local-name() = 'name']"/>
3690
3705
 
3691
- </fo:inline>
3706
+ </fo:inline>
3692
3707
 
3693
- <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
3694
- </fo:block>
3708
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
3709
+ </fo:block>
3695
3710
 
3696
3711
  </xsl:template> <!-- table/note -->
3697
3712
 
@@ -4762,6 +4777,9 @@
4762
4777
  <!-- END Definition List -->
4763
4778
  <!-- ===================== -->
4764
4779
 
4780
+ <!-- default: ignore title in sections/p -->
4781
+ <xsl:template match="*[local-name() = 'sections']/*[local-name() = 'p'][starts-with(@class, 'zzSTDTitle')]" priority="3"/>
4782
+
4765
4783
  <!-- ========================= -->
4766
4784
  <!-- Rich text formatting -->
4767
4785
  <!-- ========================= -->
@@ -6880,8 +6898,12 @@
6880
6898
  <xsl:variable name="isAdded" select="../@added"/>
6881
6899
  <xsl:variable name="isDeleted" select="../@deleted"/>
6882
6900
  <xsl:choose>
6883
- <xsl:when test="ancestor::*[local-name() = 'title']">
6901
+ <xsl:when test="ancestor::*[local-name() = 'title'] or not(parent::*[local-name() = 'figure']) or parent::*[local-name() = 'p']">
6884
6902
  <fo:inline padding-left="1mm" padding-right="1mm">
6903
+ <xsl:if test="not(parent::*[local-name() = 'figure']) or parent::*[local-name() = 'p']">
6904
+ <xsl:attribute name="padding-left">0mm</xsl:attribute>
6905
+ <xsl:attribute name="padding-right">0mm</xsl:attribute>
6906
+ </xsl:if>
6885
6907
  <xsl:variable name="src">
6886
6908
  <xsl:call-template name="image_src"/>
6887
6909
  </xsl:variable>
@@ -6914,25 +6936,45 @@
6914
6936
  <fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style">
6915
6937
  <xsl:if test="not(@mimetype = 'image/svg+xml') and ../*[local-name() = 'name'] and not(ancestor::*[local-name() = 'table'])">
6916
6938
 
6917
- <xsl:variable name="img_src">
6918
- <xsl:choose>
6919
- <xsl:when test="not(starts-with(@src, 'data:'))"><xsl:value-of select="concat($basepath, @src)"/></xsl:when>
6920
- <xsl:otherwise><xsl:value-of select="@src"/></xsl:otherwise>
6921
- </xsl:choose>
6922
- </xsl:variable>
6939
+ <xsl:if test="@width != '' and @width != 'auto' and @width != 'text-width' and @width != 'full-page-width' and @width != 'narrow'">
6940
+ <xsl:attribute name="width">
6941
+ <xsl:value-of select="@width"/>
6942
+ </xsl:attribute>
6943
+ </xsl:if>
6923
6944
 
6924
- <xsl:variable name="image_width_effective">
6945
+ <xsl:if test="@height != '' and @height != 'auto'">
6946
+ <xsl:attribute name="height">
6947
+ <xsl:value-of select="@height"/>
6948
+ </xsl:attribute>
6949
+ </xsl:if>
6925
6950
 
6926
- <xsl:value-of select="$width_effective"/>
6951
+ <xsl:choose>
6952
+ <xsl:when test="@width != '' and @width != 'auto' and @height != '' and @height != 'auto'">
6953
+ <xsl:attribute name="scaling">non-uniform</xsl:attribute>
6954
+ </xsl:when>
6955
+ <xsl:otherwise>
6927
6956
 
6928
- </xsl:variable>
6957
+ <xsl:variable name="img_src">
6958
+ <xsl:choose>
6959
+ <xsl:when test="not(starts-with(@src, 'data:'))"><xsl:value-of select="concat($basepath, @src)"/></xsl:when>
6960
+ <xsl:otherwise><xsl:value-of select="@src"/></xsl:otherwise>
6961
+ </xsl:choose>
6962
+ </xsl:variable>
6929
6963
 
6930
- <xsl:variable name="scale" select="java:org.metanorma.fop.Util.getImageScale($img_src, $image_width_effective, $height_effective)"/>
6931
- <xsl:if test="number($scale) &lt; 100">
6964
+ <xsl:variable name="image_width_effective">
6932
6965
 
6933
- <xsl:attribute name="content-width"><xsl:value-of select="$scale"/>%</xsl:attribute>
6966
+ <xsl:value-of select="$width_effective"/>
6934
6967
 
6935
- </xsl:if>
6968
+ </xsl:variable>
6969
+
6970
+ <xsl:variable name="scale" select="java:org.metanorma.fop.Util.getImageScale($img_src, $image_width_effective, $height_effective)"/>
6971
+ <xsl:if test="number($scale) &lt; 100">
6972
+
6973
+ <xsl:attribute name="content-width"><xsl:value-of select="$scale"/>%</xsl:attribute>
6974
+
6975
+ </xsl:if>
6976
+ </xsl:otherwise>
6977
+ </xsl:choose>
6936
6978
 
6937
6979
  </xsl:if>
6938
6980
 
@@ -10586,7 +10628,7 @@
10586
10628
  <xsl:template match="*[local-name() = 'span']" mode="update_xml_step1">
10587
10629
  <xsl:apply-templates mode="update_xml_step1"/>
10588
10630
  </xsl:template>
10589
- <xsl:template match="*[local-name() = 'sourcecode']//*[local-name() = 'span'][@class]" mode="update_xml_step1" priority="2">
10631
+ <xsl:template match="*[local-name() = 'sections']/*[local-name() = 'p'][starts-with(@class, 'zzSTDTitle')]/*[local-name() = 'span'][@class] | *[local-name() = 'sourcecode']//*[local-name() = 'span'][@class]" mode="update_xml_step1" priority="2">
10590
10632
  <xsl:copy>
10591
10633
  <xsl:copy-of select="@*"/>
10592
10634
  <xsl:apply-templates mode="update_xml_step1"/>
data/lib/isodoc/iho/iho.standard.xsl CHANGED
@@ -1155,11 +1155,26 @@
1155
1155
  <xsl:value-of select="$font_extended"/><xsl:text>, </xsl:text>
1156
1156
  </xsl:if>
1157
1157
 
1158
- <xsl:value-of select="."/>
1158
+ <xsl:variable name="font_family" select="."/>
1159
1159
 
1160
- <xsl:if test="$additional_fonts != ''">
1161
- <xsl:text>, </xsl:text><xsl:value-of select="$additional_fonts"/>
1162
- </xsl:if>
1160
+ <xsl:choose>
1161
+ <xsl:when test="$additional_fonts = ''">
1162
+ <xsl:value-of select="$font_family"/>
1163
+ </xsl:when>
1164
+ <xsl:otherwise> <!-- $additional_fonts != '' -->
1165
+ <xsl:choose>
1166
+ <xsl:when test="contains($font_family, ',')">
1167
+ <xsl:value-of select="substring-before($font_family, ',')"/>
1168
+ <xsl:text>, </xsl:text><xsl:value-of select="$additional_fonts"/>
1169
+ <xsl:text>, </xsl:text><xsl:value-of select="substring-after($font_family, ',')"/>
1170
+ </xsl:when>
1171
+ <xsl:otherwise>
1172
+ <xsl:value-of select="$font_family"/>
1173
+ <xsl:text>, </xsl:text><xsl:value-of select="$additional_fonts"/>
1174
+ </xsl:otherwise>
1175
+ </xsl:choose>
1176
+ </xsl:otherwise>
1177
+ </xsl:choose>
1163
1178
  </xsl:attribute>
1164
1179
  </xsl:when>
1165
1180
  <xsl:otherwise>
@@ -3677,21 +3692,21 @@
3677
3692
 
3678
3693
  <xsl:template match="*[local-name()='table']/*[local-name()='note' or local-name() = 'example']" priority="2">
3679
3694
 
3680
- <fo:block xsl:use-attribute-sets="table-note-style">
3695
+ <fo:block xsl:use-attribute-sets="table-note-style">
3681
3696
 
3682
- <xsl:call-template name="refine_table-note-style"/>
3697
+ <xsl:call-template name="refine_table-note-style"/>
3683
3698
 
3684
- <!-- Table's note/example name (NOTE, for example) -->
3685
- <fo:inline xsl:use-attribute-sets="table-note-name-style">
3699
+ <!-- Table's note/example name (NOTE, for example) -->
3700
+ <fo:inline xsl:use-attribute-sets="table-note-name-style">
3686
3701
 
3687
- <xsl:call-template name="refine_table-note-name-style"/>
3702
+ <xsl:call-template name="refine_table-note-name-style"/>
3688
3703
 
3689
- <xsl:apply-templates select="*[local-name() = 'name']"/>
3704
+ <xsl:apply-templates select="*[local-name() = 'name']"/>
3690
3705
 
3691
- </fo:inline>
3706
+ </fo:inline>
3692
3707
 
3693
- <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
3694
- </fo:block>
3708
+ <xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
3709
+ </fo:block>
3695
3710
 
3696
3711
  </xsl:template> <!-- table/note -->
3697
3712
 
@@ -4762,6 +4777,9 @@
4762
4777
  <!-- END Definition List -->
4763
4778
  <!-- ===================== -->
4764
4779
 
4780
+ <!-- default: ignore title in sections/p -->
4781
+ <xsl:template match="*[local-name() = 'sections']/*[local-name() = 'p'][starts-with(@class, 'zzSTDTitle')]" priority="3"/>
4782
+
4765
4783
  <!-- ========================= -->
4766
4784
  <!-- Rich text formatting -->
4767
4785
  <!-- ========================= -->
@@ -6880,8 +6898,12 @@
6880
6898
  <xsl:variable name="isAdded" select="../@added"/>
6881
6899
  <xsl:variable name="isDeleted" select="../@deleted"/>
6882
6900
  <xsl:choose>
6883
- <xsl:when test="ancestor::*[local-name() = 'title']">
6901
+ <xsl:when test="ancestor::*[local-name() = 'title'] or not(parent::*[local-name() = 'figure']) or parent::*[local-name() = 'p']">
6884
6902
  <fo:inline padding-left="1mm" padding-right="1mm">
6903
+ <xsl:if test="not(parent::*[local-name() = 'figure']) or parent::*[local-name() = 'p']">
6904
+ <xsl:attribute name="padding-left">0mm</xsl:attribute>
6905
+ <xsl:attribute name="padding-right">0mm</xsl:attribute>
6906
+ </xsl:if>
6885
6907
  <xsl:variable name="src">
6886
6908
  <xsl:call-template name="image_src"/>
6887
6909
  </xsl:variable>
@@ -6914,25 +6936,45 @@
6914
6936
  <fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style">
6915
6937
  <xsl:if test="not(@mimetype = 'image/svg+xml') and ../*[local-name() = 'name'] and not(ancestor::*[local-name() = 'table'])">
6916
6938
 
6917
- <xsl:variable name="img_src">
6918
- <xsl:choose>
6919
- <xsl:when test="not(starts-with(@src, 'data:'))"><xsl:value-of select="concat($basepath, @src)"/></xsl:when>
6920
- <xsl:otherwise><xsl:value-of select="@src"/></xsl:otherwise>
6921
- </xsl:choose>
6922
- </xsl:variable>
6939
+ <xsl:if test="@width != '' and @width != 'auto' and @width != 'text-width' and @width != 'full-page-width' and @width != 'narrow'">
6940
+ <xsl:attribute name="width">
6941
+ <xsl:value-of select="@width"/>
6942
+ </xsl:attribute>
6943
+ </xsl:if>
6923
6944
 
6924
- <xsl:variable name="image_width_effective">
6945
+ <xsl:if test="@height != '' and @height != 'auto'">
6946
+ <xsl:attribute name="height">
6947
+ <xsl:value-of select="@height"/>
6948
+ </xsl:attribute>
6949
+ </xsl:if>
6925
6950
 
6926
- <xsl:value-of select="$width_effective"/>
6951
+ <xsl:choose>
6952
+ <xsl:when test="@width != '' and @width != 'auto' and @height != '' and @height != 'auto'">
6953
+ <xsl:attribute name="scaling">non-uniform</xsl:attribute>
6954
+ </xsl:when>
6955
+ <xsl:otherwise>
6927
6956
 
6928
- </xsl:variable>
6957
+ <xsl:variable name="img_src">
6958
+ <xsl:choose>
6959
+ <xsl:when test="not(starts-with(@src, 'data:'))"><xsl:value-of select="concat($basepath, @src)"/></xsl:when>
6960
+ <xsl:otherwise><xsl:value-of select="@src"/></xsl:otherwise>
6961
+ </xsl:choose>
6962
+ </xsl:variable>
6929
6963
 
6930
- <xsl:variable name="scale" select="java:org.metanorma.fop.Util.getImageScale($img_src, $image_width_effective, $height_effective)"/>
6931
- <xsl:if test="number($scale) &lt; 100">
6964
+ <xsl:variable name="image_width_effective">
6932
6965
 
6933
- <xsl:attribute name="content-width"><xsl:value-of select="$scale"/>%</xsl:attribute>
6966
+ <xsl:value-of select="$width_effective"/>
6934
6967
 
6935
- </xsl:if>
6968
+ </xsl:variable>
6969
+
6970
+ <xsl:variable name="scale" select="java:org.metanorma.fop.Util.getImageScale($img_src, $image_width_effective, $height_effective)"/>
6971
+ <xsl:if test="number($scale) &lt; 100">
6972
+
6973
+ <xsl:attribute name="content-width"><xsl:value-of select="$scale"/>%</xsl:attribute>
6974
+
6975
+ </xsl:if>
6976
+ </xsl:otherwise>
6977
+ </xsl:choose>
6936
6978
 
6937
6979
  </xsl:if>
6938
6980
 
@@ -10586,7 +10628,7 @@
10586
10628
  <xsl:template match="*[local-name() = 'span']" mode="update_xml_step1">
10587
10629
  <xsl:apply-templates mode="update_xml_step1"/>
10588
10630
  </xsl:template>
10589
- <xsl:template match="*[local-name() = 'sourcecode']//*[local-name() = 'span'][@class]" mode="update_xml_step1" priority="2">
10631
+ <xsl:template match="*[local-name() = 'sections']/*[local-name() = 'p'][starts-with(@class, 'zzSTDTitle')]/*[local-name() = 'span'][@class] | *[local-name() = 'sourcecode']//*[local-name() = 'span'][@class]" mode="update_xml_step1" priority="2">
10590
10632
  <xsl:copy>
10591
10633
  <xsl:copy-of select="@*"/>
10592
10634
  <xsl:apply-templates mode="update_xml_step1"/>
data/lib/isodoc/iho/presentation_xml_convert.rb CHANGED
@@ -19,6 +19,8 @@ _bib)
19
19
  "[#{ordinal}]<tab/>"
20
20
  end
21
21
 
22
+ def middle_title(docxml); end
23
+
22
24
  def preface_rearrange(doc)
23
25
  preface_move(doc.at(ns("//preface/abstract")),
24
26
  %w(foreword executivesummary introduction clause acknowledgements), doc)
data/lib/isodoc/iho/xref.rb CHANGED
@@ -35,20 +35,18 @@ module IsoDoc
35
35
  hierarchical_asset_names(clause, num)
36
36
  end
37
37
 
38
- def back_anchor_names(docxml)
39
- super
40
- if @parse_settings.empty? || @parse_settings[:clauses]
41
- i = Counter.new
42
- docxml.xpath(ns("//annex[@obligation = 'informative']"))
43
- .each do |c|
44
- i.increment(c)
45
- annex_names(c, i.print)
46
- end
47
- i = Counter.new("@", skip_i: true)
48
- docxml.xpath(ns("//annex[not(@obligation = 'informative')]"))
38
+ def clause_order_annex(_docxml)
39
+ [{ path: "//annex[not(@obligation = 'informative')]", multi: true },
40
+ { path: "//annex[@obligation = 'informative']", multi: true }]
41
+ end
42
+
43
+ def annex_anchor_names(docxml)
44
+ clause_order_annex(docxml).each_with_index do |a, i|
45
+ n = i.zero? ? Counter.new("@", skip_i: true) : Counter.new
46
+ docxml.xpath(ns(a[:path]))
49
47
  .each do |c|
50
- i.increment(c)
51
- annex_names(c, i.print)
48
+ annex_names(c, n.increment(c).print)
49
+ a[:multi] or break
52
50
  end
53
51
  end
54
52
  end
data/lib/metanorma/iho/isodoc.rng CHANGED
@@ -17,7 +17,7 @@
17
17
  these elements; we just want one namespace for any child grammars
18
18
  of this.
19
19
  -->
20
- <!-- VERSION v1.2.2 -->
20
+ <!-- VERSION v1.2.4 -->
21
21
  <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
22
22
  <include href="reqt.rng"/>
23
23
  <include href="basicdoc.rng">
@@ -192,9 +192,11 @@
192
192
  </attribute>
193
193
  </optional>
194
194
  <attribute name="citeas"/>
195
- <attribute name="type">
196
- <ref name="ReferenceFormat"/>
197
- </attribute>
195
+ <optional>
196
+ <attribute name="type">
197
+ <ref name="ReferenceFormat"/>
198
+ </attribute>
199
+ </optional>
198
200
  <optional>
199
201
  <attribute name="alt"/>
200
202
  </optional>
@@ -836,6 +838,26 @@
836
838
  <ref name="paragraph"/>
837
839
  </element>
838
840
  </define>
841
+ <define name="stem">
842
+ <element name="stem">
843
+ <attribute name="type">
844
+ <choice>
845
+ <value>MathML</value>
846
+ <value>AsciiMath</value>
847
+ <value>LatexMath</value>
848
+ </choice>
849
+ </attribute>
850
+ <attribute name="block">
851
+ <data type="boolean"/>
852
+ </attribute>
853
+ <oneOrMore>
854
+ <choice>
855
+ <text/>
856
+ <ref name="AnyElement"/>
857
+ </choice>
858
+ </oneOrMore>
859
+ </element>
860
+ </define>
839
861
  <define name="em">
840
862
  <element name="em">
841
863
  <zeroOrMore>
@@ -2046,6 +2068,9 @@
2046
2068
  </define>
2047
2069
  <define name="termdefinition">
2048
2070
  <element name="definition">
2071
+ <optional>
2072
+ <attribute name="type"/>
2073
+ </optional>
2049
2074
  <choice>
2050
2075
  <ref name="verbaldefinition"/>
2051
2076
  <ref name="nonverbalrep"/>
data/lib/metanorma/iho/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Metanorma
2
2
  module IHO
3
- VERSION = "0.7.14".freeze
3
+ VERSION = "0.8.1".freeze
4
4
  end
5
5
  end
data/metanorma-iho.gemspec CHANGED
@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
27
27
  spec.require_paths = ["lib"]
28
28
  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
29
29
 
30
- spec.add_dependency "metanorma-generic", "~> 2.4.1"
30
+ spec.add_dependency "metanorma-generic", "~> 2.5.1"
31
31
 
32
32
  spec.add_development_dependency "debug"
33
33
  spec.add_development_dependency "equivalent-xml", "~> 0.6"
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.7.14
4
+ version: 0.8.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2023-07-24 00:00:00.000000000 Z
11
+ date: 2023-08-28 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: metanorma-generic
@@ -16,14 +16,14 @@ dependencies:
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: 2.4.1
19
+ version: 2.5.1
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - "~>"
25
25
  - !ruby/object:Gem::Version
26
- version: 2.4.1
26
+ version: 2.5.1
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: debug
29
29
  requirement: !ruby/object:Gem::Requirement