patch::: 1.1.29.jcn3: sleur volg muziek fix

[lilypond.git] / lily / main.cc

diff --git a/lily/main.cc b/lily/main.cc
index e8e55b5bafb752f75c8d3f4ead661cc89058d1d6..c6197016639ad77b4787e759ca28a15601022e31 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -401,12 +401,15 @@ distill_inname_str (String name_str, String& ext_r)
          split_path (str,a,b,c,ext_r);
 
          // add extension if not present.
-         // UGH. Should parametrise in list of default extensions.
-         if (ext_r.empty_b ())
+         char const* extensions[] = {"", "", ".ly", ".fly", ".sly", 0};
+         extensions[0] = ext_r.ch_C ();
+         for (int i = 0; extensions[i]; i++)
            {
-             ext_r = ".fly";
-             if (global_path.find (a+b+c+ext_r).empty_b ())
-               ext_r = ".ly";
+             if (!global_path.find (a+b+c+extensions[i]).empty_b ())
+               {
+                 ext_r = extensions[i];
+                 break;
+               }
            }
          str = a+b+c+ext_r;
        }