relaton-render 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9dc54a7ee2aedd554302d6a94f83fd8106ad7f28c717f37ce2785e99d4be1449
-  data.tar.gz: 25512713fefa6342d0c3fd94f9373f88dbb20914fa606ed280ad43dd47aef3e5
+  metadata.gz: a19104c38ea80010334bb8a9b010149f61bc0293cdda062595d77202e21fd2d3
+  data.tar.gz: 9e087b89f7eb6aef7a07d22264a08d8ffd1ac9310a790c1cbd30fbc59df8727e
 SHA512:
-  metadata.gz: 7fb3f5f4b135576fe9910eabab634c327a4b7d62c243765fce5c64b36d23faa78a2944c394ba8903ac3959e8e7dc0f9cfcb6b7a8f6e636721b2024d2ffc394fa
-  data.tar.gz: 106ee2f8482617321ec2563db446afdf1fe00c66640f7829218a86e01727cab6952a0d36e1a61e38c32b161f2976624b948685d9b74bd703a6b683a0b7d1d173
+  metadata.gz: 5debe31c38c1d10ede1806b5915fa47408715f51f318afe95d45f0b2ae6c2b24d6eec99d160dbfcb0efeb3490c663f42fdb6b52da347b5644975b55e22b63e9f
+  data.tar.gz: f05613f9b3081a153287550cb4f774f81276c8c424ec6b25842843a22826f248bfc8060493afb3b6d0b355721a1a50489bb1e36bc02ee68a6f43a6db3853c237

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

@@ -29,8 +29,8 @@ stage:
   withdrawn: 取り消されました
 extent:
   page:
-    sg: "p. %"
-    pl: "pp. %"
+    sg: "%頁"
+    pl: "%頁"
   volume:
     sg: "巻%"
     pl: "巻%"
@@ -39,8 +39,8 @@ extent:
     pl: "いいえ%"
 size:
   page:
-    sg: "% p."
-    pl: "% pp."
+    sg: "%頁"
+    pl: "%頁"
   volume:
     sg: "巻%"
     pl: "巻%"

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

@@ -206,7 +206,8 @@ module Relaton
 
       def uriformat(uri)
         uri.nil? || uri.empty? and return nil
-        "<link target='#{uri}'>#{uri}</link>"
+        # do not process uri contents in l10n
+        "<link target='#{uri}'><esc>#{uri}</esc></link>"
       end
 
       private

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

@@ -77,7 +77,7 @@ module Relaton
       def generic_citation(ret)
         ret.each_with_object({}) do |b, m|
           m[b[:id]] = { data_liquid: b[:data_liquid], type: b[:type],
-                        citation: b[:data_liquid][:docidentifier] }
+                        citation: @i18n.l10n(b[:data_liquid][:docidentifier]) }
         end
       end
 
@@ -126,8 +126,8 @@ module Relaton
         ret.each_with_object({}) do |(_k, v), m|
           v.each_value do |v1|
             v1.each do |b|
