relaton-render 0.10.1 → 1.0.0

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

@@ -5,6 +5,7 @@ nametemplate:
 # 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['author_and'] }} {% if nonpersonal[1] %}{{ nonpersonal[1] }}{% else %}{{surname[1] }}{% endif %}"
@@ -12,8 +13,10 @@ authorcitetemplate:
 # 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
+
 seriestemplate: "{% if series_formatted %}{{ series_formatted }}{%else%}{% if series_abbr %}{{series_abbr}}{% else %}{{series_title}}{% endif %} ({{series_run}}) {{series_num}}|({{series_partnumber}}){%endif%}"
 journaltemplate: "<em>{% if series_abbr %}{{series_abbr}}{% else %}{{series_title}}{% endif %}</em> ({{series_run}}) {{ labels['volume'] }}_{{series_num}} {{ labels['part'] }}_{{series_partnumber}}"
+
 extenttemplate:
   book: "{{ volume }}, {{ page }}"
   booklet: book
@@ -29,39 +32,85 @@ sizetemplate:
   electronic resource: dataset
   webresource: dataset
   misc: "{{ volume }}, {{ issue }}, {{ page }}, {{ data }}, {{ duration }}"
+
 language: en
 script: Latn
+
+citetemplate:
+  author_date: "{{ author }} {{ date}}"
+  author_date_br: "{{ author }} ({{ date}})"
+  author: "{{ author }}"
+  date: "{{ date }}"
+  reference_tag: "{{ biblio_tag }}"
+  title: "{{ title }}"
+  title_reference_tag: "{{ title }} {{ biblio_tag }}"
+  short:
+    book: "{{ creatornames }} ({{role}}) $$$ {{labels['punct']['open-title']}}{{ title }}{{labels['punct']['close-title']}} [{{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: '$$$ ' }}$$$ {{size}}$$$ {{extent}}$$$"
+    booklet: book
+    manual: book
+    proceedings: book
+    inbook: "{{ creatornames }} ({{role}}) $$$ {{labels['punct']['open-secondary-title']}}{{ title }}{{labels['punct']['close-secondary-title']}} $$$ {{ labels['in'] | capitalize }}: {{ host_creatornames}} ({{ host_role}}) : {{labels['punct']['open-title']}}{{host_title}}{{labels['punct']['close-title']}} [{{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: '$$$ ' }}$$$"
+    inproceedings: inbook
+    incollection: inbook
+    journal: "{{labels['punct']['open-title']}}{{ title}}{{labels['punct']['close-title']}} [{{medium}}] $$$ {{ edition | capitalize_first }}$$$ {{place}}: {{publisher}}$$$ {{date}}$$$ {{size}}$$$ {{extent}}$$$ {{ authoritative_identifier | join: '$$$ ' }}$$$ {{ other_identifier | join: '$$$ ' }}$$$"
+    article: "{{ creatornames }} ({{role}}) $$$ {{labels['punct']['open-secondary-title']}}{{ title }}{{labels['punct']['close-secondary-title']}}$$$ {{ series }} [{{medium}}] $$$ {{ edition | capitalize_first }}$$$ {{size}}$$$ {{ extent }}$$$ {{place}}: {{publisher}}$$$ {{date}}$$$ {{ labels['updated'] | capitalize }}:_{{date_updated}}$$$ {{ authoritative_identifier | join: '$$$ ' }}$$$ {{ other_identifier | join: '$$$ ' }}$$$"
+    software: "{{ creatornames }} ({{ role}}) $$$ {{labels['punct']['open-title']}}{{ title }}{{labels['punct']['close-title']}} $$$ {{ labels['version'] | capitalize }}_{{ edition_raw }}$$$ {{medium | capitalize}}$$$ {{place}}: {{publisher}}$$$ {{date}}$$$ {{ labels['updated'] | capitalize }}:_{{date_updated}}$$$ {{ authoritative_identifier | join: '$$$ ' }}$$$ {{ other_identifier | join: '$$$ ' }}$$$ {{ uri }}$$$ {{size}}$$$ {{ extent}}$$$"
+    electronic resource:  software
+    standard: "{{ creatornames }} ({{ role}}) $$$ {{ authoritative_identifier | join: '|' }}: {{labels['punct']['open-title']}}{{ title }}{{labels['punct']['close-title']}} $$$ {{ medium | capitalize }}$$$ {{ edition | capitalize_first }}$$$ {{ place }}: {{ publisher }}$$$ {{date}}$$$ {{size}}$$$ {{ extent }}$$$ {{ other_identifier | join: '$$$ ' }}"
+    techreport: standard
+    dataset: "{{ creatornames }} ({{ role }}) $$$ {{labels['punct']['open-title']}}{{ title }}{{labels['punct']['close-title']}} $$$ {{ 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}}$$$"
+    website: "{{ creatornames }} ({{ role }}) $$$ {{labels['punct']['open-title']}}{{ title }}{{labels['punct']['close-title']}} $$$ {{ labels['version'] | capitalize }}_{{ edition_raw }}$$$ {{medium | capitalize }}$$$ {{ place }}: {{ publisher }}$$$ {{date}}$$$ {{ labels['updated'] | capitalize }}:_{{date_updated}}$$$ {{ authoritative_identifier | join: '$$$ ' }}$$$ {{ other_identifier | join: '$$$ ' }}$$$ {{ uri }}$$$"
+    webresource: website
+    unpublished: "{{ creatornames }} ({{ role }}) $$$ {{labels['punct']['open-title']}}{{ title }}{{labels['punct']['close-title']}} $$$ {{ medium | capitalize }}$$$ {{ date }}$$$ {{ labels['at'] | capitalize}}:_{{ access_location }}$$$  {{ authoritative_identifier | join: '$$$ ' }}$$$ {{ other_identifier | join: '$$$ ' }}$$$"
+    thesis: "{{ creatornames }} ({{ role }}) $$$ {{labels['punct']['open-title']}}{{ title }}{{labels['punct']['close-title']}} $$$ {{ medium | capitalize }}$$$ {{ place }}: {{ publisher }}$$$ {{ date }}$$$ {{ labels['at'] | capitalize}}:_{{ access_location }}$$$ {{ authoritative_identifier | join: '$$$ ' }}$$$ {{ other_identifier | join: '$$$ ' }}$$$"
+    misc:  "{{ creatornames }} ({{ role }}) $$$ {{labels['punct']['open-title']}}{{ title }}{{labels['punct']['close-title']}} $$$ {{ date }}$$$"
+    map: misc
+    audiovisual: misc
+    film: misc
+    video: misc
+    broadcast: misc
+    graphic_work: misc
+    music: misc
+    performance: misc
+    patent: misc
+    archival: misc
+    social_media: misc
+    alert: misc
+    message: misc
+    conversation: misc
+    internal: misc
+
 template:
