Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: creation of empty attList in odd2odd.xsl #630

Merged
merged 3 commits into from
Nov 9, 2023
+17 −14
Merged

Fix: creation of empty attList in odd2odd.xsl #630

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
82e80e3
Update odd2odd.xsl
bwbohl Oct 4, 2023
29b9da0
Merge in latest from TEIC’s dev branch
sydb Oct 26, 2023
965e98e
Reproduce same fix @bwbohl made for elements to classes
sydb Oct 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 17 additions & 14 deletions odds/odd2odd.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -969,14 +969,15 @@ of this software, even if advised of the possibility of such damage.
<xsl:with-param name="elementName" select="$elementName"/>
</xsl:call-template>
<!-- attList -->
<attList xmlns="http://www.tei-c.org/ns/1.0">
<xsl:apply-templates mode="justcopy" select="tei:attList/@org"/>
<xsl:call-template name="odd2odd-processAttributes">
<xsl:with-param name="ORIGINAL" select="$ORIGINAL"/>
<xsl:with-param name="objectName" select="$elementName"/>
</xsl:call-template>
</attList>

<xsl:if test="tei:attList or $ORIGINAL/tei:attList">
<attList xmlns="http://www.tei-c.org/ns/1.0">
<xsl:apply-templates mode="justcopy" select="tei:attList/@org"/>
<xsl:call-template name="odd2odd-processAttributes">
<xsl:with-param name="ORIGINAL" select="$ORIGINAL"/>
<xsl:with-param name="objectName" select="$elementName"/>
</xsl:call-template>
</attList>
</xsl:if>

<!-- models -->
<xsl:choose>
Expand Down Expand Up @@ -1254,12 +1255,14 @@ of this software, even if advised of the possibility of such damage.
<xsl:with-param name="elementName" select="$className"/>
</xsl:call-template>
<!-- attList -->
<attList xmlns="http://www.tei-c.org/ns/1.0">
<xsl:call-template name="odd2odd-processAttributes">
<xsl:with-param name="ORIGINAL" select="$ORIGINAL"/>
<xsl:with-param name="objectName" select="$className"/>
</xsl:call-template>
</attList>
<xsl:if test="$ORIGINAL/tei:attList">
<attList xmlns="http://www.tei-c.org/ns/1.0">
<xsl:call-template name="odd2odd-processAttributes">
<xsl:with-param name="ORIGINAL" select="$ORIGINAL"/>
<xsl:with-param name="objectName" select="$className"/>
</xsl:call-template>
</attList>
</xsl:if>
<xsl:choose> <!-- maybe copy <exemplum>s from ODD or ORIGINAL -->
<xsl:when test="$stripped='true'"/>
<xsl:when test="tei:exemplum">
Expand Down