lilypond-0.0.55

diff --git a/Documentation/convert-mudela.pod b/Documentation/convert-mudela.pod
index 34e5bc8fa9101299bf0fd9fdd7697cc48cc54393..956c16bc9e88d06660f9f07d9fc182c9be7e23fa 100644 (file)
--- a/Documentation/convert-mudela.pod
+++ b/Documentation/convert-mudela.pod
@@ -40,3 +40,10 @@ available version.
 
 =back
 
+=head1 BUGS
+
+Not all language changes are handled. Multiple output options won't work
+
+=head1 AUTHOR
+
+Han-Wen Nienhuys <hanwen@gnu.ai.mit.edu>

diff --git a/bin/convert-mudela b/bin/convert-mudela
index 2ead27d9b928f0691af79111aabea8d8161c8e3d..e4a8af3013bf26f808af6a0934f6c0365488156b 100644 (file)
--- a/bin/convert-mudela
+++ b/bin/convert-mudela
@@ -2,6 +2,9 @@
 
 
 use Getopt::Long;
+
+
+
 sub 
     version_string_conv
 {
@@ -16,12 +19,17 @@ sub
 {
  
 }
+
 sub conv_pl52_pl53
 {
 
     s/include \"/$1\\include \"/g;
 }
 
+sub conv_pl53_pl54
+{
+    print STDERR "Not smart enough to convert \\transpose\n"    if (/\\transpose/) ;
+}
 
 ###############################################################
 
@@ -29,8 +37,7 @@ sub conv_pl52_pl53
 
 
 
-sub
-    usage
+sub usage
 {
     print STDERR "Usage: convert-mudela\n";
     print STDERR "other options: --edit --output=FILE --show-rules\n";
@@ -39,7 +46,8 @@ sub
     
 my %minor_conversions = (50 => \&no_conv,
                         52 => \&conv_pl0_0_50_pl0_0_52,
-                        53 => \&conv_pl52_pl53
+                        53 => \&conv_pl52_pl53,
+                        54 => \&conv_pl53_pl54
                         );
 sub versions 
 {
@@ -47,15 +55,13 @@ sub versions
 }
     
 
-sub
-    show_rules
+sub    show_rules
 {
     print "Rules: ", join(", ", sort keys %minor_conversions), "\n";
     
 }
 
-sub 
-    do_conversion
+sub do_conversion
 {
     my ($from,$to) = @_;
 
@@ -83,7 +89,8 @@ sub
        print OUTLY;
     }
 }
-sub set_auto_from
+
+sub get_auto_from
 {
     my ($fn)=@_;
     my ($ver);
@@ -97,7 +104,11 @@ sub set_auto_from
            last;
        }
     }
-    die "can't determine mudela version." unless (defined($ver));
+    if (!defined($ver)){
+       print STDERR "can't determine mudela version in $fn.\n";
+       my $u;
+       return $u;
+    }
     $ver =~ s/0\.0\.// ;
     close INLY;
     return $ver;
@@ -114,7 +125,7 @@ sub  set_files
     } 
     if (( ! -f $infile) && (! $infile =~ /\\.ly$/s ) ){
        $infile .= ".ly";
-       print STDERR "trying $infile";
+       
 
     }
     if ($opt_edit && $infile ne "-") {
@@ -122,6 +133,36 @@ sub  set_files
        $outfile = "$infile.NEW";
        $infile = "$infile";
     }
+    print STDERR "Input $infile.. ";
+
+}
+
+sub do_one_arg
+{
+    set_files;
+
+    local ($from_version, $to_version);
+    $from_version = $opt_from;
+    $to_version = $opt_to;
+    
+    ($from_version = get_auto_from $infile) unless defined($opt_from);
+    return if (!defined($from_version));
+    
+    my @v = versions;
+    ($to_version =  pop @v) unless (defined($opt_to));
+
+
+    die "can't open \`$infile\'" unless open INLY,$infile ;
+    die "can't open \`$outfile\'" unless open OUTLY, ">$outfile";
+    
+    do_conversion $from_version, $to_version;
+    close INLY;
+    close OUTLY;
+
+    if ($opt_edit) {
+       rename $infile, "$infile~";
+       rename $outfile, "$infile";
+    }
 }
 
 GetOptions ("output=s", "from=i", "to=i", "minor=i", "edit", "show-rules");
@@ -133,24 +174,13 @@ if ($opt_show_rules) {
 }
 
 local ( $infile,$outfile);
-set_files;
-
-
-($opt_from = set_auto_from $infile) unless defined($opt_from);
-
-my @v = versions;
-($opt_to =  pop @v) unless (defined($opt_to));
+my $processed_one=0;
 
