lilypond-0.0.50

diff --git a/lily/include/crescendo.hh b/lily/include/crescendo.hh
index cb6b159ad770c9545a1447d3ed4a16ab4cd6911d..915094e1dc83625f905fb8137e6e72f127e22542 100644 (file)
--- a/lily/include/crescendo.hh
+++ b/lily/include/crescendo.hh
@@ -10,21 +10,22 @@
 #ifndef CRESCENDO_HH
 #define CRESCENDO_HH
 
+#include "staff-side.hh"
 #include "spanner.hh"
 /**
   The hairpin symbol. (cresc)
  */
-class Crescendo : public Spanner {
-    int staff_size_i_;
+class Crescendo : public Spanner , public Staff_side {
+
 public:
     int grow_dir_i_;
-    int dir_i_;
-    /// if there is a dynamic at the end, make the sign smaller.
+    
+/// if there is a dynamic at the end, make the sign smaller.
     bool right_dyn_b_;
 
     /// if there is a dynamic at the end, make the sign smaller.
     bool left_dyn_b_;
-    Crescendo(int staff_size_i);
+    Crescendo();
 private:
     Spanner* do_break_at( PCol*, PCol*) const;
     Molecule*brew_molecule_p()const;

diff --git a/lily/main.cc b/lily/main.cc
index ab0aced86008bd3f8267d1bf6e16914855b1f8b6..d14272f41b2d500755d4613104ca64e81ed0c7ad 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -21,10 +21,10 @@
 
 Sources* source_l_g = 0;
 bool only_midi = false;
+bool version_ignore_b_ = false;
 
+void destill_inname( String &name_str_r);
 
-void
-destill_inname( String &name_str_r);
 Long_option_init theopts[] = {
     {1, "output", 'o'},
     {0, "warranty", 'w'},
@@ -33,6 +33,7 @@ Long_option_init theopts[] = {
     {1, "init", 'i'},
     {1, "include", 'I'},
     {0, "midi", 'M'},
+    {0, "ignore-version", 'V'},
     {0,0,0}
 };
 
@@ -44,13 +45,14 @@ usage()
        "Typeset and or produce midi output from mudela-file or stdin\n"
        "\n"
        "Options:\n"
-       "  -d, --debug         enable debugging output\n"
-        "  -I, --include=DIR   add DIR to search path\n"
-       "  -i, --init=FILE     use FILE as init file\n"
-       "  -h, --help          this help\n"
-       "  -w, --warranty      show warranty and copyright\n"
-       "  -o, --output=FILE   set FILE as default output\n"
-       "  -M, --midi          produce midi output only\n"
+       "  -d, --debug            enable debugging output\n"
+        "  -I, --include=DIR      add DIR to search path\n"
+       "  -i, --init=FILE        use FILE as init file\n"
+       "  -h, --help             this help\n"
+       "  -w, --warranty         show warranty and copyright\n"
+       "  -o, --output=FILE      set FILE as default output\n"
+       "  -M, --midi             produce midi output only\n"
+       "  -V, --ignore-version   ignore mudela version\n"
        "\n"
        "LilyPond was compiled with the following settings:\n"
 #ifdef NDEBUG
@@ -105,6 +107,7 @@ do_one_file(String init_str, String file_str)
     source_l_g->set_path(path_l);
     {
        My_lily_parser parser(source_l_g);
+       parser.set_version_check(version_ignore_b_);
        parser.parse_file(init_str, file_str);
     }
     do_scores();
@@ -147,6 +150,9 @@ main (int argc, char **argv)
            usage();
            exit(0);
            break;
+       case 'V':
+           version_ignore_b_ = false;
+           break;
        case 'd':
            set_debug(true);
            break;