relaton-render 0.7.9 → 0.7.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b51234990cdbe3de45e178f647b716590d7d6306a8d5076ec7459afb09f331f
-  data.tar.gz: 9751d764f5df9ca1a5eae7a0e9f62995dcf14ddf14dec7e608f810e551dd96d5
+  metadata.gz: 3ecf37d8e14785144bf7383d58796bb226d603cfeba6b0cf8619df630b9fa0c1
+  data.tar.gz: addc81b25ec61123784785c3dc8f221817d1ad287f0887e32a90bcde9cbd6473
 SHA512:
-  metadata.gz: bc68d7a6846155a548f8868b1cc5f3268cafa40dc0abb75ac09778bdb1e352a089505b0f9bac7f9e5393303f7e287ab7daa1e3aa26076f95c6bfc8ee28cb15a6
-  data.tar.gz: 6a98f7a41e4f3602d2b4760e0751c493c77fa2859a6a92b86f4eeff6098c60d186bd783c4b9d67de6e84a498f1ca70d626479ae96a167899d0b29d1dd56b512b
+  metadata.gz: fc01dd8e4fc926b242da2cd7241c043f41550d5e7b8ab1639b740443bda006fd676bdde73d9819c2cd71bfd05b8f0c5a89de092f0543221cd0d85d52f0a073fa
+  data.tar.gz: 8c8a2f7318176726039c0a8f7ad315566700493bd587d644e8836e7dc17639ee67b6f86a8c923de373604a6f3b367eaf3787f505d4a03d01ff11fc8157d4d50c

data/README.adoc

@@ -35,9 +35,9 @@ The gem processes either Relaton XML, or native Relaton classes.
 The gem is intended to be inherited from by Metanorma flavours, which may specialise it with their own
 code. The templates are however intended to determine much of the rendering.
 
-Gems can provide their configurations in YAML files, and parse them before passing them to the call to Iso690Render.
-The built-in values for Iso690Render are given in `/lib/iso690render/config.yml`, and can be overridden by
-the parameters of initialising Iso690Render.
+Gems can provide their configurations in YAML files, and parse them before passing them to the call to Relaton::Render.
+The built-in values for Relaton::Render are given in `/lib/relaton/render/general/config.yml`, and can be overridden by
+the parameters of initialising Relaton::Render.
 
 The parameters are:
 
@@ -70,7 +70,8 @@ author and date. It should not be used for rendering of references aligned to th
 Given a collection of Relaton bibitem objects (or equivalent Relaton XML, wrapped in `<references>`), 
 `render_all(bibliography, type: type)`
 will output a hash of objects, with information to be used both for rendering references, and for generating citations.
-This method addresses the disambiguation of citiations, and changes to rendering of references reflecting that disambiguation.
+This method addresses the disambiguation of citations, and changes to rendering of references reflecting that disambiguation
+(e.g. differentiating two works with the same wuthor surname and year: _Jones 1996a_ and _Jones 1996b_).
 For that reason, this method should be used for references using the author-date citation system.
 
 The `type` argument of `render_all` reflects the citation system to be used. 
@@ -97,296 +98,5 @@ Liquid templates described below for rendering: it is the hash of bibliographic
 
 == Configuration
 
-=== Templates
+For the configuation YAML used in relaton-render, refer to https://relaton.org/specs/relaton-render 
 
