relaton-calconnect 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c57b295752358948bf4b7b4e810f9ea3b4f3c41a6aa8b8be3ee32daf2cc57d5
-  data.tar.gz: 02252f5f0f424e5ce8a5de86e61eb57110b9bb2c13bdff7048271a42bb301b53
+  metadata.gz: 486c9ddb0b7947e6fb10eadbdab19ca60996892fd23b3713f873c3f984a216cc
+  data.tar.gz: 9c4bb050a3699f4e26db0f6304acfac6950151523daced3328453058c9a6ffdf
 SHA512:
-  metadata.gz: d11a61bff5d796282537328ae2d91f539bd514597fd424c166f82f1cd61d1075f71185d88f89b043b8986142f6699f81623a8f8db923bae3bcf6c2b58e3f9ead
-  data.tar.gz: e6ae25e67084c5bf550dd3496ce248dd166581c2a1475e0bb922c8322b857d398beccd8b8b91324a51be247ea294fac9896c07d0f656462d6c8ed349a59ef202
+  metadata.gz: 1877bf1ff5813dfebd85bdb578c4ab018fa8ae839826b02aa2c8395d5392f27ba6e178f5e40f46a283497d0fac67dafbac1d8c88385fbf7775d1314cf61d83e7
+  data.tar.gz: 4702ce07e3f316ae2ffaa21b42c5d9114cbf9bdc760d87fc6ef1c4916a9e2dae3e7fa685762566048e3c3d1428f7dd6981e5dbd071e4dde377c76945f7df2718

data/README.adoc

@@ -28,9 +28,10 @@ Or install it yourself as:
 [source,ruby]
 ----
 require 'relaton_calconnect'
+=> true
 
 hits = RelatonCalconnect::CcBibliography.search("CC/DIR 10005:2019")
-=> [<RelatonCalconnect::Hit:0x007f9a765185c0 @text="CC/DIR 10005:2019" @fetched="false" @fullIdentifier="" @title="">]
+=> <RelatonCalconnect::HitCollection:0x007f98e34a8bb0 @ref=CC/DIR 10005:2019 @fetched=false>
 
 item = hits[0].fetch
 => #<RelatonCalconnect::CcBibliographicItem:0x007f9a766b15d0
@@ -42,29 +43,29 @@ item = hits[0].fetch
 [source,ruby]
 ----
 item.to_xml
-=> "<bibitem id=CC/DIR10005-2019 type=directive>
-      <title format=text/plain language=en>Guidelines for the implementation of the CalConnect patent policy</title>
-      <uri type=xml>csd/cc-10005.xml</uri>
-      <uri type=pdf>csd/cc-10005.pdf</uri>
-      <uri type=doc>csd/cc-10005.doc</uri>
-      <uri type=html>csd/cc-10005.html</uri>
-      <uri type=rxl>csd/cc-10005.rxl</uri>
-      <docidentifier type=CC>CC/DIR 10005:2019</docidentifier>
+=> "<bibitem id="CC/DIR10005-2019" type="standard">
+      <title format="text/plain" language="en">Guidelines for the implementation of the CalConnect patent policy</title>
+      <uri type="xml">csd/cc-10005.xml</uri>
+      <uri type="pdf">csd/cc-10005.pdf</uri>
+      <uri type="doc">csd/cc-10005.doc</uri>
+      <uri type="html">csd/cc-10005.html</uri>
+      <uri type="rxl">csd/cc-10005.rxl</uri>
+      <docidentifier type="csd">CC/DIR 10005:2019</docidentifier>
       ...
-    </bibitem>
+    </bibitem>"
 ----
 With argument `bibdata: true` it ouputs XML wrapped by `bibdata` element and adds flavour `ext` element.
 [source,ruby]
 ----
 item.to_xml bibdata: true
