merge from master preparatory to testing

example-p5-xslt/global-parameters.xml → global-parameters.xml

@@ -10,14 +10,15 @@
   <parameter>
     <name>leiden-style</name>
     <value>ddbdp</value>
+    <value on="yes">dclp</value>
     <value>dohnicht</value>
     <value>edh-itx</value>
     <value>edh-names</value>
     <value>edh-web</value>
     <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>

example-p5-xslt/htm-teiab.xsl → htm-teiab.xsl

@@ -25,11 +25,11 @@
             <xsl:text>-</xsl:text>
          </xsl:if>
          <!-- if final lb in ab is L2R or R2L, then print arrow here -->
-         <xsl:if test="not($parm-leiden-style=('ddbdp','sammelbuch')) 
+         <xsl:if test="not($parm-leiden-style=('ddbdp','dclp','sammelbuch')) 
             and descendant::t:lb[last()][@rend='left-to-right']">
             <xsl:text>&#xa0;&#xa0;→</xsl:text>
          </xsl:if>
-         <xsl:if test="not($parm-leiden-style=('ddbdp','sammelbuch')) 
+         <xsl:if test="not($parm-leiden-style=('ddbdp','dclp','sammelbuch')) 
             and descendant::t:lb[last()][@rend='right-to-left']">
             <xsl:text>&#xa0;&#xa0;←</xsl:text>
          </xsl:if>

example-p5-xslt/htm-teiaddanddel.xsl → htm-teiaddanddel.xsl

@@ -13,7 +13,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' or $parm-leiden-style = 'sammelbuch') and @place='interlinear'">
+          <xsl:when test="($parm-leiden-style = ('ddbdp','dclp','sammelbuch')) and @place='interlinear'">
             <span style="font-size:smaller;">
                <xsl:apply-imports/>
             </span>

example-p5-xslt/htm-teiapp.xsl → htm-teiapp.xsl

@@ -67,7 +67,7 @@
       <xsl:param name="parm-leiden-style" tunnel="yes" required="no"></xsl:param>
       <xsl:param name="parm-hgv-gloss" tunnel="yes" required="no"></xsl:param>
       <xsl:choose>
-          <xsl:when test="$parm-leiden-style=('ddbdp','sammelbuch') and ancestor::t:div[@type='translation']">
+         <xsl:when test="$parm-leiden-style=('ddbdp','dclp','sammelbuch') and ancestor::t:div[@type='translation']">
             <xsl:variable name="wit-val" select="@resp"/>
             <xsl:variable name="lang" select="ancestor::t:div[@type = 'translation']/@xml:lang"/>
             <span class="term">
@@ -97,12 +97,12 @@
               </span>                 
             </span>
          </xsl:when>
-          <xsl:when test="$parm-leiden-style=('ddbdp','sammelbuch') and ancestor::t:*[local-name()=('reg','corr','rdg') 
+         <xsl:when test="$parm-leiden-style=('ddbdp','dclp','sammelbuch') and ancestor::t:*[local-name()=('reg','corr','rdg') 
             or self::t:del[@rend='corrected']]">
             <xsl:apply-templates/>
             <xsl:if test="@resp">
                <xsl:choose>
-                   <xsl:when test="$parm-leiden-style='ddbdp'"><xsl:text> FNORD-SPLIT </xsl:text></xsl:when>
+                  <xsl:when test="$parm-leiden-style=('ddbdp','dclp')"><xsl:text> FNORD-SPLIT </xsl:text></xsl:when>
                   <xsl:otherwise><xsl:text> </xsl:text></xsl:otherwise>
                </xsl:choose>              
                <xsl:if test="parent::t:app[@type='BL']">
@@ -115,7 +115,7 @@
                   <xsl:text> (via PE)</xsl:text>
                </xsl:if>
                <xsl:choose>
-                   <xsl:when test="$parm-leiden-style='ddbdp'"><xsl:text> FNORD-DELIM </xsl:text></xsl:when>
+                  <xsl:when test="$parm-leiden-style=('ddbdp','dclp')"><xsl:text> FNORD-DELIM </xsl:text></xsl:when>
                   <xsl:otherwise><xsl:text> </xsl:text></xsl:otherwise>
                </xsl:choose>  
             </xsl:if>

example-p5-xslt/htm-teidivedition.xsl → htm-teidivedition.xsl

@@ -42,7 +42,7 @@
          <span class="textpartnumber" id="{$div-type}ab{$div-loc}{@n}">
             <!-- add ancestor textparts -->
             <xsl:if
-               test="($parm-leiden-style = 'ddbdp' or $parm-leiden-style = 'sammelbuch') and @subtype">
+               test="($parm-leiden-style = ('ddbdp','dclp','sammelbuch')) and @subtype">
                <xsl:value-of select="@subtype"/>
                <xsl:text> </xsl:text>
             </xsl:if>

example-p5-xslt/htm-teifigure.xsl → htm-teifigure.xsl

@@ -11,7 +11,7 @@
                <xsl:apply-templates/>
             </a>
          </xsl:when>
-          <xsl:when test="$parm-leiden-style=('ddbdp','sammelbuch')">
+         <xsl:when test="$parm-leiden-style=('ddbdp','dclp','sammelbuch')">
             <xsl:text>(</xsl:text>
             <xsl:apply-templates/>
             <xsl:text>)</xsl:text>

example-p5-xslt/htm-teig.xsl → htm-teig.xsl

@@ -10,12 +10,13 @@
   <xsl:template match="t:g">
       <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>
       <xsl:call-template name="lb-dash"/>
       <xsl:call-template name="w-space"/>
 
      <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'))">
         <!-- Found in teig.xsl -->
         <xsl:call-template name="g-ddbdp"/>
          </xsl:when>

example-p5-xslt/htm-teigap.xsl → htm-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')) 
          and not(preceding-sibling::t:*[1][local-name() = 'lb'])">
          <!--     adds a newline character before gap-extent-line in DDbDP unless <lb/> present    -->
          <br/>

example-p5-xslt/htm-teihead.xsl → htm-teihead.xsl

@@ -14,7 +14,7 @@
    <xsl:template match="t:body/t:head">
        <xsl:param name="parm-leiden-style" tunnel="yes" required="no"></xsl:param>
        <xsl:choose>
-           <xsl:when test="$parm-leiden-style='ddbdp'">
+          <xsl:when test="$parm-leiden-style=('ddbdp','dclp')">
             <xsl:element name="p">
                <xsl:apply-templates/>
             </xsl:element>

example-p5-xslt/htm-teihi.xsl → htm-teihi.xsl

@@ -120,7 +120,7 @@
          <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
          <xsl:when test="@rend='subscript'">
             <xsl:choose>
-                <xsl:when test="$parm-leiden-style = 'ddbdp' or $parm-leiden-style = 'sammelbuch'">
+               <xsl:when test="$parm-leiden-style = ('ddbdp','dclp','sammelbuch')">
                   <span style="vertical-align:sub;">
                      <xsl:apply-imports/>
                   </span>
@@ -136,7 +136,7 @@
          <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
          <xsl:when test="@rend='superscript'">
             <xsl:choose>
-                <xsl:when test="$parm-leiden-style = 'ddbdp' or $parm-leiden-style = 'sammelbuch'">
+               <xsl:when test="$parm-leiden-style = ('ddbdp','dclp','sammelbuch')">
                   <span style="vertical-align:super;">
                      <xsl:apply-imports/>
                   </span>

example-p5-xslt/htm-teilb.xsl → htm-teilb.xsl

@@ -42,11 +42,11 @@
                         <xsl:when
                             test="generate-id(self::t:lb) = generate-id(ancestor::t:div[1]/t:*[child::t:lb][1]/t:lb[1])"/>
                         <xsl:when
-                            test="$parm-leiden-style = 'ddbdp' and ((not(ancestor::*[name() = 'TEI'])) or $location = 'apparatus')"/>
+                            test="$parm-leiden-style = ('ddbdp','dclp') and ((not(ancestor::*[name() = 'TEI'])) or $location = 'apparatus')"/>
                         <!--   *or unless* the second part of an app in ddbdp  -->
                         <xsl:when
                             test="
