relaton-render 0.3.7 → 0.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be0824c3523bcd05d90124be3d8c36b496803edd2322b7128e0e47f759309d25
-  data.tar.gz: 65f3c1fc7900217391a1f291ae57323823e8e1f8559e8b135b1e4e7563a3f19b
+  metadata.gz: 963f65bd45b2b7d271822ba18c63f2a6e34768da2e77b73dee08f43ae9e68c3d
+  data.tar.gz: 989731f97b400da01dbf2d549b7319f3b04d4450f087866b1622ba381674c744
 SHA512:
-  metadata.gz: b283ddeb4b4c0045cb8f4da3356093040408949f39e28da7db6c7f6807f3ed21dac4db520631e8db9b61a4cc98dcee4b83bacc06ca489295f2ee10745657f94a
-  data.tar.gz: 8394b5b4f72f01819cdff6754a46a281e89685b68f869a1615efc53388f751c43c6b36d3c4ff734fded3a7f9e3ad62b6e282d27c0e203aa88110dde7d2526277
+  metadata.gz: d8b0815748c83dd0daf24055a1c4e4f7b2a51f2c7d65632d2e5b8596fd112df4882610626716e9feb5f46ce0054ba66ad28543a55aa3162b867dedff92cd2180
+  data.tar.gz: 917f533dfe7158d182bbd679c1e921442b0786d59a25db92d8cbd330fb01cb05bf9655e0ff566ac4574ab66b670d29d91b1c1b4796bfebb0e82db0e0ef07c479

data/README.adoc

@@ -99,6 +99,7 @@ drawn from the bibliographic item:
 | title   | ./title | | |
 | edition | ./edition | | Y | If numeric value, is given internationalised rendering of "nth edition", as set in edition_numbering. Otherwise, the textual content of the tag is given.
 | edition_raw | ./edition | | Y | The strict textual content of the tag is given.
+| edition_num | ./edition[@number] | | Y | 
 | medium  | ./medium | | Y |
 | place   | ./place | | Y |
 | publisher | ./contributor[role/@type = 'publisher']/organization/name | | Y | 
@@ -223,11 +224,11 @@ The extent of a bibliographic item may be expressed differently depending on the
 
 To capture this, a separate template is supplied under `extenttemplate` for each bibliographic item type. For those types where none is supplied, the template given for `misc` is used as the default. 
 
-The template draws on the defined types of locality of extents; the most common of these is `page` and `volume`. Locality types are the fields used in the Liquid templates; for example:
+The template draws on the defined types of locality of extents; the most common of these is `volume`, `issue` (within volume; "number" for journals), and `page`. Locality types are the fields used in the Liquid templates; for example:
 
 ....
 {
-  article: "{{ volume_raw }}: {{ page_raw }}"
+  article: "{{ volume_raw }}|({{ issue_raw }}) : {{ page_raw }}"
   misc: "{{ volume }}, {{ page }}"
 }
 ....
@@ -237,7 +238,7 @@ The internationalisation files define a singular and a plural version of the loc
 * The plural label is always used if the extent is a range (with a `<from>` and `<to>`). 
 * The singular label is used if the extent is not a range (_pp. 2–4_ vs. _p. 3_).
 * The internationalisation files include a slot where the number or number range is inserted, indicated by `%`, since this varies by language. (For instance, English has `pp. %`,  whereas Chinese has `第%页`.) 
-* The number of the volume or page, without accompanying labels, is given in `volume_raw` and `page_raw`.
+* The number of the volume, issue/number, or page, without accompanying labels, is given in `volume_raw`, `issue_raw`, and `page_raw`.
 
 === Size template
 
@@ -252,6 +253,8 @@ The template draws on the defined types of locality of extents; the following ar
 
 | volume  | ./medium/size[@type = 'volume'] | With internationalisation of label
 | volume_raw  | ./medium/size[@type = 'volume'] |
+| issue  | ./medium/size[@type = 'issue'] | With internationalisation of label
+| issue_raw  | ./medium/size[@type = 'issue'] |
 | page  | ./medium/size[@type = 'page'] | With internationalisation of label
 | page_raw  | ./medium/size[@type = 'page'] |
 | data  | ./medium/size[@type = 'data'] | Unit of size is included in value

