relaton-render 0.5.3 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4db19d0a9fb16b91e2e044c547f8ed65287362cf074486c0481d7a718cb7d98
-  data.tar.gz: 964075dc466461b3388febe72e346db46b28010aa7933ced18f9958f8ee89fd1
+  metadata.gz: 582bd299999942dc5919461f4bde4d4ea90418708be1cda926903aa05659baa2
+  data.tar.gz: 5c8f8e6346a911b28bca037a9f6f931dd997d562400a615b9bbfd9f66a653848
 SHA512:
-  metadata.gz: 8b463024d200ae37a655cab3812fb4ef20d8b7b7f956c38a262ed4767b431f25c6b648964c09b6c3a37c516da4f6866091a637ba75db2e837fc852953ae64308
-  data.tar.gz: 4ac009ff61e8d9d21789fe7663b6caac24ce280880e7c97fefb17aa0875a05834538eff7394860d5f84db256cc269341c3873f89a089da6e1fb296aee5b1909c
+  metadata.gz: d5994cb6fbfac2a14e0ad9e34c5acd3f33b12e2f983ac2e9de2d34cf8392b8e5e11fa1802eb5bc21dce0b545d1ac2d36b9a50a75e6344b962c207dba31a923cb
+  data.tar.gz: 6363973667df0ba2751b7d87dd6abd7d3f4f733cdb1cbac6c6543ea0cd79befea3cfb5003ae6b50753132c2aebf826f846e0fc12e0985aa84163a88e91c92874

data/README.adoc

@@ -158,7 +158,7 @@ drawn from the bibliographic item:
 | authoritative_identifier | ./docidentifier[not(@type = 'metanorma' or @type = 'ordinal' or @type = 'ISBN' or @type = 'ISSN' or @type = 'DOI')] | Y | |
 | other_identifier | ./docidentifier[@type = 'ISBN' or @type = 'ISSN' or @type = 'DOI'] | Y | | By default, each such identifier is prefixed with its type and colon
 | status | ./status | | | Rendering varies by flavour
-| uri | ./uri[@type = 'citation' or @type = 'doi' or @type = 'uri' or @type = 'src' or true] | | | If multiples, prioritise language match
+| uri | ./uri[@type = 'citation' or @type = 'uri' or @type = 'src' or true] | | | If multiples, prioritise language match. Always exclude DOI: that is not where the resource is available from
 | access_location | ./accessLocation | | Y |
 | extent | ./extent | Y | | Render with standard abbreviations for pp, vols, with n-dash, with delimiting of multiple locations
 | creatornames | ./contributor[role/@type = 'author'] \| ./contributor[role/@type = 'performer'] \| ./contributor[role/@type = 'adapter'] \| ./contributor[role/@type = 'translator'] \| ./contributor[role/@type = 'editor'] \| ./contributor[role/@type = 'distributor'] \| ./contributor | Y | | <<nametemplate,`nametemplate`>> applied to each name; joining template from internationalisation applied to multiple names
@@ -193,6 +193,7 @@ The Liquid template surrounds each field by preceding and following punctuation.
 * If punctuation is space delimited, it is inserted regardless of preceding content. So `{{ creatornames }} ({{date}}) .` will insert the full stop whether or not the date is present.
 * Space between punctuation and before punctuation is automatically removed.
 * Spaces within fields are globally converted to underscores. For that reason, any filter operations in Liquid need to refer to underscore instead of space.
+* There are primary and secondary quotation marks defined as labels, and subject to internationalisation: `{{ labels['qq-open'] }}`, `{{ labels['qq-close'] }}`,  `{{ labels['q-open'] }}`, `{{ labels['q-close'] }}`. By default in Latn and Cyrl, these are `<em>`/`</em>` and empty, respectively; they are 《…》 , 〈…〉 in Hans, and wavy underline, empty in Hant. If these are used, they need not to be space-delimited from what they quote; e.g. `{{ labels['qq-open'] }}{{ title }}{{ labels['qq-close'] }}`.
 
 For example:
 
@@ -230,9 +231,15 @@ draws on the following fields drawn from the bibliographic item:
 | nonpersonal[1] |./contributor[2]/organization/name | Y |
 |===
 
