texlive[58878] Build/source/texk/dvipdfm-x: improve to find ofm files

[commits+kakuto at tug.org]

Revision: 58878
          http://tug.org/svn/texlive?view=revision&revision=58878
Author:   kakuto
Date:     2021-04-14 23:15:10 +0200 (Wed, 14 Apr 2021)
Log Message:
-----------
improve to find ofm files

Modified Paths:
--------------
    trunk/Build/source/texk/dvipdfm-x/ChangeLog
    trunk/Build/source/texk/dvipdfm-x/tfm.c

Modified: trunk/Build/source/texk/dvipdfm-x/ChangeLog
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/ChangeLog	2021-04-14 20:19:08 UTC (rev 58877)
+++ trunk/Build/source/texk/dvipdfm-x/ChangeLog	2021-04-14 21:15:10 UTC (rev 58878)
@@ -1,3 +1,7 @@
+2021-04-15  Akira Kakuto  <kakuto at w32tex.org>
+
+	* tfm.c: Improve to find ofm files.
+
 2021-04-03  Akira Kakuto  <kakuto at w32tex.org>
 
 	* pkfont.c: Remove unnecessary changes made on 2020-12-14.

Modified: trunk/Build/source/texk/dvipdfm-x/tfm.c
===================================================================
--- trunk/Build/source/texk/dvipdfm-x/tfm.c	2021-04-14 20:19:08 UTC (rev 58877)
+++ trunk/Build/source/texk/dvipdfm-x/tfm.c	2021-04-14 21:15:10 UTC (rev 58878)
@@ -1,6 +1,6 @@
 /* This is dvipdfmx, an eXtended version of dvipdfm by Mark A. Wicks.
 
-    Copyright (C) 2002-2020 by Jin-Hwan Cho and Shunsaku Hirata,
+    Copyright (C) 2002-2021 by Jin-Hwan Cho and Shunsaku Hirata,
     the dvipdfmx project team.
     
     Copyright (C) 1998, 1999 by Mark A. Wicks <mwicks at kettering.edu>
@@ -870,8 +870,8 @@
    char *ofm_name, *suffix;
 
    suffix = strrchr(tfm_name, '.');
-   if (!suffix || (strcmp(suffix, ".tfm") != 0 &&
-		   strcmp(suffix, ".ofm") != 0)) {
+   if (!suffix || (strcasecmp(suffix, ".tfm") != 0 &&
+                   strcasecmp(suffix, ".ofm") != 0)) {
      ofm_name = NEW(strlen(tfm_name) + strlen(".ofm") + 1, char);
      strcpy(ofm_name, tfm_name);
      strcat(ofm_name, ".ofm");
@@ -882,11 +882,15 @@
        (file_name = kpse_find_file(ofm_name, kpse_ofm_format, 0)) != NULL) {
      format = OFM_FORMAT;
    } else if ((file_name =
-	       kpse_find_file(tfm_name, kpse_tfm_format, 0)) != NULL) {
+               kpse_find_file(tfm_name, kpse_tfm_format, 0)) != NULL) {
      format = TFM_FORMAT;
    } else if ((file_name =
-	       kpse_find_file(tfm_name, kpse_ofm_format, 0)) != NULL) {
-     format = OFM_FORMAT;
+               kpse_find_file(tfm_name, kpse_ofm_format, 0)) != NULL) {
+     suffix = strrchr(file_name, '.');
+     if (suffix && strcasecmp(suffix, ".ofm") == 0)
+       format = OFM_FORMAT;
+     else
+       format = TFM_FORMAT;
    }
    if (ofm_name)
      RELEASE(ofm_name);