From bc03c6e0f3720112406fe09e31dda10d05a8f8e8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=BCrgen=20Reuter?= Date: Sat, 19 Feb 2005 19:30:13 +0000 Subject: [PATCH] *** empty log message *** --- ChangeLog | 15 ++++++++++ Documentation/user/examples.itely | 12 ++++---- Documentation/user/notation.itely | 46 +++++++++++++++---------------- lily/mensural-ligature.cc | 6 ++-- ly/gregorian-init.ly | 18 ++++++++++++ 5 files changed, 64 insertions(+), 33 deletions(-) diff --git a/ChangeLog b/ChangeLog index a380d52e2b..7c35e180e1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2005-02-19 Jürgen Reuter + + * Documentation/user/examples.itely: small + simplification/beautification + + * Documentation/user/notation.ietly: bugfix: fixed many artefacts + from the "x-y-z"->"x.y.z" renaming of glyphs throughout the whole + notation manual. + + * lily/mensural-ligature.cc: bugfix: another few victims of the + "x-y-z"->"x.y.s-z" symetrical notehead glyph renaming. + + * ly/gregorian-init.ly: commit some experimental code for hi-level + ligature input language lying around here for several months. + 2005-02-19 Han-Wen Nienhuys * scm/framework-pdf.scm (scm): new file diff --git a/Documentation/user/examples.itely b/Documentation/user/examples.itely index 75d45e0b82..db48a2b37f 100644 --- a/Documentation/user/examples.itely +++ b/Documentation/user/examples.itely @@ -784,8 +784,11 @@ staves rather than on the staves. \version "2.4.0" global = { + \set Score.skipBars = ##t + % incipit \once \override Score.SystemStartBracket #'transparent = ##t + \override Score.SpacingSpanner #'spacing-increment = #1.0 % tight spacing \key f \major \time 2/2 \once \override Staff.TimeSignature #'style = #'neomensural @@ -801,6 +804,7 @@ global = { \bar "" % main + \revert Score.SpacingSpanner #'spacing-increment % CHECK: no effect? \cadenzaOff % turn bar lines on again \once \override Staff.Clef #'full-size-change = ##t \set Staff.forceClef = ##t @@ -816,13 +820,7 @@ global = { \set Staff.printKeyCancellation = ##t \set Staff.forceClef = ##f - \skip 1*5 - - % last bar contains a brevis (i.e., spans 2 bars); - % therefore do not draw this particular bar - \cadenzaOn - \skip 1*2 - \cadenzaOff + \skip 1*7 % the actual music % let finis bar go through all staves \override Staff.BarLine #'transparent = ##f diff --git a/Documentation/user/notation.itely b/Documentation/user/notation.itely index c8fc55ccb3..95cdceb774 100644 --- a/Documentation/user/notation.itely +++ b/Documentation/user/notation.itely @@ -2153,7 +2153,7 @@ any markup text. For example, @lilypond[quote,raggedright,fragment,verbatim,relative=1] c'4 \override BreathingSign #'text - = #(make-musicglyph-markup "scripts-rvarcomma") + = #(make-musicglyph-markup "scripts.rvarcomma") \breathe d4 @end lilypond @@ -5239,7 +5239,7 @@ segno, and fermata on a bar line. Use @code{\markup} to access the appropriate symbol @lilypond[fragment,quote,raggedright,verbatim,relative=2] -c1 \mark \markup { \musicglyph #"scripts-ufermata" } +c1 \mark \markup { \musicglyph #"scripts.ufermata" } c1 @end lilypond @@ -6166,21 +6166,21 @@ select ancient accidentals. Supported styles are s^\markup { \column { "vaticana" - \line { " " \musicglyph #"accidentals-vaticana-1" - " " \musicglyph #"accidentals-vaticana0" } + \line { " " \musicglyph #"accidentals.vaticana-1" + " " \musicglyph #"accidentals.vaticana0" } } \column { "medicaea" - \line { " " \musicglyph #"accidentals-medicaea-1" } + \line { " " \musicglyph #"accidentals.medicaea-1" } } \column { "hufnagel" - \line { " " \musicglyph #"accidentals-hufnagel-1" } + \line { " " \musicglyph #"accidentals.hufnagel-1" } } \column { "mensural" - \line { " " \musicglyph #"accidentals-mensural-1" - " " \musicglyph #"accidentals-mensural1" } + \line { " " \musicglyph #"accidentals.mensural-1" + " " \musicglyph #"accidentals.mensural1" } } } } @@ -6508,34 +6508,34 @@ following table \set Score.timing = ##f \set Score.barAlways = ##t s_\markup { "$\\backslash$time 4/4" } - ^\markup { " " \musicglyph #"timesig-neomensural4/4" } + ^\markup { " " \musicglyph #"timesig.neomensural4/4" } s s_\markup { "$\\backslash$time 2/2" } - ^\markup { " " \musicglyph #"timesig-neomensural2/2" } + ^\markup { " " \musicglyph #"timesig.neomensural2/2" } s s_\markup { "$\\backslash$time 6/4" } - ^\markup { " " \musicglyph #"timesig-neomensural6/4" } + ^\markup { " " \musicglyph #"timesig.neomensural6/4" } s s_\markup { "$\\backslash$time 6/8" } - ^\markup { " " \musicglyph #"timesig-neomensural6/8" } + ^\markup { " " \musicglyph #"timesig.neomensural6/8" } \break s_\markup { "$\\backslash$time 3/2" } - ^\markup { " " \musicglyph #"timesig-neomensural3/2" } + ^\markup { " " \musicglyph #"timesig.neomensural3/2" } s s_\markup { "$\\backslash$time 3/4" } - ^\markup { " " \musicglyph #"timesig-neomensural3/4" } + ^\markup { " " \musicglyph #"timesig.neomensural3/4" } s s_\markup { "$\\backslash$time 9/4" } - ^\markup { " " \musicglyph #"timesig-neomensural9/4" } + ^\markup { " " \musicglyph #"timesig.neomensural9/4" } s s_\markup { "$\\backslash$time 9/8" } - ^\markup { " " \musicglyph #"timesig-neomensural9/8" } + ^\markup { " " \musicglyph #"timesig.neomensural9/8" } \break s_\markup { "$\\backslash$time 4/8" } - ^\markup { " " \musicglyph #"timesig-neomensural4/8" } + ^\markup { " " \musicglyph #"timesig.neomensural4/8" } s s_\markup { "$\\backslash$time 2/4" } - ^\markup { " " \musicglyph #"timesig-neomensural2/4" } + ^\markup { " " \musicglyph #"timesig.neomensural2/4" } } @end lilypond @@ -6680,19 +6680,19 @@ supported are @code{vaticana}, @code{medicaea}, @code{hufnagel}, and \new Lyrics \lyricmode { \markup { \column { \typewriter "vaticana" - \line { " " \musicglyph #"custodes-vaticana-u0" } + \line { " " \musicglyph #"custodes.vaticana-u0" } } } \markup { \column { \typewriter "medicaea" - \line { " " \musicglyph #"custodes-medicaea-u0" } + \line { " " \musicglyph #"custodes.medicaea-u0" } }} \markup { \column { \typewriter "hufnagel" - \line { " " \musicglyph #"custodes-hufnagel-u0" } + \line { " " \musicglyph #"custodes.hufnagel-u0" } }} \markup { \column { \typewriter "mensural" - \line { " " \musicglyph #"custodes-mensural-u0" } + \line { " " \musicglyph #"custodes.mensural-u0" } }} } @end lilypond @@ -7978,7 +7978,7 @@ created with a markup text. This markup text is inserted in the tsMarkup =\markup { \number { \column { "2" "4" } - \musicglyph #"scripts-stopped" + \musicglyph #"scripts.stopped" \bracket \column { "5" "8" } } } diff --git a/lily/mensural-ligature.cc b/lily/mensural-ligature.cc index 0250a416a1..0375d5d1aa 100644 --- a/lily/mensural-ligature.cc +++ b/lily/mensural-ligature.cc @@ -142,13 +142,13 @@ internal_brew_primitive (Grob *me) flexa_width, thickness, true, DOWN); break; case MLP_sc: // mensural brevis head with right cauda - out = Font_interface::get_default_font (me)->find_by_name ("noteheads.-2mensural"); + out = Font_interface::get_default_font (me)->find_by_name ("noteheads.s-2mensural"); break; case MLP_ss: // mensural brevis head - out = Font_interface::get_default_font (me)->find_by_name ("noteheads.-1mensural"); + out = Font_interface::get_default_font (me)->find_by_name ("noteheads.s-1mensural"); break; case MLP_cs: // mensural brevis head with left cauda - out = Font_interface::get_default_font (me)->find_by_name ("noteheads.lmensural"); + out = Font_interface::get_default_font (me)->find_by_name ("noteheads.slmensural"); break; case MLP_SS: out = brew_flexa (me, delta_pitch, false, diff --git a/ly/gregorian-init.ly b/ly/gregorian-init.ly index 944a2be5b5..77831af2ee 100644 --- a/ly/gregorian-init.ly +++ b/ly/gregorian-init.ly @@ -105,6 +105,24 @@ episemFinis = #(make-span-event 'TextSpanEvent STOP) % shortcut music functions for Liber Hymnarius neumes table % (experimental) % + +#(define (make-ligature music) + (make-music 'SequentialMusic + 'elements (append + (cons + (make-music 'EventChord + 'elements (list + (make-span-event 'LigatureEvent START))) + (ly:music-property music 'elements)) + (list + (make-music 'EventChord + 'elements (list + (make-span-event 'LigatureEvent STOP))))))) + +ligature = #(def-music-function + (location music) (ly:music?) + (make-ligature music)) + %#(define (make-script x) % (make-music 'ArticulationEvent % 'articulation-type x)) -- 2.39.5