patch::: 1.1.5.jcn4: plet en pin :-)

pl5.jcn4
	- scm additions: plet, hairpin
	- website fixes

diff --git a/NEWS b/NEWS
index 9b9189af5fc3d7653241b75c4f12fb68f4b6e069..fce3556d2e26151bbfbf646597c4fbeee4e54d4f 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+pl5.jcn4
+       - scm additions: plet, hairpin
+       - website fixes
+
 pl5.jcn3
        - website fixes
 

diff --git a/VERSION b/VERSION
index 8d9330e3fa8a9f7dca7763914e3c054e5e298b73..f22cd6d233dff60057f1b8cd0be5fed670bc8af2 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=1
 PATCH_LEVEL=5
-MY_PATCH_LEVEL=jcn3
+MY_PATCH_LEVEL=jcn4
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/init/lily.scm b/init/lily.scm
index aadf071f12a16e889eef21e74415ba90c7d34cf6..4d29ce239fe852a9203e6fcf297ff6304e103832 100644 (file)
--- a/init/lily.scm
+++ b/init/lily.scm
@@ -100,10 +100,38 @@
   (char o n) 
   ((invoke-output o "invoke-char") "show" n))
 
+(define 
+  (crescendo o w h cont)
+  ((invoke-output o "crescendo") w h cont))
+
+(define 
+  (crescendo-ps w h cont)
+  (string-append 
+   (numbers->string (list w h (inexact->exact cont)))
+   "draw_crescendo"))
+
+(define 
+  (crescendo-tex w h cont)
+  (embedded-ps-tex (crescendo-ps w h cont)))
+
 (define 
   (dashed-slur o thick dash l) 
   ((invoke-output o "dashed-slur") thick dash l))
 