-The `formatted-initials` field is presumed to contain full stops, and so do the surrogates of that field done by using individual
-forenames' `initial` attributes, or the forename initials. If the full stops are to be stripped, that needs to occur within the
-Liquid template.
+The `formatted-initials` field is presumed to contain full stops, and so do the surrogates of that 
+field done by using individual forenames' `initial` attributes, or the forename initials. 
+Initials are considered delimited by a full stop followed by space or an alphabetic character.
+If the full stops are to be stripped, as is often required by bibliographic styles, that needs to occur within the
+Liquid template. Bibliographic styles also govern whether initials are separated by space; this gem treats full stop,
+not space, as the initials delimiter.
+
+(So _D. X._ is two initials, as is _D.X._, but _M.-J._ is a single initial, and so is _de S._)
+
 
 There are at least three distinct `nametemplate` instances that need to be provided, one for a single contributor (`one:`), one for two contributors (`two:`), one for three or more (`more:`), and optionally one for "et al." (`etal:`). The number of contributors for which "et al." starts being used is indicated by `etal_count`.
 

data/lib/isodoc/i18n.rb

@@ -8,8 +8,9 @@ module IsoDoc
       when "en", "fr", "ru", "de", "es", "ar"
         load_yaml2(lang)
       when "zh"
-        if script == "Hans" then load_yaml2("zh-Hans")
-        else load_yaml2("en")
+        case script
+        when "Hans", "Hant" then load_yaml2("zh-#{script}")
+        else load_yaml2("zh-Hans")
         end
       else load_yaml2("en")
       end

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

@@ -1,6 +1,7 @@
 in:  في
 at: في
 and: و
+author_and: و
 updated: محدث
 viewed: ينظر
 version: الإصدار
@@ -38,6 +39,10 @@ size:
   issue:
     sg: "% عدد"
     pl: "% عدد"
+qq-open: «
+qq-close: »
+q-open: 
+q-close: 
 inflection:
   الطبعة؜:
     gender: f

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

@@ -1,6 +1,7 @@
 in: in
 at: bei
 and: und
+author_and: und
 updated: aktualisiert
 viewed: angesehen
 version: Version
@@ -27,6 +28,10 @@ extent:
   issue:
     sg: "Nr. %"
     pl: "Nr. %"
+qq-open: <em>
+qq-close: </em>
+q-open:
+q-close: 
 size:
   page:
     sg: "% S."

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

@@ -1,6 +1,7 @@
 in: in
 at: at
 and: and
+author_and: and
 updated: updated
 viewed: viewed
 version: version
@@ -18,6 +19,10 @@ draft: "draft %"
 editor:
   sg: ed.
   pl: eds.
+qq-open: <em>
+qq-close: </em>
+q-open:
+q-close:
 extent:
   page:
     sg: "p. %"

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

@@ -1,6 +1,7 @@
 in: en
 at: en
 and: y
+author_and: y
 updated: actualizado
 viewed: visto
 version: versión
@@ -20,6 +21,10 @@ draft: "borrador %"
 editor:
   sg: ed.
   pl: eds.
+qq-open: <em>
+qq-close: </em>
+q-open:
+q-close:
 extent:
   page:
     sg: "pág. %"

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

@@ -1,6 +1,7 @@
 in: dans
 at: à
 and: et
+author_and: et
 updated: mise à jour
 viewed: vu
 version: version
@@ -22,6 +23,10 @@ draft: "brouillon %"
 editor:
   sg: éd.
   pl: éd.
+qq-open: <em>
+qq-close: </em>
+q-open:
+q-close:
 extent:
   page:
     sg: "p. %"

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

@@ -1,6 +1,7 @@
 in: в
 at: в
 and: и
+author_and: и
 updated: обновлен
 viewed: просмотрено
 version: версия
@@ -24,6 +25,10 @@ draft: "проект %"
 editor:
   sg: изд.
   pl: изд.
+qq-open: <em>
+qq-close: </em>
+q-open:
+q-close:
 extent:
   page:
     sg: "стр. %"

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

@@ -1,8 +1,9 @@
 in: 在
 at: 在
 and: 和
+author_and: 和
 updated: 更新