data/lib/isodoc-yaml/i18n-ar.yaml

@@ -23,6 +23,9 @@ extent:
   volume:
     sg: "% المجلد"
     pl: "% المجلدين"
+  issue:
+    sg: "% عدد"
+    pl: "% عدد"
 size:
   page:
     sg: "ص؜ %"
@@ -30,6 +33,9 @@ size:
   volume:
     sg: "المجلد %"
     pl: "المجلدين %"
+  issue:
+    sg: "% عدد"
+    pl: "% عدد"
 inflection:
   الطبعة؜:
     gender: f

data/lib/isodoc-yaml/i18n-de.yaml

@@ -22,6 +22,9 @@ extent:
   volume:
     sg: "Bd. %"
     pl: "Bde. %"
+  issue:
+    sg: "Nr. %"
+    pl: "Nr. %"
 size:
   page:
     sg: "% S."
@@ -29,6 +32,9 @@ size:
   volume:
     sg: "% Bd."
     pl: "% Bde."
+  issue:
+    sg: "% Nr."
+    pl: "% Nr."
 inflection:
   Auflage:
     gender: f

data/lib/isodoc-yaml/i18n-en.yaml

@@ -23,6 +23,9 @@ extent:
   volume:
     sg: "vol. %"
     pl: "vols. %"
+  issue:
+    sg: "no. %"
+    pl: "nos. %"
 size:
   page:
     sg: "% p."
@@ -30,4 +33,6 @@ size:
   volume:
     sg: "% vol."
     pl: "% vols."
-
+  issue:
+    sg: "% no."
+    pl: "% nos."

data/lib/isodoc-yaml/i18n-es.yaml

@@ -25,6 +25,9 @@ extent:
   volume:
     sg: "vol. %"
     pl: "vols. %"
+  issue:
+    sg: "núm. %"
+    pl: "núms. %"
 size:
   page:
     sg: "% pág."
@@ -32,6 +35,10 @@ size:
   volume:
     sg: "% vol."
     pl: "% vols."
+issue:
+    sg: "% núm."
+    pl: "% núms."
+
 inflection:
   edición:
     gender: f

data/lib/isodoc-yaml/i18n-fr.yaml

@@ -27,6 +27,9 @@ extent:
   volume:
     sg: "vol. %"
     pl: "vol. %"
+  issue:
+    sg: "nᵒ %"
+    pl: "nᵒˢ %"
 size:
   page:
     sg: "% p."
@@ -34,6 +37,9 @@ size:
   volume:
     sg: "% vol."
     pl: "% vol."
+  issue:
+    sg: "% nᵒ"
+    pl: "% nᵒˢ"
 inflection:
   édition:
     gender: f

data/lib/isodoc-yaml/i18n-ru.yaml

@@ -29,6 +29,10 @@ extent:
   volume:
     sg: "т. %"
     pl: "тт. %"
+  issue:
+    sg: "шт. %"
+    pl: "шт. %"
+
 size:
   page:
     sg: "% стр."
@@ -36,6 +40,9 @@ size:
   volume:
     sg: "% т."
     pl: "% тт."
+  issue:
+    sg: "% шт."
+    pl: "% шт."
 inflection:  
   издание:
     gender: n

data/lib/isodoc-yaml/i18n-zh-Hans.yaml

@@ -23,6 +23,9 @@ extent:
   volume:
     sg: "第%卷"
     pl: "第%卷"
+  issue:
+    sg: "第%期"
+    pl: "第%期"
 size:
   page:
     sg: "%页"
@@ -30,3 +33,6 @@ size:
   volume:
     sg: "%卷"
     pl: "%卷"
+  issue:
+    sg: "%期"
+    pl: "%期"

data/lib/relaton/render/fields/fields.rb

@@ -34,7 +34,7 @@ module Relaton
       end
 
       def edition_fields_format(hash)
-        hash[:edition] = editionformat(hash[:edition_raw])
+        hash[:edition] = editionformat(hash[:edition_raw], hash[:edition_num])
         hash[:draft] = draftformat(hash[:draft_raw], hash)
       end
 
