relaton-render 3.0.0.pre.alpha.43 → 3.0.0.pre.alpha.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc9353e7957ae86c466052968a77f3175a2ed765e6433f7e7d255ef8036614e2
-  data.tar.gz: a35cb0ee37e731243be02beadc676de056d3b6e91e9f0dc6e9856c151373dbea
+  metadata.gz: aedee88b2cbb112fe10bea8cb0a653126eaa9b9fb4cca2acecea9ab0c658836c
+  data.tar.gz: 97d83f937135ae571bbd36aa4a35f1d17421a79b61aafee1690d69181bbd05ee
 SHA512:
-  metadata.gz: a21521192e248bc508c0256d07c52d59d7cfbc911b82c43073dc99276a62031d4d4f7381eb7e435373850ab665ceee7f93b7c04ad9ee1572e37d9e996a0bc85e
-  data.tar.gz: 3edca91d8e0c43c547e3e7d8b8007d47df15278e9d0f4a1baee6e4e7e02be52fdbcb86d9400570d7b41d45a5d99af3c6fccc86d722455d975c3673d46b1e19d1
+  metadata.gz: 8ed88ac9dbb5d27550fe956c9db969a052609d725e5f6eaa02e158ca65ee1937c083146dbaf5ed8223f830b5b619c36c81afbe04a8da8587755c394690787468
+  data.tar.gz: 92aa233a10f6e3479f971a373a7d1786215d5552368f19bd982d1dfde7d63c23d0b5b11aeee183652d48f86e00d13b9a163556c4bcf83453b315e07041b53390

data/lib/relaton/render/iso690/csl_import.rb

@@ -0,0 +1,129 @@
+require "json"
+
+module Relaton
+  module Render
+    module Iso690
+      # Imports a CSL style's common properties into a CitationStyle instance
+      # (styles as data, the downgrade direction: CSL's element-list engine
+      # is strictly richer, so the import covers what the instance format can
+      # express and lists everything it dropped in `requires`).
+      #
+      # Mapped: the info title, the citation/reference variable runs (text
+      # elements over the CSL variables, via the crosswalk below), the
+      # name-form scalars (initialize-with, name-as-sort-order, et-al
+      # lengths), the year-suffix disambiguation, and the delimiters.
+      module CslImport
+        # CSL variable -> the ISO 690 slot the engine resolves.
+        VARIABLE_SLOTS = {
+          "author" => "creator", "editor" => "creator",
+          "title" => "title", "container-title" => "series",
+          "edition" => "edition", "publisher" => "production",
+          "publisher-place" => "location", "issued" => "date",
+          "DOI" => "identifier", "URL" => "identifier", "PMID" => "identifier",
+          "number" => "numeration", "volume" => "numeration",
+          "page" => "numeration", "medium" => "medium",
+          "accessed" => "access", "version" => "edition",
+        }.freeze
+
+        # CSL features the import drops, reported in `requires` so a resolver
+        # fails loudly instead of silently mis-rendering.
+        DROPPED_FEATURES = [
+          "csl macros (macro elements are not data-expressible)",
+          "csl groups with conditional rendering (match= attributes)",
+          "csl per-locator templates",
+        ].freeze
+
+        class << self
+          # Build a CitationStyle instance from a parsed CSL style JSON.
+          #
+          # @param csl [Hash] parsed CSL style
+          # @return [Style]
+          def style(csl)
+            Style.new(
+              name: style_name(csl),
+              family: "iso690",
+              requires: dropped_features(csl),
+              scheme: scheme(csl),
+              templates: templates(csl),
+            )
+          end
+
+          # Parse a CSL style JSON string and build the instance.
+          #
+          # @param [String] json
+          # @return [Style]
+          def from_json(json)
+            style(JSON.parse(json))
+          end
+
+          private
+
+          def style_name(csl)
+            title = csl.dig("info", "title").to_s
+            title.empty? ? "Imported CSL style" : "#{title} (CSL import)"
+          end
+
+          def dropped_features(csl)
+            feats = DROPPED_FEATURES.dup
+            feats << "csl bibliography section" if csl["bibliography"]
+            feats << "csl locales" if csl["locales"]
+            feats
+          end
+
+          def scheme(csl)
+            Style::Scheme.new(
+              system: "name-date",
+              name_form: name_form(csl),
+              locale: Style::Locale.new(no_date: "n.d."),
+            )
+          end
+
+          def name_form(csl)
+            citation = csl["citation"] || {}
+            initialize_with = citation["initialize-with"]
+            Style::NameForm.new(
+              initials: !initialize_with.nil?,
+              initials_separator: initialize_with.is_a?(String) ? initialize_with : " ",
+              initials_period: initialize_with.to_s.include?("."),
+              inverted_all: citation["name-as-sort-order"].to_s == "all",
+            )
+          end
+
+          def templates(csl)
+            citation_elements = csl.dig("citation", "elements") || []
+            reference_elements = csl.dig("bibliography", "elements") || []
+            Style::TemplateMap.new(
+              citation: element_template(
+                citation_elements, csl.dig("citation", "delimiter") || ", ",
+                "{{creator}}, {{date}}{{disambiguator}}",
+              ),
+              reference: element_template(
+                reference_elements, csl.dig("bibliography", "delimiter") || ". ",
+                "{{creator}}. {{title}}. {{edition}}. {{series}}. {{production}}, {{date}}. {{identifier}}. {{location}}.",
+              ),
+              name: "{{surname}}, {{givenNames}}",
+            )
+          end
+
+          # Flatten CSL text/variable elements into a slot template. Non-text
+          # elements (macros, groups, conditions) contribute nothing: the
+          # import covers flat variable runs only.
+          def element_template(elements, delimiter, fallback)
+            slots = elements.filter_map do |el|
+              next unless el.is_a?(Hash)
+
+              # A CSL text element nests its variable: {"text": {"variable": ...}}
+              variable = el.dig("text", "variable") || el["variable"]
+              slot = variable && VARIABLE_SLOTS[variable]
+              "{{#{slot}}}" if slot
+            end
+            slots = slots.uniq
+            return fallback if slots.empty?
+
+            slots.join(delimiter)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/relaton/render/iso690/elements/creator.rb

