Tweaked material type mappings

diff --git a/etc/tmarc.xsl b/etc/tmarc.xsl
index ea20b84..f6de26b 100644 (file)
--- a/etc/tmarc.xsl
+++ b/etc/tmarc.xsl
@@ -82,12 +82,11 @@
        <xsl:when test="$typeofrec='c' or $typeofrec='d'">music-score</xsl:when>
        <xsl:when test="$form1='a' or $form1='b' or $form1='c'">microform</xsl:when>
        <xsl:when test="$typeofrec='t'">thesis</xsl:when>
+        <xsl:when test="$journal_title">article</xsl:when>
        <xsl:when test="$typeofrec='a' or $typeofrec='i' and
            ($typeofserial='d' or $typeofserial='w')">data</xsl:when>
+       <xsl:when test="$typeofrec='a' and $biblevel='b'">article</xsl:when>
        <xsl:when test="$typeofrec='m'">software</xsl:when>
-        <xsl:when test="$journal_title">
-          <xsl:text>article</xsl:text>
-        </xsl:when>
         <xsl:when test="$title_medium">
           <xsl:value-of select="translate($title_medium, ' []/:', '')" />
         </xsl:when>