lilypond-1.3.35

diff --git a/flower/getopt-long.cc b/flower/getopt-long.cc
index 3f34b5b455232568c0db44b710509e5044b5fe59..64475925b7a28c1dc4384fc99a5ddf893433cb8b 100644 (file)
--- a/flower/getopt-long.cc
+++ b/flower/getopt-long.cc
@@ -140,11 +140,11 @@ Getopt_long::report (Errorcod c)
   switch (c)
     {
     case E_ARGEXPECT:
-      str += _f ("Option `%s' requires an argument",
+      str += _f ("option `%s' requires an argument",
        found_option_l_->str ());
       break;
     case  E_NOARGEXPECT:
-      str += _f ("Option `%s' doesn't allow an argument",
+      str += _f ("option `%s' doesn't allow an argument",
        found_option_l_->str ());
       break;
     case E_UNKNOWNOPTION:

diff --git a/flower/input.cc b/flower/input.cc
index 9413f7c49e82fc37ca204dddaf9cf0b0cd4ff2f7..a33552ec8aac2d8fb83b6958105b16c895506a8a 100644 (file)
--- a/flower/input.cc
+++ b/flower/input.cc
@@ -95,7 +95,7 @@ Input::error (String s) const
 void
 Input::non_fatal_error (String s) const
 {
-  message (_ ("Non fatal error: ") + s);
+  message (_ ("non fatal error: ") + s);
 }
 String
 Input::location_str () const

diff --git a/flower/mapped-file-storage.cc b/flower/mapped-file-storage.cc
index 329f21ebf0381ab7de6e36c4f2818a3f0ac57770..2c5ad327082a43000ebd5a05aa48cc6f3454e554 100644 (file)
--- a/flower/mapped-file-storage.cc
+++ b/flower/mapped-file-storage.cc
@@ -71,7 +71,7 @@ Mapped_file_storage::map ()
   data_caddr_ = (caddr_t)mmap ((void*)0, size_off_, PROT_READ, MAP_SHARED, fildes_i_, 0);
 
   if ((int)data_caddr_ == -1)
-    warning (_ ("Can't map file") + ": " + strerror (errno));
+    warning (_ ("can't map file") + ": " + strerror (errno));
 
 #endif
 }
@@ -84,7 +84,7 @@ Mapped_file_storage::open (String name_str)
 
   if (fildes_i_ == -1)
     {
-      warning (_f ("Can't open file: `%s'", name_str)
+      warning (_f ("can't open file: `%s'", name_str)
        + ": " + strerror (errno));
       return;
     }

diff --git a/flower/simple-file-storage.cc b/flower/simple-file-storage.cc
index b7f94acead995dd5a0c99f3b6d364255295c1558..5b61cc1f433fec0bce18a2b227faf49371cddd4b 100644 (file)
--- a/flower/simple-file-storage.cc
+++ b/flower/simple-file-storage.cc
@@ -41,7 +41,7 @@ Simple_file_storage::load_file (String s)
 
   if (!f)
     {
-      warning (_f ("Can't open file: `%s'", s));
+      warning (_f ("can't open file: `%s'", s));
       return ;
     }
 

diff --git a/flower/text-stream.cc b/flower/text-stream.cc
index cb88bcd498165d5db03eff0170050c90c5b524cf..6529512c79df21074de27d98e091c3704f34c70e 100644 (file)
--- a/flower/text-stream.cc
+++ b/flower/text-stream.cc
@@ -19,7 +19,7 @@ Text_stream::Text_stream (String fn)
   if (!f)
     {
       cerr << __FUNCTION__ 
-          << ": " << _f ("Can't open file: `%s'", fn) << '\n';
+          << ": " << _f ("can't open file: `%s'", fn) << '\n';
       exit (1);
     }
 

diff --git a/input/test/coriolan-margin.ly b/input/test/coriolan-margin.ly
index 4d3f289cd9f96048b1cd528f3934b74ae7ccaed3..ed5103356dfd5f0e299eea94e00e02c2c0d08ba5 100644 (file)
--- a/input/test/coriolan-margin.ly
+++ b/input/test/coriolan-margin.ly
@@ -3,6 +3,8 @@ flauti = \notes \relative c' {
   \property Staff.instr                = #"Fl."
   c1 
   \break c
+%  \break c
+%  \break c
   \bar"|.";
 }
 
@@ -61,7 +63,8 @@ violino2 = \notes \relative c' {
 viola = \notes \relative c' {
   \property Staff.instrument   = #"Viola"
   \property Staff.instr                = #"Vla."
-  c1 c
+  c1 c 
+  %c
 }
 
 violoncello = \notes \relative c' {
@@ -120,7 +123,10 @@ violoncello = \notes \relative c' {
     \translator {
       \ScoreContext
       instrumentScriptPadding = #55  %% urg, this is in pt
-      instrScriptPadding = #25
+      instrScriptPadding = #35
+      marginScriptHorizontalAlignment = #1
+      %marginScriptPadding = #15
+      %marginScriptHorizontalAlignment = #0
     }
   }
 }

diff --git a/input/test/font-body.ly b/input/test/font-body.ly
index 67bca857792a4c8376810b61003e3cf41b282da8..c6401107773c795afde48ab899dbcb4cf9e706b4 100644 (file)
--- a/input/test/font-body.ly
+++ b/input/test/font-body.ly
@@ -51,8 +51,8 @@ c\longa*1/4 c\breve*1/2 c1 c2 c4 c8
                        a'^\flageolet
                        \property Voice . textStyle =  "roman"
                        \time 1/2; a2 |
-               %       \time 3/2; < a1.
-               %       { s4 \ppp \< s4 \! s4 \fff  s4 \> s4 \! s4\ppp} >
+                       \time 3/2; < a1.
+                       { s4 \ppp \< s4 \! s4 \fff  s4 \> s4 \! s4\ppp} >
                        |
                        \time 2/4; a2 |
                        \time 5/4; a1.. |

diff --git a/input/test/maximum-rest-count.ly b/input/test/maximum-rest-count.ly
index cbb02a484bdee49c2ae4eb1b13ebc42eea7dfcf9..6e1759a17032d46d8f18c39a94dad5229b0bb3ce 100644 (file)
--- a/input/test/maximum-rest-count.ly
+++ b/input/test/maximum-rest-count.ly
@@ -1,18 +1,36 @@
 \score{
-\context Staff \notes\relative c''{
-< a4 c e >
-< r r r >
-\property Staff.maximumRestCount = #3
-< r r r >
-\property Staff.maximumRestCount = #2
-< r r r >
-\property Staff.maximumRestCount = #1
-< r r r >
-\property Staff.maximumRestCount = #0
-< r r r >
-% urg
-r
-}
+\context Staff \notes\relative c''<
+       \context Voice = x {
+               a4 
+               r 
+               \property Voice.maximumRestCount = #3
+               r 
+               \property Staff.maximumRestCount = #2
+               r 
+               \property Staff.maximumRestCount = #1
+               r 
+               r8 r8
+               c
+       }
+       \context Voice = y {
+               c4
+               r
+               r 
+               r
+               r
+               r
+               r
+       }
+       \context Voice = z {
+               e4
+               r
+               r 
+               r
+               r
+               r
+               r
+       }
+       >
 \paper{
 }
 \midi{

diff --git a/lily/afm.cc b/lily/afm.cc
index 0a675150aa3f15c61b52e76e5c25d7700be2b525..791311adb8a241aeeed70013f3f9e6b350659e02 100644 (file)
--- a/lily/afm.cc
+++ b/lily/afm.cc
@@ -39,7 +39,7 @@ Adobe_font_metric::find_ascii_metric (int a , bool warn) const
     }
   else if (warn )
     {
-      warning (_f ("Can't find character number: %d", a));
+      warning (_f ("can't find character number: %d", a));
     }
 
   return 0;
@@ -52,7 +52,7 @@ Adobe_font_metric::find_char_metric (String nm, bool warn) const
     {
       if (warn)
        {
-         warning (_f ("Can't find character called: `%s'", nm.ch_C()));
+         warning (_f ("can't find character called: `%s'", nm.ch_C()));
        }
       return 0;
     }

diff --git a/lily/all-font-metrics.cc b/lily/all-font-metrics.cc
index 450b1b4b70017afeea614ccca6f77eaea534f3d0..5a3975fa9a709e5138509e6013f43363dfe69995 100644 (file)
--- a/lily/all-font-metrics.cc
+++ b/lily/all-font-metrics.cc
@@ -101,7 +101,7 @@ All_font_metrics::find_font (String name)
   if (f)
     return f;
 
-  warning (_f ("Can't find font: `%s'", name.ch_C ()));
+  warning (_f ("can't find font: `%s'", name.ch_C ()));
   warning (_ ("Loading default font"));
   
   String def_name = default_font_sz_;
@@ -117,8 +117,8 @@ All_font_metrics::find_font (String name)
   if (f)
     return f;
 
-  error (_f ("Can't find default font: `%s'", def_name.ch_C ()));
-  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/break-algorithm.cc b/lily/break-algorithm.cc
index 91916e56aeb7fdfe897bdd62b6eb8295301a75df..84a57b811a00cf49d4bebfc03f9ea54800d1412c 100644 (file)
--- a/lily/break-algorithm.cc
+++ b/lily/break-algorithm.cc
@@ -103,7 +103,7 @@ void
 Break_algorithm::problem_OK () const
 {
   if (pscore_l_->col_l_arr_.empty ())
-    error (_("Score does not have any columns"));
+    error (_("score does not have any columns"));
   OK ();
 }
 

diff --git a/lily/change-iterator.cc b/lily/change-iterator.cc
index 60478378a4179cbf4708e04f7bbf6bfb1f87f189..f860c6977349ff9b3235345069729021e6cf04b5 100644 (file)
--- a/lily/change-iterator.cc
+++ b/lily/change-iterator.cc
@@ -19,7 +19,7 @@ Change_iterator::error (String reason)
   String to_type = t->change_to_type_str_;
   String to_id =  t->change_to_id_str_;
 
-  String warn1 = _f ("Can't change `%s' to `%s'", to_type, to_id) 
+  String warn1 = _f ("can't change `%s' to `%s'", to_type, to_id) 
     + ": " + reason;
   /*
     GUHG!

diff --git a/lily/debug.cc b/lily/debug.cc
index 76eb7e7117130440f06ade74e08e6180c10489c6..e3aad9a4aaa24713affeda8befc5459e1ccacc3a 100644 (file)
--- a/lily/debug.cc
+++ b/lily/debug.cc
@@ -47,7 +47,7 @@ set_debug (bool b)
 #ifdef MEMORY_PARANOID
   if (check_malloc_b)
     if (mcheck (0))
-      warning (_ ("Can't set mem-checking!"));
+      warning (_ ("can't set mem-checking!"));
 #endif
 }
 

diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc
index 9bd790f0016d15f5d7c6574ea3c88ed6e2c8aefb..ea79cff0fe9d54f6b7113fc966b45f85c3483e52 100644 (file)
--- a/lily/dynamic-engraver.cc
+++ b/lily/dynamic-engraver.cc
@@ -29,8 +29,8 @@
 /*
   TODO:
 
-  * fix vertical placement of orphaned items
-  * fix padding 
+  * padding of orphaned items
+  * direction of orphaned items
  */
 
 class Dynamic_line_spanner : public Spanner
@@ -99,7 +99,6 @@ protected:
   virtual void do_process_music ();
   virtual void do_pre_move_processing ();
   virtual void do_post_move_processing ();
-  virtual void typeset_element (Score_element*);
 };
 
 ADD_THIS_TRANSLATOR (Dynamic_engraver);
@@ -174,7 +173,6 @@ Dynamic_engraver::do_process_music ()
       line_spanner_ = new Dynamic_line_spanner;
       assert (pending_column_);
       line_spanner_->add_column (pending_column_);
-      side_position (line_spanner_).set_axis (Y_AXIS);
       announce_element (Score_element_info
                        (line_spanner_,
                         text_req_l_ ? text_req_l_ : span_req_l_drul_[START]));
@@ -188,12 +186,37 @@ Dynamic_engraver::do_process_music ()
       pending_element_arr_.clear ();
     }
 
-  if (span_req_l_drul_[START] || text_req_l_)
+  if (span_req_l_drul_[START] || span_req_l_drul_[STOP] || text_req_l_)
     last_request_mom_ = now_mom ();
   else
-    pending_element_arr_.clear ();
+    {
+      for (int i = 0; i < pending_element_arr_.size (); i++)
+       {
+         Score_element* e = pending_element_arr_[i];
+         side_position (e).set_axis (Y_AXIS);
+         side_position (e).add_staff_support ();
+
+         /*
+           UGH UGH 
+          */
+         Direction d = directional_element (e).get ();
+         if (!d)
+           {
+             SCM s = get_property ("dynamicDirection");
+             if (!isdir_b (s))
+               s = get_property ("verticalDirection");
+             if (isdir_b (s))
+               d = to_dir (s);
+             directional_element (e).set (d);
+           }
+         
+         SCM s = get_property ("dynamicPadding");
+         if (gh_number_p (s))
+           e->set_elt_property ("padding", s);
+       }
+      pending_element_arr_.clear ();
+    } 
 
-  
   if (text_req_l_)
     {
       String loud = text_req_l_->text_str_;
@@ -204,10 +227,12 @@ Dynamic_engraver::do_process_music ()
       text_p_->set_elt_property ("style", gh_str02scm ("dynamic"));
       text_p_->set_elt_property ("script-priority",
                                          gh_int2scm (100));
+      if (Direction d=text_req_l_->get_direction ())
+       directional_element (text_p_).set (d);
       pending_element_arr_.push (text_p_);
       text_p_->set_elt_property ("self-alignment-Y", gh_int2scm (0));
       text_p_->add_offset_callback (Side_position_interface::aligned_on_self,
-               Y_AXIS);
+                                   Y_AXIS);
       announce_element (Score_element_info (text_p_, text_req_l_));
     }
 
@@ -305,7 +330,6 @@ Dynamic_engraver::do_pre_move_processing ()
   typeset_all ();
 }
 
-
 void
 Dynamic_engraver::do_removal_processing ()
 {
@@ -318,18 +342,12 @@ Dynamic_engraver::do_removal_processing ()
   typeset_all ();
   if (line_spanner_)
     {
+      side_position (line_spanner_).add_staff_support ();
       typeset_element (line_spanner_);
       line_spanner_ = 0;
     }
 }
 
