* mf/GNUmakefile: always trace pfa fonts.

* configure.in: require mftrace.

* lily/staff-performer.cc (new_instrument_string): don't look at
instrument property.

* lily/lily-guile.cc: renaming, ly_dir_p is the Scheme function,
is_direction is the C++ one. Similar for ly_axis_p and
ly_number_pair_p

diff --git a/ChangeLog b/ChangeLog
index 0ee849e148e5dbdf500f3e523568716ba90162dd..57a6ca4fc12dc66051a2dbdd31267094021db9ef 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2003-09-22  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+
+       * mf/GNUmakefile: always trace pfa fonts.
+
+       * configure.in: require mftrace. 
+
+       * lily/staff-performer.cc (new_instrument_string): don't look at
+       instrument property.
+
+       * lily/lily-guile.cc: renaming, ly_dir_p is the Scheme function,
+       is_direction is the C++ one. Similar for ly_axis_p and
+       ly_number_pair_p
+
 2003-09-21  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * lily/beam.cc (brew_molecule): read gap-count to determine

diff --git a/Documentation/topdocs/NEWS.texi b/Documentation/topdocs/NEWS.texi
index 379ffadf5859c6464b1157a8e9b9a6ac4b2d1a0a..bae8da8d130bd2b6d4cf942c4592702e169db74f 100644 (file)
--- a/Documentation/topdocs/NEWS.texi
+++ b/Documentation/topdocs/NEWS.texi
@@ -82,7 +82,7 @@ one with cue notes for the instrumental part:
 
 @example
 < \tag #'part <
-  @{ c4 f2 g @}      % in the part, we have cue-notes  
+  @{ c4 f2 g4 @}      % in the part, we have cue-notes  
   \\ R1 >
   \tag #'score R1  % in the score: only a rest
 >
@@ -202,8 +202,8 @@ which is set through
 @end example
 
 @item
-Windows users can double click a @code{.ly} to process and view it
-automagically through the new @code{lily-wins} frontend.
+Windows users can double click a @code{.ly} file to process and view
+it automagically through the new @code{lily-wins} frontend.
 
 @end itemize
 

diff --git a/Documentation/user/preface.itely b/Documentation/user/preface.itely
index f8c553301c4db7bfb9ae8d29e97397d1bf94ed0b..91b7c6bc22657585a3f6d0ffc0ed5d3b23acd60c 100644 (file)
--- a/Documentation/user/preface.itely
+++ b/Documentation/user/preface.itely
@@ -15,7 +15,7 @@
 @unnumberedsec Preface to version 2.0
 
 
-Due to personal circumstances, I have been able to do a lot more on
+Due to personal circumstances, Han-Wen was able to do a lot more on
 LilyPond during the past months. A testament to that is the quick
 release of version 2.0, less than two months after 1.8. We have taken
 the opportunity to make a few radical changes to the syntax: note
@@ -24,10 +24,13 @@ post-fix exclusively. This makes entering scores easier: you never
 have to think about the order of the attributes.  With version 2.0, we
 have a new and improved platform for working on notation and
 typography features for coming versions,
+ 
+Due to other personal circumstances, Jan was not able to do more than
+packaging for Cygwin.  The good news is that we now have a nearly
+fool-proof installation for Windows.  He will be back in 2.1.
 
-@c 
 
-Han-Wen,
+Han-Wen and Jan
 
 Utrecht/Eindhoven, The Netherlands, September 2003.
 

diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely
index d3cd143765dfc65c639880836cbe2ab26d45981f..8e3eae139c92cd638f73ee24cd2e2b6828c78f0f 100644 (file)
--- a/Documentation/user/refman.itely
+++ b/Documentation/user/refman.itely
@@ -8513,17 +8513,13 @@ The contexts for MIDI output are defined in @file{ly/performer-init.ly}.
 
 @cindex instrument names
 @cindex @code{Staff.midiInstrument}
-@cindex @code{Staff.instrument}
 
 The MIDI instrument name is set by the @code{Staff.midiInstrument}
-property or, if that property is not set, the @code{Staff.instrument}
 property.  The instrument name should be chosen from the list in
 @ref{MIDI instruments}.
 
 @refbugs
 
-If the selected string does not exactly match, then LilyPond uses the
-default (Grand Piano). It is not possible to select an instrument by
-number.
-
+If the selected string does not exactly match, then the default is
+used, which is the Grand Piano. 
 

diff --git a/autogen.sh b/autogen.sh
index 011fce2510d08c55676d0600a1b195c4d742f37f..bf647044619930ccd500f9ec7988cc1d0abf2683 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,7 +1,4 @@
 #!/bin/sh
-# WARNING WARNING WARNING
-# do not edit! this is autogen.sh, generated from /home/hanwen/usr/src/lilypond/stepmake/autogen.sh
-#!/bin/sh
 # Run this to generate configure and initial GNUmakefiles
 
 srcdir=`dirname $0`
@@ -45,7 +42,7 @@ if test -z "$*"; then
   echo
 fi
 
-for coin in `find $srcdir -name configure.in -print`
+for coin in $srcdir/configure.in #`find $srcdir -name configure.in -print`
 do 
   dr=`dirname $coin`
   echo processing $dr

diff --git a/configure.in b/configure.in
index a78d20d4ffc874c78431e79624871cecf67f3421..c52480db92e38b7a66f9486ef909e7fe56fd178d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -70,9 +70,9 @@ STEPMAKE_GUILE(OPTIONAL)
 # perl for help2man.
 STEPMAKE_PERL(OPTIONAL)
 # mftrace for generating pfa's, pfb's
-STEPMAKE_PROGS(MFTRACE, pktrace mftrace, OPTIONAL, 1.0.17)
+STEPMAKE_PROGS(MFTRACE, pktrace mftrace, REQUIRED, 1.0.17)
 # new makeinfo for multi-page website docs
-STEPMAKE_PROGS(MAKEINFO, makeinfo, OPTIONAL, 4.1)
+STEPMAKE_PROGS(MAKEINFO, makeinfo, OPTIONAL, 4.6)
 
 
 if test "$optimise_b" = yes; then

diff --git a/lily/align-interface.cc b/lily/align-interface.cc
index d9cef2771cff859e092a8567a08a725d003c3fc0..5f7306d2b1340ac8aee0099221be2a2c811ba20e 100644 (file)
--- a/lily/align-interface.cc
+++ b/lily/align-interface.cc
@@ -233,7 +233,7 @@ Align_interface::align_elements_to_extents (Grob * me, Axis a)
        FIXME: uncommenting freaks out the Y-alignment of
        line-of-score.
        */
-      // Real align_param = ly_dir_p (align)  ? gh_scm2double (align) : 0.0;
+      // Real align_param = is_direction (align)  ? gh_scm2double (align) : 0.0;
       
       if (gh_number_p (align))
        center_offset = total.linear_combination (gh_scm2double (align));

diff --git a/lily/arpeggio.cc b/lily/arpeggio.cc
index daf53c6eacffcac30e9b2c38b3ad8d901a57270b..ed040e70c56cbfe192ac1e761a985b640153c91f 100644 (file)
--- a/lily/arpeggio.cc
+++ b/lily/arpeggio.cc
@@ -67,7 +67,7 @@ Arpeggio::brew_molecule (SCM smob)
 
   SCM ad = me->get_grob_property ("arpeggio-direction");
   Direction dir = CENTER;
-  if (ly_dir_p (ad))
+  if (is_direction (ad))
     {
       dir = to_dir (ad);
     }

diff --git a/lily/beam.cc b/lily/beam.cc
index 8d5f1bb2246a5ceb937a0023220772f3c35eccf9..27e604856a219f3a69d808d595f2ab964fa3380e 100644 (file)
--- a/lily/beam.cc
+++ b/lily/beam.cc
@@ -317,7 +317,7 @@ Beam::brew_molecule (SCM grob)
 
   SCM posns = me->get_grob_property ("positions");
   Interval pos;
