diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-dateTimeInterval.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-dateTimeInterval.ftl index 0e764608..bb3cd74e 100644 --- a/productMods/templates/freemarker/body/partials/individual/propStatement-dateTimeInterval.ftl +++ b/productMods/templates/freemarker/body/partials/individual/propStatement-dateTimeInterval.ftl @@ -7,6 +7,6 @@ <#if ! statement.valueStart?? && ! statement.valueEnd??> ${statement.intervalName} (incomplete date/time interval data) <#else> - ${dt.dateTimeIntervalLong("${statement.dateTimeStart!}", "${statement.precisionStart!}", - "${statement.dateTimeEnd!}", "${statement.precisionEnd!}")} + ${dt.dateTimeIntervalLong(statement.dateTimeStart!, statement.precisionStart!, + statement.dateTimeEnd!, statement.precisionEnd!)} \ No newline at end of file diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-educationalTraining.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-educationalTraining.ftl index 27aafd78..991a1622 100644 --- a/productMods/templates/freemarker/body/partials/individual/propStatement-educationalTraining.ftl +++ b/productMods/templates/freemarker/body/partials/individual/propStatement-educationalTraining.ftl @@ -13,7 +13,12 @@ <#local degree> <#if statement.degreeName??> - <@s.join [ statement.degreeAbbr!statement.degreeName, statement.majorField! ], " in " /> + <#-- RY Giving up on join here. Freemarker insists on removing the space before "in" + and leaving no space between the degree and major field, even though compress + should only delete consecutive spaces. Even   doesn't help. + <@s.join [ statement.degreeAbbr!statement.degreeName, statement.majorField! ], " in " /> --> + ${statement.degreeAbbr!statement.degreeName} + <#if statement.majorField??> in ${statement.majorField} diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-informationResourceInAuthorship.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-informationResourceInAuthorship.ftl index 9097ebb5..c4001f87 100644 --- a/productMods/templates/freemarker/body/partials/individual/propStatement-informationResourceInAuthorship.ftl +++ b/productMods/templates/freemarker/body/partials/individual/propStatement-informationResourceInAuthorship.ftl @@ -9,16 +9,10 @@ <#-- Use a macro to keep variable assignments local; otherwise the values carry over to the next statement --> <#macro showAuthorship statement> - - <#local linkedIndividual> - <#if statement.person??> - ${statement.personName} - <#else> - <#-- This shouldn't happen, but we must provide for it --> - ${statement.authorshipName} (no linked author) - - - - <@s.join [ linkedIndividual ] /> - + <#if statement.person??> + ${statement.personName} + <#else> + <#-- This shouldn't happen, but we must provide for it --> + ${statement.authorshipName} (no linked author) + \ No newline at end of file