relaton-ietf 1.12.10 → 1.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 891d0ed12d4b647657c35f6cd1e38aacfb9cf9546322117b49bd6a6844c08d78
-  data.tar.gz: a291172eb2625ef08c709021424ce69c89ae3124e72a9445d1b56df6215ba22f
+  metadata.gz: e6fed6cd142a3168d65cfd06e4e1ff063dfd4e7bb2437ce7c1c332631307d369
+  data.tar.gz: 5af1d834979a4f2ae447865fa898da361b01019b37e113e087ce18402f9ba71b
 SHA512:
-  metadata.gz: 16c489706d16e147853451e386704c2bc5e4970c30b88ed7f499aa5bea979c28c1d9629182190f687431154ed1914a374f4c06534d6f7610975838dd4ce93113
-  data.tar.gz: 74dbea799c54201a3eb7e1b763274974ebcef370611b383f2b4e098edfd9a0434b68a4fd45e564a17a78475a9d7b421711fb550ee536be5bab8af2a7f8e1da6f
+  metadata.gz: 4051003063ece4084190e58e16b5b5e75cd9d8b38790bbf6d3844e1d57e7a5e6df2bfeba1d346cb777c442ce310dc10f296952099f239652c6d070e845992aef
+  data.tar.gz: 5e4fb7efd0c16218fc675c0a3b1bca4299606fa992608dc3a165108679abf391d24d5d7cdacd38d31752aa96019408ac7e9b4c39ec22244fe1914d4f3c4f50b1

data/grammars/biblio.rng

@@ -225,9 +225,9 @@
         <zeroOrMore>
           <ref name="forename"/>
         </zeroOrMore>
-        <zeroOrMore>
-          <ref name="initial"/>
-        </zeroOrMore>
+        <optional>
+          <ref name="formatted-initials"/>
+        </optional>
         <ref name="surname"/>
         <zeroOrMore>
           <ref name="addition"/>
@@ -247,8 +247,8 @@
       <ref name="LocalizedString"/>
     </element>
   </define>
-  <define name="initial">
-    <element name="initial">
+  <define name="formatted-initials">
+    <element name="formatted-initials">
       <ref name="LocalizedString"/>
     </element>
   </define>
@@ -264,6 +264,9 @@
   </define>
   <define name="forename">
     <element name="forename">
+      <optional>
+        <attribute name="initial"/>
+      </optional>
       <ref name="LocalizedString"/>
     </element>
   </define>

data/grammars/isodoc.rng

@@ -69,6 +69,17 @@
         </zeroOrMore>
       </element>
     </define>
+    <define name="AdmonitionType">
+      <choice>
+        <value>warning</value>
+        <value>note</value>
+        <value>tip</value>
+        <value>important</value>
+        <value>caution</value>
+        <value>statement</value>
+        <value>editorial</value>
+      </choice>
+    </define>
     <define name="index">
       <element name="index">
         <optional>
@@ -1274,7 +1285,12 @@
   </define>
   <define name="span">
     <element name="span">
-      <attribute name="class"/>
+      <optional>
+        <attribute name="class"/>
+      </optional>
+      <optional>
+        <attribute name="style"/>
+      </optional>
       <oneOrMore>
         <ref name="TextElement"/>
       </oneOrMore>
@@ -2493,6 +2509,16 @@
           <text/>
         </element>
       </optional>
+      <optional>
+        <element name="amendment">
+          <text/>
+        </element>
+      </optional>
+      <optional>
+        <element name="corrigendum">
+          <text/>
+        </element>
+      </optional>
       <optional>
         <element name="language">
           <text/>

data/lib/relaton_ietf/rfc_entry.rb

@@ -189,7 +189,9 @@ module RelatonIetf
           /^(?:(?<int>(?:\p{Lu}+(?:-\w|\(\w\))?\.{0,2}[-\s]?)+)\s)?(?<snm>[[:alnum:]\s'-.]+)$/ =~ n
           surname = RelatonBib::LocalizedString.new(snm, "en", "Latn")
           name = RelatonBib::LocalizedString.new(n, "en", "Latn")
-          fname = RelatonBib::FullName.new(completename: name, initial: initials(int), surname: surname)
+          fname = RelatonBib::FullName.new(
+            completename: name, initials: int, forename: forename(int), surname: surname,
+          )
           entity = RelatonBib::Person.new(name: fname)
         end
         RelatonBib::ContributionInfo.new(entity: entity, role: parse_role(contrib))
@@ -213,12 +215,14 @@ module RelatonIetf
     #
     # @param [String] int
     #
-    # @return [Array<RelatonBib::LocalizedString>]
+    # @return [Array<RelatonBib::Forename>]
     #
-    def initials(int)
+    def forename(int)
       return [] unless int
 
-      int.split(/(?<=\.)-?\s?|\s/).map { |i| RelatonBib::LocalizedString.new i, "en", "Latn" }
+      int.split(/\.-?\s?|\s/).map do |i|
+        RelatonBib::Forename.new initial: i, language: "en", script: "Latn"
+      end
     end
 
     #

data/lib/relaton_ietf/rfc_index_entry.rb

@@ -76,7 +76,7 @@ module RelatonIetf
     def parse_docid
       [
         RelatonBib::DocumentIdentifier.new(type: "IETF", id: pub_id, primary: true),
-        RelatonBib::DocumentIdentifier.new(type: "IETF", scope: "anchor", id: anchor),
+        # RelatonBib::DocumentIdentifier.new(type: "IETF", scope: "anchor", id: anchor),
       ]
     end
 

data/lib/relaton_ietf/version.rb

@@ -1,3 +1,3 @@
 module RelatonIetf
-  VERSION = "1.12.10".freeze
+  VERSION = "1.13.1".freeze
 end

data/relaton_ietf.gemspec

@@ -38,5 +38,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "vcr"
   spec.add_development_dependency "webmock"
 
-  spec.add_dependency "relaton-bib", "~> 1.12.0"
+  spec.add_dependency "relaton-bib", "~> 1.13.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-ietf
 version: !ruby/object:Gem::Version
-  version: 1.12.10
+  version: 1.13.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-03 00:00:00.000000000 Z
+date: 2022-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.12.0
+        version: 1.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.12.0
+        version: 1.13.0
 description: "RelatonIetf: retrieve IETF Standards for bibliographic use \nusing the
   BibliographicItem model.\n\nFormerly known as rfcbib.\n"
 email: