From: fred <fred>
Date: Wed, 27 Mar 2002 00:48:16 +0000 (+0000)
Subject: lilypond-1.3.124
X-Git-Tag: release/1.5.59~971
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=8217585e00a294f8b4fbb286bbe8f4e5d48a8430;p=lilypond.git

lilypond-1.3.124
---

diff --git a/input/test/markup.ly b/input/test/markup.ly
index 6a46921ef0..07f3ecb1bf 100644
--- a/input/test/markup.ly
+++ b/input/test/markup.ly
@@ -9,15 +9,15 @@
 	\notes\relative c''{
 		\stemUp
 		a-"text"
-		b-\textscript #"texta"
-		c-\textscript #'(bold "textb")
+		b-#"texta"
+		c-#'(bold "textb")
 
-		d-\textscript #'(lines "one" "two" "three")
-		e-\textscript #'(lines (bold "one") 
+		d-#'(lines "one" "two" "three")
+		e-#'(lines (bold "one") 
 		  (rows "and" "there" "is" ((font-family . number) "2"))
 		  (italic "three"))
-		f-\textscript #'(finger "3")
-		g-\textscript #'(music (named "noteheads-2" "flags-u3"))
+		f-#'(finger "3")
+		g-#'(music (named "noteheads-2" "flags-u3"))
 		
 		b-#'(rows "a" ((kern . 3) ((raise . 2) "b")) "c")
 		c-#'(rows "1" ((kern . -3) ((raise . -2) "2")) "3")
diff --git a/input/test/rhythmic-staff.ly b/input/test/rhythmic-staff.ly
index 9670f5b44b..44a5c6d184 100644
--- a/input/test/rhythmic-staff.ly
+++ b/input/test/rhythmic-staff.ly
@@ -1,8 +1,15 @@
 \score{
   \context RhythmicStaff {
     \notes\relative c''{ 
+      \clef percussion;
       \time 4/4; 
       r4 r g2 | r4 g r2 | g1:32 | r1 |
     }
   }
+  \paper{
+    \translator{
+      \RhythmicStaffContext
+      \consists "Clef_engraver"; % Doesn't work!?
+    }
+  }
 }
diff --git a/input/test/textscript.ly b/input/test/textscript.ly
new file mode 100644
index 0000000000..7ca80d427f
--- /dev/null
+++ b/input/test/textscript.ly
@@ -0,0 +1,21 @@
+\version "1.3.123";
+
+%
+% Test font selection and scm text markup
+%
+
+\score{
+  \notes\relative c''{
+    c'1^#'(rows (dynamic "p") " ma sosten.") 
+    c^#'(bold "ABCD")
+    c^#'(rows "Dal " (music "scripts-segno")) 
+    c^#'(Large "ABCD") 
+    \break
+    \property Voice . TextScript \override #'font-shape = #'upright
+    c1^#'(rows (dynamic "p") " ma sosten.")  
+    c^#'(bold "ABCD")
+    \property Voice . TextScript \override #'font-series = #'bold
+    c^#'(rows "Dal " (music "scripts-segno")) 
+    c^#'(Large "ABCD")
+  }
+}
diff --git a/mf/feta-klef.mf b/mf/feta-klef.mf
index d70391ed36..44eee6ca8d 100644
--- a/mf/feta-klef.mf
+++ b/mf/feta-klef.mf
@@ -1050,5 +1050,22 @@ fet_beginchar("Hufnagel do/fa clef", "hufnagel_do_fa_change",
 	draw_hufnagel_do_fa_clef((0,0), .8);
 fet_endchar;
 
+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;
+	draw (b,h) -- (b,-d);
+	draw (w,h) -- (w,-d);
+enddef;
+
+fet_beginchar("percussion clef", "percussion", "percussionclef")
+	draw_percussion_clef(1.0);
+fet_endchar;
+
+fet_beginchar("percussion clef", "percussion_change", "cpercussionclef")
+	draw_percussion_clef(.8);
+fet_endchar;
 
 fet_endgroup("clefs");
diff --git a/scm/clef.scm b/scm/clef.scm
index 75451eafe2..e3c3215e1f 100644
--- a/scm/clef.scm
+++ b/scm/clef.scm
@@ -19,6 +19,7 @@
 	  ("bass" . ("clefs-F" 2  0))
 	  ("F" . ( "clefs-F" 2 0))
 	  ("subbass" . ("clefs-F" 4 0))
+          ("percussion" . ("clefs-percussion" 0 0))
 
 	  ;; should move mensural stuff to separate file? 
 	  ("vaticana_do1" . ("clefs-vaticana_do" -1 0))
diff --git a/scm/font.scm b/scm/font.scm
index ffa1c28c47..fe66eb1d9f 100644
--- a/scm/font.scm
+++ b/scm/font.scm
@@ -199,7 +199,8 @@
 	(mark . ((font-family . number) (font-relative-size . 1)))
 	(script . ((font-family . roman) (font-relative-size . -1)))
 	(large . ((font-family . roman) (font-relative-size . 1)))
-	(Large . ((font-series . bold) (font-family . roman) (font-relative-size . 2)))
+	(Large . ((font-series . bold) (font-shape . upright) 
+		  (font-family . roman) (font-relative-size . 2)))
 	(dynamic . ((font-family . dynamic) (font-relative-size . 0)))
 	))
     (properties-to-font .