@@ -95,7 +95,7 @@ module Relaton
             return in_text_etal if in_text_etal?
 
             name = creators.first ? in_text_name(creators.first) : ""
-            etal? ? "#{name} <em>et al.</em>" : name
+            etal? ? "#{name}#{etal_suffix}" : name
           end
 
           # The in-text cite truncates at its own threshold: at
@@ -104,7 +104,16 @@ module Relaton
           def in_text_etal
             names = creators.first(name_form.in_text_etal_display)
               .map { |c| in_text_name(c) }
-            "#{join(names)} <em>et al.</em>"
+            "#{join(names)}#{etal_suffix}"
+          end
+
+          # The et-al suffix is the locale's label (roman by default; a
+          # pack's `others` label may carry its own presentation), joined
+          # per the style's list style — the serial comma before it is the
+          # MLA form ("Fielding, Roy, et al.")
+          def etal_suffix
+            sep = name_form.list_style == "serial" ? "," : ""
+            "#{sep} #{@i18n.label('others')}"
           end
 
           # The in-text cite names by surname alone (the 1.x
@@ -190,7 +199,7 @@ module Relaton
             creators.first(display).each_with_index
               .map do |contributor, index|
               format(contributor, first: index.zero?)
-            end.join(", ") + " <em>et al.</em>"
+            end.join(", ") + etal_suffix
           end
 
           def format(contributor, first:)

data/lib/relaton/render/iso690/elements/edition.rb

@@ -54,10 +54,13 @@ module Relaton
           private
 
           # Worded editions are document editions; online resources
-          # carry numbered builds rendered as versions
+          # carry numbered builds rendered as versions. A standard is a
+          # document edition too (its report kind carries the clause 8.11
+          # fallback templates, but its numbered editions read as
+          # "Nth edition" — the TS contract renders them so).
           def word_edition?
             number.positive? &&
-              %w[monograph component_part serial_part]
+              %w[monograph component_part serial_part report]
                 .include?(item_kind)
           end
 

data/lib/relaton/render/iso690/i18n/en.yml

@@ -41,6 +41,7 @@ labels:
   in: "In:"
   and: "and"
   oxford_comma: ","
+  others: "et al."
   ed: "ed."
   eds: "eds."
   date_range: "–"

data/lib/relaton/render/iso690/styles/apa.yml

@@ -15,13 +15,13 @@ scheme:
     givenNameFirst: false
     editorsMarked: false
     surnameUpcase: false
+    orgUpcase: false
     subsequentSurnameUpcase: false
   locale:
     "in": "In"
     labels:
       "and": "&"
       oxford_comma: ","
-      oxford_comma: ","
 templates:
   titleOpen: ""
   titleClose: ""
@@ -34,7 +34,7 @@ perType:
     home: true
     template: "{{title}}"
   - type: report
-    template: "{{identifier}}. {{title}}. {{production}}."
+    template: "{{identifier}}. ({{date}}). {{title}}. {{production}}."
   - type: monograph
     title: "<em>{{title}}</em>"
     template: "{{creator}} ({{date}}). {{title}}. {{production}}."

data/lib/relaton/render/iso690/styles/chicago.yml

@@ -18,7 +18,8 @@ scheme:
     editorsMarked: true
     loneEditorMarked: true
     surnameUpcase: false
-    subsequentSurnameUpcase: false
+    subsequentSurnameUpcase: true
+    orgUpcase: false
   locale:
     "in": "in"
     labels:

