@pretextbook/pretext-html 0.12.0 → 0.14.0

package/assets/xsl/pretext-latex-common.xsl

@@ -5733,9 +5733,7 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 </xsl:template>
 
 <xsl:template match="ul" mode="latex-list-label">
-    <xsl:variable name="format-code">
-        <xsl:apply-templates select="." mode="format-code" />
-    </xsl:variable>
+    <xsl:variable name="format-code" select="./@pi:format-code"/>
    <xsl:choose>
         <xsl:when test="$format-code = 'disc'">\ptxlistdisc</xsl:when>
         <xsl:when test="$format-code = 'circle'">\ptxlistcircle</xsl:when>
@@ -5748,26 +5746,6 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 </xsl:template>
 
 
-<!-- Utility template to translate unordered    -->
-<!-- list level to HTML list-style-type         -->
-<!-- This is similar to Firefox default choices -->
-<!-- but different in the fourth slot           -->
-<!-- disc, circle, square, disc                 -->
-<xsl:template match="*" mode="latex-unordered-list-label-default">
-    <xsl:variable name="level">
-        <xsl:apply-templates select="." mode="unordered-list-level" />
-    </xsl:variable>
-    <xsl:choose>
-        <xsl:when test="$level='0'">\ptxlistdisc</xsl:when>
-        <xsl:when test="$level='1'">\ptxlistcircle</xsl:when>
-        <xsl:when test="$level='2'">\ptxlistsquare</xsl:when>
-        <xsl:when test="$level='3'">\ptxlistdisc</xsl:when>
-        <xsl:otherwise>
-            <xsl:message>PTX:ERROR: unordered list is more than 4 levels deep</xsl:message>
-        </xsl:otherwise>
-    </xsl:choose>
-</xsl:template>
-
 <!-- Lists themselves -->
 <!-- If columns are specified, we        -->
 <!-- wrap in the multicolumn environment -->

package/assets/xsl/pretext-text-utilities.xsl

@@ -1131,11 +1131,21 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
     <!-- Add a question mark, then grab leading substring -->
     <!-- This will fail if "?" is encoded                 -->
     <xsl:variable name="no-query-string" select="substring-before(concat($filename, '?'), '?')" />
+    <!-- Reduce to the last path segment first, else a period in a host -->
+    <!-- name or a directory ("media.w3.org", "v1.2") would be read as  -->
+    <!-- the start of an extension.  The leading slash is what makes    -->
+    <!-- "substring-after-last" return a bare filename unchanged.       -->
+    <xsl:variable name="final-segment">
+        <xsl:call-template name="substring-after-last">
+            <xsl:with-param name="input" select="concat('/', $no-query-string)" />
+            <xsl:with-param name="substr" select="'/'" />
+        </xsl:call-template>
+    </xsl:variable>
     <!-- get extension after last period   -->
     <!-- will return empty if no extension -->
     <xsl:variable name="extension">
         <xsl:call-template name="substring-after-last">
-            <xsl:with-param name="input" select="$no-query-string" />
+            <xsl:with-param name="input" select="$final-segment" />
             <xsl:with-param name="substr" select="'.'" />
         </xsl:call-template>
     </xsl:variable>

package/assets/xsl/tests/pretext-text-utilities-test.xsl

@@ -324,6 +324,125 @@ along with PreTeXt.  If not, see <http://www.gnu.org/licenses/>.
 </xsl:variable>
 
 
