fix(packages): Parse and split all name fields

Closes sile-typesetter#2052
Omikhleia · Jun 15, 2024 · badb103 · badb103
1 parent 9d00c49
commit badb103
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/packages/bibtex/bibliography.lua b/packages/bibtex/bibliography.lua
@@ -119,10 +119,14 @@ Bibliography = {
       transEditor = function (item)
          local r = {}
          if item.editor then
-            r[#r + 1] = fluent:get_message("bibliography-edited-by")({ name = item.editor })
+            r[#r + 1] = fluent:get_message("bibliography-edited-by")({
+               name = Bibliography.Style.firstLastNames(item.editor),
+            })
          end
          if item.translator then
-            r[#r + 1] = fluent:get_message("bibliography-translated-by")({ name = item.translator })
+            r[#r + 1] = fluent:get_message("bibliography-translated-by")({
+               name = Bibliography.Style.firstLastNames(item.translator),
+            })
          end
          if #r then
             return table.concat(r, ", ")
@@ -162,6 +166,19 @@ Bibliography = {
          end
       end,
 
+      firstLastNames = function (field)
+         local namelist = field or {}
+         if #namelist == 0 then
+            return ""
+         end
+         local names = {}
+         for i = 1, #namelist do
+            local author = namelist[i]
+            names[i] = author.ff .. " " .. author.ll
+         end
+         return Bibliography.Style.commafy(names)
+      end,
+
       commafy = function (t, andword) -- also stolen from nbibtex
          andword = andword or fluent:get_message("bibliography-and")
          if #t == 1 then

diff --git a/packages/bibtex/init.lua b/packages/bibtex/init.lua
@@ -92,8 +92,12 @@ local function consolidateEntry (entry, label)
       end
    end
    -- Names field split and parsed
-   for _, field in ipairs({"author", }) do
+   for _, field in ipairs({ "author", "editor", "translator", "shortauthor", "shorteditor", "holder" }) do
       if consolidated[field] then
+         -- FIXME Check our corporate names behave, we are probably bad currently
+         -- with nested braces !!!
+         -- See biblatex manual v3.20 §2.3.3 Name Lists
+         -- e.g. editor = {{National Aeronautics and Space Administration} and Doe, John}
          local names = namesplit(consolidated[field])
          for i = 1, #names do
             names[i] = parse_name(names[i])