From 9e6d18db41861467f65c8952072e108921c10813 Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Wed, 27 Mar 2002 00:48:58 +0000
Subject: [PATCH] lilypond-1.3.129

---
 input/regression/clefs.ly     | 13 +++++++----
 input/test/coriolan-margin.ly |  2 +-
 input/test/incipit.ly         | 41 +++++++++++++++++++++--------------
 input/test/mark.ly            |  4 ----
 ly/property.ly                |  3 ++-
 mf/feta-klef.mf               |  4 ++--
 6 files changed, 39 insertions(+), 28 deletions(-)

diff --git a/input/regression/clefs.ly b/input/regression/clefs.ly
index 834595b0ca..5b01e40d69 100644
--- a/input/regression/clefs.ly
+++ b/input/regression/clefs.ly
@@ -26,12 +26,17 @@ way, so this is fragile as well.
          \clef "G^8";c'1^"{sup 8?}" c'1 \bar "||";
          \clef "bass";c'1^"{bass}" \bar "||";
          \clef "subbass";c'1^"{subbass}" \bar "||";
-	\property Staff.clefStyle="transparent"
-         \clef "treble"; c'1^"clefStyle=\"transparent\"" \bar "||";
-	\property Staff.clefStyle="fullSizeChanges"
-         \clef "treble"; c'1^"clefStyle=\"fullSizeChanges\"" \bar "|.";
+	 \property Staff.Clef \override #'transparent = ##t
+         \clef "treble"; c'1^"transparent=\#t" \bar "||";
+	 \property Staff.Clef \override #'transparent = ##f
+	 \context Staff \outputproperty #(make-type-checker 'clef-interface) #'full-size-change = ##t
+         \clef "french"; c'1^"full-size-change = \#t" \bar "|.";
          }
          \paper{
+	   \translator{
+	     \StaffContext
+%	     Clef \override #'full-size-change = ##t
+	   }
          }
 }
 
diff --git a/input/test/coriolan-margin.ly b/input/test/coriolan-margin.ly
index 7cfbd25c48..a85403af93 100644
--- a/input/test/coriolan-margin.ly
+++ b/input/test/coriolan-margin.ly
@@ -119,7 +119,7 @@ violoncello = \notes \relative c' {
 	}
 
   \paper {
-  	\paper_sixteen
+  	\paperSixteen
   	indent=100.0\mm;
   	linewidth=150.0\mm;
     \translator {
diff --git a/input/test/incipit.ly b/input/test/incipit.ly
index febbe7127c..b65dcf1eb5 100644
--- a/input/test/incipit.ly
+++ b/input/test/incipit.ly
@@ -8,20 +8,30 @@
 
 \version "1.3.117";
 
-incipit =  \notes\relative c'{
-  <b1 fis' b d>
+violinincipit =  \notes\relative c''{
+  \clef "french";
+  \time 2/2;
+  \property Staff.TimeSignature \override #'style = #'old
+  a4. b8 c4 fis |
+%  <b1 fis' b d>
+  \property Staff.TimeSignature \override #'style = #'C
 }
 
-emptyincipit =  \notes{
- s1
+bcincipit =  \notes\relative c{
+  \clef bass;
+  \property Staff.TimeSignature \override #'style = #'old
+  b2. cis4 | 
+  \property Staff.TimeSignature \override #'style = #'C
 }
 
 violin =  \notes\relative c''{
-  \specialkey \keysignature f' fis'' g' gis'';
+% Key signatures with different alterations in different octaves
+% are broken since 1.3.58!
+%  \specialkey \keysignature f' fis'' g' gis'';
+  \key d \major;
   \time 2/2;
-  \clef "treble";
+  \clef treble;
 
-  \key;
   a4. b8 c4 fis |
   gis~ gis8 fis16^\trill ()e b8 c \context Staff<{\voiceOne a d}{\voiceTwo es,4}>|
 }
@@ -39,20 +49,19 @@ BC  = \notes\relative c{
 \score{
   <
     \context Staff = violin {\notes{
-      \property Staff.clefStyle = "transparent" 
-      \incipit \bar ".|"; \endincipit
+      \property Staff.Clef \override #'transparent = ##t
+      \violinincipit \bar ".|"; 
+      \property Staff.Clef \revert #'transparent 
+      \endincipit
       \violin
     }}
     \context Staff = BC{\notes{
-      \property Staff.clefStyle = "transparent" 
-      \emptyincipit \bar ".|"; \endincipit
+      \property Staff.Clef \override #'transparent = ##t
+      \bcincipit \bar ".|"; 
+      \property Staff.Clef \revert #'transparent 
+      \endincipit
       \BC
     }}
   >
-  \paper{
-    \translator{\StaffContext
-      timeSignatureStyle = "C";
-    }
-  }
 }  
 
diff --git a/input/test/mark.ly b/input/test/mark.ly
index 0222093bf1..948f230197 100644
--- a/input/test/mark.ly
+++ b/input/test/mark.ly
@@ -17,8 +17,4 @@ one =  \notes \relative c {
 
 \score{
 \context Staff	< \global \one >
-	\paper {
-		\translator { \OrchestralPartStaffContext 
-		}
-	}
 }
diff --git a/ly/property.ly b/ly/property.ly
index 028933e231..d73cf04da2 100644
--- a/ly/property.ly
+++ b/ly/property.ly
@@ -75,7 +75,8 @@ specialkey = {
 % End the incipit and print a ``normal line start''.
 endincipit = \notes{
     \partial 16; s16  % Hack to handle e.g. \bar ".|"; \endincipit
-    \property Staff.clefStyle = #"fullSizeChanges" 
+    \context Staff \outputproperty #(make-type-checker 'clef-interface) #'full-size-change = ##t
+    \context Staff \outputproperty #(make-type-checker 'clef-interface) #'non-default = ##t
     \bar "";
 }
 
diff --git a/mf/feta-klef.mf b/mf/feta-klef.mf
index 44eee6ca8d..c1e3235257 100644
--- a/mf/feta-klef.mf
+++ b/mf/feta-klef.mf
@@ -1054,8 +1054,8 @@ def draw_percussion_clef(expr reduction) =
 	save reduced_il;
 	reduced_il# = staff_space# * reduction;
 	define_pixels(reduced_il);
-	set_char_box(0,.6reduced_il#,reduced_il#,reduced_il#);
-        pickup pencircle scaled 1.5 stafflinethickness;
+	set_char_box(.5reduced_il#,1.25reduced_il#,reduced_il#,reduced_il#);
+        pickup pencircle scaled 3.33 stafflinethickness;
 	draw (b,h) -- (b,-d);
 	draw (w,h) -- (w,-d);
 enddef;
-- 
2.39.5