From 1f986482e2948b38eff967dbed56d711ca574cec Mon Sep 17 00:00:00 2001 From: Winona Salesky Date: Sat, 5 Aug 2017 07:40:47 -0400 Subject: [PATCH 1/3] Added additional value 'dclp' to leiden-style parameter in global-parameters.xml. Added 'dclp' to all leiden-style parameters with value ='ddbdp' and to supplied-parallel template. https://github.com/DCLP/dclpxsltbox/issues/283 --- global-parameters.xml | 1 + htm-teiab.xsl | 4 ++-- htm-teiaddanddel.xsl | 2 +- htm-teiapp.xsl | 8 ++++---- htm-teidivedition.xsl | 2 +- htm-teifigure.xsl | 2 +- htm-teig.xsl | 2 +- htm-teigap.xsl | 2 +- htm-teihead.xsl | 2 +- htm-teihi.xsl | 4 ++-- htm-teilb.xsl | 20 ++++++++++---------- htm-teimilestone.xsl | 4 ++-- htm-teinum.xsl | 2 +- htm-teisupplied.xsl | 2 +- htm-teiterm.xsl | 2 +- htm-tpl-struct-hgv.xsl | 2 +- htm-tpl-structure.xsl | 4 ++-- teiabbrandexpan.xsl | 4 ++-- teiaddanddel.xsl | 8 ++++---- teicertainty.xsl | 2 +- teigap.xsl | 26 +++++++++++++------------- teihandshift.xsl | 2 +- teilb.xsl | 4 ++-- teinum.xsl | 2 +- teiorigandreg.xsl | 2 +- teiq.xsl | 2 +- teisicandcorr.xsl | 4 ++-- teispace.xsl | 2 +- teisupplied.xsl | 6 +++--- teiunclear.xsl | 2 +- txt-teig.xsl | 2 +- txt-teigap.xsl | 2 +- txt-teilb.xsl | 4 ++-- txt-teimilestone.xsl | 4 ++-- 34 files changed, 72 insertions(+), 71 deletions(-) diff --git a/global-parameters.xml b/global-parameters.xml index 16a6f89..597ec35 100644 --- a/global-parameters.xml +++ b/global-parameters.xml @@ -10,6 +10,7 @@ leiden-style ddbdp + dclp dohnicht edh-itx edh-names diff --git a/htm-teiab.xsl b/htm-teiab.xsl index 32da548..916de4c 100644 --- a/htm-teiab.xsl +++ b/htm-teiab.xsl @@ -25,11 +25,11 @@ - -   → -   ← diff --git a/htm-teiaddanddel.xsl b/htm-teiaddanddel.xsl index 74d647f..bdf8ae3 100644 --- a/htm-teiaddanddel.xsl +++ b/htm-teiaddanddel.xsl @@ -13,7 +13,7 @@ - + diff --git a/htm-teiapp.xsl b/htm-teiapp.xsl index 56598a9..03ff79b 100644 --- a/htm-teiapp.xsl +++ b/htm-teiapp.xsl @@ -67,7 +67,7 @@ - + @@ -97,12 +97,12 @@ - - FNORD-SPLIT + FNORD-SPLIT @@ -115,7 +115,7 @@ (via PE) - FNORD-DELIM + FNORD-DELIM diff --git a/htm-teidivedition.xsl b/htm-teidivedition.xsl index 8e4257c..19a9820 100644 --- a/htm-teidivedition.xsl +++ b/htm-teidivedition.xsl @@ -42,7 +42,7 @@ + test="($parm-leiden-style = ('ddbdp','dclp','sammelbuch')) and @subtype"> diff --git a/htm-teifigure.xsl b/htm-teifigure.xsl index 8ae7a86..108f633 100644 --- a/htm-teifigure.xsl +++ b/htm-teifigure.xsl @@ -11,7 +11,7 @@ - + ( ) diff --git a/htm-teig.xsl b/htm-teig.xsl index 29fdf7f..d9d3132 100644 --- a/htm-teig.xsl +++ b/htm-teig.xsl @@ -15,7 +15,7 @@ - + diff --git a/htm-teigap.xsl b/htm-teigap.xsl index addad71..66641ad 100644 --- a/htm-teigap.xsl +++ b/htm-teigap.xsl @@ -8,7 +8,7 @@ -
diff --git a/htm-teihead.xsl b/htm-teihead.xsl index 3826232..929a8af 100644 --- a/htm-teihead.xsl +++ b/htm-teihead.xsl @@ -14,7 +14,7 @@ - + diff --git a/htm-teihi.xsl b/htm-teihi.xsl index 6e1dbca..bc4d18b 100644 --- a/htm-teihi.xsl +++ b/htm-teihi.xsl @@ -120,7 +120,7 @@ - + @@ -136,7 +136,7 @@ - + diff --git a/htm-teilb.xsl b/htm-teilb.xsl index 60dcb48..dc78e5b 100644 --- a/htm-teilb.xsl +++ b/htm-teilb.xsl @@ -42,11 +42,11 @@ + test="$parm-leiden-style = ('ddbdp','dclp') and ((not(ancestor::*[name() = 'TEI'])) or $location = 'apparatus')"/>   →   ← @@ -111,7 +111,7 @@ --> + test="$parm-leiden-style = ('ddbdp','dclp') and ((not(ancestor::*[name() = 'TEI'])) or $location = 'apparatus')"> | @@ -137,7 +137,7 @@ + test="not(number(@n)) and ($parm-leiden-style = ('ddbdp','dclp','sammelbuch'))"> @@ -145,18 +145,18 @@ test=" number(@n) and @n mod number($parm-line-inc) = 0 and not(@n = 0) and not(following::t:*[1][local-name() = 'gap' or local-name() = 'space'][@unit = 'line'] and - ($parm-leiden-style = 'ddbdp' or $parm-leiden-style = 'sammelbuch'))"> + ($parm-leiden-style = ('ddbdp','dclp','sammelbuch')))"> + test="$parm-leiden-style = ('ddbdp','dclp') and preceding-sibling::t:*[1][local-name() = 'gap'][@unit = 'line']"> + test="$parm-leiden-style = ('ddbdp','dclp') and following::t:lb[1][ancestor::t:reg[following-sibling::t:orig[not(descendant::t:lb)]]]"> @@ -170,7 +170,7 @@ + test="$parm-leiden-style = ('ddbdp','dclp') and following::t:lb[1][ancestor::t:reg[following-sibling::t:orig[not(descendant::t:lb)]]]"> linenumberbroken diff --git a/htm-teimilestone.xsl b/htm-teimilestone.xsl index 06d99f2..780bcbf 100644 --- a/htm-teimilestone.xsl +++ b/htm-teimilestone.xsl @@ -11,7 +11,7 @@ + test="($parm-leiden-style = ('ddbdp','dclp','sammelbuch')) and ancestor::t:div[@type = 'translation']">
@@ -22,7 +22,7 @@   - + diff --git a/htm-teinum.xsl b/htm-teinum.xsl index 3a8b5e6..3a83a42 100644 --- a/htm-teinum.xsl +++ b/htm-teinum.xsl @@ -10,7 +10,7 @@ diff --git a/htm-teisupplied.xsl b/htm-teisupplied.xsl index b6e27db..8216294 100644 --- a/htm-teisupplied.xsl +++ b/htm-teisupplied.xsl @@ -7,7 +7,7 @@ - ⎣⎦ + ⎣⎦ diff --git a/htm-teiterm.xsl b/htm-teiterm.xsl index 66d1f13..2c7638a 100644 --- a/htm-teiterm.xsl +++ b/htm-teiterm.xsl @@ -10,7 +10,7 @@ - + diff --git a/htm-tpl-struct-hgv.xsl b/htm-tpl-struct-hgv.xsl index c7081a0..19df299 100644 --- a/htm-tpl-struct-hgv.xsl +++ b/htm-tpl-struct-hgv.xsl @@ -31,7 +31,7 @@ - +

