]> git.donarmstrong.com Git - lilypond.git/commitdiff
lilypond-0.1.54
authorfred <fred>
Sun, 24 Mar 2002 20:09:13 +0000 (20:09 +0000)
committerfred <fred>
Sun, 24 Mar 2002 20:09:13 +0000 (20:09 +0000)
78 files changed:
Documentation/introduction.doc
Makefile.am.wild
bin/conflily.in
configure.in
flowertest/GNUmakefile
flowertest/flower-test.hh [new file with mode: 0644]
flowertest/main.cc [new file with mode: 0644]
flowertest/mat-test.cc [new file with mode: 0644]
flowertest/pqtest.cc [new file with mode: 0644]
flowertest/rattest.cc [new file with mode: 0644]
flowertest/stringtest.cc [new file with mode: 0644]
init/table11.ly
init/table13.ly
init/table16.ly
init/table20.ly
init/table26.ly
input/sleur.ly
lily/dynamic-grav.cc
lily/include/main.hh
lily/main.cc
lily/midi-item.cc
lily/midi-stream.cc
lily/performance.cc
lily/slur.cc
lily/tex-stream.cc
mf/feta-slag.mf
mi2mu/include/mi2mu-global.hh
mi2mu/main.cc
mi2mu/mudela-stream.cc
mutopia/Coriolan/Makefile.am.wild [new file with mode: 0644]
mutopia/Coriolan/TODO [new file with mode: 0644]
mutopia/Coriolan/clarinetti-part.ly [new file with mode: 0644]
mutopia/Coriolan/clarinetti.ly [new file with mode: 0644]
mutopia/Coriolan/clarinetto-1.ly [new file with mode: 0644]
mutopia/Coriolan/clarinetto-2.ly [new file with mode: 0644]
mutopia/Coriolan/contrabasso.ly [new file with mode: 0644]
mutopia/Coriolan/coriolan.ly [new file with mode: 0644]
mutopia/Coriolan/corni-part.ly [new file with mode: 0644]
mutopia/Coriolan/corni.ly [new file with mode: 0644]
mutopia/Coriolan/corno-1.ly [new file with mode: 0644]
mutopia/Coriolan/corno-2.ly [new file with mode: 0644]
mutopia/Coriolan/fagotti-part.ly [new file with mode: 0644]
mutopia/Coriolan/fagotti.ly [new file with mode: 0644]
mutopia/Coriolan/fagotto-1.ly [new file with mode: 0644]
mutopia/Coriolan/fagotto-2.ly [new file with mode: 0644]
mutopia/Coriolan/flauti-part.ly [new file with mode: 0644]
mutopia/Coriolan/flauti.ly [new file with mode: 0644]
mutopia/Coriolan/flauto-1.ly [new file with mode: 0644]
mutopia/Coriolan/flauto-2.ly [new file with mode: 0644]
mutopia/Coriolan/global.ly [new file with mode: 0644]
mutopia/Coriolan/music [new file with mode: 0644]
mutopia/Coriolan/oboe-1.ly [new file with mode: 0644]
mutopia/Coriolan/oboe-2.ly [new file with mode: 0644]
mutopia/Coriolan/oboi-part.ly [new file with mode: 0644]
mutopia/Coriolan/oboi.ly [new file with mode: 0644]
mutopia/Coriolan/timpani.ly [new file with mode: 0644]
mutopia/Coriolan/trombe-part.ly [new file with mode: 0644]
mutopia/Coriolan/trombe.ly [new file with mode: 0644]
mutopia/Coriolan/trombo-1.ly [new file with mode: 0644]
mutopia/Coriolan/trombo-2.ly [new file with mode: 0644]
mutopia/Coriolan/viola.ly [new file with mode: 0644]
mutopia/Coriolan/violino-1.ly [new file with mode: 0644]
mutopia/Coriolan/violino-2.ly [new file with mode: 0644]
mutopia/Coriolan/violoncello.ly [new file with mode: 0644]
mutopia/J.S.Bach/Makefile.am.wild
mutopia/J.S.Bach/preludes-1.ly
mutopia/J.S.Bach/preludes-2.ly
mutopia/J.S.Bach/preludes-4.ly
mutopia/J.S.Bach/preludes-5.ly
mutopia/Makefile.am.wild
mutopia/los-toros-oboe.ly
test/Makefile.am.wild [new file with mode: 0644]
test/check-lily-midi.sh [new file with mode: 0644]
test/check-lily-paper.sh [new file with mode: 0644]
test/check-mi2mu.sh [new file with mode: 0644]
test/ok.ly [new file with mode: 0644]
test/ok.tex [new file with mode: 0644]
tex/lilyponddefs.tex

index 05fdfff7160d9cf9706312fb94c4803f61b7a516..1af131b13fa905f1792f33bfdb3db7aede71e395 100644 (file)
 %   mudela-book --outdir=out/ --outname=introduction.mudtex introduction.doc
 %   latex '\nonstopmode \input out/introduction.mudtex'
 
+% Hoi Tim, hier staan wat 'enge' commando's (die dingen met een '\'
+% zoals \documentclass en \def\mudela...).
+% Daar moet je je niets van aantrekken, ga gewoon naar Introduction
+% en begin te tiepen.
 
 \documentclass{article}
 \usepackage{a4wide}
index f3651acb950b29223cc0d7cc7d7965556ccbb703..97c5d507e1191be99e3b70858f7aef47111be621 100644 (file)
@@ -1,7 +1,7 @@
 # title           top level makefile for LilyPond  
 # file    Makefile.am.wild
 
-SUBDIRS = bin flower flowertest lib lily mf mi2mu debian\
+SUBDIRS = bin flower flowertest lib lily mf mi2mu test debian\
        Documentation init input tex make mutopia
 
 SCHRIFTEN = configure configure.in install-sh aclocal.m4
index 3b42fc3ebc11dfa98266e8df88caae829aa4cb05..2eab5a059eea65eccfad3c44bc7f178c2651ae0f 100644 (file)
@@ -22,9 +22,6 @@ current=`basename \`pwd\``
 echo ln -s $lelie/$current $lelie/current
 ln -s $lelie/$current $lelie/current
 
-ln -sf $lelie/current/lily/lilypond bin/lilypond
-ln -sf $lelie/current/mi2mu/mi2mu bin/mi2mu
-
 if [ "x$LILYINCLUDE" = "x" ]; then
        echo you should make add the following to your login script
        echo "export LILYINCLUDE=$lelie/current/init:$lelie/current/mutopia:$lelie/current/input:$lelie/current/mutopia/J.S.Bach:"
@@ -32,7 +29,9 @@ if [ "x$LILYINCLUDE" = "x" ]; then
        echo "export MFINPUTS=$MFINPUTS:$lelie/current/mf"
 fi
 
-mkdir -f ../build
+mkdir -p ../build
 (cd ../build; 
+ln -sf $lelie/build/lily/lilypond bin/lilypond
+ln -sf $lelie/build/mi2mu/mi2mu bin/mi2mu
 ../current/configure --prefix=/usr --enable-debugging --enable-printing --enable-checking)
 