-=> "<bibdata type=directive>
-      <title format=text/plain language=en>Guidelines for the implementation of the CalConnect patent policy</title>
-      <uri type=xml>csd/cc-10005.xml</uri>
-      <uri type=pdf>csd/cc-10005.pdf</uri>
-      <uri type=doc>csd/cc-10005.doc</uri>
-      <uri type=html>csd/cc-10005.html</uri>
-      <uri type=rxl>csd/cc-10005.rxl</uri>
-      <docidentifier type=CC>CC/DIR 10005:2019</docidentifier>
+=> "<bibdata type="standard">
+      <title format="text/plain" language=en>Guidelines for the implementation of the CalConnect patent policy</title>
+      <uri type="xml">csd/cc-10005.xml</uri>
+      <uri type="pdf">csd/cc-10005.pdf</uri>
+      <uri type="doc">csd/cc-10005.doc</uri>
+      <uri type="html">csd/cc-10005.html</uri>
+      <uri type="rxl">csd/cc-10005.rxl</uri>
+      <docidentifier type="csd">CC/DIR 10005:2019</docidentifier>
       ...
       <ext>
         <doctype>directive</doctype>
@@ -79,7 +80,8 @@ item.to_xml bibdata: true
 [source,ruby]
 ----
 RelatonCalconnect::CcBibliography.get "CC/DIR 10005", "2019", {}
-fetching CC/DIR 10005...
+[relaton-calconnect] ("CC/DIR 10005") fetching...
+[relaton-calconnect] ("CC/DIR 10005") found CC/DIR 10005:2019
 => #<RelatonCalconnect::CcBibliographicItem:0x007f9a73dfa290
 ...
 ----

data/grammars/isodoc.rng

@@ -42,8 +42,11 @@
     </define>
     <define name="xref">
       <element name="xref">
+        <!-- attribute target { xsd:IDREF }, -->
         <attribute name="target">
-          <data type="IDREF"/>
+          <data type="string">
+            <param name="pattern">\i\c*|\c+#\c+</param>
+          </data>
         </attribute>
         <optional>
           <attribute name="type">
@@ -61,6 +64,11 @@
             </choice>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="droploc">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <text/>
       </element>
     </define>
@@ -578,6 +586,8 @@
             <ref name="ol"/>
             <ref name="dl"/>
             <ref name="formula"/>
+            <ref name="quote"/>
+            <ref name="sourcecode"/>
           </choice>
         </oneOrMore>
       </element>
@@ -661,6 +671,16 @@
             </choice>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="valign">
+            <choice>
+              <value>top</value>
+              <value>middle</value>
+              <value>bottom</value>
+              <value>baseline</value>
+            </choice>
+          </attribute>
+        </optional>
         <choice>
           <zeroOrMore>
             <choice>
@@ -697,6 +717,16 @@
             </choice>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="valign">
+            <choice>
+              <value>top</value>
+              <value>middle</value>
+              <value>bottom</value>
+              <value>baseline</value>
+            </choice>
+          </attribute>
+        </optional>
         <choice>
           <zeroOrMore>
             <choice>
@@ -855,7 +885,7 @@
       <oneOrMore>
         <choice>
           <ref name="content"/>
-          <ref name="preface_abstract"/>
+          <ref name="abstract"/>
           <ref name="foreword"/>
           <ref name="introduction"/>
           <ref name="acknowledgements"/>
@@ -922,6 +952,9 @@
       <optional>
         <attribute name="script"/>
       </optional>
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <optional>
         <attribute name="obligation">
           <choice>
@@ -961,9 +994,6 @@
   </define>
   <define name="content-subsection">
     <element name="clause">
-      <optional>
-        <attribute name="type"/>
-      </optional>
       <ref name="Content-Section"/>
     </element>
   </define>
@@ -992,6 +1022,9 @@
         </choice>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="type"/>
+    </optional>
     <optional>
       <ref name="section-title"/>
     </optional>
@@ -1011,9 +1044,6 @@
   </define>
   <define name="clause">
     <element name="clause">
-      <optional>
-        <attribute name="type"/>
-      </optional>
       <ref name="Clause-Section"/>
     </element>
   </define>
@@ -1042,18 +1072,24 @@
         </choice>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="type"/>