+(define 
+  (decrescendo o w h cont)
+  ((invoke-output o "decrescendo") w h cont))
+
+(define 
+  (decrescendo-ps w h cont)
+  (string-append 
+   (numbers->string (list w h (inexact->exact cont)))
+   "draw_decrescendo"))
+
+(define 
+  (decrescendo-tex w h cont)
+  (embedded-ps-tex (decrescendo-ps w h cont)))
+
 (define 
   (dashed-slur-ps thick dash l)
   (string-append 
@@ -424,4 +452,17 @@
   (string-append "\\set" f "{" s "}"))
 
 
+(define 
+  (tuplet o dx dy dir)
+  ((invoke-output o "tuplet") dx dy dir))
+
+(define 
+  (tuplet-ps dx dy dir)
+  (string-append 
+   (numbers->string (list dx dy (inexact->exact dir)))
+   "draw_tuplet"))
+
+(define 
+  (tuplet-tex dx dy dir)
+  (embedded-ps-tex (tuplet-ps dx dy dir)))
 

diff --git a/input/test/GNUmakefile b/input/test/GNUmakefile
index 9d0326d15fbda7c07da5ce94cbc67d053baad677..39f71e418c456f7c6e7ca1a9a8782eea897269f0 100644 (file)
--- a/input/test/GNUmakefile
+++ b/input/test/GNUmakefile
@@ -1,7 +1,7 @@
 # input/test/Makefile
 
 depth = ../..
-examples=font20 hara-kiri grace mark denneboom slurs
+examples=font20 hara-kiri grace mark denneboom sleur
 LOCALSTEPMAKE_TEMPLATES=mutopia
 
 include $(depth)/make/stepmake.make 

diff --git a/input/test/mark.ly b/input/test/mark.ly
index 7b2f99823c90d67d76570b2168dd15ba868e8a75..e730c90c0aa68257408440a3507f4f0a95d97d34 100644 (file)
--- a/input/test/mark.ly
+++ b/input/test/mark.ly
@@ -20,6 +20,6 @@ two = \notes\relative c{
 \score{
        < \global \one \two >
        \paper {
-               \translator { \BarNumberingStaffContext }
+               \translator { \OrchestralPartStaffContext }
        }
 }

diff --git a/lily/lookup.cc b/lily/lookup.cc
index 63259a3cc7b9eb0b62726184070973f18eff8bed..e579ca8231ea38be88313c4a66b63c945f68f394 100644 (file)
--- a/lily/lookup.cc
+++ b/lily/lookup.cc
@@ -449,12 +449,13 @@ Lookup::hairpin (Real width, bool decresc, bool continued) const
 {
   Atom a;  
   Real height = paper_l_->staffheight_f () / 6;
-  String ps;
-  ps += to_str (width) + " " 
-    + to_str (height) + " " 
-    + to_str (continued ? height/2 : 0) + 
-    + " draw_"  + String (decresc ? "de" : "") + "cresc\n";
-  a.str_ = ps;
+  Array<Real> arr;
+  arr.push (width);
+  arr.push (height);
+  arr.push (continued ? height/2 : 0);
+  String hairpin = String (decresc ? "de" : "") + "crescendo\n";
+  a.lambda_ = (lambda_scm (hairpin, arr));
+  a.str_ = "hairpin";
   a.dim_.x () = Interval (0, width);
   a.dim_.y () = Interval (-2*height, 2*height);
   a.font_ = font_;
@@ -464,15 +465,13 @@ Lookup::hairpin (Real width, bool decresc, bool continued) const
 Atom
 Lookup::plet (Real dy , Real dx, Direction dir) const
 {
-  String ps;
-    
-  ps += String_convert::double_str (dx) + " " 
-    + String_convert::double_str (dy) + " "
-    + String_convert::int_str ( (int)dir) +
-    " draw_plet ";
-
+  Array<Real> arr;
+  arr.push (dx);
+  arr.push (dy);
+  arr.push (dir);
   Atom a;
-  a.str_ = ps;
+  a.lambda_ = (lambda_scm ("tuplet", arr));
+  a.str_ = "plet";
   return a;
 }
 
@@ -481,8 +480,6 @@ Lookup::slur (Array<Offset> controls) const
 {
   assert (controls.size () == 8);
 
-  String ps;
-  
   Real dx = controls[3].x () - controls[0].x ();
   Real dy = controls[3].y () - controls[0].y ();
   Atom a;

diff --git a/ps/lily.ps b/ps/lily.ps
index c0b92bdcef3caeaa7f7866941d3174f0f6c073f1..56745b521bfa85d6790625680d154dde5ab46275 100644 (file)
--- a/ps/lily.ps
+++ b/ps/lily.ps
@@ -18,7 +18,7 @@
         closepath fill
 } bind def
 %
-/draw_decresc
+/draw_decrescendo % cont height width
 {
        stafflinethickness setlinewidth
        /cresc_cont exch def
@@ -33,7 +33,7 @@
        stroke
 } bind def
 %
-/draw_cresc
+/draw_crescendo % cont height width
 {
        stafflinethickness setlinewidth
        /cresc_cont exch def
@@ -53,29 +53,29 @@
        1 copy mul exch 1 copy mul add sqrt
 } bind def
 %
-stafflinethickness 1.2 mul /plet_t exch def
-/draw_plet
+stafflinethickness 1.2 mul /tuplet_t exch def
+/draw_tuplet
 {
-       plet_t setlinewidth
+       tuplet_t setlinewidth
 % urg: the only Level-2 PS, check effect in print
 %      true setstrokeadjust
        1 setlinecap
        1 setlinejoin
        /dir exch def
-       /plet_dy exch def
-       /plet_dx exch def
-       staffheight 2 div /plet_gapx exch def
-       plet_dy plet_dx div plet_gapx mul /plet_gapy exch def
-       staffheight 4 div dir mul /plet_h exch def
+       /tuplet_dy exch def
+       /tuplet_dx exch def
+       staffheight 2 div /tuplet_gapx exch def
+       tuplet_dy tuplet_dx div tuplet_gapx mul /tuplet_gapy exch def
+       staffheight 4 div dir mul /tuplet_h exch def
 %
        0 0 moveto
-       0 plet_h lineto 
-       plet_dx plet_gapx sub 2 div 
-               plet_dy plet_gapy sub 2 div plet_h add lineto
-       plet_dx plet_gapx add 2 div 
-               plet_dy plet_gapy add 2 div plet_h add moveto
-       plet_dx plet_dy plet_h add lineto
-       plet_dx plet_dy lineto
+       0 tuplet_h lineto 
+       tuplet_dx tuplet_gapx sub 2 div 
+               tuplet_dy tuplet_gapy sub 2 div tuplet_h add lineto
+       tuplet_dx tuplet_gapx add 2 div 
+               tuplet_dy tuplet_gapy add 2 div tuplet_h add moveto
+       tuplet_dx tuplet_dy tuplet_h add lineto
+       tuplet_dx tuplet_dy lineto
        stroke
 } bind def
 %