(beam): add function.

(draw-line): new routine.
(dashed-line): stub; call draw-line

diff --git a/ChangeLog b/ChangeLog
index 604bea1851b39a160c0677a3e751a5d9569384f0..ce3c6361cc974c09ff40ac1cdad7767e48b422cc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-11-16  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * scm/output-gnome.scm (beam): add function.
+       (draw-line): new routine.
+       (dashed-line): stub; call draw-line
+
 2004-11-15  Werner Lemberg  <wl@gnu.org>
 
        * Documentation/user/lilypond-book.itely: Revise section on

diff --git a/lily/lookup.cc b/lily/lookup.cc
index 801ead580108d8dcfe1db905f5f2faae9813b450..ad082dc806eb508c85d42126b3ec6c84840d3d6d 100644 (file)
--- a/lily/lookup.cc
+++ b/lily/lookup.cc
@@ -653,7 +653,7 @@ Lookup::repeat_slash (Real w, Real s, Real t)
   SCM sl = scm_make_real (s);
   SCM thick = scm_make_real (t);
   SCM slashnodot = scm_list_n (ly_symbol2scm ("repeat-slash"),
-                           wid, sl, thick, SCM_UNDEFINED);
+                              wid, sl, thick, SCM_UNDEFINED);
 
   Box b (Interval (0, w + sqrt (sqr (t/s) + sqr (t))),
         Interval (0, w * s));

diff --git a/scm/lily.scm b/scm/lily.scm
index 1fc5afbe898474debb929a2d5402259bd633aa8f..b3d4b0127160fa6bdbfcee4d2dd5059bf94bf98e 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -134,7 +134,6 @@ predicates. Print a message at LOCATION if any predicate failed."
     repeat-slash
     round-filled-box
     text
-    tuplet
     white-dot
     white-text
     zigzag-line

diff --git a/scm/output-gnome.scm b/scm/output-gnome.scm
index 5bfc43d5fe40164b07ab16dae0e5360fe3e1ad54..2d137c27755ff4bb3028c6c8eb32c14bfad0eb1a 100644 (file)
--- a/scm/output-gnome.scm
+++ b/scm/output-gnome.scm
@@ -261,6 +261,25 @@ lilypond -fgnome input/simple-song.ly
     props))
     
 
+(define (dashed-line thick on off dx dy)
+  (draw-line thick 0 0 dx dy)) 
+
+(define (draw-line thick fx fy tx ty)
+  (let*
+      ((def (make <gnome-canvas-path-def>))
+       (props (make <gnome-canvas-bpath>
+                  #:parent (canvas-root)
+                  #:fill-color "black"
+                  #:outline-color "black"
+                  #:width-units thick)))
+    
+    (reset def)
+    (moveto def fx (- fy))
+    (lineto def tx (- ty))
+    (set-path-def props def)
+    props))
+    
+
 (define (round-filled-box breapth width depth height blot-diameter)
   ;; FIXME: no rounded corners on rectangle...
   ;; FIXME: blot?

diff --git a/scm/output-ps.scm b/scm/output-ps.scm
index edc25b84e72bfb08419aa413b232f40626d78bb3..ae0d93e306754708f7d717fe8069643ad3d4b560 100644 (file)
--- a/scm/output-ps.scm
+++ b/scm/output-ps.scm
@@ -40,7 +40,6 @@
             round-filled-box
             text
             white-text
-            tuplet
             polygon
             draw-line
             no-origin

diff --git a/scm/output-tex.scm b/scm/output-tex.scm
index 70da599df2445f1213d38e16dc38db4013f7bec2..c8ac8ec04ed1dce379ff0d3127b992cbc0aa647d 100644 (file)
--- a/scm/output-tex.scm
+++ b/scm/output-tex.scm
@@ -42,7 +42,6 @@
             round-filled-box
             text
             white-text
-            tuplet
             polygon
             draw-line
             no-origin
@@ -172,9 +171,6 @@
 (define (white-text scale s)
    (embedded-ps (list 'white-text scale s)))
    
-(define (tuplet ht gapx dx dy thick dir)
-  (embedded-ps (list 'tuplet  ht gapx dx dy thick dir)))
-
 (define (polygon points blotdiameter)
   (embedded-ps (list 'polygon `(quote ,points) blotdiameter)))