-  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}}."
+  book: "{{ creatornames }} ({{role}}) $$$ {{labels['punct']['open-title']}}{{ title }}{{labels['punct']['close-title']}} [{{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}}) . {{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}}]."
+  inbook: "{{ creatornames }} ({{role}}) $$$ {{labels['punct']['open-secondary-title']}}{{ title }}{{labels['punct']['close-secondary-title']}} $$$ {{ labels['in'] | capitalize }}: {{ host_creatornames}} ({{ host_role}}) : {{labels['punct']['open-title']}}{{host_title}}{{labels['punct']['close-title']}} [{{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: "{{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}}]."
+  journal: "{{labels['punct']['open-title']}}{{ title}}{{labels['punct']['close-title']}} [{{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}}) . {{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}}]."
+  article: "{{ creatornames }} ({{role}}) $$$ {{labels['punct']['open-secondary-title']}}{{ title }}{{labels['punct']['close-secondary-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}}]$$$"
     # TODO: omitted: author ids, subsidiary titles, rights metadata, distributor, item attributes, relationships; newspapers
-  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}}]. "
+  software: "{{ creatornames }} ({{ role}}) $$$ {{labels['punct']['open-title']}}{{ title }}{{labels['punct']['close-title']}} $$$ {{ 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: '|' }}: {{labels['qq-open']}}{{ title }}{{labels['qq-close']}} . {{ 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['punct']['open-title']}}{{ title }}{{labels['punct']['close-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 }}) . {{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}}]. "
+  dataset: "{{ creatornames }} ({{ role }}) $$$ {{labels['punct']['open-title']}}{{ title }}{{labels['punct']['close-title']}} $$$ {{ 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 }}) . {{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}}]. "
+  website: "{{ creatornames }} ({{ role }}) $$$ {{labels['punct']['open-title']}}{{ title }}{{labels['punct']['close-title']}} $$$ {{ 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 }}) . {{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}}]."
+  unpublished: "{{ creatornames }} ({{ role }}) $$$ {{labels['punct']['open-title']}}{{ title }}{{labels['punct']['close-title']}} $$$ {{ 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 }}) . {{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 }}. {{ uri }}."
+  thesis: "{{ creatornames }} ({{ role }}) $$$ {{labels['punct']['open-title']}}{{ title }}{{labels['punct']['close-title']}} $$$ {{ 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['punct']['open-title']}}{{ title }}{{labels['punct']['close-title']}} $$$ {{ date }}$$$ {{ uri }}$$$"
   # following are # unsupported types:
   map: misc
   audiovisual: misc