-viewed: 看过
+viewed: 阅
 version: 版本
 no_date: 无日期
 no_place: 无出版地
@@ -16,8 +17,12 @@ edition_ordinal: "第%Ordinal版"
 edition: 版
 draft: "草案%"
 editor:
-  sg: 编辑
-  pl: 编辑
+  sg: 编
+  pl: 编
+qq-open: 《
+qq-close: 》
+q-open: 〈
+q-close: 〉
 extent:
   page:
     sg: "第%页"

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

@@ -0,0 +1,45 @@
+in: 在
+at: 在
+and: 和
+author_and: 與
+updated: 更新
+viewed: 閱
+version: 版本
+no_date: 無日期
+no_place: 無出版地
+date_formats:
+  month_year: yMMMM
+  day_month_year: to_long_s
+  date_time: to_long_s
+ordinal_keys: []
+OrdinalRules: digits-ordinal
+edition_ordinal: "第%Ordinal版"
+edition: 版
+draft: "草案%"
+editor:
+  sg: 編輯
+  pl: 編輯
+qq-open: <underline style="wavy">
+qq-close: </underline>
+q-open: 〈
+q-close: 〉
+extent:
+  page:
+    sg: "第%頁"
+    pl: "第%頁"
+  volume:
+    sg: "第%卷"
+    pl: "第%卷"
+  issue:
+    sg: "第%期"
+    pl: "第%期"
+size:
+  page:
+    sg: "%頁"
+    pl: "%頁"
+  volume:
+    sg: "%卷"
+    pl: "%卷"
+  issue:
+    sg: "%期"
+    pl: "%期"

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

@@ -1,14 +1,14 @@
 nametemplate:
   one: "{% if nonpersonal[0] %}{{ nonpersonal[0] }}{% else %}{{surname[0] | upcase }} ,_{%if given[0]%}{{given[0]}} {{middle[0]}}{%else%}{{initials[0] | join: ' '}}.{%endif%}{% endif %}"
-  two: "{% if nonpersonal[0] %}{{ nonpersonal[0] }}{% else %}{{surname[0] | upcase}} ,_{%if given[0]%}{{given[0]}} {{middle[0]}}{%else%}{{initials[0] | join: ' '}}.{%endif%}{% endif %} {{ labels['and'] }} {% if nonpersonal[1] %}{{ nonpersonal[1] }}{% else %}{%if given[1]%}{{given[1]}} {{middle[1]}}{%else%}{{initials[1] | join: ' '}}.{%endif%} {{surname[1] | upcase}}{% endif %}"
-  more: "{% if nonpersonal[0] %}{{ nonpersonal[0] }}{% else %}{{surname[0] | upcase}} ,_{%if given[0]%}{{given[0]}} {{middle[0]}}{%else%}{{initials[0] | join: ' '}}.{%endif%}{% endif %} , {% if nonpersonal[1] %}{{ nonpersonal[1] }}{% else %}{%if given[1]%}{{given[1]}} {{middle[1]}}{%else%}{{initials[1] | join: ' '}}.{%endif%} {{surname[1] | upcase}}{% endif %} {{ labels['and'] }} {% if nonpersonal[2] %}{{ nonpersonal[2] }}{% else %}{%if given[2]%}{{given[2]}} {{middle[2]}}{%else%}{{initials[2] | join: ' '}}.{%endif%} {{surname[2] | upcase}}{% endif %}"
+  two: "{% if nonpersonal[0] %}{{ nonpersonal[0] }}{% else %}{{surname[0] | upcase}} ,_{%if given[0]%}{{given[0]}} {{middle[0]}}{%else%}{{initials[0] | join: ' '}}.{%endif%}{% endif %} {{ labels['author_and'] }} {% if nonpersonal[1] %}{{ nonpersonal[1] }}{% else %}{%if given[1]%}{{given[1]}} {{middle[1]}}{%else%}{{initials[1] | join: ' '}}.{%endif%} {{surname[1] | upcase}}{% endif %}"
+  more: "{% if nonpersonal[0] %}{{ nonpersonal[0] }}{% else %}{{surname[0] | upcase}} ,_{%if given[0]%}{{given[0]}} {{middle[0]}}{%else%}{{initials[0] | join: ' '}}.{%endif%}{% endif %} , {% if nonpersonal[1] %}{{ nonpersonal[1] }}{% else %}{%if given[1]%}{{given[1]}} {{middle[1]}}{%else%}{{initials[1] | join: ' '}}.{%endif%} {{surname[1] | upcase}}{% endif %} {{ labels['author_and'] }} {% if nonpersonal[2] %}{{ nonpersonal[2] }}{% else %}{%if given[2]%}{{given[2]}} {{middle[2]}}{%else%}{{initials[2] | join: ' '}}.{%endif%} {{surname[2] | upcase}}{% endif %}"
 # disabled the following: they should be provided in inheriting calls
 # etal: "{% if nonpersonal[0] %}{{ nonpersonal[0] }}{% else %}{{surname[0] | upcase}} ,_{%if given[0]%}{{given[0]}} {{middle[0]}}{%else%}{{initials[0] | join: ' '}}.{%endif%}{% endif %}, {% if nonpersonal[1] %}{{ nonpersonal[1] }}{% else %}{%if given[1]%}{{given[1]}} {{middle[1]}}{%else%}{{initials[1] | join: ' '}}.{%endif%} {{surname[1] | upcase}}{% endif %} <em>et al.</em>"
 # etal_count: 5
 authorcitetemplate:
   one: "{% if nonpersonal[0] %}{{ nonpersonal[0] }}{% else %}{{surname[0] }}{% endif %}"
