From b852851082be56b773b9342308453f04092ef1c6 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Fri, 18 Oct 2002 22:21:42 +0000 Subject: [PATCH] (main_prog): don't try to load init.EXT when processing foo.EXT. --- ChangeLog | 5 +++++ lily/main.cc | 4 +--- scripts/convert-ly.py | 10 ++++++++++ 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 64abff0031..b68a223320 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-10-19 Han-Wen Nienhuys + + * lily/main.cc (main_prog): don't try to load init.EXT when + processing foo.EXT. + 2002-10-15 Rune Zedeler * scm/tex.scm (zigzig-line): added. diff --git a/lily/main.cc b/lily/main.cc index ff00e7c334..20ecf61532 100644 --- 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 01c7e9771e..0209abeaba 100644 --- 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 ################################ -- 2.39.5