data/lib/relaton/render/general/render.rb

@@ -13,16 +13,21 @@ module Relaton
     class General
       attr_reader :template, :journaltemplate, :seriestemplate, :nametemplate,
                   :authorcitetemplate, :extenttemplate, :sizetemplate,
-                  :lang, :script, :i18n,
-                  :edition, :edition_ordinal, :date, :fieldsklass, :dateklass
+                  :citetemplate, :citeshorttemplate, :lang, :script, :i18n,
+                  :edition, :date, :fieldsklass, :dateklass, :config
 
       def initialize(opt = {})
-        options = read_config.merge(Utils::string_keys(opt))
+        @config = read_config
+        options = @config.merge(Utils::string_keys(opt))
         @type = self.class.name.downcase.split("::").last
         klass_initialize(options)
         root_initalize(options)
         render_initialize(options)
         @parse ||= options["parse"]
+        init_misc
+      end
+
+      def init_misc
         @semaphore = Mutex.new
         @urlcache = {}
         @url_warned = {}
@@ -32,9 +37,11 @@ module Relaton
         YAML.load_file(File.join(File.dirname(__FILE__), "config.yml"))
       end
 
-      def klass_initialize(_options)
+      def klass_initialize(options)
         @nametemplateklass = Relaton::Render::Template::Name
         @authorcitetemplateklass = Relaton::Render::Template::AuthorCite
+        @citetemplateklass = Relaton::Render::Template::Cite
+        @citeshorttemplateklass = Relaton::Render::Template::Cite
         @seriestemplateklass = Relaton::Render::Template::Series
         @extenttemplateklass = Relaton::Render::Template::Extent
         @sizetemplateklass = Relaton::Render::Template::Size
@@ -42,6 +49,7 @@ module Relaton
         @fieldsklass = Relaton::Render::Fields
         @dateklass = Relaton::Render::Date
         @parseklass = Relaton::Render::Parse
+        @i18nklass = options["i18nklass"] || Relaton::Render::I18n
       end
 
       def root_initalize(opt)
@@ -49,6 +57,7 @@ module Relaton
         @parse = @parseklass.new(lang: @lang, script: @script, i18n: @i18n)
         @nametemplate = @nametemplateklass
           .new(template: opt["nametemplate"], i18n: @i18n)