-              m[b[:id]] = { author: b[:author], date: b[:date],
-                            citation: "#{b[:author]} #{b[:date]}",
+              m[b[:id]] = { author: @i18n.l10n(b[:author]), date: b[:date],
+                            citation: @i18n.l10n("#{b[:author]} #{b[:date]}"),
                             data_liquid: b[:data_liquid], type: b[:type] }
             end
           end

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

@@ -112,6 +112,7 @@ module Relaton
       end
 
       def render(bib, embedded: false)
+        require "debug"; binding.b
         bib = xml2relaton(bib)
         f = bib.formattedref and
           return embedded ? f.content : fmtref(f.content)
@@ -139,11 +140,17 @@ module Relaton
         ret
       end
 
+      # <esc> in field can get capitalised in filters
+      def esc_cleanup(text)
+        text.gsub(/<esc>/i, "<esc>").gsub(/<\/esc>/i, "</esc>")
+      end
+
       def render1(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(out.join(". ").gsub(".. ", ". "))
+        @i18n.l10n(esc_cleanup(out.join(". ")).gsub(".</esc>.", ".</esc>")
+          .gsub(".. ", ". "))
       end
 
       def render_single_bibitem(doc)
@@ -152,7 +159,7 @@ module Relaton
       end
 
       def liquid(data_liquid, renderer)
-        valid_parse(@i18n.l10n(renderer.render(data_liquid)))
+        valid_parse(renderer.render(data_liquid))
       end
 
       def parse(doc)
@@ -201,7 +208,7 @@ module Relaton
       end
 
       # add to liquid data based on template
-      def enhance_data(data, template)
+      def enhance_data(_data, template)
         template.is_a?(String) or return
         # add_date_accessed(data, template)
       end

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

@@ -17,7 +17,7 @@ module Relaton
       def extract_personname(person)
         surname = person.name.surname || person.name.completename
         given, middle, initials = given_and_middle_name(person)
-        { surname: content(surname),
+        { surname: wrap_in_esc(content(surname)),
           given: given,
           middle: middle,
           initials: initials }
@@ -28,7 +28,16 @@ module Relaton
         initials = extract_initials(person)
         forenames.empty? and initials.empty? and return [nil, nil, nil]
         initials.empty? and initials = initials_from_forenames(forenames)
-        [forenames.first, forenames[1..-1], Array(initials)]
+        [forenames.first, forenames[1..-1],
+         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)
@@ -41,7 +50,7 @@ module Relaton
 
       def forenames_parse(person)
         person.name.forename.map do |x|
-          x.content.empty? ? "#{x.initial}." : content(x)
+          x.content.empty? ? "<esc>#{x.initial}.</esc>" : content(x)
         end
       end
 

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

@@ -79,7 +79,7 @@ module Relaton
       end
 
       def series_num(series, _doc)
-        series.number
+        series.number&.strip
       end
 
       def series_partnumber(series, _doc)

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

@@ -48,7 +48,8 @@ module Relaton
           out = authoritative_identifier_select(a)
           out.empty? or break
         end
-        out.map(&:id)
+        # prevent l10n of identifier contents
+        out.map(&:id).map { |i| "<esc>#{i.strip}</esc>" }
       end
 
       def authoritative_identifier_select(idents)
@@ -71,7 +72,7 @@ module Relaton
         doc.docidentifier.each_with_object([]) do |id, ret|
           type = id_type_norm(id)
           other_identifier_include.include? type or next
-          ret << @i18n.l10n("#{type}: #{id.id}")
+          ret << @i18n.l10n("#{type}: <esc>#{id.id}</esc>")
         end
       end
 
@@ -85,7 +86,7 @@ module Relaton
           type.casecmp("doi").zero? or next
           ret << id.id
         end
-        out.empty? ? nil : out
+        out.empty? ? nil : out.map { |i| "<esc>#{i.strip}</esc>" }
       end
 
       def id_type_norm(id)

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

@@ -97,8 +97,8 @@ module Relaton
             end
             a.join
           end.join.tr("\t", " ")
-          t.gsub(/\}\}#{FIELD_DELIM}\|/o, "}}#{FIELD_DELIM}\t")
-            .gsub(/\|#{FIELD_DELIM}\{\{/o, "\t#{FIELD_DELIM}{{")
+          t.gsub(/\}\}#{FIELD_DELIM}\|/o, "}}#{FIELD_DELIM}#{NON_SPACING_DELIM}")
+            .gsub(/\|#{FIELD_DELIM}\{\{/o, "#{NON_SPACING_DELIM}#{FIELD_DELIM}{{")
         end
 
         def render(hash)
@@ -124,8 +124,11 @@ module Relaton
         def template_clean1(str)
           str.gsub(/\S*#{FIELD_DELIM}#{FIELD_DELIM}\S*/o, "")
             .gsub(/#{FIELD_DELIM}/o, "")
+            .gsub(/([,:;]\s*)+<\/esc>([,:;])(\s|_|$)/, "\\2</esc>\\3")
             .gsub(/([,:;]\s*)+([,:;](\s|_|$))/, "\\2")
+            .gsub(/([,.:;]\s*)+<\/esc>([.])(\s|_|$)/, "\\2</esc>\\3")
             .gsub(/([,.:;]\s*)+([.](\s|_|$))/, "\\2")
+            .gsub(/([,:;]\s*)+<\/esc>(,)(\s|_|$)/, "\\2</esc>\\3")
             .gsub(/([,:;]\s*)+(,(\s|_|$))/, "\\2")
             .gsub(/(:\s+)(&\s)/, "\\2")
             .gsub(/\s+([,.:;)])/, "\\1")
@@ -133,7 +136,9 @@ module Relaton
             .sub(/[,:;]\s*$/, "")
             .gsub(/(?<!\\)_/, " ")
             .gsub("\\_", "_")
-            .gsub(/#{NON_SPACING_DELIM}/o, "").gsub(/\s+/, " ")
+            .gsub(/#{NON_SPACING_DELIM}/o, "")
+            .gsub(/\s+/, " ")
+            .gsub(/<(\/)?esc>/i, "<\\1esc>")
         end
 
         # need non-breaking spaces in fields: "Updated:_nil" ---

data/lib/relaton/render/version.rb

@@ -1,5 +1,5 @@
 module Relaton
   module Render
-    VERSION = "0.10.0".freeze
+    VERSION = "0.10.1".freeze
   end
 end

data/relaton-render.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
+  spec.add_development_dependency "isodoc"
   spec.add_development_dependency "rake", ">= 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "simplecov"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-render
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-09-29 00:00:00.000000000 Z
+date: 2025-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: isodoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement