From: Jürgen Reuter Date: Mon, 9 May 2005 21:08:38 +0000 (+0000) Subject: 2005-05-09 Jürgen Reuter X-Git-Tag: release/2.5.24~25 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=6c8cbca7b94a7d388916c580389116549e8cc12e;p=lilypond.git 2005-05-09 Jürgen Reuter * Documentation/user/instrument-notation.itely: petrucci note heads: updated docu * input/regression/note-head-style.ly: updated regression test; indentation fixes * ly/engraver-init.ly: MensuralVoiceContext: use petrucci note heads as default * mf/parmesan-heads.mf: minor editing; use musicological names (rather than optical description) as note head names * scm/output-lib.scm: complete petrucci heads 2005-05-09 Pal Benko * mf/parmesan-heads.mf: add petrucci heads (like neo-mensural heads, but bigger) --- diff --git a/ChangeLog b/ChangeLog index f55113a4db..8c4db0e375 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,24 @@ +2005-05-09 Jürgen Reuter + + * Documentation/user/instrument-notation.itely: petrucci note + heads: updated docu + + * input/regression/note-head-style.ly: updated regression test; + indentation fixes + + * ly/engraver-init.ly: MensuralVoiceContext: use petrucci note + heads as default + + * mf/parmesan-heads.mf: minor editing; use musicological names + (rather than optical description) as note head names + + * scm/output-lib.scm: complete petrucci heads + +2005-05-09 Pal Benko + + * mf/parmesan-heads.mf: add petrucci heads (like neo-mensural + heads, but bigger) + 2005-05-09 Jan Nieuwenhuizen * configure.in (gui_b): Add mbrtowc checking. diff --git a/Documentation/user/instrument-notation.itely b/Documentation/user/instrument-notation.itely index 3fb767dfee..bf83cd5b41 100644 --- a/Documentation/user/instrument-notation.itely +++ b/Documentation/user/instrument-notation.itely @@ -1954,15 +1954,17 @@ Here are all suptopics at a glance: For ancient notation, a note head style other than the @code{default} style may be chosen. This is accomplished by setting the @code{style} property of the @internalsref{NoteHead} object to @code{baroque}, -@code{neomensural} or @code{mensural}. The @code{baroque} style -differs from the @code{default} style only in using a square shape -for @code{\breve} note heads. The @code{neomensural} style differs from -the @code{baroque} style in that it uses rhomboidal heads for whole notes -and all smaller durations. Stems are centered on the note heads. -This style is particularly useful when transcribing mensural music, -e.g., for the incipit. The @code{mensural} style finally produces note -heads that mimic the look of note heads in historic printings of the -16th century. +@code{neomensural}, @code{mensural} or @code{petrucci}. The +@code{baroque} style differs from the @code{default} style only in +using a square shape for @code{\breve} note heads. The +@code{neomensural} style differs from the @code{baroque} style in that +it uses rhomboidal heads for whole notes and all smaller durations. +Stems are centered on the note heads. This style is particularly +useful when transcribing mensural music, e.g., for the incipit. The +@code{mensural} style produces note heads that mimic the look of note +heads in historic printings of the 16th century. Finally, the +@code{petrucci} style also mimicks historic printings, but uses bigger +note heads. The following example demonstrates the @code{neomensural} style diff --git a/input/regression/note-head-style.ly b/input/regression/note-head-style.ly index 9fc8710db1..97d48ac951 100644 --- a/input/regression/note-head-style.ly +++ b/input/regression/note-head-style.ly @@ -11,20 +11,19 @@ dimensions. " } -pattern = << - \new Voice { - \override Stem #'direction = #UP - e'4 - e'2. e'1 e'\breve*1/2 e'\longa*1/4 - } - \new Voice { - \override Stem #'direction = #DOWN - a4 a2. a1 a\breve*1/2 a\longa*1/4 - } - >> +pattern = << + \new Voice { + \override Stem #'direction = #UP + e'4 e'2. e'1 e'\breve*1/2 e'\longa*1/4 + } + \new Voice { + \override Stem #'direction = #DOWN + a4 a2. a1 a\breve*1/2 a\longa*1/4 + } +>> \score { - \transpose c c { + \transpose c c { \clef C \override Staff.NoteHead #'style = #'default @@ -34,7 +33,8 @@ pattern = << \override Staff.NoteHead #'style = #'baroque s1*0^\markup { "baroque" } \pattern - \break + + \break \override Staff.NoteHead #'style = #'neomensural s1*0^\markup { "neomensural" } @@ -43,37 +43,42 @@ pattern = << \override Staff.NoteHead #'style = #'mensural s1*0^\markup { "mensural" } \pattern - + \break + \override Staff.NoteHead #'style = #'petrucci + s1*0^\markup { "petrucci" } + \pattern + \override Staff.NoteHead #'style = #'harmonic s1*0^\markup { "harmonic" } \pattern + \break + \override Staff.NoteHead #'style = #'diamond s1*0^\markup { "diamond" } \pattern - \break \override Staff.NoteHead #'style = #'cross s1*0^\markup { "cross" } \pattern + \break + \override Staff.NoteHead #'style = #'xcircle s1*0^\markup { "xcircle" } -\pattern - - \break + \pattern \override Staff.NoteHead #'style = #'triangle s1*0^\markup { "triangle" } \pattern - + + \break \override Staff.NoteHead #'style = #'slash s1*0^\markup { "slash" } \pattern - \break } \layout { diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly index 300db4fabc..73f35f49d1 100644 --- a/ly/engraver-init.ly +++ b/ly/engraver-init.ly @@ -816,7 +816,7 @@ EasyNotation = \context { %% TODO: why \context override? \consists "Mensural_ligature_engraver" %% Set default head for notes outside of \[ \]. - \override NoteHead #'style = #'mensural + \override NoteHead #'style = #'petrucci %% There are no beams in mensural notation. autoBeaming = ##f diff --git a/mf/parmesan-heads.mf b/mf/parmesan-heads.mf index 72c6a155f4..1365bb02b6 100644 --- a/mf/parmesan-heads.mf +++ b/mf/parmesan-heads.mf @@ -89,6 +89,7 @@ def draw_neomensural_brevis(expr brevwid) = enddef; +%%% This head does not seem to be used anywhere. Junk me? -- jr def draw_neomensural_left_stemmed_head (expr wid) = draw_neomensural_brevis(wid); @@ -99,7 +100,8 @@ def draw_neomensural_left_stemmed_head (expr wid) = draw z6 .. z7; enddef; -fet_beginchar("Left stemmed notehead", "lneomensural"); +%%% This head does not seem to be used anywhere. Junk me? -- jr +fet_beginchar("Left stemmed notehead", "slneomensural"); draw_neomensural_left_stemmed_head (2 staff_space#); fet_endchar; @@ -180,38 +182,34 @@ def draw_neomensural_open_head (expr wid, height)= unfill z5 -- z6 -- z7 -- z8 --cycle; enddef; -fet_beginchar("Neo-mensural open head","s0neomensural") - draw_neomensural_open_head (staff_space#, noteheight#); -fet_endchar; - % % WL says the thin lines should be thinner. % - fet_beginchar("Harmonic notehead (Neo-mensural open)", - "s0harmonic") - + "s0harmonic") draw_neomensural_open_head (1.3 staff_space#, 1.3 noteheight#); charwx := head_width#; charwy := 0; fet_endchar; +fet_beginchar("Neo-mensural semibrevis head","s0neomensural") + draw_neomensural_open_head (staff_space#, noteheight#); +fet_endchar; -fet_beginchar("Neo-mensural open head","s1neomensural") +fet_beginchar("Neo-mensural minima head","s1neomensural") draw_neomensural_open_head (staff_space#, noteheight#); fet_endchar; -fet_beginchar("Neo-mensural black head","s2neomensural") +fet_beginchar("Neo-mensural semiminima head","s2neomensural") draw_neomensural_black_head (staff_space#, noteheight#); fet_endchar; - - def draw_mensural_brevis (expr wid) = % TODO. For the moment, fall back to draw_neomensural_brevis. draw_neomensural_brevis(wid); enddef; +%%% This head does not seem to be used anywhere. Junk me? -- jr def draw_mensural_left_stemmed_head (expr wid) = draw_mensural_brevis(wid); x6 = x7 = stem_width/2; @@ -230,6 +228,7 @@ def draw_mensural_longa (expr wid) = draw z6 .. z7; enddef; +%%% This head does not seem to be used anywhere. Junk me? -- jr fet_beginchar("Mensural left stemmed notehead", "slmensural"); draw_mensural_left_stemmed_head (staff_space#) fet_endchar; @@ -287,18 +286,33 @@ def draw_diamond_head (expr head_h, pen_w, pen_h, angle, open) = enddef; -fet_beginchar("Mensural open head","s0mensural") +fet_beginchar("Mensural semibrevis head","s0mensural") draw_diamond_head (staff_space#, 0.15, 0.30, 30, true); fet_endchar; -fet_beginchar("Mensural open head","s1mensural") +fet_beginchar("Mensural minima head","s1mensural") draw_diamond_head (staff_space#, 0.15, 0.30, 30, true); fet_endchar; -fet_beginchar("Mensural black head","s2mensural") +fet_beginchar("Mensural semiminima head","s2mensural") draw_diamond_head (staff_space#, 0.15, 0.30, 30, false); fet_endchar; +fet_beginchar("Petrucci semibrevis head","s0petrucci") +% draw_diamond_head (1.8 staff_space#, 0.15, 0.40, 30, true); + draw_neomensural_open_head (staff_space#, 1.8 staff_space#); +fet_endchar; + +fet_beginchar("Petrucci minima head","s1petrucci") +% draw_diamond_head (1.8 staff_space#, 0.15, 0.40, 30, true); + draw_neomensural_open_head (staff_space#, 1.8 staff_space#); +fet_endchar; + +fet_beginchar("Petrucci semiminima head","s2petrucci") +% draw_diamond_head (1.8 staff_space#, 0.15, 0.40, 30, false); + draw_neomensural_black_head (staff_space#, 1.8 staff_space#); +fet_endchar; + %%%%%%%% % diff --git a/scm/output-lib.scm b/scm/output-lib.scm index d5d9d10264..9b24de88ec 100644 --- a/scm/output-lib.scm +++ b/scm/output-lib.scm @@ -158,6 +158,10 @@ (number->string duration))) ((mensural) (string-append (number->string duration) (symbol->string style))) + ((petrucci) + (if (< duration 0) + (string-append (number->string duration) "mensural") + (string-append (number->string duration) (symbol->string style)))) ((neomensural) (string-append (number->string duration) (symbol->string style))) ((default)