Implement new formats: framelist & lyrics.

* scheme/format.scm: Set actual format script name as argv[0]
* src/cmdline.opt <format>: Use `stop' to stop
argument processing.
* src/getopt.m4 (GETOPT): New local variable `stop'.

* scheme/idest/format/framelist.scm: New file.
* scheme/idest/format/lyrics.scm: New file.

4 files changed, 7 insertions, 6 deletions

diff --git a/src/cmdline.opt b/src/cmdline.opt
index 9ba0e81..f2d891d 100644
--- a/src/cmdline.opt
+++ b/src/cmdline.opt
@@ -190,9 +190,10 @@ BEGIN
 END
 
 OPTION(format,H,NAME,
-       [<apply external format NAME>])
+       [<apply external format NAME; this stops further argument processing>])
 BEGIN
        format_name = optarg;		     
+       stop = 1; /* Stop argument processing */ 
 END
 
 OPTION(function,f,NAME,
diff --git a/src/getopt.m4 b/src/getopt.m4
index 54ef9c1..19ee33c 100644
--- a/src/getopt.m4
+++ b/src/getopt.m4
@@ -200,10 +200,10 @@ dnl
 define([<GETOPT>],[<
  {
   int c;
-
+  int stop = 0;
 ifelse([<$#>],3,opterr = 0;)
-  while ((c = getopt_long($1, $2, SHORT_OPTS,
-                          long_options, NULL)) != EOF)
+  while (!stop && (c = getopt_long($1, $2, SHORT_OPTS,
+			           long_options, NULL)) != EOF)
     {
       switch (c)
         {
diff --git a/src/guile.c b/src/guile.c
index b4339c3..3934837 100644
--- a/src/guile.c
+++ b/src/guile.c
@@ -487,7 +487,7 @@ scm_to_tag(SCM scm, struct id3_tag *tag)
 	}
 	return modified;
 }
-
+
 SCM
 guile_apply_main(const char *file, struct id3_tag *tag)
 {
diff --git a/src/idop.c b/src/idop.c
index 316cd9c..e10a295 100644
--- a/src/idop.c
+++ b/src/idop.c
@@ -51,7 +51,7 @@ parse_ed_items(gl_list_t *plist, const char *arg)
 		arg += strspn(arg, " \t,");
 	}
 }
-
+
 void
 parse_filter_items(const char *arg)
 {