Skip to content

Commit

Permalink
rebase with master
Browse files Browse the repository at this point in the history
  • Loading branch information
@wsalesky
wsalesky committed Jun 5, 2017
1 parent fc980db commit 5b809fb
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 37 deletions.
68 changes: 34 additions & 34 deletions example-p5-xslt/teisupplied.xsl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,39 +3,39 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:t="http://www.tei-c.org/ns/1.0"
xmlns:EDF="http://epidoc.sourceforge.net/ns/functions"
exclude-result-prefixes="t EDF"
version="2.0">
exclude-result-prefixes="t EDF"
version="2.0">

<xsl:template match="t:supplied[@evidence='parallel']" priority="1">
<xsl:choose>
<xsl:when test="$collection = 'dclp'"><xsl:call-template name="supplied-parallel"/></xsl:when>
<xsl:otherwise><xsl:apply-templates/></xsl:otherwise>
</xsl:choose>

</xsl:template>
<xsl:template match="t:supplied[@evidence='parallel']" priority="1">
<xsl:choose>
<xsl:when test="$collection = 'dclp'"><xsl:call-template name="supplied-parallel"/></xsl:when>
<xsl:otherwise><xsl:apply-templates/></xsl:otherwise>
</xsl:choose>

<xsl:template match="t:supplied[@reason='lost']">
</xsl:template>

<xsl:template match="t:supplied[@reason='lost']">
<xsl:param name="parm-edition-type" tunnel="yes" required="no"></xsl:param>
<xsl:param name="parm-leiden-style" tunnel="yes" required="no"></xsl:param>
<xsl:param name="location" tunnel="yes" required="no"/>
<xsl:param name="location" />
<xsl:if test="($parm-leiden-style = 'ddbdp' or $parm-leiden-style = 'sammelbuch') and child::t:*[1][local-name() = 'milestone'][@rend = 'paragraphos']">
<br/>
</xsl:if>
<xsl:choose>
<xsl:when test="@evidence = 'parallel'">
<!-- Found in [htm|txt]-teisupplied.xsl -->
<xsl:call-template name="supplied-parallel"/>
<!-- Found in [htm|txt]-teisupplied.xsl -->
<xsl:call-template name="supplied-parallel"/>
</xsl:when>
<xsl:otherwise>
<!-- *NB* the lost-opener and lost-closer templates, found in tpl-reasonlost.xsl,
<!-- *NB* the lost-opener and lost-closer templates, found in tpl-reasonlost.xsl,
are no longer used in this version of the stylesheets. They used to serve to limit
the superfluous square brackets between adjacent gap and supplied elements,
but this function is now performed by regex in [htm|txt]-tpl-sqbrackets.xsl
which is called after all other templates are completed.
-->
<xsl:text>[</xsl:text>
<xsl:choose>
<xsl:when test="$parm-edition-type = 'diplomatic'">
<xsl:when test="$parm-edition-type = 'diplomatic'">
<xsl:variable name="supplied-content">
<xsl:value-of select="descendant::text()"/>
</xsl:variable>
Expand All @@ -56,7 +56,7 @@
<xsl:text>··</xsl:text>
</xsl:for-each>
<!-- Found in teigap.xsl -->
<xsl:call-template name="dot-out">
<xsl:call-template name="dot-out">
<xsl:with-param name="cur-num" select="$sup-context-length"/>
</xsl:call-template>
<xsl:call-template name="dot-out">
Expand All @@ -72,7 +72,7 @@
<!-- function EDF:f-wwrap declared in htm-teilb.xsl; tests if lb break=no immediately follows supplied -->
<xsl:if test="EDF:f-wwrap(.) = true()">
<!-- unless this is in the app part of a choice/subst/app in ddbdp -->
<xsl:if test="(not($parm-leiden-style='ddbdp' and (ancestor::t:*[local-name()=('reg','corr','rdg') or self::t:del[parent::t:subst]]))) and (not($location = 'apparatus'))">
<xsl:if test="(not($parm-leiden-style='ddbdp' and (ancestor::t:*[local-name()=('reg','corr','rdg') or self::t:del[parent::t:subst]]))) and (not($location = 'apparatus'))">
<xsl:text>-</xsl:text>
</xsl:if>
</xsl:if>
Expand All @@ -85,42 +85,42 @@
<xsl:text>]</xsl:text>
</xsl:otherwise>
</xsl:choose>
</xsl:template>

</xsl:template>

<xsl:template match="t:supplied[@reason='omitted']">

<xsl:template match="t:supplied[@reason='omitted']">
<xsl:param name="parm-edition-type" tunnel="yes" required="no"></xsl:param>
<xsl:choose>
<xsl:when test="$parm-edition-type='diplomatic'"/>
<xsl:when test="$parm-edition-type='diplomatic'"/>
<xsl:when test="@evidence = 'parallel'">
<!-- Found in [htm|txt]-teisupplied.xsl -->
<xsl:call-template name="supplied-parallel"/>
<!-- Found in [htm|txt]-teisupplied.xsl -->
<xsl:call-template name="supplied-parallel"/>
</xsl:when>
<xsl:otherwise>
<xsl:text>&lt;</xsl:text>
<xsl:apply-templates/>
<!-- Found in tpl-cert-low.xsl -->
<xsl:call-template name="cert-low"/>
<xsl:call-template name="cert-low"/>
<xsl:text>&gt;</xsl:text>
</xsl:otherwise>
</xsl:choose>
</xsl:template>
</xsl:template>


<xsl:template match="t:supplied[@reason='subaudible']">
<xsl:template match="t:supplied[@reason='subaudible']">
<xsl:text>(</xsl:text>
<xsl:apply-templates/>
<xsl:call-template name="cert-low"/>
<xsl:text>)</xsl:text>
</xsl:template>

<xsl:apply-templates/>
<xsl:call-template name="cert-low"/>
<xsl:text>)</xsl:text>
</xsl:template>

<xsl:template match="t:supplied[@reason='explanation']">

<xsl:template match="t:supplied[@reason='explanation']">
<xsl:text>(i.e. </xsl:text>
<xsl:apply-templates/>
<xsl:call-template name="cert-low"/>
<xsl:text>)</xsl:text>
</xsl:template>
</xsl:template>

<xsl:template match="t:supplied[@evidence='apograph']">
<xsl:text>⌈</xsl:text>
Expand Down
6 changes: 3 additions & 3 deletions example-p5-xslt/tpl-apparatus.xsl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -872,8 +872,8 @@
<xsl:copy-of select="$buildup"/>
</xsl:when>
<xsl:otherwise>
<!-- <xsl:element name="{$step/name()}" xmlns="http://www.tei-c.org/ns/1.0">-->
<!-- <xsl:sequence select="$step/@*"/>-->
<xsl:element name="{$step/name()}" xmlns="http://www.tei-c.org/ns/1.0">
<xsl:sequence select="$step/@*"/>
<xsl:choose>
<xsl:when test="$step/text() and not($step/*)">
<xsl:choose>
Expand Down Expand Up @@ -917,7 +917,7 @@
</xsl:for-each>
</xsl:otherwise>
</xsl:choose>
<!-- </xsl:element>-->
</xsl:element>
</xsl:otherwise>
</xsl:choose>
</xsl:template>
Expand Down

0 comments on commit 5b809fb

Please sign in to comment.