diff --git a/htm-tpl-structure.xsl b/htm-tpl-structure.xsl index b12981c..dd78a63 100644 --- a/htm-tpl-structure.xsl +++ b/htm-tpl-structure.xsl @@ -24,7 +24,7 @@ <xsl:choose> - <xsl:when test="($parm-leiden-style = 'ddbdp' or $parm-leiden-style = 'sammelbuch')"> + <xsl:when test="($parm-leiden-style = ('ddbdp','dclp','sammelbuch'))"> <xsl:choose> <xsl:when test="//t:sourceDesc//t:bibl/text()"> <xsl:value-of select="//t:sourceDesc//t:bibl"/> @@ -59,7 +59,7 @@ <xsl:template name="default-body-structure"> <xsl:param name="parm-leiden-style" tunnel="yes" required="no"></xsl:param> <!-- Heading for a ddb style file --> - <xsl:if test="($parm-leiden-style = 'ddbdp' or $parm-leiden-style = 'sammelbuch')"> + <xsl:if test="($parm-leiden-style = ('ddbdp','dclp','sammelbuch'))"> <h1> <xsl:choose> <xsl:when test="//t:sourceDesc//t:bibl/text()"> diff --git a/teiabbrandexpan.xsl b/teiabbrandexpan.xsl index fc5c890..ffdb8e7 100644 --- a/teiabbrandexpan.xsl +++ b/teiabbrandexpan.xsl @@ -16,7 +16,7 @@ <xsl:apply-templates/> <xsl:if test="not(ancestor::t:expan) and not($parm-edition-type='diplomatic')"> <xsl:text>(</xsl:text><xsl:choose> - <xsl:when test="$parm-leiden-style = 'ddbdp' or $parm-leiden-style = 'sammelbuch'"> + <xsl:when test="$parm-leiden-style = ('ddbdp','dclp','sammelbuch')"> <xsl:text>  </xsl:text> </xsl:when> <xsl:when test="$parm-leiden-style = 'rib'"> @@ -26,7 +26,7 @@ <xsl:text>- - -</xsl:text> </xsl:otherwise> </xsl:choose><xsl:text>)</xsl:text> - <xsl:if test="($parm-leiden-style = 'ddbdp' or $parm-leiden-style = 'sammelbuch')"> + <xsl:if test="($parm-leiden-style = ('ddbdp','dclp','sammelbuch'))"> <!-- Found in tpl-certlow.xsl --> <xsl:call-template name="cert-low"/> </xsl:if> diff --git a/teiaddanddel.xsl b/teiaddanddel.xsl index 8644e6f..7ab55f4 100644 --- a/teiaddanddel.xsl +++ b/teiaddanddel.xsl @@ -22,7 +22,7 @@ <xsl:template match="t:add"> <xsl:param name="parm-leiden-style" tunnel="yes" required="no"></xsl:param> <xsl:choose> - <xsl:when test="$parm-leiden-style=('ddbdp','sammelbuch')"> + <xsl:when test="$parm-leiden-style=('ddbdp','dclp','sammelbuch')"> <xsl:choose> <xsl:when test="parent::t:subst"/> <xsl:when test="@place = 'above'"> @@ -57,7 +57,7 @@ <xsl:call-template name="cert-low"/> <xsl:choose> - <xsl:when test="$parm-leiden-style=('ddbdp','sammelbuch')"> + <xsl:when test="$parm-leiden-style=('ddbdp','dclp','sammelbuch')"> <xsl:choose> <!-- if my parent is subst which in turn is in the appcrit-part of a further app-like element (i.e. my ancestor is reg, corr, rdg, or del[corrected]), then include value of my sibling del in parens --> @@ -122,10 +122,10 @@ <xsl:apply-templates/> <xsl:text>]]</xsl:text> </xsl:when> - <xsl:when test="($parm-leiden-style = 'ddbdp' or $parm-leiden-style = 'sammelbuch') and @rend='slashes'"> + <xsl:when test="($parm-leiden-style = ('ddbdp','dclp','sammelbuch')) and @rend='slashes'"> <xsl:apply-templates/> </xsl:when> - <xsl:when test="($parm-leiden-style = 'ddbdp' or $parm-leiden-style = 'sammelbuch') and @rend='cross-strokes'"> + <xsl:when test="($parm-leiden-style = ('ddbdp','dclp','sammelbuch')) and @rend='cross-strokes'"> <xsl:apply-templates/> </xsl:when> <xsl:when test="$parm-leiden-style = 'rib'"> diff --git a/teicertainty.xsl b/teicertainty.xsl index 36ac2d0..f25d0bf 100644 --- a/teicertainty.xsl +++ b/teicertainty.xsl @@ -6,7 +6,7 @@ <xsl:template match="t:certainty"> <xsl:param name="parm-leiden-style" tunnel="yes" required="no"></xsl:param> <xsl:choose> - <xsl:when test="$parm-leiden-style=('ddbdp','sammelbuch','iospe')"> + <xsl:when test="$parm-leiden-style=('ddbdp','dclp','sammelbuch','iospe')"> <xsl:if test="@match='..'"> <xsl:text>(?)</xsl:text> </xsl:if> diff --git a/teigap.xsl b/teigap.xsl index fa4ece9..1dfb3ab 100644 --- a/teigap.xsl +++ b/teigap.xsl @@ -61,7 +61,7 @@ <xsl:template match="t:gap[@reason='ellipsis']"> <xsl:param name="parm-leiden-style" tunnel="yes" required="no"></xsl:param> <xsl:choose> - <xsl:when test="$parm-leiden-style = ('ddbdp','sammelbuch')"> + <xsl:when test="$parm-leiden-style = ('ddbdp','dclp','sammelbuch')"> <xsl:if test="string(t:desc) != 'non transcribed'"> <xsl:value-of select="t:desc"/> <xsl:text> </xsl:text> @@ -125,7 +125,7 @@ <xsl:param name="parm-verse-lines" tunnel="yes" required="no"></xsl:param> <xsl:choose> <xsl:when - test="$parm-leiden-style = ('ddbdp','sammelbuch') and @unit = 'line' and @extent = 'unknown'"/> + test="$parm-leiden-style = ('ddbdp','dclp','sammelbuch') and @unit = 'line' and @extent = 'unknown'"/> <xsl:when test="$parm-leiden-style = 'panceira' and @unit = 'line' and @extent = 'unknown'"/> <xsl:when test="@unit='line'"> <xsl:text>[</xsl:text> @@ -163,7 +163,7 @@ <!-- certainty --> <xsl:if test="child::t:certainty[@match='..']"> <xsl:choose> - <xsl:when test="$parm-leiden-style = ('ddbdp','sammelbuch')"> + <xsl:when test="$parm-leiden-style = ('ddbdp','dclp','sammelbuch')"> <xsl:text>(?)</xsl:text> </xsl:when> <xsl:otherwise> @@ -179,7 +179,7 @@ <xsl:choose> <xsl:when - test="$parm-leiden-style = ('ddbdp','sammelbuch') and @unit = 'line' and @extent = 'unknown'"/> + test="$parm-leiden-style = ('ddbdp','dclp','sammelbuch') and @unit = 'line' and @extent = 'unknown'"/> <xsl:when test="$parm-leiden-style = 'panceira' and @unit = 'line' and @extent = 'unknown'"/> <xsl:when test="@unit='line'"> <xsl:text>]</xsl:text> @@ -206,7 +206,7 @@ <xsl:variable name="circa"> <xsl:choose> <xsl:when - test="$parm-leiden-style = ('ddbdp','sammelbuch') and + test="$parm-leiden-style = ('ddbdp','dclp','sammelbuch') and (@precision='low' or (@unit='character' and number(@quantity) > $cur-max))"> <xsl:text>ca.</xsl:text> </xsl:when> @@ -219,7 +219,7 @@ <xsl:choose> <xsl:when test="@extent='unknown'"> <xsl:choose> - <xsl:when test="$parm-leiden-style = ('ddbdp','sammelbuch')"> + <xsl:when test="$parm-leiden-style = ('ddbdp','dclp','sammelbuch')"> <xsl:choose> <!-- lines lost --> <xsl:when test="@reason='lost' and @unit='line'"> @@ -286,7 +286,7 @@ </xsl:when> <xsl:when test="number(@quantity) > $cur-max or (number(@quantity) > 1 and @precision='low')"> <xsl:choose> - <xsl:when test="$parm-leiden-style = ('ddbdp','sammelbuch')"> + <xsl:when test="$parm-leiden-style = ('ddbdp','dclp','sammelbuch')"> <xsl:choose> <xsl:when test="t:desc = 'vestiges' and @reason = 'illegible'"> <xsl:call-template name="tpl-vest"> @@ -326,7 +326,7 @@ <xsl:when test="$cur-max >= number(@quantity)"> <xsl:choose> - <xsl:when test="t:desc='vestiges' and @reason='illegible' and ($parm-leiden-style='ddbdp' or $parm-leiden-style='sammelbuch')"> + <xsl:when test="t:desc='vestiges' and @reason='illegible' and ($parm-leiden-style=('ddbdp','dclp','sammelbuch'))"> <xsl:call-template name="tpl-vest"> <xsl:with-param name="circa" select="$circa"/> </xsl:call-template> @@ -342,7 +342,7 @@ <xsl:otherwise> <xsl:choose> <xsl:when - test="t:desc='vestiges' and @reason='illegible' and ($parm-leiden-style='ddbdp' or $parm-leiden-style='sammelbuch')"> + test="t:desc='vestiges' and @reason='illegible' and ($parm-leiden-style=('ddbdp','dclp','sammelbuch'))"> <xsl:call-template name="tpl-vest"> <xsl:with-param name="circa" select="$circa"/> </xsl:call-template> @@ -358,7 +358,7 @@ <xsl:when test="@atLeast and @atMost and not(starts-with($parm-leiden-style, 'edh'))"> <!-- reason illegible and lost caught in the otherwise --> <xsl:choose> - <xsl:when test="$parm-leiden-style = ('ddbdp','sammelbuch')"> + <xsl:when test="$parm-leiden-style = ('ddbdp','dclp','sammelbuch')"> <xsl:choose> <xsl:when test="t:desc='vestiges' and @reason='illegible'"> <xsl:call-template name="tpl-vest"> @@ -417,7 +417,7 @@ <xsl:when test="@quantity and @unit='line'"> <xsl:choose> - <xsl:when test="$parm-leiden-style = ('ddbdp','sammelbuch')"> + <xsl:when test="$parm-leiden-style = ('ddbdp','dclp','sammelbuch')"> <xsl:choose> <xsl:when test="desc = 'vestiges' and @reason = 'illegible'"> <xsl:call-template name="tpl-vest"> @@ -482,7 +482,7 @@ <xsl:when test="@quantity and @unit='cm'"> <xsl:choose> <xsl:when - test="desc = 'vestiges' and $parm-leiden-style = ('ddbdp','sammelbuch') and @reason = 'illegible'"> + test="desc = 'vestiges' and $parm-leiden-style = ('ddbdp','dclp','sammelbuch') and @reason = 'illegible'"> <xsl:call-template name="tpl-vest"> <xsl:with-param name="circa" select="$circa"/> </xsl:call-template> @@ -504,7 +504,7 @@ <xsl:otherwise> <xsl:choose> <xsl:when - test="desc = 'vestiges' and $parm-leiden-style = ('ddbdp','sammelbuch') and @reason = 'illegible'"> + test="desc = 'vestiges' and $parm-leiden-style = ('ddbdp','dclp','sammelbuch') and @reason = 'illegible'"> <xsl:call-template name="tpl-vest"> <xsl:with-param name="circa" select="$circa"/> </xsl:call-template> diff --git a/teihandshift.xsl b/teihandshift.xsl index 33aa2dd..c9ba74a 100644 --- a/teihandshift.xsl +++ b/teihandshift.xsl @@ -7,7 +7,7 @@ <xsl:template match="t:handShift"> <xsl:param name="parm-leiden-style" tunnel="yes" required="no"></xsl:param> <xsl:choose> - <xsl:when test="($parm-leiden-style = 'ddbdp' or $parm-leiden-style = 'sammelbuch')"> + <xsl:when test="($parm-leiden-style = ('ddbdp','dclp','sammelbuch'))"> <xsl:text>(hand </xsl:text> <xsl:value-of select="substring-after(@new, 'm')"/> <xsl:if test="@cert='low'"> diff --git a/teilb.xsl b/teilb.xsl index 1c92beb..4e65a5c 100644 --- a/teilb.xsl +++ b/teilb.xsl @@ -20,7 +20,7 @@ </xsl:choose> <xsl:choose> <!-- If verse-line is needed in ddbdp and @n is not a number eg 2a --> - <xsl:when test="$parm-verse-lines = 'on' and not(number(@n)) and ($parm-leiden-style = 'ddbdp' or $parm-leiden-style = 'sammelbuch')"> + <xsl:when test="$parm-verse-lines = 'on' and not(number(@n)) and ($parm-leiden-style = ('ddbdp','dclp','sammelbuch'))"> <xsl:call-template name="lb-content"/> </xsl:when> <xsl:when test="number(@n) and @n mod $parm-line-inc = 0 and not(@n = 0) and not(starts-with($parm-leiden-style, 'edh'))"> @@ -28,7 +28,7 @@ </xsl:when> </xsl:choose> </xsl:if> - <xsl:if test="$parm-leiden-style=('ddbdp','sammelbuch') and @rend"> + <xsl:if test="$parm-leiden-style=('ddbdp','dclp','sammelbuch') and @rend"> <xsl:text> (</xsl:text> <xsl:value-of select="@rend"/> <xsl:text>) </xsl:text> diff --git a/teinum.xsl b/teinum.xsl index 653abe7..df61874 100644 --- a/teinum.xsl +++ b/teinum.xsl @@ -10,7 +10,7 @@ <xsl:param name="parm-leiden-style" tunnel="yes" required="no"></xsl:param> <xsl:choose> <xsl:when test="not(child::t:* or child::text())"/> - <xsl:when test="$parm-leiden-style = ('ddbdp','sammelbuch')"> + <xsl:when test="$parm-leiden-style = ('ddbdp','dclp','sammelbuch')"> <xsl:apply-templates/> <xsl:if test="@rend='tick'"> <xsl:text>´</xsl:text> diff --git a/teiorigandreg.xsl b/teiorigandreg.xsl index 4fd40ee..5447d1a 100644 --- a/teiorigandreg.xsl +++ b/teiorigandreg.xsl @@ -15,7 +15,7 @@ </xsl:when> <xsl:otherwise> <xsl:apply-templates/> - <xsl:if test="$parm-leiden-style = 'ddbdp'"> + <xsl:if test="$parm-leiden-style = ('ddbdp','dclp')"> <!-- found in tpl-certlow.xsl --> <xsl:call-template name="cert-low"/> <!-- if context is inside the app-part of an app-like element, print reg as well --> diff --git a/teiq.xsl b/teiq.xsl index ba3d50f..0e77f30 100644 --- a/teiq.xsl +++ b/teiq.xsl @@ -11,7 +11,7 @@ <xsl:when test="($parm-edn-structure = 'rib')"> <xsl:text>‘</xsl:text><xsl:apply-templates/><xsl:text>’</xsl:text> </xsl:when> - <xsl:when test="($parm-leiden-style = 'ddbdp' or $parm-leiden-style = 'sammelbuch')"> + <xsl:when test="($parm-leiden-style = ('ddbdp','dclp','sammelbuch'))"> <xsl:text>'</xsl:text> <xsl:apply-templates/> <xsl:text>'</xsl:text> diff --git a/teisicandcorr.xsl b/teisicandcorr.xsl index 61f1429..c10138a 100644 --- a/teisicandcorr.xsl +++ b/teisicandcorr.xsl @@ -9,7 +9,7 @@ <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:choose> - <xsl:when test="$parm-edition-type='diplomatic' or $parm-leiden-style=('ddbdp','sammelbuch')"> + <xsl:when test="$parm-edition-type='diplomatic' or $parm-leiden-style=('ddbdp','dclp','sammelbuch')"> <xsl:apply-templates/> <!-- if context is inside the app-part of an app-like element... --> <xsl:if test="ancestor::t:*[local-name()=('reg','corr','rdg') @@ -30,7 +30,7 @@ <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:choose> - <xsl:when test="$parm-edition-type='diplomatic' or $parm-leiden-style=('ddbdp','sammelbuch')"/> + <xsl:when test="$parm-edition-type='diplomatic' or $parm-leiden-style=('ddbdp','dclp','sammelbuch')"/> <xsl:otherwise> <xsl:choose> <xsl:when test="$parm-leiden-style = 'seg'"> diff --git a/teispace.xsl b/teispace.xsl index b4106a5..af4f8e3 100644 --- a/teispace.xsl +++ b/teispace.xsl @@ -45,7 +45,7 @@ <xsl:otherwise> <xsl:choose> - <xsl:when test="($parm-leiden-style = 'ddbdp' or $parm-leiden-style = 'sammelbuch')"> + <xsl:when test="($parm-leiden-style = ('ddbdp','dclp','sammelbuch'))"> <xsl:text> vac. </xsl:text> <xsl:choose> <xsl:when test="@quantity"> diff --git a/teisupplied.xsl b/teisupplied.xsl index 2b9fbd6..cd66496 100644 --- a/teisupplied.xsl +++ b/teisupplied.xsl @@ -8,7 +8,7 @@ <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:when test="$leiden-style = 'dclp'"><xsl:call-template name="supplied-parallel"/></xsl:when> <xsl:otherwise><xsl:apply-templates/></xsl:otherwise> </xsl:choose> @@ -18,7 +18,7 @@ <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" /> - <xsl:if test="($parm-leiden-style = 'ddbdp' or $parm-leiden-style = 'sammelbuch') and child::t:*[1][local-name() = 'milestone'][@rend = 'paragraphos']"> + <xsl:if test="($parm-leiden-style = ('ddbdp','dclp','sammelbuch')) and child::t:*[1][local-name() = 'milestone'][@rend = 'paragraphos']"> <br/> </xsl:if> <xsl:choose> @@ -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','dclp') 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> diff --git a/teiunclear.xsl b/teiunclear.xsl index b692853..167dbfe 100644 --- a/teiunclear.xsl +++ b/teiunclear.xsl @@ -44,7 +44,7 @@ <xsl:when test="$parm-leiden-style='london'"> <xsl:text>·</xsl:text> </xsl:when> - <xsl:when test="$parm-leiden-style=('ddbdp','sammelbuch')"> + <xsl:when test="$parm-leiden-style=('ddbdp','dclp','sammelbuch')"> <xsl:text>  ̣</xsl:text> </xsl:when> <xsl:otherwise> diff --git a/txt-teig.xsl b/txt-teig.xsl index 8759130..6aac81e 100644 --- a/txt-teig.xsl +++ b/txt-teig.xsl @@ -14,7 +14,7 @@ <xsl:choose> <xsl:when test="starts-with($parm-leiden-style, 'edh')"/> - <xsl:when test="($parm-leiden-style = 'ddbdp' or $parm-leiden-style = 'sammelbuch')"> + <xsl:when test="($parm-leiden-style = ('ddbdp','dclp','sammelbuch'))"> <xsl:call-template name="g-ddbdp"/> </xsl:when> <xsl:when test="$parm-leiden-style = 'dohnicht'"> diff --git a/txt-teigap.xsl b/txt-teigap.xsl index b9f7a79..6222050 100644 --- a/txt-teigap.xsl +++ b/txt-teigap.xsl @@ -8,7 +8,7 @@ <xsl:template match="t:gap[@reason = 'lost']"> <xsl:param name="parm-leiden-style" tunnel="yes" required="no"></xsl:param> - <xsl:if test="@extent='unknown' and @reason='lost' and @unit='line' and ($parm-leiden-style = 'ddbdp' or $parm-leiden-style = 'sammelbuch')"> + <xsl:if test="@extent='unknown' and @reason='lost' and @unit='line' and ($parm-leiden-style = ('ddbdp','dclp','sammelbuch'))"> <xsl:text> </xsl:text> </xsl:if> diff --git a/txt-teilb.xsl b/txt-teilb.xsl index 85b462a..241c20a 100644 --- a/txt-teilb.xsl +++ b/txt-teilb.xsl @@ -35,7 +35,7 @@ <!-- *or unless* the lb is first in its ancestor div --> <xsl:when test="generate-id(self::t:lb) = generate-id(ancestor::t:div[1]/t:*[child::t:lb][1]/t:lb[1])"/> <!-- *or unless* the second part of an app in ddbdp --> - <xsl:when test="($parm-leiden-style = 'ddbdp' or $parm-leiden-style = 'sammelbuch') and + <xsl:when test="($parm-leiden-style = ('ddbdp','dclp','sammelbuch')) and (ancestor::t:corr or ancestor::t:reg or ancestor::t:rdg or ancestor::t:del[parent::t:subst])"/> <!-- *unless* previous line ends with space / g / supplied[reason=lost] --> <!-- in which case the hyphen will be inserted before the space/g r final ']' of supplied @@ -74,7 +74,7 @@ </xsl:otherwise> </xsl:choose> <xsl:choose> - <xsl:when test="not(number(@n)) and ($parm-leiden-style = 'ddbdp' or $parm-leiden-style = 'sammelbuch')"> + <xsl:when test="not(number(@n)) and ($parm-leiden-style = ('ddbdp','dclp','sammelbuch'))"> <xsl:call-template name="margin-num"/> </xsl:when> <xsl:when test="number(@n) and @n mod $parm-line-inc = 0 and not(@n = 0)"> diff --git a/txt-teimilestone.xsl b/txt-teimilestone.xsl index 08afcba..6d682a0 100644 --- a/txt-teimilestone.xsl +++ b/txt-teimilestone.xsl @@ -8,7 +8,7 @@ <xsl:template match="t:milestone"> <xsl:param name="parm-leiden-style" tunnel="yes" required="no"></xsl:param> <xsl:choose> - <xsl:when test="($parm-leiden-style = 'ddbdp' or $parm-leiden-style = 'sammelbuch') and ancestor::t:div[@type = 'translation']"> + <xsl:when test="($parm-leiden-style = ('ddbdp','dclp','sammelbuch')) and ancestor::t:div[@type = 'translation']"> <xsl:if test="@rend = 'break'"> <xsl:text> </xsl:text> @@ -18,7 +18,7 @@ </xsl:when> <xsl:when test="@rend = 'paragraphos'"> <xsl:choose> - <xsl:when test="($parm-leiden-style = 'ddbdp' or $parm-leiden-style = 'sammelbuch')"> + <xsl:when test="($parm-leiden-style = ('ddbdp','dclp','sammelbuch'))"> <xsl:if test="not(parent::t:supplied)"> <xsl:text> </xsl:text> From ce2fb7cddf6f96900804bb199fda315178a30b5f Mon Sep 17 00:00:00 2001 From: Winona Salesky <wsalesky@gmail.com> Date: Sat, 5 Aug 2017 09:08:48 -0400 Subject: [PATCH 2/3] Added additional value 'dclp' to leiden-style parameter in global-parameters.xml. Added 'dclp' to all leiden-style parameters with value ='ddbdp' and to supplied-parallel template. https://github.com/DCLP/dclpxsltbox/issues/283 --- teigap.xsl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/teigap.xsl b/teigap.xsl index 1dfb3ab..6f96b1e 100644 --- a/teigap.xsl +++ b/teigap.xsl @@ -13,7 +13,7 @@ <xsl:param name="gapReason"></xsl:param> <xsl:variable name="dot"> <xsl:choose> - <xsl:when test="$leidenStyle = ('ddbdp','sammelbuch')"> + <xsl:when test="$leidenStyle = ('ddbdp','dclp','sammelbuch')"> <xsl:text>  ̣</xsl:text> </xsl:when> <xsl:when test="$leidenStyle = 'panciera' and $gapReason='illegible'"> @@ -35,7 +35,7 @@ <xsl:param name="leidenStyle"></xsl:param> <xsl:variable name="maxnum"> <xsl:choose> - <xsl:when test="$leidenStyle = ('ddbdp','sammelbuch')"> + <xsl:when test="$leidenStyle = ('ddbdp','dclp','sammelbuch')"> <xsl:number value="8"/> </xsl:when> <xsl:otherwise> From 2b9be783bbc88a6cbc6a498ab666d59f63789f95 Mon Sep 17 00:00:00 2001 From: Winona Salesky <wsalesky@gmail.com> Date: Sat, 5 Aug 2017 10:04:07 -0400 Subject: [PATCH 3/3] Updated global parameters to use 'dclp', added paramaeter parm-leiden-style to htm-teisupplied.xsl and teisupplied.xsl --- global-parameters.xml | 4 ++-- htm-teisupplied.xsl | 3 ++- teisupplied.xsl | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/global-parameters.xml b/global-parameters.xml index 597ec35..dd38219 100644 --- a/global-parameters.xml +++ b/global-parameters.xml @@ -10,7 +10,7 @@ <parameter> <name>leiden-style</name> <value>ddbdp</value> - <value>dclp</value> + <value on="yes">dclp</value> <value>dohnicht</value> <value>edh-itx</value> <value>edh-names</value> @@ -18,7 +18,7 @@ <value>ila</value> <value>iospe</value> <value>london</value> - <value on="yes">panciera</value> + <value>panciera</value> <value>petrae</value> <value>rib</value> <value>seg</value> diff --git a/htm-teisupplied.xsl b/htm-teisupplied.xsl index 8216294..a44595e 100644 --- a/htm-teisupplied.xsl +++ b/htm-teisupplied.xsl @@ -6,8 +6,9 @@ <!-- Called from teisupplied.xsl --> <xsl:template name="supplied-parallel"> + <xsl:param name="parm-leiden-style" tunnel="yes" required="no"></xsl:param> <xsl:choose> - <xsl:when test="$leiden-style = 'dclp'">⎣<xsl:apply-templates/>⎦</xsl:when> + <xsl:when test="$parm-leiden-style = 'dclp'">⎣<xsl:apply-templates/>⎦</xsl:when> <xsl:otherwise><span class="underline"><xsl:apply-templates/></span></xsl:otherwise> </xsl:choose> diff --git a/teisupplied.xsl b/teisupplied.xsl index cd66496..34a609f 100644 --- a/teisupplied.xsl +++ b/teisupplied.xsl @@ -7,8 +7,9 @@ version="2.0"> <xsl:template match="t:supplied[@evidence='parallel']" priority="1"> + <xsl:param name="parm-leiden-style" tunnel="yes" required="no"></xsl:param> <xsl:choose> - <xsl:when test="$leiden-style = 'dclp'"><xsl:call-template name="supplied-parallel"/></xsl:when> + <xsl:when test="$parm-leiden-style = 'dclp'"><xsl:call-template name="supplied-parallel"/></xsl:when> <xsl:otherwise><xsl:apply-templates/></xsl:otherwise> </xsl:choose>