Skip to content

Commit

Permalink
Fixes notes related issues in XSLT files (#1746)
Browse files Browse the repository at this point in the history
Fixes a number of XSLT problems:
- 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)
  • Loading branch information
anvit committed Jan 30, 2024
1 parent 3094418 commit f88cbb7
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 6 deletions.
9 changes: 8 additions & 1 deletion lib/task/pdf/ead-pdf-common.xsl
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
33 changes: 28 additions & 5 deletions lib/task/pdf/ead-pdf-full-details.xsl
Original file line number Diff line number Diff line change
Expand Up @@ -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>

0 comments on commit f88cbb7

Please sign in to comment.