index 5a1c64b911e1a0a4222ebd741c6061d798229457..b6a41c2f66963ee56075fc728815ea77e13ef5e7 100644 (file)
@@ -256,7 +256,8 @@ AC_OUTPUT(bin/Makefile flower/Makefile flower/include/Makefile
        lily/Makefile lily/include/Makefile mf/Makefile mi2mu/Makefile
        mi2mu/include/Makefile debian/Makefile Documentation/Makefile
        init/Makefile input/Makefile tex/Makefile make/Makefile
-       mutopia/Makefile mutopia/J.S.Bach/Makefile Makefile 
+       mutopia/Makefile mutopia/J.S.Bach/Makefile mutopia/Coriolan/Makefile
+       test/Makefile Makefile 
        bin/add-URLs bin/clean-diaper bin/clean-embeds bin/clean-fonts 
        bin/conflily bin/convert-mudela bin/cvm bin/find-typenames bin/foo 
        bin/genheader bin/ly2dvi bin/make-docxx bin/make-examples 
index 7026cec1e8efbd97dd70ab3209238c1446c1b3d0..c588cc6fbc157ec7e59a73585a8bac0abf28e17a 100644 (file)
@@ -1,4 +1,4 @@
-# flower/test/GNUmakefile
+# flowertest/GNUmakefile
 #
 # This file helps maintainers to keep their Makefile.am automatically
 # up to date using GNU make features.
diff --git a/flowertest/flower-test.hh b/flowertest/flower-test.hh
new file mode 100644 (file)
index 0000000..b5bde0f
--- /dev/null
@@ -0,0 +1,46 @@
+/*
+  flower-test.hh -- declare 
+
+  source file of the Flower Library
+
+  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+*/
+
+
+#ifndef FLOWER_TEST_HH
+#define FLOWER_TEST_HH
+#include <iostream.h>
+
+#define ADD_TEST(f) \
+struct f ## Init {\
+    f ## Init () { reg_test(f); }\
+} f ## init\
+
+typedef void (*fptr)(void);
+
+void reg_test (fptr f);
+
+#endif // FLOWER_TEST_HH
+/*
+  flower-test.hh -- declare 
+
+  source file of the Flower Library
+
+  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+*/
+
+
+#ifndef FLOWER_TEST_HH
+#define FLOWER_TEST_HH
+#include <iostream.h>
+
+#define ADD_TEST(f) \
+struct f ## Init {\
+    f ## Init () { reg_test(f); }\
+} f ## init\
+
+typedef void (*fptr)(void);
+
+void reg_test (fptr f);
+
+#endif // FLOWER_TEST_HH
diff --git a/flowertest/main.cc b/flowertest/main.cc
new file mode 100644 (file)
index 0000000..26aaf3c
--- /dev/null
@@ -0,0 +1,21 @@
+#include "flower-test.hh"
+#include "varray.hh"
+
+Array< fptr > *test_arr_p;
+
+void reg_test (fptr f)
+{
+ if (!test_arr_p)
+  test_arr_p = new Array<fptr>;
+ test_arr_p->push (f);
+}
+
+int
+main ()
+{
+ if (test_arr_p)
+   {
+     for (int i=0; i < test_arr_p->size (); i++)
+       (*test_arr_p)[i] ();
+   }
+}
diff --git a/flowertest/mat-test.cc b/flowertest/mat-test.cc
new file mode 100644 (file)
index 0000000..1ad7af4
--- /dev/null
@@ -0,0 +1,64 @@
+/*
+  mat-test.cc -- test Matrix
+
+  source file of the Flower Library
+
+  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+*/
+
+#include <iostream.h>
+#include "matrix.hh"
+#include "string.hh"
+#include "flower-test.hh"
+#include "choleski.hh"
+
+void
+matrix()
+{
+  int N=10;
+  Matrix m(N,N), q(N,N);
+  Vector v(N);
+
+  for (int i=0; i < N; i++) {
+    v(i) =i;
+    for (int j=0; j < N; j++) {
+      m(i,j) = i+j;
+      q(i,j) = (abs(i-j) > 3) ?0 :i-j;
+    }
+  }
+
+  cout << "v: " << String(v);
+  cout << "m: " <<  String(m );
+  cout << "q: " <<  String(q);
+  cout << "m*q; " <<  String(m*q);
+  cout << "m*m: " <<  String(m*m);
+  m.OK();
+  cout << "m: " <<  String(m);
+  cout << "q.band " << q.band_i() << endl; 
+  q.try_set_band();
+  cout << "q(B): " << q;
+  q.OK();
+  Matrix sum(q+q);
+  cout << "q + q " << sum;
+  q.OK();
+  cout << "q*q: " << q*q;
+  q.OK();
+
+  Matrix hilbert(N,N), h2(hilbert);
+  for (int i=0; i < N; i++) {
+    for (int j=0; j < N; j++) {
+      hilbert(i,j) = 1/Real(i+j+1);
+      h2 (i,j) = (abs(i-j) > 3) ?0 : hilbert(i,j);
+    }
+  }
+  h2.try_set_band();
+  Choleski_decomposition ch(h2);
+  cout << "red Hilbert  " <<  h2;
+  cout << "choleski " << ch.L;
+  Matrix T =ch.L.transposed();
+  cout << "L^T " <<  T;
+  cout << "L * L^T" << ch.L * T;
+  cout << "H2^{-1} * H2" << h2 * ch.inverse();
+}
+
+ADD_TEST(matrix);
diff --git a/flowertest/pqtest.cc b/flowertest/pqtest.cc
new file mode 100644 (file)
index 0000000..ea28bcb
--- /dev/null
@@ -0,0 +1,26 @@
+#include "flower-test.hh"
+#include "pqueue.hh"
+#include <stdlib.h>
+
+int compare (int i, int j)
+{
+  return i-j;
+}
+
+void
+pqtest ()
+{
+  PQueue<int> pq;
+
+  for  (int i=0; i < 10; i++) {
+    int r = rand ()/10000;
+    pq.insert (r);
+    cout << "adding: " << r<< endl;
+  }
+  while  (pq.size ()) {
+    cout << "getting : "<< flush;
+    cout << pq.get () << "\n";
+  }
+}
+
+ADD_TEST (pqtest);
diff --git a/flowertest/rattest.cc b/flowertest/rattest.cc
new file mode 100644 (file)
index 0000000..64cc51e
--- /dev/null
@@ -0,0 +1,39 @@
+#include <iostream.h>
+#include "rational.hh"
+#include "flower-test.hh"
+#include "string.hh"
+
+
+#define EXP_PRINT(a) #a << ": " << (a) << "\n"
+
+void
+rattest ()
+{
+  Rational r (1,4);
+  Rational q(1,2);
+  Rational s(6,4);
+  Rational i;
+  i.set_infinite (1);
+
+  cout << r << " " << s << " " << q << "\n";
+  cout << r + q << " " << (s * q + s) << " " << (q / r) << "\n";
+  cout << i;
+  cout << "inf * r" << i * r << "inf * inf " << i * i << "inf + r" << i + r;
+  cout << EXP_PRINT(-i);
+  cout << EXP_PRINT(i >? -i) << EXP_PRINT(i >? r);
+  cout << EXP_PRINT(i <? r) ;
+  Rational one(1);
+  cout << EXP_PRINT(one/Rational (4));
+  cout << EXP_PRINT(one + one/Rational (4));
+  Rational nul (0,1);
+  Rational kwart (1,4);
+  nul += kwart;
+  cout << EXP_PRINT(nul);
+  nul -= Rational (2) * kwart;
+  cout << EXP_PRINT(nul);
+
+  cout << EXP_PRINT(Rational (1,128)  + Rational (1919,128));
+
+}
+
+ADD_TEST (rattest);
diff --git a/flowertest/stringtest.cc b/flowertest/stringtest.cc
new file mode 100644 (file)
index 0000000..4597ff3
--- /dev/null
@@ -0,0 +1,144 @@
+/*
+  stupid test program to verify stringlib
+  stringtest.cc
+  */
+#include "string.hh"
+#include "varray.hh"
+#include "string-convert.hh"
+#include "flower-test.hh"
+
+void
+ctors ()
+{
+  cout << "constructors"<<endl;
+  {
+    String str ("hai");
+    cout << str << endl;
+  }
+  {
+    String fromi (10);
+    cout << fromi<< endl;
+  }
+  {String fromf (1.32e-2, "%g");
+  cout << fromf<< endl;
+  }
+  {
+    String def;
+    cout << def << endl;
+  }
+  {
+    String fromc ('c');
+    cout << fromc<< endl;       
+  }
+}
+void
+cmp ()
+{
+  
+  String path  = "";
+  String sep ('/');
+  String right(path.right_str (1));
+  cout << "cmp ('', '/'): " << String::compare_i (sep,right) << endl;
+  
+  Array<String> a;
+  a.push ("abcd");
+  a.push ("zxy");
+  a.push ("abc");
+  a.push ("");
+  a.push  ("a");
+  a.sort (String::compare_i);
+  cout << "compares: "<<endl;
+  for  (int i=0; i < a.size (); i++)
+    cout << a[i] << endl;
+}
+
+
+void
+searching ()
+{
+  String hay = "foobarbazblub";
+
+  char c =   'b';
+  String cstr =c;
+  String set = "bar";
+  cout << "hay = \"" << hay << "\" len="<< hay.length_i ()<<endl;
+  cout << "index_i ('"<< c<<"') " << c << "= " << hay.index_i (c) <<endl;
+  cout << "last_index_i ('"<< c<<"') " << c << "= " << hay.index_last_i (c) <<endl;    
+  //    cout << "last index of cstr " << c << ": " << hay.index_last_i (cstr) <<endl;    
+  //    cout << "index_last_i (\""<<set<<"\"): " << hay.index_last_i (set) <<endl;
+  cout << "index_i (\""<<set<<"\"): " << hay.index_i (set) <<endl;    
+  cout << "index_any (\"" << set << "\"): " << cstr << ": " << hay.index_any_i (cstr) <<endl;
+
+    
+    
+}
+
+
+void
+kutenpeer ()
+{
+  String str ("hai");
+  for  (int i=-1; i < str.length_i ()+2; i++) {
+    cout<<" left_str (" << i<<"): " << str.left_str (i) << endl;
+    cout<<" right_str ("<<i<<"): " << str.right_str (i) << endl;
+  }
+  str = "blonde haren";
+  cout << str<<endl;
+  cout << "mid (2,6)="<<str.cut (2,6)<<endl;
+  cout << "nomid (2,6)="<<str.nomid_str (2,6)<<endl;
+}
+
+bool
+test_empty_b (String str)
+{
+  cout << "`" << str << "' is ";
+
+  if  (str == String ("")) {
+    cout << "empty" << endl;
+    return true;
+  }
+
+  cout << "not empty" << endl;
+  return false;
+}
+
+void
+stringtest ()
+{
+  ctors ();
+  cmp ();
+  searching ();
+  kutenpeer ();
+  String str ("hai");
+  cout <<  str << endl;
+  cout << "left" << endl;
+  str += " daar";
+  cout << str << endl;
+
+  //    str = String ("Hallo") + " daaR" + '!'; // no go on doze-s gcc2.7.2?
+  str = String ("Hallo") + " daaR" + "!";
+  cout << str << endl;
+
+  cout << "up: " << str.upper_str () << " down: " << str.lower_str ()<<endl;
+    
+  if  (test_empty_b (str))
+    cout << "failed";
+
+  String fn = "";
+  if  (!test_empty_b (fn))
+    cout << "failed";
+
+    
+  fn = "";
+  fn += "";
+  delete fn.copy_byte_p ();
+  delete str.copy_byte_p ();
+
+  cout << String_convert::bin2hex_str (String ( (char)0xff)) << endl;
+  cout << "-1:" << String_convert::i2hex_str (-1, 2, '0');
+  cout << endl;
+
+}
+
+
+ADD_TEST (stringtest);
index ba026be641e2553234cb92a7cbcb40110b5a0c9a..e2ed20408527cfdd4419baf1980b3dab8fa0b417 100644 (file)
@@ -11,10 +11,12 @@ table_eleven  = \symboltables {
     % index TeXstring,         xmin xmax ymin ymax
 
      "style" = \table {
-               "roman" "\settext{%}"   0.0\pt  7.5\pt  0.0\pt  10.0\pt
-               "italic"        "\setitalic{%}" 0.0\pt  0.0\pt  0.0\pt  10.0\pt
+               "bold"  "\setbold{%}"   0.0\pt  7.50\pt 0.0\pt  8.0\pt
                "dynamic"       "\setdynamic{%}"        0.0\pt  0.0\pt  0.0\pt  10.0\pt
                "finger"        "\setfinger{%}" 0.0\pt  0.0\pt  0.0\pt  5.0\pt
+               "italic"        "\setitalic{%}" 0.0\pt  0.0\pt  0.0\pt  10.0\pt
+               "large" "\setlarge{%}"  0.0\pt  9.50\pt 0.0\pt  12.0\pt
+               "roman" "\settext{%}"   0.0\pt  7.5\pt  0.0\pt  10.0\pt
      }
 
      "dynamics" = \table {
index 1969e3974ca7af30e250061dde645c2b562e11e1..757778437f7a38ca398b3bb60db752e6193d10c3 100644 (file)
@@ -11,10 +11,12 @@ table_thirteen  = \symboltables {
     % index TeXstring,         xmin xmax ymin ymax
 
      "style" = \table {
-               "roman" "\settext{%}"   0.0\pt  7.5\pt  0.0\pt  10.0\pt
-               "italic"        "\setitalic{%}" 0.0\pt  0.0\pt  0.0\pt  10.0\pt
+               "bold"  "\setbold{%}"   0.0\pt  7.50\pt 0.0\pt  8.0\pt
                "dynamic"       "\setdynamic{%}"        0.0\pt  0.0\pt  0.0\pt  10.0\pt
                "finger"        "\setfinger{%}" 0.0\pt  0.0\pt  0.0\pt  5.0\pt
+               "italic"        "\setitalic{%}" 0.0\pt  0.0\pt  0.0\pt  10.0\pt
+               "large" "\setlarge{%}"  0.0\pt  9.50\pt 0.0\pt  12.0\pt
+               "roman" "\settext{%}"   0.0\pt  7.5\pt  0.0\pt  10.0\pt
      }
 
      "dynamics" = \table {
index d9680a0f193932ed4e416f658911e355888cbd42..83f0e3c9bb0bcb228fe4777287b6dcb025e15f04 100644 (file)
@@ -12,11 +12,11 @@ table_sixteen=
 
      "style" = \table {
                "bold"  "\setbold{%}"   0.0\pt  7.50\pt 0.0\pt  8.0\pt
-%              "roman" "\settext{%}"   0.0\pt  7.50\pt 0.0\pt  8.0\pt
-               "roman" "\settext{%}"   0.0\pt  9.50\pt 0.0\pt  8.0\pt
-               "italic"        "\setitalic{%}" 0.0\pt  0.0\pt  0.0\pt  8.0\pt
                "dynamic"       "\setdynamic{%}"        0.0\pt  0.0\pt  0.0\pt  8.0\pt
                "finger"        "\setfinger{%}" 0.0\pt  0.0\pt  0.0\pt  4.0\pt
+               "italic"        "\setitalic{%}" 0.0\pt  0.0\pt  0.0\pt  8.0\pt
+               "large" "\setlarge{%}"  0.0\pt  9.50\pt 0.0\pt  10.0\pt
+               "roman" "\settext{%}"   0.0\pt  7.50\pt 0.0\pt  8.0\pt
      }
      "dynamics" = \table {
        "mf" "\dynmf"
index 73f43265040523c48998b70c98b6fd7b00926bd1..597cbe0ef3e8c20c102319d36e1b5124473d4379 100644 (file)
@@ -13,10 +13,11 @@ table_twenty =
 
      "style" = \table {
                "bold"  "\setbold{%}"   0.0\pt  7.50\pt 0.0\pt  8.0\pt
-               "roman" "\settext{%}"   0.0\pt  7.5\pt  0.0\pt  10.0\pt
-               "italic"        "\setitalic{%}" 0.0\pt  0.0\pt  0.0\pt  10.0\pt
                "dynamic"       "\setdynamic{%}"        0.0\pt  0.0\pt  0.0\pt  10.0\pt
                "finger"        "\setfinger{%}" 0.0\pt  0.0\pt  0.0\pt  5.0\pt
+               "italic"        "\setitalic{%}" 0.0\pt  0.0\pt  0.0\pt  10.0\pt
+               "large" "\setlarge{%}"  0.0\pt  9.50\pt 0.0\pt  12.0\pt
+               "roman" "\settext{%}"   0.0\pt  7.5\pt  0.0\pt  10.0\pt
      }
 
      "dynamics" = \table {
index 047015cc43e2c5735a2bd6e44499f4d3524cc529..ace2e1026e85c9aafa3481bf9b2a7d5e1db6a274 100644 (file)
@@ -11,10 +11,12 @@ table_twentysix  = \symboltables {
     % index TeXstring,         xmin xmax ymin ymax
 
      "style" = \table {
-               "roman" "\settext{%}"   0.0\pt  7.5\pt  0.0\pt  10.0\pt
-               "italic"        "\setitalic{%}" 0.0\pt  0.0\pt  0.0\pt  10.0\pt
+               "bold"  "\setbold{%}"   0.0\pt  7.50\pt 0.0\pt  8.0\pt
                "dynamic"       "\setdynamic{%}"        0.0\pt  0.0\pt  0.0\pt  10.0\pt
                "finger"        "\setfinger{%}" 0.0\pt  0.0\pt  0.0\pt  5.0\pt
+               "italic"        "\setitalic{%}" 0.0\pt  0.0\pt  0.0\pt  10.0\pt
+               "large" "\setlarge{%}"  0.0\pt  9.50\pt 0.0\pt  12.0\pt
+               "roman" "\settext{%}"   0.0\pt  7.5\pt  0.0\pt  10.0\pt
      }
 
      "dynamics" = \table {
index a0c895286c6b684a41139e3393f790d6a47de5f2..0f53a82adca8923e543f5f237109fcaefe8a94ea 100644 (file)
@@ -27,10 +27,11 @@ complex = \melodic{
 }
 
 beum = \melodic{
+       \octave c'; 
        [c8 c] c4 c4 c4 |
 }
 
-extend = {
+extend = \melodic{
          c8(( c c )c c c c )c |
          \[4/5c8( c c' c )c\]1/1 c c c c |
          \[4/5c8( c c c c'\]1/1 c c c )c |
@@ -41,19 +42,32 @@ extend = {
          \[4/5c8( c ''c c c\]1/1 c c c )c |
 }
 
+extendbug = \melodic{
+       \octave c'; 
+       c4( c' c' )c
+       \stemup c'4( \stemdown e e \stemboth )c'
+       [c'8( b g a] [c' d' e' c'] [c' d' e' )c']
+       c( c' c' )c
+       e( g' g' )e
+}
+
 \score{
        \melodic{ 
                \shortlong
                \dirs
                \complex
                \beum
+               \octave c'; 
                \stemup; 
-               \octave c''; 
                \extend
+               \octave c''; 
                \stemdown; 
-               \octave c'; 
                \extend
+               \stemboth;
+               \extendbug
+       }
+       \paper{ 
+%              castingalgorithm = \Wordwrap;
        }
-       \paper{ }
 }
 
index 39523900425f9cf8c5a0e25fe4ecede3fd2efa0b..44580b64bac24a9d7d18d042f343eff41b1e063f 100644 (file)
@@ -44,7 +44,13 @@ Dynamic_engraver::do_try_request (Request * r)
   if (cresc_p_ && d->span_dynamic ()
       && d->span_dynamic ()->spantype == Span_req::START)
     return false;
-  
+  if (d->absdynamic ())
+    {
+      for (int i=0; i < dynamic_req_l_arr_.size (); i++)
+       if (d->equal_b (dynamic_req_l_arr_[i]))
+         return true;
+    }
+
   dynamic_req_l_arr_.push (m->dynamic());
   return true;
 }
@@ -161,9 +167,12 @@ Dynamic_engraver::acknowledge_element (Score_elem_info i)
 {
   if (i.elem_l_->is_type_b (Note_column::static_name ()))
     {
-      if (dynamic_p_) dynamic_p_->add_support (i.elem_l_);
+      if (dynamic_p_)
+       dynamic_p_->add_support (i.elem_l_);
+
       if (to_end_cresc_p_)
        to_end_cresc_p_->add_support (i.elem_l_);
+
       if (cresc_p_)
        cresc_p_->add_support (i.elem_l_);
     }
index 5ca8f5ad8c719b7fcb4718b7da8ec50c7ac38b6b..c966f37591568bf01b906c3883e2b81f0072be1e 100644 (file)
@@ -21,6 +21,7 @@ String get_version_number_str();
 void call_constructors ();
 extern Sources* source_global_l;
 extern bool no_paper_global_b;
+extern bool no_timestamps_global_b;
 extern int exit_status_i_;
 extern bool experimental_features_global_b;
 extern bool postscript_global_b;
index 66ae3e649caa4310bf7dfa982096ee63c1b82214..dc66e42aa207b62b82741e4454290e50cf382b41 100644 (file)
@@ -24,6 +24,7 @@
 static bool version_ignore_b = false;
 Sources* source_global_l = 0;
 bool no_paper_global_b = false;
+bool no_timestamps_global_b = false;
 
 bool experimental_features_global_b = false;
 bool postscript_global_b = true;
@@ -41,6 +42,7 @@ Long_option_init theopts[] = {
   {1, "include", 'I'},
   {0, "no-paper", 'M'},
   {0, "no-postscript", 'P'},
+  {0, "no-timestamps", 'T'},
   {0, "ignore-version", 'V'},
   {0,0,0}
 };
@@ -63,6 +65,7 @@ usage ()
     "  -M, --no-paper         produce midi output only\n"
     "  -V, --ignore-version   ignore mudela version\n"
     "  -P, --no-postscript    don't use PostScript\n"
+    "  -T, --no-timestamps    don't timestamp the output\n"
     "\n"
     "GNU LilyPond was compiled with the following settings:\n")
 #ifdef NDEBUG
@@ -217,6 +220,9 @@ main (int argc, char **argv)
        case 'M':
          no_paper_global_b = true;
          break;
+       case 'T':
+         no_timestamps_global_b = true;
+         break;
        default:
          assert (false);
          break;
index 36ba0668b9f1eaa35c85b6adcbbc51e693a540c8..05f0be08a1db8a7658f12d9f0e8241eb83a7f222 100644 (file)
@@ -56,9 +56,12 @@ Midi_chunk::str () const
 {
   String str = header_str_;
   String dat = data_str ();
+#if 1 
+  String length_str = String_convert::i2hex_str (dat.length_i () 
+#else
   // huh, huh??
-//  String length_str = String_convert::i2hex_str (dat.length_i () 
   String length_str = String_convert::i2hex_str (data_str_.length_i () 
+#endif
     + footer_str_.length_i (), 8, '0');
   length_str = String_convert::hex2bin_str (length_str);
   str += length_str;
index efc244c5de69538a56b997c85f5be076d2ce8112..a9abaa677b75d65684e9be4df9a47ffc8d02a016 100644 (file)
@@ -1,12 +1,11 @@
 //
-// midistream.cc
+// midi-stream.cc
 //
 // source file of the GNU LilyPond music typesetter
 //
 // (c) 1997 Jan Nieuwenhuizen <jan@digicash.com>
 
 #include <fstream.h>
-#include <time.h>
 #include "string.hh"
 #include "string-convert.hh"
 #include "main.hh"
index aaf926965fe23b07d779a40bd3239bd1a204cf3b..8a6d3c79876cb5ffacde3144ba9ff203a0163dad 100644 (file)
@@ -1,5 +1,5 @@
 /*
-  audio-score.cc -- implement Performance
+  performance.cc -- implement Performance
 
   source file of the GNU LilyPond music typesetter
 
@@ -49,18 +49,26 @@ Performance::output_header_track (Midi_stream& midi_stream_r)
 {
   Midi_track midi_track;
 
-  time_t t = time (0);
-
   // perhaps multiple text events?
-  String str = String (_("Creator: ")) + get_version_str() + "\n";
+  String str = String (_("Creator: "));
+  if (no_timestamps_global_b)
+    str += "GNU LilyPond\n";
+  else
+      str += get_version_str() + "\n";
 
   Midi_text creator (Midi_text::TEXT, str);
   midi_track.add (Moment (0), &creator);
 
-  str = _("Automatically generated at ");
-  str += ctime (&t);
-  str = str.left_str (str.length_i() - 1);
-  str += "\n";
+  str = _("Automatically generated");
+  if (no_timestamps_global_b)
+    str += ".\n";
+  else
+    {
+      str += _(", at ");
+      time_t t (time (0));
+      str += ctime (&t);
+      str = str.left_str (str.length_i() - 1);
+    }
   Midi_text generate (Midi_text::TEXT, str);
   midi_track.add (Moment (0), &generate);
 
index f8142f23ee55a6a9a7c07df59385594ed3cc03ff..e1a8cf926bf8d9cdd0bfeb97cd8c8fe7c63ef5e2 100644 (file)
@@ -143,33 +143,34 @@ Slur::height_f () const
   Real nh_f = interline_f / 2;
   Real h = 0;
   Real dx = width ().length ();
-  Real dy = dy_f_drul_[RIGHT] - dy_f_drul_[LEFT];
+//  Real dy = (dy_f_drul_[RIGHT] - dy_f_drul_[LEFT]) * nh_f;
+  Real dy = (dy_f_drul_[RIGHT] - dy_f_drul_[LEFT]);
   Stem* stem = encompass_arr_[0]->stem_l_;
   Real lx = stem->hpos_f ();
-  Real centre = (width ().min () + width ().max ()) / 2;
+  Real centre = (width ().min () + width ().max ()) / 2 + lx;
   Real ly = stem->dir_ == dir_ ? stem->stem_end_f () : stem->stem_begin_f () 
-    + dir_ * nh_f / 2;
+    + dir_ * 0.5;
+  ly *= nh_f;
   for (int i = 0; i < encompass_arr_.size (); i++) 
     {
-      Stem* stem = encompass_arr_[i]->stem_l_;
-      Real sx = abs (centre - stem->hpos_f ());
-      Real sy = stem->dir_ == dir_ ? stem->stem_end_f () 
-        : stem->stem_begin_f () + dir_ * nh_f / 2;
-      sy = dir_ * (sy - (ly + ((stem->hpos_f () - lx) / dx) * dy));
+      Stem* s = encompass_arr_[i]->stem_l_;
+      Real sx = abs (centre - s->hpos_f ());
+      Real stemy = s->dir_ == dir_ ? s->stem_end_f () : s->stem_begin_f () + dir_ * 0.5;
+      stemy *= nh_f;
+      Real sy = dir_ * (stemy - (ly + ((s->hpos_f () - lx) / dx) * dy));
       /*
         uhm, correct for guess bezier curve (more if further from centre)
         forget the cos alpha...
        */
-      if (sy > 0)
-       h = h >? sy * (1 + 2 * sx / dx);
+      if (sy > 0.5 * nh_f)
+       h = h >? (sy * (1 + 2 * sx / dx))*(1 + abs (dy)/32);
     }
-  Real ratio = 1.0/3; // duh
-  /* 
-    correct h for slur ratio
-   */
-  Real staffheight = paper ()->get_var ("barsize");
-  if (h)
-    h *= ((h * interline_f) / dx ) / ratio;
+    if ( h < nh_f )
+      return 0;
+  h *= h/(dx*dx*dx);
+//  h *= 32;
+//  h *= h;
+  h *= 40000;
   return h;
 }
 
index d861e6ecdee72dea2af673b50f155546dbc700bd..ed8ef91a53c8515a1a9ce5e9853e2c717f87da7e 100644 (file)
@@ -30,11 +30,22 @@ Tex_stream::Tex_stream (String filename)
 void
 Tex_stream::header()
 {
-  *os << _("% Creator: ") << get_version_str() << "\n";
-  *os << _("% Automatically generated, at ");
-  time_t t (time (0));
-  *os << ctime (&t) << "%\n";
+  *os << _("% Creator: ");
+  if (no_timestamps_global_b)
+    *os << "GNU LilyPond\n";
+  else
+    *os << get_version_str() << "\n";
+  *os << _("% Automatically generated");
+  if (no_timestamps_global_b)
+    *os << ".\n";
+  else
+    {
+      *os << _(", at ");
+      time_t t (time (0));
+      *os << ctime (&t) << "%\n";
+    }
 }
+
 Tex_stream::~Tex_stream()
 {
   *os << flush;
index 7d9ea0b295d1b4306a44d42c89baa20d44d1fedd..2f0e762b4d064c64f77d3490b6b4fb0eb247a348 100644 (file)
@@ -9,8 +9,7 @@
 
 % this file is included by feta-scripts.mf
 
-% tfat := 0.3;
-tfat := 1/3;
+tfat := 1/2;
 twidth# := 0.5interline#;
 theight# := 0.55interline#;
 % tthin# := stafflinethickness#;
@@ -27,7 +26,8 @@ def draw_trillelement =
        pickup pencircle scaled tthin;
        
        lft x1 = -twidth;
-       x3 = -tfat*twidth;
+%      x3 = -1/3*twidth;
+       x3 = -0.3*twidth;
        top y3 = theight;
 
        z3 - z1 = whatever * (0.5twidth, theight);
@@ -121,8 +121,10 @@ fet_beginchar("upprall", "upprall", "upprall")
 %      trills := 4;
        trills := 3;
        set_char_box(trills*twidth#-(trills-1)*0.5toverlap#, trills*twidth#-(trills-1)*0.5toverlap#, theight#, theight#);
-       draw_slur(-2twidth#,-2theight#,-1);
-       currentpicture := currentpicture shifted (-0.5w+tthin,-tfat*theight+0.5tthin);
+%      draw_slur(-2twidth#,-2theight#,-1);
+%      currentpicture := currentpicture shifted (-0.5w+tthin,-tfat*theight+0.75tthin);
+       draw_slur(0,-2theight#,-1);
+       currentpicture := currentpicture shifted (-0.5w+1.3tthin,-tfat*theight+1.5tthin);
 %      draw_trill_four;
        draw_trill_three;
 fet_endchar;
@@ -130,8 +132,9 @@ fet_endchar;
 fet_beginchar("downprall", "downprall", "downprall")
        trills := 3;
        set_char_box(trills*twidth#-(trills-1)*0.5toverlap#, trills*twidth#-(trills-1)*0.5toverlap#, theight#, theight#);
-       draw_slur(-2twidth#,2theight#,1);
-       currentpicture := currentpicture shifted (-0.5w+tthin,-tfat*theight+0.5tthin);
+%      draw_slur(-2twidth#,2theight#,1);
+       draw_slur(0,2theight#,1);
+       currentpicture := currentpicture shifted (-0.5w+tthin,-tfat*theight+0.75tthin);
        draw_trill_three;
 fet_endchar;
 
index cb577d0bdfc4aba2a6d41dac3f292a646b2a4d29..005870af7d6488bff91d489619d2b6dc57f33da0 100644 (file)
@@ -27,6 +27,7 @@ void warning (String message_str); //, char const* context_ch_C);
 void error (String message_str); //, char const* context_ch_C);
 
 String mi2mu_version_str();
+extern bool no_timestamps_b_g;;
 
 #endif // MI2MU_GLOBAL_HH
 
index d12b3f3dcc95a9b882631eb6b2fe8d41624c568f..7f89342476ce3df368a0bd6d18b204335bd45f60 100644 (file)
@@ -23,6 +23,8 @@ String filename_str_g;
 // ugh
 Mudela_score* mudela_score_l_g = 0;
 
+bool no_timestamps_b_g = false;
+
 Sources source;
 
 static File_path path;
@@ -46,6 +48,7 @@ usage()
   "  -o, --output=FILE      set FILE as default output\n"
   "  -p, --no-plets         assume no plets\n"
   "  -q, --quiet            be quiet\n"
+  "  -T, --no-timestamps    don't timestamp the output\n"
   "  -s, --smallest=N       assume no shorter (reciprocal) durations than N\n"
   "  -v, --verbose          be verbose\n"
   "  -w, --warranty         show warranty and copyright\n"
@@ -100,6 +103,7 @@ main (int argc_i, char* argv_sz_a[])
        {0, "no-plets", 'p'},
        {0, "quiet", 'q'},
        {1, "smallest", 's'},
+       {0, "no-timestamps", 'T'},
        {0, "verbose", 'v'},
        {0, "warranty", 'w'},
        {0, "no-double-dots", 'x'},
@@ -148,6 +152,9 @@ main (int argc_i, char* argv_sz_a[])
        case 'q':
            level_ver = QUIET_ver;
            break;
+       case 'T':
+           no_timestamps_b_g = true;
+           break;
        case 's':
          {
                int i = String_convert::dec2_i (getopt_long.optional_argument_ch_C_);
index d54b9cea57bcabb1d6ef22e681a9a196bab57df5..42ba6695c3a46c2a5618535fa8d92ecc8bfc6548 100644 (file)
@@ -71,10 +71,20 @@ Mudela_stream::handle_pending_indent()
 void
 Mudela_stream::header()
 {
-  *os_p_ << _("% Creator: ") << mi2mu_version_str() << "\n";
-  *os_p_ << _("% Automatically generated, at ");
-  time_t t (time (0));
-  *os_p_ << ctime (&t);
+  *os_p_ << _("% Creator: ");
+  if (no_timestamps_b_g)
+    *os_p_ << "GNU LilyPond\n"; 
+  else
+    *os_p_ << mi2mu_version_str() << "\n";
+  *os_p_ << _("% Automatically generated");
+  if (no_timestamps_b_g)
+    *os_p_ << ".\n";
+  else
+    {
+      *os_p_ << _(", at ");
+      time_t t (time (0));
+      *os_p_ << ctime (&t) << "%\n";
+    }
   *os_p_ << _("% from input file: ");
   //  *os_p_ << midi_parser_l_g->filename_str_;
   // ugh
diff --git a/mutopia/Coriolan/Makefile.am.wild b/mutopia/Coriolan/Makefile.am.wild
new file mode 100644 (file)
index 0000000..d761af4
--- /dev/null
@@ -0,0 +1,11 @@
+# mutopia/Coriolan/Makefile.am.wild
+
+LYFILES = $(wildcard *.ly)
+TEXFILES = $(wildcard *.tex)
+M4FILES = $(wildcard *.m4)
+EXTRA_DIST = Makefile.am.wild TODO music $(LYFILES) $(TEXFILES) $(M4FILES)
+
+OUTFILES = $(M4FILES:%.m4=%)
+
+default: all $(OUTFILES)
+
diff --git a/mutopia/Coriolan/TODO b/mutopia/Coriolan/TODO
new file mode 100644 (file)
index 0000000..183509d
--- /dev/null
@@ -0,0 +1,10 @@
+coriolan/TODO
+
+       * complete all parts
+
+       * make a macro/framework/something for symphonies
+
+       * staff-group bracket
+
+       * chords/divisi; one stem/two stems...
+
diff --git a/mutopia/Coriolan/clarinetti-part.ly b/mutopia/Coriolan/clarinetti-part.ly
new file mode 100644 (file)
index 0000000..dff3a50
--- /dev/null
@@ -0,0 +1,19 @@
+\header{
+filename =      "clarinetti-part.ly";
+% %title =      "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62";
+description =   "";
+composer =      "Ludwig van Beethoven (1770-1792)";
+enteredby =     "JCN";
+copyright =     "public domain";
+}
+
+\version "0.1.9";
+
+\include "global.ly"
+\include "clarinetti.ly"
+
+\score{
+       \$clarinetti_staff
+       \paper{}
+}
+
diff --git a/mutopia/Coriolan/clarinetti.ly b/mutopia/Coriolan/clarinetti.ly
new file mode 100644 (file)
index 0000000..f1b6000
--- /dev/null
@@ -0,0 +1,28 @@
+\header{
+filename =      "clarinetti.ly";
+% %title =      "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62";
+description =   "";
+composer =      "Ludwig van Beethoven (1770-1792)";
+enteredby =     "JCN";
+copyright =     "public domain";
+
+
+}
+
+\version "0.1.9";
+
+\include "clarinetto-1.ly"
+\include "clarinetto-2.ly"
+
+$clarinetti_staff = \type Staff = clarinetti <
+       \property Staff.instrument = "clarinet"
+       \melodic< 
+% ugh, key doesn't transpose along
+%              \global
+               \meter 4/4;
+               \key bes;
+               \transpose d \$clarinetto1
+               \transpose d \$clarinetto2
+       >
+>
+
diff --git a/mutopia/Coriolan/clarinetto-1.ly b/mutopia/Coriolan/clarinetto-1.ly
new file mode 100644 (file)
index 0000000..29b6bce
--- /dev/null
@@ -0,0 +1,23 @@
+\header{
+filename =      "clarinetto-1.ly";
+%title =        "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62";
+description =   "";
+composer =      "Ludwig van Beethoven (1770-1792)";
+enteredby =     "JCN";
+copyright =     "public domain";
+
+
+}
+
+\version "0.1.9";
+
+clarinetto1 = \melodic{
+       \octave c';     
+       r1 | r1 | c'4-.\ff r r2 | r1 |
+       r1 | r1 | d'4-. r r2 | r1 |
+       r1 | r1 | es'4-. r r2 | r1 |
+       es'4-. r r2 | d'4-. r r2 |
+       r1 | r1 | r1 | r1 |
+       as2\p_"\ \ \ cresc." ( g | )fis2. g4-.\f |
+}
+
diff --git a/mutopia/Coriolan/clarinetto-2.ly b/mutopia/Coriolan/clarinetto-2.ly
new file mode 100644 (file)
index 0000000..f69468e
--- /dev/null
@@ -0,0 +1,27 @@
+\header{
+filename =      "clarinetto-2.ly";
+%title =        "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62";
+description =   "";
+composer =      "Ludwig van Beethoven (1770-1792)";
+enteredby =     "JCN";
+copyright =     "public domain";
+
+
+}
+
+\version "0.1.9";
+
+clarinetto2 = \melodic{
+       \octave c';     
+% koor: clarinetto-part.ly
+% lilypond: ../../current/lily/dynamic-grav.cc:58: void Dynamic_engraver::do_process_requests(): Assertion `!dynamic_p_' failed.
+% Aborted (core dumped)
+%      r1 | r1 | as4-.\ff r r2 | r1 |
+       r1 | r1 | as4-. r r2 | r1 |
+       r1 | r1 | b4-. r r2 | r1 |
+       r1 | r1 | c'4-. r r2 | r1 |
+       c'4-. r r2 | b4-. r r2 |
+       r1 | r1 | r1 | r1 |
+       r1 | r2 r4 'b4-. |
+}
+
diff --git a/mutopia/Coriolan/contrabasso.ly b/mutopia/Coriolan/contrabasso.ly
new file mode 100644 (file)
index 0000000..f941bb5
--- /dev/null
@@ -0,0 +1,31 @@
+\header{
+filename =      "contrabasso.ly";
+%title =        "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62";
+description =   "";
+composer =      "Ludwig van Beethoven (1770-1792)";
+enteredby =     "JCN";
+copyright =     "public domain";
+
+
+}
+
+\version "0.1.9";
+
+contrabasso = \melodic{
+       \octave c;
+       c1\ff ~ | c | 'f4-. r r2 | r1 |
+       c1\ff ~ | c | 'f4-. r r2 | r1 |
+       c1\ff ~ | c | 'fis4-. r r2 | r1 |
+       'g4-. r r2 | 'g4-. r r2 |
+       c4\p r4 r2 | c4 r4 r2 | c4 r4 r2 | r1 |
+       c'4.-"cresc." c'8 bes4. bes8 | as4. as8 g4\f r4 |
+}
+
+$contrabasso_staff = \type Staff = contrabasso <
+       \property Staff.instrument = "contrabass"
+       \clef "bass";
+       \melodic< 
+               \global;
+               \$contrabasso
+       >
+>
diff --git a/mutopia/Coriolan/coriolan.ly b/mutopia/Coriolan/coriolan.ly
new file mode 100644 (file)
index 0000000..f55fe47
--- /dev/null
@@ -0,0 +1,73 @@
+\header{
+filename =      "coriolan.ly";
+% %title =      "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62";
+description =   "";
+composer =      "Ludwig van Beethoven (1770-1792)";
+enteredby =     "JCN";
+copyright =     "public domain";
+
+
+}
+
+\version "0.1.9";
+
+\include "global.ly"
+
+\include "contrabasso.ly"
+\include "clarinetti.ly"
+\include "corni.ly"
+\include "fagotti.ly"
+\include "flauti.ly"
+\include "oboi.ly"
+\include "timpani.ly"
+\include "trombe.ly"
+\include "viola.ly"
+\include "violino-1.ly"
+\include "violino-2.ly"
+\include "violoncello.ly"
+
+legno = \type Staff_group = legno_group <
+       \$flauti_staff
+       \$oboi_staff
+       \$clarinetti_staff
+       \$fagotti_staff
+>
+
+koper = \type Staff_group = koper_group <
+       \$corni_staff
+       \$trombe_staff
+>
+
+$timpani_g = \type Staff_group = timpani_group <
+       \$timpani_staff
+>
+
+$violini = \type Grandstaff = violini_group <
+       \$violino1_staff
+       \$violino2_staff
+>
+
+$bassi = \type Grandstaff = violine_group <
+       \$violoncello_staff
+       \$contrabasso_staff
+>
+
+strijkers = \type Staff_group = strijkers_group <
+       \$violini
+       \$viola_staff
+       \$bassi
+>
+
+\score{
+       <
+               \$legno
+               \$koper
+               \$timpani_g
+               \$strijkers
+       >
+       \paper{}
+       \midi{
+               \tempo 4 = 160;
+       }
+}
+
diff --git a/mutopia/Coriolan/corni-part.ly b/mutopia/Coriolan/corni-part.ly
new file mode 100644 (file)
index 0000000..088608e
--- /dev/null
@@ -0,0 +1,21 @@
+\header{
+filename =      "corni-part.ly";
+% %title =      "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62";
+description =   "";
+composer =      "Ludwig van Beethoven (1770-1792)";
+enteredby =     "JCN";
+copyright =     "public domain";
+
+
+}
+
+\version "0.1.9";
+
+\include "global.ly"
+\include "corni.ly"
+
+\score{
+       \$corni_staff
+       \paper{}
+}
+
diff --git a/mutopia/Coriolan/corni.ly b/mutopia/Coriolan/corni.ly
new file mode 100644 (file)
index 0000000..e8867a1
--- /dev/null
@@ -0,0 +1,27 @@
+\header{
+filename =      "corni.ly";
+% %title =      "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62";
+description =   "";
+composer =      "Ludwig van Beethoven (1770-1792)";
+enteredby =     "JCN";
+copyright =     "public domain";
+
+
+}
+
+\version "0.1.9";
+
+\include "corno-1.ly"
+\include "corno-2.ly"
+
+$corni_staff = \type Staff = corni <
+       \property Staff.instrument = "french horn"
+       \melodic< 
+% ugh, key doesn't transpose along
+%              \global
+               \meter 4/4;
+               \transpose 'a \$corno1
+               \transpose 'a \$corno2
+       >
+>
+
diff --git a/mutopia/Coriolan/corno-1.ly b/mutopia/Coriolan/corno-1.ly
new file mode 100644 (file)
index 0000000..5193c00
--- /dev/null
@@ -0,0 +1,23 @@
+\header{
+filename =      "corno-1.ly";
+%title =        "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62";
+description =   "";
+composer =      "Ludwig van Beethoven (1770-1792)";
+enteredby =     "JCN";
+copyright =     "public domain";
+
+
+}
+
+\version "0.1.9";
+
+corno1 = \melodic{
+       \octave c';     
+       r1 | r1 | as'4-.\ff r r2 | r1 |
+       r1 | r1 | as'4-. r r2 | r1 |
+       r1 | r1 | es'4-. r r2 | r1 |
+       g'4-. r r2 | g'4-. r r2 |
+       r1 | r1 | r1 | r1 |
+       r1 | r2 r4 g'4-.\f |
+}
+
diff --git a/mutopia/Coriolan/corno-2.ly b/mutopia/Coriolan/corno-2.ly
new file mode 100644 (file)
index 0000000..cbebbf4
--- /dev/null
@@ -0,0 +1,25 @@
+\header{
+filename =      "corno-2.ly";
+%title =        "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62";
+description =   "";
+composer =      "Ludwig van Beethoven (1770-1792)";
+enteredby =     "JCN";
+copyright =     "public domain";
+
+
+}
+
+\version "0.1.9";
+
+corno2 = \melodic{
+       \octave c';     
+% koor: corno-part.ly
+%      r1 | r1 | f'4-.\ff r r2 | r1 |
+       r1 | r1 | f'4-. r r2 | r1 |
+       r1 | r1 | f'4-. r r2 | r1 |
+       r1 | r1 | es'4-. r r2 | r1 |
+       g4-. r r2 | g4-. r r2 |
+       r1 | r1 | r1 | r1 |
+       r1 | r2 r4 g4-. |
+}
+
diff --git a/mutopia/Coriolan/fagotti-part.ly b/mutopia/Coriolan/fagotti-part.ly
new file mode 100644 (file)
index 0000000..b9b19b0
--- /dev/null
@@ -0,0 +1,21 @@
+\header{
+filename =      "fagotti-part.ly";
+% %title =      "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62";
+description =   "";
+composer =      "Ludwig van Beethoven (1770-1792)";
+enteredby =     "JCN";
+copyright =     "public domain";
+
+
+}
+
+\version "0.1.9";
+
+\include "global.ly"
+\include "fagotti.ly"
+
+\score{
+       \$fagotti_staff
+       \paper{}
+}
+
diff --git a/mutopia/Coriolan/fagotti.ly b/mutopia/Coriolan/fagotti.ly
new file mode 100644 (file)
index 0000000..68a1ca0
--- /dev/null
@@ -0,0 +1,26 @@
+\header{
+filename =      "fagotti.ly";
+% %title =      "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62";
+description =   "";
+composer =      "Ludwig van Beethoven (1770-1792)";
+enteredby =     "JCN";
+copyright =     "public domain";
+
+
+}
+
+\version "0.1.9";
+
+\include "fagotto-1.ly"
+\include "fagotto-2.ly"
+
+$fagotti_staff = \type Staff = fagotti <
+       \property Staff.instrument = "bassoon"
+       \clef "bass";
+       \melodic< 
+               \global;
+               \$fagotto1
+               \$fagotto2
+       >
+>
+
diff --git a/mutopia/Coriolan/fagotto-1.ly b/mutopia/Coriolan/fagotto-1.ly
new file mode 100644 (file)
index 0000000..8cf7e43
--- /dev/null
@@ -0,0 +1,23 @@
+\header{
+filename =      "fagotto-1.ly";
+%title =        "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62";
+description =   "";
+composer =      "Ludwig van Beethoven (1770-1792)";
+enteredby =     "JCN";
+copyright =     "public domain";
+
+
+}
+
+\version "0.1.9";
+
+fagotto1 = \melodic{
+       \octave c;      
+       r1 | r1 | as4-.\ff r r2 | r1 |
+       r1 | r1 | as4-. r r2 | r1 |
+       r1 | r1 | a4-. r r2 | r1 |
+       c'4-. r r2 | b4-. r r2 |
+       r1 | r1 | r1 | r1 |
+       r1 | r2 r4 g4-.\f |
+}
+
diff --git a/mutopia/Coriolan/fagotto-2.ly b/mutopia/Coriolan/fagotto-2.ly
new file mode 100644 (file)
index 0000000..946ce94
--- /dev/null
@@ -0,0 +1,25 @@
+\header{
+filename =      "fagotto-2.ly";
+%title =        "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62";
+description =   "";
+composer =      "Ludwig van Beethoven (1770-1792)";
+enteredby =     "JCN";
+copyright =     "public domain";
+
+
+}
+
+\version "0.1.9";
+
+fagotto2 = \melodic{
+       \octave c;      
+% koor
+%      r1 | r1 | f4-.\ff r r2 | r1 |
+       r1 | r1 | f4-. r r2 | r1 |
+       r1 | r1 | f4-. r r2 | r1 |
+       r1 | r1 | fis4-. r r2 | r1 |
+       g4-. r r2 | g4-. r r2 |
+       r1 | r1 | r1 | r1 |
+       r1 | r2 r4 'g4-. |
+}
+
diff --git a/mutopia/Coriolan/flauti-part.ly b/mutopia/Coriolan/flauti-part.ly
new file mode 100644 (file)
index 0000000..5e9dfb0
--- /dev/null
@@ -0,0 +1,21 @@
+\header{
+filename =      "flauti-part.ly";
+% %title =      "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62";
+description =   "";
+composer =      "Ludwig van Beethoven (1770-1792)";
+enteredby =     "JCN";
+copyright =     "public domain";
+
+
+}
+
+\version "0.1.9";
+
+\include "global.ly"
+\include "flauti.ly"
+
+\score{
+       \$flauti_staff
+       \paper{}
+}
+
diff --git a/mutopia/Coriolan/flauti.ly b/mutopia/Coriolan/flauti.ly
new file mode 100644 (file)
index 0000000..dc49d11
--- /dev/null
@@ -0,0 +1,25 @@
+\header{
+filename =      "flauti.ly";
+% %title =      "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62";
+description =   "";
+composer =      "Ludwig van Beethoven (1770-1792)";
+enteredby =     "JCN";
+copyright =     "public domain";
+
+
+}
+
+\version "0.1.9";
+
+\include "flauto-1.ly"
+\include "flauto-2.ly"
+
+$flauti_staff = \type Staff = flauti <
+       \property Staff.instrument = "flute"
+       \melodic< 
+               \global;
+               \$flauto1
+               \$flauto2
+       >
+>
+
diff --git a/mutopia/Coriolan/flauto-1.ly b/mutopia/Coriolan/flauto-1.ly
new file mode 100644 (file)
index 0000000..bb62b1b
--- /dev/null
@@ -0,0 +1,23 @@
+\header{
+filename =      "flauto-1.ly";
+%title =        "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62";
+description =   "";
+composer =      "Ludwig van Beethoven (1770-1792)";
+enteredby =     "JCN";
+copyright =     "public domain";
+
+
+}
+
+\version "0.1.9";
+
+flauto1 = \melodic{
+       \octave c'';    
+       r1 | r1 | c'4-.\ff r r2 | r1 |
+       r1 | r1 | d'4-. r r2 | r1 |
+       r1 | r1 | es'4-. r r2 | r1 |
+       g'4-. r r2 | b4-. r r2 |
+       r1 | r1 | r1 | r1 |
+       r2 es'\p_"\ \ \ cresc." ( | )dis'2. es'4-.\f |
+}
+
diff --git a/mutopia/Coriolan/flauto-2.ly b/mutopia/Coriolan/flauto-2.ly
new file mode 100644 (file)
index 0000000..0a6f57b
--- /dev/null
@@ -0,0 +1,25 @@
+\header{
+filename =      "flauto-2.ly";
+%title =        "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62";
+description =   "";
+composer =      "Ludwig van Beethoven (1770-1792)";
+enteredby =     "JCN";
+copyright =     "public domain";
+
+
+}
+
+\version "0.1.9";
+
+flauto2 = \melodic{
+       \octave c'';    
+% koor
+%      r1 | r1 | as4-.\ff r r2 | r1 |
+       r1 | r1 | as4-. r r2 | r1 |
+       r1 | r1 | b4-. r r2 | r1 |
+       r1 | r1 | c'4-. r r2 | r1 |
+       es'4-. r r2 | d4-. r r2 |
+       r1 | r1 | r1 | r1 |
+       r2 r2 | r2 r4 b4-. |
+}
+
diff --git a/mutopia/Coriolan/global.ly b/mutopia/Coriolan/global.ly
new file mode 100644 (file)
index 0000000..966f1f1
--- /dev/null
@@ -0,0 +1,18 @@
+\header{
+filename =      "global.ly";
+%title =        "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62";
+description =   "";
+composer =      "Ludwig van Beethoven (1770-1792)";
+enteredby =     "JCN";
+copyright =     "public domain";
+
+
+}
+
+\version "0.1.9";
+
+global = \melodic{
+       \meter 4/4;
+       \key bes es as;
+}
+
diff --git a/mutopia/Coriolan/music b/mutopia/Coriolan/music
new file mode 100644 (file)
index 0000000..240986b
--- /dev/null
@@ -0,0 +1,18 @@
+flauto-1.ly
+flauto-2.ly
+oboe-1.ly
+oboe-2.ly
+clarinetto-1.ly
+clarinetto-2.ly
+fagotto-1.ly
+fagotto-2.ly
+corno-1.ly
+corno-2.ly
+trombo-1.ly
+trombo-2.ly
+timpani.ly
+violino-1.ly
+violino-2.ly
+viola.ly
+violoncello.ly
+contrabasso.ly
diff --git a/mutopia/Coriolan/oboe-1.ly b/mutopia/Coriolan/oboe-1.ly
new file mode 100644 (file)
index 0000000..b68f11c
--- /dev/null
@@ -0,0 +1,23 @@
+\header{
+filename =      "oboe-1.ly";
+%title =        "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62";
+description =   "";
+composer =      "Ludwig van Beethoven (1770-1792)";
+enteredby =     "JCN";
+copyright =     "public domain";
+
+
+}
+
+\version "0.1.9";
+
+oboe1 = \melodic{
+       \octave c'';    
+       r1 | r1 | as4-.\ff r r2 | r1 |
+       r1 | r1 | as4-. r r2 | r1 |
+       r1 | r1 | a4-. r r2 | r1 |
+       g4-. r r2 | g4-. r r2 |
+       r1 | r1 | r1 | r1 |
+       as2\p_"\ \ \ cresc." ( g | )fis2. g4-.\f |
+}
+
diff --git a/mutopia/Coriolan/oboe-2.ly b/mutopia/Coriolan/oboe-2.ly
new file mode 100644 (file)
index 0000000..94cecf9
--- /dev/null
@@ -0,0 +1,25 @@
+\header{
+filename =      "oboe-2.ly";
+%title =        "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62";
+description =   "";
+composer =      "Ludwig van Beethoven (1770-1792)";
+enteredby =     "JCN";
+copyright =     "public domain";
+
+
+}
+
+\version "0.1.9";
+
+oboe2 = \melodic{
+       \octave c'';    
+% koor
+%      r1 | r1 | f4-.\ff r r2 | r1 |
+       r1 | r1 | f4-. r r2 | r1 |
+       r1 | r1 | f4-. r r2 | r1 |
+       r1 | r1 | es4-. r r2 | r1 |
+       es4-. r r2 | 'b4-. r r2 |
+       r1 | r1 | r1 | r1 |
+       r1 | r2 r4 'b4-. |
+}
+
diff --git a/mutopia/Coriolan/oboi-part.ly b/mutopia/Coriolan/oboi-part.ly
new file mode 100644 (file)
index 0000000..3d67ea5
--- /dev/null
@@ -0,0 +1,21 @@
+\header{
+filename =      "oboi-part.ly";
+% %title =      "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62";
+description =   "";
+composer =      "Ludwig van Beethoven (1770-1792)";
+enteredby =     "JCN";
+copyright =     "public domain";
+
+
+}
+
+\version "0.1.9";
+
+\include "global.ly"
+\include "oboi.ly"
+
+\score{
+       \$oboi_staff
+       \paper{}
+}
+
diff --git a/mutopia/Coriolan/oboi.ly b/mutopia/Coriolan/oboi.ly
new file mode 100644 (file)
index 0000000..cce1305
--- /dev/null
@@ -0,0 +1,25 @@
+\header{
+filename =      "oboi.ly";
+% %title =      "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62";
+description =   "";
+composer =      "Ludwig van Beethoven (1770-1792)";
+enteredby =     "JCN";
+copyright =     "public domain";
+
+
+}
+
+\version "0.1.9";
+
+\include "oboe-1.ly"
+\include "oboe-2.ly"
+
+$oboi_staff = \type Staff = oboi <
+       \property Staff.instrument = "oboe"
+       \melodic< 
+               \global;
+               \$oboe1
+               \$oboe2
+       >
+>
+
diff --git a/mutopia/Coriolan/timpani.ly b/mutopia/Coriolan/timpani.ly
new file mode 100644 (file)
index 0000000..9ad4482
--- /dev/null
@@ -0,0 +1,32 @@
+\header{
+filename =      "timpani.ly";
+%title =        "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62";
+description =   "";
+composer =      "Ludwig van Beethoven (1770-1792)";
+enteredby =     "JCN";
+copyright =     "public domain";
+
+
+}
+
+\version "0.1.9";
+
+timpani = \melodic{
+       \octave c;      
+       r1 | r1 | c4-.\ff r r2 | r1 |
+       r1 | r1 | c4-. r r2 | r1 |
+       r1 | r1 | c4-. r r2 | r1 |
+       'g4-. r r2 | 'g4-. r r2 |
+       r1 | r1 | r1 | r1 |
+       r1 | r2 r4 'g4-. |
+}
+
+$timpani_staff = \type Staff = timpani <
+       \property Staff.instrument = "timpani"
+       \clef "bass";
+       \melodic< 
+               \global;
+               \$timpani
+       >
+>
+
diff --git a/mutopia/Coriolan/trombe-part.ly b/mutopia/Coriolan/trombe-part.ly
new file mode 100644 (file)
index 0000000..b32d202
--- /dev/null
@@ -0,0 +1,21 @@
+\header{
+filename =      "trombe-part.ly";
+% %title =      "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62";
+description =   "";
+composer =      "Ludwig van Beethoven (1770-1792)";
+enteredby =     "JCN";
+copyright =     "public domain";
+
+
+}
+
+\version "0.1.9";
+
+\include "global.ly"
+\include "trombe.ly"
+
+\score{
+       \$trombe_staff
+       \paper{}
+}
+
diff --git a/mutopia/Coriolan/trombe.ly b/mutopia/Coriolan/trombe.ly
new file mode 100644 (file)
index 0000000..2d70dd7
--- /dev/null
@@ -0,0 +1,25 @@
+\header{
+filename =      "trombe.ly";
+% %title =      "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62";
+description =   "";
+composer =      "Ludwig van Beethoven (1770-1792)";
+enteredby =     "JCN";
+copyright =     "public domain";
+
+
+}
+
+\version "0.1.9";
+
+\include "trombo-1.ly"
+\include "trombo-2.ly"
+
+$trombe_staff = \type Staff = trombe <
+       \melodic< 
+%              \global;
+               \meter 4/4;
+               \$trombo1
+               \$trombo2
+       >
+>
+
diff --git a/mutopia/Coriolan/trombo-1.ly b/mutopia/Coriolan/trombo-1.ly
new file mode 100644 (file)
index 0000000..49aefe5
--- /dev/null
@@ -0,0 +1,23 @@
+\header{
+filename =      "trombo-1.ly";
+%title =        "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62";
+description =   "";
+composer =      "Ludwig van Beethoven (1770-1792)";
+enteredby =     "JCN";
+copyright =     "public domain";
+
+
+}
+
+\version "0.1.9";
+
+trombo1 = \melodic{
+       \octave c';     
+       r1 | r1 | c'4-.\ff r r2 | r1 |
+       r1 | r1 | c'4-. r r2 | r1 |
+       r1 | r1 | c'4-. r r2 | r1 |
+       g4-. r r2 | g4-. r r2 |
+       r1 | r1 | r1 | r1 |
+       r1 | r2 r4 g4-.\f |
+}
+
diff --git a/mutopia/Coriolan/trombo-2.ly b/mutopia/Coriolan/trombo-2.ly
new file mode 100644 (file)
index 0000000..1ca561b
--- /dev/null
@@ -0,0 +1,25 @@
+\header{
+filename =      "trombo-2.ly";
+%title =        "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62";
+description =   "";
+composer =      "Ludwig van Beethoven (1770-1792)";
+enteredby =     "JCN";
+copyright =     "public domain";
+
+
+}
+
+\version "0.1.9";
+
+trombo2 = \melodic{
+       \octave c';     
+% koor
+%      r1 | r1 | c4-.\ff r r2 | r1 |
+       r1 | r1 | c4-. r r2 | r1 |
+       r1 | r1 | c4-. r r2 | r1 |
+       r1 | r1 | c4-. r r2 | r1 |
+       'g4-. r r2 | 'g4-. r r2 |
+       r1 | r1 | r1 | r1 |
+       r1 | r2 r4 'g4-. |
+}
+
diff --git a/mutopia/Coriolan/viola.ly b/mutopia/Coriolan/viola.ly
new file mode 100644 (file)
index 0000000..1fd005e
--- /dev/null
@@ -0,0 +1,36 @@
+\header{
+filename =      "viola.ly";
+%title =        "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62";
+description =   "";
+composer =      "Ludwig van Beethoven (1770-1792)";
+enteredby =     "JCN";
+copyright =     "public domain";
+
+
+}
+
+\version "0.1.9";
+
+viola = \melodic{
+       \octave c;
+       < { c'1\ff ~ | c' } { c ~ | c } > | f4-. r r2 | r1 |
+       % copied 3 bars from three back...
+       < { c'1 ~ | c' } { c ~ | c } > | f4-. r r2 | r1 |
+       < { c'1 ~ | c' } { c ~ | c } > | fis4-. r r2 | r1 |
+       < g4-. g'-. > r r2 | < g4-. g'-. > r r2 |
+       % copied from violino-1...
+       [c8-.\p es-.] [es()d] [d-. g-.] g4-"ten." |
+       [c8-. es-.] [es()d] [d-. g-.] g4-"ten." |
+       [c8-. es-.] [es()d] [d-. as-.] [as()g] |
+       [g8-. c'-.] [c'()b] [b-. f'-.] [f'()es'] |
+       es'4.-"cresc." es'8 d'4. d'8 | c'4. c'8 b4\f r4 |
+}
+
+$viola_staff = \type Staff = viola <
+       \property Staff.instrument = "viola"
+       \clef "alto";
+       \melodic< 
+               \global;
+               \$viola
+       >
+>
diff --git a/mutopia/Coriolan/violino-1.ly b/mutopia/Coriolan/violino-1.ly
new file mode 100644 (file)
index 0000000..b5290fe
--- /dev/null
@@ -0,0 +1,34 @@
+\header{
+filename =      "violino-1.ly";
+%title =        "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62";
+description =   "";
+composer =      "Ludwig van Beethoven (1770-1792)";
+enteredby =     "JCN";
+copyright =     "public domain";
+
+
+}
+
+\version "0.1.9";
+
+violino1 = \melodic{
+       \octave c';     
+       c1\ff ~ | c | <as'4-. c'-. f-.> r r2 | r1 |
+       c1 ~ | c | <d''4-. d'-. d-.> r r2 | r1 |
+       c1 ~ | c | <es''4-. es'-.> r r2 | r1 |
+       <g'4-. c'-. es-.> r r2 | <b4-. d-. 'g-.> r r2 |
+       [c8-.\p es-.] [es()d] [d-. g-.] g4-"ten." |
+       [c8-. es-.] [es()d] [d-. g-.] g4-"ten." |
+       [c8-. es-.] [es()d] [d-. as-.] [as()g] |
+       [g8-. c'-.] [c'()b] [b-. f'-.] [f'()es'] |
+       [es'8-.-"cresc." as'-.] as'4. g'8-. g'4 ~ |
+       [g'8 fis'] fis'4 ~ fis' g'-.\f |
+}
+
+$violino1_staff = \type Staff = violino1 <
+       \property Staff.instrument = "violin"
+       \melodic< 
+               \global;
+               \$violino1
+       >
+>
diff --git a/mutopia/Coriolan/violino-2.ly b/mutopia/Coriolan/violino-2.ly
new file mode 100644 (file)
index 0000000..260ea14
--- /dev/null
@@ -0,0 +1,32 @@
+\header{
+filename =      "violino-2.ly";
+%title =        "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62";
+description =   "";
+composer =      "Ludwig van Beethoven (1770-1792)";
+enteredby =     "JCN";
+copyright =     "public domain";
+
+
+}
+
+\version "0.1.9";
+
+violino2 = \melodic{
+       \octave c';     
+       c1\ff ~ | c | <as'4-. c'-. f-.> r r2 | r1 |
+       c1 ~ | c | <as'4-. b-. d-.> r r2 | r1 |
+       c1 ~ | c | <c''4-. es'-. fis-.> r r2 | r1 |
+       <c'4-. es-. 'g-.> r r2 | <b4-. d-. 'g-.> r r2 |
+       r1 | r1 | r1 | 
+       r2 ['b8-.\p f-.] [f()es] |
+       [es8-. as-.] as4.-"cresc." g8-. g4 ~ |
+       [g8 fis-.] fis4 ~ fis g-.\f |
+}
+
+$violino2_staff = \type Staff = violino2 <
+       \property Staff.instrument = "violin"
+       \melodic< 
+               \global;
+               \$violino2
+       >
+>
diff --git a/mutopia/Coriolan/violoncello.ly b/mutopia/Coriolan/violoncello.ly
new file mode 100644 (file)
index 0000000..38aecb4
--- /dev/null
@@ -0,0 +1,31 @@
+\header{
+filename =      "violoncello.ly";
+%title =        "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62";
+description =   "";
+composer =      "Ludwig van Beethoven (1770-1792)";
+enteredby =     "JCN";
+copyright =     "public domain";
+
+
+}
+
+\version "0.1.9";
+
+violoncello = \melodic{
+       \octave c;
+       c1\ff ~ | c | 'f4-. r r2 | r1 |
+       c1\ff ~ | c | 'f4-. r r2 | r1 |
+       c1\ff ~ | c | 'fis4-. r r2 | r1 |
+       'g4-. r r2 | 'g4-. r r2 |
+       c4\p r4 r2 | c4 r4 r2 | c4 r4 r2 | r1 |
+       c'4.-"cresc." c'8 bes4. bes8 | as4. as8 g4\f r4 |
+}
+
+$violoncello_staff = \type Staff = violoncello <
+       \property Staff.instrument = "cello"
+       \clef "bass";
+       \melodic< 
+               \global;
+               \$violoncello
+       >
+>
index 3b57ddb74cbfa0a14ed8483d93d3b5b341cc4bb3..630d2c35bec11707e54788e36afc307f8aaf4c7c 100644 (file)
@@ -9,3 +9,9 @@ OUTFILES = $(M4FILES:%.m4=%)
 
 default: all $(OUTFILES)
 
+# ugh
+M4 = m4
+
+%.ly: $(srcdir)/%.ly.m4
+       $(M4) $< > $@
+
index 2c87868ab77329d54a2c4905ec00fc217c397465..651e0c8bb74d7f450b379efbd3cb3225e7213d5b 100644 (file)
@@ -65,22 +65,19 @@ one = \melodic{
 two = \melodic{
        \octave c;
        \textstyle "roman";
-       c4-5 e-3 [g32-1 fis-2 g8.-1] 'g4 |
-       d-5 f-3 [a32-1 gis a8.] 'a4 |
-       % ugh grouping32: 4..4
-       e-5 e'-1 a-4 [a32-3 b c' b] [c' b a b] |
-       c'4 e-4 fis [a32-1 gis fis gis] [a gis fis gis] |
-       a4 c-4 d [d32 e f e] [f e d e] |
-       % ugh tril sign
-       % f4-1 e d-3\tr c |
-       f4-1 e d-3 c |
-       % g( )'g g\pr-"(#)"( )'g |
-       g ~ 'g g-"(\\textsharp)" ~ 'g |
-       % g\pr-"(\\textsharp)" ~ 'g g\pr-"(\\textsharp)" ~ 'g |
-       g-"(\\textsharp)" ~ 'g g-"(\\textsharp)" ~ 'g |
+       c4-5 e-3 g-\mordent-"(\\textsharp)" 'g4 |
+       d-\mordent-5 f-3 a-\mordent-"(\\textsharp)" 'a4 |
+       e-5 e'-\mordent-1 a-4 b-\upprall |
+       c'4 e-4 fis gis-\downprall |
+       a4 c-4 d e-\upprall |
+       f4-1 e d-3-\prall c |
+       g-\mordent-"(\\textsharp)" 'g g-\mordent 'g |
+       g-\mordent 'g g-\mordent 'g |
        % ugh, f should be at upper staff
-       g r r16 ['g-5( 'b-4 d] )f-1 s s s |
-       s [g-5( b-4 d'-2] )f'-1 s s s s \clef violin; [g'-4 b'-2 d''-1] 
+       g-\mordent r r16 ['g-5( 'b-4 d] )f-1 s s s |
+%      s [g-5( b-4 d'-2] )f'-1 s s s s \clef violin; [g'-4 b'-2 d''-1] 
+       % huh, can't violin anymore (see BUGS)
+       s [g-5( b-4 d'-2] )f'-1 s s s s [g'-4 b'-2 d''-1] 
        s s s s \clef bass; |
        <
                { \voiceone; g1 ~ g ~ g ~ g ~ g ~ g ~ g }
index 39ba3fff8b21658706a5caed694561cbdfa2111d..48dcb7d08391a4ca94ebccfbf7ef1aef183b5632 100644 (file)
@@ -70,8 +70,8 @@ one = \melodic{
 two = \melodic{
        \octave c;
        <
-               { \voiceone; c1 ~ c ~ c }
-               { \voicetwo; 'c1 ~ 'c ~ 'c }
+               { \voiceone; c1 ~ | c ~ | c }
+               { \voicetwo; 'c1 ~ | 'c ~ | 'c }
        >
        \onevoice; |
        r8 [c-5( e-3 g-1] [e-3 c-5 c' e-4] |
@@ -79,13 +79,10 @@ two = \melodic{
        )g2-3 r4 g-2( |
        [)a8 'a-5( c-4 e-2] [c-4 'a-5 g e-3] |
        )fis2 r4 d-4 |
-       % [g32-1( fis-2 g8.-1] ) 'g4 g( )'g\mr |
-       
-       % my edition has  mordents on every g here
-       [g32-1( fis-2 g8.-1] ) 'g4 g ~ 'g |
-       % 'g( )g\mr 'g( )g\mr |
-       g ~ 'g g ~ 'g |
-       g ~ 'g g ~ 'g |
+       g-\mordent-"(\\textsharp)" 'g4 g-\mordent 'g |
+       % mordents in brackets...
+       g-\mordent 'g g-\mordent 'g |
+       g-\mordent 'g g-\mordent 'g |
        [g8 'g-5( 'b-4 d-2] ['b-4 'g-5 f!-1 d-3] |
        [)e-2 c-4 e-2 g-1] [e-3 c-5 c' e-4] |
        \textstyle "finger";
index 7060b2ea946d4a1c0582ccf95635f4b8431848b9..3e4887586a0e1f8a057991c96196b2e0cc00f2a0 100644 (file)
@@ -45,7 +45,7 @@ one = \melodic{
        \stemboth
        [''fis16-1\p ''a-2 'd-5\< 'c-4] [''b-1 'd-2 'g-5 'fis-4]
        ['d-1 'b-5 'a 'g] ['fis-2 'e-1 'd-4 \!'c!-3] |
-       [''b-2 'd-1 'g 'a] ['fis32 'g 'fis16] ['e16-4 'd-3]
+       [''b-2 'd-1 'g 'a] ['fis8-\prall 'e16-4 'd-3]
        ['d8. 'e16~] ['e 'd8 'cis16] |
        \stemup
        r16 ['d-1\< 'fis 'd] ['g 'a 'b 'g-1] [c-3 'b c d] [c e d-4 \!c] |
index 0291fe4077c2cb2ec07072d02e219cca70fe2e66..d0446ef4ba362853b7c31270b84e8f0dd2210960 100644 (file)
@@ -24,28 +24,25 @@ one = \melodic{
        < 
                {
                        \voiceone;
-%                      c'4\mr^"(\\textsharp)"\p r r |
-%                      c'4\mr^"(\\textsharp)" r r
-                       c'4^"(\\textsharp)"\p r r |
-                       c'4^"(\\textsharp)" r r
+                       c'4-\mordent-"(\\textsharp)"\p r r |
+                       c'4-\mordent-"(\\textsharp)" r r
                }
                { \voicetwo; a4 r r | a4 r r }
        > |
        \onevoice;
        [a'8\mf( es'-3\> d' c' bes!-3 a] |
        [g fis-3 e!-2 d-1 c'-4 \!a] |
-       [)bes32(\p a bes16] [d'8-5 bes-3 g-1] )g'4 |
-%      r8 [d'-5( c' bes a\pr g] |
-       r8 [d'-5( c' bes a g] |
+       [)bes8-\mordent\p( d'8-5 bes-3 g-1] )g'4 |
+       r8 [d'-5( c' bes a-\prall g] |
        [)a-2 c'-4( a f] ) f'4 |
-%      r8 [c'-5 bes a g\tr f] |
-       r8 [c'-5 bes a g f] |
+       r8 [c'-5 bes a g-\prall f] |
        [g-2 bes-4 a g f-1 e-2] |
        [f-3 d-1 f-2 a-3 d'-5 g-2] |
        < 
                { 
                        \voiceone;
-                       [cis'32-4 bes cis'16 e'8-5-"poco cresc." cis'-3 a e' cis']
+                       % ... textnatural
+                       [cis'8-\prall e'8-5-"poco cresc." cis'-3 a e' cis']
                }
                { \voicetwo; a4 }
        >
@@ -99,10 +96,9 @@ two = \melodic{
        \octave c;
        [d32( cis )d8.] r4 r |
        'd4 r r |
-%      d\mr r r |
-       d r r |
+       d-\mordent r r |
        'd4 r r |
-%      d\mr r r |
+       d-\mordent r r |
        d r r |
        'd4 r r |
        [d8-2 'a-5 d-2 f-1 d-4 f-2] |
@@ -113,11 +109,9 @@ two = \melodic{
        [g!-5 es'-1 c'-1 g-5 es'-1 c'-1 ] |
        fis4-5 r r 
        d-4( ) fis d-5 |
-%      g\mr-"(\\textsharp)" r r f!8 |
-       g-"(\\textsharp)" r r8 f! |
-       [e32 f e8.] r4 r |
-%      f\pr r r8 e |
-       f r r8 e |
+       g4-\mordent-"(\\textsharp)" r r f!8 |
+       e4-\prall r r |
+       f4-\mordent r r8 e |
        d4 r8 [f-1 e d] |
        [e-2 d-3 cis-4 e-1 d-2 cis-3] |
        d4-2( )c! 'bes-4 |
index bde501ae8d62fec7e548970a37f3ad8973078a3e..01a7a8ce129f0653d239ae441d8af2abb6c39757 100644 (file)
@@ -1,6 +1,6 @@
 # mutopia/Makefile.am.wild
 
-SUBDIRS = J.S.Bach
+SUBDIRS = J.S.Bach Coriolan
 
 LYFILES = $(wildcard *.ly)
 TEXFILES = $(wildcard *.tex)
index 20f454567e5273aba3cfee8e4a8d2c07f1436c8e..86774fc1ba87a46d14e89b9b386abf2187f0349a 100644 (file)
@@ -12,8 +12,8 @@ copyright =    "public domain";
 hoboonestart = \melodic{
 % ugh: can't copy: allegro/primo tempo
        \octave c';
-       \textstyle "roman";
-       [es'16-.-"Allegro" es'-. es'-. es'-.] [es'8-. d'-.] |
+       \textstyle "large";
+       [es'16-.^"Allegro" es'-. es'-. es'-.] [es'8-. d'-.] |
        \textstyle "italic";
 }
 
@@ -26,7 +26,7 @@ hobooneintro = \melodic{
        [bes16( c' d' es'] [)d'8 c'-.] |
        [bes-. as->~] [as16( g f g] |
        [as bes c' d'] [)es'8 c'-.] |
-       [d'8-. c'16( bes] )a4 ~ |
+       [d'8-. c'16( bes] )as4 ~ |
        [as16 g( f g] [as c' bes as] |
 %      [)g8 as16 g(] [)f8 g16( f] |
        [)g8 as16 g(] [)f8 g16( f] |
@@ -75,28 +75,32 @@ hoboonemid = \melodic{
        [f'8.-> f'16] [f'8 f'] |
        [bes'8-. as'16( g'] )f'4 ~ |
        [f'16 es'( d' es'] [f' as' g' )f'] |
-       [es'( g' f' es'] [d' g' es' d'] |
+       [es'( g' f' es'] [d' f' es' d'] |
        [c' es' d' c'] [b d' c' b] |
        [a c' bes a] [g bes a g] |
        [fis a g fis] [e g fis )e] |
        % `a deux
        [d8 d'] [es'8.-> c'16] |
        [a8 bes g es] |
-       [c' d' es8. bes16] |
+       [c' d' es'8. bes16] |
        [g8 es bes c] |
        [d16-. d-. d-. d-.] [d8.-. es16->] |
        [d'16-.-"cresc." d'-. d'-. d'-.] [d'8.-. es'16->] |
        [d'16-. d'-. d'-. d'-.] [d'8.-. es'16->] |
-       [d'16 d' d' d'] [d'8 es'16-.] r16-\fermata-"court"-"tr\\`es" |
+       [d'16 d' d' d'] [d'8 es'16-.] r16-\fermata^"court"^"tr\\`es" |
        % Un peu plus lent.
-       \textstyle "roman";
+       \textstyle "bold";
 
 % ugh
 %      d'4(\<^"Un peu plus lent" \textstyle "italic; _"tr\\`es \\'el\\'egant"
-       d'4(\<^"Un peu plus lent"
+%      d'4(\<^"Un peu plus lent"
+       d'4(\<
        \textstyle "italic"; 
        [e'8_"tr\\`es \\'el\\'egant" \!f'8] |
-       [)b'-. a'-.] [g16( fis' e' )d'] |
+%      [)b'-. a'-.] [g16( fis' e' )d'] |
+       \textstyle "bold";
+       [)b'-.^"Un peu plus lent" a'-.] [g16( fis' e' )d'] |
+       \textstyle "italic"; 
        [d'( c' b\< c'] [)\!f'8-. e'-.] |
        d4-> ~ [d16 e( fis g] |
        [a b\< d' fis] [)\!a'8-. g'-.] |
@@ -132,7 +136,7 @@ hoboonemid = \melodic{
 hoboonesecondstart = \melodic{
        \octave c';
 % ugh: can't copy: allegro/primo tempo
-       \textstyle "roman";
+       \textstyle "large";
        [es'16-.\ff^"Tempo 1$^o$" es'-. es'-. es'-.] [es'8-. d'-.] |
        \textstyle "italic";
        
@@ -171,7 +175,6 @@ hoboonelast = \melodic{
        [bes16-.-"cresc." bes-. bes-. bes-.] [bes8-. ces'->] |
        % same measure
        [bes16-. bes-. bes-. bes-.] [bes8-. ces'->] |
-       \textstyle "roman";
        [bes'16-.\ff bes'-. bes'-. bes'-.] [bes'8-. ces''16->] r16^"court"-\fermata |
        % ugh: eight measures rest (ugh: r1 -> four beats...)
        r2-"Un peu plus lent et \\'el\\'egant"
@@ -207,7 +210,7 @@ hoboonelast = \melodic{
        g'8-. r f4-> ~ |
        [f'8 es'-. ces'8.-. as16-.] |
        % `a deux
-       \textstyle "roman";
+       \textstyle "large";
        [ces'8.->^"Plus vite" bes16-.(] [a bes es' d'] |
        \textstyle "italic";
        [)c!8.-> bes16] [a( bes es' )d'] |
@@ -218,7 +221,9 @@ hoboonelast = \melodic{
        [g' )f' d'( es'] [f' g' as' a'] |
        [c'' )bes' bes( c'] [d' es' f' g'] |
        [as' g' f' g'] [as' bes' c'' d''] |
+       \textstyle "large";
        [)es''-.^"Tempo 1$^o$" g'-. g'-. g-.] [g'8-. g'-.] |
+       \textstyle "italic";
        bes'4.-> g'8-. |
        gis'2->( |
        )as'! |
@@ -233,7 +238,7 @@ hoboonelast = \melodic{
        g'4.-> g'8-. |
        es'4.-> es'8-. |
        bes4.-> bes8-. |
-       \textstyle "roman";
+       \textstyle "large";
        g'4.->^"Presto" g'8-. |
        \textstyle "italic";
        es'4.-> es'8-. |
@@ -256,12 +261,14 @@ hoboone = \melodic {
 global = \melodic{
        \key bes es as;
        \meter 2/4;
-       \skip 4*106;
+       \skip 4*110;
+       \key fis; |
        \bar "||";
-       \key fis;
-       \skip 4*60;
+       \skip 4*58;
+       \key bes es as; |
        \bar "||";
-       \key bes es as;
+       \skip 4*206;
+       \bar "|.";
 }
 
 
@@ -280,7 +287,7 @@ a4 = \paper{
        \$staff_hoboone
        \paper{ \a4 }
        \midi{
-               \tempo 4 = 120;
+               \tempo 4 = 80;
        }
 }
 
diff --git a/test/Makefile.am.wild b/test/Makefile.am.wild
new file mode 100644 (file)
index 0000000..7d7fdcb
--- /dev/null
@@ -0,0 +1,21 @@
+# project  LilyPond -- the musical typesetter
+# title           makefile for test
+# file    test/Makefile.am.wild
+
+TEST_SCHRIFTEN = $(wildcard *.sh)
+
+# ugh ugh
+TESTS = $(top_srcdir)/test/check-lily-midi.sh $(top_srcdir)/test/check-lily-paper.sh $(top_srcdir)/test/check-mi2mu.sh
+
+INPUTS = test.midi
+
+RESULTS = ok.midi ok.tex ok.ly
+
+EXTRA_DIST = Makefile.am.wild GNUmakefile $(TEST_SCHRIFTEN) $(INPUTS) $(RESULTS)
+
+# override default target for all-am: to get an extra dependency
+all-am: Makefile $(PROGRAMS) wild-check
+
+# dummy target for non-GNU makes; is overridden in GNUmakefile
+wild-check:
+
diff --git a/test/check-lily-midi.sh b/test/check-lily-midi.sh
new file mode 100644 (file)
index 0000000..6ce2758
--- /dev/null
@@ -0,0 +1,20 @@
+#!/bin/sh
+# check-lily-midi.sh
+
+# out=check-lily.midi
+# ugh -o is broken
+out=lelie.midi
+ok=$LILYPOND_SOURCEDIR/test/ok.midi
+cat <<EOF | lilypond -T -o $out
+\score{
+       \melodic{
+               c d e f g a b c'
+       }
+       \midi{}
+}
+EOF
+
+# ugh
+cmp $out $ok
+exit $?
+
diff --git a/test/check-lily-paper.sh b/test/check-lily-paper.sh
new file mode 100644 (file)
index 0000000..1829154
--- /dev/null
@@ -0,0 +1,20 @@
+#!/bin/sh
+# check-lily-paper.sh
+
+# out=check-lily.tex
+# ugh -o is broken
+out=lelie.tex
+ok=$LILYPOND_SOURCEDIR/test/ok.tex
+cat <<EOF | lilypond -T # -o $out
+\score{
+       \melodic{
+               c d e f g a b c'
+       }
+       \paper{}
+}
+EOF
+
+# ugh
+diff $out $ok
+exit $?
+
diff --git a/test/check-mi2mu.sh b/test/check-mi2mu.sh
new file mode 100644 (file)
index 0000000..b445a03
--- /dev/null
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+out=check-mi2mu.ly
+# out=check-lily.midi
+# ugh -o is broken
+out=test.midi.ly
+ok=$LILYPOND_SOURCEDIR/test/ok.ly
+mi2mu -T $LILYPOND_SOURCEDIR/test/test.midi # -o $out
+
+# ugh
+diff $out $ok
+exit $?
+
diff --git a/test/ok.ly b/test/ok.ly
new file mode 100644 (file)
index 0000000..c8b050f
--- /dev/null
@@ -0,0 +1,41 @@
+% Creator: GNU LilyPond
+% Automatically generated.
+% from input file: /home/fred/lelie/current/test/test.midi
+
+\version "0.1.9";
+$Track_0 = \melodic{
+       % midi copyright:
+       % instrument:
+       \duration 4;
+       % Creator: GNU LilyPond
+
+        % Automatically generated.
+
+        % from musical definition: : 1
+        % Track 0
+        \tempo 4=60;
+        
+} % Track 0
+
+$track1 = \melodic{
+       % midi copyright:
+       % instrument:piano
+       \duration 4;
+
+       % piano
+        \tempo 4=60;
+        c4  d4  e4  f4  |
+       % 2
+       g4  a4  b4  c'4  
+
+} % track1
+
+\score{
+       \multi 3 < \type Staff
+                       < \melodic{ \$track1 } >
+       >
+       \paper{}
+       \midi{
+               \tempo 4=60;
+                }
+}
diff --git a/test/ok.tex b/test/ok.tex
new file mode 100644 (file)
index 0000000..c75af77
--- /dev/null
@@ -0,0 +1,283 @@
+% Creator: GNU LilyPond
+% Automatically generated.
+% outputting Score, defined at: : 1
+\def\LilyIdString{Lily was here, 0.1.52.jcn6}%
+%
+ \def\mudelapaperlinewidth{441.017717}%
+%
+\def\mudelapaperindent{28.452756}%
+%
+\def\mudelapaperrulethickness{0.400000}%
+%
+\def\mudelapaperbarsize{16.000000}%
+%
+\def\mudelapaperinterline{4.000000}%
+%
+\def\mudelapapernotewidth{5.930000}%
+%
+\def\mudelapaperwholewidth{8.640000}%
+%
+\def\mudelapaperunitspace{22.000000}%
+%
+\def\mudelapaperbasicspace{4.000000}%
+%
+\def\mudelapapergeometric{0.000000}%
+%
+\def\mudelapaperarithmetic_basicspace{2.000000}%
+%
+\def\mudelapaperarithmetic_multiplier{4.800000}%
+%
+\def\mudelapaperinterbeam{3.140000}%
+%
+\def\mudelapapergourlay_energybound{100000.000000}%
+%
+\def\mudelapapergourlay_maxmeasures{14.000000}%
+%
+\def\mudelapapercastingalgorithm{1.000000}%
+%
+\input lilyponddefs \musixsixteendefs%(Tex id)
+\turnOnPostScript%
+\hbox{%<- line of score
+\placebox{-16.000pt }%
+ {79.326pt }%
+ {\placebox{0.000pt }%
+  {5.080pt }%
+  {\stem{-25.039pt }%
+   {0.000pt }%
+   }%
+  }%
+ \placebox{-16.000pt }%
+ {79.326pt }%
+ {\placebox{-26.000pt }%
+  {0.000pt }%
+  {\quartball}%
+  \placebox{-24.000pt }%
+  {0.000pt }%
+  {\quartledger}%
+  \placebox{-20.000pt }%
+  {0.000pt }%
+  {\quartledger}%
+  \placebox{-16.000pt }%
+  {0.000pt }%
+  {\quartledger}%
+  \placebox{-12.000pt }%
+  {0.000pt }%
+  {\quartledger}%
+  }%
+ \placebox{-16.000pt }%
+ {120.670pt }%
+ {\placebox{0.000pt }%
+  {5.080pt }%
+  {\stem{-23.039pt }%
+   {0.000pt }%
+   }%
+  }%
+ \placebox{-16.000pt }%
+ {120.670pt }%
+ {\placebox{-24.000pt }%
+  {0.000pt }%
+  {\quartball}%
+  \placebox{-24.000pt }%
+  {0.000pt }%
+  {\quartledger}%
+  \placebox{-20.000pt }%
+  {0.000pt }%
+  {\quartledger}%
+  \placebox{-16.000pt }%
+  {0.000pt }%
+  {\quartledger}%
+  \placebox{-12.000pt }%
+  {0.000pt }%
+  {\quartledger}%
+  }%
+ \placebox{-16.000pt }%
+ {162.013pt }%
+ {\placebox{0.000pt }%
+  {5.080pt }%
+  {\stem{-21.039pt }%
+   {0.000pt }%
+   }%
+  }%
+ \placebox{-16.000pt }%
+ {162.013pt }%
+ {\placebox{-22.000pt }%
+  {0.000pt }%
+  {\quartball}%
+  \placebox{-20.000pt }%
+  {0.000pt }%
+  {\quartledger}%
+  \placebox{-16.000pt }%
+  {0.000pt }%
+  {\quartledger}%
+  \placebox{-12.000pt }%
+  {0.000pt }%
+  {\quartledger}%
+  }%
+ \placebox{-16.000pt }%
+ {203.357pt }%
+ {\placebox{0.000pt }%
+  {5.080pt }%
+  {\stem{-19.039pt }%
+   {0.000pt }%
+   }%
+  }%
+ \placebox{-16.000pt }%
+ {203.357pt }%
+ {\placebox{-20.000pt }%
+  {0.000pt }%
+  {\quartball}%
+  \placebox{-20.000pt }%
+  {0.000pt }%
+  {\quartledger}%
+  \placebox{-16.000pt }%
+  {0.000pt }%
+  {\quartledger}%
+  \placebox{-12.000pt }%
+  {0.000pt }%
+  {\quartledger}%
+  }%
+ \placebox{-16.000pt }%
+ {244.700pt }%
+ {\placebox{0.000pt }%
+  {0.000pt }%
+  {\maatstreep{16.000pt }%
+   }%
+  }%
+ \placebox{-16.000pt }%
+ {275.644pt }%
+ {\placebox{0.000pt }%
+  {5.080pt }%
+  {\stem{-17.039pt }%
+   {0.000pt }%
+   }%
+  }%
+ \placebox{-16.000pt }%
+ {275.644pt }%
+ {\placebox{-18.000pt }%
+  {0.000pt }%
+  {\quartball}%
+  \placebox{-16.000pt }%
+  {0.000pt }%
+  {\quartledger}%
+  \placebox{-12.000pt }%
+  {0.000pt }%
+  {\quartledger}%
+  }%
+ \placebox{-16.000pt }%
+ {316.987pt }%
+ {\placebox{0.000pt }%
+  {5.080pt }%
+  {\stem{-15.039pt }%
+   {0.000pt }%
+   }%
+  }%
+ \placebox{-16.000pt }%
+ {316.987pt }%
+ {\placebox{-16.000pt }%
+  {0.000pt }%
+  {\quartball}%
+  \placebox{-16.000pt }%
+  {0.000pt }%
+  {\quartledger}%
+  \placebox{-12.000pt }%
+  {0.000pt }%
+  {\quartledger}%
+  }%
+ \placebox{-16.000pt }%
+ {358.331pt }%
+ {\placebox{0.000pt }%
+  {5.080pt }%
+  {\stem{-13.039pt }%
+   {0.000pt }%
+   }%
+  }%
+ \placebox{-16.000pt }%
+ {358.331pt }%
+ {\placebox{-14.000pt }%
+  {0.000pt }%
+  {\quartball}%
+  \placebox{-12.000pt }%
+  {0.000pt }%
+  {\quartledger}%
+  }%
+ \placebox{-16.000pt }%
+ {399.674pt }%
+ {\placebox{0.000pt }%
+  {5.080pt }%
+  {\stem{-11.039pt }%
+   {2.000pt }%
+   }%
+  }%
+ \placebox{-16.000pt }%
+ {399.674pt }%
+ {\placebox{-12.000pt }%
+  {0.000pt }%
+  {\quartball}%
+  \placebox{-12.000pt }%
+  {0.000pt }%
+  {\quartledger}%
+  }%
+ \placebox{-16.000pt }%
+ {50.383pt }%
+ {\placebox{0.000pt }%
+  {0.000pt }%
+  {}%
+  }%
+ \placebox{-16.000pt }%
+ {31.943pt }%
+ {\placebox{-4.000pt }%
+  {0.000pt }%
+  {\violinclef}%
+  }%
+ \placebox{-16.000pt }%
+ {28.453pt }%
+ {\placebox{8.000pt }%
+  {0.000pt }%
+  {\rulesym{0.400pt }%
+   {412.565pt }%
+   }%
+  \placebox{4.000pt }%
+  {0.000pt }%
+  {\rulesym{0.400pt }%
+   {412.565pt }%
+   }%
+  \placebox{0.000pt }%
+  {0.000pt }%
+  {\rulesym{0.400pt }%
+   {412.565pt }%
+   }%
+  \placebox{-4.000pt }%
+  {0.000pt }%
+  {\rulesym{0.400pt }%
+   {412.565pt }%
+   }%
+  \placebox{-8.000pt }%
+  {0.000pt }%
+  {\rulesym{0.400pt }%
+   {412.565pt }%
+   }%
+  }%
+ \placebox{-16.000pt }%
+ {440.378pt }%
+ {\placebox{0.000pt }%
+  {0.000pt }%
+  {\maatstreep{16.000pt }%
+   }%
+  }%
+ \placebox{-16.000pt }%
+ {28.453pt }%
+ {\placebox{0.000pt }%
+  {0.000pt }%
+  {\hbox{}%
+   }%
+  }%
+ \placebox{0.000pt }%
+ {28.453pt }%
+ {\placebox{0.000pt }%
+  {0.000pt }%
+  {\hbox{}%
+   }%
+  }%
+ }%
+\interscoreline%
+\EndLilyPondOutput
index 67cfd2e3bfdb8245d043d642e6e1ed83bb3ac6c5..d73f989630ac2d21dfc130883e3730684cb4ff3e 100644 (file)
@@ -78,6 +78,7 @@
         \font\smalltextfont=cmr8
         \font\boldfont=cmbx10
         \font\textmusic=cmmi12
+       \font\largefont=cmbx12
 }
 \def\cmrsixteen{
         \font\smalltextfont=cmr6
@@ -86,6 +87,7 @@
         \font\italicfont=cmti9
         \font\textmusic=cmmi10
         \font\boldfont=cmbx8
+       \font\largefont=cmbx10
 }
 \def\cmreleven{
         \font\smalltextfont=cmr5
@@ -94,6 +96,7 @@
         \font\italicfont=cmti6
         \font\textmusic=cmmi8
         \font\boldfont=cmbx6
+       \font\largefont=cmbx8
 }
 
 \def\cmrthirteen{
         \font\italicfont=cmti7
         \font\textmusic=cmmi9
         \font\boldfont=cmbx7
+       \font\largefont=cmbx9
 }
 \def\musixsixteendefs{
         \sixteenfonts
 \def\setbold#1{\boldfont #1}
 \def\setdynamic#1{\dynfont #1}
 \def\setfinger#1{\fingerfont #1}
+\def\setlarge#1{\largefont #1}
 
 % the interline symbol. Redefine to remove it.
 \def\defaultlineseparator{\vbox{\mussepline\vskip -5pt\mussepline}}