+        @citetemplate,  @citeshorttemplate = citerenderers(opt)
         @authorcitetemplate = @authorcitetemplateklass
           &.new(template: opt["authorcitetemplate"], i18n: @i18n)
         @seriestemplate = @seriestemplateklass
@@ -63,12 +72,17 @@ module Relaton
         @lang = opt["language"]
         @script = opt["script"]
         @locale = opt["locale"]
-        @i18n = opt["i18n"] ||
+        default_i18n = opt["i18n"] ||
           i18n_klass(language: @lang, script: @script, locale: @locale,
                      i18nhash: opt["i18nhash"])
-        @edition_ordinal = opt["edition_ordinal"] || @i18n.edition_ordinal
-        @edition = opt["edition"] || @i18n.edition
-        @date = opt["date"] || @i18n.get["date_formats"] ||
+        @i18n = @i18nklass.new(opt.merge({"i18n" => default_i18n}))
+        i18n_default_strs(opt)
+      end
+
+      # avoid using these, they are document-set not citation-specific
+      def i18n_default_strs(opt)
+        @edition = opt["edition"] || @i18n.select(nil).edition
+        @date = opt["date"] || @i18n.select(nil).get["date_formats"] ||
           { "month_year" => "yMMMM", "day_month_year" => "to_long_s",
             "date_time" => "to_long_s" }
       end
@@ -86,9 +100,9 @@ module Relaton
       def renderers(opt)
         template_hash_fill(opt["template"]).each_with_object({}) do |(k, v), m|
           @type == "general" || @type == k or next
-          m[k] = General.subclass(k)
-            .new(template: v, parse: @parse, i18n: @i18n,
-                 language: @lang, script: @script)
+          m[k] = self.class.subclass(k)
+            .new(template: v, parse: @parse, i18n_multi: @i18n.config,
+                 language: @lang, script: @script, i18nklass: @i18nklass)
         end
       end
 
@@ -102,6 +116,16 @@ module Relaton
           .new(template: template_hash_fill(opt["sizetemplate"]), i18n: @i18n)
       end
 
+      def citerenderers(opt)
+        s = opt["citetemplate"]["short"]
+        r = opt["citetemplate"].reject { |k, _| k == "short" }
+        short = @citetemplateklass
+          &.new(template: template_hash_fill(s), i18n: @i18n)
+        ret = @citetemplateklass
+          &.new(template: r, i18n: @i18n)
+        [ret, short]
+      end
+
       def default_template
         "{{creatornames}}. {{title}}. {{date}}."
       end
@@ -111,19 +135,19 @@ module Relaton
                                                           i18nhash: i18nhash)
       end
 
-      def render(bib, embedded: false)
-        require "debug"; binding.b
+      def render(bib, embedded: false, terminator: true)
         bib = xml2relaton(bib)
         f = bib.formattedref and
           return embedded ? f.content : fmtref(f.content)
-        ret = render1(bib) or return nil
+        ret = render1(bib, terminator) or return nil
         embedded and return ret
         fmtref(ret)
       end
 
       def xml2relaton(bib)
         bib.is_a?(Nokogiri::XML::Element) and
-          bib = bib.to_xml
+          bib = bib.to_xml(encoding: "UTF-8", indent: 0,
+                    save_with: Nokogiri::XML::Node::SaveOptions::AS_XML)
         bib.is_a?(String) && Nokogiri::XML(bib).errors.empty? and
           bib = RelatonBib::XMLParser.from_xml(bib) or bib
       end
@@ -145,21 +169,33 @@ module Relaton
         text.gsub(/<esc>/i, "<esc>").gsub(/<\/esc>/i, "</esc>")
       end
 
-      def render1(doc)
+      def render1(doc, terminator)
+        obj, str = render_single_bibitem(doc)
+        out = [str] + also_pub_as(doc)
+        ret1 = out.join(@i18n.select(obj).get["punct"]["biblio-field-delimiter"] || ". ")
+        ret = @i18n.select(obj).l10n(esc_cleanup(ret1)
+          .gsub(".</esc>.", ".</esc>").gsub(".. ", ". "))
+        final = @i18n.select(obj).get["punct"]["biblio-terminator"] || "."
+        terminator && !ret.end_with?(final) && !ret.empty? and ret += final
+        ret
+      end
+
+      def also_pub_as(doc)
         r = doc.relation.select { |x| x.type == "hasRepresentation" }