+<!--========================================================================-->
+<!-- test file-extension -->
+<xsl:variable name="file-extension-bare">
+  <xsl:variable name="test-val">
+    <xsl:call-template name="file-extension">
+      <xsl:with-param name="filename" select="'movie.mp4'"/>
+    </xsl:call-template>
+  </xsl:variable>
+  <xsl:call-template name="assert-equal">
+    <xsl:with-param name="expected" select="'mp4'"/>
+    <xsl:with-param name="actual" select="$test-val"/>
+    <xsl:with-param name="test-name" select="'file-extension-bare'"/>
+  </xsl:call-template>
+</xsl:variable>
+
+<xsl:variable name="file-extension-none">
+  <xsl:variable name="test-val">
+    <xsl:call-template name="file-extension">
+      <xsl:with-param name="filename" select="'movie'"/>
+    </xsl:call-template>
+  </xsl:variable>
+  <xsl:call-template name="assert-equal">
+    <xsl:with-param name="expected" select="''"/>
+    <xsl:with-param name="actual" select="$test-val"/>
+    <xsl:with-param name="test-name" select="'file-extension-none'"/>
+  </xsl:call-template>
+</xsl:variable>
+
+<xsl:variable name="file-extension-uppercase">
+  <xsl:variable name="test-val">
+    <xsl:call-template name="file-extension">
+      <xsl:with-param name="filename" select="'MOVIE.MP4'"/>
+    </xsl:call-template>
+  </xsl:variable>
+  <xsl:call-template name="assert-equal">
+    <xsl:with-param name="expected" select="'mp4'"/>
+    <xsl:with-param name="actual" select="$test-val"/>
+    <xsl:with-param name="test-name" select="'file-extension-uppercase'"/>
+  </xsl:call-template>
+</xsl:variable>
+
+<xsl:variable name="file-extension-relative-path">
+  <xsl:variable name="test-val">
+    <xsl:call-template name="file-extension">
+      <xsl:with-param name="filename" select="'video/movie.webm'"/>
+    </xsl:call-template>
+  </xsl:variable>
+  <xsl:call-template name="assert-equal">
+    <xsl:with-param name="expected" select="'webm'"/>
+    <xsl:with-param name="actual" select="$test-val"/>
+    <xsl:with-param name="test-name" select="'file-extension-relative-path'"/>
+  </xsl:call-template>
+</xsl:variable>
+
+<xsl:variable name="file-extension-relative-none">
+  <xsl:variable name="test-val">
+    <xsl:call-template name="file-extension">
+      <xsl:with-param name="filename" select="'video/ups-visitor-guide-360'"/>
+    </xsl:call-template>
+  </xsl:variable>
+  <xsl:call-template name="assert-equal">
+    <xsl:with-param name="expected" select="''"/>
+    <xsl:with-param name="actual" select="$test-val"/>
+    <xsl:with-param name="test-name" select="'file-extension-relative-none'"/>
+  </xsl:call-template>
+</xsl:variable>
+
+<xsl:variable name="file-extension-query-string">
+  <xsl:variable name="test-val">
+    <xsl:call-template name="file-extension">
+      <xsl:with-param name="filename" select="'movie.mp4?start=16'"/>
+    </xsl:call-template>
+  </xsl:variable>
+  <xsl:call-template name="assert-equal">
+    <xsl:with-param name="expected" select="'mp4'"/>
+    <xsl:with-param name="actual" select="$test-val"/>
+    <xsl:with-param name="test-name" select="'file-extension-query-string'"/>
+  </xsl:call-template>
+</xsl:variable>
+
+<xsl:variable name="file-extension-url">
+  <xsl:variable name="test-val">
+    <xsl:call-template name="file-extension">
+      <xsl:with-param name="filename" select="'https://media.w3.org/2010/05/sintel/trailer.mp4'"/>
+    </xsl:call-template>
+  </xsl:variable>
+  <xsl:call-template name="assert-equal">
+    <xsl:with-param name="expected" select="'mp4'"/>
+    <xsl:with-param name="actual" select="$test-val"/>
+    <xsl:with-param name="test-name" select="'file-extension-url'"/>
+  </xsl:call-template>
+</xsl:variable>
+
+<xsl:variable name="file-extension-url-none">
+  <xsl:variable name="test-val">
+    <xsl:call-template name="file-extension">
+      <xsl:with-param name="filename" select="'https://media.w3.org/2010/05/sintel/trailer'"/>
+    </xsl:call-template>
+  </xsl:variable>
+  <xsl:call-template name="assert-equal">
+    <xsl:with-param name="expected" select="''"/>
+    <xsl:with-param name="actual" select="$test-val"/>
+    <xsl:with-param name="test-name" select="'file-extension-url-none'"/>
+  </xsl:call-template>
+</xsl:variable>
+
+<xsl:variable name="file-extension-url-dotted-directory">
+  <xsl:variable name="test-val">
+    <xsl:call-template name="file-extension">
+      <xsl:with-param name="filename" select="'https://example.org/v1.2/movie.webm'"/>
+    </xsl:call-template>
+  </xsl:variable>
+  <xsl:call-template name="assert-equal">
+    <xsl:with-param name="expected" select="'webm'"/>
+    <xsl:with-param name="actual" select="$test-val"/>
+    <xsl:with-param name="test-name" select="'file-extension-url-dotted-directory'"/>
+  </xsl:call-template>
+</xsl:variable>
+
 <!--========================================================================-->
 
 <!-- "main" -->