From 27dee713438fc3a9ac0cac333a4393dd49a7f294 Mon Sep 17 00:00:00 2001
From: Anvit Srivastav <asrivastav@artefactual.com>
Date: Tue, 30 Jan 2024 09:53:22 -0800
Subject: [PATCH] Fix notes related issues in XSLT files (#1746)

Fixes the following XSLT issues:
- Removes "Note" subheading under the bio history section
- Have general notes in files list the name of the type (General)
  instead of the type itself (generalNote)
---
 lib/task/pdf/ead-pdf-common.xsl       |  9 +++++++-
 lib/task/pdf/ead-pdf-full-details.xsl | 33 +++++++++++++++++++++++----
 2 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/lib/task/pdf/ead-pdf-common.xsl b/lib/task/pdf/ead-pdf-common.xsl
index bed760f92d..c91d34a914 100644
--- a/lib/task/pdf/ead-pdf-common.xsl
+++ b/lib/task/pdf/ead-pdf-common.xsl
@@ -644,7 +644,14 @@
             <fo:block xsl:use-attribute-sets="h2ID">
                 <xsl:value-of select="local:tagName(.)"/>
             </fo:block>
-            <xsl:apply-templates/>
+            <xsl:choose>
+              <xsl:when test="ead:note">
+                <xsl:apply-templates select="./ead:note/*" />
+              </xsl:when>
+              <xsl:otherwise>
+                <xsl:apply-templates/>
+              </xsl:otherwise>
+            </xsl:choose>
             <xsl:call-template name="toc"/>
         </fo:block>
     </xsl:template>
diff --git a/lib/task/pdf/ead-pdf-full-details.xsl b/lib/task/pdf/ead-pdf-full-details.xsl
index e3afa53c7a..a56a1ed259 100644
--- a/lib/task/pdf/ead-pdf-full-details.xsl
+++ b/lib/task/pdf/ead-pdf-full-details.xsl
@@ -256,10 +256,33 @@
     </xsl:template>
     <!-- Special formatting for elements in the collection inventory list -->
     <xsl:template match="ead:repository | ead:origination | ead:unittitle | ead:unitdate | ead:unitid | ead:scopecontent | ead:physdesc | ead:physloc | ead:materialspec | ead:container | ead:abstract | ead:note | ead:phystech | ead:acqinfo | ead:arrangement | ead:originalsloc | ead:altformavail | ead:accessrestrict | ead:userestrict | ead:otherfindaid | ead:relatedmaterial | ead:accruals | ead:odd" mode="dsc">
-        <fo:block xsl:use-attribute-sets="smpDsc"><fo:inline text-decoration="underline"><xsl:choose><!-- Test for label attribute used by origination element --><xsl:when test="@label"><xsl:value-of select="concat(upper-case(substring(@label,1,1)),substring(@label,2))"/><xsl:if test="@type"> [<xsl:value-of select="@type"/>]</xsl:if><xsl:if test="self::ead:origination"><xsl:choose><xsl:when test="ead:persname[@role != ''] and contains(ead:persname/@role,' (')">
-                                - <xsl:value-of select="substring-before(ead:persname/@role,' (')"/>
-                            </xsl:when><xsl:when test="ead:persname[@role != '']">
-                                - <xsl:value-of select="ead:persname/@role"/>
-                            </xsl:when><xsl:otherwise/></xsl:choose></xsl:if></xsl:when><xsl:otherwise><xsl:value-of select="local:tagName(.)"/><xsl:if test="@type"> [<xsl:value-of select="@type"/>]</xsl:if></xsl:otherwise></xsl:choose></fo:inline>: <xsl:apply-templates/><xsl:if test="@datechar"> (<xsl:value-of select="@datechar"/>)</xsl:if><xsl:if test="name()='unitdate'"> (date of creation)</xsl:if></fo:block>
+        <fo:block xsl:use-attribute-sets="smpDsc">
+            <fo:inline text-decoration="underline">
+                <xsl:choose><!-- Test for label attribute used by origination element -->
+                    <xsl:when test="@label">
+                        <xsl:value-of select="concat(upper-case(substring(@label,1,1)),substring(@label,2))"/>
+                        <xsl:if test="@type"> [<xsl:value-of select="@type"/>]</xsl:if>
+                        <xsl:if test="self::ead:origination">
+                            <xsl:choose>
+                                <xsl:when test="ead:persname[@role != ''] and contains(ead:persname/@role,' (')">
+                                    - <xsl:value-of select="substring-before(ead:persname/@role,' (')"/>
+                                </xsl:when>
+                                <xsl:when test="ead:persname[@role != '']">
+                                    - <xsl:value-of select="ead:persname/@role"/>
+                                </xsl:when>
+                                <xsl:otherwise/>
+                            </xsl:choose>
+                        </xsl:if>
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <xsl:value-of select="local:tagName(.)"/>
+                        <xsl:if test="@type"> [<xsl:value-of select="local:typeLabel(.)"/>]</xsl:if>
+                    </xsl:otherwise>
+                </xsl:choose>
+            </fo:inline>:
+            <xsl:apply-templates/>
+            <xsl:if test="@datechar"> (<xsl:value-of select="@datechar"/>)</xsl:if>
+            <xsl:if test="name()='unitdate'"> (date of creation)</xsl:if>
+        </fo:block>
     </xsl:template>
 </xsl:stylesheet>