-          .map { |x| @i18n.also_pub_as + render_single_bibitem(x.bibitem) }
-        out = [render_single_bibitem(doc)] + r
-        @i18n.l10n(esc_cleanup(out.join(". ")).gsub(".</esc>.", ".</esc>")
-          .gsub(".. ", ". "))
+        r.map do |x|
+          _, out = render_single_bibitem(x.bibitem)
+          @i18n.select(nil).also_pub_as + out
+        end
       end
 
       def render_single_bibitem(doc)
         data_liquid, r = parse(doc)
-        liquid(data_liquid, r)
+        out = liquid(data_liquid, r)
+        [data_liquid, out]
       end
 
       def liquid(data_liquid, renderer)
-        valid_parse(renderer.render(data_liquid))
+        valid_parse(renderer.render(data_liquid, data_liquid))
       end
 
       def parse(doc)
@@ -173,7 +209,7 @@ module Relaton
       end
 
       def valid_parse(ret)
-        @i18n.get["no_date"] == ret and return nil
+        @i18n.select(nil).get["no_date"] == ret and return nil
         ret
       end
 
@@ -181,10 +217,15 @@ module Relaton
       # enhance_data is skipped here, and is done in batch inside Citations
       def render_all(bib, type: "author-date")
         bib = sanitise_citations_input(bib) or return
-        Citations.new(type: type, renderer: self, i18n: @i18n)
+        Citations.new(type: type, renderer: citation_renderers,
+                      i18n: @i18n, lang: @lang, script: @script)
           .render(citations1(bib))
       end
 
+      def citation_renderers
+       { default: self }
+      end
+
       def sanitise_citations_input(bib)
         bib.is_a?(Array) and return bib
         bib.is_a?(String) and return sanitise_citations_input_string(bib)
@@ -203,7 +244,7 @@ module Relaton
           data_liquid = @fieldsklass.new(renderer: self)
             .compound_fields_format(@parse.extract(b))
           m << { author: data_liquid[:authorcite], date: data_liquid[:date],
-                 ord: i, id: b.id, data_liquid: data_liquid, type: b.type }
+                 ord: i, id: b.id, data: data_liquid, type: b.type }
         end
       end
 

data/lib/relaton/render/general/render_classes.rb

@@ -17,7 +17,10 @@ module Relaton
       end
 
       def self.subclass(type)
-        @descendants[type]
+        # Always look up from the root General class, not from subclasses
+        base = self
+        base = base.superclass while base.superclass != Object && base.superclass.name =~ /Relaton::Render/
+        base.instance_variable_get(:@descendants)&.[](type)
       end
     end
 

data/lib/relaton/render/i18n/i18n.rb

@@ -0,0 +1,40 @@
+module Relaton
+  module Render
+    class I18n
+      # @i18n is a hash of IsoDoc::I18n objects, selected from according to
+      # attributes of the parsed Relaton object
+      def initialize(opt)
+        if opt["i18n_multi"]
+          @i18n = opt["i18n_multi"]
+        elsif opt["i18n"]
+          @i18n = { "" => opt["i18n"] }
+        else
+          raise error "Bad configuration, Relaton::Render::I18n"
+        end
+      end
+
+      # obj is the biblio hash, extracted by Relaton::Render::Fields
+      # There must always be a default selection, for obj = nil,
+      # being the document language setting. If select is applied on obj,
+      # the i18n selected is appropriate to the citation specifically,
+      # and potentially to the field specificaly
+      def select(obj)
+        if obj.nil? then select_default
+        else select_obj(obj)
+        end
+      end
+
+      def select_default
+        @i18n[""]
+      end
+
+      def select_obj(_obj)
+        @i18n[""]
+      end
+
+      def config
+        @i18n
+      end
+    end
+  end
+end

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

