instance => instanceOf: relaton/relaton-data-ccsds#1

metanorma · Aug 30, 2023 · d61727e · d61727e
1 parent a72852a
commit d61727e
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/lib/isodoc/ietf/metadata.rb b/lib/isodoc/ietf/metadata.rb
@@ -15,7 +15,7 @@ def title(isoxml, _out)
       end
 
       def relaton_relations
-        %w(included-in described-by derived-from instance)
+        %w(included-in described-by derived-from instance-of)
         # = item describedby convertedfrom alternate
       end
 

diff --git a/lib/isodoc/ietf/section.rb b/lib/isodoc/ietf/section.rb
@@ -105,7 +105,7 @@ def make_link(out, isoxml)
         links = isoxml
           .xpath(ns("//bibdata/relation[@type = 'includedIn' or " \
                     "@type = 'describedBy' or @type = 'derivedFrom' or " \
-                    "@type = 'instance']")) || return
+                    "@type = 'instanceOf']")) || return
         links.each do |l|
           out.link href: l&.at(ns("./bibitem/docidentifier"))&.text,
                    rel: rel2iana(l["type"])
@@ -117,7 +117,7 @@ def rel2iana(type)
         when "includedIn" then "item"
         when "describedBy" then "describedby"
         when "derivedFrom" then "convertedfrom"
-        when "instance" then "alternate"
+        when "instanceOf" then "alternate"
         else
           "alternate"
         end

diff --git a/lib/metanorma/ietf/front.rb b/lib/metanorma/ietf/front.rb
@@ -2,7 +2,7 @@ module Metanorma
   module Ietf
     class Converter < ::Metanorma::Standoc::Converter
       def relaton_relations
-        %w(included-in described-by derived-from instance obsoletes updates)
+        %w(included-in described-by derived-from instance-of obsoletes updates)
       end
 
       def metadata_author(node, xml)

diff --git a/spec/isodoc/metadata_spec.rb b/spec/isodoc/metadata_spec.rb
@@ -167,13 +167,13 @@
                      <docidentifier>DER2</docidentifier>
                    </bibitem>
                  </relation>
-                 <relation type='instance'>
+                 <relation type='instanceOf'>
                    <bibitem>
                      <title>--</title>
                      <docidentifier>EQ1</docidentifier>
                    </bibitem>
                  </relation>
-                 <relation type='instance'>
+                 <relation type='instanceOf'>
                    <bibitem>
                      <title>--</title>
                      <docidentifier>EQ2</docidentifier>

diff --git a/spec/metanorma/base_spec.rb b/spec/metanorma/base_spec.rb
@@ -122,7 +122,7 @@
       :included-in: INC1;INCL2
       :described-by: DESC1;DESC2
       :derived-from: https://datatracker.ietf.org/doc/draft-DER1;https://datatracker.ietf.org/doc/draft-DER2
-      :instance: EQ1;EQ2
+      :instance-of: EQ1;EQ2
       :obsoletes: OB1;OB2
       :updates: UPD1;UPD2
       :abbrev: Abbreviated Title
@@ -324,13 +324,13 @@
                      <docidentifier>https://datatracker.ietf.org/doc/draft-DER2</docidentifier>
                    </bibitem>
                  </relation>
-                 <relation type='instance'>
+                 <relation type='instanceOf'>
                    <bibitem>
                      <title>--</title>
                      <docidentifier>EQ1</docidentifier>
                    </bibitem>
                  </relation>
-                 <relation type='instance'>
+                 <relation type='instanceOf'>
                    <bibitem>
                      <title>--</title>
                      <docidentifier>EQ2</docidentifier>