Merge pull request #7 from DCLP/issue163

strip accents from Unicode characters if they are not wrapped in corresponding <hi rend> elements
DCLP · Jun 9, 2017 · 923ef90 · 923ef90
2 parents e737b28 + 743fad3
commit 923ef90
Showing 1 changed file with 15 additions and 4 deletions.
diff --git a/example-p5-xslt/tpl-apparatus.xsl b/example-p5-xslt/tpl-apparatus.xsl
@@ -952,7 +952,6 @@
 
       <xsl:variable name="origin" select="name()"/>
       <xsl:variable name="origin_id" select="generate-id()"/>
-
       <xsl:choose>
          <xsl:when test="$step[self::t:lb[not(@break='no')]]"/>
          <xsl:when test="$step[self::text()]">
@@ -1089,9 +1088,21 @@
                         </xsl:for-each>
                      </xsl:when>
                      <xsl:otherwise>
-                        <xsl:apply-templates select="$step">
-                           <xsl:with-param name="location" select="'apparatus'" tunnel="yes"/>
-                        </xsl:apply-templates>
+                        <xsl:variable name="str">
+                           <xsl:choose>
+                              <xsl:when test="$step[self::t:hi]">   
+                                 <xsl:call-template name="hirend_print"/>
+                              </xsl:when>
+                              <xsl:otherwise>
+                                 <xsl:call-template name="trans-string">
+                                    <xsl:with-param name="trans-text">
+                                       <xsl:apply-templates select="$step"/>
+                                    </xsl:with-param>
+                                 </xsl:call-template>
+                              </xsl:otherwise>
+                           </xsl:choose>
+                        </xsl:variable>
+                        <xsl:value-of select="$str"/>
                      </xsl:otherwise>
                   </xsl:choose>
                   <xsl:call-template name="recurse_forward">