@@ -15,9 +15,11 @@ module Relaton
 
       def extract(doc)
         host = host(doc)
-        simple_xml2hash(doc).merge(simple_or_host_xml2hash(doc, host))
+        ret = simple_xml2hash(doc).merge(simple_or_host_xml2hash(doc, host))
           .merge(host_xml2hash(host))
           .merge(series_xml2hash(doc, host))
+        ret
+        #i18n(ret)
       end
 
       def simple_xml2hash(doc)
@@ -25,8 +27,9 @@ module Relaton
         { type: type(doc), title: title(doc), extent_raw: extent(doc),
           size_raw: size(doc), uri_raw: uri(doc), doi: doi(doc),
           authoritative_identifier: authoritative_identifier(doc),
-          other_identifier: other_identifier(doc),
-          status: status(doc), creators: creators, role_raw: role }
+          other_identifier_raw: other_identifier(doc), biblio_tag: biblio_tag(doc),
+          status_raw: status(doc), creators: creators, role_raw: role,
+          language: language(doc), script: script(doc), locale: locale(doc) }
       end
 
       def simple_or_host_xml2hash(doc, host)
@@ -54,17 +57,29 @@ module Relaton
       end
 
       def series_xml2hash1(series, doc)
-        return {} unless series
+        series or return {}
+        ret = { series_formatted: series_formatted(series, doc),
+                series_title: series_title(series, doc),
+                series_abbr: series_abbr(series, doc),
+                series_run: series_run(series, doc),
+                series_num: series_num(series, doc),
+                series_partnumber: series_partnumber(series, doc),
+                series_place: series_place(series, doc),
+                series_org: series_org(series, doc),
+                series_dates: series_dates(series, doc) }
+        ret.each do |k, v|
+          %i(series_num series_dates).include?(k) and next
+          ret[k] = esc(v)
+        end
+        ret
+      end
 
-        { series_formatted: series_formatted(series, doc),
-          series_title: series_title(series, doc),
-          series_abbr: series_abbr(series, doc),
-          series_run: series_run(series, doc),
-          series_num: series_num(series, doc),
-          series_partnumber: series_partnumber(series, doc),
-          series_place: series_place(series, doc),
-          series_org: series_org(series, doc),
-          series_dates: series_dates(series, doc) }
+      #KILL
+      def other_identifier_i18n(hash)
+           #ret << "#{type}: #{esc id.id}"
+        hash[:other_identifier]&.map! do |i|
+          i.include?("<esc>") ? @i18n.select(hash).l10n(i) : i
+        end
       end
 
       private
@@ -72,6 +87,19 @@ module Relaton
       def blank?(text)
         text.nil? || text.empty?
       end
+
+      def esc(text)
+        blank?(text) and return text
+        "<esc>#{text}</esc>"
+      end
+
+      def wrap_in_esc(obj)
+        case obj
+        when String then esc(obj)
+        when Array then obj.map { |e| wrap_in_esc(e) }
+        else obj
+        end
+      end
     end
   end
 end

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

@@ -4,8 +4,10 @@ module Relaton
       def content(node)
         node.nil? and return node
         node.content.is_a?(Array) and return node.content.map { |x| content(x) }
-        node.content.strip
+        ret = node.content.strip
           .gsub("</title>", "").gsub("<title>", "")
+        # safeguard against indented XML
+        ret.gsub(/>\n\s*</, "><").gsub(/\n\s*/, " ")
         # node.children.map { |n| n.text? ? n.content : n.to_xml }.join
         # node.text? ? node.content.strip : node.to_xml.strip
       end
@@ -32,14 +34,6 @@ module Relaton
          wrap_in_esc(Array(initials))]
       end
 