@@ -95,11 +95,11 @@ module Relaton
         @r.i18n.get[role][number] || role
       end
 
-      def editionformat(edn)
-        return edn unless /^\d+$/.match?(edn)
+      def editionformat(edn, num)
+        return edn unless num || /^\d+$/.match?(edn)
 
-        num = edition_translate1(edn.to_i)
-        @r.edition_ordinal.sub(/%(Spellout|Ordinal)?/, num)
+        ret = edition_translate1(num || edn.to_i)
+        @r.edition_ordinal.sub(/%(Spellout|Ordinal)?/, ret)
       end
 
       def edition_translate1(num)
@@ -133,7 +133,7 @@ module Relaton
       end
 
       def extentformat1(key, val, hash, norm_hash)
-        if %i(volume page).include?(key)
+        if %i(volume issue page).include?(key)
           hash["#{key}_raw".to_sym] = norm_hash[key]
           hash[key] = pagevolformat(norm_hash[key], val, key.to_s, false)
         end
@@ -164,6 +164,9 @@ module Relaton
         when "volume"
           hash[:volume_raw] = val
           hash[:volume] = pagevolformat(val, nil, "volume", true)
+        when "issue"
+          hash[:issue_raw] = val
+          hash[:issue] = pagevolformat(val, nil, "issue", true)
         when "page"
           hash[:page_raw] = val
           hash[:page] = pagevolformat(val, nil, "page", true)

data/lib/relaton/render/general/config.yml

@@ -15,12 +15,12 @@ extenttemplate:
   standard: book
   techreport: book
   inbook: "{{ volume }}: {{ page }}"
-  misc: "{{ volume }}, {{ page }}, {{ duration }}"
+  misc: "{{ volume }} {{issue}} , {{ page }}, {{ duration }}"
 sizetemplate:
   dataset: "{{ data }}"
   electronic resource: dataset
   webresource: dataset
-  misc: "{{ volume }}, {{ page }}, {{ data }}, {{ duration }}"
+  misc: "{{ volume }}, {{ issue }}, {{ page }}, {{ data }}, {{ duration }}"
 language: en
 script: Latn
 template:

data/lib/relaton/render/parse/parse.rb

@@ -27,7 +27,8 @@ module Relaton
       end
 
       def simple_or_host_xml2hash(doc, host)
-        { edition_raw: edition(doc, host), medium_raw: medium(doc, host),
+        { edition_raw: edition(doc, host), edition_num: edition_num(doc, host),
+          medium_raw: medium(doc, host),
           place_raw: place(doc, host), publisher_raw: publisher(doc, host),
           publisher_abbrev_raw: publisher_abbrev(doc, host),
           distributor_raw: distributor(doc, host), draft_raw: draft(doc, host),

data/lib/relaton/render/parse/parse_contributors.rb

@@ -115,7 +115,10 @@ module Relaton
         x = pick_contributor(doc, "publisher")
         host and x ||= pick_contributor(host, "publisher")
         x.nil? and return nil
-        x.map { |c| c.entity.abbreviation&.content }
+        x.map do |c|
+          c.entity.abbreviation&.content ||
+            c.entity.name.first&.content
+        end
       end
 
       def distributor(doc, host)

data/lib/relaton/render/parse/parse_extract.rb

@@ -33,7 +33,11 @@ module Relaton
       end
 
       def edition(doc, host)
-        doc.edition || host&.edition
+        doc.edition&.content || host&.edition&.content
+      end
+
+      def edition_num(doc, host)
+        doc.edition&.number || host&.edition&.number
       end
 
       def place(doc, host)

data/lib/relaton/render/version.rb

@@ -1,5 +1,5 @@
 module Relaton
   module Render
-    VERSION = "0.3.7".freeze
+    VERSION = "0.3.10".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-render
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.10
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-30 00:00:00.000000000 Z
+date: 2022-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -236,7 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.14
+rubygems_version: 3.3.16
 signing_key:
 specification_version: 4
 summary: Rendering of ISO 690 XML