Merge branch 'drop-detailed-accents'

sbsdev · Apr 18, 2023 · 6e55610 · 6e55610
2 parents 30ffd16 + a6ceea9
commit 6e55610
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/test_xsl/getTable_test.xml b/test_xsl/getTable_test.xml
@@ -122,7 +122,7 @@
       <utfx:source>
         <dtb:span brl:accents="reduced" xml:lang="de"/>
       </utfx:source>
-      <utfx:expected>sbs.dis,sbs-de-core6.cti,sbs-de-accents.cti,sbs-special.cti,sbs-whitespace.mod,sbs-de-capsign-fake.mod,sbs-numsign.mod,litdigits6Dots.uti,sbs-de-core.mod,sbs-de-g0-core.mod,sbs-de-g1-white.mod,sbs-de-g1-core.mod,sbs-de-accents-reduced.mod,sbs-special.mod</utfx:expected>
+      <utfx:expected>sbs.dis,sbs-de-core6.cti,sbs-de-accents.cti,sbs-special.cti,sbs-whitespace.mod,sbs-de-capsign-fake.mod,sbs-numsign.mod,litdigits6Dots.uti,sbs-de-core.mod,sbs-de-g0-core.mod,sbs-de-g1-white.mod,sbs-de-g1-core.mod,sbs-de-accents.mod,sbs-special.mod</utfx:expected>
     </utfx:assert-equal>
   </utfx:test>
 

diff --git a/xsl/dtbook2sbsform.xsl b/xsl/dtbook2sbsform.xsl
@@ -369,9 +369,6 @@
     <xsl:if test="$context != 'date_month' and $context != 'date_day'">
       <xsl:choose>
         <xsl:when test="ancestor-or-self::dtb:span[@brl:accents = 'reduced']">
-          <xsl:text>sbs-de-accents-reduced.mod,</xsl:text>
-        </xsl:when>
-        <xsl:when test="ancestor-or-self::dtb:span[@brl:accents = 'detailed']">
           <xsl:text>sbs-de-accents.mod,</xsl:text>
         </xsl:when>
         <xsl:otherwise>
@@ -380,9 +377,6 @@
             <xsl:when test="$detailed_accented_characters = 'de-accents-ch'">
               <xsl:text>sbs-de-accents-ch.mod,</xsl:text>
             </xsl:when>
-            <xsl:when test="$detailed_accented_characters = 'de-accents-reduced'">
-              <xsl:text>sbs-de-accents-reduced.mod,</xsl:text>
-            </xsl:when>
             <xsl:otherwise>
               <xsl:text>sbs-de-accents.mod,</xsl:text>
             </xsl:otherwise>