-  two: "{% if nonpersonal[0] %}{{ nonpersonal[0] }}{% else %}{{surname[0] }}{% endif %} {{ labels['and'] }} {% if nonpersonal[1] %}{{ nonpersonal[1] }}{% else %}{{surname[1] }}{% endif %}"
-  more: "{% if nonpersonal[0] %}{{ nonpersonal[0] }}{% else %}{{surname[0] }}{% endif %}, {% if nonpersonal[1] %}{{ nonpersonal[1] }}{% else %}{{surname[1] }}{% endif %} {{ labels['and'] }} {% if nonpersonal[2] %}{{ nonpersonal[2] }}{% else %}{{surname[2] }}{% endif %}"
+  two: "{% if nonpersonal[0] %}{{ nonpersonal[0] }}{% else %}{{surname[0] }}{% endif %} {{ labels['author_and'] }} {% if nonpersonal[1] %}{{ nonpersonal[1] }}{% else %}{{surname[1] }}{% endif %}"
+  more: "{% if nonpersonal[0] %}{{ nonpersonal[0] }}{% else %}{{surname[0] }}{% endif %}, {% if nonpersonal[1] %}{{ nonpersonal[1] }}{% else %}{{surname[1] }}{% endif %} {{ labels['author_and'] }} {% if nonpersonal[2] %}{{ nonpersonal[2] }}{% else %}{{surname[2] }}{% endif %}"
 # disabled the following: they should be provided in inheriting calls
 # etal: "{% if nonpersonal[0] %}{{ nonpersonal[0] }}{% else %}{{surname[0] }}{% endif %}, {% if nonpersonal[1] %}{{ nonpersonal[1] }}{% else %}{{surname[1] }}{% endif %} <em>et al.</em>"
 # etal_count: 5
@@ -31,36 +31,36 @@ sizetemplate:
 language: en
 script: Latn
 template:
-  book: "{{ creatornames }} ({{role}}) . <em>{{ title }}</em> [{{medium}}] . {{ edition | capitalize_first }}. ({{ series }}.) {% if place %}{{place}}{%else%}{{ labels['no_place']}}{%endif%}: {{publisher}}. {{date}}. {{ labels['updated'] | capitalize }}:_{{date_updated}}. {{ authoritative_identifier | join: '. ' }}. {{ other_identifier | join: '. ' }}. {{ uri }}. {{ labels['at'] | capitalize}}:_{{ access_location }}. [{{ labels['viewed'] }}:_{{date_accessed}}]. {{size}}. {{extent}}."
+  book: "{{ creatornames }} ({{role}}) . {{labels['qq-open']}}{{ title }}{{labels['qq-close']}} [{{medium}}] . {{ edition | capitalize_first }}. ({{ series }}.) {% if place %}{{place}}{%else%}{{ labels['no_place']}}{%endif%}: {{publisher}}. {{date}}. {{ labels['updated'] | capitalize }}:_{{date_updated}}. {{ authoritative_identifier | join: '. ' }}. {{ other_identifier | join: '. ' }}. {{ uri }}. {{ labels['at'] | capitalize}}:_{{ access_location }}. [{{ labels['viewed'] }}:_{{date_accessed}}]. {{size}}. {{extent}}."
     # TODO: omitted: author ids, subsidiary titles, subsidiary creators, rights metadata, distributor, item attributes, relationships
   booklet: book
   manual: book
   proceedings: book