-void
-Dynamic_engraver::typeset_element (Score_element* e)
-{
-  side_position (e).add_staff_support ();
-  Engraver::typeset_element (e);
-}
-
 void
 Dynamic_engraver::typeset_all ()
 {  
@@ -352,6 +370,7 @@ Dynamic_engraver::typeset_all ()
       * continue through piece */
   if (line_spanner_ && last_request_mom_ < now_mom ())
     {
+      side_position (line_spanner_).add_staff_support ();
       typeset_element (line_spanner_);
       line_spanner_ = 0;
     }

diff --git a/lily/includable-lexer.cc b/lily/includable-lexer.cc
index 2634c1a1db50caabee4228816573911ef72c4420..a73b2266b17664c92d0f26c1047b2d1f60032cd9 100644 (file)
--- a/lily/includable-lexer.cc
+++ b/lily/includable-lexer.cc
@@ -44,7 +44,7 @@ Includable_lexer::new_input (String s, Sources  * global_sources)
   Source_file * sl = global_sources->get_file_l (s);
   if (!sl)
     {
-      String msg = _f ("Can't find file: `%s'", s);
+      String msg = _f ("can't find file: `%s'", s);
       msg += "\n";
       msg += _f ("(search path: `%s')", global_sources->path_C_->str ().ch_C());
       msg += "\n";

diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc
index dd14be84fe8adaa67c58bd2f0073b29a0162b2e7..d8866c3a8e3c66b064b4f00ebb7c197c92434a83 100644 (file)
--- a/lily/lily-guile.cc
+++ b/lily/lily-guile.cc
@@ -123,7 +123,7 @@ read_lily_scm_file (String fn)
   String s = global_path.find (fn);
   if (s == "")
     {
-      String e = _f ("Can't find file: `%s'", fn);
+      String e = _f ("can't find file: `%s'", fn);
       e += " ";
       e += _f ("(load path: `%s')", global_path.str ());
       error (e);
@@ -146,7 +146,7 @@ ly_gulp_file (SCM name)
  String s = global_path.find (fn);
   if (s == "")
     {
-      String e = _f ("Can't find file: `%s'", fn);
+      String e = _f ("can't find file: `%s'", fn);
       e += " ";
       e += _f ("(load path: `%s')", global_path.str ());
       error (e);

diff --git a/lily/local-key-engraver.cc b/lily/local-key-engraver.cc
index bfd5390b9c20cef1efc6bf52bf1c36fc4638c8f1..2641421ccaf5783489e8e1832de4951122e97066 100644 (file)
--- a/lily/local-key-engraver.cc
+++ b/lily/local-key-engraver.cc
@@ -80,7 +80,7 @@ Local_key_engraver::do_creation_processing ()
   if (!key_grav_l_)
     {
       warning (_ ("out of tune:"));
-      warning (_f ("Can't find: `%s'", "Key_engraver"));
+      warning (_f ("can't find: `%s'", "Key_engraver"));
     }
   else
     {

diff --git a/lily/lookup.cc b/lily/lookup.cc
index fc4d696d93656fa456f7bb1e132ba0671e51b9cd..818ce69e3f5f508b71b8982280b95a790fc9f6fa 100644 (file)
--- a/lily/lookup.cc
+++ b/lily/lookup.cc
@@ -53,8 +53,8 @@ Lookup::afm_find (String s, bool warn) const
       me->afm_l_ = all_fonts_global_p->find_afm (font_name_);
       if (!me->afm_l_)
        {
-         warning (_f ("Can't find font: `%s'", font_name_));
-         warning (_f ("(search path `%s')", global_path.str ().ch_C()));
+         warning (_f ("can't find font: `%s'", font_name_));
+         warning (_f ("(search path: `%s')", global_path.str ().ch_C()));
          error (_ ("Aborting"));
        }
     }
@@ -285,6 +285,8 @@ Lookup::text (String style, String text, Paper_def *paper_l)
       lines[i] = str;
     }
 
+  if (!lines.size())
+       return Molecule();
 
   SCM first = gh_list (ly_symbol2scm ("text"),
                         ly_str02scm (lines[0].ch_C()),

diff --git a/lily/midi-stream.cc b/lily/midi-stream.cc
index 05fb19bc6df4327c5763a89acdb3c34430ec1493..f84544976fd6f0d6bb110cb34debb876d30af0ed 100644 (file)
--- a/lily/midi-stream.cc
+++ b/lily/midi-stream.cc
@@ -74,5 +74,5 @@ Midi_stream::open ()
 {
   os_p_ = new ofstream (filename_str_.ch_C (),ios::out|ios::bin);
   if (!*os_p_)
-    error (_f ("Can't open file: `%s'", filename_str_));
+    error (_f ("can't open file: `%s'", filename_str_));
 }

diff --git a/lily/music-output-def.cc b/lily/music-output-def.cc
index f1cf79cb65386443b2dfc60320470cb7b66ba9e9..fec85bba0fb6d15ad7fa5e78a2549546994d7ff3 100644 (file)
--- a/lily/music-output-def.cc
+++ b/lily/music-output-def.cc
@@ -81,7 +81,7 @@ Music_output_def::get_global_translator_p ()
 {
   Translator * t = find_translator_l ("Score");
   if (!t)
-    error (_f ("Can't find `%s' context", "Score"));
+    error (_f ("can't find `%s' context", "Score"));
   t = t->clone ();
   Global_translator *g = dynamic_cast <Global_translator *> (t);
   t->add_processing ();

diff --git a/lily/paper-stream.cc b/lily/paper-stream.cc
index bb4ec7121deb5d9baa17ab676a17b12cb00a0d50..caab11e504165cba9cb576816bed4422407a7e35 100644 (file)
--- a/lily/paper-stream.cc
+++ b/lily/paper-stream.cc
@@ -22,7 +22,7 @@ Paper_stream::Paper_stream (String filename)
     //    os = new ostream (cout.ostreambuf ());
     os = new ostream (cout._strbuf);
   if (!*os)
-    error (_f ("Can't open file: `%s'", filename));
+    error (_f ("can't open file: `%s'", filename));
   nest_level = 0;
   line_len_i_ = 0;
   outputting_comment_b_=false;

diff --git a/lily/rest-collision.cc b/lily/rest-collision.cc
index 2dd7aa890b6219a6530fe4ca384875664a88455c..f551d0d2532fcd0e67da33ce147daf818e2760f9 100644 (file)
--- a/lily/rest-collision.cc
+++ b/lily/rest-collision.cc
@@ -86,14 +86,6 @@ Rest_collision::before_line_breaking ()
   // meisjes met meisjes
   if (!ncol_l_arr.size()) 
     {
-
-      /*
-       Oeps, nu zie ik 't pas: colommen met noten.
-       Het commentaar, dat ik ooit geschreven had: meisjes met meisjes,
-       is achterhaald: urg.
-
-       */
-
       Moment m = rhythmic_head2mom (col2rhythmic_head (rest_l_arr[0]));
       int i = 1;
       for (; i < rest_l_arr.size (); i++)
@@ -112,20 +104,12 @@ Rest_collision::before_line_breaking ()
       int display_count;
       SCM s = get_elt_property ("maximum-rest-count");
       if (i == rest_l_arr.size ()
-         && gh_number_p (s) && gh_int2scm (s) < rest_l_arr.size ())
+         && gh_number_p (s) && gh_scm2int (s) < rest_l_arr.size ())
        {
-         display_count = gh_int2scm (s);
-#if 0
-         /*
-           Setting surplus rests to transparent.
-           Only really necessary for maximum-rest-count == 0,
-           because rests wil be set at exact the same position
-           and thus overlap.
-         */
-         for (i--;i > display_count; i--)
+         display_count = gh_scm2int (s);
+         for (; i > display_count; i--)
            col2rhythmic_head (rest_l_arr[i-1])
              ->set_elt_property ("transparent", SCM_BOOL_T);
-#endif
        }
       else
        display_count = rest_l_arr.size ();

diff --git a/lily/scores.cc b/lily/scores.cc
index 64787328ac23b8cb45b44ea5cc57bceee6695cf5..e0ff3ffc1878202f85bf7d2b5377aaf92d43c730 100644 (file)
--- a/lily/scores.cc
+++ b/lily/scores.cc
@@ -35,7 +35,7 @@ void write_dependency_file (String fn, Array<String> targets,
   cout << _f ("Writing dependency file: `%s'...", fn) << '\n';
   ofstream f (fn.ch_C ());
   if (!f)
-    warning (_f ("Can't open file: `%s'", fn));
+    warning (_f ("can't open file: `%s'", fn));
 
   f << "# Automatically generated by " << gnu_lilypond_version_str ()  << '\n';
   String out;
@@ -105,13 +105,13 @@ do_one_file (String init_str, String file_str)
 {
   if (init_str.length_i () && global_path.find (init_str).empty_b ())
     {
-      warning (_f ("Can't find file: `%s'", init_str));
+      warning (_f ("can't find file: `%s'", init_str));
       warning (_f ("(search path: `%s')", global_path.str ().ch_C()));
       return;
     }
   if ((file_str != "-") && global_path.find (file_str).empty_b ())
     {
-      warning (_f ("Can't find file: `%s'", file_str));
+      warning (_f ("can't find file: `%s'", file_str));
       return;
     }
 

diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc
index 0b1a8c6839a4aabb7fcd56a0f47df0c0042674cf..d6115db93c489b181280db3eeb3b17aad9f2723e 100644 (file)
--- a/lily/slur-engraver.cc
+++ b/lily/slur-engraver.cc
@@ -74,7 +74,7 @@ Slur_engraver::do_process_music()
        {
          if (slur_l_stack_.empty())
 
-           slur_req_l->warning (_f ("Can't find both ends of %s", _("slur")));
+           slur_req_l->warning (_f ("can't find both ends of %s", _("slur")));
          else
            {
              end_slur_l_arr_.push (slur_l_stack_.pop());

diff --git a/lily/spacing-spanner.cc b/lily/spacing-spanner.cc
index 52ff8c05e19da738def546c1c2606ec518ec6339..d485c9abfdf3d3b32ad166d4a60249d4b683fa5b 100644 (file)
--- a/lily/spacing-spanner.cc
+++ b/lily/spacing-spanner.cc
@@ -233,7 +233,7 @@ Spacing_spanner::note_spacing (Paper_column *lc, Paper_column *rc, Moment shorte
   
   if (! shortest_playing_len)
     {
-      programming_error ("Can't find a ruling note at " + lc->when_mom ().str ());
+      programming_error ("can't find a ruling note at " + lc->when_mom ().str ());
       shortest_playing_len = 1;
     }
   

diff --git a/lily/staff-margin-engraver.cc b/lily/staff-margin-engraver.cc
index 3472bcf54f101f278138f918046c26df79e5eb9f..88adb28af6ecbf3713bd17a4c8e22a7da4e7d289 100644 (file)
--- a/lily/staff-margin-engraver.cc
+++ b/lily/staff-margin-engraver.cc
@@ -10,6 +10,7 @@
 #include "engraver.hh"
 #include "bar.hh"
 #include "dimension-cache.hh"
+#include "directional-element-interface.hh"
 #include "timing-translator.hh"
 #include "text-item.hh"
 #include "side-position-interface.hh"
@@ -20,7 +21,8 @@
 /*
   TODO:
 
-    * padding
+    * align over full score
+    * text aligment: left, centred, right
     * merge with/derive from/add functionality to Bar_script_engraver
  */
 
@@ -105,28 +107,73 @@ Staff_margin_engraver::create_text (SCM text)
       // 'just to be sure': see Clef_item::do_add_processing
       l->add_dependency (t);
 
-      announce_element (Score_element_info (t, 0));
 
       /*
        Hmm.
        In almost every score that uses "instrument" and "instr"
        we need two different paddings.
        Let's try one of those first:
-          instrumentScriptPadding/instrScriptPadding
-       */
+       instrumentScriptPadding/instrScriptPadding
+      */
       SCM s = get_property (String (now_mom () ? "instr" : "instrument")
                            + "ScriptPadding");
       if (!gh_number_p (s))
        s = get_property (type_ + "ScriptPadding");
+
+      Real padding = 0;
       if (gh_number_p (s))
+       padding = gh_scm2double (s);
+  
+      s = get_property (type_ + "ScriptTextStyle");
+      if (gh_string_p (s))
+       t->set_elt_property ("style", s);
+
+      s = get_property (type_ + "ScriptHorizontalAlignment");
+      /*
+        Allow centred,
+       */
+      if (gh_number_p (s) && !gh_scm2int (s))
+       {
+         t->set_elt_property ("self-alignment-X", gh_int2scm (0));
+         t->add_offset_callback (Side_position_interface::aligned_on_self, X_AXIS);
+         /*
+%          Centred is still broken, it always requires proper padding.
+          */
+         padding *= -1;
+         if (padding)
+           t->translate_axis (padding, X_AXIS);
+       }
+      /*
+       left or right alignment.
+      */
+      else
        {
-         //t->set_elt_property ("padding", s);
-         t->translate_axis (-gh_scm2double (s), X_AXIS);
+         side_position (t).set_axis (X_AXIS);
+         side_position (t).add_support (l);
+      
+         Direction d;
+         if (isdir_b (s))
+           d = to_dir (s);
+         /*
+           By default, align at left edge of Left_edge_item,
+           (which makes text right-aligned)
+           so that we don't collide with staff.
+         */
+         else
+           d = LEFT;
+         
+         directional_element (t).set (d);
+         padding *= -d;
+         if (padding)
+           t->set_elt_property ("padding", gh_double2scm (padding));
        }
+
+
+      announce_element (Score_element_info (t, 0));
       text_p_ = t;
     }
-  //text_p_->set_elt_property ("style", s);
-  //text_p_->set_elt_property ("direction", gh_int2scm (RIGHT));
+
+
   text_p_->set_elt_property ("text", text);
 }
 

diff --git a/lily/tfm.cc b/lily/tfm.cc
index bbcfaab5b1c91c9207e44a4d2fa114aacb21a1e4..982b357300ef76c9a53510d4a189b6bcf73d671a 100644 (file)
--- a/lily/tfm.cc
+++ b/lily/tfm.cc
@@ -67,7 +67,7 @@ Tex_font_metric::find_ascii (int ascii, bool warn) const
   else if (warn)
 
     {
-      warning (_f ("Can't find ascii character: `%d'", ascii));
+      warning (_f ("can't find ascii character: `%d'", ascii));
     }
   return &dummy_static_char_metric;  
 }

diff --git a/lily/time-signature-engraver.cc b/lily/time-signature-engraver.cc
index f485c22afd329a87d2d2a6293ddb1be8565ea322..547d4c2ef451c21898ad57746fd685298bc8ffee 100644 (file)
--- a/lily/time-signature-engraver.cc
+++ b/lily/time-signature-engraver.cc
@@ -26,7 +26,7 @@ Time_signature_engraver::do_process_music()
   if (!result)
     {
       warning (_ ("lost in time:"));
-      warning (_f ("Can't find: `%s'", " Timing_translator"));
+      warning (_f ("can't find: `%s'", " Timing_translator"));
       return ;
     }
   

diff --git a/lily/translator-group.cc b/lily/translator-group.cc
index 64851dfc192ad2e38c8125c764185a27e2d6eeb4..ab2bb7c82f0c18a69808c72c9aaeb43c7f6919d8 100644 (file)
--- a/lily/translator-group.cc
+++ b/lily/translator-group.cc
@@ -207,7 +207,7 @@ Translator_group::find_create_translator_l (String n, String id)
     ret = daddy_trans_l_->find_create_translator_l (n,id);
   else
     {
-      warning (_f ("Can't find or create `%s' called `%s'", n, id));
+      warning (_f ("can't find or create `%s' called `%s'", n, id));
       ret =0;
     }
   return ret;
@@ -319,7 +319,7 @@ Translator_group::get_default_interpreter()
       Translator*t = output_def_l ()->find_translator_l (accepts_str_arr_[0]);
       if (!t)
        {
-         warning (_f ("Can't find or create: `%s'", accepts_str_arr_[0]));
+         warning (_f ("can't find or create: `%s'", accepts_str_arr_[0]));
          t = this;
        }
       Translator_group * g= dynamic_cast <Translator_group*>(t->clone ());
@@ -413,7 +413,7 @@ Translator_group::do_add_processing ()
       String s = consists_str_arr_[i];
       Translator * t = output_def_l ()->find_translator_l (s);
       if (!t)
-       warning (_f ("Can't find: `%s'", s));
+       warning (_f ("can't find: `%s'", s));
       else
        add_translator (t->clone ());
     }
@@ -422,7 +422,7 @@ Translator_group::do_add_processing ()
        String s = consists_end_str_arr_[i];
        Translator * t = output_def_l ()->find_translator_l (s);
        if (!t)
-        warning (_f ("Can't find: `%s'", s));
+        warning (_f ("can't find: `%s'", s));
        else
         add_translator (t->clone ());
     }

diff --git a/ly/engraver.ly b/ly/engraver.ly
index f95e8cdf8dc92374c67d23eb57e020f01b277827..a97abe6d6e029ccf44329aaa868de1ac8b623e62 100644 (file)
--- a/ly/engraver.ly
+++ b/ly/engraver.ly
@@ -113,7 +113,7 @@ VoiceContext = \translator {
        \type "Engraver_group_engraver";
        \name Voice;
 
-       dynamicPadding = #2.0
+       dynamicPadding = #5  % urg, in \pt
        Generic_property_list = #generic-voice-properties
        \consists "Output_property_engraver";   
 
@@ -322,6 +322,8 @@ ScoreContext = \translator {
        \type Score_engraver;
        \name Score;
 
+       marginScriptPadding = #10  % urg, in \pt
+
        \consists "Timing_engraver";
        \consists "Output_property_engraver";   
 

diff --git a/midi2ly/midi-score-parser.cc b/midi2ly/midi-score-parser.cc
index 3370edcd15ffaa0a82accf5998e61c64422339e1..e80e85740b70014230d97fc708de4b1e7e8302d5 100644 (file)
--- a/midi2ly/midi-score-parser.cc
+++ b/midi2ly/midi-score-parser.cc
@@ -21,7 +21,7 @@ Midi_score_parser::open (String filename_str, Sources* sources_l)
 {
   info_l_->source_l_ = sources_l->get_file_l (filename_str);
   if (!info_l_->source_l_)
-    ::error (_f ("Can't find file: `%s'", filename_str));
+    ::error (_f ("can't find file: `%s'", filename_str));
   info_l_->byte_L_ = (Byte const*)info_l_->source_l_->ch_C ();
   info_l_->end_byte_L_ = info_l_->byte_L_ + info_l_->source_l_->length_i () + 1;
 }
@@ -55,7 +55,7 @@ Midi_score_parser::parse_header ()
     exit (_("invalid number of tracks"));
   info_l_->division_1_i_ = get_i (2) * 4;
   if (info_l_->division_1_i_ < 0)
-    exit (_ ("Can't handle non-metrical time"));
+    exit (_ ("can't handle non-metrical time"));
   // ugh
   Duration::division_1_i_s = info_l_->division_1_i_;
   forward_byte_L (length_i - 6);

diff --git a/midi2ly/mudela-stream.cc b/midi2ly/mudela-stream.cc
index b185a9bbcd5152330f72ac42a644f6aeec220f4b..f47a26ffa872a5a483fd106e23a2041b475dd9fc 100644 (file)
--- a/midi2ly/mudela-stream.cc
+++ b/midi2ly/mudela-stream.cc
@@ -108,7 +108,7 @@ Mudela_stream::open()
 {
   os_p_ = new ofstream (filename_str_.ch_C ());
   if  (!*os_p_)
-    error (_f ("Can't open file: `%s'",  filename_str_));
+    error (_f ("can't open file: `%s'",  filename_str_));
 }
 
 void

diff --git a/mutopia/Coriolan/coriolan-paper.ly b/mutopia/Coriolan/coriolan-paper.ly
index 2b175075fc5aa9266300802ea23179b7cec66f2b..9e735356fbd818995d0545ad6ebe502ee1274ca3 100644 (file)
--- a/mutopia/Coriolan/coriolan-paper.ly
+++ b/mutopia/Coriolan/coriolan-paper.ly
@@ -1,18 +1,15 @@
 \paper{
        \paper_sixteen
+       textheight = 295.0\mm;
+       linewidth = 180.0\mm;
+
        % slurs are never beautiful (no steep slurs)
        slur_beautiful = 0.0;
 
-       %%
-       %%\translator { \VoiceContext \remove "Dynamic_engraver"; }
-
        \translator {
                \VoiceContext
                \name "VoiceOne";
 
-               %%
-               %%\remove "Dynamic_engraver";
-
                %%\consists "Line_number_engraver";
                verticalDirection = #1
                stemVerticalDirection = #1
@@ -31,7 +28,8 @@
        \translator { 
                \HaraKiriStaffContext 
                instrumentScriptPadding = #55  %% urg, this is in pt
-               instrScriptPadding = #25 %% urg, this is in pt
+               instrScriptPadding = #35 %% urg, this is in pt
+               maximumRestCount = #1
                \accepts "VoiceOne";
                \accepts "VoiceTwo";
        }

diff --git a/mutopia/Coriolan/coriolan-part-paper.ly b/mutopia/Coriolan/coriolan-part-paper.ly
index 0610b3083d4d69fa29cf29fdb900d41eed22dc48..3d21929758a95bf35f53b475890ddeb51e0339a6 100644 (file)
--- a/mutopia/Coriolan/coriolan-part-paper.ly
+++ b/mutopia/Coriolan/coriolan-part-paper.ly
@@ -1,11 +1,10 @@
 \paper {
+       textheight = 295.0\mm;
+       linewidth = 180.0\mm;
+
        % slurs are never beautiful (no steep slurs)
        slur_beautiful = 0.0;
-       \translator { 
-               \OrchestralPartStaffContext 
-               instrumentScriptPadding = #55  %% urg, this is in pt
-               instrScriptPadding = #25  %% urg, this is in pt
-       }
+
        \translator {
                \VoiceContext
                \name "VoiceOne";
@@ -29,6 +28,10 @@
                \StaffContext
                \accepts "VoiceOne";
                \accepts "VoiceTwo";
+               instrumentScriptPadding = #55  %% urg, this is in pt
+               instrScriptPadding = #35  %% urg, this is in pt
+               maximumRestCount = #1
        }
+       \translator { \OrchestralPartStaffContext }
        \translator { \ScoreContext skipBars = ##t }
 }

diff --git a/po/lilypond.pot b/po/lilypond.pot
index 84c0384ca2920b68637ed2b01d2761e7fe00e353..10301acea2cf09c4be619a31c60d6f4b132a2ace 100644 (file)
--- a/po/lilypond.pot
+++ b/po/lilypond.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-12-28 00:34+0000\n"
+"POT-Creation-Date: 2000-03-15 19:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -26,42 +26,32 @@ msgstr ""
 msgid "not enough fields in Dstream init"
 msgstr ""
 
-#: getopt-long.cc:141
+#: getopt-long.cc:143
 #, c-format
-msgid "Option `%s' requires an argument"
+msgid "option `%s' requires an argument"
 msgstr ""
 
-#: getopt-long.cc:145
+#: getopt-long.cc:147
 #, c-format
-msgid "Option `%s' doesn't allow an argument"
+msgid "option `%s' doesn't allow an argument"
 msgstr ""
 
-#: getopt-long.cc:149
+#: getopt-long.cc:151
 #, c-format
 msgid "unrecognized option: `%s'"
 msgstr ""
 
-#: getopt-long.cc:156
+#: getopt-long.cc:158
 #, c-format
 msgid "invalid argument `%s' to option `%s'"
 msgstr ""
 
-#: text-stream.cc:9
-msgid "<stdin>"
-msgstr ""
-
-#: mapped-file-storage.cc:87 midi-stream.cc:77 mudela-stream.cc:111
-#: paper-stream.cc:25 scores.cc:38 simple-file-storage.cc:44 text-stream.cc:22
-#, c-format
-msgid "Can't open file: `%s'"
-msgstr ""
-
 #: input.cc:92 warn.cc:8 warn.cc:16
 msgid "error: "
 msgstr ""
 
 #: input.cc:98
-msgid "Non fatal error: "
+msgid "non fatal error: "
 msgstr ""
 
 #: input.cc:106 source-file.cc:62 source-file.cc:155
@@ -69,7 +59,13 @@ msgid "position unknown"
 msgstr ""
 
 #: mapped-file-storage.cc:74
-msgid "Can't map file"
+msgid "can't map file"
+msgstr ""
+
+#: mapped-file-storage.cc:87 midi-stream.cc:77 mudela-stream.cc:111
+#: paper-stream.cc:25 scores.cc:38 simple-file-storage.cc:44 text-stream.cc:22
+#, c-format
+msgid "can't open file: `%s'"
 msgstr ""
 
 #: simple-file-storage.cc:56
@@ -77,6 +73,10 @@ msgstr ""
 msgid "Huh?  Got %d, expected %d characters"
 msgstr ""
 
+#: text-stream.cc:9
+msgid "<stdin>"
+msgstr ""
+
 #: warn.cc:35
 msgid "programming error: "
 msgstr ""
@@ -85,36 +85,40 @@ msgstr ""
 msgid " (Continuing; cross thumbs)"
 msgstr ""
 
-#: afm.cc:128
+#: afm.cc:42
 #, c-format
-msgid "Can't find character called: `%s'"
+msgid "can't find character number: %d"
 msgstr ""
 
-#: afm.cc:153
+#: afm.cc:55
 #, c-format
-msgid "Can't find character number: %d"
+msgid "can't find character called: `%s'"
 msgstr ""
 
-#: all-font-metrics.cc:107 lookup.cc:96
+#: afm.cc:85
+msgid "Error parsing AFM file"
+msgstr ""
+
+#: all-font-metrics.cc:104 lookup.cc:56
 #, c-format
-msgid "Can't find font: `%s'"
+msgid "can't find font: `%s'"
 msgstr ""
 
-#: all-font-metrics.cc:108
+#: all-font-metrics.cc:105
 msgid "Loading default font"
 msgstr ""
 
-#: all-font-metrics.cc:113
+#: all-font-metrics.cc:120
 #, c-format
-msgid "Can't find default font: `%s'"
+msgid "can't find default font: `%s'"
 msgstr ""
 
-#: all-font-metrics.cc:114
+#: all-font-metrics.cc:121 includable-lexer.cc:49 lookup.cc:57 scores.cc:109
 #, c-format
-msgid "(search path: `%s'"
+msgid "(search path: `%s')"
 msgstr ""
 
-#: all-font-metrics.cc:115
+#: all-font-metrics.cc:122
 msgid "Giving up"
 msgstr ""
 
@@ -123,44 +127,44 @@ msgid "Can't switch translators, I'm there already"
 msgstr ""
 
 #: beam-engraver.cc:42 beam-engraver.cc:58
-msgid "no beam to end"
+msgid "can't find start of beam"
 msgstr ""
 
 #: beam-engraver.cc:87
-msgid "Already have a Beam"
+msgid "already have a beam"
 msgstr ""
 
 #: beam-engraver.cc:142
-msgid "unfinished beam"
+msgid "unterminated beam"
 msgstr ""
 
-#: beam-engraver.cc:170
-msgid "Stem must have Rhythmic structure"
+#: beam-engraver.cc:170 chord-tremolo-engraver.cc:229
+msgid "stem must have Rhythmic structure"
 msgstr ""
 
 #: beam-engraver.cc:181
-msgid "Stem doesn't fit in beam"
+msgid "stem doesn't fit in beam"
 msgstr ""
 
 #: beam-engraver.cc:182
-msgid "Beam was started here"
+msgid "beam was started here"
 msgstr ""
 
-#: beam.cc:85
+#: beam.cc:87
 msgid "beam has less than two stems"
 msgstr ""
 
-#: beam.cc:469
+#: beam.cc:475
 msgid "weird beam vertical offset"
 msgstr ""
 
 #: break-algorithm.cc:106
-msgid "Score does not have any columns"
+msgid "score does not have any columns"
 msgstr ""
 
 #: change-iterator.cc:22
 #, c-format
-msgid "Can't change `%s' to `%s'"
+msgid "can't change `%s' to `%s'"
 msgstr ""
 
 #.
@@ -177,16 +181,16 @@ msgstr ""
 msgid "none of these in my family"
 msgstr ""
 
-#: chord-tremolo-engraver.cc:40 chord-tremolo-engraver.cc:57
-msgid "no tremolo beam to end"
+#: chord-tremolo-engraver.cc:83 chord-tremolo-engraver.cc:100
+msgid "can't find start of chord tremolo"
 msgstr ""
 
-#: chord-tremolo-engraver.cc:82
-msgid "Already have a tremolo beam"
+#: chord-tremolo-engraver.cc:130
+msgid "already have a chord tremolo"
 msgstr ""
 
-#: chord-tremolo-engraver.cc:125
-msgid "unfinished tremolo beam"
+#: chord-tremolo-engraver.cc:183
+msgid "unterminated chord tremolo"
 msgstr ""
 
 #: chord.cc:147
@@ -207,45 +211,45 @@ msgstr ""
 msgid "Too many clashing notecolumns.  Ignoring them."
 msgstr ""
 
-#: crescendo.cc:63
+#: crescendo.cc:67
 msgid "crescendo"
 msgstr ""
 
-#: crescendo.cc:63
+#: crescendo.cc:67
 msgid "too small"
 msgstr ""
 
-#: cross-staff.cc:17
+#: cross-staff.cc:18
 msgid ""
 "minVerticalAlign != maxVerticalAlign: cross staff spanners may be broken"
 msgstr ""
 
-#: debug.cc:30
+#: debug.cc:26
 msgid "floating point exception"
 msgstr ""
 
-#: debug.cc:54
-msgid "Can't set mem-checking!"
+#: debug.cc:50
+msgid "can't set mem-checking!"
 msgstr ""
 
 #: dimensions.cc:13
 msgid "NaN"
 msgstr ""
 
-#: dynamic-engraver.cc:105
-msgid "Got a dynamic already.  Continuing dazed and confused."
+#: dynamic-engraver.cc:244 span-dynamic-performer.cc:114
+msgid "can't find start of (de)crescendo"
 msgstr ""
 
-#: dynamic-engraver.cc:154
-msgid "Can't find (de)crescendo to end"
+#: dynamic-engraver.cc:263
+msgid "already have a crescendo"
 msgstr ""
 
-#: dynamic-engraver.cc:186
-msgid "Too many crescendi here"
+#: dynamic-engraver.cc:264
+msgid "already have a decrescendo"
 msgstr ""
 
-#: dynamic-engraver.cc:224
-msgid "unended crescendo"
+#: dynamic-engraver.cc:339
+msgid "unterminated (de)crescendo"
 msgstr ""
 
 #: extender-engraver.cc:62
@@ -268,7 +272,7 @@ msgstr ""
 msgid "no Grace context available"
 msgstr ""
 
-#: grace-position-engraver.cc:89
+#: grace-position-engraver.cc:91
 msgid "Unattached grace notes.  Attaching to last musical column."
 msgstr ""
 
@@ -280,20 +284,15 @@ msgstr ""
 msgid "Nothing to connect hyphen to on the left.  Ignoring hyphen request."
 msgstr ""
 
-#: identifier.cc:46
+#: identifier.cc:43
 #, c-format
 msgid "wrong identifier type, expected: `%s'"
 msgstr ""
 
-#: includable-lexer.cc:47 lily-guile.cc:127 lily-guile.cc:150
+#: includable-lexer.cc:47 lily-guile.cc:126 lily-guile.cc:149
 #: midi-score-parser.cc:24 scores.cc:108 scores.cc:114
 #, c-format
-msgid "Can't find file: `%s'"
-msgstr ""
-
-#: includable-lexer.cc:49 lookup.cc:97 scores.cc:109
-#, c-format
-msgid "(search path: `%s')"
+msgid "can't find file: `%s'"
 msgstr ""
 
 #: key-def.cc:31
@@ -323,26 +322,26 @@ msgstr ""
 msgid "overdone accidentals (%s)"
 msgstr ""
 
-#: lily-guile.cc:129 lily-guile.cc:152
+#: lily-guile.cc:128 lily-guile.cc:151
 #, c-format
 msgid "(load path: `%s')"
 msgstr ""
 
-#: local-key-engraver.cc:44
+#: local-key-engraver.cc:82
 msgid "out of tune:"
 msgstr ""
 
-#: local-key-engraver.cc:45 time-signature-engraver.cc:29
-#: translator-group.cc:417 translator-group.cc:426
+#: local-key-engraver.cc:83 time-signature-engraver.cc:29
+#: translator-group.cc:416 translator-group.cc:425
 #, c-format
-msgid "Can't find: `%s'"
+msgid "can't find: `%s'"
 msgstr ""
 
-#: lookup.cc:98
+#: lookup.cc:58
 msgid "Aborting"
 msgstr ""
 
-#: lookup.cc:331
+#: lookup.cc:200
 #, c-format
 msgid "Non-matching braces in text `%s', adding braces"
 msgstr ""
@@ -423,36 +422,36 @@ msgstr ""
 msgid "show warranty and copyright"
 msgstr ""
 
-#: main.cc:92
+#: main.cc:100
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]..."
 msgstr ""
 
-#: main.cc:94
+#: main.cc:102
 msgid "Typeset music and or play MIDI from FILE"
 msgstr ""
 
-#: main.cc:98
+#: main.cc:106
 msgid ""
 "LilyPond is a music typesetter.  It produces beautiful sheet music\n"
 "using a high level description file as input.  LilyPond is part of \n"
 "the GNU Project.\n"
 msgstr ""
 
-#: main.cc:104 main.cc:116
+#: main.cc:112 main.cc:116
 msgid "Options:"
 msgstr ""
 
-#: main.cc:108
+#: main.cc:116
 msgid "This binary was compiled with the following options:"
 msgstr ""
 
-#: main.cc:120 main.cc:127
+#: main.cc:120 main.cc:135
 #, c-format
 msgid "Report bugs to %s"
 msgstr ""
 
-#: main.cc:53 main.cc:141
+#: main.cc:53 main.cc:143
 #, c-format
 msgid ""
 "This is free software.  It is covered by the GNU General Public License,\n"
@@ -460,17 +459,17 @@ msgid ""
 "certain conditions.  Invoke as `%s --warranty' for more information.\n"
 msgstr ""
 
-#: main.cc:60 main.cc:148 main.cc:160
+#: main.cc:60 main.cc:150 main.cc:162
 #, c-format
 msgid "Copyright (c) %s by"
 msgstr ""
 
 #. GNU GNU?
-#: main.cc:158
+#: main.cc:160
 msgid "GNU LilyPond -- The GNU Project music typesetter"
 msgstr ""
 
-#: main.cc:69 main.cc:166
+#: main.cc:69 main.cc:168
 msgid ""
 "    This program is free software; you can redistribute it and/or\n"
 "modify it under the terms of the GNU General Public License version 2\n"
@@ -487,21 +486,21 @@ msgid ""
 "USA.\n"
 msgstr ""
 
-#: midi-item.cc:307
+#: midi-item.cc:309
 #, c-format
 msgid "no such instrument: `%s'"
 msgstr ""
 
-#: midi-item.cc:361
+#: midi-item.cc:363
 #, c-format
 msgid "unconventional key: flats: %d, sharps: %d"
 msgstr ""
 
-#: midi-item.cc:406
+#: midi-item.cc:408
 msgid "silly duration"
 msgstr ""
 
-#: midi-item.cc:419
+#: midi-item.cc:421
 msgid "silly pitch"
 msgstr ""
 
@@ -515,7 +514,7 @@ msgstr ""
 
 #: music-output-def.cc:84
 #, c-format
-msgid "Can't find `%s' context"
+msgid "can't find `%s' context"
 msgstr ""
 
 #: musical-request.cc:42
@@ -523,26 +522,26 @@ msgstr ""
 msgid "Transposition by %s makes accidental larger than two"
 msgstr ""
 
-#: my-lily-lexer.cc:135
+#: my-lily-lexer.cc:138
 #, c-format
 msgid "redeclaration of `\\%s'"
 msgstr ""
 
-#: my-lily-lexer.cc:141
+#: my-lily-lexer.cc:144
 #, c-format
 msgid "Identifier name is a keyword: `%s'"
 msgstr ""
 
-#: my-lily-lexer.cc:170
+#: my-lily-lexer.cc:173
 #, c-format
 msgid "error at EOF: %s"
 msgstr ""
 
-#: midi-score-parser.cc:94 my-lily-parser.cc:61
+#: midi-score-parser.cc:94 my-lily-parser.cc:58
 msgid "Parsing..."
 msgstr ""
 
-#: my-lily-parser.cc:70
+#: my-lily-parser.cc:67
 msgid "Braces don't match"
 msgstr ""
 
@@ -559,24 +558,24 @@ msgstr ""
 msgid "not a real variable"
 msgstr ""
 
-#: paper-def.cc:207
+#: paper-def.cc:180
 #, c-format
 msgid "paper output to %s..."
 msgstr ""
 
-#: mudela-stream.cc:93 paper-outputter.cc:58 performance.cc:95
+#: mudela-stream.cc:93 paper-outputter.cc:60 performance.cc:95
 msgid ", at "
 msgstr ""
 
-#: paper-score.cc:115
+#: paper-score.cc:114
 msgid "Preprocessing elements..."
 msgstr ""
 
-#: paper-score.cc:120
+#: paper-score.cc:119
 msgid "Calculating column positions..."
 msgstr ""
 
-#: paper-score.cc:147
+#: paper-score.cc:146
 msgid "Outputting Score, defined at: "
 msgstr ""
 
@@ -603,51 +602,60 @@ msgstr ""
 msgid "MIDI output to %s..."
 msgstr ""
 
-#: repeat-engraver.cc:192
+#: property-engraver.cc:76
+msgid "Wrong type for property"
+msgstr ""
+
+#: repeat-engraver.cc:195
 msgid "No bar engraver found.  Ignoring repeats."
 msgstr ""
 
-#: request-chord-iterator.cc:73
+#: request-chord-iterator.cc:72
 #, c-format
 msgid "Junking request: `%s'"
 msgstr ""
 
-#: request-chord-iterator.cc:76
+#: request-chord-iterator.cc:75
 #, c-format
 msgid "Huh?  Not a Request: `%s'"
 msgstr ""
 
-#: rest-collision.cc:76
+#: request-iterator.cc:20
+#, c-format
+msgid "Junking music: `%s'"
+msgstr ""
+
+#: rest-collision.cc:132
 msgid "too many colliding rests"
 msgstr ""
 
-#: rest-collision.cc:80
+#: rest-collision.cc:136
 msgid "too many notes for rest collision"
 msgstr ""
 
-#: score-engraver.cc:135
+#: score-engraver.cc:139
 #, c-format
 msgid "unbound spanner `%s'"
 msgstr ""
 
-#: score.cc:56
+#: score.cc:60
 msgid "no toplevel translator"
 msgstr ""
 
-#: score.cc:59
+#: score.cc:63
 msgid "Interpreting music..."
 msgstr ""
 
-#: score.cc:71
+#: score.cc:75
 msgid "Need music in a score"
 msgstr ""
 
 #. should we? hampers debugging.
-#: score.cc:84
+#: score.cc:88
 msgid "Errors found/*, not processing score*/"
 msgstr ""
 
-#: score.cc:89
+#: score.cc:93
 #, c-format
 msgid "elapsed time: %.2f seconds"
 msgstr ""
@@ -661,7 +669,7 @@ msgstr ""
 msgid "Score contains errors; will not process it"
 msgstr ""
 
-#: script-engraver.cc:48
+#: script-engraver.cc:67
 #, c-format
 msgid "Don't know how to interpret articulation `%s'"
 msgstr ""
@@ -675,42 +683,42 @@ msgstr ""
 msgid "Single_malt_grouping_item:  I've been drinking too much"
 msgstr ""
 
-#: slur-engraver.cc:66
+#: slur-engraver.cc:61
 msgid "unterminated slur"
 msgstr ""
 
-#: slur-engraver.cc:82
+#: slur-engraver.cc:77
 #, c-format
-msgid "Can't find both ends of %s"
+msgid "can't find both ends of %s"
 msgstr ""
 
-#: slur-engraver.cc:82
+#: slur-engraver.cc:77
 msgid "slur"
 msgstr ""
 
-#: slur.cc:41
+#: slur.cc:240
 msgid "Putting slur over rest.  Ignoring."
 msgstr ""
 
-#: slur.cc:89
+#: slur.cc:322
 msgid "Slur over rest?"
 msgstr ""
 
-#: spanner.cc:33
+#: spanner.cc:34
 msgid "Left spanpoint is right spanpoint"
 msgstr ""
 
-#: spanner.cc:100
+#: spanner.cc:128
 #, c-format
 msgid "Spanner `%s' has equal left and right spanpoints"
 msgstr ""
 
-#: stem-engraver.cc:83
+#: stem-engraver.cc:124
 #, c-format
 msgid "Adding note head to incompatible stem (type = %d)"
 msgstr ""
 
-#: stem.cc:117
+#: stem.cc:118
 msgid "Weird stem size; check for narrow beams"
 msgstr ""
 
@@ -724,16 +732,16 @@ msgstr ""
 msgid "%s: TFM file has %u parameters, which is more than the %u I can handle"
 msgstr ""
 
-#: tfm.cc:64
+#: tfm.cc:70
 #, c-format
-msgid "Can't find ascii character: `%d'"
+msgid "can't find ascii character: `%d'"
 msgstr ""
 
-#: tie-engraver.cc:146 tie-performer.cc:106
+#: tie-engraver.cc:195 tie-performer.cc:109
 msgid "No ties were created!"
 msgstr ""
 
-#: tie.cc:65
+#: tie.cc:79
 msgid "lonely tie"
 msgstr ""
 
@@ -745,11 +753,15 @@ msgstr ""
 msgid "lost in time:"
 msgstr ""
 
-#: timing-translator.cc:28
+#: timing-translator.cc:31
 msgid "conflicting timing request"
 msgstr ""
 
-#: timing-translator.cc:69
+#: timing-translator.cc:32
+msgid "This is the other timing request"
+msgstr ""
+
+#: timing-translator.cc:73
 #, c-format
 msgid "barcheck failed at: %s"
 msgstr ""
@@ -770,12 +782,12 @@ msgstr ""
 
 #: translator-group.cc:210
 #, c-format
-msgid "Can't find or create `%s' called `%s'"
+msgid "can't find or create `%s' called `%s'"
 msgstr ""
 
-#: translator-group.cc:323
+#: translator-group.cc:322
 #, c-format
-msgid "Can't find or create: `%s'"
+msgid "can't find or create: `%s'"
 msgstr ""
 
 #: transposed-music.cc:31
@@ -786,94 +798,99 @@ msgstr ""
 msgid "no one to print a volta bracket"
 msgstr ""
 
-#: parser.yy:60
+#: parser.yy:61
 #, c-format
 msgid "Oldest supported input version: %s"
 msgstr ""
 
-#: parser.yy:433
+#: parser.yy:436
 msgid "Need a translator group for a context"
 msgstr ""
 
-#: parser.yy:454
+#: parser.yy:457
 msgid "Wrong type for property value"
 msgstr ""
 
-#: parser.yy:504
+#: parser.yy:507
 msgid "More than one music block"
 msgstr ""
 
-#: parser.yy:700
+#: parser.yy:706
 msgid "More alternatives than repeats.  Junking excess alternatives."
 msgstr ""
 
-#: parser.yy:930 parser.yy:1335 parser.yy:1355
-#, c-format
-msgid "not a duration: %d"
+#: parser.yy:750
+msgid "Second argument must be a symbol"
+msgstr ""
+
+#: parser.yy:755
+msgid "First argument must be a procedure taking 1 argument"
 msgstr ""
 
-#: parser.yy:932 parser.yy:1357
-msgid "Can't abbreviate"
+#: parser.yy:954 parser.yy:1386 parser.yy:1406
+#, c-format
+msgid "not a duration: %d"
 msgstr ""
 
-#: parser.yy:1052
+#: parser.yy:1105
 msgid "Can't specify direction for this request"
 msgstr ""
 
-#: parser.yy:1186 parser.yy:1194 parser.yy:1419
+#: parser.yy:1237 parser.yy:1245 parser.yy:1497
 msgid "Have to be in Lyric mode for lyrics"
 msgstr ""
 
-#: parser.yy:1366
+#: parser.yy:1415
 msgid "Have to be in Note mode for notes"
 msgstr ""
 
-#: parser.yy:1378
-msgid "Can't abbreviate tuplet"
+#. urg, burp.  what nonsense / silly implementation
+#: parser.yy:1429
+msgid "can't put stem tremolo on tuplet"
 msgstr ""
 
-#: parser.yy:1425
+#: parser.yy:1513
 msgid "Have to be in Chord mode for chords"
 msgstr ""
 
-#: lexer.ll:158
+#: lexer.ll:159
 msgid "EOF found inside a comment"
 msgstr ""
 
-#: lexer.ll:172
+#: lexer.ll:173
 msgid "\\maininput disallowed outside init files"
 msgstr ""
 
-#: lexer.ll:202
+#: lexer.ll:203
 #, c-format
 msgid "undefined identifier: `%s'"
 msgstr ""
 
 #. backup rule
-#: lexer.ll:207
+#: lexer.ll:208
 msgid "Missing end quote"
 msgstr ""
 
 #. backup rule
-#: lexer.ll:229 lexer.ll:233
+#: lexer.ll:230 lexer.ll:234
 msgid "white expected"
 msgstr ""
 
-#: lexer.ll:241
+#: lexer.ll:242
 msgid "Can't evaluate Scheme in safe mode"
 msgstr ""
 
-#: lexer.ll:436
+#: lexer.ll:437
 #, c-format
 msgid "invalid character: `%c'"
 msgstr ""
 
-#: lexer.ll:492
+#: lexer.ll:491
 #, c-format
 msgid "unknown escaped string: `\\%s'"
 msgstr ""
 
-#: lexer.ll:578
+#: lexer.ll:575
 #, c-format
 msgid "incorrect mudela version: %s (%s, %s)"
 msgstr ""
@@ -891,7 +908,7 @@ msgid "set key: ACC +sharps/-flats; :1 minor"
 msgstr ""
 
 #: main.cc:95
-msgid "assume no tuplets or double dots, smallest is 32"
+msgid "don't output tuplets or double dots, smallest is 32"
 msgstr ""
 
 #: main.cc:96
@@ -899,7 +916,7 @@ msgid "set FILE as default output"
 msgstr ""
 
 #: main.cc:97
-msgid "assume no tuplets"
+msgid "don't output tuplets"
 msgstr ""
 
 #: main.cc:98
@@ -952,7 +969,7 @@ msgid "invalid number of tracks"
 msgstr ""
 
 #: midi-score-parser.cc:58
-msgid "Can't handle non-metrical time"
+msgid "can't handle non-metrical time"
 msgstr ""
 
 #: midi-track-parser.cc:68

diff --git a/po/nl.po b/po/nl.po
index 1aa64ac334ab70a499f0b5696b731f3d0be764fb..56a2d4a94437472d1d56973fd54c0c980ccf266e 100644 (file)
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,10 +1,10 @@
 # nl.po -- GNU LilyPond's dutch language file
 # Jan Nieuwenhuizen <janneke@gnu.org>
-# Han-Wen Nienhuys <hanwen@cs.uu.nl>, 1998, 1999.
+# Han-Wen Nienhuys <hanwen@cs.uu.nl>, 1998, 1999, 2000.
 #
 msgid ""
 msgstr ""
-"POT-Creation-Date: 1999-09-16 20:29+0200\n"
+"POT-Creation-Date: 2000-03-15 19:34+0100\n"
 "Content-Type: text/plain; charset=\n"
 "Date: 1998-05-26 11:26:28+0200\n"
 "From:  <janneke@gnu.org>\n"
@@ -16,183 +16,154 @@ msgstr ""
 msgid "EOF in a string"
 msgstr "EOF in een string"
 
-#: data-file.cc:116 input.cc:86 midi-parser.cc:100 warn.cc:21
+#: data-file.cc:116 input.cc:87 midi-parser.cc:100 warn.cc:22
 msgid "warning: "
 msgstr "waarschuwing: "
 
-#: dstream.cc:158
+#: dstream.cc:184
 msgid "not enough fields in Dstream init"
 msgstr "onvoldoende velden in Dstream init"
 
-#: flower-debug.cc:17
-msgid "Debug output disabled.  Compiled with NPRINT."
-msgstr "Ontluisberichten zijn uitgeschakeld.  Vertaald met NPRINT."
-
-#: getopt-long.cc:141
+#: getopt-long.cc:143
 #, c-format
-msgid "Option `%s' requires an argument"
-msgstr "Optie `%s' vereist een argument"
+msgid "option `%s' requires an argument"
+msgstr "optie `%s' vereist een argument"
 
-#: getopt-long.cc:145
+#: getopt-long.cc:147
 #, c-format
-msgid "Option `%s' doesn't allow an argument"
-msgstr "Optie `%s' staat geen argument toe"
+msgid "option `%s' doesn't allow an argument"
+msgstr "optie `%s' staat geen argument toe"
 
-#: getopt-long.cc:149
+#: getopt-long.cc:151
 #, c-format
 msgid "unrecognized option: `%s'"
 msgstr "onbekende optie: `%s'"
 
-#: getopt-long.cc:156
+#: getopt-long.cc:158
 #, c-format
 msgid "invalid argument `%s' to option `%s'"
 msgstr "onjuist argument: `%s' voor optie `%s'"
 
-#: text-stream.cc:8
-msgid "<stdin>"
-msgstr "<stdin>"
-
-#: mapped-file-storage.cc:87 midi-stream.cc:77 mudela-stream.cc:104
-#: paper-stream.cc:25 scores.cc:38 simple-file-storage.cc:44 text-stream.cc:21
-#, c-format
-msgid "Can't open file: `%s'"
-msgstr "Kan bestand niet openen: `%s'"
-
-#: input.cc:91 warn.cc:7 warn.cc:15
+#: input.cc:92 warn.cc:8 warn.cc:16
 msgid "error: "
 msgstr "fout: "
 
-#: input.cc:97
-msgid "Non fatal error: "
-msgstr "Niet noodlottige fout: "
+#: input.cc:98
+msgid "non fatal error: "
+msgstr "niet noodlottige fout: "
 
-#: input.cc:105 source-file.cc:63 source-file.cc:156
+#: input.cc:106 source-file.cc:62 source-file.cc:155
 msgid "position unknown"
 msgstr "positie onbekend"
 
 #: mapped-file-storage.cc:74
-msgid "Can't map file"
-msgstr "Kan bestand niet inkaarten"
+msgid "can't map file"
+msgstr "kan bestand niet inkaarten"
+
+#: mapped-file-storage.cc:87 midi-stream.cc:77 mudela-stream.cc:111
+#: paper-stream.cc:25 scores.cc:38 simple-file-storage.cc:44 text-stream.cc:22
+#, c-format
+msgid "can't open file: `%s'"
+msgstr "kan bestand niet openen: `%s'"
 
 #: simple-file-storage.cc:56
 #, c-format
 msgid "Huh?  Got %d, expected %d characters"
 msgstr "Huh?  Kreeg %d, verwachtte %d tekens"
 
-#: warn.cc:34
+#: text-stream.cc:9
+msgid "<stdin>"
+msgstr "<stdin>"
+
+#: warn.cc:35
 msgid "programming error: "
 msgstr "programmeerfout: "
 
-#: warn.cc:34
+#: warn.cc:35
 msgid " (Continuing; cross thumbs)"
 msgstr " (Ga verder; duim maar)"
 
-#: afm.cc:129
+#: afm.cc:42
 #, c-format
-msgid "Can't find character called: `%s'"
-msgstr "Kan teken niet vinden genaamd: `%s'"
+msgid "can't find character number: %d"
+msgstr "kan teken niet vinden met nummer: %d"
 
-#: afm.cc:154
+#: afm.cc:55
 #, c-format
-msgid "Can't find character number: %d"
-msgstr "kan teken niet vinden met nummer: %d"
+msgid "can't find character called: `%s'"
+msgstr "kan teken niet vinden genaamd: `%s'"
+
+#: afm.cc:85
+msgid "Error parsing AFM file"
+msgstr "Fout bij ontleden AFM bestand"
 
-#: all-font-metrics.cc:69 lookup.cc:103
+#: all-font-metrics.cc:104 lookup.cc:56
 #, c-format
-msgid "Can't find font: `%s'"
-msgstr "Kan font niet vinden: `%s'"
+msgid "can't find font: `%s'"
+msgstr "kan font niet vinden: `%s'"
 
-#: all-font-metrics.cc:70
+#: all-font-metrics.cc:105
 msgid "Loading default font"
 msgstr "Laad verstek font"
 
-#: all-font-metrics.cc:75
+#: all-font-metrics.cc:120
 #, c-format
-msgid "Can't find default font: `%s'"
-msgstr "Kan verstekfont niet vinden: `%s'"
+msgid "can't find default font: `%s'"
+msgstr "kan verstekfont niet vinden: `%s'"
 
-#: all-font-metrics.cc:76
+#: all-font-metrics.cc:121 includable-lexer.cc:49 lookup.cc:57 scores.cc:109
 #, c-format
-msgid "(search path: `%s)'"
+msgid "(search path: `%s')"
 msgstr "(zoekpad: `%s')"
 
-#: all-font-metrics.cc:77
+#: all-font-metrics.cc:122
 msgid "Giving up"
 msgstr "Geef op"
 
+#: auto-change-iterator.cc:43 change-iterator.cc:60
+msgid "Can't switch translators, I'm there already"
+msgstr "Kan niet wisselen van vertaler, ben al hier"
+
 #: beam-engraver.cc:42 beam-engraver.cc:58
-msgid "no beam to end"
-msgstr "geen balk te beëindigen"
+msgid "can't find start of beam"
+msgstr "kan start van waardestreep niet vinden"
 
 #: beam-engraver.cc:87
-msgid "Already have a beam"
-msgstr "Heb al een balk"
+msgid "already have a beam"
+msgstr "heb al een waardestreep"
 
-#: beam-engraver.cc:149
-msgid "unfinished beam"
-msgstr "onbeëindigde balk"
+#: beam-engraver.cc:142
+msgid "unterminated beam"
+msgstr "onbeëindigde waardestreep"
 
-#: beam-engraver.cc:174
-msgid "Stem must have Rhythmic structure"
-msgstr "Stok moet Ritmische structuur hebben"
+#: beam-engraver.cc:170 chord-tremolo-engraver.cc:229
+msgid "stem must have Rhythmic structure"
+msgstr "stok moet Ritmische structuur hebben"
 
-#: beam-engraver.cc:185
-msgid "Stem doesn't fit in beam"
-msgstr "Stok past niet in balk"
+#: beam-engraver.cc:181
+msgid "stem doesn't fit in beam"
+msgstr "stok past niet in waardestreep"
 
-#: beam-engraver.cc:186
-msgid "Beam was started here"
-msgstr "Balk werd hier gestart"
+#: beam-engraver.cc:182
+msgid "beam was started here"
+msgstr "waardestreep werd hier gestart"
 
-#: beam.cc:147
-msgid "beam with less than two stems"
-msgstr "balk met minder dan twee stokken"
+#: beam.cc:87
+msgid "beam has less than two stems"
+msgstr "waardestreep heeft minder dan twee stokken"
 
-#: beam.cc:312
+#: beam.cc:475
 msgid "weird beam vertical offset"
-msgstr "rare verticale balk verplaatsing"
-
-#: break-algorithm.cc:28
-msgid "0 lines"
-msgstr "0 regels"
-
-#: break-algorithm.cc:30
-#, c-format
-msgid "1 line (of %.0f columns)"
-msgstr "1 regel (van %.0f kolommen)"
-
-#: break-algorithm.cc:32
-#, c-format
-msgid "%d lines (with an average of %.1f columns)"
-msgstr "%d regels (van gemiddeld %.1f kolommen)"
-
-#: break-algorithm.cc:155
-msgid "Score does not have any columns"
-msgstr "Partituur heeft geen enkele kolom"
-
-#: break-algorithm.cc:172
-#, c-format
-msgid "approximated %s"
-msgstr "geschat: %s"
+msgstr "rare verticale waardestreep verplaatsing"
 
-#: break-algorithm.cc:174
-#, c-format
-msgid "calculated %s exactly"
-msgstr "exact berekend: %s"
-
-#: break-algorithm.cc:175
-#, c-format
-msgid "elapsed time %.2f seconds"
-msgstr "duur: %.2f seconden"
+#: break-algorithm.cc:106
+msgid "score does not have any columns"
+msgstr "partituur heeft geen enkele kolom"
 
 #: change-iterator.cc:22
 #, c-format
-msgid "Can't change `%s' to `%s'"
-msgstr "Kan `%s' niet in `%s' veranderen"
-
-#: change-iterator.cc:57
-msgid "Can't switch translators, I'm there already"
-msgstr "Kan niet wisselen van vertaler, ben al hier"
+msgid "can't change `%s' to `%s'"
+msgstr "kan `%s' niet in `%s' veranderen"
 
 #.
 #. We could change the current translator's id, but that would make
@@ -200,90 +171,86 @@ msgstr "Kan niet wisselen van vertaler, ben al hier"
 #.
 #. last->translator_id_str_  = change_l ()->change_to_id_str_;
 #.
-#: change-iterator.cc:76
+#: change-iterator.cc:79
 msgid "I'm one myself"
 msgstr "Ben er zelf een"
 
-#: change-iterator.cc:79
+#: change-iterator.cc:82
 msgid "none of these in my family"
 msgstr "geen van deze in mijn gezin"
 
-#: chord-tremolo-engraver.cc:41 chord-tremolo-engraver.cc:58
-msgid "no tremolo beam to end"
-msgstr "geen tremolo balk te beëindigen"
+#: chord-tremolo-engraver.cc:83 chord-tremolo-engraver.cc:100
+msgid "can't find start of chord tremolo"
+msgstr "kan start van akkoordtremolo niet vinden"
 
-#: chord-tremolo-engraver.cc:83
-msgid "Already have a tremolo beam"
-msgstr "Heb al een tremolo balk"
+#: chord-tremolo-engraver.cc:130
+msgid "already have a chord tremolo"
+msgstr "heb al een akkoordtremolo"
 
-#: chord-tremolo-engraver.cc:124
-msgid "unfinished tremolo beam"
-msgstr "onbeëindigde tremolo balk"
+#: chord-tremolo-engraver.cc:183
+msgid "unterminated chord tremolo"
+msgstr "onbeëindigd akkoordtremolo"
 
-#: chord.cc:231
+#: chord.cc:147
 #, c-format
 msgid "invalid subtraction: not part of chord: %s"
 msgstr "ongeldige aftrek: maakt geen deel uit van accoord: %s"
 
-#: chord.cc:245
+#: chord.cc:365
 #, c-format
 msgid "invalid inversion pitch: not part of chord: %s"
 msgstr "ongeldige inversie toon: geen onderdeel van accoord: %s"
 
-#: clef-engraver.cc:178
+#: clef-engraver.cc:151
 msgid "unknown clef type"
 msgstr "onbekend type sleutel"
 
-#: collision.cc:95
+#: collision.cc:99
 msgid "Too many clashing notecolumns.  Ignoring them."
 msgstr "Te veel botsende nootkolommen.  Negeer ze."
 
-#: crescendo.cc:42
+#: crescendo.cc:67
 msgid "crescendo"
 msgstr "crescendo"
 
-#: crescendo.cc:42
+#: crescendo.cc:67
 msgid "too small"
 msgstr "te klein"
 
-#: debug.cc:56
+#: cross-staff.cc:18
+msgid ""
+"minVerticalAlign != maxVerticalAlign: cross staff spanners may be broken"
+msgstr ""
+"minVerticalAlign != maxVerticalAlign: waardestrepen/bindingsbogen tussen "
+"notenbalken kunnen breken"
+
+#: debug.cc:26
 msgid "floating point exception"
-msgstr "frijvende komma uitzondering"
+msgstr "zwevende komma exceptie"
 
-#: debug.cc:139
-msgid "Can't set mem-checking!"
-msgstr "Kan geheugen controle niet zetten!"
+#: debug.cc:50
+msgid "can't set mem-checking!"
+msgstr "kan geheugen controle niet zetten!"
 
 #: dimensions.cc:13
 msgid "NaN"
 msgstr "NaN"
 
-#: dynamic-engraver.cc:109
-msgid "Got a dynamic already.  Continuing dazed and confused."
-msgstr "Heb al een dynamiek.  Ga verder, verstrooid en verward"
+#: dynamic-engraver.cc:244 span-dynamic-performer.cc:114
+msgid "can't find start of (de)crescendo"
+msgstr "kan start van (de)crescendo niet vinden"
 
-#: dynamic-engraver.cc:162
-msgid "Can't find (de)crescendo to end"
-msgstr "Kan te beëindigen (de)crescendo niet vinden"
+#: dynamic-engraver.cc:263
+msgid "already have a crescendo"
+msgstr "heb al een crescendo"
 
-#: dynamic-engraver.cc:216
-msgid "Too many crescendi here"
-msgstr "Te veel cescendi hier"
+#: dynamic-engraver.cc:264
+msgid "already have a decrescendo"
+msgstr "heb al een decrescendo"
 
-#: dynamic-engraver.cc:254
-msgid "unended crescendo"
-msgstr "niet beeindigd crescendo"
-
-#: encompass-info.cc:32
-msgid "Slur over rest?"
-msgstr "Boogje over rust?"
-
-#: encompass-info.cc:67 stem-info.cc:140
-msgid ""
-"minVerticalAlign != maxVerticalAlign: interstaff beams/slurs may be broken"
-msgstr ""
-"minVerticalAlign != maxVerticalAlign: balken/bindingsbogen tussen "
-"notenbalken kunnen breken"
+#: dynamic-engraver.cc:339
+msgid "unterminated (de)crescendo"
+msgstr "onbeëindigd (de)crescendo"
 
 #: extender-engraver.cc:62
 msgid "unterminated extender"
@@ -298,38 +265,37 @@ msgstr ""
 msgid "no one to print a repeat brace"
 msgstr "niemand om een herhalings haak af te drukken"
 
+#: gourlay-breaking.cc:154
+msgid "No feasible line breaking found"
+msgstr "Geen doenbare regelafbreuk gevonden"
+
 #: grace-iterator.cc:43
 msgid "no Grace context available"
 msgstr "geen Grace context voor handen"
 
-#: grace-position-engraver.cc:89
+#: grace-position-engraver.cc:91
 msgid "Unattached grace notes.  Attaching to last musical column."
 msgstr "Losse grace noten.  Maak ze vast aan vorige muziekale kolom."
 
 #: hyphen-engraver.cc:60
 msgid "unterminated hyphen"
-msgstr "onafgesloten balk"
+msgstr "onafgesloten waardestreep"
 
 #: hyphen-engraver.cc:72
 msgid "Nothing to connect hyphen to on the left.  Ignoring hyphen request."
 msgstr ""
 "Niets om streepje aan linkerkant aan vast te maken.  Negeer streepje verzoek."
 
-#: identifier.cc:46
+#: identifier.cc:43
 #, c-format
 msgid "wrong identifier type, expected: `%s'"
 msgstr "Verkeerd type identifier: "
 
-#: includable-lexer.cc:47 lily-guile.cc:82 lily-guile.cc:105
+#: includable-lexer.cc:47 lily-guile.cc:126 lily-guile.cc:149
 #: midi-score-parser.cc:24 scores.cc:108 scores.cc:114
 #, c-format
-msgid "Can't find file: `%s'"
-msgstr "Kan bestand niet vinden: `%s'"
-
-#: includable-lexer.cc:49 lookup.cc:104 scores.cc:109
-#, c-format
-msgid "(search path: `%s')"
-msgstr "(zoekpad: `%s')"
+msgid "can't find file: `%s'"
+msgstr "kan bestand niet vinden: `%s'"
 
 #: key-def.cc:31
 msgid "No key name, assuming `C'"
@@ -339,54 +305,49 @@ msgstr "Geen toonsoort, ga uit van `C'"
 msgid "Don't know how handle empty keys"
 msgstr "Weet niet hoe lege toonsoorten te behandelen"
 
-#: key-engraver.cc:70 key-performer.cc:65
+#: key-engraver.cc:77 key-performer.cc:65
 msgid "FIXME: key change merge"
 msgstr "MAAKME: toonsoort sleutel samenvoeging"
 
-#: key.cc:54 key.cc:59
+#: key.cc:56 key.cc:61
 #, c-format
 msgid "Don't have that many octaves (%s)"
 msgstr "Zoveel oktaven heb ik niet (%s)"
 
-#: key.cc:77
+#: key.cc:79
 #, c-format
 msgid "underdone accidentals (%s)"
 msgstr "onderdreven aantal kruizen/mollen (%s)"
 
-#: key.cc:82
+#: key.cc:84
 #, c-format
 msgid "overdone accidentals (%s)"
 msgstr "overdreven aantal kruizen/mollen (%s)"
 
-#: lily-guile.cc:84 lily-guile.cc:107
+#: lily-guile.cc:128 lily-guile.cc:151
 #, c-format
 msgid "(load path: `%s')"
 msgstr "(zoekpad: `%s')"
 
-#: line-of-score.cc:91
-msgid "Huh?  Empty Line_of_score?"
-msgstr "Huh?  Lege Line_of_score?"
-
-#: local-key-engraver.cc:42
+#: local-key-engraver.cc:82
 msgid "out of tune:"
 msgstr "vals:"
 
-#: local-key-engraver.cc:43 time-signature-engraver.cc:29
-#: translator-group.cc:437 translator-group.cc:446
-#, c-format
-msgid "Can't find: `%s'"
-msgstr "Kan niet vinden: `%s'"
+#: local-key-engraver.cc:83 time-signature-engraver.cc:29
+#: translator-group.cc:416 translator-group.cc:425
+msgid "can't find: `%s'"
+msgstr "kan niet vinden: `%s'"
 
-#: lookup.cc:105
+#: lookup.cc:58
 msgid "Aborting"
 msgstr "Breek af"
 
-#: lookup.cc:436
+#: lookup.cc:200
 #, c-format
 msgid "Non-matching braces in text `%s', adding braces"
 msgstr "Ongepaarde haakjes in tekst `%s', voeg haakjes toe"
 
-#: main.cc:71 main.cc:91
+#: main.cc:71 main.cc:92
 msgid "enable debugging output"
 msgstr "maak ontluis uitvoer mogelijk"
 
@@ -398,7 +359,7 @@ msgstr "EXT"
 msgid "use output format EXT"
 msgstr "gebruik uitvoer formaat EXT"
 
-#: main.cc:73 main.cc:92
+#: main.cc:73 main.cc:93
 msgid "this help"
 msgstr "deze hulp"
 
@@ -410,7 +371,7 @@ msgstr "DIR"
 msgid "add DIR to search path"
 msgstr "voeg DIR toe aan zoekpad"
 
-#: main.cc:75 main.cc:95
+#: main.cc:75 main.cc:96
 msgid "FILE"
 msgstr "BESTAND"
 
@@ -442,7 +403,7 @@ msgstr "toon veranderingen voor relatieve mode"
 msgid "inhibit file output naming and exporting"
 msgstr "verbied naamgeving van uitvoer bestand en exportering"
 
-#: main.cc:81 main.cc:99
+#: main.cc:81 main.cc:100
 msgid "don't timestamp the output"
 msgstr "geen tijdsstempel in de uitvoer"
 
@@ -454,39 +415,49 @@ msgstr "zet experimentele kunstjes aan"
 msgid "ignore mudela version"
 msgstr "negeer mudela versie"
 
-#: main.cc:84 main.cc:100
+#: main.cc:84 main.cc:101
 msgid "print version number"
 msgstr "druk versienummer af"
 
-#: main.cc:85 main.cc:102
+#: main.cc:85 main.cc:103
 msgid "show warranty and copyright"
 msgstr "toon garantie en auteursrechten"
 
-#: main.cc:92
+#: main.cc:100
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]..."
 msgstr "Gebruik: %s [OPTIE]... [BESTAND]..."
 
-#: main.cc:94
+#: main.cc:102
 msgid "Typeset music and or play MIDI from FILE"
 msgstr "Zet muziek en of speel MIDI van BESTAND"
 
-#: main.cc:100 main.cc:115
+#: main.cc:106
+msgid ""
+"LilyPond is a music typesetter.  It produces beautiful sheet music\n"
+"using a high level description file as input.  LilyPond is part of \n"
+"the GNU Project.\n"
+msgstr ""
+"LilyPond is een muziekzetter.  Zij maakt prachtige bladmuziek\n"
+"uitgaande van een hoog niveau beschrijving bestand.  LilyPond \n"
+"maakt deel uit van het GNU Project.\n"
+
+#: main.cc:112 main.cc:116
 msgid "Options:"
 msgstr "Opties:"
 
-#: main.cc:104
+#: main.cc:116
 msgid "This binary was compiled with the following options:"
-msgstr "Dit programma is vertaald met de volgende instellingen:"
+msgstr "Dit programma is gecompileerd met de volgende instellingen:"
 
-#: main.cc:119 main.cc:123
+#: main.cc:120 main.cc:135
 #, c-format
 msgid "Report bugs to %s"
 msgstr ""
 "Meld luizen in het programma aan %s;\n"
 "meld onjuistheden in de vertaling aan <janneke@gnu.org> of <hanwen@cs.uu.nl>"
 
-#: main.cc:52 main.cc:137
+#: main.cc:53 main.cc:143
 #, c-format
 msgid ""
 "This is free software.  It is covered by the GNU General Public License,\n"
@@ -498,17 +469,17 @@ msgstr ""
 "onder bepaalde voorwaarden.  Roep aan als `%s --warranty' voor meer\n"
 "informatie.\n"
 
-#: main.cc:59 main.cc:144 main.cc:156
+#: main.cc:60 main.cc:150 main.cc:162
 #, c-format
 msgid "Copyright (c) %s by"
 msgstr "Copyright (c) %s "
 
 #. GNU GNU?
-#: main.cc:154
+#: main.cc:160
 msgid "GNU LilyPond -- The GNU Project music typesetter"
 msgstr "GNU LilyPond -- De Muziekzetter van het GNU Project"
 
-#: main.cc:68 main.cc:162
+#: main.cc:69 main.cc:168
 msgid ""
 "    This program is free software; you can redistribute it and/or\n"
 "modify it under the terms of the GNU General Public License version 2\n"
@@ -538,21 +509,21 @@ msgstr ""
 "zoniet, schrijf dan naar de Free Software Foundation, Inc.,\n"
 "675 Mass Ave, Cambridge, MA 02139, USA.\n"
 
-#: midi-item.cc:303
+#: midi-item.cc:309
 #, c-format
 msgid "no such instrument: `%s'"
 msgstr "geen dergelijk instrument: `%s'"
 
-#: midi-item.cc:357
+#: midi-item.cc:363
 #, c-format
 msgid "unconventional key: flats: %d, sharps: %d"
 msgstr "vreemde toonsoort: %d mollen, %d kruizen"
 
-#: midi-item.cc:402
+#: midi-item.cc:408
 msgid "silly duration"
 msgstr "rare duur"
 
-#: midi-item.cc:415
+#: midi-item.cc:421
 msgid "silly pitch"
 msgstr "rare toonhoogte"
 
@@ -560,168 +531,152 @@ msgstr "rare toonhoogte"
 msgid "Error syncing file (disk full?)"
 msgstr "Fout by synchroniseren van bestand (disk vol?)"
 
-#: music-output-def.cc:56
+#: music-output-def.cc:57
 msgid "Interpretation context with empty type"
 msgstr "Vertolk context met leeg type"
 
-#: music-output-def.cc:83
-#, c-format
-msgid "Can't find `%s' context"
-msgstr "Kan `%s' context niet vinden"
+#: music-output-def.cc:84
+msgid "can't find `%s' context"
+msgstr "kan `%s' context niet vinden"
 
 #: musical-request.cc:42
 #, c-format
 msgid "Transposition by %s makes accidental larger than two"
 msgstr "Transponering van %s geeft tripel kruizen/mollen"
 
-#: my-lily-lexer.cc:137
+#: my-lily-lexer.cc:138
 #, c-format
 msgid "redeclaration of `\\%s'"
 msgstr "`herdeclaratie van `\\%s'"
 
-#: my-lily-lexer.cc:143
+#: my-lily-lexer.cc:144
 #, c-format
 msgid "Identifier name is a keyword: `%s'"
 msgstr "Identifier naam is een sleutelwoord: `%s'"
 
-#: my-lily-lexer.cc:172
+#: my-lily-lexer.cc:173
 #, c-format
 msgid "error at EOF: %s"
 msgstr "fout bij EOF: %s"
 
-#: midi-score-parser.cc:94 my-lily-parser.cc:60
+#: midi-score-parser.cc:94 my-lily-parser.cc:58
 msgid "Parsing..."
 msgstr "Ontleden..."
 
-#: my-lily-parser.cc:69
+#: my-lily-parser.cc:67
 msgid "Braces don't match"
 msgstr "Haakjes paren niet"
 
-#: p-col.cc:48
+#: paper-column.cc:48
 msgid "Must set spring between differing columns"
 msgstr "Moet veertje zetten tussen verschillende kolommen"
 
-#: paper-def.cc:95
+#: paper-def.cc:69
 #, c-format
 msgid "unknown paper variable: `%s'"
 msgstr "onbekende papier veranderlijke: `%s'"
 
-#: paper-def.cc:99
+#: paper-def.cc:73
 msgid "not a real variable"
 msgstr "niet een reële veranderlijke"
 
-#. for now; breaks -fscm output
-#: paper-def.cc:251
-msgid "Outputting Score, defined at: "
-msgstr "Uitvoer van Score, gedefinieerd op: "
-
-#: paper-def.cc:280
+#: paper-def.cc:180
 #, c-format
 msgid "paper output to %s..."
 msgstr "papier uitvoer naar %s..."
 
-#: mudela-stream.cc:86 paper-outputter.cc:76 performance.cc:97
+#: mudela-stream.cc:93 paper-outputter.cc:60 performance.cc:95
 msgid ", at "
 msgstr ", bij "
 
-#: paper-outputter.cc:130
-#, c-format
-msgid "improbable offset for object type: `%s'"
-msgstr "onwaarschijnlijke verschuiving voor object type: `%s'"
-
-#: paper-score.cc:131
-msgid "Can't solve this casting problem exactly; reverting to Word_wrap"
-msgstr "Kan breekprobleem niet exact oplossen; verval naar Word_wrap"
-
-#: paper-score.cc:156
+#: paper-score.cc:114
 msgid "Preprocessing elements..."
 msgstr "Voorbewerken van elementen..."
 
-#: paper-score.cc:160
+#: paper-score.cc:119
 msgid "Calculating column positions..."
 msgstr "Berekenen van kolomposities..."
 
-#: paper-score.cc:179
-#, c-format
-msgid "%s elements"
-msgstr "%s elementen"
-
-#: paper-score.cc:182
-msgid "Line ... "
-msgstr "Regel ..."
+#: paper-score.cc:146
+msgid "Outputting Score, defined at: "
+msgstr "Uitvoer van Score, gedefinieerd op: "
 
 #: performance.cc:50
 msgid "Track ... "
 msgstr "Spoor ... "
 
 #. perhaps multiple text events?
-#: performance.cc:77
+#: performance.cc:75
 msgid "Creator: "
 msgstr "Schepper: "
 
-#: performance.cc:92
+#: performance.cc:90
 msgid "Automatically generated"
 msgstr "Automatisch gegenerederd"
 
-#: performance.cc:106
+#: performance.cc:104
 #, c-format
 msgid "from musical definition: %s"
 msgstr "van muzikale definitie: %s"
 
-#: performance.cc:174
+#: performance.cc:172
 #, c-format
 msgid "MIDI output to %s..."
 msgstr "MIDI uitvoer naar %s..."
 
-#: qlpsolve.cc:88 qlpsolve.cc:139
-msgid "degenerate constraints"
-msgstr "voorwaarde is gedegenerederd"
+#: property-engraver.cc:76
+msgid "Wrong type for property"
+msgstr "Verkeerd type voor property"
 
-#: repeat-engraver.cc:177
+#: repeat-engraver.cc:195
 msgid "No bar engraver found.  Ignoring repeats."
 msgstr "Geen bar engraver gevonden.  Negeer herhalingen."
 
-#: request-chord-iterator.cc:73
+#: request-chord-iterator.cc:72
 #, c-format
 msgid "Junking request: `%s'"
 msgstr "Schroot verzoek: `%s'"
 
-#: request-chord-iterator.cc:76
+#: request-chord-iterator.cc:75
 #, c-format
 msgid "Huh?  Not a Request: `%s'"
 msgstr "Huh?  Geen Request: `%s'"
 
-#: rest-collision.cc:64
+#: request-iterator.cc:20
+msgid "Junking music: `%s'"
+msgstr "Schroot muziek: `%s'"
+
+#: rest-collision.cc:132
 msgid "too many colliding rests"
 msgstr "te veel botsende rusten"
 
-#: rest-collision.cc:68
+#: rest-collision.cc:136
 msgid "too many notes for rest collision"
 msgstr "te veel noten voor bosting met rusten"
 
-#: score-engraver.cc:149
+#: score-engraver.cc:139
 #, c-format
 msgid "unbound spanner `%s'"
 msgstr "ongebonden spanner `%s'"
 
-#: score.cc:56
+#: score.cc:60
 msgid "no toplevel translator"
 msgstr "geen hoogste niveau vertaler"
 
-#: score.cc:59
+#: score.cc:63
 msgid "Interpreting music..."
 msgstr "Vertolken van muziek..."
 
-#: score.cc:70
+#: score.cc:75
 msgid "Need music in a score"
 msgstr "Heb muziek nodig in een partituur"
 
 #. should we? hampers debugging.
-#: score.cc:83
+#: score.cc:88
 msgid "Errors found/*, not processing score*/"
 msgstr "Fouten gevonden, /*verwerk partituur niet */"
 
-#: score.cc:88
+#: score.cc:93
 #, c-format
 msgid "elapsed time: %.2f seconds"
 msgstr "duur: %.2f seconden"
@@ -735,120 +690,81 @@ msgstr "Schijven van afhankelijkheden bestand: `%s'..."
 msgid "Score contains errors; will not process it"
 msgstr "Partituur bevat fouten; zal hem niet verwerken"
 
-#: script-engraver.cc:49
+#: script-engraver.cc:67
 #, c-format
 msgid "Don't know how to interpret articulation `%s'"
 msgstr "Weet niet hoe articulatie te vertolken `%s'"
 
-#: sequential-music-iterator.cc:82
+#: sequential-music-iterator.cc:83
 msgid "Must stop before this music ends"
 msgstr "Moet stoppen voordat deze muziek ophoudt"
 
 #. this shouldn't happen, but let's continue anyway.
-#: single-malt-grouping-item.cc:43
+#: single-malt-grouping-item.cc:54
 msgid "Single_malt_grouping_item:  I've been drinking too much"
 msgstr "Single_malt_grouping_item:  Ik heb te veel gedronken"
 
-#: slur-engraver.cc:64
+#: slur-engraver.cc:61
 msgid "unterminated slur"
 msgstr "onbeëindigde bindingsboog"
 
-#: slur-engraver.cc:80
-#, c-format
-msgid "Can't find both ends of %s"
-msgstr "Kan niet beide uiteinden van %s vinden"
+#: slur-engraver.cc:77
+msgid "can't find both ends of %s"
+msgstr "kan niet beide uiteinden vinden van %s"
 
-#: slur-engraver.cc:80
+#: slur-engraver.cc:77
 msgid "slur"
 msgstr "bindingsboog"
 
-#: slur.cc:38
+#: slur.cc:240
 msgid "Putting slur over rest.  Ignoring."
 msgstr "Zet bindingsboog over rust.  Negeer."
 
-#: spanner.cc:41
+#: slur.cc:322
+msgid "Slur over rest?"
+msgstr "Boogje over rust?"
+
+#: spanner.cc:34
 msgid "Left spanpoint is right spanpoint"
 msgstr "Linker spanpunt is rechter spanpunt"
 
-#: spanner.cc:111
+#: spanner.cc:128
 #, c-format
 msgid "Spanner `%s' has equal left and right spanpoints"
 msgstr "Spanner `%s' heeft gelijke linker en rechter spanpunten"
 
-#: spanner.cc:143
-msgid "spanner with negative length"
-msgstr "spanner met negatieve lengte"
-
-#: spring-spacer.cc:134
-msgid "I'm too fat; call Oprah"
-msgstr "Ben te dik; roep Catherine"
-
-#: spring-spacer.cc:299
-msgid "Solution doesn't satisfy constraints"
-msgstr "Oplossing voldoet niet aan voorwaarden"
-
-#: spring-spacer.cc:400
-#, c-format
-msgid "Improbable distance: %f point, setting to 10 mm"
-msgstr "Onwaarschijnlijke afstand: %f punten, zet op 10 mm"
-
-#: spring-spacer.cc:405
-msgid "Negative distance, setting to 10 mm"
-msgstr "Negatieve afstand, zet op 10 mm"
-
-#: stem-engraver.cc:80
+#: stem-engraver.cc:124
 #, c-format
 msgid "Adding note head to incompatible stem (type = %d)"
 msgstr "Voeg noot bolletje toe aan onverenigbare stok (type = %d)"
 
-#: stem.cc:26
-msgid "stem direction set already!"
-msgstr "stokrichting is al gezet!"
-
-#: stem.cc:106
+#: stem.cc:118
 msgid "Weird stem size; check for narrow beams"
-msgstr "Vreemde stoklengte; controleer op krappe balken"
+msgstr "Vreemde stoklengte; controleer op krappe waardestrepen"
 
-#: tfm-reader.cc:108
+#: tfm-reader.cc:115
 #, c-format
 msgid "TFM header of `%s' has only %u word(s)"
 msgstr "TFM kop van `%s' heeft slechts %u woord(en)"
 
-#: tfm-reader.cc:146
+#: tfm-reader.cc:153
 #, c-format
 msgid "%s: TFM file has %u parameters, which is more than the %u I can handle"
 msgstr ""
 "%s: TFM bestand heeft %u parameters, wat meer is dan de %u die ik aan kan"
 
-#: tfm.cc:64
-#, c-format
-msgid "Can't find ascii character: `%d'"
-msgstr "Kan teken niet vinden, genaamd: `%s'"
-
-#: tie-engraver.cc:91
-msgid "unequal number of note heads for tie"
-msgstr "ongelijk aantal notebolletjes voor overbinding"
+#: tfm.cc:70
+msgid "can't find ascii character: `%d'"
+msgstr "kan teken niet vinden: `%s'"
 
-#: tie-engraver.cc:155 tie-performer.cc:106
+#: tie-engraver.cc:195 tie-performer.cc:109
 msgid "No ties were created!"
 msgstr "Geen overbindingen geschapen!"
 
-#: tie.cc:55
+#: tie.cc:79
 msgid "lonely tie"
 msgstr "eenzame overbinding"
 
-#: time-description.cc:17
-msgid "cadenza"
-msgstr "cadens"
-
-#: time-description.cc:106
-msgid "Partial measure must be non-negative"
-msgstr "Deelmaat moet niet-negatief zijn"
-
-#: time-description.cc:108
-msgid "partial measure too large"
-msgstr "deelmaat te groot"
-
 #: time-scaled-music-iterator.cc:25
 msgid "no one to print a tuplet start bracket"
 msgstr "niemand om een x-ool start haak af te drukken"
@@ -857,15 +773,15 @@ msgstr "niemand om een x-ool start haak af te drukken"
 msgid "lost in time:"
 msgstr "verdwaald in de tijd:"
 
-#: timing-translator.cc:26
+#: timing-translator.cc:31
 msgid "conflicting timing request"
 msgstr "strijdig timing verzoek"
 
-#: timing-translator.cc:62
-msgid "time signature change not allowed here"
-msgstr "maatwisseling is hier niet geoorloofd"
+#: timing-translator.cc:32
+msgid "This is the other timing request"
+msgstr "Dit is het andere timing verzoek"
 
-#: timing-translator.cc:83
+#: timing-translator.cc:73
 #, c-format
 msgid "barcheck failed at: %s"
 msgstr "maatstreep controle gefaald op: %s"
@@ -875,24 +791,22 @@ msgstr "maatstreep controle gefaald op: %s"
 msgid "unknown translator: `%s'"
 msgstr "onbekende papier varanderlijke: `%s'"
 
-#: translator-group.cc:78 translator-group.cc:91
+#: translator-group.cc:81 translator-group.cc:94
 msgid "Program has no such type"
 msgstr "Programma heeft geen dergelijk type"
 
-#: translator-group.cc:82 translator-group.cc:97
+#: translator-group.cc:85 translator-group.cc:100
 #, c-format
 msgid "Already contains: `%s'"
 msgstr "Bevat reeds: `%s'"
 
-#: translator-group.cc:207
-#, c-format
-msgid "Can't find or create `%s' called `%s'"
-msgstr "Kan niet vinden of scheppen `%s' genaamd `%s'"
+#: translator-group.cc:210
+msgid "can't find or create `%s' called `%s'"
+msgstr "kan niet vinden of scheppen `%s' genaamd `%s'"
 
-#: translator-group.cc:341
-#, c-format
-msgid "Can't find or create: `%s'"
-msgstr "Kan niet vinden of scheppen: `%s'"
+#: translator-group.cc:322
+msgid "can't find or create: `%s'"
+msgstr "kan niet vinden of scheppen: `%s'"
 
 #: transposed-music.cc:31
 msgid "Will ignore \\relative for transposed music"
@@ -902,176 +816,154 @@ msgstr "Zal \\relative negeren voor getransponeerde muziek"
 msgid "no one to print a volta bracket"
 msgstr "niemand om een volta haak af te drukken"
 
-#: word-wrap.cc:75
-#, c-format
-msgid "Ugh, this measure is too long, breakpoint: %d"
-msgstr "Ugh, deze maat is te lang, breukpunt: %d"
-
-#: word-wrap.cc:77
-msgid "Generating stupido solution"
-msgstr "Genereer sullige oplossing"
-
-#: word-wrap.cc:95
-msgid "I don't fit; put me on Montignac"
-msgstr "Ik ben te dik; zet me op Montignac"
-
-#: parser.yy:55
+#: parser.yy:61
 #, c-format
 msgid "Oldest supported input version: %s"
-msgstr "Oudst ondersteunde invoer versie: %s"
-
-#: parser.yy:313
-msgid "Can't evaluate Scheme in safe mode"
-msgstr "Kan Scheme niet evalueren in veilige modus"
+msgstr "Oudst ondersteunde invoerversie: %s"
 
-#: parser.yy:433 parser.yy:441 parser.yy:465
+#: parser.yy:436
 msgid "Need a translator group for a context"
 msgstr "Heb een translator groep nodig voor een context"
 
-#: parser.yy:459
+#: parser.yy:457
 msgid "Wrong type for property value"
 msgstr "Verkeerd type voor property waarde"
 
-#: parser.yy:515
+#: parser.yy:507
 msgid "More than one music block"
 msgstr "Meer dan een muziekblok"
 
-#: parser.yy:575
-msgid "Need even number of args for shape array"
-msgstr "Heb even aantal argumenten nodig voor shape array"
-
-#: parser.yy:723
+#: parser.yy:706
 msgid "More alternatives than repeats.  Junking excess alternatives."
 msgstr ""
 "Meer alternatieven dan herhalingen.  Schroot overvloedige alternatieven."
 
-#: parser.yy:946 parser.yy:1360 parser.yy:1380
+#: parser.yy:750
+msgid "Second argument must be a symbol"
+msgstr "Tweede argument moet een symbool zijn"
+
+#: parser.yy:755
+msgid "First argument must be a procedure taking 1 argument"
+msgstr "Eerste argument moet een procedure zijn met 1 argument"
+
+#: parser.yy:954 parser.yy:1386 parser.yy:1406
 #, c-format
 msgid "not a duration: %d"
 msgstr "geen duur: %d"
 
-#: parser.yy:948 parser.yy:1382
-msgid "Can't abbreviate"
-msgstr "Kan niet afkorten"
-
-#: parser.yy:1076
+#: parser.yy:1105
 msgid "Can't specify direction for this request"
 msgstr "Kan richting voor dit verzoek niet specificeren"
 
-#: parser.yy:1211 parser.yy:1219 parser.yy:1444
+#: parser.yy:1237 parser.yy:1245 parser.yy:1497
 msgid "Have to be in Lyric mode for lyrics"
 msgstr "Moet in Lyric modus zijn voor liedteksten"
 
-#: parser.yy:1391
+#: parser.yy:1415
 msgid "Have to be in Note mode for notes"
 msgstr "Moet in Note modus zijn voor noten"
 
-#: parser.yy:1403
-msgid "Can't abbreviate tuplet"
-msgstr "Kan x-ool niet afkorten"
+#. urg, burp.  what nonsense / silly implementation
+#: parser.yy:1429
+msgid "can't put stem tremolo on tuplet"
+msgstr "kan stoktremolo niet op n-ool zetten"
 
-#: parser.yy:1450
+#: parser.yy:1513
 msgid "Have to be in Chord mode for chords"
 msgstr "Moet in Chord modus zijn voor accoorden"
 
-#: lexer.ll:155
+#: lexer.ll:159
 msgid "EOF found inside a comment"
 msgstr "EOF gevonden in een kommentaar"
 
-#: lexer.ll:169
+#: lexer.ll:173
 msgid "\\maininput disallowed outside init files"
 msgstr "\\maininput niet toegestaan buiten init bestanden"
 
-#: lexer.ll:199
+#: lexer.ll:203
 #, c-format
 msgid "undefined identifier: `%s'"
 msgstr "ongedefiniëerde idendifier: `%s'"
 
 #. backup rule
-#: lexer.ll:204
+#: lexer.ll:208
 msgid "Missing end quote"
 msgstr "Aanhalingsteken sluiten mist"
 
 #. backup rule
-#: lexer.ll:227 lexer.ll:231
+#: lexer.ll:230 lexer.ll:234
 msgid "white expected"
 msgstr "wit verwacht"
 
-#: lexer.ll:401
+#: lexer.ll:242
+msgid "Can't evaluate Scheme in safe mode"
+msgstr "Kan Scheme niet evalueren in veilige modus"
+
+#: lexer.ll:437
 #, c-format
 msgid "invalid character: `%c'"
 msgstr "ongeldig teken: `%c'"
 
-#: lexer.ll:457
+#: lexer.ll:491
 #, c-format
 msgid "unknown escaped string: `\\%s'"
 msgstr "onbekende ontsnapte string: `\\%s'"
 
-#: lexer.ll:543
+#: lexer.ll:575
 #, c-format
 msgid "incorrect mudela version: %s (%s, %s)"
 msgstr "verkeerde mudela versie: %s (%s, %s)"
 
-#: out/BLURB.hh:2
-msgid ""
-"LilyPond is a music typesetter.  It produces beautiful sheet music\n"
-"using a high level description file as input.  LilyPond is part of \n"
-"the GNU Project.\n"
-msgstr ""
-"LilyPond is een muziekzetter.  Zij maakt prachtige bladmuziek\n"
-"uitgaande van een hoog niveau beschrijving bestand.  LilyPond \n"
-"maakt deel uit van het GNU Project.\n"
-
-#: main.cc:90
+#: main.cc:91
 msgid "write exact durations, e.g.: a4*385/384"
 msgstr "schrijf exacte duren, bijv.: a4*385/384"
 
-#: main.cc:93
+#: main.cc:94
 msgid "ACC[:MINOR]"
 msgstr "ACC[:MINEUR]"
 
-#: main.cc:93
+#: main.cc:94
 msgid "set key: ACC +sharps/-flats; :1 minor"
 msgstr "zet toonsoort: ACC +kruizen/-mollen; :1 mineur"
 
-#: main.cc:94
-msgid "assume no tuplets or double dots, smallest is 32"
-msgstr "ga niet uit van n-olen of dubbel gepunkteerd, kortste is 32"
-
 #: main.cc:95
-msgid "set FILE as default output"
-msgstr "zet BESTAND als verstek uitvoer"
+msgid "don't output tuplets or double dots, smallest is 32"
+msgstr "maak geen n-olen of dubbel gepunkteerd, kortste is 32"
 
 #: main.cc:96
-msgid "assume no tuplets"
-msgstr "gebruik geen antimetrische figuren"
+msgid "set FILE as default output"
+msgstr "zet BESTAND als verstek uitvoer"
 
 #: main.cc:97
+msgid "don't output tuplets"
+msgstr "maak geen n-olen"
+
+#: main.cc:98
 msgid "be quiet"
 msgstr "wees stil"
 
-#: main.cc:98
+#: main.cc:99
 msgid "DUR"
 msgstr "DUUR"
 
-#: main.cc:98
+#: main.cc:99
 msgid "set smallest duration"
 msgstr "zet kortste duur"
 
-#: main.cc:101
+#: main.cc:102
 msgid "be verbose"
 msgstr "wees breedsprakig"
 
-#: main.cc:103
+#: main.cc:104
 msgid "assume no double dotted notes"
 msgstr "ga niet uit van dubbel gepunteerde noten"
 
-#: main.cc:110
+#: main.cc:111
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]"
 msgstr "Gebruik: %s [OPTIE]... [BESTAND]"
 
-#: main.cc:112
+#: main.cc:113
 msgid "Translate MIDI-file to mudela"
 msgstr "Vertaal MIDI-bestand naar mudela"
 
@@ -1096,8 +988,8 @@ msgid "invalid number of tracks"
 msgstr "ongeldig aantal sporen"
 
 #: midi-score-parser.cc:58
-msgid "Can't handle non-metrical time"
-msgstr "Kan niet-metrische tijd niet aan"
+msgid "can't handle non-metrical time"
+msgstr "kan niet-metrische tijd niet aan"
 
 #: midi-track-parser.cc:68
 #, c-format
@@ -1167,11 +1059,11 @@ msgstr "Kwantificeren van kolommen..."
 msgid "Settling columns..."
 msgstr "Zetten van kolommen..."
 
-#: mudela-staff.cc:177
+#: mudela-staff.cc:178
 msgid "% MIDI copyright:"
 msgstr "% MIDI copyright:"
 
-#: mudela-staff.cc:178
+#: mudela-staff.cc:179
 msgid "% MIDI instrument:"
 msgstr "% MIDI instrument:"
 
@@ -1181,15 +1073,135 @@ msgid "lily indent level: %d"
 msgstr "lelie inspring diepte: %d"
 
 #. Maybe better not to translate these?
-#: mudela-stream.cc:76
+#: mudela-stream.cc:83
 msgid "% Creator: "
 msgstr "% Schepper: "
 
-#: mudela-stream.cc:81
+#: mudela-stream.cc:88
 msgid "% Automatically generated"
 msgstr "% Automatisch gegenereerd"
 
-#: mudela-stream.cc:90
+#: mudela-stream.cc:97
 #, c-format
 msgid "% from input file: "
 msgstr "% van invoerbestand: "
+
+#~ msgid "(search path: `%s'"
+#~ msgstr "(zoekpad: `%s')"
+
+#~ msgid "Can't find font: `%s'"
+#~ msgstr "Kan font niet vinden: `%s'"
+
+#~ msgid "(search path `%s')"
+#~ msgstr "(zoekpad: `%s')"
+
+#~ msgid "Debug output disabled.  Compiled with NPRINT."
+#~ msgstr "Ontluisberichten zijn uitgeschakeld.  Vertaald met NPRINT."
+
+#~ msgid "no beam to end"
+#~ msgstr "geen waardestreep te beëindigen"
+
+#~ msgid "unfinished beam"
+#~ msgstr "onbeëindigde waardestreep"
+
+#~ msgid "0 lines"
+#~ msgstr "0 regels"
+
+#~ msgid "1 line (of %.0f columns)"
+#~ msgstr "1 regel (van %.0f kolommen)"
+
+#~ msgid "%d lines (with an average of %.1f columns)"
+#~ msgstr "%d regels (van gemiddeld %.1f kolommen)"
+
+#~ msgid "approximated %s"
+#~ msgstr "geschat: %s"
+
+#~ msgid "calculated %s exactly"
+#~ msgstr "exact berekend: %s"
+
+#~ msgid "elapsed time %.2f seconds"
+#~ msgstr "duur: %.2f seconden"
+
+#~ msgid "no tremolo beam to end"
+#~ msgstr "geen tremolo waardestreep te beëindigen"
+
+#~ msgid "unfinished tremolo beam"
+#~ msgstr "onbeëindigde tremolo waardestreep"
+
+#~ msgid "Got a dynamic already.  Continuing dazed and confused."
+#~ msgstr "Heb al een dynamiek.  Ga verder, verstrooid en verward"
+
+#~ msgid "Too many crescendi here"
+#~ msgstr "Te veel cescendi hier"
+
+#~ msgid "Huh?  Empty Line_of_score?"
+#~ msgstr "Huh?  Lege Line_of_score?"
+
+#~ msgid "improbable offset for object type: `%s'"
+#~ msgstr "onwaarschijnlijke verschuiving voor object type: `%s'"
+
+#~ msgid "Can't solve this casting problem exactly; reverting to Word_wrap"
+#~ msgstr "Kan breekprobleem niet exact oplossen; verval naar Word_wrap"
+
+#~ msgid "%s elements"
+#~ msgstr "%s elementen"
+
+#~ msgid "Line ... "
+#~ msgstr "Regel ..."
+
+#~ msgid "degenerate constraints"
+#~ msgstr "voorwaarde is gedegenerederd"
+
+#~ msgid "spanner with negative length"
+#~ msgstr "spanner met negatieve lengte"
+
+#~ msgid "I'm too fat; call Oprah"
+#~ msgstr "Ben te dik; roep Catherine"
+
+#~ msgid "Solution doesn't satisfy constraints"
+#~ msgstr "Oplossing voldoet niet aan voorwaarden"
+
+#~ msgid "Improbable distance: %f point, setting to 10 mm"
+#~ msgstr "Onwaarschijnlijke afstand: %f punten, zet op 10 mm"
+
+#~ msgid "Negative distance, setting to 10 mm"
+#~ msgstr "Negatieve afstand, zet op 10 mm"
+
+#~ msgid "stem direction set already!"
+#~ msgstr "stokrichting is al gezet!"
+
+#~ msgid "unequal number of note heads for tie"
+#~ msgstr "ongelijk aantal notebolletjes voor overbinding"
+
+#~ msgid "cadenza"
+#~ msgstr "cadens"
+
+#~ msgid "Partial measure must be non-negative"
+#~ msgstr "Deelmaat moet niet-negatief zijn"
+
+#~ msgid "partial measure too large"
+#~ msgstr "deelmaat te groot"
+
+#~ msgid "time signature change not allowed here"
+#~ msgstr "maatwisseling is hier niet geoorloofd"
+
+#~ msgid "Ugh, this measure is too long, breakpoint: %d"
+#~ msgstr "Ugh, deze maat is te lang, breukpunt: %d"
+
+#~ msgid "Generating stupido solution"
+#~ msgstr "Genereer sullige oplossing"
+
+#~ msgid "I don't fit; put me on Montignac"
+#~ msgstr "Ik ben te dik; zet me op Montignac"
+
+#~ msgid "Need even number of args for shape array"
+#~ msgstr "Heb even aantal argumenten nodig voor shape array"
+
+#~ msgid "Can't abbreviate"
+#~ msgstr "Kan niet afkorten"
+
+#~ msgid "Can't abbreviate tuplet"
+#~ msgstr "Kan x-ool niet afkorten"
+
+#~ msgid "assume no tuplets"
+#~ msgstr "gebruik geen antimetrische figuren"

diff --git a/scm/generic-property.scm b/scm/generic-property.scm
index ef89bf14baaa0f92d35bfe76058fa427dea0683e..a71efc94d3319865071564959660b01a651ddd0a 100644 (file)
--- a/scm/generic-property.scm
+++ b/scm/generic-property.scm
@@ -54,15 +54,15 @@
 
 (define generic-crescendo-properties
   (cons "Crescendo" (list
-                    (list 'dynamicDirection dir? 'direction)
                     (list 'verticalDirection dir? 'direction)
+                    (list 'dynamicDirection dir? 'direction)
                     (list 'dynamicPadding number? 'padding) 
                     )))
   
 (define generic-dynamic-line-spanner-properties
   (cons "Dynamic_line_spanner" (list
-                    (list 'dynamicDirection dir? 'direction)
                     (list 'verticalDirection dir? 'direction)
+                    (list 'dynamicDirection dir? 'direction)
                     (list 'dynamicPadding number? 'padding) 
                     )))
   

diff --git a/scm/lily.scm b/scm/lily.scm
index f5965cb7f286a72e7dfa82ed987aa8d85076a3eb..9933b82133a94f16b8444611f095e208c1a05c27 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -100,7 +100,7 @@
 ;; (Measured in staff space)
 (define space-alist
  '(
-   (("" "Left_edge_item") . (minimum-space -15.0))
+   (("" "Left_edge_item") . (extra-space -15.0))
    (("" "Clef_item") . (minimum-space 1.0))
    (("" "Staff_bar") . (minimum-space 0.0))
    (("" "Clef_item") . (minimum-space 1.0))

diff --git a/stepmake/stepmake/help2man-rules.make b/stepmake/stepmake/help2man-rules.make
index ee9f13e32ded9a2f9b3f6e74f78507a21d2baa9a..b6bdb5af214fa8e280d070ee6dbf407f85766a39 100644 (file)
--- a/stepmake/stepmake/help2man-rules.make
+++ b/stepmake/stepmake/help2man-rules.make
@@ -6,4 +6,9 @@
 # Indeed it is. Perl sucks.
 #
 $(outdir)/%.1: $(outdir)/%
-       $(PERL) $(depth)/buildscripts/$(outdir)/help2man $< > $@
+       $(PERL) $(depth)/buildscripts/$(outdir)/help2man $< > $@ || \
+       (echo ""; echo "Apparently the man pages failed to build. This is";\
+       echo "no problem, since they don't contain any information anyway.";\
+       echo "Please run make again, and be prepared for NO manual pages.")
+
+