(main_prog): don't try to load init.EXT when

processing foo.EXT.

diff --git a/ChangeLog b/ChangeLog
index 64abff00317c8f4d8fc9333ed2447d8155099a07..b68a2233209407fc7a2cd127338da451c134df35 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-10-19  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+
+       * lily/main.cc (main_prog): don't try to load init.EXT when
+       processing foo.EXT.
+
 2002-10-15  Rune Zedeler  <rune@zedeler.dk>
 
        * scm/tex.scm (zigzig-line): added.

diff --git a/lily/main.cc b/lily/main.cc
index ff00e7c334f01af596a20410c4f3a5fd09730940..20ecf6153299b468392f5ad5d8c34feeccf3cfc7 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -288,7 +288,7 @@ distill_inname (String str)
   else
     {
       String orig_ext = p.ext;
-      char const *extensions[] = {"ly", "fly", "sly", "", 0};
+      char const *extensions[] = {"ly", "", 0};
       for (int i = 0; extensions[i]; i++)
        {
          p.ext = orig_ext;
@@ -386,8 +386,6 @@ main_prog (void *, int, char **)
       String init;
       if (!init_name_global.empty_b ())
        init = init_name_global;
-      else if (!inpath.ext.empty_b ())
-       init = "init." + inpath.ext;
       else
        init = "init.ly";
        

diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index 01c7e9771eab8a84b6679167e466845def83bc12..0209abeabad793a3ee9568df188f17bb062baff7 100644 (file)
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -1071,7 +1071,17 @@ if 1:
                return str
        
        conversions.append (((1,7,3), conv, 'ly- -> ly:'))
+
+if 1:
+       def conv(str):
+               str = re.sub (r'<<' '< <', str)
+               str = re.sub (r'>>' '> >', str)
+
+               return str
        
+       conversions.append (((1,7,4), conv, '<< >> -> < <  > >'))
+
+
 ################################
 #      END OF CONVERSIONS      
 ################################