-  inbook: "{{ creatornames }} ({{role}}) . {{ title }} . {{ labels['in'] | capitalize }}: {{ host_creatornames}} ({{ host_role}}) : <em>{{host_title}}</em> [{{medium}}] . {{ edition | capitalize_first }}. ({{ series }}.) {% if place %}{{place}}{%else%}{{ labels['no_place']}}{%endif%}: {{publisher}}. {{date}}. {{size}}. {{extent}}. {{ labels['updated'] | capitalize }}:_{{date_updated}}. {{ authoritative_identifier | join: '. ' }}. {{ other_identifier | join: '. ' }}. {{ uri }}. {{ labels['at'] | capitalize}}:_{{ access_location }}. [{{ labels['viewed'] }}:_{{date_accessed}}]."
+  inbook: "{{ creatornames }} ({{role}}) . {{labels['q-open']}}{{ title }}{{labels['q-close']}} . {{ labels['in'] | capitalize }}: {{ host_creatornames}} ({{ host_role}}) : {{labels['qq-open']}}{{host_title}}{{labels['qq-close']}} [{{medium}}] . {{ edition | capitalize_first }}. ({{ series }}.) {% if place %}{{place}}{%else%}{{ labels['no_place']}}{%endif%}: {{publisher}}. {{date}}. {{size}}. {{extent}}. {{ labels['updated'] | capitalize }}:_{{date_updated}}. {{ authoritative_identifier | join: '. ' }}. {{ other_identifier | join: '. ' }}. {{ uri }}. {{ labels['at'] | capitalize}}:_{{ access_location }}. [{{ labels['viewed'] }}:_{{date_accessed}}]."
   inproceedings: inbook
   incollection: inbook
     # TODO: omitted: author ids, additional info for component part, subsidiary titles of host resource, rights metadata, distributor, relationships
-  journal: "<em>{{ title}}</em> [{{medium}}] . {{ edition | capitalize_first }}. {{place}}: {{publisher}}. {{date}}. {{size}}. {{extent}}. {{ authoritative_identifier | join: '. ' }}. {{ other_identifier | join: '. ' }}. {{ uri }}. {{ labels['at'] | capitalize}}:_{{ access_location }}. [{{ labels['viewed'] }}:_{{date_accessed}}]."
+  journal: "{{labels['qq-open']}}{{ title}}{{labels['qq-close']}} [{{medium}}] . {{ edition | capitalize_first }}. {{place}}: {{publisher}}. {{date}}. {{size}}. {{extent}}. {{ authoritative_identifier | join: '. ' }}. {{ other_identifier | join: '. ' }}. {{ uri }}. {{ labels['at'] | capitalize}}:_{{ access_location }}. [{{ labels['viewed'] }}:_{{date_accessed}}]."
     # TODO subsidiary titles, rights metadata, item attributes, relationships
-  article: "{{ creatornames }} ({{role}}) . {{ title }}. {{ series }} [{{medium}}] . {{ edition | capitalize_first }}. {{size}}. {{ extent }}. {{place}}: {{publisher}}. {{date}}. {{ labels['updated'] | capitalize }}:_{{date_updated}}. {{ authoritative_identifier | join: '. ' }}. {{ other_identifier | join: '. ' }}. {{ uri }}. {{ labels['at'] | capitalize}}:_{{ access_location }}. [{{ labels['viewed'] }}:_{{date_accessed}}]."
+  article: "{{ creatornames }} ({{role}}) . {{labels['q-open']}}{{ title }}{{labels['q-close']}}. {{ series }} [{{medium}}] . {{ edition | capitalize_first }}. {{size}}. {{ extent }}. {{place}}: {{publisher}}. {{date}}. {{ labels['updated'] | capitalize }}:_{{date_updated}}. {{ authoritative_identifier | join: '. ' }}. {{ other_identifier | join: '. ' }}. {{ uri }}. {{ labels['at'] | capitalize}}:_{{ access_location }}. [{{ labels['viewed'] }}:_{{date_accessed}}]."
     # TODO: omitted: author ids, subsidiary titles, rights metadata, distributor, item attributes, relationships; newspapers
