* mf/feta-autometric.mf (fet_beginchar): Check whether `feta_group'

[lilypond.git] / mf / parmesan-timesig.mf

diff --git a/mf/parmesan-timesig.mf b/mf/parmesan-timesig.mf
index cf03e8f77b011da6abfc81d5881647247021335e..9691bb0ef3212aa094eee0994290d49ab3fa3616 100644 (file)
--- a/mf/parmesan-timesig.mf
+++ b/mf/parmesan-timesig.mf
@@ -3,9 +3,9 @@
 % 
 % source file of LilyPond's pretty-but-neat music font
 % 
-% (c) 1998--2004 Mats Bengtsson <matsb@s3.kth.se>,
+% (c) 1998--2005 Mats Bengtsson <matsb@s3.kth.se>,
 %               Christian Mondrup <scancm@biobase.dk>
-% (c) 2002--2004 Juergen Reuter <reuter@ipd.uka.de>
+% (c) 2002--2005 Juergen Reuter <reuter@ipd.uka.de>
 % 
 
 fet_begingroup ("timesig")
@@ -57,10 +57,10 @@ def draw_nail (expr bottom_left, top_right) =
 
 enddef;
 
-def mensural_timesig (expr verbose_name, internal_name, ly_name,
+def mensural_timesig (expr verbose_name, internal_name,
                      full_circle, reverse_circle, slashed, dotted) =
 
-       fet_beginchar(verbose_name, internal_name, ly_name)
+       fet_beginchar(verbose_name, internal_name)
                if slashed:
                        set_char_box(0,
                                     mensural_Cdiameter# + mensural_Cthickness#,
@@ -94,47 +94,47 @@ def mensural_timesig (expr verbose_name, internal_name, ly_name,
 enddef;
 
 %% tempus imperfectum cum prolatione imperfecta
-mensural_timesig ("Mensural 4/4 meter", "mensural4/4", "mensuralfourfourmeter",
+mensural_timesig ("Mensural 4/4 meter", "mensural44",
                  false, false, false, false);
 
 %% tempus imperfectum cum prolatione imperfecta proportio dupla
-mensural_timesig ("Mensural 2/2 meter", "mensural2/2", "mensuralallabreve",
+mensural_timesig ("Mensural 2/2 meter", "mensural22",
                  false, false, true, false);
 
 %% tempus perfectum cum prolatione imperfecta
-mensural_timesig ("Mensural 3/2 meter", "mensural3/2", "mensuralthreetwometer",
+mensural_timesig ("Mensural 3/2 meter", "mensural32",
                  true, false, false, false);
 
 %% tempus imperfectum cum prolatione perfecta
-mensural_timesig ("Mensural 6/4 meter", "mensural6/4", "mensuralsixfourmeter",
+mensural_timesig ("Mensural 6/4 meter", "mensural64",
                  false, false, false, true);
 
 %% tempus perfectum cum prolatione perfecta
-mensural_timesig ("Mensural 9/4 meter", "mensural9/4", "mensuralninefourmeter",
+mensural_timesig ("Mensural 9/4 meter", "mensural94",
                  true, false, false, true);
 
 %% tempus perfectum cum prolatione imperfecta proportio dupla
-mensural_timesig ("Mensural 3/4 meter", "mensural3/4", "mensuralthreefourmeter",
+mensural_timesig ("Mensural 3/4 meter", "mensural34",
                  true, false, true, false);
 
 %% tempus imperfectum cum prolatione perfecta proportio dupla
-mensural_timesig ("Mensural 6/8 meter", "mensural6/8", "mensuralsixeightmeter",
+mensural_timesig ("Mensural 6/8 meter", "mensural68",
                  false, false, true, true);
 
 %% tempus perfectum cum prolatione perfecta proportio dupla
-mensural_timesig ("Mensural 9/8 meter", "mensural9/8", "mensuralnineeight",
+mensural_timesig ("Mensural 9/8 meter", "mensural98",
                  true, false, true, true);
        
 %% tempus imperfectum cum prolatione imperfecta diminutio simplex
-mensural_timesig ("Mensural 4/8 meter", "mensural4/8", "mensuralfoureightmeter",
+mensural_timesig ("Mensural 4/8 meter", "mensural48",
                  false, true, false, false);
 
 %% tempus imperfectum cum prolatione perfecta diminutio simplex
-mensural_timesig ("Mensural 6/8 meter", "mensural6/8alt", "mensuralsixeightmeteralt",
+mensural_timesig ("Mensural 6/8 meter", "mensural68alt",
                  false, true, false, true);
 
 %% tempus imperfectum cum prolatione imperfecta diminutio duplex
-mensural_timesig ("Mensural 2/4 meter", "mensural2/4", "mensuraltwofourmeter",
+mensural_timesig ("Mensural 2/4 meter", "mensural24",
                  false, true, true, false);
 
 %%%%%%%%
@@ -151,10 +151,10 @@ neomensural_Cdiameter# := 3/2 staff_space#;
 neomensural_Cthickness# := 2 linethickness#;
 define_pixels(neomensural_Cdiameter, neomensural_Cthickness);
 
-def neomensural_timesig (expr verbose_name, internal_name, ly_name,
+def neomensural_timesig (expr verbose_name, internal_name,
                         full_circle, reverse_circle, slashed, dotted) =
 
-       fet_beginchar(verbose_name, internal_name, ly_name)
+       fet_beginchar(verbose_name, internal_name)
                if slashed:
                        set_char_box(0,
                                     neomensural_Cdiameter# + neomensural_Cthickness#,
@@ -188,47 +188,47 @@ def neomensural_timesig (expr verbose_name, internal_name, ly_name,
 enddef;
 
 %% tempus imperfectum cum prolatione imperfecta
-neomensural_timesig ("Mensural 4/4 meter", "neomensural4/4", "neomensuralfourfourmeter",
+neomensural_timesig ("Mensural 4/4 meter", "neomensural44",
                        false, false, false, false);
 
 %% tempus imperfectum cum prolatione imperfecta proportio dupla
-neomensural_timesig ("Mensural 2/2 meter", "neomensural2/2", "neomensuralallabreve",
+neomensural_timesig ("Mensural 2/2 meter", "neomensural22",
                        false, false, true, false);
 
 %% tempus perfectum cum prolatione imperfecta
-neomensural_timesig ("Mensural 3/2 meter", "neomensural3/2", "neomensuralthreetwometer",
+neomensural_timesig ("Mensural 3/2 meter", "neomensural32",
                        true, false, false, false);
 
 %% tempus imperfectum cum prolatione perfecta
-neomensural_timesig ("Mensural 6/4 meter", "neomensural6/4", "neomensuralsixfourmeter",
+neomensural_timesig ("Mensural 6/4 meter", "neomensural64",
                        false, false, false, true);
 
 %% tempus perfectum cum prolatione perfecta
-neomensural_timesig ("Mensural 9/4 meter", "neomensural9/4", "neomensuralninefourmeter",
+neomensural_timesig ("Mensural 9/4 meter", "neomensural94",
                        true, false, false, true);
 
 %% tempus perfectum cum prolatione imperfecta proportio dupla
-neomensural_timesig ("Mensural 3/4 meter", "neomensural3/4", "neomensuralthreefourmeter",
+neomensural_timesig ("Mensural 3/4 meter", "neomensural34",
                        true, false, true, false);
 
 %% tempus imperfectum cum prolatione perfecta proportio dupla
-neomensural_timesig ("Mensural 6/8 meter", "neomensural6/8", "neomensuralsixeightmeter",
+neomensural_timesig ("Mensural 6/8 meter", "neomensural68",
                        false, false, true, true);
 
 %% tempus perfectum cum prolatione perfecta proportio dupla
-neomensural_timesig ("Mensural 9/8 meter", "neomensural9/8", "neomensuralnineeight",
+neomensural_timesig ("Mensural 9/8 meter", "neomensural98",
                        true, false, true, true);
        
 %% tempus imperfectum cum prolatione imperfecta diminutio simplex
-neomensural_timesig ("Mensural 4/8 meter", "neomensural4/8", "neomensuralfoureightmeter",
+neomensural_timesig ("Mensural 4/8 meter", "neomensural48",
                        false, true, false, false);
 
 %% tempus imperfectum cum prolatione perfecta diminutio simplex
-neomensural_timesig ("Mensural 6/8 meter", "neomensural6/8alt", "neomensuralsixeightmeteralt",
+neomensural_timesig ("Mensural 6/8 meter", "neomensural68alt",
                        false, true, false, true);
 
 %% tempus imperfectum cum prolatione imperfecta diminutio duplex
-neomensural_timesig ("Mensural 2/4 meter", "neomensural2/4", "neomensuraltwofourmeter",
+neomensural_timesig ("Mensural 2/4 meter", "neomensural24",
                        false, true, true, false);
 
 fet_endgroup ("timesig")