-                                ($parm-leiden-style = 'ddbdp' or $parm-leiden-style = 'sammelbuch') and
+                            ($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
@@ -72,14 +72,14 @@
                 <!-- arrows after final line handled in htm-teiab.xsl -->
                 <xsl:if
                     test="
-                        not($parm-leiden-style = ('ddbdp', 'sammelbuch'))
+                    not($parm-leiden-style = ('ddbdp','dclp', 'sammelbuch'))
                         and not(position() = 1)
                         and preceding::t:lb[1][@rend = 'left-to-right']">
                     <xsl:text>&#xa0;&#xa0;→</xsl:text>
                 </xsl:if>
                 <xsl:if
                     test="
-                        not($parm-leiden-style = ('ddbdp', 'sammelbuch'))
+                    not($parm-leiden-style = ('ddbdp', 'dclp','sammelbuch'))
                         and not(position() = 1)
                         and preceding::t:lb[1][@rend = 'right-to-left']">
                     <xsl:text>&#xa0;&#xa0;←</xsl:text>
@@ -111,7 +111,7 @@
                </xsl:when>
                -->
                     <xsl:when
-                        test="$parm-leiden-style = 'ddbdp' and ((not(ancestor::*[name() = 'TEI'])) or $location = 'apparatus')">
+                        test="$parm-leiden-style = ('ddbdp','dclp') and ((not(ancestor::*[name() = 'TEI'])) or $location = 'apparatus')">
                         <xsl:choose>
                             <xsl:when test="@break = 'no' or @type = 'inWord'">
                                 <xsl:text>|</xsl:text>
@@ -141,26 +141,26 @@
                 <xsl:choose>
                     <xsl:when test="$location = 'apparatus'"/>
                     <xsl:when
-                        test="not(number(@n)) and ($parm-leiden-style = 'ddbdp' or $parm-leiden-style = 'sammelbuch')">
+                        test="not(number(@n)) and ($parm-leiden-style = ('ddbdp','dclp','sammelbuch'))">
                         <!--         non-numerical line-nos always printed in DDbDP         -->
                         <xsl:call-template name="margin-num"/>
                     </xsl:when>
                     <xsl:when
                         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')))">
                         <!-- prints line-nos divisible by stated increment, unless zero
                      and unless it is a gap line or vacat in DDbDP -->
                         <xsl:call-template name="margin-num"/>
                     </xsl:when>
                     <xsl:when
-                        test="$parm-leiden-style = 'ddbdp' and preceding-sibling::t:*[1][local-name() = 'gap'][@unit = 'line']">
+                        test="$parm-leiden-style = ('ddbdp','dclp') and preceding-sibling::t:*[1][local-name() = 'gap'][@unit = 'line']">
                         <!-- always print line-no after gap line in ddbdp -->
                         <xsl:call-template name="margin-num"/>
                     </xsl:when>
                     <xsl:when
-                        test="$parm-leiden-style = 'ddbdp' and following::t:lb[1][ancestor::t:reg[following-sibling::t:orig[not(descendant::t:lb)]]]">
+                        test="$parm-leiden-style = ('ddbdp','dclp') and following::t:lb[1][ancestor::t:reg[following-sibling::t:orig[not(descendant::t:lb)]]]">
                         <!-- always print line-no when broken orig in line, in ddbdp -->
                         <xsl:call-template name="margin-num"/>
                     </xsl:when>
@@ -174,7 +174,7 @@
         <span>
                     <xsl:choose>
                         <xsl:when
-                            test="$parm-leiden-style = 'ddbdp' and following::t:lb[1][ancestor::t:reg[following-sibling::t:orig[not(descendant::t:lb)]]]">
+                            test="$parm-leiden-style = ('ddbdp','dclp') and following::t:lb[1][ancestor::t:reg[following-sibling::t:orig[not(descendant::t:lb)]]]">
                             <xsl:attribute name="class">
                                 <xsl:text>linenumberbroken</xsl:text>
                             </xsl:attribute>

example-p5-xslt/htm-teimilestone.xsl → htm-teimilestone.xsl

@@ -11,7 +11,7 @@
 
        <xsl:choose>
          <xsl:when
-             test="($parm-leiden-style = 'ddbdp' or $parm-leiden-style = 'sammelbuch') and ancestor::t:div[@type = 'translation']">
+            test="($parm-leiden-style = ('ddbdp','dclp','sammelbuch')) and ancestor::t:div[@type = 'translation']">
             <xsl:if test="@rend = 'break'">
                <br/>
             </xsl:if>
@@ -22,7 +22,7 @@
             </sup>
             <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:choose>
                <xsl:when test="@rend = 'wavy-line'">
                   <xsl:if test="not(parent::t:supplied)">

example-p5-xslt/htm-teinum.xsl → htm-teinum.xsl

@@ -10,7 +10,7 @@
        <xsl:param name="parm-leiden-style" tunnel="yes" required="no"></xsl:param>
        <xsl:choose>
          <xsl:when
-             test="$parm-leiden-style=('ddbdp','sammelbuch') 
+            test="$parm-leiden-style=('ddbdp','dclp','sammelbuch') 
             and string(.)">
             <span>
                <xsl:attribute name="title">