-  software: "{{ creatornames }} ({{ role}}) . <em>{{ title }}</em> . {{ labels['version'] | capitalize }}_{{ edition_raw }}. {{medium | capitalize}}. {{place}}: {{publisher}}. {{date}}. {{ labels['updated'] | capitalize }}:_{{date_updated}}. {{ authoritative_identifier | join: '. ' }}. {{ other_identifier | join: '. ' }}. {{ uri }}. {{size}}. {{ extent}}. [{{ labels['viewed'] }}:_{{date_accessed}}]. "
+  software: "{{ creatornames }} ({{ role}}) . {{labels['qq-open']}}{{ title }}{{labels['qq-close']}} . {{ labels['version'] | capitalize }}_{{ edition_raw }}. {{medium | capitalize}}. {{place}}: {{publisher}}. {{date}}. {{ labels['updated'] | capitalize }}:_{{date_updated}}. {{ authoritative_identifier | join: '. ' }}. {{ other_identifier | join: '. ' }}. {{ uri }}. {{size}}. {{ extent}}. [{{ labels['viewed'] }}:_{{date_accessed}}]. "
     # TODO: omitted: author ids, subsidiary titles, subsidiary creators, copyright, license, distributor, system requirements, relationships
   electronic resource:  software
-  standard: "{{ creatornames }} ({{ role}}) . {{ authoritative_identifier | join '|' }}: <em>{{ title }}</em> . {{ labels['in'] | capitalize }}:_{{ series_title }}. {{ medium | capitalize }}. {{ edition | capitalize_first }}. {{ place }}: {{ publisher }}. {{date}}. {{size}}. {{ extent }}. {{ other_identifier | join: '. ' }}. {{ uri }}. {{ labels['at'] | capitalize}}:_{{ access_location }}. [{{ labels['viewed'] }}:_{{date_accessed}}]."
+  standard: "{{ creatornames }} ({{ role}}) . {{ authoritative_identifier | join '|' }}: {{labels['qq-open']}}{{ title }}{{labels['qq-close']}} . {{ labels['in'] | capitalize }}:_{{ series_title }}. {{ medium | capitalize }}. {{ edition | capitalize_first }}. {{ place }}: {{ publisher }}. {{date}}. {{size}}. {{ extent }}. {{ other_identifier | join: '. ' }}. {{ uri }}. {{ labels['at'] | capitalize}}:_{{ access_location }}. [{{ labels['viewed'] }}:_{{date_accessed}}]."
     # TODO: omitted: author ids, subsidiary titles, rights metadata, distributor, persistent identifier, item attributes, relationships
   techreport: standard
-  dataset: "{{ creatornames }} ({{ role }}) . <em>{{ title }}</em> . {{ labels['version'] | capitalize }}_{{ edition_raw }}. {{medium | capitalize }}. {{ labels['in'] | capitalize }}:_{{series}}. {{date}}. {{ labels['updated'] | capitalize }}:_{{date_updated}}. {{ authoritative_identifier | join: '. ' }}. {{ other_identifier | join: '. ' }}. {{ uri }}. {{ size }}. {{ extent}}. [{{ labels['viewed'] }}:_{{date_accessed}}]. "
+  dataset: "{{ creatornames }} ({{ role }}) . {{labels['qq-open']}}{{ title }}{{labels['qq-close']}} . {{ labels['version'] | capitalize }}_{{ edition_raw }}. {{medium | capitalize }}. {{ labels['in'] | capitalize }}:_{{series}}. {{date}}. {{ labels['updated'] | capitalize }}:_{{date_updated}}. {{ authoritative_identifier | join: '. ' }}. {{ other_identifier | join: '. ' }}. {{ uri }}. {{ size }}. {{ extent}}. [{{ labels['viewed'] }}:_{{date_accessed}}]. "
     # TODO: omitted: author ids, system requirements, host archive, copyright, license, data source, distributor, usage instructions, relationships, provenance
