rendering of inslib symbols (partly), numerals and ligatures

The current templates in teig.xsl are not handling symbols as expected; see EpiDoc/EFES#63
SigiDoc · Feb 26, 2022 · cb5eade · cb5eade
1 parent ae34dd8
commit cb5eade
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 5 deletions.
diff --git a/global.css b/global.css
@@ -52,7 +52,13 @@
 
 .petraeligature {
     text-decoration: underline;
-    }
+    }    
+
+.inslibligature {
+      border-top: 2px solid black;
+      border-radius: 6px;
+      padding: 4px 2px 0px 2px;
+}
 
 .underline {
     text-decoration: underline;

diff --git a/htm-teig.xsl b/htm-teig.xsl
@@ -10,6 +10,7 @@
   <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="parm-edn-structure" 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"/>
@@ -45,6 +46,9 @@
            <xsl:apply-imports/>
            <xsl:text>⊃</xsl:text>
         </xsl:when>
+        <xsl:when test="$parm-edn-structure='inslib' and (starts-with(ancestor::t:TEI//t:publicationStmt/t:idno[@type='filename']/text(), 'IGCyr') or starts-with(ancestor::t:TEI//t:publicationStmt/t:idno[@type='filename']/text(), 'GVCyr'))">
+         <xsl:apply-imports/>
+       </xsl:when>
         <xsl:otherwise>
            <xsl:text>((</xsl:text>
            <xsl:apply-imports/>

diff --git a/htm-teihi.xsl b/htm-teihi.xsl
@@ -8,6 +8,7 @@
 
    <xsl:template match="t:hi">
        <xsl:param name="parm-leiden-style" tunnel="yes" required="no"></xsl:param>
+       <xsl:param name="parm-edn-structure" tunnel="yes" required="no"></xsl:param>
        <xsl:choose>
          <!-- No html code needed for these -->
          <xsl:when
@@ -63,6 +64,9 @@
                   <xsl:when test="$parm-leiden-style=('petrae','iospe')">
                      <xsl:attribute name="class">petraeligature</xsl:attribute>
                   </xsl:when>
+                  <xsl:when test="$parm-edn-structure = 'inslib'">
+                     <xsl:attribute name="class">inslibligature</xsl:attribute>
+                  </xsl:when>
                   <xsl:otherwise>
                      <xsl:attribute name="class">ligature</xsl:attribute>
                   </xsl:otherwise>

diff --git a/teig.xsl b/teig.xsl
@@ -1,4 +1,4 @@
-<!-- $Id$ --><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">
+<!-- $Id$ --><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" xmlns:fn="http://www.w3.org/2005/xpath-functions" exclude-result-prefixes="t EDF" version="2.0">
    <!-- Templates imported by [htm|txt]-teig.xsl -->
 
    <xsl:template name="lb-dash">
@@ -17,6 +17,7 @@
    <xsl:template match="t:g">
       <xsl:param name="parm-leiden-style" tunnel="yes" required="no"></xsl:param>
       <xsl:param name="parm-edition-type" tunnel="yes" required="no"></xsl:param>
+      <xsl:param name="parm-edn-structure" tunnel="yes" required="no"></xsl:param>
       <xsl:param name="parm-glyph-variant" tunnel="yes" required="no"></xsl:param>
 
       <xsl:choose>

diff --git a/teihi.xsl b/teihi.xsl
@@ -28,6 +28,7 @@
         <xsl:param name="parm-external-app-style" tunnel="yes" required="no"></xsl:param>
         <xsl:param name="parm-internal-app-style" tunnel="yes" required="no"></xsl:param>
         <xsl:param name="parm-edition-type" tunnel="yes" required="no"></xsl:param>
+        <xsl:param name="parm-edn-structure" 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"/>
 
@@ -48,7 +49,7 @@
         </xsl:variable>
 
         <xsl:choose>
-            <xsl:when test="@rend='ligature'">
+            <xsl:when test="@rend='ligature' and not($parm-edn-structure='inslib')">
                 <xsl:choose>
                     <xsl:when test="$parm-leiden-style='seg'">
                         <xsl:if test="string-length(normalize-space(.))=2">

diff --git a/teinum.xsl b/teinum.xsl
@@ -8,15 +8,16 @@
    <xsl:template match="t:num">
       <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="parm-edn-structure" tunnel="yes" required="no"></xsl:param>
       <xsl:choose>
          <xsl:when test="not(child::t:* or child::text())"/>
-         <xsl:when test="$parm-leiden-style = ('ddbdp','dclp','sammelbuch')">
+         <xsl:when test="$parm-leiden-style = ('ddbdp','dclp','sammelbuch') and $parm-edn-structure!='inslib'">
             <xsl:apply-templates/>
             <xsl:if test="@rend='tick'">
                <xsl:text>´</xsl:text>
             </xsl:if>
          </xsl:when>
-         <xsl:when test="$parm-edition-type='interpretive' and ancestor::t:*[@xml:lang][1][@xml:lang = 'grc']
+         <xsl:when test="$parm-edn-structure!='inslib' and $parm-edition-type='interpretive' and ancestor::t:*[@xml:lang][1][@xml:lang = 'grc']
             and ((number(@value) and not(contains(@value,'/')))
             or (number(@atLeast) and not(contains(@atLeast,'/')))
             or (number(@atMost) and not(contains(@atMost,'/'))))">