lilypond-1.3.75

diff --git a/ly/params-as.ly b/ly/params-as.ly
index f06f633e0f110d72db6c0eca60e09298be70bdc4..01e44e8281163ccf3a922dda3c0f0e50ac08bd9d 100644 (file)
--- a/ly/params-as.ly
+++ b/ly/params-as.ly
@@ -1,8 +1,6 @@
 % params-as.ly
 % generic paper parameters
 
-#'staff-height = \staffheight;
-
 %%paperfile = \papersize + ".ly";
 %%% paperfile = "a4.ly";
 %%\include \paperfile;
@@ -23,9 +21,6 @@ interline = \staffspace;
 % urg, need grace_ versions of these too?
 beam_thickness = 0.52 * (\staffspace - \stafflinethickness);
 
-#'beam-thickness = \beam_thickness;  %% UGR
-
-
 interbeam = (2.0 * \staffspace + \stafflinethickness - \beam_thickness) / 2.0;
 interbeam4 = (3.0 * \staffspace - \beam_thickness) / 3.0;
 
@@ -117,7 +112,7 @@ tie_thickness = 1.2 * \stafflinethickness;
 %{
  Specifies the maximum height of slurs.
 %}
-slur_height_limit = \staffheight;
+slur_height_limit_factor = \staffheight;
 
 
 %{
@@ -143,21 +138,9 @@ method.
 %}
 gourlay_maxmeasures = 10.;
 
-bar_kern = 1.0\char;
-bar_thinkern = 1.0\char;
-barthick_thick = 2.0\char;
-barthick_score = 1.0\char;
-barthick_thin = 1.0\char;
-
-bracket_arch_thick = \staffspace / 3.0;
-bracket_width = 2.0 * \staffspace;
-bracket_thick = 2.0 * \stafflinethickness;
-bracket_arch_height = 1.5 * \staffspace;
-bracket_arch_width = \bracket_arch_height;
-bracket_arch_angle = 50.0;
-
-tuplet_spanner_gap = 2.0 * \staffspace;
-tuplet_thick = 1.0\char;
+% vertical space between lines.
+line_kern = \staffspace;
+
 volta_thick = 1.0\char;
 volta_spanner_height = 1.0\char;
 
@@ -243,14 +226,3 @@ Wordwrap =0.0;
 
 \include "engraver.ly";
 
-
-#'margin-shape = #'()
-
-
-% 
-#'Local_key_item::left-padding = #'0.2
-#'Local_key_item::right-padding = #'0.4
-
-#'Staff_symbol::staff-space = \staffspace ;
-#'Staff_symbol::line-count = #5
-

diff --git a/scm/lily.scm b/scm/lily.scm
index 99f21eb25bd8218d76ed7ac433ecb5d5f73aec73..c22f512b8ab30472eb9d6575c9942f451ee4792c 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -778,6 +778,8 @@
   (define (char i)
     (func "char" i))
 
+  (define (define-origin a b c ) "")
+
   (define (end-output) 
     (func "end-output"))
   
@@ -819,6 +821,8 @@
           (string-append "(define " key " " (arg->string val) ")\n")
           ""))
 
+  (define (no-origin) "")
+  
   (define (placebox x y s) 
     (let ((ey (inexact->exact y)))
          (string-append "(move-to " (number->string (inexact->exact x)) " "
@@ -847,6 +851,8 @@
   (define (text s)
          (func "text" s))
 
+  (define (tuplet ht gap dx dy thick dir) "")
+
   (define (volta h w thick vert-start vert-end)
          ;; urg
          (string-append
@@ -871,6 +877,7 @@
            (define beam ,beam)
            (define bracket ,bracket)
            (define char ,char)
+           (define define-origin ,define-origin)
            ;;(define crescendo ,crescendo)
            (define bezier-sandwich ,bezier-sandwich)
            ;;(define dashed-slur ,dashed-slur) 
@@ -886,6 +893,7 @@
            (define lily-def ,lily-def)
            ;;(define invoke-char ,invoke-char) 
            ;;(define invoke-dim1 ,invoke-dim1)
+           (define no-origin ,no-origin)
            (define placebox ,placebox)
            (define select-font ,select-font)
            (define start-line ,start-line)
@@ -893,10 +901,10 @@
            (define stop-line ,stop-line)
            (define stop-last-line ,stop-line)
            (define text ,text)
-           ;;(define tuplet ,tuplet)
+           (define tuplet ,tuplet)
            (define volta ,volta)
            ))
-       ;;((eq? action-name 'tuplet) tuplet)
+       ((eq? action-name 'tuplet) tuplet)
        ;;((eq? action-name 'beam) beam)
        ;;((eq? action-name 'bezier-sandwich) bezier-sandwich)
        ;;((eq? action-name 'bracket) bracket)