-  website: "{{ creatornames }} ({{ role }}) . <em>{{ title }}</em> . {{ labels['version'] | capitalize }}_{{ edition_raw }}. {{medium | capitalize }}. {{ place }}: {{ publisher }}. {{date}}. {{ labels['updated'] | capitalize }}:_{{date_updated}}. {{ authoritative_identifier | join: '. ' }}. {{ other_identifier | join: '. ' }}. {{ uri }}. [{{ labels['viewed'] }}:_{{date_accessed}}]. "
+  website: "{{ creatornames }} ({{ role }}) . {{labels['qq-open']}}{{ title }}{{labels['qq-close']}} . {{ labels['version'] | capitalize }}_{{ edition_raw }}. {{medium | capitalize }}. {{ place }}: {{ publisher }}. {{date}}. {{ labels['updated'] | capitalize }}:_{{date_updated}}. {{ authoritative_identifier | join: '. ' }}. {{ other_identifier | join: '. ' }}. {{ uri }}. [{{ labels['viewed'] }}:_{{date_accessed}}]. "
     # TODO: omitted: author ids, page title, system requirements, subsidiary creator, rights metadata, distributor, persistent identifier, archive location, archive date and time, relationships
   webresource: website
     # TODO: component part
-  unpublished: "{{ creatornames }} ({{ role }}) . <em>{{ title }}</em> . {{ medium | capitalize }}. {{ date }}. {{ labels['at'] | capitalize}}:_{{ access_location }}.  {{ authoritative_identifier | join: '. ' }}. {{ other_identifier | join: '. ' }}. {{ uri }}. [{{ labels['viewed'] }}:_{{date_accessed}}]."
+  unpublished: "{{ creatornames }} ({{ role }}) . {{labels['qq-open']}}{{ title }}{{labels['qq-close']}} . {{ medium | capitalize }}. {{ date }}. {{ labels['at'] | capitalize}}:_{{ access_location }}.  {{ authoritative_identifier | join: '. ' }}. {{ other_identifier | join: '. ' }}. {{ uri }}. [{{ labels['viewed'] }}:_{{date_accessed}}]."
     # TODO: omitted: author ids, subsidiary titles, subsidiary creators, host archive, item attributes, relationships
   presentation: unpublished
-  thesis: "{{ creatornames }} ({{ role }}) . <em>{{ title }}</em> . {{ medium | capitalize }}. {{ place }}: {{ publisher }}. {{ date }}. {{ labels['at'] | capitalize}}:_{{ access_location }}. {{ authoritative_identifier | join: '. ' }}. {{ other_identifier | join: '. ' }}. {{ uri }}. [{{ labels['viewed'] }}:_{{date_accessed}}]."
-  misc:  "{{ creatornames }} ({{ role }}) . <em>{{ title }}</em> . {{ date }}."
+  thesis: "{{ creatornames }} ({{ role }}) . {{labels['qq-open']}}{{ title }}{{labels['qq-close']}} . {{ medium | capitalize }}. {{ place }}: {{ publisher }}. {{ date }}. {{ labels['at'] | capitalize}}:_{{ access_location }}. {{ authoritative_identifier | join: '. ' }}. {{ other_identifier | join: '. ' }}. {{ uri }}. [{{ labels['viewed'] }}:_{{date_accessed}}]."
+  misc:  "{{ creatornames }} ({{ role }}) . {{labels['qq-open']}}{{ title }}{{labels['qq-close']}} . {{ date }}."
   # following are # unsupported types:
   map: misc
   audiovisual: misc

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

@@ -27,6 +27,22 @@ module Relaton
         [forenames.first, forenames[1..-1], Array(initials)]
       end
 