data/lib/relaton/render/iso690/styles/mla.yml

@@ -0,0 +1,56 @@
+# MLA Handbook (9th ed.), Works Cited forms: every author after the
+# first renders in natural order ("Dorris, Michael, and Louise
+# Erdrich"), three or more collapse to "et al."; self-contained titles
+# are italic and container/part titles take quotation marks; the date
+# closes the entry before the extent. The in-text citation carries the
+# author alone - MLA has no date in the parenthesis.
+name: "MLA (9th edition) Works Cited"
+family: mla
+requires:
+  - extent_units
+scheme:
+  system: name-date
+  nameForm:
+    initials: false
+    initialsSeparator: " "
+    initialsPeriod: true
+    invertedAll: false
+    givenNameFirst: false
+    editorsMarked: true
+    surnameUpcase: false
+    subsequentSurnameUpcase: false
+    orgUpcase: false
+    listStyle: serial
+    etalCount: 3
+    etalDisplay: 1
+  locale:
+    "in": "in"
+    labels:
+      "and": "and"
+      oxford_comma: ","
+      others: "et al."
+templates:
+  titleOpen: "\""
+  titleClose: "\""
+  citation: "{{surname}}"
+  reference: "{{creator}}. {{title}}. {{edition}}. {{series}}. {{production}}, {{date}}. {{extent}}."
+  name: "{{surname}}, {{givenNames}}"
+  identifierMode: all
+perType:
+  - type: report
+    title: "<em>{{title}}</em>"
+    template: "{{creator}}. {{title}}. {{edition}}. {{production}}, {{date}}."
+  - type: monograph
+    title: "<em>{{title}}</em>"
+    template: "{{creator}}. {{title}}. {{edition}}. {{production}}, {{date}}. {{extent}}."
+  - type: component_part
+    title: "\"{{title}}\""
+    componentpart: "<em>{{componentpart}}</em>"
+    template: "{{creator}}. {{title}}. {{componentpart}}, {{production}}, {{date}}. {{extent}}."
+  - type: continuing
+    title: "\"{{title}}\""
+    series: "<em>{{seriestitle}}</em>"
+    template: "{{creator}}. {{title}}. {{series}}, {{date}}. {{extent}}."
+sortKey:
+  - attribute: creator
+  - attribute: date

data/lib/relaton/render/iso690.rb

@@ -21,6 +21,7 @@ module Relaton
       autoload :Renderer, "relaton/render/iso690/renderer"
         autoload :Rules, "relaton/render/iso690/rules"
       autoload :Style, "relaton/render/iso690/style"
+      autoload :CslImport, "relaton/render/iso690/csl_import"
       autoload :Template, "relaton/render/iso690/template"
     end
   end

data/lib/relaton/render/version.rb

@@ -1,5 +1,5 @@
 module Relaton
   module Render
-    VERSION = "3.0.0.pre.alpha.43".freeze
+    VERSION = "3.0.0.pre.alpha.44".freeze
   end
 end

data/lib/relaton/render.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+# The gem's require entry: the public rendering surface — General (the
+# localized multi-renderer front) and the ISO 690 engine with its
+# CitationStyle loader. Styles are data (lib/relaton/render/iso690/styles);
+# the engine holds none.
+require_relative "render/version"
+require_relative "render/general"
+require_relative "render/iso690"

data/relaton-render.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "htmlentities"
   spec.add_development_dependency "relaton-bib"
   spec.add_dependency "liquid", "~> 5"
-  spec.add_dependency "lutaml-model"
+  spec.add_dependency "lutaml-model", "~> 0.8"
   spec.add_dependency "nokogiri"
   spec.add_dependency "twitter_cldr"
   # spec.metadata["rubygems_mfa_required"] = "true"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-render
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre.alpha.43
+  version: 3.0.0.pre.alpha.44
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-10-10 00:00:00.000000000 Z
+date: 2026-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -56,16 +56,16 @@ dependencies:
   name: lutaml-model
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -115,8 +115,10 @@ files:
 - bin/setup
 - docs/citation-style-pack.adoc
 - lib/relaton-render.rb
+- lib/relaton/render.rb
 - lib/relaton/render/general.rb
 - lib/relaton/render/iso690.rb
+- lib/relaton/render/iso690/csl_import.rb
 - lib/relaton/render/iso690/element.rb
 - lib/relaton/render/iso690/elements.rb
 - lib/relaton/render/iso690/elements/access.rb
@@ -165,6 +167,7 @@ files:
 - lib/relaton/render/iso690/styles/jis-en.yml
 - lib/relaton/render/iso690/styles/jis-ja.yml
 - lib/relaton/render/iso690/styles/lncs.yml
+- lib/relaton/render/iso690/styles/mla.yml
 - lib/relaton/render/iso690/template.rb
 - lib/relaton/render/version.rb
 - relaton-render.gemspec