-      def wrap_in_esc(obj)
-        case obj
-        when String then "<esc>#{obj}</esc>"
-        when Array then obj.map { |e| wrap_in_esc(e) }
-        else obj
-        end
-      end
-
       def extract_initials(person)
         initials = content(person.name.initials)&.sub(/(.)\.?$/, "\\1.")
           &.split /(?<=\.) /
@@ -50,7 +44,7 @@ module Relaton
 
       def forenames_parse(person)
         person.name.forename.map do |x|
-          x.content.empty? ? "<esc>#{x.initial}.</esc>" : content(x)
+          x.content.empty? ? esc("#{x.initial}.") : content(x)
         end
       end
 

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

@@ -12,7 +12,8 @@ module Relaton
         t.empty? and t = doc.title
         t1 = t.select { |x| x.type == "main" }
         t1.empty? and t1 = t
-        content(t1.first&.title)
+        t1.first or return
+        esc(content(t1.first.title))
       end
 
       def medium(doc, host)
@@ -31,7 +32,9 @@ module Relaton
       end
 
       def edition(doc, host)
-        content(doc.edition || host&.edition)
+        ret = content(doc.edition || host&.edition)
+        ret &&= esc(ret)
+        ret
       end
 
       def edition_num(doc, host)
@@ -51,7 +54,8 @@ module Relaton
         n = place.country
         c.nil? && r.empty? && n.empty? and return place.name
         ret = [c] + r.map(&:name) + n.map(&:name)
-        @i18n.l10n(ret.compact.join(", "))
+        ret.compact
+        #@i18n.l10n(ret.compact.join(", "))
       end
 
       def series(doc)
@@ -121,6 +125,19 @@ module Relaton
         "book"
       end
 
+      def language(doc)
+        doc.language&.first || @lang
+      end
+
+      def script(doc)
+        doc.script&.first || @script
+      end
+
+      def locale(doc)
+        # TODO not yet implemented in relaton-bib
+        # doc.locale&.first
+      end
+
       def extent1(localities)
         localities.each_with_object({}) do |l, ret|
           ret[(l.type || "page").to_sym] = {
@@ -168,7 +185,7 @@ module Relaton
 
       def status(doc)
         v = doc&.status&.stage&.value
-        @i18n.get.dig("stage", v) || v
+        #@i18n.get.dig("stage", v) || v
       end
     end
   end

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

@@ -49,7 +49,7 @@ module Relaton
           out.empty? or break
         end
         # prevent l10n of identifier contents
-        out.map(&:id).map { |i| "<esc>#{i.strip}</esc>" }
+        out.map(&:id).map { |i| esc(i.strip) }
       end
 
       def authoritative_identifier_select(idents)
@@ -65,14 +65,14 @@ module Relaton
       end
 
       def authoritative_identifier_exclude
-        %w(METANORMA METANORMA-ORDINAL TITLE) + other_identifier_include
+        %w(METANORMA METANORMA-ORDINAL TITLE URN ISO-REFERENCE) + other_identifier_include
       end
 
       def other_identifier(doc)
         doc.docidentifier.each_with_object([]) do |id, ret|
           type = id_type_norm(id)
           other_identifier_include.include? type or next
-          ret << @i18n.l10n("#{type}: <esc>#{id.id}</esc>")
+          ret << [type, id.id]
         end
       end
 
@@ -86,7 +86,7 @@ module Relaton
           type.casecmp("doi").zero? or next
           ret << id.id
         end
-        out.empty? ? nil : out.map { |i| "<esc>#{i.strip}</esc>" }
+        out.empty? ? nil : out.map { |i| esc(i.strip) }
       end
 
       def id_type_norm(id)
@@ -95,6 +95,13 @@ module Relaton
         m[1].upcase
       end
 
+      def biblio_tag(doc)
+        ret = doc.docidentifier.detect do |id|
+          id.scope&.downcase == "biblio-tag"
+        end
+        ret&.id
+      end
+
       def uri(doc)
         uri = nil
         %w(citation uri src).each do |t|