+      def forenames_parse(person)
+        person.name.forename.map do |x|
+          x.content.empty? ? "#{x.initial}." : x.content
+        end
+      end
+
+      # de S. => one initial, M.-J. => one initial
+      def initials_parse(person)
+        i = person.name.initials&.content or
+          return person.name.forename.map(&:initial)
+              .compact.map { |x| x.sub(/(.)\.?$/, "\\1.") }
+
+        i.sub(/(.)\.?$/, "\\1.")
+          .scan(/.+?\.(?=(?:$|\s|\p{Alpha}))/).map(&:strip)
+      end
+
       def extractname(contributor)
         org = contributor.entity if contributor.entity
           .is_a?(RelatonBib::Organization)

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

@@ -113,11 +113,13 @@ module Relaton
 
       def uri(doc)
         uri = nil
-        %w(citation doi uri src).each do |t|
+        %w(citation uri src).each do |t|
           uri = uri_type_select(doc, t) and break
         end
-        uri ||= doc.link.detect { |u| u.language == @lang }
-        uri ||= doc.link.first
+        uri ||= doc.link.detect do |u|
+          u.language == @lang && !u.type&.casecmp("doi")&.zero?
+        end
+        uri ||= doc.link.detect { |u| !u.type&.casecmp("doi")&.zero? }
         return nil unless uri
 
         uri.content.to_s
@@ -125,9 +127,9 @@ module Relaton
 
       def uri_type_select(doc, type)
         uri = doc.link.detect do |u|
-          u.type == type && u.language == @lang
+          u.type&.downcase == type && u.language == @lang
         end and return uri
-        uri = doc.link.detect { |u| u.type == type } and return uri
+        uri = doc.link.detect { |u| u.type&.downcase == type } and return uri
         nil
       end
 

data/lib/relaton/render/template/template.rb

@@ -31,7 +31,8 @@ module Relaton
 
         # denote start and end of field,
         # so that we can detect empty fields in postprocessing
-        FIELD_DELIM = "\u0018".freeze
+        #FIELD_DELIM = "\u0018".freeze
+        FIELD_DELIM = "%%".freeze
 
         # escape < >
         LT_DELIM = "\u0019".freeze
@@ -40,13 +41,23 @@ module Relaton
         # use tab internally for non-spacing delimiter
         NON_SPACING_DELIM = "\t".freeze
 
+        def punct_field?(name)
+          name or return false
+          name = name.gsub(/'/, '"')
+          %w(labels["qq-open"] labels["qq-close"] labels["q-open"]
+             labels["q-close"]).include?(name)
+        end
+
         def template_process(template)
-          t = template.gsub(/\{\{/, "#{FIELD_DELIM}{{")
-            .gsub(/\}\}/, "}}#{FIELD_DELIM}")
-            .gsub(/\t/, " ")
-          t1 = t.split(/(\{\{.+?\}\})/).map do |n|
-            n.include?("{{") ? n : n.gsub(/(?<!\\)\|/, "\t")
-          end.join
+          t = template.split(/(\{\{|\}\})/).each_slice(4).map do |a|
+            unless !a[2] || punct_field?(a[2]&.strip)
+              a[1] = "#{FIELD_DELIM}{{"
+              a[3] = "}}#{FIELD_DELIM}"
+            end
+            a.join
+          end.join.gsub(/\t/, " ")
+          t1 = t.gsub(/\}\}#{FIELD_DELIM}\|/o, "}}#{FIELD_DELIM}\t")
+            .gsub(/\|#{FIELD_DELIM}\{\{/o, "\t#{FIELD_DELIM}{{")
           ::Liquid::Template.parse(t1)
         end
 

data/lib/relaton/render/version.rb

@@ -1,5 +1,5 @@
 module Relaton
   module Render
-    VERSION = "0.5.3".freeze
+    VERSION = "0.5.5".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-render
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-11-17 00:00:00.000000000 Z
+date: 2022-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -203,6 +203,7 @@ files:
 - lib/isodoc-yaml/i18n-fr.yaml
 - lib/isodoc-yaml/i18n-ru.yaml
 - lib/isodoc-yaml/i18n-zh-Hans.yaml
+- lib/isodoc-yaml/i18n-zh-Hant.yaml
 - lib/isodoc/i18n.rb
 - lib/relaton-render.rb
 - lib/relaton/render/fields/date.rb