lilypond-0.1.52

diff --git a/Documentation/Makefile.am.wild b/Documentation/Makefile.am.wild
index aa2476c53ba3671852940a329ca16a2dcb9882b2..329e22535fbb854f2e736c4e5fa8bfd24089aa84 100644 (file)
--- a/Documentation/Makefile.am.wild
+++ b/Documentation/Makefile.am.wild
@@ -32,7 +32,7 @@ uninstall-hook:
 
 html: $(HTMLFILES)
 
-clean-hook:
-       rm $(TEXTFILES) $(MAN1GROFF)
+clean-local:
+       -rm $(TEXTFILES) $(MAN1GROFF)
 
 include $(top_srcdir)/Documentation/Rules.make

diff --git a/Makefile.am.wild b/Makefile.am.wild
index 885dcb8c12f1762cf2a62d427d5be46140893f91..5d6cdeb6354c2bcb3c8d228a3c11357889259602 100644 (file)
--- a/Makefile.am.wild
+++ b/Makefile.am.wild
@@ -23,3 +23,8 @@ PATCHES:
        rm -f PATCHES
        ln `$(FIND) ./ -name PATCHES.txt -print | head -1` $@
 
+
+# a hack due to a bug in automake: the macro AM_CONFIG_HEADER does not
+# respect the directory
+distclean-local:
+       rm -f lib/config.hh

diff --git a/bin/wild-perl b/bin/wild-perl
index a26ceefcae6f5b42185eb1307a9f2ed58cf978a5..a61caf335bfeddb78644f26010c29acc01925fae 100644 (file)
--- a/bin/wild-perl
+++ b/bin/wild-perl
@@ -1,6 +1,11 @@
 # -*- perl -*-
 ##! @PERL@
 
+use Getopt::Long;
+GetOptions("top-srcdir:s");
+
+$my_topdir = $opt_top_srcdir ? $opt_top_srcdir : "\$(top_srcdir)";
+
 @ignorestuff = ();
 
 sub ignore_query
@@ -11,6 +16,7 @@ sub ignore_query
 
 print "# Generated automatically by wild-perl 0.1\n";
 
+
 while (<>) {
        $line = $_;
        if ($line =~ /^ *nowildcard: *(.*)$/) {
@@ -37,5 +43,5 @@ while (<>) {
 
 
 print "\$(srcdir)/Makefile.am: \$(srcdir)/Makefile.am.wild\n" .
-    "\t\$(PERL) \$(top_srcdir)/bin/wild-perl < \$< > \$@";
+    "\t\$(PERL) $my_topdir/bin/wild-perl --top-srcdir=\"\$(real_topdir)\" < \$< > \$@";
 

diff --git a/flower/Makefile.am.wild b/flower/Makefile.am.wild
index 87639fc1d0e9db232d0c6581774050122b478fe8..6ef3498d049fc9f5c0c7713a267c5797ef7eb700 100644 (file)
--- a/flower/Makefile.am.wild
+++ b/flower/Makefile.am.wild
@@ -9,6 +9,9 @@
 
 SUBDIRS = include test 
 
+# the wild-perl script needs this.
+real_topdir = $(top_srcdir)/..
+
 lib_LTLIBRARIES = libflower.la
 
 README_FILES = ONEWS NEWS README TODO VERSION
@@ -20,3 +23,5 @@ libflower_la_LDFLAGS = -version-info @CURRENT@:@REVISION@:@AGE@
 
 INCLUDES = -I$(srcdir)/include
 
+distclean-local:
+       -rm -rf .deps

diff --git a/flower/configure.in b/flower/configure.in
index 25bb9392bccf48f024e58a6283fd6d8ba559429c..aa9aa5f516b117db10cfe136e506d0cecf8848f4 100644 (file)
--- a/flower/configure.in
+++ b/flower/configure.in
@@ -88,6 +88,8 @@ AC_SUBST(REVISION)
 AC_SUBST(AGE)
 AC_SUBST(PERL)
 
+AC_PATH_PROG(PERL, perl, error)
+
 AC_FUNC_MEMCMP
 AC_FUNC_VPRINTF
 AC_CHECK_FUNCS(memmem snprintf )

diff --git a/flower/include/Makefile.am.wild b/flower/include/Makefile.am.wild
index ac36bc76efcf0f0b1d9b762952350808789d966c..5eb223087407d2f7371cbcdff1add36e3c9156a3 100644 (file)
--- a/flower/include/Makefile.am.wild
+++ b/flower/include/Makefile.am.wild
@@ -1,5 +1,8 @@
 # flower/lib/include/Makefile.am.wild
 
+# the wild-perl script needs this.
+real_topdir = $(top_srcdir)/..
+
 noinst_HEADERS = $(wildcard *.hh *.icc *.tcc)
 
 EXTRA_DIST = Makefile.am.wild

diff --git a/flower/test/Makefile.am.wild b/flower/test/Makefile.am.wild
index 2346878f8020080db84bcf78c5938d73753ac18b..02f871025b7c995393a154fe14cdc2fad542de7f 100644 (file)
--- a/flower/test/Makefile.am.wild
+++ b/flower/test/Makefile.am.wild
@@ -8,6 +8,9 @@
 #      Han-Wen Nienhuys <hanwen@stack.nl>
 #
 
+# the wild-perl script needs this.
+real_topdir = $(top_srcdir)/..
+
 # bin_PROGRAMS = test
 
 # TEST = test

diff --git a/init/Makefile.am.wild b/init/Makefile.am.wild
index 8589be49c80aedf43fdd67f455ad96de209de722..24936bd1b2c0d8b5a9dd6a857a84ed39427f3a74 100644 (file)
--- a/init/Makefile.am.wild
+++ b/init/Makefile.am.wild
@@ -8,13 +8,13 @@ CLEANFILES = $(wildcard feta*.ly)
 FONT_FILES = $(wildcard ../mf/*[0-9].mf)
 TABLES = $(patsubst ../mf/%.mf,%.ly,$(FONT_FILES))
 
-# localclean:
+# clean-local:
 #      rm -f $(TABLES)
 
-install-data:
+install-data-local:
        $(INSTALL) -d $(datadir)/lilypond/init
        $(INSTALL) -m 644 $(INIFILES) $(datadir)/lilypond/init
 
-uninstall-data:
+uninstall-local:
        for i in $(INIFILES) ; do rm -f $(datadir)/lilypond/init/$$i; done
        -rmdir $(datadir)/lilypond/init $(datadir)/lilypond/

diff --git a/lib/Makefile.am.wild b/lib/Makefile.am.wild
index 1bd40b765febb44b1f27ab5f5613f0f3a4b1d168..3185791ed7d9b1bd433ffa013e300be3228bc659 100644 (file)
--- a/lib/Makefile.am.wild
+++ b/lib/Makefile.am.wild
@@ -18,3 +18,5 @@ MODULE_CXXFLAGS += -D_REENTRANT
 
 EXTRA_DIST = Makefile.am.wild
 
+distclean-local:
+       -rm -rf .deps

diff --git a/lily/Makefile.am.wild b/lily/Makefile.am.wild
index b7584ca7bfeed32006bbdddf1d70a67875c5a022..f5050d47d044557b31c34355970cf829a94e00de 100644 (file)
--- a/lily/Makefile.am.wild
+++ b/lily/Makefile.am.wild
@@ -20,9 +20,6 @@ lilypond_LDADD = $(top_builddir)/lib/liblily.la $(top_builddir)/flower/libflower
 
 lilypond_LDFLAGS = -L$(absolute_builddir)/lib/.libs -L$(absolute_builddir)/flower/.libs
 
-
- 
-
 INCLUDES =  -I$(srcdir)/include -I$(srcdir)/../lib/include -I$(srcdir)/../flower/include 
 
 EXTRA_DIST = Makefile.am.wild GNUmakefile Stable.make VERSION
@@ -47,3 +44,5 @@ all-am: Makefile $(PROGRAMS) wild-check
 # dummy target for non-GNU makes; is overridden in GNUmakefile
 wild-check:
 
+distclean-local:
+       -rm -rf .deps

diff --git a/lily/axis-group-item.cc b/lily/axis-group-item.cc
index f22332098be9e7e77984fdb5b93d935c1e30c13a..8419f85ad5008eca6cad50699d6f48f6d8f0c35c 100644 (file)
--- a/lily/axis-group-item.cc
+++ b/lily/axis-group-item.cc
@@ -42,7 +42,7 @@ Axis_group_item::do_breakable_col_processing()
            it_l->find_prebroken_piece (broken_to_drul_[j]->break_status_i_);
          ((Axis_group_item*)broken_to_drul_[j])->add_element (new_l);
        }
-      while ((j*=-1)!=LEFT);
+      while (flip(&j)!=LEFT);
     }
   Item::do_breakable_col_processing();
 }

diff --git a/lily/axis-group-spanner.cc b/lily/axis-group-spanner.cc
index 42050ae5b4499fda404da13cd5c55757b7890361..5cace351e33134d0de7eb1b37d69726a5851c37a 100644 (file)
--- a/lily/axis-group-spanner.cc
+++ b/lily/axis-group-spanner.cc
@@ -98,7 +98,7 @@ Axis_group_spanner::do_break_processing()
                  if (v)
                    v->add_element (my_item);
                }
-             while ((j*=-1) != LEFT);
+             while (flip(&j) != LEFT);
            }
        }
       else 

diff --git a/lily/beam.cc b/lily/beam.cc
index cb6159ae09a108f8856bccb66ef86ddb52418f8b..a463ff233f0fbeaa4df7d94764ef592e53c6373e 100644 (file)
--- a/lily/beam.cc
+++ b/lily/beam.cc
@@ -151,7 +151,7 @@ Beam::set_default_dir ()
       Stem *s = stems_[i];
       int current = s->dir_ 
        ? (1 + d * s->dir_)/2
-       : s->get_center_distance (Direction (-d));
+       : s->get_center_distance ((Direction)-d);
 
       if (current)
        {
@@ -159,12 +159,12 @@ Beam::set_default_dir ()
          count[d] ++;
        }
 
-    } while ((d *= -1) != DOWN);
+    } while (flip(&d) != DOWN);
   
    do {
     if (!total[d])
       count[d] = 1;
-  } while ((d *= -1) != DOWN);
+  } while (flip(&d) != DOWN);
   
   /* 
 

diff --git a/lily/crescendo.cc b/lily/crescendo.cc
index 22920506ec5759aaf4d231c4736e616ee05dc13b..400b6709a05b68821543ff39e10f35e409a056f0 100644 (file)
--- a/lily/crescendo.cc
+++ b/lily/crescendo.cc
@@ -53,7 +53,7 @@ Crescendo::get_symbol() const
   do {
     Score_column* s = (Score_column* )spanned_drul_[d] ; // UGH
     broken[d] = (!s->musical_b());
-  } while ((d *= -1) != LEFT);
+  } while (flip(&d) != LEFT);
   
 
   bool continued = broken[(Direction)-grow_dir_];

diff --git a/lily/dynamic-grav.cc b/lily/dynamic-grav.cc
index 69859a59c3f424c7128d3a55a33e818a2820283b..c4fe4b46af53fd41695d53255e390b3f827337bb 100644 (file)
--- a/lily/dynamic-grav.cc
+++ b/lily/dynamic-grav.cc
@@ -50,7 +50,7 @@ Dynamic_engraver::do_process_requests()
       if (dreq_l->absdynamic())
        {
          Text_def * td_p = new Text_def;
-         td_p->align_i_ = 0;
+         td_p->align_i_ = CENTER;
          String loud = dreq_l->absdynamic()->loudness_str ();
          td_p->text_str_ = paper()->lookup_l ()->dynamic (loud).tex_;
          td_p->style_str_ = "dynamic";

diff --git a/lily/include/direction.hh b/lily/include/direction.hh
index d02274f6c1e762923ae9786dc989620aae39b5a4..66abd5f379f570a878220d1e9063236f846c04ba 100644 (file)
--- a/lily/include/direction.hh
+++ b/lily/include/direction.hh
@@ -19,9 +19,17 @@ enum Direction
   CENTER=0,
   SMALLER=-1,
   BIGGER=1,
-
 };
 
+inline Direction
+flip (Direction *i) {
+  if (*i == (Direction)1)
+    *i = (Direction)-1;
+  else if (*i == (Direction)-1)
+    *i = (Direction)1;
+  return *i;
+}
+
 /**
    if d > 0: the max operator
    if d < 0: the min operator

diff --git a/lily/include/musical-request.hh b/lily/include/musical-request.hh
index 28fa8d04aa45c86caba4551572f370807d25045f..ff5303d5f608f1abd8a6f20c103a6de87609a4db 100644 (file)
--- a/lily/include/musical-request.hh
+++ b/lily/include/musical-request.hh
@@ -165,9 +165,9 @@ public:
 class Span_req  : public virtual Musical_req  {
 public:
   /// should the spanner start or stop, or is it unwanted?
-  enum {
+  enum Spantype {
     NOSPAN, START, STOP
-  } spantype ;
+  } spantype;
   bool do_equal_b (Request*) const;
   REQUESTMETHODS(Span_req,span);
 

diff --git a/lily/musical-request.cc b/lily/musical-request.cc
index bc46309810682d6bad89d9c4e7c7eac3872acbf7..c84b92ee0fdebbe2671c8cf442fe742cc6ddff3e 100644 (file)
--- a/lily/musical-request.cc
+++ b/lily/musical-request.cc
@@ -207,7 +207,7 @@ Rhythmic_req::duration() const
 Lyric_req::Lyric_req (Text_def* def_p)
   :Text_req (0, def_p)
 {
-  def_p->align_i_ = 0; // centre
+  def_p->align_i_ = CENTER;    // centre
   dir_ = DOWN;         // lyrics below (invisible) staff
 }
 

diff --git a/lily/parser.yy b/lily/parser.yy
index 4be93f095718cf675154d9225be6d33f203a038a..842423e0ea9cf72b0122bdfdf7b7ae0b5bee2c4c 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -40,6 +40,9 @@
 #include "duration-convert.hh"
 #include "change-translator.hh"
 
+// needed for bison.simple's malloc() and free()
+#include <malloc.h>
+
 int const GUESS_PLET = 5;
 int guess_plet_a[GUESS_PLET] =
 { 
@@ -863,8 +866,8 @@ dynamic_req:
        }
        | SPANDYNAMIC '{' int int '}' {
                Span_dynamic_req * sp_p = new Span_dynamic_req;
-               sp_p->spantype = $4;
-               sp_p-> dynamic_dir_  = $3;
+               sp_p->spantype = (Span_req::Spantype)$4;
+               sp_p-> dynamic_dir_  = (Direction)$3;
                $$ = sp_p;
        }
        ;
@@ -993,7 +996,7 @@ script_req:
                m->scriptdef_p_ = $2;
                m->set_spot (THIS->here_input ());
                if (!m->dir_)
-                 m->dir_  = $1;
+                 m->dir_  = (Direction)$1;
        }
        ;
 

diff --git a/lily/plet-spanner.cc b/lily/plet-spanner.cc
index 6eebc48f04ca0815f3e0f8e851bf275b4d54253f..6787088b0e2bf4d9c014508b8c92e7d91bea601e 100644 (file)
--- a/lily/plet-spanner.cc
+++ b/lily/plet-spanner.cc
@@ -85,7 +85,7 @@ Plet_spanner::do_add_processing ()
   do {
     if (!stem_l_drul_[d])
       new_stem_drul[d] = stem_l_drul_[(Direction)-d];
-  } while ( (d *= -1) != LEFT);
+  } while (flip(&d) != LEFT);
   stem_l_drul_ = new_stem_drul;
 }
   
@@ -110,7 +110,7 @@ Plet_spanner::do_post_processing ()
       if (d == RIGHT)
         dx_f_drul_[d] = nw_f;
     }
-  while ( (d *= -1) != LEFT);
+  while (flip(&d) != LEFT);
 }
 
 void

diff --git a/lily/score-grav.cc b/lily/score-grav.cc
index 8e28c11280b062365657f0a0dada02b5e4ba08e2..06f54eca515ee4ce47b96cf2a11efdcf9f406fde 100644 (file)
--- a/lily/score-grav.cc
+++ b/lily/score-grav.cc
@@ -144,7 +144,7 @@ Score_engraver::typeset_all()
                s->set_bounds(d, command_column_l_);
                warning ("Unbound spanner");
              }
-         } while ((d *= -1) != LEFT);
+         } while (flip(&d) != LEFT);
        }
       else 
        {

diff --git a/lily/script.cc b/lily/script.cc
index 0979cfe8245a61d38c8637c698ea9fca39d3a360..f5333cea467b70c69ab3847c3d913be080a2127d 100644 (file)
--- a/lily/script.cc
+++ b/lily/script.cc
@@ -54,7 +54,7 @@ Script::set_default_dir()
   if (s_i)
     {
       if (stem_l_)
-       dir_ = stem_l_->dir_ * s_i;
+       dir_ = Direction(stem_l_->dir_ * s_i);
       else
        {
          specs_l_->warning (_("Script needs stem direction"));

diff --git a/lily/slur.cc b/lily/slur.cc
index 88b2c6cc3378661071b2dd6b018bdaac21e8e447..f8142f23ee55a6a9a7c07df59385594ed3cc03ff 100644 (file)
--- a/lily/slur.cc
+++ b/lily/slur.cc
@@ -127,7 +127,7 @@ Slur::do_post_processing ()
        }
       dy_f_drul_[d] += dir_ * interline_f;
     }
-  while ((d *= -1) != LEFT);
+  while (flip(&d) != LEFT);
 }
 
 Real

diff --git a/lily/stem-grav.cc b/lily/stem-grav.cc
index 1a552bcf2c03a642a9aaf20bf7e146a9dd2152ca..544da9c59f1a47dfbb4c1273de9700b2ecec81b8 100644 (file)
--- a/lily/stem-grav.cc
+++ b/lily/stem-grav.cc
@@ -77,7 +77,7 @@ Stem_engraver::do_pre_move_processing()
   if (stem_p_)
     {
       Scalar prop = get_property ("ydirection");
-      dir_ = prop.isnum_b () ? int(prop) : CENTER;
+      dir_ = prop.isnum_b () ? (Direction)int(prop) : CENTER;
       if (dir_)
        stem_p_->dir_ = dir_;
 

diff --git a/lily/template4.cc b/lily/template4.cc
index 8975172e83fd9065e116b50cf0ce8cbe53931b27..820b07be3d5e8469cb6838479b2c8b51a832d058 100644 (file)
--- a/lily/template4.cc
+++ b/lily/template4.cc
@@ -9,10 +9,12 @@
 #include "proto.hh"
 #include "pcursor.hh"
 #include "plist.hh"
+/*
 #include "audio-item.hh"
 #include "audio-staff.hh"
 #include "p-col.hh"
 #include "p-score.hh"
+*/
 #include "cursor.tcc"
 #include "list.tcc"
 #include "pcursor.tcc"

diff --git a/lily/tex-slur.cc b/lily/tex-slur.cc
index 8fb616fcb747ce0ef6916686b09a0e8d1872ac57..9e116df08ee99c1a93ebb9a4ebb01e35a0b5de1d 100644 (file)
--- a/lily/tex-slur.cc
+++ b/lily/tex-slur.cc
@@ -179,7 +179,7 @@ Lookup::ps_slur (Real dy , Real dx, Real ht, Real dir) const
 Atom
 Lookup::tex_slur (int dy , Real &dx, Direction dir) const
 {
-  assert (abs (dir) <= 1);
+  assert (abs ((int)dir) <= 1);
   Atom s;
   Direction y_sign = (Direction) sign (dy);
 

diff --git a/lily/tie.cc b/lily/tie.cc
index fb929047e6eb2f572d5670c0a7b443fdea11c840..de7b328b11c695583703b317ae3427b795120efe 100644 (file)
--- a/lily/tie.cc
+++ b/lily/tie.cc
@@ -53,7 +53,7 @@ Tie::do_add_processing()
   do {
     if (!head_l_drul_[d])
       new_head_drul[d] = head_l_drul_[(Direction)-d];
-  } while ((d *= -1) != LEFT);
+  } while (flip(&d) != LEFT);
   head_l_drul_ = new_head_drul;
 }
 
@@ -86,7 +86,7 @@ Tie::do_post_processing()
                       ? head_l_drul_[d]->position_i_
                       : head_l_drul_[(Direction)-d]->position_i_);
     }
-  while ((d *= -1) != LEFT);
+  while (flip(&d) != LEFT);
 
   do
     {
@@ -108,7 +108,7 @@ Tie::do_post_processing()
                                -0.5 * nw_f);
        }
     }
-  while ((d *= -1) != LEFT);
+  while (flip(&d) != LEFT);
 }
 
 void

diff --git a/mi2mu/Makefile.am.wild b/mi2mu/Makefile.am.wild
index 46079471217638afc04c67c4aefabccf59165488..cced5f03007171bf7260bde03c39d46574a8587c 100644 (file)
--- a/mi2mu/Makefile.am.wild
+++ b/mi2mu/Makefile.am.wild
@@ -28,3 +28,6 @@ all-am: Makefile $(PROGRAMS) wild-check
 
 # dummy target for non-GNU makes; is overridden in GNUmakefile
 wild-check:
+
+distclean-local:
+       -rm -rf .deps

diff --git a/mutopia/J.S.Bach/wtk1-fugue2.ly b/mutopia/J.S.Bach/wtk1-fugue2.ly
index 0b9e7fcabcbedd9d736477601da48c2d90741431..a2bd3542b2c8efa15d9869488b7087817fed1929 100644 (file)
--- a/mutopia/J.S.Bach/wtk1-fugue2.ly
+++ b/mutopia/J.S.Bach/wtk1-fugue2.ly
@@ -1,188 +1,191 @@
-\header{
-filename =      "wohltemperirt.ly";
-title =         "Fuga a 3";
-description =   "Das Wohltemperierte Clavier I, Fuga II (c-minor)";
-opus =  "BWV 847-Fuga";
-source =        "Henle's Urtext";
-composer =      "Johann Sebastian Bach (1685-1750)";
-enteredby =     "HWN and Werner Lemberg";
-copyright =     "Public Domain";
+\header {
+  filename =    "wtk1-fugue2.ly";
+  title =       "Fuga a 3";
+  description = "Das Wohltemperierte Clavier I, Fuga II (c-minor)";
+  opus =        "BWV 847-Fuga";
+  source =      "Henle's Urtext";
+  composer =    "Johann Sebastian Bach (1685-1750)";
+  enteredby =   "HWN, WL";
+  copyright =   "Public Domain";
 }
+
 %{
  Tested Features: stem direction, multivoice, forced accidentals.
 %}
 
 \version "0.1.9";
 
-keyCminor = \melodic \key bes es as;
-                                    % should add \need{dutch.ini} for
-                                    % correct parsing of note names
+\include "dutch.ly"                 % for correct parsing of note names
 
 global = \melodic {
-         \meter 4/4;                % should be \meter C
-         \keyCminor 
-        \skip 1*31;
-        \bar "|."; |
+  \meter 4/4;
+  \key bes es as;
+  \skip 1*31;
+  \bar "|."; |
 }
   
 dux = \melodic {
-        \clef "violin";
-        \octave c';
+  \clef violin;
+  \octave c';
 
-        \stemdown
-        r8 [c'16 b] [c'8 g] [as c'16 b] [c'8 d'] |
-        [g c'16 b] [c'8 d'] [f16 g] as4 [g16 f] |
-        [es c' b a] [g f! es d] [c8 es' d' c'] |
-        [bes a bes c'] [fis g a fis] |
+  \stemdown
+  r8 [c'16 b] [c'8 g] [as c'16 b] [c'8 d'] |
+  [g c'16 b] [c'8 d'] [f16 g] as4 [g16 f] |
+  [es c' b a] [g f! es d] [c8 es' d' c'] |
+  [bes a bes c'] [fis g a fis] |
 %% 5
-        g4 r16 [c d es] [f g as8~] [as16 d es f] |
-        [g a bes8~] [bes16 es f g] [as g f es] [d8 c'16 b!] |
+  g4 r16 [c d es] [f g as8~] [as16 d es f] |
+  [g a bes8] ~ [bes16 es f g] [as g f es] [d8 c'16 b!] |
                                                     % forced accident!
-        c'4 r4 r8 [f' es' d'] |
-        r8 [as g f] [g f16 es] [f8 d] | 
-        g4 r8 b [c' c'16 b] [c'8 g] |
+  c'4 r4 r8 [f' es' d'] |
+  r8 [as g f] [g f16 es] [f8 d] | 
+  g4 r8 b [c' c'16 b] [c'8 g] |
 %% 10   
-        as4 r8 a [bes bes16 a] [bes8 f] |
-        g4 r8 g [as as g f] |
-       \translator Staff=bass \stemup
-        \octave c; r8 [as bes c'] r8 [as16 g] [as8 f8] |
-        [bes8 c' bes as] [bes g f es] |
-        [f des' c' bes] [c' as g f] |
+  as4 r8 a [bes bes16 a] [bes8 f] |
+  g4 r8 g [as as g f] |
+  \translator Staff = bass \stemup \octave c;
+   r8 [as bes c'] r8 [as16 g] [as8 f8] |
+  [bes8 c' bes as] [bes g f es] |
+  [f des' c' bes] [c' as g f] |
 %% 15
-       \translator Staff=treble \stemdown
-        g8 \octave c'; [g16 fis] [g8 c] [es g16 fis!] [g8 a] |
-        [d g16 fis] [g8 a!] [c16 d] es4 [d16 c] |
-                                                    % forced accident!
-        'bes8 r8 r16 [d e fis] [g a bes8~] [bes16 e f g] |
-        [a bes c'8~] [c'16 fis16 g a] [bes8 es!16 d] [es8 'g] |
-        ['as f16 es] [f8 'a8] ['bes g16 f] [g8 'b] |
+  g8
+   \translator Staff = treble \stemdown \octave c';
+   [g16 fis] [g8 c] [es g16 fis!] [g8 a] |
+  [d g16 fis] [g8 a!] [c16 d] es4 [d16 c] |         % forced accident!
+  'bes8 r8 r16 [d e fis] [g a bes8] ~ [bes16 e f g] |
+  [a bes c'8] ~ [c'16 fis16 g a] [bes8 es!16 d] [es8 'g] |
+  ['as f16 es] [f8 'a8] ['bes g16 f] [g8 'b] |
 %% 20
-        [c16 f es d] [c Bes! As G] [F8 as g f] |
-        [es d es f] [B c d B] |
-        c4 r8 e8 [f f16 e] [f8 c] |
-        d4 r8 d8 [es8 es16 d] [es8 Bes] |
-        c2 ~  [c8 d16 es][ f es f d] |
+  [c16 f es d] [c Bes! As G] [F8 as g f] |
+  [es d es f] [B c d B] |
+  c4 r8 e8 [f f16 e] [f8 c] |
+  d4 r8 d8 [es8 es16 d] [es8 Bes] |
+  c2 ~ [c8 d16 es] [f es f d] |
 %% 25
-        B8 r8 r B c r r es |
-        d r r f~ f r r f |
-        [es as g f] [es d es f] |
-        [B c d B] [B c] r c |
-        [f16 d es c]~ [c8 B] c4 r8 e |
+  B8 r8 r B c r r es |
+  d r r f ~ f r r f |
+  [es as g f] [es d es f] |
+  [B c d B] [B c] r c |
+  [f16 d es c] ~ [c8 B] c4 r8 e |
 %% 30
-        f4 r8 f [f es16 d] [es8 <f as]> |
-        <B d> r <B d> r <G2 c> |
+  f4 r8 f [f es16 d] [es8 <f as]> |
+  <B d> r <B d> r <G2 c> |
 }
 
 
 comes = \melodic {
-        \octave c'';
-        \stemup
-        r1 |
-        r1 |
-        r8 [g16 fis] [g8 c] [es g16 fis] [g8 a] |
-        [d8 g16 fis] [g8 a] [c16 d] es4 [d16 c] |
+  \octave c'';
+  \stemup
+
+  r1 |
+  r1 |
+  r8 [g16 fis] [g8 c] [es g16 fis] [g8 a] |
+  [d8 g16 fis] [g8 a] [c16 d] es4 [d16 c] |
 %% 5
-        ['bes8 es16 d] [es8 'g8] ['as f16 es] [f8 'a] 
-        ['bes8 g16 f] [g8 'b] [c8 d16 es] f4~ |
-        [f8 es16 d] [c16 'bes! 'as 'g] ['f8 as g f] 
-        [es d es f] ['b c d 'b] |
-        [c g16 fis] [g8 d] es4 r8 e8 |
+  ['bes8 es16 d] [es8 'g8] ['as f16 es] [f8 'a] 
+  ['bes8 g16 f] [g8 'b] [c8 d16 es] f4 ~ |
+  [f8 es16 d] [c16 'bes! 'as 'g] ['f8 as g f] 
+  [es d es f] ['b c d 'b] |
+  [c g16 fis] [g8 d] es4 r8 e8 |
 %% 10 
-        [f f16 e] [f8 c8] d4 r8 d |
-        [es8 es16 d] [es8 'bes] [c es16 d] [es8 f] |
-        ['bes es16 d] [es8 f] ['as16 'bes] c4 ['bes16 'as] |
-        [G16 Es F G] [As Bes c d] [es d c d] [es f g a] |
-        [bes F G As] [Bes c d e] [f es d es] [ f g a b] |
+  [f f16 e] [f8 c8] d4 r8 d |
+  [es8 es16 d] [es8 'bes] [c es16 d] [es8 f] |
+  \stemboth ['bes es16 d] [es8 f] ['as16 'bes] c4 ['bes16 'as] |
+  [G16 Es F G] [As Bes c d] [es d c d] [es f g a] |
+  [bes F G As] [Bes c d e] [f es d es] [ f g a b] |
 %% 15
-        [c'8 b16 a] [g f! es d] [c8 es d c] |
-        [Bes A Bes c] [Fis! G A Fis] |
-                                                    % forced accident
-        [G8 d16 c] d8 r8 r8 [e16 d] e8 r8 |
-        r [fis16 e] fis8 r r [G16 F] G8 r8 |
-        r8 [A16 G] A8 r r [B16 A] B8 r |
+  \stemup [c'8 b16 a] [g f! es d] [c8 es d c] |
+  [Bes A Bes c] [Fis! G A Fis] |                    % forced accident
+  [G8 d16 c] d8 r8 r8 [e16 d] e8 r8 |
+  r [fis16 e] fis8 r r [G16 F] G8 r8 |
+  r8 [A16 G] A8 r r [B16 A] B8 r |
 %% 20
-        r8 [c16 'b] [c8 'g] [As c16 'b] [c8 d] |
-        [G c16 B] [c8 d] [F16 G] As4 [G16 F] |
-        [Es8 c16 B] [c8 G] As4 r8 A |
-        [Bes8 Bes16 A] [Bes8 F8] 'g4 r8 G~ |
-        [G As16 Bes] [c B c As] F2~ |
+  r8 [c16 'b] [c8 'g] [As c16 'b] [c8 d] |
+  [G c16 B] [c8 d] [F16 G] As4 [G16 F] |
+  [Es8 c16 B] [c8 G] As4 r8 A |
+  [Bes8 Bes16 A] [Bes8 F8] 'g4 r8 G ~ |
+  [G As16 Bes] [c B c As] F2 ~ |
 %% 25
-        [F8 d16 c] [d8 F] [Es es16 d] [es8 G] |
-        [F f16 es] [f8 As] [G16 f es d] [c B A G] |
-        [c8 f es d] r [As G F] |
-        [G F16 Es] [F8 D] [As G] r A |
-        [B c] [F16 Es D C] C8 [c16 B] [c8 G] |
+  [F8 d16 c] [d8 F] [Es es16 d] [es8 G] |
+  [F f16 es] [f8 As] [G16 f es d] [c B A G] |
+  [c8 f es d] r [As G F] |
+  [G F16 Es] [F8 D] [As G] r A |
+  [B c] [F16 Es D C] C8 [c16 B] [c8 G] |
 %% 30
-        [As c16 B] [c8 <d 'b! 'as!]> [G8 c16 B] [c8 d] |
-        [F16 G] As4 [G16 F] E2 |
+  [As c16 B] [c8 <d 'b! 'as!]> [G8 c16 B] [c8 d] |
+  [F16 G] As4 [G16 F] E2 |
 }
 
+
 bassdux = \melodic {
-        \clef "bass";
-        \octave c';
-        r1 |
-        r |
-        r |
-        r |
+  \clef bass;
+  \octave c';
+
+  r1 |
+  r |
+  r |
+  r |
 %% 5
-        r |
-        r1 |
-        r8 [c16 B] [c8 G] [As c16 B] [c8 d] |
-        [G c16 B] [c8 d] [F16 G] As4 [G16 F] | 
-        \octave c; [es c' b a] [g f es d] [c d es d] [c Bes! As! G] |
+  r |
+  r1 |
+  r8 [c16 B] [c8 G] [As c16 B] [c8 d] |
+  [G c16 B] [c8 d] [F16 G] As4 [G16 F] | 
+  \octave c; [es c' b a] [g f es d] [c d es d] [c Bes! As! G] |
                                                     % -> \classic_accidentals
 %% 10
-        [F bes as g] [f es d c] [Bes c d c] [Bes As G F] |
-        [Es as g f] [es des c Bes] [As8 c' bes as] |
-        [g8 f g as] [d es f d] |
-        [es as g f] [g es d c] |
-        [d bes as g] [as f es d!] |
+  [F bes as g] [f es d c] [Bes c d c] [Bes As G F] |
+  [Es as g f] [es des c Bes] [As8 c' bes as] |
+  [g8 f g as] [d es f d] |
+  [es as g f] [g es d c] |
+  [d bes as g] [as f es d!] |
 %% 15
-        es8 r8 r4 r8 [c Bes A] |
-        r [es d c] [d c16 Bes] [c8 d] |
-        [G8 bes16 a] [bes8 d] [es c'16 bes] [c'8 e] |
-        [f d'16 c'] [d'8 fis] g4 r16 [G A B] |
-        [c16 d es8~] [es16 A Bes c] [d es f8~] [f16 'b c d] |
+  es8 r8 r4 r8 [c Bes A] |
+  r [es d c] [d c16 Bes] [c8 d] |
+  [G8 bes16 a] [bes8 d] [es c'16 bes] [c'8 e] |
+  [f d'16 c'] [d'8 fis] g4 r16 [G A B] |
+  [c16 d es8~] [es16 A Bes c] [d es f8~] [f16 'b c d] |
 %% 20    
-        es8 r r e [f F Es! D] |                     % -> \classic_accidentals
-        r [As G F] [G F16 Es] [F8 G] |
-        [c16 d  es d] [c Bes As G] [F bes as g] [f es d c] |
-        [Bes c d c] [Bes As G F] [Es as g f] [es d c Bes] |
-        [As Bes c Bes] [As G F Es] [D g f es] [d c B A] |
+  es8 r r e [f F Es! D] |                           % -> \classic_accidentals
+  r [As G F] [G F16 Es] [F8 G] |
+  [c16 d  es d] [c Bes As G] [F bes as g] [f es d c] |
+  [Bes c d c] [Bes As G F] [Es as g f] [es d c Bes] |
+  [As Bes c Bes] [As G F Es] [D g f es] [d c B A] |
 %% 25
-        G4 r4 r16 [G A B] [c d es f] |
-        [g f as g] [f es d c] [B8 c16 B] [c8 G] |
-        [As c16 B] [c8 d] [G c16 B] [c8 d] |
-        [F16 G] As4 [G16 F] Es4 r8 es |
-        [d c g G]
+  G4 r4 r16 [G A B] [c d es f] |
+  [g f as g] [f es d c] [B8 c16 B] [c8 G] |
+  [As c16 B] [c8 d] [G c16 B] [c8 d] |
+  [F16 G] As4 [G16 F] Es4 r8 es |
+  [d c g G]
 %% 30
-        \multi 2 <
-               { \stemup c2~ | c1~ | c1 }
-               { \stemdown C2~ | C1~ | C1 }
-        >
-    }
+  \multi 2 <
+    { \stemup c2 ~ | c1 ~ | c1 }
+    { \stemdown C2 ~ | C1 ~ | C1 }
+  >
+}
 
         
 \score {
-       \type Grandstaff < 
-       \type Staff=treble  < 
-                       \global 
-                       \dux
-                       \comes 
-                 >
-       \type Staff=bass  <
-                       \global
-                       \bassdux
-                 >
+  \melodic {
+    \type Grandstaff < 
+      \type Staff = treble < 
+        \global 
+        \dux
+        \comes 
+      >
+      \type Staff = bass <
+        \global
+        \bassdux
+      >
     >
+  }
+
+  \paper {
+    gourlay_maxmeasures = 5.;
+  }
 
-    \paper{
-       gourlay_maxmeasures =5.;
-       
-    }
-    \midi {
-        \tempo 4 = 84;
-    }
+  \midi {
+    \tempo 4 = 84;
+  }
 }
 
 % EOF

diff --git a/tex/Makefile.am.wild b/tex/Makefile.am.wild
index 1bd3e8c8a15477a5a37fa968eb53fae067346c49..f9e538d1403f6c69193154b2167cef745f336cc4 100644 (file)
--- a/tex/Makefile.am.wild
+++ b/tex/Makefile.am.wild
@@ -5,10 +5,10 @@ EXTRA_DIST = Makefile.am.wild $(TEXFILES)
 
 CLEANFILES = $(wildcard feta*.tex)
 
-install-data:
+install-data-local:
        $(INSTALL) -d $(TEXDIR)/lilypond
        $(INSTALL) -m 644 $(TEXFILES) $(TEXDIR)/lilypond/
 
-uninstall-data:
+uninstall-local:
        for i in $(TEXFILES) ; do rm -f $(TEXDIR)/lilypond/$$i; done
        -rmdir $(TEXDIR)/lilypond/