From: fred <fred>
Date: Tue, 26 Mar 2002 22:44:39 +0000 (+0000)
Subject: lilypond-1.3.16
X-Git-Tag: release/1.5.59~1933
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=22631bcf508c5515a33d876f4f5cb3ae5ce94a20;p=lilypond.git

lilypond-1.3.16
---

diff --git a/input/test/auto-isknee.ly b/input/test/auto-isknee.ly
new file mode 100644
index 0000000000..f2b30b932a
--- /dev/null
+++ b/input/test/auto-isknee.ly
@@ -0,0 +1,26 @@
+
+\score {
+	\notes \context PianoStaff <
+		\context Staff = "up" {
+			\autochange Staff \relative c' { 
+				[c8 e'] [c' c,,]
+				\stemdown
+				c'8 c c g,
+				g8 d' d d 
+				\stemup
+				b8 c d e
+			}
+		}
+		\context Staff = "down" {
+			\clef bass; 
+			s1*2
+		}
+	>
+	\paper{
+		\translator{
+			\StaffContext
+			autoKneeGap = #13.0
+			autoInterstaffKneeGap = #4.0
+		}
+	}
+}
diff --git a/input/test/auto-knee.ly b/input/test/auto-knee.ly
index e6541ec2ef..3a3fbf55d2 100644
--- a/input/test/auto-knee.ly
+++ b/input/test/auto-knee.ly
@@ -1,26 +1,13 @@
 
 \score {
-	\notes \context PianoStaff <
-		\context Staff = "up" {
-			\autochange Staff \relative c' { 
-				[c8 e'] [c' c,,]
-				\stemdown
-				c'8 c c g,
-				g8 d' d d 
-				\stemup
-				b8 c d e
-			}
-		}
-		\context Staff = "down" {
-			\clef bass; 
-			s1*2
-		}
-	>
+	  \context Staff \notes\relative c'{ 
+%	  	\property Voice.autoKneeGap = #13
+	  	[c8 e'] [c' c,,]
+	}
 	\paper{
 		\translator{
 			\StaffContext
-			autoKneeGap = "13.0";
-			autoInterstaffKneeGap = "4.0";
+			autoKneeGap = #13
 		}
 	}
 }
diff --git a/input/test/beam-quanting.ly b/input/test/beam-quanting.ly
new file mode 100644
index 0000000000..f0f9cc1ef0
--- /dev/null
+++ b/input/test/beam-quanting.ly
@@ -0,0 +1,17 @@
+%{
+Have some fun beam quanting
+%}
+
+% no y quantising
+#(define (beam-vertical-position-quants m dy) '())
+
+% rediculous dy quanting
+#(define beam-height-quants '(0 4))
+
+\score {
+    \notes\relative c'{
+        c8 c c c
+        c8 e g a
+        c,8 f b e
+    }
+}
diff --git a/lily/include/musical-pitch.hh b/lily/include/musical-pitch.hh
index d4d0a60854..54899cabb4 100644
--- a/lily/include/musical-pitch.hh
+++ b/lily/include/musical-pitch.hh
@@ -12,6 +12,7 @@
 
 #include "lily-proto.hh"
 #include "input.hh"
+#include "lily-guile.hh" // we need SCM
 
 /** A "tonal" pitch. This is a pitch as it figures in diatonal western
    music (12 semitones in an octave), as opposed to a frequence in Hz
@@ -43,6 +44,9 @@ struct Musical_pitch : public Input
   void print () const;
 };
 
+SCM to_scm (Musical_pitch p);
+void scm_to (SCM s, Musical_pitch* p);
+
 #include "compare.hh"
 INSTANTIATE_COMPARE(Musical_pitch, Musical_pitch::compare);
 
diff --git a/lily/musical-pitch.cc b/lily/musical-pitch.cc
index 409c71d92b..d60a1fb832 100644
--- a/lily/musical-pitch.cc
+++ b/lily/musical-pitch.cc
@@ -10,6 +10,26 @@
 #include "debug.hh"
 #include "main.hh"
 
+SCM
+to_scm (Musical_pitch p)
+{
+  return gh_list (gh_int2scm (p.notename_i_),
+		  gh_int2scm (p.accidental_i_),
+		  gh_int2scm (p.octave_i_),
+		  SCM_UNDEFINED);
+}
+
+/*
+  TODO: check -- is_pitch () ?
+ */
+void
+scm_to (SCM s, Musical_pitch* p)
+{
+  *p = Musical_pitch (gh_scm2int (gh_car (s)),
+		      gh_scm2int (gh_cadr (s)),
+		      gh_scm2int (gh_caddr (s)));
+}
+
 Musical_pitch::Musical_pitch (int n, int a, int o)
 {
   notename_i_ = n;
diff --git a/ly/generic-paper.ly b/ly/generic-paper.ly
index a4140bb73b..3e3f28c450 100644
--- a/ly/generic-paper.ly
+++ b/ly/generic-paper.ly
@@ -1,3 +1,6 @@
+
+#(eval-string (ly-gulp-file "paper.scm"))
+
 \paper {
 	texsetting = "";
 	pssetting = "";
diff --git a/scm/lily.scm b/scm/lily.scm
index ce8c9eec87..f35e747fef 100644
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -142,10 +142,6 @@
 	       '(minimum-space 0.0)))))
   
 
-;; Measured in interlines (urg: how to say #interline?)
-(define (stem-shorten flags) 0.5)
-(define (beamed-stem-shorten multiplicity) 0.5)
-
 
 ;;;;;;;; TeX