-There is one template provided for each of the bibliographic types recognised by Relaton (`/bibitem/@type`), and a default template:
-
-Currently supported:
-
-* article 
-* book 
-* booklet 
-* manual 
-* proceedings 
-* presentation 
-* thesis 
-* techreport 
-* standard 
-* unpublished 
-* electronic resource 
-* inbook 
-* incollection 
-* inproceedings 
-* journal 
-* website
-* webresource
-* dataset
-
-Not currently supported:
-
-* map 
-* audiovisual 
-* film 
-* video 
-* broadcast 
-* software 
-* graphic_work 
-* music 
-* performance 
-* patent 
-* archival 
-* social_media 
-* alert 
-* message 
-* conversation 
-* misc (default)
-
-
-In Metanorma, not all types are used, but there are exemplars for all of these given on this site, following
-the human-readable style used in ISO 690. These can be overridden by supplying corresponding paramerers in the call
-to initialise Iso690Render.
-
-Each `template` is a string marked up with https://shopify.github.io/liquid/[Liquid Markup], with the following fields
-drawn from the bibliographic item:
-
-|===
-| Field   | Relaton XPath | Multiple | Can come from host | Note
-
-| title   | ./title | | | If multiples, prioritise language match
-| 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 | 
-| distributor | ./contributor[role/@type = 'distributor']/organization/name | | Y | 
-| authorizer | ./contributor[role/@type = 'authorizer']/organization/name \| ./contributor[role/@type = 'publisher']/organization/name | | Y | 
-| 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
-| doi | ./docidentifier[@type = 'DOI'] | Y | | No prefix supplied
-| status | ./status | | | Rendering varies by flavour
-| 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[role/@type = 'authorizer'] \| ./contributor | Y | | <<nametemplate,`nametemplate`>> applied to each name; joining template from internationalisation applied to multiple names
-| authorcite | ./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[role/@type = 'authorizer'] \| ./contributor | Y | | <<authorcitetemplate,`authorcitetemplate`>> applied to each name; joining template from internationalisation applied to multiple names
-| role | ./contributor[role/description] \| ./contributor[role/@type] | | | 
-| date | ./date[@type = 'issued'] \| ./date[@type = 'circulated'] \| ./date | | Y | Always truncated to just year
-| date_updated | ./date[@type = 'updated'] | | Y | 
-| date_accessed | ./date[@type = 'accessed'] | | Y | 
-| series | ./series[@type = 'main' or not(@type) or true] | | Y | <<seriestemplate,`seriestemplate`>> applies to series
-| host_creatornames | ./relation[@type = 'includedIn']/ bibitem/contributor[role/@type = 'author'] | |  Y | Follows options for `creatornames`
-| host_title | ./relation[@type = 'includedIn']/ bibitem/title | Y | Y | Follows options for `creatornames`
-| host_role | ./relation[@type = 'includedIn']/ bibitem/contributor[role/description] \| ./relation[@type = 'includedIn']/ bibitem/contributor[role/@type] | | Y | 
-| type | ./@type | |
-| labels | | | text to be looked up in internationalisation configuration files: "edition", "In", "At", "Vol", "Vols", "p.", "pp" 
-|===
-
-Missing dates and places of publication are rendered as "n.d." and "n.p." or the equivalent internationalisation (`no_date`, `no_place` in the internationalisation YAML files.) However, missing dates are left as nil in standards, as undated standards indicate that the citation applies to the latest version of the standard, and not that the date is unknown. Missing dates are also left as nil in webresources and websites, since they are continuously updated.
-
-Many fields are populated either by the description of the bibliographic item itself, or by the description of the item containing it (the _host_ item: `./relation[@type = 'includedIn']/bibitem`). For example, in a paper included in an edited volume, the edition will typically be given for the editor volume, rather than for the paper. Those fields are indicated by "Can come from host" in the table.
-
-The Liquid templates use the filters defined in Liquid, such as `upcase`. We have defined some custom filters:
-
-* `capitalize_first` capitalises only the first word in a string, and does not lowercase other words in the string. So "third edition" becomes "Third edition", but "3. Aufl." does not become "3. aufl."
-
-The Liquid template surrounds each field by preceding and following punctuation.
-
-* Fields are space-delimited. So `<em>{{ title }}</em> [{{medium}}]` are two separate fields.
-* If fields are not space-delimited, this is indicated by inserting `|`. So `{{ title }}|{{ medium}}` is two fields, rendered with no space separation.
-* If the field is empty, its surrounding markup is also removed. So if there is no medium, then `[{{medium}}]` is not rendered, and the brackets will be stripped.
-* Underscore is treated as space, attaching to the preceding or following field. So `,_{{ edition }}_{{ labels['edition'] }}` is treated as the one field.
-* Underscore is escaped by \. So `<span_class="std\_note">` maps to `<span class="std_note">`.
-* 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:
-
-....
-"{{ creatornames }} ({{date}}) . <em>{{ title }}</em> [{{medium}}] ,_{{ edition }}_{{ labels['edition'] }} ."
-....
-
-If a type uses another type's template, the type is mapped to the other type's name; e.g.
-
-....
-template:
-  book: ...
-  booklet:  book
-....
-
-[[nametemplate]]
-=== Name templates
-
-The `nametemplate` is a hash of Liquid templates for the formatting of contributor names in particular positions. It
-draws on the following fields drawn from the bibliographic item:
-
-|===
-| Field  | Relaton XPath | Multiple | Note
-
-| surname[0] | ./contributor[1]/person/name/surname \| ./contributor[1]/person/name/completename | | i.e. surname is the name default
-| surname[1] | ./contributor[2]/name/surname | |
-| surname[2] | ./contributor[3]/name/surname | |
-| initials[0] | ./contributor[1]/name/formatted-initials \| ./contributor[1]/name/forename/@initial | | If not supplied, the first letter of each given name is used instead
-| initials[1] | ./contributor[2]/name/initial | |
-| given[0] | ./contributor[1]/name/forename[1] | | If not supplied, initials are used instead
-| given[1] |  ./contributor[2]/name/forename[1] | |
-| middle[0] | ./contributor[1]/name/forename[not(first())] | Y |
-| middle[1] | ./contributor[2]/name/forename[not(first())] | Y |
-| nonpersonal[0] |./contributor[1]/organization/name | Y |
-| 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. 
-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`.
-
-For example:
-....
-{
-  one: "{% if nonpersonal[0] %}{{ nonpersonal[0] }}{% else %}{{ surname[0] }}, {{ given[0] }} {{ middle[0] | slice : 0 }}{% endif %}",
-  two: "{% if nonpersonal[0] %}{{ nonpersonal[0] }}{% else %}{{ surname[0] }}, {{ given[0] }} {{ middle[0] | slice : 0 }}{% endif %} &amp; {% if nonpersonal[1] %}{{ nonpersonal[1] }}{% else %}{{ given[1] }} {{ middle[1] | slice : 0 }} {{ surname[1] }}{% endif %}",
-  more: "{% if nonpersonal[0] %}{{ nonpersonal[0] }}{% else %}{{ surname[0] }}, {{ given[0] }} {{ middle[0] | slice : 0 }}{% endif %}, {% if nonpersonal[1] %}{{ nonpersonal[1] }}{% else %}{{ given[1] }} {{ middle[1] | slice : 0 }} {{ surname[1] }}{% endif %} &amp; {% if nonpersonal[2] %}{{ nonpersonal[2] }}{% else %}{{ given[2] }} {{ middle[2] | slice : 0 }} {{ surname[2] }}{% endif %}",
-  etal: "{% if nonpersonal[0] %}{{ nonpersonal[0] }}{% else %}{{ surname[0] }}, {{ given[0] }} {{ middle[0] | slice : 0 }}{% endif %}, {% if nonpersonal[1] %}{{ nonpersonal[1] }}{% else %}{{ given[1] }} {{ middle[1] | slice : 0 }} {{ surname[1] }}{% endif %} <em>et al.</em>",
-  etal_count: 6
-}
-....
-
-In the case of `more`, the `(name)[1]` entries are repeated for all additional authors above 2 and before the final author.
-
-The behaviour of _et al._ can be specified as follows:
-
-* `etal_count`: the number of authors to trigger _et al._ in bibliographic rendering
-* `etal_display`: how many authors to show if using _et al._ in bibliography (by default, same as `etal_count`)
-
-So the Chicago Manual of Style behaviour:
-
-____
-For more than ten authors (not shown here), list the first seven in the reference list, followed by et al.
-____
-
-is realised with etal_count = 10, etal_display = 7
-
-[[authorcitetemplate]]
-=== Author citation templates
-
-The `authorcitetemplate` is a subclass of the name template, configured for rendering author names for author-date citations.
-That means that it typically selects only surnames for rendering.
-
-
-The behaviour of _et al._ in author-date citations can be specified as follows:
-
-* `etal_count`: the number of authors to trigger _et al._ in bibliographic rendering
-* `etal_display`: how many authors to show if using _et al._ in bibliography (by default, same as `etal_count`)
-
-[[seriestemplate]]
-=== Series template
-
-The `seriestemplate` is a template for the rendering of series information. It draws on the following fields drawn from the bibliographic item:
-
-|===
-| Field  | Relaton XPath | Multiple | Can come from host | Note
-
-| series_title  | ./series[@type = 'main' or not(@type) or true]/name | | Y |
-| series_abbr  | ./series[@type = 'main' or not(@type) or true]/abbreviation | | Y |
-| series_num  | ./series[@type = 'main' or not(@type) or true]/number | | Y |
-| series_partnumber  | ./series[@type = 'main' or not(@type) or true]/partnumber | | Y |
-| series_run  | ./series[@type = 'main' or not(@type) or true]/run | | Y |
-| series_place  | ./series[@type = 'main' or not(@type) or true]/place | | Y |
-| series_organization  | ./series[@type = 'main' or not(@type) or true]/organization | | Y |
-| series_dates  | ./series[@type = 'main' or not(@type) or true]/from, ./series[@type = 'main' or not(@type) or true]/to | | Y |
-|===
-
-For example: `{% if series_abbr %}{{series_abbr}}{% else %}{{series_title}}{% endif %} ,_({{series_run}}) {{series_num}}|({{series_partnumber}})`
-
-=== Journal template
-
-The `journaltemplate` is a template for the rendering of series information, when they relate to articles in a journal. The template is distinct because of longstanding practice of rendering journal information differently from monograph series information. The template draws on the same fields as the `seriestemplate`, but because the journal title is typically italicised and the numeration is not, any italicisation needs to occur within the template.
-
-For example, the recommended practice in the current edition of ISO 690 is to give explicit volume labels:
-
-`<em>{% if series_abbr %}{{series_abbr}}{% else %}{{series_title}}{% endif %}</em> {{ labels['volume'] }}_{{series_num}} {{ labels['part'] }}_{{series_partnumber}}`
-
-A common template that drops those labels is:
-
-`<em>{% if series_abbr %}{{series_abbr}}{% else %}{{series_title}}{% endif %}</em> {{series_num}}|({{series_partnumber}})`
-
-=== Extent template
-
-The extent of a bibliographic item may be expressed differently depending on the type of bibliographic item. For example, the extent of a book chapter may be expressed as _pp. 9–20_, while the extent of an article may be expressed as just _9–20_. 
-
-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 `volume`, `issue` (within volume; "number" for journals), and `page`. Locality types are the fields used in the Liquid templates; for example:
-
-....
-{
-  article: "{{ volume_raw }}|({{ issue_raw }}) : {{ page_raw }}"
-  misc: "{{ volume }}, {{ page }}"
-}
-....
-
-The internationalisation files define a singular and a plural version of the locality types, under `labels['extent']`.
-
-* 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, issue/number, or page, without accompanying labels, is given in `volume_raw`, `issue_raw`, and `page_raw`.
-
-=== Size template
-
-The size of a bibliographic item is distinct from the extent: the size is how large the item is (e.g. how many pages are in the book), whereas the extent is how much of the host item the item covers (e.g. which pages of the book are in the current chapter.) They can be displayed quite differently from extent; for example, while extent pages is given in English as _pp. 9–20_ or _p. 3_, size pages is given as _3 pp._.
-
-To capture this, a separate template is supplied under `sizetemplate` for each bibliographic item type. Again, 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 following are currently recognised:
-
-|===
-| Field  | Relaton XPath | Note
-
-| 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
-| duration  | ./medium/size[@type = 'time'] | Expressed in ISO 8601 duration
-|===
-
-
-Locality types are the fields used in the Liquid templates; for example:
-
-....
-{
-  dataset: "{{ data }}"
-  misc: "{{ volume }}, {{ page }}, {{ data }}, {{ duration }}"
-}
-....
-
-The internationalisation files define a singular and a plural version of the locality types, under `labels['size']`.
-
-* The plural label is always used if the extent is a range (with a `<from>` and `<to>`).
-* The label is singular only if the value is `1`, else it is plural (_1 p._, _2 pp._)
-* Again, the internationalisation files include a slot where the number or number range is inserted, since this varies by language. 
-* The number of volumes or pages, without accompanying labels, is given in `volume_raw` and `page_raw`.
-* Multiple spans of the same type are joined by `+`; e.g. _xlii + 76 pp._.
-
-=== Other
-
-In addition, the configuration includes different configuration options for rendering:
-
-The internationalisation file sets the following variables, which can be overridden in configuration parameters:
-`edition_number`:: has following values corresponding to the rule-based number rules defined in https://github.com/twitter/twitter-cldr-rb[Twitter CLDR]. 
-for a language. For example, English _4th_ is defined as `["OrdinalRules", "digits-ordinal"]`, because under twitter-cldr, `4th` is generated as `4.localize(:en).to_rbnf_s("OrdinalRules", "digits-ordinal")`. If missing, the raw number is given.
-`edition`:: is the localised expression for edition, with the edition number given as %. So _4th ed.` is generated with `edition` as `% ed.`.
-`date`:: date format default, taken from https://github.com/twitter/twitter-cldr-rb[Twitter CLDR]: `to_full_s`, `to_long_s`, `to_medium_s`, `to_short_s`, or one of the `to_additional_s` formats. One value is given for each of "month_year", "day_month_year", and "date_time"; e.g. `{ month_year: to_long_s, day_month_year: to_long_s, date_time: to_long_s }`.

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

