relaton-bib 1.2.2 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60c49a41357c85d67963be4c8260759919e4ec11b14444e0ebaea3eb71c51597
-  data.tar.gz: 7f1e174522173f072112e5230fefb1d490f4d7aae472f36c92a7fe82c7bb2303
+  metadata.gz: 82478564be12002c51d6f7f81ea3c54ca36c5bc82ca545936f4736db3ddc738e
+  data.tar.gz: 93d029e955c664c2f6a0c0e2e9828f957b6e28658df37336a4e3a1dcf2b8e64c
 SHA512:
-  metadata.gz: 85aebc56a9f88e43dcac88b74a951557536e183549ef32340493cdeea30612a7443bd09472886e7d0b4494538c57b1109eebc9fd2c940f7df94e0bebbb02eb02
-  data.tar.gz: 470d434701c6c2ba04ffd444ac7f4e056b7cd3220b1fa6121f63bee273a97056643156ab455e0ed526cd981d124ae4535b3f70b0aa754139e3c541fe51ae7615
+  metadata.gz: ae4783978cf446d07b669de15c00f7e9018736347dfb5999ca7b5c11890a3448bb723dce967f5ef7d83199eaca6c01cf2750b557816ea8ed3633743b36bb2405
+  data.tar.gz: da5f68cd7839e4436adedfbdfbc82923c3416cec188b411cf4cb9d288ba8d0722cf15d39f909daef7afadb2792affc21e7c83c88ce4ecc71de0fb2cd7338e81b

data/.github/workflows/ubuntu.yml

@@ -35,4 +35,5 @@ jobs:
           bundle install --jobs 4 --retry 3
       - name: Run specs
         run: |
+          unset JAVA_TOOL_OPTIONS
           bundle exec rake

data/.rubocop.yml

@@ -5,6 +5,6 @@
 inherit_from:
   - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.4
 Rails:
-  Enabled: true
+  Enabled: false

data/README.adoc

@@ -136,10 +136,13 @@ item = RelatonBib::BibliographicItem.new(
     },
     { entity: { name: "Institution" }, role: [type: "sponsor"] }
   ],
-  copyright: { owner: {
-    name: "International Organization for Standardization",
-    abbreviation: "ISO", url: "www.iso.org"
-  }, from: "2014", to: "2020" },
+  copyright: [{
+      owner: [{
+          name: "International Organization for Standardization",
+          abbreviation: "ISO", url: "www.iso.org"
+        }],
+      from: "2014", to: "2020" 
+  }],
   link: [
     { type: "src", content: "https://www.iso.org/standard/53798.html" },
     { type: "obp",
@@ -232,6 +235,10 @@ item = RelatonBib::BibliographicItem.new(
     revision: Time.new(2011, 3, 4, 9, 0),
   )
 )
+
+=> #<RelatonBib::BibliographicItem:0x007fc8b6c796c0
+ @abstract=
+  [#<RelatonBib::FormattedString:0x007fc8b6c726b8 @content="ISO 19115-1:2014 defines the schema required for ...", @format="text/plain", @language=["en"], @script=["Latn"]>,
 ----
 
 === BibliographicItem Typed Title Strings
@@ -245,6 +252,11 @@ item.title
  #<RelatonBib::TypedTitleString:0x007fa49a35bf38
   @title=#<RelatonBib::FormattedString:0x007fa49a35bdd0 @content="Information géographique", @format=nil, @language=["fr"], @script=["Latn"]>,
   @type=nil>]
+
+item.title lang: "fr"
+=> [#<RelatonBib::TypedTitleString:0x007fa49a35bf38
+  @title=#<RelatonBib::FormattedString:0x007fa49a35bdd0 @content="Information géographique", @format=nil, @language=["fr"], @script=["Latn"]>,
+  @type=nil>]
 ----
 
 === BibliographicItem Formatted Strings
@@ -252,8 +264,8 @@ item.title
 [source,ruby]
 ----
 item.abstract
-=> [#<RelatonBib::FormattedString:0x007fa49a35aed0 @content="ISO 19115-1:2014 defines the schema required for ...", @format="text/plain", @language=["en"], @script=["Latn"]>,
- #<RelatonBib::FormattedString:0x007fa49a35ae08 @content="L'ISO 19115-1:2014 définit le schéma requis pour ...", @format="text/plain", @language=["fr"], @script=["Latn"]>]
+=> [#<RelatonBib::FormattedString:0x007fc8b6c726b8 @content="ISO 19115-1:2014 defines the schema required for ...", @format="text/plain", @language=["en"], @script=["Latn"]>,
+ #<RelatonBib::FormattedString:0x007fc8b6c725f0 @content="L'ISO 19115-1:2014 définit le schéma requis pour ...", @format="text/plain", @language=["fr"], @script=["Latn"]>]
 
 item.abstract(lang: "en").to_s
 => "ISO 19115-1:2014 defines the schema required for ..."
@@ -263,8 +275,8 @@ item.abstract(lang: "en").to_s
 
 [source,ruby]
 ----
-item.shortref item
-=> "ISO/TC211:2014"
+item.shortref item.docidentifier.first
+=> "TC211:2014"
 ----
 
 === XML serialization
@@ -272,10 +284,10 @@ item.shortref item
 [source,ruby]
 ----
 item.to_xml
-=> "<bibitem id=\"ISO/TC211\" type=\"standard\">
+=> "<bibitem id="ISO/TC211" type="standard">
       <fetched>2019-04-30</fetched>
-      <title type=\"main\" language=\"en\" script=\"Latn\">Geographic information</title>
-      <title language=\"fr\" script=\"Latn\">Information géographique</title>
+      <title type="main" language="en" script="Latn">Geographic information</title>
+      <title language="fr" script="Latn">Information géographique</title>
       ...
     </bibitem>"
 ----
@@ -285,9 +297,9 @@ Default root element is `bibitem`. With argument `bibdata: true` the XML wrapped
 [source,ruby]
 ----
 item.to_xml bibdata: true
-=> "<bibdata type=\"standard\">
+=> "<bibdata type="standard">
       <fetched>2019-04-30</fetched>
-      <title type=\"main\" language=\"en\" script=\"Latn\">Geographic information</title>
+      <title type="main" language="en" script="Latn">Geographic information</title>
       ...
     </bibdata>"
 ----
@@ -296,12 +308,12 @@ item.to_xml bibdata: true
 
 By default date elements are formatted as year (yyyy). Option `:date_format` allows to output date elements in `:short` (yyyy-mm) and `:full` (yyyy-mm-dd) additiona formats.
 
-[surce,ruby]
+[source,ruby]
 ----
 item.to_xml date_format: :short
-=> "<bibitem id=\"ISO/TC211\" type=\"standard\">
+=> "<bibitem id="ISO/TC211" type="standard">
       <fetched>2019-04-30</fetched>
-      <title type=\"main\" language=\"en\" script=\"Latn\">Geographic information</title>
+      <title type="main" language="en" script="Latn">Geographic information</title>
       ...
       <date type="issued">
         <on>2014-01</on>
@@ -313,9 +325,10 @@ item.to_xml date_format: :short
         <on>2015-05</on>
       </date>
       ...
+    </bibitem>"
 
 item.to_xml date_format: :full
-=> "<bibitem id=\"ISO/TC211\" type=\"standard\">
+=> "<bibitem id="ISO/TC211" type="standard">
       ...
       <date type="issued">
         <on>2014-01-01</on>
@@ -327,6 +340,19 @@ item.to_xml date_format: :full
         <on>2015-05-20</on>
       </date>
       ...
+    </bibitem>"
+----
+
+==== Adding notes
+
+[source,ruby]
+----
+item.to_xml note: [{ text: "Note", type: "note" }]
+=>"<bibitem id="ISO19115-1-2014">
+  ...
+  <note format="text/plain" type="note">Note</note>
+  ...
+</bibitem>"
 ----
 
 === Create bibliographic item form YAML
@@ -362,7 +388,7 @@ item.to_hash
 
 [source,ruby]
 ----
-RelatonBib::BibtexParser.from_bibtex File.read('spec/examples/bibitem.bib')
+RelatonBib::BibtexParser.from_bibtex File.read('spec/examples/techreport.bib')
 => {"ISOTC211"=>
   #<RelatonBib::BibliographicItem:0x007fedee0a2ab0
   ...
@@ -380,6 +406,22 @@ item.to_bibtex
   ...
 ----
 
+=== Exporting bibliographic item to AsciiBib
+
+[source,ruby]
+----
+item.to_asciibib
+[%bibitem]
+== {blank}
+id:: ISOTC211
+fetched:: 2020-08-19
+title::
+title.type:: title-main
+title.conten:: Geographic information
+title.format:: text/plain
+...
+----
+
 == Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

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/grammars/reqt.rng

@@ -39,12 +39,6 @@
     <optional>
       <attribute name="filename"/>
     </optional>
-    <optional>
-      <attribute name="model"/>
-    </optional>
-    <optional>
-      <attribute name="type"/>
-    </optional>
     <optional>
       <ref name="reqtitle"/>
     </optional>
@@ -54,9 +48,9 @@
     <optional>
       <ref name="subject"/>
     </optional>
-    <zeroOrMore>
+    <optional>
       <ref name="reqinherit"/>
-    </zeroOrMore>
+    </optional>
     <zeroOrMore>
       <ref name="classification"/>
     </zeroOrMore>