lilypond-1.3.62

diff --git a/lily/all-font-metrics.cc b/lily/all-font-metrics.cc
index eba97b0ec6b0d2819805cb80f90fa21228f6fd39..f8e2c0cee1ae37ed3c061af5ec6d3c97f769c445 100644 (file)
--- a/lily/all-font-metrics.cc
+++ b/lily/all-font-metrics.cc
@@ -33,11 +33,15 @@ All_font_metrics::find_afm (String name)
       path = search_path_.find (path);
       if (path.empty_b ())
        return 0;
-      progress_indication ("[" + path);
+
+      if (verbose_global_b)
+       progress_indication ("[" + path);
       Adobe_font_metric * afm_p = read_afm_file (path);
 
       afm_p->name_ = ly_symbol2scm (name.ch_C ());
-      progress_indication ("]");
+
+      if (verbose_global_b)
+       progress_indication ("]");
 
       afm_p_dict_.set (sname,afm_p->self_scm_);
     }
@@ -76,10 +80,13 @@ All_font_metrics::find_tfm (String name)
       path = search_path_.find (path);
       if (path.empty_b ())
        return 0;
-      progress_indication ("[" + path);
+      if (verbose_global_b)
+       progress_indication ("[" + path);
       Tex_font_metric  * tfm_p = Tex_font_metric_reader::read_file (path);
       tfm_p->name_ = ly_symbol2scm (name.ch_C( ));
-      progress_indication ("]");
+
+      if (verbose_global_b)
+       progress_indication ("]");
 
       tfm_p_dict_.set (sname, tfm_p->self_scm_);
     }
@@ -119,8 +126,8 @@ All_font_metrics::find_font (String name)
   if (f)
     return f;
 
-  non_fatal_error (_f ("can't find default font: `%s'", def_name.ch_C ()));
-  non_fatal_error (_f ("(search path: `%s')", search_path_.str ()));
+  error (_f ("can't find default font: `%s'", def_name.ch_C ()));
+  error (_f ("(search path: `%s')", search_path_.str ()));
   error (_ ("Giving up"));
 
   return 0;

diff --git a/lily/include/main.hh b/lily/include/main.hh
index 0d7b4ffa1c6aed20e83fc44c446e224724e886bd..1adae59d0eb123ab01f9f686c433bd83b7fa2275 100644 (file)
--- a/lily/include/main.hh
+++ b/lily/include/main.hh
@@ -29,7 +29,7 @@ extern int exit_status_i_;
 extern bool experimental_features_global_b;
 extern char const* output_global_ch;
 extern bool dependency_global_b;
-extern bool version_ignore_global_b;
+extern bool verbose_global_b;
 
 
 extern Array<String> get_inclusion_names ();

diff --git a/lily/lexer.ll b/lily/lexer.ll
index 44209d00e3df2d37f24e78104b88e96aa81f25f2..7178826d35fb44977c709f744847bbb84d0acf39 100644 (file)
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -586,9 +586,9 @@ valid_version_b (String s)
   Mudela_version ver (s);
   if (!((ver >= oldest_version) && (ver <= current)))
        {       
-               error (_f ("incorrect mudela version: %s (%s, %s)", ver.str (), oldest_version.str (), current.str ()));
-               if (!version_ignore_global_b)
-                       return false;
+               non_fatal_error (_f ("incorrect mudela version: %s (%s, %s)", ver.str (), oldest_version.str (), current.str ()));
+               non_fatal_error (_("Consider converting the input with the convert-mudela script")); 
+               return false;
     }
   return true;
 }

diff --git a/lily/main.cc b/lily/main.cc
index 3f7a41e000b7b69187655b1d30b0f6454ed42a8e..d5752455707c7b65adade9bd7fbaa1c9014343de 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -34,7 +34,7 @@
 #endif
 
 
-bool version_ignore_global_b = false;
+bool verbose_global_b = false;
 bool no_paper_global_b = false;
 bool no_timestamps_global_b = false;
 bool find_old_relative_b = false;
@@ -80,8 +80,8 @@ Long_option_init theopts[] = {
   {0, "safe", 's',  _i ("inhibit file output naming and exporting")},
   {0, "no-timestamps", 'T',  _i ("don't timestamp the output")},
   {0, "test", 't',  _i ("switch on experimental features")},
-  {0, "ignore-version", 'V',  _i ("ignore mudela version")},
   {0, "version", 'v',  _i ("print version number")},
+  {0, "verbose", 'V', _i("verbose")},
   {0, "warranty", 'w',  _i ("show warranty and copyright")},
   {0,0,0, 0}
 };
@@ -346,7 +346,7 @@ main (int argc, char **argv)
          exit (0);
          break;
        case 'V':
-         version_ignore_global_b = true;
+         verbose_global_b = true;
          break;
        case 's':
          safe_global_b = true;

diff --git a/lily/my-lily-parser.cc b/lily/my-lily-parser.cc
index 65e3c69adc6c3ea1b11e35d7d4c506eacf6f0976..286c938429f2e6b81fff36cda7ae667bf45d48f2 100644 (file)
--- a/lily/my-lily-parser.cc
+++ b/lily/my-lily-parser.cc
@@ -43,7 +43,6 @@ My_lily_parser::~My_lily_parser()
 void
 My_lily_parser::set_version_check (bool ig)
 {
-  ignore_version_b_ = ig;
 }
 
 void

diff --git a/lily/scores.cc b/lily/scores.cc
index e0ff3ffc1878202f85bf7d2b5377aaf92d43c730..86c03032843b16604cffdfafbcc03581497f1379 100644 (file)
--- a/lily/scores.cc
+++ b/lily/scores.cc
@@ -120,7 +120,8 @@ do_one_file (String init_str, String file_str)
   source_global_l->set_path (&global_path);
   {
     My_lily_parser parser (source_global_l);
-    parser.set_version_check (version_ignore_global_b);
+    parser.set_version_check (false);
+    cout << "\nNow processing `" << file_str << "'\n";
     parser.parse_file (init_str, file_str);
 
     if (parser.error_level_i_)