@@ -1,14 +1,39 @@
 require_relative "../utils/utils"
 require_relative "liquid"
+require "singleton"
 
 module Relaton
   module Render
     module Template
+      class CacheManager
+        include Singleton
+
+        attr_accessor :mutex
+
+        def initialize
+          @cache = {}
+          @mutex = Mutex.new
+        end
+
+        def store(key, value)
+          @cache[key] = value
+        end
+
+        def retrieve(key)
+          @cache[key]
+        end
+
+        def clear
+          @cache.clear
+        end
+      end
+
       class General
         attr_reader :template_raw
 
         def initialize(opt = {})
           @htmlentities = HTMLEntities.new
+          @templatecache = CacheManager.instance
           customise_liquid
           parse_options(opt)
         end
@@ -52,7 +77,15 @@ module Relaton
 
         def template_process(template)
           template.is_a?(String) or return template
-          ::Liquid::Template.parse(add_field_delim_to_template(template))
+          t = nil
+          @templatecache.mutex.synchronize do
+            unless t = @templatecache.retrieve(template)
+              t = ::Liquid::Template
+                .parse(add_field_delim_to_template(template))
+              @templatecache.store(template, t)
+            end
+          end
+          t
         end
 
         def add_field_delim_to_template(template)

data/lib/relaton/render/version.rb

@@ -1,5 +1,5 @@
 module Relaton
   module Render
-    VERSION = "0.7.9".freeze
+    VERSION = "0.7.10".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-render
 version: !ruby/object:Gem::Version
-  version: 0.7.9
+  version: 0.7.10
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-09-30 00:00:00.000000000 Z
+date: 2024-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler