lilypond-0.1.35

diff --git a/README b/README
index 34d7ec453265a99a630a3bf889b3cad330e8fcbf..82740ef2da72d4c22de8a3d97eae594bf2b77a61 100644 (file)
--- a/README
+++ b/README
@@ -56,7 +56,7 @@ the mailing lists.  See Documentation/links.pod for more info
 6. DOZE
 
 If you have received this file as part of a DOS/Window32 distribution
-(lilypond-*.zip ), then it is advisable to also download the source
+(lilypond-*.zip), then it is advisable to also download the source
 package, since it might contain more documentation
 
        ftp://pcnov095.win.tue.nl/pub/lilypond/ (Europe)
@@ -67,7 +67,7 @@ The website also contains the complete documentation
        http://www.stack.nl/~hanwen/lilypond/index.html
 
 If you decide to build LilyPond from source, please read the INSTALL
-document first, esp. the Windows NT/95 section.
+document first, especially the Windows NT/95 section.
 
 7. CAVEATS
 
@@ -78,3 +78,5 @@ Linux-Intel unix users.
 files, eg
 
        rm `find /var/lib/texmf/fonts -name 'feta*'`
+
+a script to do this for you is in bin/cleanfonts.sh

diff --git a/bin/clean-fonts.sh b/bin/clean-fonts.sh
index 0610fba7e3edbbacbbfe5f9220ddeab4752f4aac..07814d664e66d6e67ae658804f2c289070330019 100644 (file)
--- a/bin/clean-fonts.sh
+++ b/bin/clean-fonts.sh
@@ -1,8 +1,15 @@
 #!/bin/sh
 
+case  $# in
+0) 
+    WHAT="" ;;
+1)
+    WHAT=$1;;
+esac
+    
 # remove possibly stale .pk/.tfm files 
-echo> /tmp/cleaning-font
-FILES=`find /var/lib/texmf/ -name 'font-en-tja*' -o -name 'feta*'`
-# FILES=`find /var/lib/texmf/ -name 'font-en-tja*' -o name 'feta-*" -o -name 'vette-beam*' -o -name 'dyn10*'`
+echo> /tmp/cleaning-font-dummy
+FILES=`find /var/lib/texmf/ -name "feta*$WHAT*"`
+
 echo removing $FILES
-rm  $FILES /tmp/cleaning-font
+rm  $FILES /tmp/cleaning-font-dummy

diff --git a/lily/lookup.cc b/lily/lookup.cc
index 5c304c2cb2216b2fe8e998acb5bb6c4a09979fdd..d2e4c12d9024a0a2ef0faaf411fe823ec9203dd2 100644 (file)
--- a/lily/lookup.cc
+++ b/lily/lookup.cc
@@ -227,27 +227,32 @@ Lookup::stem (Real y1,Real y2) const
 Atom
 Lookup::vbrace (Real &y) const
 {
-  if (y < 2* 20 PT)
+  Atom brace = (*symtables_p_)("param")->lookup ("brace");
+  Interval ydims = brace.dim_[Y_AXIS];
+  Real min_y = ydims[LEFT];
+  Real max_y = ydims[RIGHT];
+  Real step = 2.0 PT;
+ 
+  if (y < min_y)
     {
       warning (_("piano brace too small (") + print_dimen (y)+ ")");
-      y = 2*20 PT;
+      y = min_y;
     }
-  if (y > 67 * 2 PT)
+  if (y > max_y)
     {
       warning (_("piano brace too big (") + print_dimen (y)+ ")");
-      y = 67 *2 PT;
+      y = max_y;
     }
 
-  int idx = int (rint ((y/2.0 - 20) + 148));
-
-  Atom s = (*symtables_p_)("param")->lookup ("brace");
+  
+  int idx = int (rint ((y- min_y)/step)) + 1;
+  
   {
     Array<String> a;
     a.push (idx);
-    s.tex_ = substitute_args (s.tex_,a);
-    s.dim_.y() = Interval (-y/2,y/2);
+    brace.tex_ = substitute_args (brace.tex_,a);
+    brace.dim_[Y_AXIS] = Interval (-y/2,y/2);
   }
 
-
-  return s;
+  return brace;
 }

diff --git a/make/lilypond.lsm.in b/make/lilypond.lsm.in
index bc3e34ed5d93cca5246badeb489aa13039ba1e3a..b98fc8e244a43d66f5bc0b97fede0be68aa045a6 100644 (file)
--- a/make/lilypond.lsm.in
+++ b/make/lilypond.lsm.in
@@ -14,8 +14,8 @@ Author: hanwen@stack.nl (Han-Wen Nienhuys)
        jan@digicash.com (Jan Nieuwenhuizen)
 Maintained-by: hanwen@stack.nl (Han-Wen Nienhuys)
 Primary-site: sunsite.unc.edu /pub/Linux/apps/sound/convert
-       440k lilypond-@TOPLEVEL_VERSION@.tar.gz 
+       460k lilypond-@TOPLEVEL_VERSION@.tar.gz 
 Original-site: pcnov095.win.tue.nl /pub/lilypond/development/
-       440k lilypond-@TOPLEVEL_VERSION@.tar.gz 
+       460k lilypond-@TOPLEVEL_VERSION@.tar.gz 
 Copying-policy: GPL
 End

diff --git a/mf/feta-beugel.mf b/mf/feta-beugel.mf
new file mode 100644 (file)
index 0000000..df625dc
--- /dev/null
+++ b/mf/feta-beugel.mf
@@ -0,0 +1,44 @@
+input feta-macros;
+input feta-params;
+
+save code;
+code :=0;
+
+
+def draw_brace( expr height_sharp, width_sharp) = 
+       save pendir, height, width, thin, thick;
+       save penangle;
+       height# := height_sharp;
+       width#  := width_sharp;
+
+       beginchar(incr code, width#, height#/2, height#/2);
+ 
+       define_pixels (height, width);
+       thin = 2 stafflinethickness;
+       thick = .5 interline;
+       
+       z2 = .5 [z1, z3];
+       y3 = y1 + height/2;
+       x3 = x1 + width;
+       y1 =0;
+       x3 = - width / 2;
+
+       pair pendir;
+       pendir = unitvector(x3 - x1, y3/6 - y1);
+       penangle = angle pendir - 90;
+       penpos3(thin, penangle);
+       penpos2(thick, angle(z3 -z1) -90 );
+       penpos1(2/3 thin, penangle);
+       
+       penlabels(1,2,3);
+       fill z2r ..  simple_serif (z3r, z3l, 90)
+               .. z2l .. simple_serif (z1l, z1r, 90) ..cycle;
+
+       addto currentpicture also currentpicture yscaled -1;
+endchar;
+enddef;
+
+
+for h :=  2 staffsize#  step 2 pt# until (6 * staffsize#):
+       draw_brace(h, interline# );
+endfor