From 313ce80cce2e0341442b5758eabe1d8813bed585 Mon Sep 17 00:00:00 2001 From: fred Date: Sun, 24 Mar 2002 19:38:59 +0000 Subject: [PATCH] lilypond-0.0.50 --- lily/include/crescendo.hh | 11 ++++++----- lily/main.cc | 24 +++++++++++++++--------- 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/lily/include/crescendo.hh b/lily/include/crescendo.hh index cb6b159ad7..915094e1dc 100644 --- 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 ab0aced860..d14272f41b 100644 --- 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; -- 2.39.5