+    </optional>
     <optional>
       <ref name="section-title"/>
     </optional>
     <group>
-      <group>
-        <zeroOrMore>
-          <ref name="BasicBlock"/>
-        </zeroOrMore>
-        <zeroOrMore>
-          <ref name="note"/>
-        </zeroOrMore>
-      </group>
+      <choice>
+        <group>
+          <zeroOrMore>
+            <ref name="BasicBlock"/>
+          </zeroOrMore>
+          <zeroOrMore>
+            <ref name="note"/>
+          </zeroOrMore>
+        </group>
+        <ref name="amend"/>
+      </choice>
       <zeroOrMore>
         <choice>
           <ref name="clause-subsection"/>
@@ -1180,6 +1216,9 @@
       <optional>
         <attribute name="script"/>
       </optional>
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <optional>
         <attribute name="obligation">
           <choice>
@@ -1447,11 +1486,6 @@
       </optional>
     </element>
   </define>
-  <define name="preface_abstract">
-    <element name="abstract">
-      <ref name="Basic-Section"/>
-    </element>
-  </define>
   <define name="term-clause">
     <element name="clause">
       <optional>
@@ -1501,4 +1535,79 @@
       <ref name="CitationType"/>
     </element>
   </define>
+  <define name="amend">
+    <element name="amend">
+      <optional>
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+      </optional>
+      <attribute name="change">
+        <choice>
+          <value>add</value>
+          <value>modify</value>
+          <value>delete</value>
+        </choice>
+      </attribute>
+      <optional>
+        <attribute name="path"/>
+      </optional>
+      <optional>
+        <attribute name="path_end"/>
+      </optional>
+      <optional>
+        <attribute name="title"/>
+      </optional>
+      <optional>
+        <element name="location">
+          <zeroOrMore>
+            <ref name="locality"/>
+          </zeroOrMore>
+        </element>
+      </optional>
+      <zeroOrMore>
+        <ref name="autonumber"/>
+      </zeroOrMore>
+      <optional>
+        <element name="description">
+          <zeroOrMore>
+            <ref name="BasicBlock"/>
+          </zeroOrMore>
+        </element>
+      </optional>
+      <optional>
+        <element name="newcontent">
+          <zeroOrMore>
+            <ref name="BasicBlock"/>
+          </zeroOrMore>
+        </element>
+      </optional>
+      <optional>
+        <element name="description">
+          <zeroOrMore>
+            <ref name="BasicBlock"/>
+          </zeroOrMore>
+        </element>
+      </optional>
+    </element>
+  </define>
+  <define name="autonumber">
+    <element name="autonumber">
+      <attribute name="type">
+        <choice>
+          <value>requirement</value>
+          <value>recommendation</value>
+          <value>permission</value>
+          <value>table</value>
+          <value>figure</value>
+          <value>admonition</value>
+          <value>formula</value>
+          <value>sourcecode</value>
+          <value>example</value>
+          <value>note</value>
+        </choice>
+      </attribute>
+      <text/>
+    </element>
+  </define>
 </grammar>

data/lib/relaton_calconnect/version.rb

@@ -1,3 +1,3 @@
 module RelatonCalconnect
-  VERSION = "1.3.0".freeze
+  VERSION = "1.4.0".freeze
 end

data/relaton_calconnect.gemspec

@@ -37,5 +37,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "webmock"
 
   spec.add_dependency "faraday"
-  spec.add_dependency "relaton-bib", "~> 1.3.0"
+  spec.add_dependency "relaton-bib", "~> 1.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-calconnect
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-08-20 00:00:00.000000000 Z
+date: 2020-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debase
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.4.0
 description: 'RelatonIso: retrieve CC Standards for bibliographic use using the IsoBibliographicItem
   model'
 email:
@@ -205,7 +205,7 @@ homepage: https://github.com/relaton/relaton-calconnect
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -221,7 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: 'RelatonIso: retrieve CC Standards for bibliographic use using the IsoBibliographicItem
   model'