-  if (!ly_number_pair_p (posns))
+  if (!is_number_pair (posns))
     {
       programming_error ("No beam posns");
       pos = Interval (0,0);
@@ -326,7 +326,7 @@ Beam::brew_molecule (SCM grob)
     pos= ly_scm2interval (posns);
 
   Real dy = pos.delta ();
-  Real dydx = dy && dx ? dy/dx : 0;
+  Real dydx = (dy && dx) ? dy/dx : 0;
   
   Real thick = get_thickness (me);
   Real bdy = get_beam_translation (me);
@@ -335,7 +335,6 @@ Beam::brew_molecule (SCM grob)
   Real last_xposn = -1;
   Real last_width = -1 ;
 
-
   Real gap_length =0.0;
   SCM scm_gap = me->get_grob_property ("gap");
   if (gh_number_p (scm_gap))

diff --git a/lily/cluster.cc b/lily/cluster.cc
index 424e1d248bd8057cf400bd5b49d3df6ac880288b..a6caf0a7d5b15fa9c91bd9156e2b9939b2af4b8a 100644 (file)
--- a/lily/cluster.cc
+++ b/lily/cluster.cc
@@ -180,7 +180,7 @@ Cluster::brew_molecule (SCM smob)
       SCM posns = col->get_grob_property ("positions");
       
       Slice s (0,0);
-      if (ly_number_pair_p (posns))
+      if (is_number_pair (posns))
        s = Slice (gh_scm2int (gh_car (posns)),
                   gh_scm2int (gh_cdr (posns)));
 
@@ -206,7 +206,7 @@ Cluster::brew_molecule (SCM smob)
              SCM posns = col->get_grob_property ("positions");
       
              Slice s (0,0);
-             if (ly_number_pair_p (posns))
+             if (is_number_pair (posns))
                s = Slice (gh_scm2int (gh_car (posns)),
                           gh_scm2int (gh_cdr (posns)));
 

diff --git a/lily/directional-element-interface.cc b/lily/directional-element-interface.cc
index daf19d91a5c7607c716bb7151f82fee406cad4bf..dec6d49ce3a52dde394cc5495dc21097d8a713d3 100644 (file)
--- a/lily/directional-element-interface.cc
+++ b/lily/directional-element-interface.cc
@@ -15,7 +15,7 @@
 bool
 Directional_element_interface::has_interface (Grob*me) 
 {
-  return ly_dir_p (me->get_grob_property ("direction"));
+  return is_direction (me->get_grob_property ("direction"));
 }
 
 Direction
@@ -23,7 +23,7 @@ Directional_element_interface::get (Grob*me)
 {
   // return dir_;
   SCM d= me->get_grob_property ("direction");
-  if (!ly_dir_p (d))
+  if (!is_direction (d))
     return CENTER;
       
   return to_dir (d);

diff --git a/lily/fingering-engraver.cc b/lily/fingering-engraver.cc
index a32bd5b4867652a45d30d4ee76508bb827591866..07df23d08b41b3efb76c422a6b638dd60c52f022 100644 (file)
--- a/lily/fingering-engraver.cc
+++ b/lily/fingering-engraver.cc
@@ -104,7 +104,7 @@ Fingering_engraver::make_script (Direction d, Music *r,Axis a,  int i)
   fingering->set_grob_property ("script-priority", gh_int2scm (priority));
 
 
-  if (!ly_dir_p (fingering->get_grob_property ("direction")))
+  if (!is_direction (fingering->get_grob_property ("direction")))
     {
       if (d)
        fingering->set_grob_property ("direction", gh_int2scm (d));

diff --git a/lily/grob-scheme.cc b/lily/grob-scheme.cc
index 7f6a424635b7b4ce091082eba533215f39857b9f..70004e9959290f43cfe065c1b9a7ceb1402f7de7 100644 (file)
--- a/lily/grob-scheme.cc
+++ b/lily/grob-scheme.cc
@@ -59,7 +59,7 @@ LY_DEFINE (spanner_get_bound, "ly:get-spanner-bound", 2 , 0, 0,
 {
   Spanner * sl = dynamic_cast<Spanner*> (unsmob_grob (slur));
   SCM_ASSERT_TYPE (sl, slur, SCM_ARG1, __FUNCTION__, "spanner grob");
-  SCM_ASSERT_TYPE (ly_dir_p (dir), slur, SCM_ARG2, __FUNCTION__, "dir");
+  SCM_ASSERT_TYPE (is_direction (dir), slur, SCM_ARG2, __FUNCTION__, "dir");
   return sl->get_bound (to_dir (dir))->self_scm ();
 }
 
@@ -101,7 +101,7 @@ LY_DEFINE (ly_get_extent, "ly:get-extent", 3, 0, 0,
   SCM_ASSERT_TYPE (sc, grob, SCM_ARG1, __FUNCTION__, "grob");
   SCM_ASSERT_TYPE (ref, refp, SCM_ARG2, __FUNCTION__, "grob");
   
-  SCM_ASSERT_TYPE (ly_axis_p (axis), axis, SCM_ARG3, __FUNCTION__, "axis");
+  SCM_ASSERT_TYPE (is_axis (axis), axis, SCM_ARG3, __FUNCTION__, "axis");
 
   return ly_interval2scm ( sc->extent (ref, Axis (gh_scm2int (axis))));
 }
@@ -112,7 +112,7 @@ LY_DEFINE (ly_get_parent, "ly:get-parent", 2, 0, 0, (SCM grob, SCM axis),
 {
   Grob * sc = unsmob_grob (grob);
   SCM_ASSERT_TYPE (sc, grob, SCM_ARG1, __FUNCTION__, "grob");
-  SCM_ASSERT_TYPE (ly_axis_p (axis), axis, SCM_ARG2, __FUNCTION__, "axis");
+  SCM_ASSERT_TYPE (is_axis (axis), axis, SCM_ARG2, __FUNCTION__, "axis");
 
   Grob * par = sc->get_parent (Axis (gh_scm2int (axis)));
   return par ? par->self_scm () : SCM_EOL;
@@ -183,7 +183,7 @@ LY_DEFINE (ly_grob_translate_axis_x,
   Grob *me = unsmob_grob (g);
   SCM_ASSERT_TYPE (me, g, SCM_ARG1, __FUNCTION__, "grob");
   SCM_ASSERT_TYPE (gh_number_p (d), d, SCM_ARG2, __FUNCTION__, "dimension");
-  SCM_ASSERT_TYPE (ly_axis_p (a), a, SCM_ARG3, __FUNCTION__, "axis");
+  SCM_ASSERT_TYPE (is_axis (a), a, SCM_ARG3, __FUNCTION__, "axis");
 
   me->translate_axis (gh_scm2double (d),
                      Axis (gh_scm2int (a)));

diff --git a/lily/hairpin.cc b/lily/hairpin.cc
index ba4427a6eec58666c33dc81e7d49a7485a9cd3ec..c757f4ce1e645facc3dc3761c6a85a6ca23f53c7 100644 (file)
--- a/lily/hairpin.cc
+++ b/lily/hairpin.cc
@@ -27,7 +27,7 @@ Hairpin::brew_molecule (SCM smob)
   Real line = me->get_paper ()->get_realvar (ly_symbol2scm ("linethickness"));  
   
   SCM s = me->get_grob_property ("grow-direction");
-  if (!ly_dir_p (s))
+  if (!is_direction (s))
     {
       me->suicide ();
       return SCM_EOL;

diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh
index 17afbe734aeb87fa547b4f25ecc08da3b674078c..5af2ab0176f554ff6b0123e8150419f6bb96d3ca 100644 (file)
--- a/lily/include/lily-guile.hh
+++ b/lily/include/lily-guile.hh
@@ -202,9 +202,9 @@ void ly_display_scm (SCM s);
 void read_lily_scm_file (String);
 void ly_init_guile ();
 
-bool ly_dir_p (SCM s);
-bool ly_number_pair_p (SCM);
-bool ly_axis_p (SCM);
+bool is_direction (SCM s);
+bool is_number_pair (SCM);
+bool is_axis (SCM);
 
 /*
   these conversion functions also do a typecheck on the argument, and

diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc
index 85f2e9818635c8dcaada41c423bf939fa07dfb03..9646364087cab8b71c95dbfe3a867a243de716c0 100644 (file)
--- a/lily/lily-guile.cc
+++ b/lily/lily-guile.cc
@@ -157,9 +157,9 @@ LY_DEFINE(ly_warning,"ly:warn", 1, 0, 0,
   return SCM_BOOL_T;
 }
 
-LY_DEFINE(ly_isdir,  "ly:dir?", 1,0, 0,  (SCM s),
-         "type predicate. A direction is a -1, 0 or 1, where -1 represents left or "
-"down and 1 represents right or up. ")
+LY_DEFINE(ly_dir_p,  "ly:dir?", 1,0, 0,  (SCM s),
+         "type predicate. A direction is a -1, 0 or 1, where -1 represents "
+         "left or down and 1 represents right or up. ")
 {
   if (gh_number_p (s))
     {
@@ -170,7 +170,7 @@ LY_DEFINE(ly_isdir,  "ly:dir?", 1,0, 0,  (SCM s),
 }
 
 bool
-ly_number_pair_p (SCM p)
+is_number_pair (SCM p)
 {
   return gh_pair_p (p) && gh_number_p (ly_car (p)) && gh_number_p (ly_cdr (p));
 }
@@ -217,7 +217,7 @@ unsigned int ly_scm_hash (SCM s)
 
 
 bool
-ly_dir_p (SCM s)
+is_direction (SCM s)
 {
   if (gh_number_p (s))
     {
@@ -229,7 +229,7 @@ ly_dir_p (SCM s)
 
 
 bool
-ly_axis_p (SCM s)
+is_axis (SCM s)
 {
   if (gh_number_p (s))
     {

diff --git a/lily/lookup.cc b/lily/lookup.cc
index 9666930e3a94bbb2594d738c99d82245edac247a..9781002205780066c6ba28ff4522252f95791172 100644 (file)
--- a/lily/lookup.cc
+++ b/lily/lookup.cc
@@ -770,8 +770,8 @@ LY_DEFINE(ly_bracket ,"ly:bracket",
          "given by @var{iv}. The wings protude by an amount of @var{p}, which "
          "may be negative. The thickness is given by @var{t}.")
 {
-  SCM_ASSERT_TYPE(ly_axis_p (a), a, SCM_ARG1, __FUNCTION__, "axis") ;
-  SCM_ASSERT_TYPE(ly_number_pair_p (iv), iv, SCM_ARG2, __FUNCTION__, "number pair") ;
+  SCM_ASSERT_TYPE(is_axis (a), a, SCM_ARG1, __FUNCTION__, "axis") ;
+  SCM_ASSERT_TYPE(is_number_pair (iv), iv, SCM_ARG2, __FUNCTION__, "number pair") ;
   SCM_ASSERT_TYPE(gh_number_p (t), a, SCM_ARG3, __FUNCTION__, "number") ;
   SCM_ASSERT_TYPE(gh_number_p (p), a, SCM_ARG4, __FUNCTION__, "number") ;
 
@@ -788,8 +788,8 @@ LY_DEFINE(ly_filled_box ,"ly:round-filled-box",
          (SCM xext, SCM yext, SCM blot),
          "Make a filled-box of dimensions @var{xext}, @var{yext} and roundness @var{blot}.")
 {
-  SCM_ASSERT_TYPE(ly_number_pair_p (xext), xext, SCM_ARG1, __FUNCTION__, "number pair") ;
-  SCM_ASSERT_TYPE(ly_number_pair_p (yext), yext, SCM_ARG2, __FUNCTION__, "number pair") ;
+  SCM_ASSERT_TYPE(is_number_pair (xext), xext, SCM_ARG1, __FUNCTION__, "number pair") ;
+  SCM_ASSERT_TYPE(is_number_pair (yext), yext, SCM_ARG2, __FUNCTION__, "number pair") ;
   SCM_ASSERT_TYPE(gh_number_p (blot), blot, SCM_ARG3, __FUNCTION__, "number") ;
 
   return Lookup::round_filled_box (Box (ly_scm2interval (xext), ly_scm2interval (yext)),

diff --git a/lily/midi-item.cc b/lily/midi-item.cc
index 1f7cbea2d6b88ae394f9dd2bf7a3334f0d847ce4..db6bdc12c166f125946d86580c44797a65ee8148 100644 (file)
--- a/lily/midi-item.cc
+++ b/lily/midi-item.cc
@@ -145,7 +145,7 @@ Midi_instrument::to_string () const
   if (found)
     program_byte = gh_scm2int(program);
   else
-      warning (_f ("no such instrument: `%s'", audio_->str_.to_str0 ()));
+      warning (_f ("no such MIDI instrument: `%s'", audio_->str_.to_str0 ()));
 
   String str = ::to_string ((char) (0xc0 + channel_)); //YIKES! FIXME: Should be track. -rz
   str += ::to_string ((char)program_byte);

diff --git a/lily/molecule-scheme.cc b/lily/molecule-scheme.cc
index b81c4f717d6264d15887abfdc28a5090f68e5b1c..ff5b3ba9f8b70c79433ae8f915cd37bea927c6ba 100644 (file)
--- a/lily/molecule-scheme.cc
+++ b/lily/molecule-scheme.cc
@@ -20,8 +20,8 @@ LY_DEFINE(ly_molecule_set_extent_x,"ly:molecule-set-extent!", 3 , 0, 0,
 {
   Molecule* m = unsmob_molecule (mol);
   SCM_ASSERT_TYPE (m, mol, SCM_ARG1, __FUNCTION__, "molecule");
-  SCM_ASSERT_TYPE (ly_axis_p (axis), axis, SCM_ARG2, __FUNCTION__, "axis");
-  SCM_ASSERT_TYPE (ly_number_pair_p (np), np, SCM_ARG3, __FUNCTION__, "number pair");
+  SCM_ASSERT_TYPE (is_axis (axis), axis, SCM_ARG2, __FUNCTION__, "axis");
+  SCM_ASSERT_TYPE (is_number_pair (np), np, SCM_ARG3, __FUNCTION__, "number pair");
 
   Interval iv = ly_scm2interval (np);
   m->dim_[Axis (gh_scm2int (axis))] = iv;
@@ -37,7 +37,7 @@ LY_DEFINE(ly_translate_molecule_axis,"ly:molecule-translate-axis", 3, 0, 0,
   Molecule* m = unsmob_molecule (mol);
   SCM_ASSERT_TYPE (m, mol, SCM_ARG1, __FUNCTION__, "molecule");
   SCM_ASSERT_TYPE (gh_number_p (amount), amount, SCM_ARG2, __FUNCTION__, "number pair");
-  SCM_ASSERT_TYPE (ly_axis_p (axis), axis, SCM_ARG3, __FUNCTION__, "axis");
+  SCM_ASSERT_TYPE (is_axis (axis), axis, SCM_ARG3, __FUNCTION__, "axis");
 
 
   Molecule q (*m);
@@ -52,7 +52,7 @@ LY_DEFINE(ly_translate_molecule,"ly:molecule-translate", 2, 0, 0,
 {
   Molecule* m = unsmob_molecule (mol);
   SCM_ASSERT_TYPE (m, mol, SCM_ARG1, __FUNCTION__, "molecule");
-  SCM_ASSERT_TYPE (ly_number_pair_p (offset), offset, SCM_ARG2, __FUNCTION__, "number pair");
+  SCM_ASSERT_TYPE (is_number_pair (offset), offset, SCM_ARG2, __FUNCTION__, "number pair");
   Offset o = ly_scm2offset (offset);
   
   Molecule q (*m);
@@ -68,7 +68,7 @@ LY_DEFINE(ly_molecule_get_extent,
 {
   Molecule *m = unsmob_molecule (mol);
   SCM_ASSERT_TYPE (m, mol, SCM_ARG1, __FUNCTION__, "molecule");
-  SCM_ASSERT_TYPE (ly_axis_p (axis), axis, SCM_ARG2, __FUNCTION__, "axis");
+  SCM_ASSERT_TYPE (is_axis (axis), axis, SCM_ARG2, __FUNCTION__, "axis");
  
   return ly_interval2scm (m->extent (Axis (gh_scm2int (axis))));
 }
@@ -93,8 +93,8 @@ LY_DEFINE(ly_molecule_combined_at_edge,
   Molecule result;
 
 
-  SCM_ASSERT_TYPE(ly_axis_p (axis), axis, SCM_ARG3, __FUNCTION__, "axis");
-  SCM_ASSERT_TYPE(ly_dir_p (direction), direction, SCM_ARG4, __FUNCTION__, "dir");
+  SCM_ASSERT_TYPE(is_axis (axis), axis, SCM_ARG3, __FUNCTION__, "axis");
+  SCM_ASSERT_TYPE(is_direction (direction), direction, SCM_ARG4, __FUNCTION__, "dir");
 
   Real p = 0.0;
   if (padding != SCM_UNDEFINED)
@@ -183,8 +183,8 @@ LY_DEFINE(ly_make_molecule,
 "can run with the @code{-f scm} option. The scheme expressions are then \n"
 "dumped in the output file.")
 {
-  SCM_ASSERT_TYPE (ly_number_pair_p (xext), xext, SCM_ARG2, __FUNCTION__, "number pair");
-  SCM_ASSERT_TYPE (ly_number_pair_p (yext), yext, SCM_ARG3, __FUNCTION__, "number pair");  
+  SCM_ASSERT_TYPE (is_number_pair (xext), xext, SCM_ARG2, __FUNCTION__, "number pair");
+  SCM_ASSERT_TYPE (is_number_pair (yext), yext, SCM_ARG3, __FUNCTION__, "number pair");  
 
   Box b (ly_scm2interval (xext), ly_scm2interval(yext));
   Molecule m (b, expr);
@@ -217,7 +217,7 @@ LY_DEFINE(ly_align_to_x,"ly:molecule-align-to!", 3, 0, 0,  (SCM mol, SCM axis, S
          " the center. ")
 {
   SCM_ASSERT_TYPE(unsmob_molecule (mol), mol, SCM_ARG1, __FUNCTION__, "molecule");
-  SCM_ASSERT_TYPE(ly_axis_p (axis), axis, SCM_ARG2, __FUNCTION__, "axis");
+  SCM_ASSERT_TYPE(is_axis (axis), axis, SCM_ARG2, __FUNCTION__, "axis");
   SCM_ASSERT_TYPE(gh_number_p (dir), dir, SCM_ARG3, __FUNCTION__, "number");
 
   unsmob_molecule (mol)->align_to ((Axis)gh_scm2int (axis),

diff --git a/lily/multi-measure-rest-engraver.cc b/lily/multi-measure-rest-engraver.cc
index 09b81be76006c8f15f8d17378254f9cba42b02c2..b25fd144d11642f90de8784e9bd22ef0e656e139 100644 (file)
--- a/lily/multi-measure-rest-engraver.cc
+++ b/lily/multi-measure-rest-engraver.cc
@@ -115,7 +115,7 @@ Multi_measure_rest_engraver::process_music ()
              SCM t = e->get_mus_property ("text");
              SCM dir = e->get_mus_property ("direction");
              sp->set_grob_property ("text",t);
-             if (ly_dir_p (dir))
+             if (is_direction (dir))
                sp->set_grob_property ("direction",dir);
              
              numbers_.push (sp);

diff --git a/lily/parser.yy b/lily/parser.yy
index 1ebb6f2f045a8adc5a4e0f67ec9ee84d9b619e48..2f9d9b37c232daa0163a66877b4a4e2be722c178 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -55,6 +55,7 @@ TODO:
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdio.h>
 
 
 #include "scm-option.hh"

diff --git a/lily/piano-pedal-bracket.cc b/lily/piano-pedal-bracket.cc
index 1289dd90579f2afae76599a042a98d159c5ae8c7..09203303240ccc92ce8857f5f7d34ca2a4455a0d 100644 (file)
--- a/lily/piano-pedal-bracket.cc
+++ b/lily/piano-pedal-bracket.cc
@@ -58,9 +58,9 @@ Piano_pedal_bracket::after_line_breaking (SCM smob)
       Item *b = me->get_bound (d);
       broken[d] = b->break_status_dir () != CENTER;
 
-      if (!broken[d] && (ly_number_pair_p (eh)))
+      if (!broken[d] && (is_number_pair (eh)))
        height[d] += gh_scm2double (index_get_cell (eh, d));
-      if (ly_number_pair_p (sp))
+      if (is_number_pair (sp))
        shorten[d] +=  gh_scm2double (index_get_cell (sp, d));
     }
   while (flip (&d) != LEFT);

diff --git a/lily/script-engraver.cc b/lily/script-engraver.cc
index 74df559d3bd7145f3e94c7f7b205df8c40b153e5..4a55c1e634c4265155dbe012237aecb24e151ce7 100644 (file)
--- a/lily/script-engraver.cc
+++ b/lily/script-engraver.cc
@@ -97,7 +97,7 @@ Grob *make_script_from_event (SCM * descr, Translator_group*tg, Music * event,
   *descr = art;  
 
   SCM force_dir = event->get_mus_property ("direction");
-  if (ly_dir_p (force_dir) && to_dir (force_dir))
+  if (is_direction (force_dir) && to_dir (force_dir))
     p->set_grob_property ("direction", force_dir);
 
   copy_property (p, ly_symbol2scm ("script-molecule"), art);

diff --git a/lily/separation-item.cc b/lily/separation-item.cc
index 24a87528b40407ddcedef4cefe3e3d1a2db3e478..3ca590a50044f5ec628b694d09c43cbd38cb99f2 100644 (file)
--- a/lily/separation-item.cc
+++ b/lily/separation-item.cc
@@ -79,7 +79,7 @@ Interval
 Separation_item::width (Grob *me)
 {
   SCM sw = me->get_grob_property ("X-extent");
-  if (ly_number_pair_p (sw))
+  if (is_number_pair (sw))
     {
       return ly_scm2interval (sw);
     }

diff --git a/lily/side-position-interface.cc b/lily/side-position-interface.cc
index e14def2696e02756bbb17805645e3bc53dd905c6..103593b686c95be0bf6a7e80b69e5460209bfcea 100644 (file)
--- a/lily/side-position-interface.cc
+++ b/lily/side-position-interface.cc
@@ -28,12 +28,12 @@ Direction
 Side_position_interface::get_direction (Grob*me)
 {
   SCM d = me->get_grob_property ("direction");
-  if (ly_dir_p (d) && to_dir (d))
+  if (is_direction (d) && to_dir (d))
     return to_dir (d);
 
   Direction relative_dir = Direction (1);
   SCM reldir = me->get_grob_property ("side-relative-direction");      // should use a lambda.
-  if (ly_dir_p (reldir))
+  if (is_direction (reldir))
     {
       relative_dir = to_dir (reldir);
     }

diff --git a/lily/staff-performer.cc b/lily/staff-performer.cc
index b0705a9df7e8ff2146139f08e6c40e73478298b6..1c7d5c0b0548e3dc66e0822461f22ce7cf221496 100644 (file)
--- a/lily/staff-performer.cc
+++ b/lily/staff-performer.cc
@@ -138,9 +138,6 @@ Staff_performer::new_instrument_string ()
   // mustn't ask Score for instrument: it will return piano!
   SCM minstr = get_property ("midiInstrument");
 
-  if (!gh_string_p (minstr))
-    minstr = get_property ("instrument");
-
   if (!gh_string_p (minstr)
       || ly_scm2string (minstr) == instrument_string_)
     return "";

diff --git a/lily/stem-tremolo.cc b/lily/stem-tremolo.cc
index dba612fc70e295df81104bcde2b90564dac14a63..445926bbada1b74a830845eda03a471f0c048389 100644 (file)
--- a/lily/stem-tremolo.cc
+++ b/lily/stem-tremolo.cc
@@ -66,7 +66,7 @@ Stem_tremolo::raw_molecule (Grob *me)
     {
       Real dy = 0;
       SCM s = beam->get_grob_property ("positions");
-      if (ly_number_pair_p (s))
+      if (is_number_pair (s))
        {
          dy = -gh_scm2double (gh_car (s)) +gh_scm2double (gh_cdr (s));
        }

diff --git a/lily/tuplet-bracket.cc b/lily/tuplet-bracket.cc
index 8843a0047a0ddf7ec701470006494b67dbf70ffe..306ff7b679258e8575d4a5e6af402342d8199db6 100644 (file)
--- a/lily/tuplet-bracket.cc
+++ b/lily/tuplet-bracket.cc
@@ -200,11 +200,11 @@ Tuplet_bracket::brew_molecule (SCM smob)
       Drul_array<Real> height, flare, shorten;
       do {
        flare[d] =  height[d] = shorten[d] = 0.0;
-       if (ly_number_pair_p (fl))
+       if (is_number_pair (fl))
          flare[d] +=  gh_scm2double (index_get_cell (fl, d));
-       if (ly_number_pair_p (eh))
+       if (is_number_pair (eh))
          height[d] += gh_scm2double (index_get_cell (eh, d)) * - dir;
-       if (ly_number_pair_p (sp))
+       if (is_number_pair (sp))
          shorten[d] +=  gh_scm2double (index_get_cell (sp, d));
       }
       while (flip (&d) != LEFT);

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index 1e4b6cb9843a6852c07412890a0d802f75fc1924..88d89a4c8d8301b08b3b2e7747e6c0886c55aed4 100644 (file)
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -50,11 +50,6 @@ INSTALLATION_OUT_FILES2=$(AFM_FILES)
 INSTALLATION_OUT_DIR3=$(local_lilypond_datadir)/fonts/tfm
 INSTALLATION_OUT_FILES3=$(TFM_FILES)
 
-# comment this out if you don't want pfa's to be generated
-# making pfas takes a lot of CPU time. Let's skip it for now.
-#MAKE_PFA_FILES=1
-#MAKE_PFB_FILES=1
-
 SAUTER_FONTS = cmbxti7 cmbxti8 cmbxti12 cmbxti14 \
        cmcsc7 cmcsc12 cmtt17 cmbx14 cmbx17 cmtt6 cmbx6 cmbx5 cmbxti5 \
        cmti6 cmti5 
@@ -65,23 +60,12 @@ ALL_FONTS = $(FETA_FONTS) $(SAUTER_FONTS)
 PFA_FILES = $(ALL_FONTS:%=$(outdir)/%.pfa)
 PFB_FILES = $(PFA_FILES:%.pfa=%.pfb)
 
-ifdef MAKE_PFB_FILES
-MAKE_PFA_FILES = 1
-ALL_GEN_FILES += $(PFB_FILES)
-endif
-
-ifdef MAKE_PFA_FILES
 ALL_GEN_FILES += $(PFA_FILES) $(outdir)/lilypond.map $(outdir)/fonts.scale
 INSTALLATION_OUT_DIR4=$(local_lilypond_datadir)/fonts/type1
 INSTALLATION_OUT_FILES4=$(PFA_FILES) $(outdir)/fonts.scale
 
 INSTALLATION_OUT_DIR5=$(local_lilypond_datadir)/dvips/
 INSTALLATION_OUT_FILES5=$(outdir)/lilypond.map
-endif
-
-ifdef MAKE_PFB_FILES
-INSTALLATION_OUT_FILES4 +=$(PFB_FILES)
-endif
 
 export MFINPUTS:=.:$(MFINPUTS)
 

diff --git a/stepmake/autogen.sh b/stepmake/autogen.sh
index 05b2eae55cb2e6b92f0e1c0f44e4d174ba62da2d..bf647044619930ccd500f9ec7988cc1d0abf2683 100755 (executable)
--- a/stepmake/autogen.sh
+++ b/stepmake/autogen.sh
@@ -42,7 +42,7 @@ if test -z "$*"; then
   echo
 fi
 
-for coin in `find $srcdir -name configure.in -print`
+for coin in $srcdir/configure.in #`find $srcdir -name configure.in -print`
 do 
   dr=`dirname $coin`
   echo processing $dr