From: Han-Wen Nienhuys Date: Sat, 31 Jul 2004 19:40:59 +0000 (+0000) Subject: (print): use music_font_alist_chain(). This X-Git-Tag: release/2.3.10~15 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=b342db300b355af0cc99934b89a6764ca25dd1e2;p=lilypond.git (print): use music_font_alist_chain(). This fixes smaller cautionaries. --- diff --git a/ChangeLog b/ChangeLog index 0c49faebdb..ecf4c2a1ed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2004-07-31 Han-Wen Nienhuys + * mf/parmesan*.mf (threequartercircle): change neo_mensural to + neomensural. + * input/test/trills.ly: remove. * input/test/transposition.ly: remove. diff --git a/input/regression/note-head-style.ly b/input/regression/note-head-style.ly index e705902925..d81b16661c 100644 --- a/input/regression/note-head-style.ly +++ b/input/regression/note-head-style.ly @@ -1,4 +1,4 @@ -\version "2.3.4" +\version "2.3.9" \header{ texidoc=" Note head shapes may be set from several choices. @@ -36,7 +36,7 @@ pattern = << \pattern \break - \override Staff.NoteHead #'style = #'neo_mensural + \override Staff.NoteHead #'style = #'neomensural s1*0^\markup { "neomensural" } \pattern diff --git a/input/test/ancient-font.ly b/input/test/ancient-font.ly index bdbd7d7f12..64ffbea727 100644 --- a/input/test/ancient-font.ly +++ b/input/test/ancient-font.ly @@ -1,4 +1,4 @@ -\version "2.3.8" +\version "2.3.9" % TODO: split ancient-font into seperate files; possibly in % different locations. \header { @@ -121,8 +121,8 @@ lowerStaff = \context MensuralStaff = lowerStaff << \transpose c c { \set autoBeaming = ##f - \override NoteHead #'style = #'neo_mensural - \override Rest #'style = #'neo_mensural + \override NoteHead #'style = #'neomensural + \override Rest #'style = #'neomensural \key a \major % FIXME: lily crashes on some (invalid?) ligatures with: @@ -134,7 +134,7 @@ lowerStaff = \context MensuralStaff = lowerStaff << cis'1 d'\breve gis'\breve e'\breve \[ e'\longa fis'\longa \] \set Staff.forceClef = ##t - \clef "neo_mensural_c2" + \clef "neomensural_c2" cis1 \bar "|" % \break % 2 (16*1) @@ -172,11 +172,11 @@ lowerStaff = \context MensuralStaff = lowerStaff << r\breve \clef "mensural_f" - % FIXME: must set Stem flag-style to #'neo_mensural to avoid + % FIXME: must set Stem flag-style to #'neomensural to avoid % segmentation fault on r8/r16/r32. (Strange: what has % Stem flag-style to do with mensural rests?) - \override Stem #'flag-style = #'neo_mensural - % FIXME: produces warnings about "flag `neo_mensurald4' (or 3) not found". + \override Stem #'flag-style = #'neomensural + % FIXME: produces warnings about "flag `neomensurald4' (or 3) not found". r2 r4 r8 r16 r16 \override Stem #'flag-style = #'mensural \set Staff.forceClef = ##t diff --git a/input/test/ancient-time.ly b/input/test/ancient-time.ly index 2bfc95fd3b..08c8474db5 100644 --- a/input/test/ancient-time.ly +++ b/input/test/ancient-time.ly @@ -1,4 +1,4 @@ -\version "2.3.8" +\version "2.3.9" % TODO: move stuff from ancient-font into here? See comment % for ancient-font.ly \header { @@ -9,7 +9,7 @@ Time signatures may also be engraved in an old style. \score { { - \override Staff.TimeSignature #'style = #'neo_mensural + \override Staff.TimeSignature #'style = #'neomensural s1 } \paper {raggedright = ##t} diff --git a/input/test/rests.ly b/input/test/rests.ly index 201189eeed..b981a9cb49 100644 --- a/input/test/rests.ly +++ b/input/test/rests.ly @@ -1,5 +1,5 @@ -\version "2.3.8" +\version "2.3.9" \header { texidoc = "@cindex Rests @@ -20,8 +20,8 @@ Rests may be used in various styles. r\longa r\breve r1 r2 r4 r8 r16 r32 r64 r128 r128 \bar "" - \override Staff.Rest #'style = #'neo_mensural - r\maxima^\markup \typewriter { neo_mensural } + \override Staff.Rest #'style = #'neomensural + r\maxima^\markup \typewriter { neomensural } r\longa r\breve r1 r2 r4 r8 r16 r32 r64 r128 r128 \bar "" diff --git a/input/test/time.ly b/input/test/time.ly index 0b3e13518a..a1322934de 100644 --- a/input/test/time.ly +++ b/input/test/time.ly @@ -1,5 +1,5 @@ -\version "2.3.8" +\version "2.3.9" % TODO: This file could be old. Ask about it later. -gp \header { texidoc = "@cindex Time @@ -99,7 +99,7 @@ properties will quite definitely change, and maybe the syntax of the \time 9/8 c4. c4. c4. \break - \override Staff.TimeSignature #'style = #'neo_mensural + \override Staff.TimeSignature #'style = #'neomensural \time 1/1 c1^"TimeSignature style = \#'neo\_mensural" \time 2/2 diff --git a/input/wilhelmus.ly b/input/wilhelmus.ly index e177457485..f062d22fbf 100644 --- a/input/wilhelmus.ly +++ b/input/wilhelmus.ly @@ -1,4 +1,4 @@ -\version "2.3.4" +\version "2.3.9" \header { texidoc = "Wilhelmus van Nassouwe" @@ -81,7 +81,7 @@ voice = \relative c' { d,4 | g4.\melisma a8\melismaEnd b2 a2 g4 | fis e8 \myBreak d8 | e4 g g fis | - \override NoteHead #'style = #'neo_mensural + \override NoteHead #'style = #'neomensural g\breve diff --git a/lily/accidental.cc b/lily/accidental.cc index 6c177a779f..7287aaa810 100644 --- a/lily/accidental.cc +++ b/lily/accidental.cc @@ -154,7 +154,7 @@ Accidental_interface::get_fontcharname (String style, int alteration) case SHARP: return "mensural1"; } - if (style == "neo_mensural") + if (style == "neomensural") style = ""; // currently same as default if (style == "default") style = ""; diff --git a/lily/rest.cc b/lily/rest.cc index 99bbae0faf..2ceffafb5a 100644 --- a/lily/rest.cc +++ b/lily/rest.cc @@ -73,7 +73,7 @@ Rest::glyph_name (Grob *me, int balltype, String style, bool try_ledgers) String actual_style (style.to_str0 ()); - if ((style == "mensural") || (style == "neo_mensural")) { + if ((style == "mensural") || (style == "neomensural")) { /* FIXME: Currently, ancient font does not provide ledgered rests; @@ -84,7 +84,7 @@ Rest::glyph_name (Grob *me, int balltype, String style, bool try_ledgers) ledgered_b = 0; /* - There are no 32th/64th/128th mensural/neo_mensural rests. In + There are no 32th/64th/128th mensural/neomensural rests. In these cases, revert back to default style. */ if (balltype > 4) diff --git a/lily/time-signature.cc b/lily/time-signature.cc index d6e3b16f3e..8342607fa1 100644 --- a/lily/time-signature.cc +++ b/lily/time-signature.cc @@ -141,7 +141,7 @@ ADD_INTERFACE (Time_signature, "time-signature-interface", " 4/4 and 2/2 are typeset as C and struck C, respectively. All\n" " other time signatures are written with two digits.\n" "\n" -" @item @code{neo_mensural}\n" +" @item @code{neomensural}\n" " 2/2, 3/2, 2/4, 3/4, 4/4, 6/4, 9/4, 4/8, 6/8 and 9/8 are\n" " typeset with neo-mensural style mensuration marks. All other time\n" " signatures are written with two digits.\n" diff --git a/mf/parmesan-clefs.mf b/mf/parmesan-clefs.mf index f1c8a40ac4..4f63711491 100644 --- a/mf/parmesan-clefs.mf +++ b/mf/parmesan-clefs.mf @@ -357,13 +357,13 @@ def draw_neo_mensural_c_clef(expr exact_center, reduction) = enddef; -fet_beginchar("neo-mensural c clef", "neo_mensural_c", "neomenscclef") +fet_beginchar("neo-mensural c clef", "neomensural_c", "neomenscclef") if test = 1: draw_staff(-1,3, 0.0); fi; draw_neo_mensural_c_clef((0,0), 1.0); fet_endchar; -fet_beginchar("neo-mensural c clef", "neo_mensural_c_change", "cneomenscclef") +fet_beginchar("neo-mensural c clef", "neomensural_c_change", "cneomenscclef") draw_neo_mensural_c_clef((0,0), .8); fet_endchar; diff --git a/mf/parmesan-heads.mf b/mf/parmesan-heads.mf index 680a85f321..b8e6421667 100644 --- a/mf/parmesan-heads.mf +++ b/mf/parmesan-heads.mf @@ -100,7 +100,7 @@ def draw_neo_left_stemmed_head (expr wid) = draw z6 .. z7; enddef; -fet_beginchar("Left stemmed notehead", "lneo_mensural", "mensuralleftstemmedhead"); +fet_beginchar("Left stemmed notehead", "lneomensural", "mensuralleftstemmedhead"); draw_neo_left_stemmed_head (2 staff_space#); fet_endchar; @@ -129,15 +129,15 @@ enddef; % % (ze is wel breed) % -fet_beginchar("Maxima notehead", "-3neo_mensural", "neomensuralmaximahead"); +fet_beginchar("Maxima notehead", "-3neomensural", "neomensuralmaximahead"); draw_neo_longa (2.6 staff_space#) fet_endchar; -fet_beginchar("Longa notehead", "-2neo_mensural", "neomensurallongahead"); +fet_beginchar("Longa notehead", "-2neomensural", "neomensurallongahead"); draw_neo_longa (2 staff_space#) fet_endchar; -fet_beginchar("Brevis notehead", "-1neo_mensural", "neomensuralbrevishead") +fet_beginchar("Brevis notehead", "-1neomensural", "neomensuralbrevishead") draw_neo_brevis(2 staff_space#); fet_endchar; @@ -181,7 +181,7 @@ def draw_neo_mensural_open_head (expr wid, height)= unfill z5 -- z6 -- z7 -- z8 --cycle; enddef; -fet_beginchar("Neo-mensural open head","0neo_mensural","neomensuralsemibrevishead") +fet_beginchar("Neo-mensural open head","0neomensural","neomensuralsemibrevishead") draw_neo_mensural_open_head (staff_space#, noteheight#); fet_endchar; @@ -198,11 +198,11 @@ fet_beginchar("Harmonic notehead (Neo-mensural open)", fet_endchar; -fet_beginchar("Neo-mensural open head","1neo_mensural","neomensuralminimahead") +fet_beginchar("Neo-mensural open head","1neomensural","neomensuralminimahead") draw_neo_mensural_open_head (staff_space#, noteheight#); fet_endchar; -fet_beginchar("Neo-mensural black head","2neo_mensural","neomensuralsemiminimahead") +fet_beginchar("Neo-mensural black head","2neomensural","neomensuralsemiminimahead") draw_neo_mensural_black_head (staff_space#, noteheight#); fet_endchar; diff --git a/mf/parmesan-rests.mf b/mf/parmesan-rests.mf index 314e39b9ad..64ebf21693 100644 --- a/mf/parmesan-rests.mf +++ b/mf/parmesan-rests.mf @@ -34,7 +34,7 @@ def neomens_half_block_rest = draw_block ((0,0), (neomens_block_rest_x, neomens_half_block_rest_y)); enddef; -fet_beginchar("Neo-mensural maxima rest", "-3neo_mensural", "neomensmaximarest"); +fet_beginchar("Neo-mensural maxima rest", "-3neomensural", "neomensmaximarest"); set_char_box(0, 3 neomens_block_rest_x#, neomens_block_rest_y#, neomens_block_rest_y#); draw_block ((0,-neomens_block_rest_y), @@ -42,20 +42,20 @@ fet_beginchar("Neo-mensural maxima rest", "-3neo_mensural", "neomensmaximarest") addto currentpicture also currentpicture shifted (2 neomens_block_rest_x, 0); fet_endchar; -fet_beginchar("Neo-mensural longa rest", "-2neo_mensural", "neomenslongarest"); +fet_beginchar("Neo-mensural longa rest", "-2neomensural", "neomenslongarest"); set_char_box(0, neomens_block_rest_x#, neomens_block_rest_y#, neomens_block_rest_y#); draw_block ((0,-neomens_block_rest_y), (neomens_block_rest_x, neomens_block_rest_y)); fet_endchar; -fet_beginchar("Neo-mensural breve rest", "-1neo_mensural", "neomensbreverest"); +fet_beginchar("Neo-mensural breve rest", "-1neomensural", "neomensbreverest"); set_char_box(0, neomens_block_rest_x#, 0, neomens_block_rest_y#); draw_block ((0,0), (neomens_block_rest_x, neomens_block_rest_y)); fet_endchar; -fet_beginchar("Neo-mensural whole rest", "0neo_mensural", "neomenssemibrevisrest"); +fet_beginchar("Neo-mensural whole rest", "0neomensural", "neomenssemibrevisrest"); set_char_box(0, neomens_block_rest_x#, neomens_half_block_rest_y#, 0); neomens_half_block_rest; @@ -63,7 +63,7 @@ fet_beginchar("Neo-mensural whole rest", "0neo_mensural", "neomenssemibrevisrest currentpicture shifted (0,- neomens_half_block_rest_y); fet_endchar; -fet_beginchar("Neo-mensural half rest", "1neo_mensural", "neomensminimahalfrest"); +fet_beginchar("Neo-mensural half rest", "1neomensural", "neomensminimahalfrest"); set_char_box(0, neomens_block_rest_x#, 0, neomens_half_block_rest_y#); neomens_half_block_rest; @@ -71,7 +71,7 @@ fet_endchar; neomensrestsize# = 0.8 staff_space#; -fet_beginchar("Neo-mensural 4th rest","2neo_mensural","neomenssemiminimarest") +fet_beginchar("Neo-mensural 4th rest","2neomensural","neomenssemiminimarest") set_char_box(0,neomensrestsize#,0,neomensrestsize#); pickup pencircle scaled 2 stafflinethickness; lft x1 = 0; @@ -84,7 +84,7 @@ fet_beginchar("Neo-mensural 4th rest","2neo_mensural","neomenssemiminimarest") draw z2 .. z3; fet_endchar -fet_beginchar("Neo-mensural 8th rest","3neo_mensural","neomensfusarest") +fet_beginchar("Neo-mensural 8th rest","3neomensural","neomensfusarest") set_char_box(0,neomensrestsize#,0,neomensrestsize#); pickup pencircle scaled 2 stafflinethickness; rt x1 = w; @@ -97,7 +97,7 @@ fet_beginchar("Neo-mensural 8th rest","3neo_mensural","neomensfusarest") draw z2 .. z3; fet_endchar -fet_beginchar("Neo-mensural 16th rest","4neo_mensural","neomenssemifusarest") +fet_beginchar("Neo-mensural 16th rest","4neomensural","neomenssemifusarest") set_char_box(0,neomensrestsize#,0,staff_space#); pickup pencircle scaled 2 stafflinethickness; rt x1 = w; diff --git a/mf/parmesan-timesig.mf b/mf/parmesan-timesig.mf index cade6d47f1..a7134a5495 100644 --- a/mf/parmesan-timesig.mf +++ b/mf/parmesan-timesig.mf @@ -187,47 +187,47 @@ def neo_mens_timesig (expr verbose_name, internal_name, ly_name, enddef; %% tempus imperfectum cum prolatione imperfecta -neo_mens_timesig ("Mensural 4/4 meter", "neo_mensural4/4", "neomensuralfourfourmeter", +neo_mens_timesig ("Mensural 4/4 meter", "neomensural4/4", "neomensuralfourfourmeter", false, false, false, false); %% tempus imperfectum cum prolatione imperfecta proportio dupla -neo_mens_timesig ("Mensural 2/2 meter", "neo_mensural2/2", "neomensuralallabreve", +neo_mens_timesig ("Mensural 2/2 meter", "neomensural2/2", "neomensuralallabreve", false, false, true, false); %% tempus perfectum cum prolatione imperfecta -neo_mens_timesig ("Mensural 3/2 meter", "neo_mensural3/2", "neomensuralthreetwometer", +neo_mens_timesig ("Mensural 3/2 meter", "neomensural3/2", "neomensuralthreetwometer", true, false, false, false); %% tempus imperfectum cum prolatione perfecta -neo_mens_timesig ("Mensural 6/4 meter", "neo_mensural6/4", "neomensuralsixfourmeter", +neo_mens_timesig ("Mensural 6/4 meter", "neomensural6/4", "neomensuralsixfourmeter", false, false, false, true); %% tempus perfectum cum prolatione perfecta -neo_mens_timesig ("Mensural 9/4 meter", "neo_mensural9/4", "neomensuralninefourmeter", +neo_mens_timesig ("Mensural 9/4 meter", "neomensural9/4", "neomensuralninefourmeter", true, false, false, true); %% tempus perfectum cum prolatione imperfecta proportio dupla -neo_mens_timesig ("Mensural 3/4 meter", "neo_mensural3/4", "neomensuralthreefourmeter", +neo_mens_timesig ("Mensural 3/4 meter", "neomensural3/4", "neomensuralthreefourmeter", true, false, true, false); %% tempus imperfectum cum prolatione perfecta proportio dupla -neo_mens_timesig ("Mensural 6/8 meter", "neo_mensural6/8", "neomensuralsixeightmeter", +neo_mens_timesig ("Mensural 6/8 meter", "neomensural6/8", "neomensuralsixeightmeter", false, false, true, true); %% tempus perfectum cum prolatione perfecta proportio dupla -neo_mens_timesig ("Mensural 9/8 meter", "neo_mensural9/8", "neomensuralnineeight", +neo_mens_timesig ("Mensural 9/8 meter", "neomensural9/8", "neomensuralnineeight", true, false, true, true); %% tempus imperfectum cum prolatione imperfecta diminutio simplex -neo_mens_timesig ("Mensural 4/8 meter", "neo_mensural4/8", "neomensuralfoureightmeter", +neo_mens_timesig ("Mensural 4/8 meter", "neomensural4/8", "neomensuralfoureightmeter", false, true, false, false); %% tempus imperfectum cum prolatione perfecta diminutio simplex -neo_mens_timesig ("Mensural 6/8 meter", "neo_mensural6/8alt", "neomensuralsixeightmeteralt", +neo_mens_timesig ("Mensural 6/8 meter", "neomensural6/8alt", "neomensuralsixeightmeteralt", false, true, false, true); %% tempus imperfectum cum prolatione imperfecta diminutio duplex -neo_mens_timesig ("Mensural 2/4 meter", "neo_mensural2/4", "neomensuraltwofourmeter", +neo_mens_timesig ("Mensural 2/4 meter", "neomensural2/4", "neomensuraltwofourmeter", false, true, true, false); fet_endgroup ("timesig") diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py index 2921d5b574..4f0a8cb286 100644 --- a/scripts/convert-ly.py +++ b/scripts/convert-ly.py @@ -2126,6 +2126,13 @@ def conv (str): conversions.append (((2, 3, 8), conv, '''remove \\consistsend, strip \\lyrics from \\lyricsto.''')) +def conv (str): + str = re.sub (r'neo_mensural', 'neomensural', str) + return str + +conversions.append (((2, 3, 9), conv, + '''neo_mensural -> neomensural''')) + def conv_mode_experiment (str): str = re.sub (r'\\chords\b', r'\\chordmode', str)