Output chapter authors for single file output

dragonstyle · dragonstyle · commit 4471ea29d135 · 2022-06-06T12:28:52.000-04:00
diff --git a/src/project/types/book/book-render.ts b/src/project/types/book/book-render.ts
@@ -85,6 +85,7 @@ import {
 import { pathWithForwardSlashes } from "../../../core/path.ts";
 import { kDateFormat } from "../website/listing/website-listing-template.ts";
 import { removePandocTo } from "../../../command/render/flags.ts";
+import { resourcePath } from "../../../core/resources.ts";
 
 export function bookPandocRenderer(
   options: RenderOptions,
@@ -349,13 +350,21 @@ async function mergeExecutedFiles(
           const partitioned = partitionYamlFrontMatter(
             file.executeResult.markdown,
           );
-          const yaml = partitioned?.yaml
-            ? readYamlFromMarkdown(partitioned?.yaml)
-            : undefined;
-          const frontTitle = frontMatterTitle(yaml);
-          const titleMarkdown = frontTitle ? `# ${frontTitle}\n\n` : "";
 
-          itemMarkdown = bookItemMetadata(project, item, file) + titleMarkdown +
+          const titleBlockPath = resourcePath(
+            "projects/book/pandoc/title-block.md",
+          );
+          const titleAttr = `template='${titleBlockPath}'`;
+
+          const titleBlockMd = partitioned?.yaml
+            ? "```````{.quarto-title-block " + titleAttr + "}\n" +
+              partitioned?.yaml +
+              "\n```````"
+            : "";
+
+          console.log(titleBlockMd);
+
+          itemMarkdown = bookItemMetadata(project, item, file) + titleBlockMd +
             (partitioned?.markdown || file.executeResult.markdown);
         } else {
           throw new Error(
diff --git a/src/resources/filters/authors/authors.lua b/src/resources/filters/authors/authors.lua
@@ -15,7 +15,7 @@ function import(script)
   local path = PANDOC_SCRIPT_FILE:match("(.*[/\\])")
   dofile(path .. script)
 end
-import("meta.lua")
+
 import("../common/pandoc.lua")
 import("../common/string.lua")
 import("../common/table.lua")
@@ -25,10 +25,14 @@ import("../common/base64.lua")
 import("../common/meta.lua")
 import("../common/debug.lua")
 import("../common/params.lua")
+import("../common/authors.lua")
 -- [/import]
 
 initParams()
 
 return {
-  authorsMeta()
+  Meta = function(meta)
+    return processAuthorMeta(meta)
+  end
 }
+
diff --git a/src/resources/filters/common/authors.lua b/src/resources/filters/common/authors.lua
@@ -140,99 +140,96 @@ local kAffiliationAliasedFields = {
 -- a simple incremental counter that can be used for things like note numbers
 local kNumber = "number"
 
--- Normalizes author metadata from the 'input' field into 
--- consistently structured metadata in the 'output' field
-function authorsMeta()
-  return {
-    Meta = function(meta)
-      if not _quarto.format.isHtmlOutput() and not _quarto.format.isLatexOutput() and not _quarto.format.isIpynbOutput() then
-        return
-      end
+function processAuthorMeta(meta, authorInput)
+  if not _quarto.format.isHtmlOutput() and not _quarto.format.isLatexOutput() and not _quarto.format.isIpynbOutput() then
+    return
+  end
 
-      local authorsRaw = meta[kAuthorInput]
-      
-      -- the normalized authors
-      local authors = {}
-
-      -- the normalized affilations
-      local affiliations = {}
-
-      if authorsRaw then
-        for i,v in ipairs(authorsRaw) do
-
-          local authorAndAffiliations = processAuthor(v)
-          
-          -- initialize the author
-          local author = authorAndAffiliations.author
-          local authorAffils = authorAndAffiliations.affiliations
-
-          -- assign an id to this author if one isn't defined
-          local authorNumber = #authors + 1
-          if author[kId] == nil then
-            author[kId] = authorNumber
-          end        
-
-          -- go through the affilations and add any to the list
-          -- assigning an id if needed
-          if authorAffils ~= nil then
-            for i,v in ipairs(authorAffils) do
-              local affiliation = maybeAddAffiliation(v, affiliations)
-              setAffiliation(author, { ref=affiliation[kId] })
-            end
-          end
+  if authorInput == nil then
+    authorInput = kAuthorInput
+  end
+  local authorsRaw = meta[authorInput]
+  
+  -- the normalized authors
+  local authors = {}
 
-          -- add this author to the list of authors
-          authors[authorNumber] = author
-        end      
-      end
+  -- the normalized affilations
+  local affiliations = {}
 
-      -- Add any attributes that are explicitly specified
-      local affiliationsRaw = meta[kAffiliations]
-      if affiliationsRaw then        
-        local explicitAffils = processAffiliation(nil, affiliationsRaw)
-        if explicitAffils then
-          for i,affiliation in ipairs(explicitAffils) do          
-            maybeAddAffiliation(affiliation, affiliations)
-          end
+  if authorsRaw then
+    for i,v in ipairs(authorsRaw) do
+
+      local authorAndAffiliations = processAuthor(v)
+      
+      -- initialize the author
+      local author = authorAndAffiliations.author
+      local authorAffils = authorAndAffiliations.affiliations
+
+      -- assign an id to this author if one isn't defined
+      local authorNumber = #authors + 1
+      if author[kId] == nil then
+        author[kId] = authorNumber
+      end        
+
+      -- go through the affilations and add any to the list
+      -- assigning an id if needed
+      if authorAffils ~= nil then
+        for i,v in ipairs(authorAffils) do
+          local affiliation = maybeAddAffiliation(v, affiliations)
+          setAffiliation(author, { ref=affiliation[kId] })
         end
       end
 
-      -- validate that every author affiliation has a corresponding 
-      -- affiliation defined in the affiliations key
-      validateRefs(authors, affiliations)
+      -- add this author to the list of authors
+      authors[authorNumber] = author
+    end      
+  end
 
-      -- number the authors and affiliations
-      for i,affil in ipairs(affiliations) do
-        affil[kNumber] = i
-      end
-      for i,auth in ipairs(authors) do
-        auth[kNumber] = i
+  -- Add any attributes that are explicitly specified
+  local affiliationsRaw = meta[kAffiliations]
+  if affiliationsRaw then        
+    local explicitAffils = processAffiliation(nil, affiliationsRaw)
+    if explicitAffils then
+      for i,affiliation in ipairs(explicitAffils) do          
+        maybeAddAffiliation(affiliation, affiliations)
       end
+    end
+  end
 
-      -- Write the normalized data back to metadata
-      if #authors ~= 0 then
-        meta[kAuthorOutput] = authors
-      end
+  -- validate that every author affiliation has a corresponding 
+  -- affiliation defined in the affiliations key
+  validateRefs(authors, affiliations)
 
-      if #affiliations ~= 0 then
-        meta[kAffiliations] = affiliations
-      end
+  -- number the authors and affiliations
+  for i,affil in ipairs(affiliations) do
+    affil[kNumber] = i
+  end
+  for i,auth in ipairs(authors) do
+    auth[kNumber] = i
+  end
 
-      -- Write the de-normalized versions back to metadata
-      if #authors ~= 0 then
-        meta[kByAuthor] = byAuthors(authors, affiliations)
-      end
+  -- Write the normalized data back to metadata
+  if #authors ~= 0 then
+    meta[kAuthorOutput] = authors
+  end
 
-      if #affiliations ~= 0 then
-        meta[kByAffiliation] = byAffiliations(authors, affiliations)
-      end
+  if #affiliations ~= 0 then
+    meta[kAffiliations] = affiliations
+  end
 
-      -- Provide localized or user specified strings for title block elements
-      meta = computeLabels(authors, affiliations, meta)
+  -- Write the de-normalized versions back to metadata
+  if #authors ~= 0 then
+    meta[kByAuthor] = byAuthors(authors, affiliations)
+  end
 
-      return meta
-    end
-  }
+  if #affiliations ~= 0 then
+    meta[kByAffiliation] = byAffiliations(authors, affiliations)
+  end
+
+  -- Provide localized or user specified strings for title block elements
+  meta = computeLabels(authors, affiliations, meta)
+
+  return meta
 end
 
 -- Add an affiliation to the list of affiliations if needed
diff --git a/src/resources/filters/quarto-post/book.lua b/src/resources/filters/quarto-post/book.lua
@@ -0,0 +1,36 @@
+-- book.lua
+-- Copyright (C) 2020 by RStudio, PBC
+
+-- inject metadata
+function quartoBook()
+  return {
+    CodeBlock = function(el)
+
+      -- If this is a title block cell, we should render it
+      -- using the template
+      if (tcontains(el.attr.classes, 'quarto-title-block')) then
+
+        -- read the contents of the code cell
+        -- this should just be some metadata 
+        local renderedDoc = pandoc.read(el.text, 'markdown')
+
+        -- render the title block using the metdata and
+        -- and the template
+        local template = el.attr.attributes['template']
+
+        -- process any author information
+        local input = 'author'
+        if renderedDoc.meta['authors'] then
+          input = 'authors'
+        end
+        local processedMeta = processAuthorMeta(renderedDoc.meta, input)
+
+        -- read the title block template
+        local renderedBlocks = compileTemplate(template, processedMeta)
+
+        return renderedBlocks
+      end
+    end
+  }
+end
+
diff --git a/src/resources/filters/quarto-post/quarto-post.lua b/src/resources/filters/quarto-post/quarto-post.lua
@@ -26,6 +26,7 @@ import("reveal.lua")
 import("tikz.lua")
 import("meta.lua")
 import("delink.lua")
+import("book.lua")
 import("../common/lunacolors.lua")
 import("../common/log.lua")
 import("../common/base64.lua")
@@ -36,6 +37,7 @@ import("../common/pandoc.lua")
 import("../common/figures.lua")
 import("../common/meta.lua")
 import("../common/debug.lua")
+import("../common/authors.lua")
 -- [/import]
 
 initParams()
@@ -47,6 +49,7 @@ return {
     foldCode(),
     responsive(),
     ipynb(),
+    quartoBook(),
     reveal(),
     tikz(),
     delink(),
diff --git a/src/resources/formats/ipynb/templates/title-block.md b/src/resources/formats/ipynb/templates/title-block.md
@@ -6,11 +6,11 @@ $if(subtitle)$$subtitle$$endif$
 
 $-- there are affiliations, render that
 $if(by-affiliation/first)$
-$for(by-author)$$if(by-author.url)$[$by-author.name.literal$]($by-author.url$)$else$$by-author.name.literal$$endif$$if(by-author.orcid)$ [![](data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA2ZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYwIDYxLjEzNDc3NywgMjAxMC8wMi8xMi0xNzozMjowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDo1N0NEMjA4MDI1MjA2ODExOTk0QzkzNTEzRjZEQTg1NyIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDozM0NDOEJGNEZGNTcxMUUxODdBOEVCODg2RjdCQ0QwOSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDozM0NDOEJGM0ZGNTcxMUUxODdBOEVCODg2RjdCQ0QwOSIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M1IE1hY2ludG9zaCI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkZDN0YxMTc0MDcyMDY4MTE5NUZFRDc5MUM2MUUwNEREIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjU3Q0QyMDgwMjUyMDY4MTE5OTRDOTM1MTNGNkRBODU3Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+84NovQAAAR1JREFUeNpiZEADy85ZJgCpeCB2QJM6AMQLo4yOL0AWZETSqACk1gOxAQN+cAGIA4EGPQBxmJA0nwdpjjQ8xqArmczw5tMHXAaALDgP1QMxAGqzAAPxQACqh4ER6uf5MBlkm0X4EGayMfMw/Pr7Bd2gRBZogMFBrv01hisv5jLsv9nLAPIOMnjy8RDDyYctyAbFM2EJbRQw+aAWw/LzVgx7b+cwCHKqMhjJFCBLOzAR6+lXX84xnHjYyqAo5IUizkRCwIENQQckGSDGY4TVgAPEaraQr2a4/24bSuoExcJCfAEJihXkWDj3ZAKy9EJGaEo8T0QSxkjSwORsCAuDQCD+QILmD1A9kECEZgxDaEZhICIzGcIyEyOl2RkgwAAhkmC+eAm0TAAAAABJRU5ErkJggg==)](https://orcid.org/$by-author.orcid$) $endif$$if(by-author.affiliations/first)$
+$for(by-author)$$if(by-author.url)$[$by-author.name.literal$]($by-author.url$)$else$$by-author.name.literal$$endif$$if(by-author.orcid)$ [![](data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA2ZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYwIDYxLjEzNDc3NywgMjAxMC8wMi8xMi0xNzozMjowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDo1N0NEMjA4MDI1MjA2ODExOTk0QzkzNTEzRjZEQTg1NyIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDozM0NDOEJGNEZGNTcxMUUxODdBOEVCODg2RjdCQ0QwOSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDozM0NDOEJGM0ZGNTcxMUUxODdBOEVCODg2RjdCQ0QwOSIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M1IE1hY2ludG9zaCI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkZDN0YxMTc0MDcyMDY4MTE5NUZFRDc5MUM2MUUwNEREIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjU3Q0QyMDgwMjUyMDY4MTE5OTRDOTM1MTNGNkRBODU3Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+84NovQAAAR1JREFUeNpiZEADy85ZJgCpeCB2QJM6AMQLo4yOL0AWZETSqACk1gOxAQN+cAGIA4EGPQBxmJA0nwdpjjQ8xqArmczw5tMHXAaALDgP1QMxAGqzAAPxQACqh4ER6uf5MBlkm0X4EGayMfMw/Pr7Bd2gRBZogMFBrv01hisv5jLsv9nLAPIOMnjy8RDDyYctyAbFM2EJbRQw+aAWw/LzVgx7b+cwCHKqMhjJFCBLOzAR6+lXX84xnHjYyqAo5IUizkRCwIENQQckGSDGY4TVgAPEaraQr2a4/24bSuoExcJCfAEJihXkWDj3ZAKy9EJGaEo8T0QSxkjSwORsCAuDQCD+QILmD1A9kECEZgxDaEZhICIzGcIyEyOl2RkgwAAhkmC+eAm0TAAAAABJRU5ErkJggg==)](https://orcid.org/$by-author.orcid$)$endif$$if(by-author.affiliations/first)$
 $if(by-author.affiliations/allbutlast)$
-($for(by-author.affiliations/allbutlast)$$if(it.url)$[$it.name$]($it.url$)$else$$it.name$$endif$$if(it.orcid)$ [![](data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA2ZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYwIDYxLjEzNDc3NywgMjAxMC8wMi8xMi0xNzozMjowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDo1N0NEMjA4MDI1MjA2ODExOTk0QzkzNTEzRjZEQTg1NyIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDozM0NDOEJGNEZGNTcxMUUxODdBOEVCODg2RjdCQ0QwOSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDozM0NDOEJGM0ZGNTcxMUUxODdBOEVCODg2RjdCQ0QwOSIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M1IE1hY2ludG9zaCI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkZDN0YxMTc0MDcyMDY4MTE5NUZFRDc5MUM2MUUwNEREIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjU3Q0QyMDgwMjUyMDY4MTE5OTRDOTM1MTNGNkRBODU3Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+84NovQAAAR1JREFUeNpiZEADy85ZJgCpeCB2QJM6AMQLo4yOL0AWZETSqACk1gOxAQN+cAGIA4EGPQBxmJA0nwdpjjQ8xqArmczw5tMHXAaALDgP1QMxAGqzAAPxQACqh4ER6uf5MBlkm0X4EGayMfMw/Pr7Bd2gRBZogMFBrv01hisv5jLsv9nLAPIOMnjy8RDDyYctyAbFM2EJbRQw+aAWw/LzVgx7b+cwCHKqMhjJFCBLOzAR6+lXX84xnHjYyqAo5IUizkRCwIENQQckGSDGY4TVgAPEaraQr2a4/24bSuoExcJCfAEJihXkWDj3ZAKy9EJGaEo8T0QSxkjSwORsCAuDQCD+QILmD1A9kECEZgxDaEZhICIzGcIyEyOl2RkgwAAhkmC+eAm0TAAAAABJRU5ErkJggg==)](https://orcid.org/$it.orcid$) $endif$, $endfor$$for(by-author.affiliations/last)$$if(it.url)$[$it.name$]($it.url$)$else$$it.name$$endif$$endfor$)  
+ ($for(by-author.affiliations/allbutlast)$$if(it.url)$[$it.name$]($it.url$)$else$$it.name$$endif$$if(it.orcid)$ [![](data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA2ZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYwIDYxLjEzNDc3NywgMjAxMC8wMi8xMi0xNzozMjowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDo1N0NEMjA4MDI1MjA2ODExOTk0QzkzNTEzRjZEQTg1NyIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDozM0NDOEJGNEZGNTcxMUUxODdBOEVCODg2RjdCQ0QwOSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDozM0NDOEJGM0ZGNTcxMUUxODdBOEVCODg2RjdCQ0QwOSIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M1IE1hY2ludG9zaCI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkZDN0YxMTc0MDcyMDY4MTE5NUZFRDc5MUM2MUUwNEREIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjU3Q0QyMDgwMjUyMDY4MTE5OTRDOTM1MTNGNkRBODU3Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+84NovQAAAR1JREFUeNpiZEADy85ZJgCpeCB2QJM6AMQLo4yOL0AWZETSqACk1gOxAQN+cAGIA4EGPQBxmJA0nwdpjjQ8xqArmczw5tMHXAaALDgP1QMxAGqzAAPxQACqh4ER6uf5MBlkm0X4EGayMfMw/Pr7Bd2gRBZogMFBrv01hisv5jLsv9nLAPIOMnjy8RDDyYctyAbFM2EJbRQw+aAWw/LzVgx7b+cwCHKqMhjJFCBLOzAR6+lXX84xnHjYyqAo5IUizkRCwIENQQckGSDGY4TVgAPEaraQr2a4/24bSuoExcJCfAEJihXkWDj3ZAKy9EJGaEo8T0QSxkjSwORsCAuDQCD+QILmD1A9kECEZgxDaEZhICIzGcIyEyOl2RkgwAAhkmC+eAm0TAAAAABJRU5ErkJggg==)](https://orcid.org/$it.orcid$) $endif$, $endfor$$for(by-author.affiliations/last)$$if(it.url)$[$it.name$]($it.url$)$else$$it.name$$endif$$endfor$)  
 $else$
-($for(by-author.affiliations/first)$$if(it.url)$[$it.name$]($it.url$)$else$$it.name$$endif$$endfor$)  
+ ($for(by-author.affiliations/first)$$if(it.url)$[$it.name$]($it.url$)$else$$it.name$$endif$$endfor$)  
 $endif$
 $endif$
 $endfor$$if(date)$$date$$endif$
diff --git a/src/resources/projects/book/pandoc/title-block.md b/src/resources/projects/book/pandoc/title-block.md