-
-die "can't open \`$infile\'" unless open INLY,$infile ;
-die "can't open \`$outfile\'" unless open OUTLY, ">$outfile";
-
-do_conversion $opt_from, $opt_to;
-close INLY;
-close OUTLY;
-
-if ($opt_edit) {
-    rename $infile, "$infile~";
-    rename $outfile, "$infile";
+while (defined($ARGV[0])) {
+    do_one_arg;
+    shift @ARGV;
+    $processed_one = 1;
 }
+do_one_arg unless ($processed_one);
 
+    

diff --git a/input/cadenza.ly b/input/cadenza.ly
index c50d815ced1b76aa685d813e7c198a25f1860cb2..b8a31404d8676f2e5d44dd02c7e09157f6fc00d1 100644 (file)
--- a/input/cadenza.ly
+++ b/input/cadenza.ly
@@ -3,6 +3,7 @@
 %
 % author: unknown. Copyright: none
 %
+\version "0.0.54";
 
 cad = \melodic  {
                \cadenza 1;

diff --git a/input/collisions.ly b/input/collisions.ly
index 6cc99923830d6cd938aaba741ec8b203361b27f3..333fd67e40231df60ae1ba3f3e854dd7a2c3011b 100644 (file)
--- a/input/collisions.ly
+++ b/input/collisions.ly
@@ -1,4 +1,5 @@
 % test the Collision resolution 
+\version "0.0.54";
 
 two_voice_steminvert = \melodic { 
        < \multivoice 

diff --git a/input/coriolan-alto.ly b/input/coriolan-alto.ly
index c2b8ed5da3c9d020f0291eae898a635136f6e7b8..8e5d3b568e982b07b3719d06871eb2f0a7c7368a 100644 (file)
--- a/input/coriolan-alto.ly
+++ b/input/coriolan-alto.ly
@@ -10,6 +10,7 @@
 % when lily can handle this, i-ll type the other 304 bars 
 % (maybe even sooner :-)
 %
+\version "0.0.54";
 
 alto = \melodic{ 
        

diff --git a/input/error.ly b/input/error.ly
index f5690f0c8ac3fb37bad56f2f54404c75c0761ad6..9eeada0ea951d6265e30a108f1c5e68ae468433a 100644 (file)
--- a/input/error.ly
+++ b/input/error.ly
@@ -1,4 +1,4 @@
-\version "0.0.53";
+\version "0.0.54";
 
 \include "this-is-hopefully-a-nonexisting-file"
 

diff --git a/input/kortjakje.ly b/input/kortjakje.ly
index 167236c1e9c5c1dae076ca04e4619f3620f7e13c..31af29881035768b04b7c1e0736d3ba49ff629b5 100644 (file)
--- a/input/kortjakje.ly
+++ b/input/kortjakje.ly
@@ -8,7 +8,7 @@
 % copyright: None
 %
 % declare melody (which will be in *one* staff ) for the lead voice
-\version "0.0.53";
+\version "0.0.54";
 
 melodie = \melodic {
                                % switch Lilypond in note-mode

diff --git a/input/maartje.ly b/input/maartje.ly
index bebe65d14fc0c2ea9f565d41cf1abaaa72b25604..5bcf7c303ca522046c5660dee4f706e067b40806 100644 (file)
--- a/input/maartje.ly
+++ b/input/maartje.ly
@@ -3,7 +3,7 @@
 % COPYRIGHT: GPL
 %
 %
-\version "0.0.53";
+\version "0.0.54";
 
 globals=\melodic{
                \meter 4/ 4;

diff --git a/input/scsii-menuetto.ly b/input/scsii-menuetto.ly
index b42f912ff96f7f82c15264aa311d2a89a2b585fd..cc3f3636fb2c009a03468b210a869493b47fadc7 100644 (file)
--- a/input/scsii-menuetto.ly
+++ b/input/scsii-menuetto.ly
@@ -11,7 +11,7 @@
 % The purpose of this file is to demonstrate features of LilyPond.
 % (there is an accompanying LaTeX file, scsii-menuetto.tex)
 %
-\version "0.0.53";
+\version "0.0.54";
 %% Stuff from MPP version
 % \lefttitle{Menuetto}
 % \tempo{Moderato}

diff --git a/input/standchen.ly b/input/standchen.ly
index 49b0cf60599fc8c395873227e2fd1672b0f7ede1..e545dd011c1c81127449caa8165986fb993384b5 100644 (file)
--- a/input/standchen.ly
+++ b/input/standchen.ly
@@ -9,7 +9,7 @@
 % The purpose of this file is to demonstrate features of LilyPond.
 % (there is an accompanying LaTeX file, standchen.tex)
 %
-\version "0.0.53";
+\version "0.0.54";
 
 melodie = \melodic{  
        \meter  3/4 ;

diff --git a/input/wohltemperirt.ly b/input/wohltemperirt.ly
index 82659d38002a775583cc456b52dd4bd38568b4bd..66c3ae015e4b59101e158b3fed44f194ae8c1e83 100644 (file)
--- a/input/wohltemperirt.ly
+++ b/input/wohltemperirt.ly
@@ -2,7 +2,7 @@
 %
 %      Public Domain -- typed by by HWN
 %
-\version "0.0.53";
+\version "0.0.54";
 
 global = \melodic{
        \meter 4/4 ;