From 8144751cb757612145b419a3ef53c972c1703747 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Fri, 30 Jul 2004 10:27:24 +0000 Subject: [PATCH] * Documentation/user/tutorial.itely (Integrating text and music): remove \score and \notes from manual. * lily/my-lily-lexer.cc (My_lily_lexer): really switch on note mode in the beginning. --- ChangeLog | 8 + Documentation/topdocs/NEWS.texi | 9 + Documentation/user/changing-defaults.itely | 31 +- Documentation/user/cheatsheet.itely | 2 +- Documentation/user/introduction.itely | 22 +- Documentation/user/invoking.itexi | 6 +- Documentation/user/lilypond-book.itely | 2 +- Documentation/user/lilypond.tely | 2 +- Documentation/user/music-glossary.tely | 156 +-- Documentation/user/notation.itely | 1193 +++-------------- .../user/programming-interface.itely | 46 +- Documentation/user/tutorial.itely | 112 +- input/test/engraver-example.lyinc | 10 +- lily/include/my-lily-lexer.hh | 3 + lily/lexer.ll | 7 - lily/lily-guile.cc | 4 +- lily/my-lily-lexer.cc | 4 + lily/my-lily-parser.cc | 1 + lily/parser.yy | 41 +- ly/a3-init.ly | 2 +- ly/a4-init.ly | 2 +- ly/accordion-defs-init.ly | 2 +- ly/book-init-init.ly | 2 +- ly/book-paper-defaults.ly | 2 +- ly/catalan.ly | 2 +- ly/center-init.ly | 2 +- ly/chord-modifiers-init.ly | 6 +- ly/declarations-init.ly | 6 +- ly/deutsch.ly | 2 +- ly/drumpitch-init.ly | 2 +- ly/dynamic-scripts-init.ly | 6 +- ly/english.ly | 2 +- ly/espanol.ly | 2 +- ly/generate-documentation.ly | 2 +- ly/generate-interface-doc-init.ly | 2 +- ly/grace-init.ly | 14 +- ly/gregorian-init.ly | 28 +- ly/init.ly | 2 +- ly/italiano.ly | 2 +- ly/legal-init.ly | 2 +- ly/letter-init.ly | 2 +- ly/midi-init.ly | 2 +- ly/music-functions-init.ly | 2 +- ly/nederlands.ly | 2 +- ly/norsk.ly | 2 +- ly/params-init.ly | 2 +- ly/part-paper-init.ly | 2 +- ly/performer-init.ly | 2 +- ly/portugues.ly | 2 +- ly/property-init.ly | 4 +- ly/scale-definitions-init.ly | 2 +- ly/script-init.ly | 2 +- ly/spanners-init.ly | 10 +- ly/suomi.ly | 2 +- ly/svenska.ly | 2 +- ly/tabloid-init.ly | 2 +- ly/vlaams.ly | 2 +- 57 files changed, 441 insertions(+), 1354 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4308f5a6e2..e69e029016 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2004-07-30 Han-Wen Nienhuys + + * Documentation/user/tutorial.itely (Integrating text and music): + remove \score and \notes from manual. + + * lily/my-lily-lexer.cc (My_lily_lexer): really switch on note + mode in the beginning. + 2004-07-30 Mats Bengtsson * Documentation/user/changing-defaults.itely (Horizontal spacing): diff --git a/Documentation/topdocs/NEWS.texi b/Documentation/topdocs/NEWS.texi index e384ae9879..8033a8c617 100644 --- a/Documentation/topdocs/NEWS.texi +++ b/Documentation/topdocs/NEWS.texi @@ -134,6 +134,15 @@ This is handled by the function defined in @code{toplevel-book-handler}. By changing these variables, different results can be obtained. +This required a small change in the syntax. Mode changing commands, +such as @code{\chords} and @code{\figures} now be directly followed by +delimeters. The following example demonstrates the new behavior, + +@example + \figures \context Figures { .. } % wrong + \context Figures \figures { .. } % right +@end example + @item Start pitch for @code{relative} music is optional for music lists. The default value is middle C. diff --git a/Documentation/user/changing-defaults.itely b/Documentation/user/changing-defaults.itely index 2688d432e5..fac60f1751 100644 --- a/Documentation/user/changing-defaults.itely +++ b/Documentation/user/changing-defaults.itely @@ -432,8 +432,8 @@ one context. In the following example, articulations and notes are entered separately, @verbatim -music = \notes { c4 c4 } -arts = \notes { s4-. s4-> } +music = { c4 c4 } +arts = { s4-. s4-> } @end verbatim They are combined by sending both to the same @context{Voice} context, @@ -444,13 +444,11 @@ They are combined by sending both to the same @context{Voice} context, >> @end verbatim @lilypond[raggedright] -music = \notes { c4 c4 } -arts = \notes { s4-. s4-> } -\score { - \notes \relative c'' << \new Staff \context Voice = "A" \music +music = { c4 c4 } +arts = { s4-. s4-> } + \relative c'' << \new Staff \context Voice = "A" \music \context Voice = "A" \arts >> -} @end lilypond @cindex @code{\context} @@ -852,11 +850,11 @@ to indicate improvisation in Jazz pieces, \context { \Staff \accepts "ImproVoice" }} - \score { \notes \relative c'' { + { \relative c'' { a4 d8 bes8 \new ImproVoice { c4^"ad lib" c c4 c^"undress" c_"while playing :)" c } a1 - }} + } @end lilypond @@ -973,16 +971,14 @@ Putting both into a @code{\paper} block, like Then the output at the start of this subsection can be entered as @verbatim -\score { - \notes \relative c'' { +\relative c'' { a4 d8 bes8 \new ImproVoice { c4^"ad lib" c c4 c^"undress" c c_"while playing :)" } - a1 - } + a1 } @end verbatim @@ -1630,7 +1626,7 @@ Markups can be stored in variables, and these variables may be attached to notes, like @verbatim allegro = \markup { \bold \large { Allegro } } -\notes { a^\allegro b c d } + { a^\allegro b c d } @end verbatim @@ -1965,16 +1961,15 @@ for controlling the stem/bar line spacing. The following example shows these corrections, once with default settings, and once with exaggerated corrections: -@lilypond - \score { \notes { +@lilypond[raggedright] +{ c'4 e''4 e'4 b'4 | b'4 e''4 b'4 e''4| \override Staff.NoteSpacing #'stem-spacing-correction = #1.5 \override Staff.StaffSpacing #'stem-spacing-correction = #1.5 c'4 e''4 e'4 b'4 | b'4 e''4 b'4 e''4| - } - \paper { raggedright = ##t } } +} @end lilypond @cindex SpacingSpanner, overriding properties diff --git a/Documentation/user/cheatsheet.itely b/Documentation/user/cheatsheet.itely index 5e174d1f52..2184dd615f 100644 --- a/Documentation/user/cheatsheet.itely +++ b/Documentation/user/cheatsheet.itely @@ -242,7 +242,7 @@ twinkle @tab @lilypond[fragment,relative=2] << - \notes { g'4 g } + { g'4 g } \lyricsto "" \new Lyrics { twin -- kle } >> @end lilypond diff --git a/Documentation/user/introduction.itely b/Documentation/user/introduction.itely index 5048fc28a2..a1970ae595 100644 --- a/Documentation/user/introduction.itely +++ b/Documentation/user/introduction.itely @@ -113,9 +113,8 @@ exact mathematical spacing, and once with corrections. Can you spot which fragment is which? @cindex optical spacing -@lilypond[quote,noindent] -\score { - \notes { +@lilypond[quote,noindent,fragment] +{ \override Staff.NoteSpacing #'stem-spacing-correction = #0.6 c'4 e''4 e'4 b'4 | \stemDown b'4 e''4 a'4 e''4 | \bar "||" @@ -123,8 +122,6 @@ spot which fragment is which? \override Staff.StaffSpacing #'stem-spacing-correction = #0.0 \stemBoth c'4 e''4 e'4 b'4 | \stemDown b'4 e''4 a'4 e''4 | - } - \paper { raggedright = ##t } } @end lilypond @@ -252,11 +249,11 @@ lines---a characteristic of typographical style---are preset variables. Changing them gives a different typographical impression. @lilypond[quote,raggedright] -fragment = \notes { +fragment = { \clef bass f8 as8 c'4-~ c'16 as g f e16 g bes c' des'4 } -\score { + << \new Staff \fragment \new Staff \with { @@ -268,7 +265,6 @@ fragment = \notes { \override Tie #'extra-offset = #'(0 . 0.3) } \fragment >> -} @end lilypond Formatting rules are also preset variables: each object has variables @@ -296,8 +292,7 @@ their symbol is changed during the music fragment. ((-2) (make-smaller-markup (make-bold-markup "2"))) (else (make-simple-markup "bla"))))))))) -\score { - \notes \context Voice \relative c' { + \context Voice \relative c' { \stemUp \set autoBeaming = ##f \time 2/4 @@ -313,7 +308,6 @@ their symbol is changed during the music fragment. \repeat unfold 5 { \applyoutput #mc-squared s8 } >> } -} @end lilypond @@ -482,7 +476,7 @@ polyphony? In polyphonic notation, many voices can share a staff. @lilypond[quote,raggedright] \include "engraver-example.lyinc" -\score { \context Staff << \topVoice \\ \botVoice >> } +\context Staff << \topVoice \\ \botVoice >> @end lilypond In this situation, the accidentals and staff are shared, but the @@ -607,13 +601,11 @@ simplest application is printing notes. By adding chord names and lyrics we obtain a lead sheet. @lilypond[quote,raggedright] -\score { << \context ChordNames \chords { c2 c f2 c } - \new Staff \notes \relative c' { \time 2/4 c4 c g'4 g a4 a g2 } + \new Staff \relative c' { \time 2/4 c4 c g'4 g a4 a g2 } \context Lyrics \lyrics { twin4 kle twin kle lit tle star2 } >> -} @end lilypond Polyphonic notation and piano music can also be printed. The following diff --git a/Documentation/user/invoking.itexi b/Documentation/user/invoking.itexi index 80eb9b6a4f..923fdc218d 100644 --- a/Documentation/user/invoking.itexi +++ b/Documentation/user/invoking.itexi @@ -101,7 +101,7 @@ When LilyPond formatting available through a web server, the @verbatim #(system "rm -rf /") - \score { + { c4^#(ly:export (ly:gulp-file "/etc/passwd")) } @end verbatim @@ -259,8 +259,8 @@ where the error was found. For example, @example test.ly:2:19: error: not a duration: 5: - \notes @{ c'4 e'5 - g' @} + @{ c'4 e'5 + g' @} @end example diff --git a/Documentation/user/lilypond-book.itely b/Documentation/user/lilypond-book.itely index 0d2da4ceb4..d522231ee8 100644 --- a/Documentation/user/lilypond-book.itely +++ b/Documentation/user/lilypond-book.itely @@ -319,7 +319,7 @@ documents are composed from small @file{.ly} files in this way: \header @{ texidoc = "this file demonstrates a single note" @} - \score @{ \notes @{ c'4 @} @} + @{ c'4 @} @end example @item relative, relative=@var{N} diff --git a/Documentation/user/lilypond.tely b/Documentation/user/lilypond.tely index 6072aca4ce..bdad180430 100644 --- a/Documentation/user/lilypond.tely +++ b/Documentation/user/lilypond.tely @@ -108,7 +108,7 @@ Copyright @copyright{} 1999--2004 by the authors @c compiling gs-8.01 right now... -- jcn @lilypond[raggedright] \score { - \context Lyrics \notes { + \context Lyrics { \override Score.RehearsalMark #'self-alignment-X = #LEFT \mark #(ly:export (string-append "(For LilyPond version " (lilypond-version) ")")) diff --git a/Documentation/user/music-glossary.tely b/Documentation/user/music-glossary.tely index 97f619bb3a..6e98cbe70f 100644 --- a/Documentation/user/music-glossary.tely +++ b/Documentation/user/music-glossary.tely @@ -209,7 +209,7 @@ accidental. \set Score.automaticBars = ##f %\override TextScript #'font-style = #'large \addlyrics -\context Staff \notes\relative c'' { +\context Staff \relative c'' { gis1 s s gisis s s ges s s geses s s g! } \context Lyrics \lyrics { @@ -314,7 +314,7 @@ FI: luonnollinen molliasteikko. @lilypond[fragment,notime] \set Score.automaticBars = ##f -\notes\relative c'' { +\relative c'' { a1 b c d e f g a } @end lilypond @@ -347,7 +347,7 @@ a. is performed as a short note regardless of the duration of the main note the duration of the long a. is proportional to that of the main note. @lilypond -\context Voice \notes\relative c'' { +\context Voice \relative c'' { \key d \major \time 4/4 @@ -364,7 +364,7 @@ fis8 e16 fis } g8 fis16 g | \cadenzaOn a4 \bar "||" \cadenzaOff } -\notes\relative c'' { +\relative c'' { 4_"performance" r g16 ( fis) e fis a ( g) fis g | \cadenzaOn a4 \bar "||" \cadenzaOff } @end lilypond @@ -372,7 +372,7 @@ g8 fis16 g | An appoggiatura may have more notes preceding the main note. @lilypond -\notes\relative c'' { +\relative c'' { \key as \major \time 2/4 % \override Score.TextScript #'font-style = #'large @@ -397,7 +397,7 @@ S: arpeggio, FI: arpeggio, murtosointu. @lilypond[fragment] -\notes \context PianoStaff << + \context PianoStaff << \context Staff = SA \relative c'' { \time 4/4 \clef treble @@ -551,7 +551,7 @@ The number of beams determine the note value of the connected notes. @lilypond[fragment,notime] \set Score.automaticBars = ##f %\override TextScript #'font-style = #'large -\notes\relative c'' { +\relative c'' { g8_"1/8"[ g g g] s16 g16_"1/16"[ g g g] s16 g32_"1/32"[ s32 g32 s32 g32 s32 g32] s16 @@ -575,9 +575,9 @@ the start of the music. @lilypond[fragment] \key g \major \time 4/4 -\notes\relative c'' { g4 c b a | g1 \bar "||"} +\relative c'' { g4 c b a | g1 \bar "||"} \time 3/8 -\notes\relative c'' { g8 d' c | b c a | g4. \bar "||"} +\relative c'' { g8 d' c | b c a | g4. \bar "||"} @end lilypond @aitem{bind} @@ -598,7 +598,7 @@ for connecting piano staves, angular brackets for connecting parts in an orchestral or choral score. @lilypond[fragment] -\notes\context GrandStaff << +\context GrandStaff << \relative c''\context Staff = SA { \clef treble g4 e c2 } \relative c \context Staff = SB { \clef bass c1 \bar "|." } >> @end lilypond @@ -606,8 +606,8 @@ orchestral or choral score. @lilypond[fragment] \context StaffGroup << % \set StaffGroup.minVerticalAlign = #12 - \notes\relative c'' \context Staff = SA { \clef treble g4 e c2 } - \notes\relative c \context Staff = SB { \clef bass c1 \bar "|." } >> + \relative c'' \context Staff = SA { \clef treble g4 e c2 } + \relative c \context Staff = SB { \clef bass c1 \bar "|." } >> @end lilypond @aitem{brass} @@ -650,7 +650,7 @@ in pre-1650 music. @lilypond[fragment,notime] \set Score.automaticBars = ##f -\notes\relative c'' { g\breve } +\relative c'' { g\breve } @end lilypond @aitem{C} @@ -681,7 +681,7 @@ lines. \override Score.Clef #'full-size-change = ##t %\override Score.LyricText #'font-style = #'large \addlyrics -\context Staff \notes\relative c' { +\context Staff \relative c' { \clef soprano c1 s s \clef mezzosoprano c s s \clef alto c s s @@ -774,7 +774,7 @@ chords are denoted open chords \set Score.automaticBars = ##f %\override TextScript #'font-style = #'large \addlyrics -\context Staff \notes\relative c'' { +\context Staff \relative c'' { 1 s s s s s s @@ -803,7 +803,7 @@ A scale consisting of all 12 @aref{semitone}s. @lilypond[fragment,notime] \set Score.automaticBars = ##f -\notes\relative c' { c1 cis d dis e f fis g gis a ais b c } +\relative c' { c1 cis d dis e f fis g gis a ais b c } @end lilypond @aitem{chromaticism} @@ -926,7 +926,7 @@ Progressing melodically by intervals of a second. Opposite of @aref{disjunct mo @lilypond[fragment] \key g \major \time 4/4 -\notes\relative c'' { g4 g g a | b2 a | g4 b a a | g1 \bar "||" } +\relative c'' { g4 g g a | b2 a | g4 b a a | g1 \bar "||" } @end lilypond @aitem{consonance} @@ -974,7 +974,7 @@ composition methods. @lilypond[fragment,staffsize=11] \set Score.TimeSignature =\turnOff -\notes\context PianoStaff << +\context PianoStaff << \context Staff = SA \relative c' { \key bes \major \time 4/4 @@ -1042,7 +1042,7 @@ abbreviation ``cresc.''. @lilypond[fragment] \key g \major \time 4/4 -\notes\relative c'' { g4 \< a b c | d1\! \bar "|." } +\relative c'' { g4 \< a b c | d1\! \bar "|." } @end lilypond @aitem{cue-notes} @@ -1074,7 +1074,7 @@ of the 20th century @lilypond \score { - \notes { + { % \override Staff.Custos #'neutral-position = #4 \override Staff.Custos #'neutral-direction = #-1 @@ -1132,7 +1132,7 @@ another place frequently near the beginning marked by a sign: %\override TextScript #'font-style = #'large \override TextScript #'font-shape = #'italic \key g \major \time 4/4 -\notes\relative c'' { d1 | g,4^\segno a b c | b a g2_\markup{ \line < "d.s. " \small \raise #1 \musicglyph #"scripts-segno" > } \bar "|." } +\relative c'' { d1 | g,4^\segno a b c | b a g2_\markup{ \line < "d.s. " \small \raise #1 \musicglyph #"scripts-segno" > } \bar "|." } @end lilypond @aitem{decrescendo} @@ -1148,7 +1148,7 @@ Decreasing tone volume. Indicated by a leftwards opening horizontal wedge or the abbreviation ``decresc.''. @lilypond[fragment] -\notes\relative c'' { +\relative c'' { \key g \major \time 4/4 d4 \> c b a | g1 \! \bar "|." } @@ -1188,7 +1188,7 @@ also to some extent in newer jazz music. %\override Score.LyricText #'font-style = #'large %\override Score.TextScript #'font-style = #'large \addlyrics - \context Staff \notes\relative c' { + \context Staff \relative c' { c1 d \override TextScript #'padding = #-4 e^"~~ S" f g a b^"~~ S" c @@ -1203,7 +1203,7 @@ also to some extent in newer jazz music. %\override Score.LyricText #'font-style = #'large %\override Score.TextScript #'font-style = #'large \addlyrics - \context Staff \notes\relative c' { + \context Staff \relative c' { d1 \override TextScript #'padding = #-4 e^"~~ S" f g a b^"~~ S" c d @@ -1218,7 +1218,7 @@ also to some extent in newer jazz music. %\override Score.LyricText #'font-style = #'large %\override Score.TextScript #'font-style = #'large \addlyrics - \notes\relative c' { + \relative c' { \override TextScript #'padding = #-4 e1^"~~ S" f g a b^"~~ S" c d e } @@ -1232,7 +1232,7 @@ also to some extent in newer jazz music. %\override Score.LyricText #'font-style = #'large %\override Score.TextScript #'font-style = #'large \addlyrics - \notes\relative c' { + \relative c' { f1 g a \override TextScript #'padding = #-4 b^"~~ S" c d e^"~~ S" f @@ -1247,7 +1247,7 @@ also to some extent in newer jazz music. %\override Score.LyricText #'font-style = #'large %\override Score.TextScript #'font-style = #'large \addlyrics - \notes\relative c'' { + \relative c'' { g1 a \override TextScript #'padding = #-4 b^"~~ S" c d e^"~~ S" f g } @@ -1261,7 +1261,7 @@ also to some extent in newer jazz music. %\override Score.LyricText #'font-style = #'large %\override Score.TextScript #'font-style = #'large \addlyrics - \notes\relative c'' { + \relative c'' { a1 \override TextScript #'padding = #-4 b^"~~ S" c d e^"~~ S" f g a @@ -1281,7 +1281,7 @@ harmonic minor scale type an augmented second (A) occurs between the 6th and %\override Score.LyricText #'font-style = #'large %\override Score.TextScript #'font-style = #'large \addlyrics - \notes\relative c' { + \relative c' { c1 d \override TextScript #'padding = #-4 e^"~~ S" f g a b^"~~ S" c @@ -1296,7 +1296,7 @@ harmonic minor scale type an augmented second (A) occurs between the 6th and %\override Score.LyricText #'font-style = #'large %\override Score.TextScript #'font-style = #'large \addlyrics - \notes\relative c'' { + \relative c'' { a1 \override TextScript #'padding = #-4 b^"~~ S" c d e^"~~ S" f g a @@ -1311,7 +1311,7 @@ harmonic minor scale type an augmented second (A) occurs between the 6th and %\override Score.LyricText #'font-style = #'large %\override Score.TextScript #'font-style = #'large \addlyrics - \notes\relative c'' { + \relative c'' { a1 \override TextScript #'padding = #-4 b^"~~ S" c d e^"~~ S" f!^"~~ A" gis^"~~ S" a @@ -1326,7 +1326,7 @@ harmonic minor scale type an augmented second (A) occurs between the 6th and %\override Score.LyricText #'font-style = #'large %\override Score.TextScript #'font-style = #'large \addlyrics - \notes\relative c'' { + \relative c'' { a1 \override TextScript #'padding = #-4 b^"~~ S" c d e fis gis^"~~ S" @@ -1377,7 +1377,7 @@ Opposite of @aref{conjunct movement}. @lilypond[fragment] \key a \major \time 4/4 -\notes\relative c' { +\relative c' { \partial 8 e8 | a4. gis8 b a e cis | fis2 d4. \bar "||" } @@ -1647,7 +1647,7 @@ but equal pitch. \set Score.automaticBars = ##f %\override Score.TextScript #'font-style = #'large \addlyrics -\context Staff \notes\relative c'' { +\context Staff \relative c'' { gis1 s s as s s s s s s } \context Lyrics \lyrics { @@ -1715,7 +1715,7 @@ symbol indicates playing an octave lower (for example on double bass \override Staff.Clef #'full-size-change = ##t %\override Score.LyricText #'font-style = #'large \addlyrics -\notes\relative c { +\relative c { \clef varbaritone f1 \clef bass @@ -1753,7 +1753,7 @@ Prolonged note or rest of indefinite duration. @lilypond[fragment] \time 4/4 -\notes\relative c'' { +\relative c'' { a4 b c2^\fermata \bar "|." } @end lilypond @@ -1802,7 +1802,7 @@ less than a quarter note. The number of flags determines the @lilypond[fragment,notime] \set Score.automaticBars = ##f %\override Score.TextScript #'font-style = #'large -\notes\relative c'' { +\relative c'' { g8_"1/8" s8 g16_"1/16" s8 g32_"1/32" s8 @@ -1883,7 +1883,7 @@ variants of the base chords. %\override Score.LyricText #'font-style = #'large %\override Score.TextScript #'font-style = #'large \addlyrics -\context Voice \notes\relative c'' { +\context Voice \relative c'' { 1 < a f d > < b g e > < d b g > < e c a > < f d b > } \context Lyrics \lyrics { T Sp Dp S D Tp "D{\\kern-5pt}$\\mid$" } @@ -1920,7 +1920,7 @@ scores are notated like that). \override Staff.Clef #'full-size-change = ##t %\override Score.LyricText #'font-style = #'large \addlyrics -\notes\relative c'' { +\relative c'' { \clef french g1 s s \clef treble @@ -2029,7 +2029,7 @@ Sequence of chords that terminate a musical phrase or section. @aref{functional harmony}. @lilypond[fragment] -\notes\context PianoStaff << +\context PianoStaff << \context Staff = SA \relative c'' { \time 4/4 \clef treble @@ -2068,7 +2068,7 @@ Consonances: @lilypond[fragment,notime] \set Score.automaticBars = ##f %\override Score.TextScript #'font-style = #'large -\context Voice \notes\relative c'' { +\context Voice \relative c'' { 1_"unisone " s _"third " s _"fourth " s @@ -2084,7 +2084,7 @@ Dissonances: @lilypond[fragment,notime] \set Score.automaticBars = ##f %\override Score.TextScript #'font-style = #'large -\context Voice \notes\relative c'' { +\context Voice \relative c'' { 1_"second " s s _"seventh " s s _"ninth" s s @@ -2127,7 +2127,7 @@ of such two forms an octave. %\override Score.LyricText #'font-style = #'large %\override Score.TextScript #'font-style = #'large \addlyrics -\context Voice \notes\relative c'' { +\context Voice \relative c'' { < g g >1 s < g as >^"minor" s < g a! > s @@ -2148,7 +2148,7 @@ of such two forms an octave. %\override Score.LyricText #'font-style = #'large %\override Score.TextScript #'font-style = #'large \addlyrics -\context Staff \notes\relative c'' { +\context Staff \relative c'' { < g c >^"perfect" s < g cis >^"augm" s < g d' >^"perfect" s @@ -2169,7 +2169,7 @@ of such two forms an octave. %\override Score.LyricText #'font-style = #'large %\override Score.TextScript #'font-style = #'large \addlyrics -\context Staff \notes\relative c'' { +\context Staff \relative c'' { < gis f'! >1^"dimin" s < g! f'! >^"minor" s < g fis' >^"major" s @@ -2200,7 +2200,7 @@ The difference between an interval and an octave. @lilypond[fragment,notime] \set Score.automaticBars = ##f %\override Score.TextScript #'font-style = #'large -\context Staff \notes\relative c'' { +\context Staff \relative c'' { < g a >1_"second " s s < g' a, >_"seventh " s s \bar "||" < g, b >_"third " s s < g' b, >_"sixth " s s \bar "||" < g, c >_"fourth " s s < g' c, >_"fifth " s s \bar "||" @@ -2287,7 +2287,7 @@ A ledger line is an extension of the staff. @lilypond[fragment,notime] \set Score.automaticBars = ##f -\notes\relative c'' { a,1 s c'' } +\relative c'' { a,1 s c'' } @end lilypond @aitem{legato} @@ -2307,7 +2307,7 @@ unlike (b) @emph{leggiero} or @emph{non-legato}, (c) @emph{portato}, and @lilypond[fragment,notime] \set Score.automaticBars = ##f \addlyrics -\context Staff \notes\relative c'' { +\context Staff \relative c'' { c4-( d e-) \bar "||" c4-- d-- e-- \bar "||" c4-.-( d-. e-.-) \bar "||" @@ -2390,7 +2390,7 @@ Note value: double length of @aref{breve}. @lilypond[fragment,notime] \set Score.automaticBars = ##f -\notes\relative c'' { +\relative c'' { \override NoteHead #'style = #'mensural g\longa } @@ -2506,14 +2506,14 @@ one speaks of @emph{duple} (2/2, 2/4, 2/8), @emph{triple} (3/2, 3/4, 3/8), or @emph{quadruple} (4/2, 4/4, 4/8) meter. 4/4 is also called common meter. @lilypond[fragment] -\notes\relative c'' { +\relative c'' { \time 3/4 \key f \major c es d | c bes8 a bes4 | c es d | c2 \bar "||"} @end lilypond @lilypond[fragment] -\notes\relative c' { +\relative c' { \time 6/8 \key f \major f8 f f f a16 g a f | @@ -2521,7 +2521,7 @@ one speaks of @emph{duple} (2/2, 2/4, 2/8), @emph{triple} (3/2, 3/4, 3/8), or @end lilypond @lilypond[fragment] -\notes\relative c'' { +\relative c'' { \time 5/4 \key g \major d4 b8 g b d d c a4 | @@ -2582,7 +2582,7 @@ First C below the 440 Hz A. @lilypond[fragment,notime] \set Score.automaticBars = ##f \override Staff.Clef #'full-size-change = ##t -\notes\relative c' { +\relative c' { \clef bass c1 s \clef alto c s \clef treble c s @@ -2667,7 +2667,7 @@ subject. @lilypond[fragment] \set Score.TimeSignature = \turnOff %\override Score.TextScript #'font-style = #'large -\notes\relative c'' { +\relative c'' { \time 4/4 \key g \major \partial 8 g16_"------" fis | @@ -2701,7 +2701,7 @@ S: flertaktspaus, FI: usean tahdin mittainen tauko. @lilypond[fragment] -\notes\relative c'' { +\relative c'' { a1 \set Score.skipBars = ##t R1*3 a1 @@ -2792,7 +2792,7 @@ but sometimes (mostly in pre baroque music) the double length note value @lilypond[fragment,notime] %\override Score.TextScript #'font-style = #'large \set Score.automaticBars = ##f -\notes\relative c'' { +\relative c'' { \override NoteHead #'style = #'mensural g\longa_"longa" g\breve_"breve" \revert NoteHead #'style @@ -2803,7 +2803,7 @@ but sometimes (mostly in pre baroque music) the double length note value @lilypond[fragment,notime] %\override Score.TextScript #'font-style = #'large \set Score.automaticBars = ##f -\notes\relative c'' { +\relative c'' { r\longa_"longa" r\breve_"breve" r1_"1/1" r2_"1/2" r4_"1/4" s16 r8_"1/8" s16 r16_"1/16" s16 r32_"1/32" s16 r64_"1/64" s32 } @@ -2814,7 +2814,7 @@ half. Another dot adds yet a fourth of the duration. @lilypond[fragment] %\override Score.TextScript #'font-style = #'large -\notes\relative c'' { +\relative c'' { \time 4/4 g4._"pointed" g8 g2 | g4 ~ g8 g g2 \bar "||" g4.._"double pointed" g16 g2 | g4 ~ g8 ~ g16 g g2 \bar "||" } @@ -2827,7 +2827,7 @@ dotted notes are also frequently used. @lilypond[fragment] %\override Score.TextScript #'font-style = #'large -\notes\relative c'' { +\relative c'' { \time 4/4 \times 2/3 {g8_"triplets" g g} g4 g8 g g4 \bar "||" \times 2/5 {g8_"quintuplets" g g g g} g4 g8 g g4 \bar "||" @@ -2835,7 +2835,7 @@ dotted notes are also frequently used. @end lilypond @lilypond[fragment] -\notes\relative c'' { +\relative c'' { \time 3/4 \times 3/2 {g4_"duplets" g} | g4 g g \bar "||" @@ -2879,12 +2879,12 @@ the upper note is played first. << \context Staff = sa { % \override Score.TextScript #'font-style = #'large - \notes\relative c'' { + \relative c'' { c2._"pre-1850" b4\trill | c1 \bar "||" c2._"post-1850" b4\trill | c1 \bar "||" } } - \notes\relative c'' { + \relative c'' { c2. c32 b c b c b c b | c1 c2. b32 c b c \times 4/5 { b c b c b } | c1 } @@ -2898,13 +2898,13 @@ Other frequently used ornaments are the @emph{turn}, the @emph{mordent}, and the << \context Staff = sa { % \override Score.TextScript #'font-style = #'large - \notes\relative c'' { + \relative c'' { a4_"turn" b\turn c2 \bar "||" g4_"mordent" a b\mordent a \bar "||" e'4_"prall" d\prall c2 \bar "||" } } - \notes\relative c'' { + \relative c'' { a4 c16[ b a b] c2 g4 a b16-[ a b8] a4 e'4 e32[ d e d ~ d8] c2 @@ -3153,7 +3153,7 @@ with the same @aref{key signature}. @lilypond[fragment,notime] \set Score.automaticBars = ##f %\override Score.TextScript #'font-style = #'large -\notes\relative c' { +\relative c' { \key es \major es1_"e flat major" f g as bes c d es \bar "||" @@ -3163,7 +3163,7 @@ with the same @aref{key signature}. @lilypond[fragment,notime] \set Score.automaticBars = ##f %\override Score.TextScript #'font-style = #'large -\notes\relative c' { +\relative c' { \key es \major c1_"c minor" d es f g a! b! c \bar "||" } @@ -3182,7 +3182,7 @@ FI: toisto. @lilypond[fragment] \key g \major \time 4/4 -\notes\relative c'' { +\relative c'' { \repeat volta 2 {g4 g d' d | e e d2 | c4 c b b | a a g2 } } @end lilypond @@ -3276,7 +3276,7 @@ sub@-do@-mi@-nant (S) and V = dominant (D). %\override Score.LyricText #'font-style = #'large %\set minVerticalAlign = #8 \addlyrics -\context Staff \notes\relative c' { +\context Staff \relative c' { c1 d e f g a b c } \context Lyrics \lyrics { @@ -3334,7 +3334,7 @@ semitone. An octave may be divided into 12@w{ }semitones. @lilypond[fragment,notime] \set Score.automaticBars = ##f -\notes\relative c'' { g1 gis s a bes s b! c } +\relative c'' { g1 gis s a bes s b! c } @end lilypond @aitem{seventh} @@ -3533,7 +3533,7 @@ note head. @lilypond[fragment] \key d \major \time 4/4 -\notes\relative c'' { +\relative c'' { \partial 8 a8 | d4-\staccato cis-\staccato b-\staccato cis-\staccato | d2. \bar "||" @@ -3572,7 +3572,7 @@ whole note. @aref{beam}. \set Score.autoBeaming = ##f \set Score.automaticBars = ##f %\override Score.TextScript #'font-style = #'large -\notes\relative c'' { +\relative c'' { g2_"1/2" g' s16 g,4_"1/4" g' s16 g,8_"1/8" g' s16 @@ -3698,7 +3698,7 @@ the underlaying (normal) pulse and the actual (abnormal) rhythm. @lilypond[fragment] \time 4/4 -\notes\relative c' { +\relative c' { \partial 4 d8 dis | e c'4 e,8 c'4 e,8 c' ( | c2) @@ -3836,7 +3836,7 @@ with figures designating the chief @aref{interval}s and @lilypond[fragment] \context GrandStaff << - \context Staff = lh \notes\relative c'' { + \context Staff = lh \relative c'' { \time 4/4 \key es \major \clef treble @@ -3849,7 +3849,7 @@ with figures designating the chief @aref{interval}s and >> } \addlyrics - \context Staff = rh \notes\relative c' { + \context Staff = rh \relative c' { \clef bass \key es \major es8 c d bes c as bes16 as g f | es4 @@ -3878,7 +3878,7 @@ uniting them into a single sound equal to the combined durations. @lilypond[fragment,notime] \set Score.automaticBars = ##f -\notes\relative c'' { g2 ~ g4. } +\relative c'' { g2 ~ g4. } @end lilypond @aitem{time signature} @@ -3936,7 +3936,7 @@ relative pitches. @lilypond[fragment] \context Staff { \time 3/4 - \notes\relative c'' { + \relative c'' { \key g \major d4 g,8 a b c | d4 g, g | e' c8 d e fis | g4 g, g \bar "|." } @@ -3984,7 +3984,7 @@ a @aref{chord}, usually in the distance of a third @lilypond[fragment,notime] \set Score.automaticBars = ##f %\override Score.TextScript #'font-style = #'large -\notes\relative c' { +\relative c' { e2:32_"a" f:32 [ e8:16 f:16 g:16 a:16 ] s4 \repeat "tremolo" 8 { e32_"b" g } @@ -4106,7 +4106,7 @@ line. @aref{measure}, @aref{meter}. @lilypond[fragment] \key f \major \time 4/4 -\notes\relative c' { +\relative c' { \partial 4 f4 | bes4. a8 bes4 c | bes( a) g f | bes4. a8 bes4 c | f,2. \bar "||" } @end lilypond diff --git a/Documentation/user/notation.itely b/Documentation/user/notation.itely index cab51b603e..40b7d1fe7e 100644 --- a/Documentation/user/notation.itely +++ b/Documentation/user/notation.itely @@ -80,8 +80,8 @@ cis'4 d'8 e'16 c'16 @cindex pitches @cindex entering notes -The most common syntax for pitch entry is used in @code{\chords} and -@code{\notes} mode. In these modes, pitches may be designated by +The most common syntax for pitch entry is used in standard notes and +@code{\chords} mode. In these modes, pitches may be designated by names. The notes are specified by the letters @code{a} through @code{g}, while the octave is formed with notes ranging from @code{c} to @code{b}. The pitch @code{c} is an octave below middle C and the @@ -262,12 +262,10 @@ The @code{s} syntax is only available in note mode and chord mode. In other situations, you should use the @code{\skip} command @lilypond[quote,raggedright,verbatim] -\score { \new Staff << { \time 4/8 \skip 2 \time 4/4 } - \notes\relative c'' { a2 a1 } + \relative c'' { a2 a1 } >> -} @end lilypond The skip command is merely an empty musical placeholder. It does not @@ -278,7 +276,7 @@ The @code{s} skip command does create @internalsref{Staff} and commands. For example, the following results in an empty staff. @lilypond[quote,raggedright,verbatim] -\score { \notes { s4 } } + { s4 } @end lilypond The same fragment using @code{\skip} results in an empty page. @@ -314,7 +312,7 @@ r1 r2 r4 r8 r16 r32 r64 r64 @lilypond[quote] \score { - \notes \relative c'' { + \relative c'' { a\breve*1/2 \autoBeamOff a1 a2 a4 a8 a16 a32 a64 a64 r\longa*1/4 r\breve *1/2 @@ -609,10 +607,9 @@ to determine the first note of the next chord } @end lilypond -@cindex @code{\notes} -The pitch after the @code{\relative} contains a note name. To parse -the note name as a pitch, it must be surrounded by @code{\notes} +The pitch after the @code{\relative} contains a note name. + The relative conversion will not affect @code{\transpose}, @code{\chords} or @code{\relative} sections in its argument. If you @@ -714,9 +711,7 @@ by assigning a music expression to @code{pipeSymbol}, @lilypond pipeSymbol = \bar "||" -\score { - \notes { c'2 c'2 | c'2 c'2 | } -} +{ c'2 c'2 | c'2 c'2 | } @end lilypond @@ -1036,7 +1031,7 @@ measure is subdivided in 2, 2, 2 and 3. This is passed to @lilypond[quote,raggedright,verbatim] \score { - \notes \relative c'' { + \relative c'' { #(set-time-signature 9 8 '(2 2 2 3)) g8[ g] d[ d] g[ g] a8[( bes g]) | #(set-time-signature 5 8 '(3 2)) @@ -1933,7 +1928,7 @@ To use this, add the @internalsref{Horizontal_bracket_engraver} to @lilypond[quote,raggedright,verbatim] \score { - \notes \relative c'' { + \relative c'' { c4\startGroup\startGroup c4\stopGroup c4\startGroup @@ -2616,13 +2611,11 @@ Program reference: @internalsref{VoltaBracket}, @internalsref{RepeatedMusic}, To place tremolo marks between notes, use @code{\repeat} with tremolo style @lilypond[quote,verbatim,raggedright] -\score { - \context Voice \notes\relative c' { + \context Voice \relative c' { \repeat "tremolo" 8 { c16 d16 } \repeat "tremolo" 4 { c16 d16 } \repeat "tremolo" 2 { c16 d16 } } -} @end lilypond Tremolo marks can also be put on a single note. In this case, the @@ -2771,12 +2764,10 @@ To typeset the music, the notes must be interpreted in a @lilypond[quote,raggedright,verbatim] up = \drums { crashcymbal4 hihat8 halfopenhihat hh hh hh openhihat } down = \drums { bassdrum4 snare8 bd r bd sn4 } -\score { \new DrumStaff << \new DrumVoice { \voiceOne \up } \new DrumVoice { \voiceTwo \down } >> -} @end lilypond The above example shows verbose polyphonic notation. The short @@ -2842,8 +2833,8 @@ to typeset timbales on a two line staff @lilypond[quote,raggedright] nam = \lyrics { timh ssh timl ssl cb } mus = \drums { timh ssh timl ssl cb s16 } -\score { - << + +<< \context DrumStaff \with { \remove Bar_engraver \remove Time_signature_engraver @@ -2858,8 +2849,7 @@ mus = \drums { timh ssh timl ssl cb s16 } \override LyricText #'font-family = #'typewriter \nam } - >> -} +>> @end lilypond @item congas-style to typeset congas on a two line staff @@ -2867,8 +2857,7 @@ to typeset congas on a two line staff @lilypond[quote,raggedright] nam = \lyrics { cgh cgho cghm ssh cgl cglo cglm ssl } mus = \drums { cgh cgho cghm ssh cgl cglo cglm ssl s16 } -\score { - << +<< \context DrumStaff\with { \remove Bar_engraver \remove Time_signature_engraver @@ -2883,8 +2872,7 @@ mus = \drums { cgh cgho cghm ssh cgl cglo cglm ssl s16 } \context Lyrics { \override LyricText #'font-family = #'typewriter \nam } - >> -} +>> @end lilypond @item bongos-style to typeset bongos on a two line staff @@ -2892,8 +2880,7 @@ to typeset bongos on a two line staff @lilypond[quote,raggedright] nam = \lyrics { boh boho bohm ssh bol bolo bolm ssl } mus = \drums { boh boho bohm ssh bol bolo bolm ssl s16 } -\score { - << +<< \context DrumStaff\with { \remove Bar_engraver \remove Time_signature_engraver @@ -2908,8 +2895,7 @@ mus = \drums { boh boho bohm ssh bol bolo bolm ssl s16 } \context Lyrics { \override LyricText #'font-family = #'typewriter \nam } - >> -} +>> @end lilypond @item percussion-style @@ -2917,8 +2903,7 @@ to typeset all kinds of simple percussion on one line staves @lilypond[quote,raggedright] nam = \lyrics { tri trio trim gui guis guil cb cl tamb cab mar hc } mus = \drums { tri trio trim gui guis guil cb cl tamb cab mar hc s16 } -\score { - << +<< \context DrumStaff\with{ \remove Bar_engraver drumStyleTable = #percussion-style @@ -2928,11 +2913,10 @@ mus = \drums { tri trio trim gui guis guil cb cl tamb cab mar hc s16 } \override Stem #'Y-extent-callback = ##f } \mus \context Lyrics { - \nam - \override LyricText #'font-family = #'typewriter -} - >> -} + \nam + \override LyricText #'font-family = #'typewriter + } +>> @end lilypond @end table @@ -2948,14 +2932,13 @@ list at the top of your file (lowtom diamond #f 3))) up = \drums { hh8 hh hh hh hhp4 hhp } down = \drums { bd4 sn bd toml8 toml } -\score { - \new DrumStaff << + +\new DrumStaff << \set DrumStaff.drumStyleTable = #(alist->hash-table mydrums) \new DrumVoice { \voiceOne \up } \new DrumVoice { \voiceTwo \down } - >> -} +>> @end lilypond @@ -3043,14 +3026,14 @@ point), and it looks ahead skipping over rests to switch in advance. Here is a practical example @lilypond[quote,verbatim,raggedright] -\score { \notes \context PianoStaff << +\context PianoStaff << \context Staff = "up" { \autochange \new Voice \relative c' { g4 a b c d r4 a g } } \context Staff = "down" { \clef bass s1*2 -} >> } +} >> @end lilypond @noindent @@ -3458,7 +3441,7 @@ then the lyrics are specified with @code{\lyricsto}. The command For different or more complex orderings, the best way is to setup the hierarchy of staves and lyrics first, e.g. @example -\context ChoirStaff \notes << +\context ChoirStaff << \context Lyrics = sopranoLyrics @{ s1 @} \context Voice = soprano @{ @emph{music} @} \context Lyrics = tenorLyrics @{ s1 @} @@ -3475,7 +3458,7 @@ and then combine the appropriate melodies and lyric lines The final input would resemble @example - << \context ChoirStaff \notes << @emph{setup the music} >> + << \context ChoirStaff << @emph{setup the music} >> \lyricsto "soprano" @emph{etc} \lyricsto "alto" @emph{etc} @emph{etc} @@ -3623,9 +3606,8 @@ that identity followed by a dash. In the preceding example, the The complete example is shown here @lilypond[quote,raggedright,verbatim] -\score { << - \notes \relative c'' \context Voice = duet { + \relative c'' \context Voice = duet { \time 3/4 g2 e4 a2 f4 g2. } << @@ -3637,7 +3619,6 @@ The complete example is shown here Ooooo, ch\'e -- ri, je t'aime. } >> >> -} @end lilypond @cindex stanza number @@ -3699,9 +3680,15 @@ for example, This results in the following output @lilypond[quote,raggedright] -\score { + \paper { + \context { + \Staff + \consists Ambitus_engraver + } + } + \context ChoirStaff - \notes \relative c' << + \relative c' << \new Staff { as'' c e2 cis,2 } @@ -3709,13 +3696,6 @@ This results in the following output es4 b c f as g } >> - \paper { - \context { - \Staff - \consists Ambitus_engraver - } - } -} @end lilypond If you have multiple voices in a single staff, and you want a single @@ -3769,7 +3749,7 @@ are printed as tablature, by using @internalsref{TabStaff} and @internalsref{TabVoice} contexts @lilypond[quote,fragment,verbatim] -\notes \context TabStaff { + \context TabStaff { a,4\5 c'\2 a\3 e'\1 e\4 c'\2 a\3 e'\1 } @@ -3789,18 +3769,16 @@ e16 fis gis a b4 e16 fis gis a b4 @end example @lilypond[quote,noindent,raggedright] -frag = \notes { +frag = { \key e \major e16 fis gis a b4 \set TabStaff.minimumFret = #8 e16 fis gis a b4 } -\score { \context StaffGroup << \context Staff { \clef "G_8" \frag } \context TabStaff { \frag } >> -} @end lilypond @seealso @@ -3834,7 +3812,7 @@ g \context TabStaff << \set TabStaff.stringTunings = #'(-5 -10 -15 -20) - \notes { + { a,4 c' a e' e c' a e' } >> @@ -3860,7 +3838,7 @@ set of pitches, so they can be transposed @lilypond[quote,verbatim,raggedright] -twoWays = \notes \transpose c c' { +twoWays = \transpose c c' { \chords { c1 f:sus4 bes/f } @@ -3869,9 +3847,8 @@ twoWays = \notes \transpose c c' { } -\score { << \context ChordNames \twoWays - \context Voice \twoWays >> } + \context Voice \twoWays >> @end lilypond This example also shows that the chord printing routines do not try to @@ -3988,7 +3965,7 @@ by using @code{/+}@var{pitch}. \chords { c1 c/+g c/+f } @end lilypond -Chords is a mode similar to @code{\lyrics}, @code{\notes} etc. Most +Chords is a mode similar to @code{\lyrics} etc. Most of the commands continue to work, for example, @code{r} and @code{\skip} can be used to insert rests and spaces, and property commands may be used to change various settings. @@ -4018,15 +3995,14 @@ The chords may be entered either using the notation described above, or directly using @code{<} and @code{>} @lilypond[quote,verbatim,raggedright] -scheme = \notes { +scheme = { \chords {a1 b c} } -\score { - \notes << + + << \context ChordNames \scheme \context Staff \scheme - >> -} +>> @end lilypond You can make the chord changes stand out by setting @@ -4038,14 +4014,12 @@ the start of a new line scheme = \chords { c1:m c:m \break c:m c:m d } -\score { - \notes << + << \context ChordNames { \set chordChanges = ##t \scheme } \context Staff \transpose c c' \scheme - >> -} +>> @end lilypond The default chord name layout is a system for Jazz music, proposed by @@ -4340,7 +4314,7 @@ You can also use markup texts to construct more complicated instrument names, for example @lilypond[quote,fragment,verbatim,raggedright] -\notes { + { \set Staff.instrument = \markup { \column < "Clarinetti" { "in B" \smaller \flat } > } @@ -4393,20 +4367,19 @@ transposition will produce the appropriate part \transpose a c @dots{} @end example -Since @var{from} and @var{to} are pitches, so @code{\transpose} must be -inside a @code{\notes} section. @code{\transpose} distinguishes -between enharmonic pitches: both @code{\transpose c cis} or -@code{\transpose c des} will transpose up half a tone. The first -version will print sharps and the second version will print flats +@code{\transpose} distinguishes between enharmonic pitches: both +@code{\transpose c cis} or @code{\transpose c des} will transpose up +half a tone. The first version will print sharps and the second +version will print flats @lilypond[quote,raggedright,verbatim] -mus =\notes { \key d \major cis d fis g } -\score { \notes \context Staff { +mus = { \key d \major cis d fis g } +\context Staff { \clef "F" \mus \clef "G" \transpose c g' \mus \transpose c f' \mus -}} +} @end lilypond @@ -4643,15 +4616,16 @@ in this example disappears in the second line @lilypond[quote,verbatim] -\score { - \notes \relative c' << - \new Staff { e4 f g a \break c1 } - \new Staff { c4 d e f \break R1 } - >> \paper { linewidth = 6.\cm \context { \RemoveEmptyStaffContext } } + +{ + \relative c' << + \new Staff { e4 f g a \break c1 } + \new Staff { c4 d e f \break R1 } + >> } @end lilypond @@ -4743,7 +4717,7 @@ Here, @var{name} is an identifying string. The @var{music} is any kind of music. This is an example of @code{\addquote} @verbatim -\addquote clarinet \notes\relative c' { +\addquote clarinet \relative c' { f4 fis g gis } @end verbatim @@ -4762,14 +4736,14 @@ Quotations take into account the transposition both source and target instruments, if they are specified using the @code{\transposition} command. @lilypond[quote,raggedright,verbatim] -\addquote clarinet \notes\relative c' { +\addquote clarinet \relative c' { \transposition bes f4 fis g gis } -\score { - \notes { + +{ e'8 f'8 \quote clarinet 2 -} } +} @end lilypond @refbugs @@ -4907,7 +4881,7 @@ select ancient accidentals. Supported styles are @lilypond[quote,raggedright,staffsize=26] \score { - \notes { + { \fatText s ^\markup { @@ -5264,7 +5238,7 @@ following table @lilypond[quote] \score { - \notes { + { \set Score.timing = ##f \set Score.barAlways = ##t s_\markup { "$\\backslash$time 4/4" } @@ -5385,7 +5359,7 @@ The result looks like this @lilypond[quote,raggedright] \score { - \notes { + { a'1 \override Staff.Custos #'style = #'mensural \break @@ -5511,12 +5485,10 @@ this particular type of ligature. By default, the above the ligature @lilypond[quote,raggedright,verbatim] -\score { - \notes \transpose c c' { +\transpose c c' { \[ g c a f d' \] a g f \[ e f a g \] - } } @end lilypond @@ -5575,7 +5547,7 @@ For example, @end example @lilypond[quote,raggedright] \score { - \notes \transpose c c' { + \transpose c c' { \set Score.timing = ##f \set Score.defaultBarType = "empty" \override NoteHead #'style = #'neo_mensural @@ -5600,8 +5572,7 @@ Without replacing @internalsref{Ligature_bracket_engraver} with to the following @lilypond[quote,raggedright] -\score { - \notes \transpose c c' { +\transpose c c' { \set Score.timing = ##f \set Score.defaultBarType = "empty" \override NoteHead #'style = #'neo_mensural @@ -5610,7 +5581,6 @@ to the following \[ g\longa c\breve a\breve f\breve d'\longa \] s4 \[ e1 f1 a\breve g\longa \] - } } @end lilypond @@ -5663,7 +5633,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=1.5\cm] \include "gregorian-init.ly" \score { - \notes \transpose c c' { + \transpose c c' { % Punctum \[ b \] \noBreak s^\markup {"a"} \noBreak @@ -5672,36 +5642,13 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published \[ \inclinatum b \] \noBreak s^\markup {"b"} } - \paper { - interscoreline = 1 - \context { - \Score - \remove "Bar_number_engraver" - } - \context { - \Staff - \remove "Clef_engraver" - \remove "Key_engraver" - \override StaffSymbol #'transparent = ##t - \remove "Time_signature_engraver" - \remove "Bar_engraver" - minimumVerticalExtent = ##f - } - \context { - \Voice - \remove Ligature_bracket_engraver - \consists Vaticana_ligature_engraver - \override NoteHead #'style = #'vaticana_punctum - \override Stem #'transparent = ##t - } - } -} +\paper { \neumeDemoPaper }} @end lilypond @tab @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=2.5\cm] \include "gregorian-init.ly" \score { - \notes \transpose c c' { + \transpose c c' { % Punctum Auctum Ascendens \[ \auctum \ascendens b \] \noBreak s^\markup {"c"} \noBreak @@ -5714,64 +5661,18 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published \[ \inclinatum \auctum b \] \noBreak s^\markup {"e"} } - \paper { - interscoreline = 1 - \context { - \Score - \remove "Bar_number_engraver" - } - \context { - \Staff - \remove "Clef_engraver" - \remove "Key_engraver" - \override StaffSymbol #'transparent = ##t - \remove "Time_signature_engraver" - \remove "Bar_engraver" - minimumVerticalExtent = ##f - } - \context { - \Voice - \remove Ligature_bracket_engraver - \consists Vaticana_ligature_engraver - \override NoteHead #'style = #'vaticana_punctum - \override Stem #'transparent = ##t - } - } -} +\paper { \neumeDemoPaper }} @end lilypond @tab @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=1.0\cm] \include "gregorian-init.ly" \score { - \notes \transpose c c' { + \transpose c c' { % Punctum Inclinatum Parvum \[ \inclinatum \deminutum b \] \noBreak s^\markup {"f"} } - \paper { - interscoreline = 1 - \context { - \Score - \remove "Bar_number_engraver" - } - \context { - \Staff - \remove "Clef_engraver" - \remove "Key_engraver" - \override StaffSymbol #'transparent = ##t - \remove "Time_signature_engraver" - \remove "Bar_engraver" - minimumVerticalExtent = ##f - } - \context { - \Voice - \remove Ligature_bracket_engraver - \consists Vaticana_ligature_engraver - \override NoteHead #'style = #'vaticana_punctum - \override Stem #'transparent = ##t - } - } -} +\paper { \neumeDemoPaper }} @end lilypond @item @@ -5780,35 +5681,12 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=1.0\cm] \include "gregorian-init.ly" \score { - \notes \transpose c c' { + \transpose c c' { % Virga \[ \virga b \] \noBreak s^\markup {"g"} } - \paper { - interscoreline = 1 - \context { - \Score - \remove "Bar_number_engraver" - } - \context { - \Staff - \remove "Clef_engraver" - \remove "Key_engraver" - \override StaffSymbol #'transparent = ##t - \remove "Time_signature_engraver" - \remove "Bar_engraver" - minimumVerticalExtent = ##f - } - \context { - \Voice - \remove Ligature_bracket_engraver - \consists Vaticana_ligature_engraver - \override NoteHead #'style = #'vaticana_punctum - \override Stem #'transparent = ##t - } - } -} +\paper { \neumeDemoPaper }} @end lilypond @tab @tab @@ -5819,69 +5697,23 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=1.0\cm] \include "gregorian-init.ly" \score { - \notes \transpose c c' { + \transpose c c' { % Stropha \[ \stropha b \] \noBreak s^\markup {"h"} } - \paper { - interscoreline = 1 - \context { - \Score - \remove "Bar_number_engraver" - } - \context { - \Staff - \remove "Clef_engraver" - \remove "Key_engraver" - \override StaffSymbol #'transparent = ##t - \remove "Time_signature_engraver" - \remove "Bar_engraver" - minimumVerticalExtent = ##f - } - \context { - \Voice - \remove Ligature_bracket_engraver - \consists Vaticana_ligature_engraver - \override NoteHead #'style = #'vaticana_punctum - \override Stem #'transparent = ##t - } - } -} +\paper { \neumeDemoPaper }} @end lilypond @tab @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=1.0\cm] \include "gregorian-init.ly" \score { - \notes \transpose c c' { + \transpose c c' { % Stropha Aucta \[ \stropha \auctum b \] \noBreak s^\markup {"i"} } - \paper { - interscoreline = 1 - \context { - \Score - \remove "Bar_number_engraver" - } - \context { - \Staff - \remove "Clef_engraver" - \remove "Key_engraver" - \override StaffSymbol #'transparent = ##t - \remove "Time_signature_engraver" - \remove "Bar_engraver" - minimumVerticalExtent = ##f - } - \context { - \Voice - \remove Ligature_bracket_engraver - \consists Vaticana_ligature_engraver - \override NoteHead #'style = #'vaticana_punctum - \override Stem #'transparent = ##t - } - } -} +\paper { \neumeDemoPaper }} @end lilypond @tab @@ -5891,35 +5723,12 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=1.0\cm] \include "gregorian-init.ly" \score { - \notes \transpose c c' { + \transpose c c' { % Oriscus \[ \oriscus b \] \noBreak s^\markup {"j"} } - \paper { - interscoreline = 1 - \context { - \Score - \remove "Bar_number_engraver" - } - \context { - \Staff - \remove "Clef_engraver" - \remove "Key_engraver" - \override StaffSymbol #'transparent = ##t - \remove "Time_signature_engraver" - \remove "Bar_engraver" - minimumVerticalExtent = ##f - } - \context { - \Voice - \remove Ligature_bracket_engraver - \consists Vaticana_ligature_engraver - \override NoteHead #'style = #'vaticana_punctum - \override Stem #'transparent = ##t - } - } -} +\paper { \neumeDemoPaper }} @end lilypond @tab @tab @@ -5930,41 +5739,18 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=1.0\cm] \include "gregorian-init.ly" \score { - \notes \transpose c c' { + \transpose c c' { % Clivis vel Flexa \[ b \flexa g \] s^\markup {"k"} } - \paper { - interscoreline = 1 - \context { - \Score - \remove "Bar_number_engraver" - } - \context { - \Staff - \remove "Clef_engraver" - \remove "Key_engraver" - \override StaffSymbol #'transparent = ##t - \remove "Time_signature_engraver" - \remove "Bar_engraver" - minimumVerticalExtent = ##f - } - \context { - \Voice - \remove Ligature_bracket_engraver - \consists Vaticana_ligature_engraver - \override NoteHead #'style = #'vaticana_punctum - \override Stem #'transparent = ##t - } - } -} +\paper { \neumeDemoPaper }} @end lilypond @tab @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=2.0\cm] \include "gregorian-init.ly" \score { - \notes \transpose c c' { + \transpose c c' { % Clivis Aucta Descendens \[ b \flexa \auctum \descendens g \] \noBreak s^\markup {"l"} \noBreak @@ -5973,64 +5759,18 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published \[ b \flexa \auctum \ascendens g \] \noBreak s^\markup {"m"} } - \paper { - interscoreline = 1 - \context { - \Score - \remove "Bar_number_engraver" - } - \context { - \Staff - \remove "Clef_engraver" - \remove "Key_engraver" - \override StaffSymbol #'transparent = ##t - \remove "Time_signature_engraver" - \remove "Bar_engraver" - minimumVerticalExtent = ##f - } - \context { - \Voice - \remove Ligature_bracket_engraver - \consists Vaticana_ligature_engraver - \override NoteHead #'style = #'vaticana_punctum - \override Stem #'transparent = ##t - } - } -} +\paper { \neumeDemoPaper }} @end lilypond @tab @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=1.0\cm] \include "gregorian-init.ly" \score { - \notes \transpose c c' { + \transpose c c' { % Cephalicus \[ b \flexa \deminutum g \] s^\markup {"n"} } - \paper { - interscoreline = 1 - \context { - \Score - \remove "Bar_number_engraver" - } - \context { - \Staff - \remove "Clef_engraver" - \remove "Key_engraver" - \override StaffSymbol #'transparent = ##t - \remove "Time_signature_engraver" - \remove "Bar_engraver" - minimumVerticalExtent = ##f - } - \context { - \Voice - \remove Ligature_bracket_engraver - \consists Vaticana_ligature_engraver - \override NoteHead #'style = #'vaticana_punctum - \override Stem #'transparent = ##t - } - } -} +\paper { \neumeDemoPaper }} @end lilypond @item @@ -6039,41 +5779,18 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=1.0\cm] \include "gregorian-init.ly" \score { - \notes \transpose c c' { + \transpose c c' { % Podatus vel Pes \[ g \pes b \] s^\markup {"o"} } - \paper { - interscoreline = 1 - \context { - \Score - \remove "Bar_number_engraver" - } - \context { - \Staff - \remove "Clef_engraver" - \remove "Key_engraver" - \override StaffSymbol #'transparent = ##t - \remove "Time_signature_engraver" - \remove "Bar_engraver" - minimumVerticalExtent = ##f - } - \context { - \Voice - \remove Ligature_bracket_engraver - \consists Vaticana_ligature_engraver - \override NoteHead #'style = #'vaticana_punctum - \override Stem #'transparent = ##t - } - } -} +\paper { \neumeDemoPaper }} @end lilypond @tab @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=2.0\cm] \include "gregorian-init.ly" \score { - \notes \transpose c c' { + \transpose c c' { % Pes Auctus Descendens \[ g \pes \auctum \descendens b \] \noBreak s^\markup {"p"} \noBreak @@ -6082,64 +5799,18 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published \[ g \pes \auctum \ascendens b \] \noBreak s^\markup {"q"} } - \paper { - interscoreline = 1 - \context { - \Score - \remove "Bar_number_engraver" - } - \context { - \Staff - \remove "Clef_engraver" - \remove "Key_engraver" - \override StaffSymbol #'transparent = ##t - \remove "Time_signature_engraver" - \remove "Bar_engraver" - minimumVerticalExtent = ##f - } - \context { - \Voice - \remove Ligature_bracket_engraver - \consists Vaticana_ligature_engraver - \override NoteHead #'style = #'vaticana_punctum - \override Stem #'transparent = ##t - } - } -} +\paper { \neumeDemoPaper }} @end lilypond @tab @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=1.0\cm] \include "gregorian-init.ly" \score { - \notes \transpose c c' { + \transpose c c' { % Epiphonus \[ g \pes \deminutum b \] s^\markup {"r"} } - \paper { - interscoreline = 1 - \context { - \Score - \remove "Bar_number_engraver" - } - \context { - \Staff - \remove "Clef_engraver" - \remove "Key_engraver" - \override StaffSymbol #'transparent = ##t - \remove "Time_signature_engraver" - \remove "Bar_engraver" - minimumVerticalExtent = ##f - } - \context { - \Voice - \remove Ligature_bracket_engraver - \consists Vaticana_ligature_engraver - \override NoteHead #'style = #'vaticana_punctum - \override Stem #'transparent = ##t - } - } -} +\paper { \neumeDemoPaper }} @end lilypond @item @@ -6148,69 +5819,23 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=1.0\cm] \include "gregorian-init.ly" \score { - \notes \transpose c c' { + \transpose c c' { % Pes Quassus \[ \oriscus g \pes \virga b \] s^\markup {"s"} } - \paper { - interscoreline = 1 - \context { - \Score - \remove "Bar_number_engraver" - } - \context { - \Staff - \remove "Clef_engraver" - \remove "Key_engraver" - \override StaffSymbol #'transparent = ##t - \remove "Time_signature_engraver" - \remove "Bar_engraver" - minimumVerticalExtent = ##f - } - \context { - \Voice - \remove Ligature_bracket_engraver - \consists Vaticana_ligature_engraver - \override NoteHead #'style = #'vaticana_punctum - \override Stem #'transparent = ##t - } - } -} +\paper { \neumeDemoPaper }} @end lilypond @tab @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=1.0\cm] \include "gregorian-init.ly" \score { - \notes \transpose c c' { + \transpose c c' { % Pes Quassus Auctus Descendens \[ \oriscus g \pes \auctum \descendens b \] s^\markup {"t"} } - \paper { - interscoreline = 1 - \context { - \Score - \remove "Bar_number_engraver" - } - \context { - \Staff - \remove "Clef_engraver" - \remove "Key_engraver" - \override StaffSymbol #'transparent = ##t - \remove "Time_signature_engraver" - \remove "Bar_engraver" - minimumVerticalExtent = ##f - } - \context { - \Voice - \remove Ligature_bracket_engraver - \consists Vaticana_ligature_engraver - \override NoteHead #'style = #'vaticana_punctum - \override Stem #'transparent = ##t - } - } -} +\paper { \neumeDemoPaper }} @end lilypond @tab @@ -6220,69 +5845,23 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=1.0\cm] \include "gregorian-init.ly" \score { - \notes \transpose c c' { + \transpose c c' { % Quilisma Pes \[ \quilisma g \pes b \] s^\markup {"u"} } - \paper { - interscoreline = 1 - \context { - \Score - \remove "Bar_number_engraver" - } - \context { - \Staff - \remove "Clef_engraver" - \remove "Key_engraver" - \override StaffSymbol #'transparent = ##t - \remove "Time_signature_engraver" - \remove "Bar_engraver" - minimumVerticalExtent = ##f - } - \context { - \Voice - \remove Ligature_bracket_engraver - \consists Vaticana_ligature_engraver - \override NoteHead #'style = #'vaticana_punctum - \override Stem #'transparent = ##t - } - } -} +\paper { \neumeDemoPaper }} @end lilypond @tab @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=1.0\cm] \include "gregorian-init.ly" \score { - \notes \transpose c c' { + \transpose c c' { % Quilisma Pes Auctus Descendens \[ \quilisma g \pes \auctum \descendens b \] s^\markup {"v"} } - \paper { - interscoreline = 1 - \context { - \Score - \remove "Bar_number_engraver" - } - \context { - \Staff - \remove "Clef_engraver" - \remove "Key_engraver" - \override StaffSymbol #'transparent = ##t - \remove "Time_signature_engraver" - \remove "Bar_engraver" - minimumVerticalExtent = ##f - } - \context { - \Voice - \remove Ligature_bracket_engraver - \consists Vaticana_ligature_engraver - \override NoteHead #'style = #'vaticana_punctum - \override Stem #'transparent = ##t - } - } -} +\paper { \neumeDemoPaper }} @end lilypond @tab @@ -6292,69 +5871,23 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=1.0\cm] \include "gregorian-init.ly" \score { - \notes \transpose c c' { + \transpose c c' { % Pes Initio Debilis \[ \deminutum g \pes b \] s^\markup {"w"} } - \paper { - interscoreline = 1 - \context { - \Score - \remove "Bar_number_engraver" - } - \context { - \Staff - \remove "Clef_engraver" - \remove "Key_engraver" - \override StaffSymbol #'transparent = ##t - \remove "Time_signature_engraver" - \remove "Bar_engraver" - minimumVerticalExtent = ##f - } - \context { - \Voice - \remove Ligature_bracket_engraver - \consists Vaticana_ligature_engraver - \override NoteHead #'style = #'vaticana_punctum - \override Stem #'transparent = ##t - } - } -} +\paper { \neumeDemoPaper }} @end lilypond @tab @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=1.0\cm] \include "gregorian-init.ly" \score { - \notes \transpose c c' { + \transpose c c' { % Pes Auctus Descendens Initio Debilis \[ \deminutum g \pes \auctum \descendens b \] s^\markup {"x"} } - \paper { - interscoreline = 1 - \context { - \Score - \remove "Bar_number_engraver" - } - \context { - \Staff - \remove "Clef_engraver" - \remove "Key_engraver" - \override StaffSymbol #'transparent = ##t - \remove "Time_signature_engraver" - \remove "Bar_engraver" - minimumVerticalExtent = ##f - } - \context { - \Voice - \remove Ligature_bracket_engraver - \consists Vaticana_ligature_engraver - \override NoteHead #'style = #'vaticana_punctum - \override Stem #'transparent = ##t - } - } -} +\paper { \neumeDemoPaper }} @end lilypond @tab @@ -6364,103 +5897,34 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=1.0\cm] \include "gregorian-init.ly" \score { - \notes \transpose c c' { + \transpose c c' { % Torculus \[ a \pes b \flexa g \] s^\markup {"y"} } - \paper { - interscoreline = 1 - \context { - \Score - \remove "Bar_number_engraver" - } - \context { - \Staff - \remove "Clef_engraver" - \remove "Key_engraver" - \override StaffSymbol #'transparent = ##t - \remove "Time_signature_engraver" - \remove "Bar_engraver" - minimumVerticalExtent = ##f - } - \context { - \Voice - \remove Ligature_bracket_engraver - \consists Vaticana_ligature_engraver - \override NoteHead #'style = #'vaticana_punctum - \override Stem #'transparent = ##t - } - } -} +\paper { \neumeDemoPaper }} @end lilypond @tab @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=1.0\cm] \include "gregorian-init.ly" \score { - \notes \transpose c c' { + \transpose c c' { % Torculus Auctus Descendens \[ a \pes b \flexa \auctum \descendens g \] s^\markup {"z"} } - \paper { - interscoreline = 1 - \context { - \Score - \remove "Bar_number_engraver" - } - \context { - \Staff - \remove "Clef_engraver" - \remove "Key_engraver" - \override StaffSymbol #'transparent = ##t - \remove "Time_signature_engraver" - \remove "Bar_engraver" - minimumVerticalExtent = ##f - } - \context { - \Voice - \remove Ligature_bracket_engraver - \consists Vaticana_ligature_engraver - \override NoteHead #'style = #'vaticana_punctum - \override Stem #'transparent = ##t - } - } -} +\paper { \neumeDemoPaper }} @end lilypond @tab @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=1.0\cm] \include "gregorian-init.ly" \score { - \notes \transpose c c' { + \transpose c c' { % Torculus Deminutus \[ a \pes b \flexa \deminutum g \] s^\markup {"A"} } - \paper { - interscoreline = 1 - \context { - \Score - \remove "Bar_number_engraver" - } - \context { - \Staff - \remove "Clef_engraver" - \remove "Key_engraver" - \override StaffSymbol #'transparent = ##t - \remove "Time_signature_engraver" - \remove "Bar_engraver" - minimumVerticalExtent = ##f - } - \context { - \Voice - \remove Ligature_bracket_engraver - \consists Vaticana_ligature_engraver - \override NoteHead #'style = #'vaticana_punctum - \override Stem #'transparent = ##t - } - } -} +\paper { \neumeDemoPaper }} @end lilypond @item @@ -6469,103 +5933,34 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=1.0\cm] \include "gregorian-init.ly" \score { - \notes \transpose c c' { + \transpose c c' { % Torculus Initio Debilis \[ \deminutum a \pes b \flexa g \] s^\markup {"B"} } - \paper { - interscoreline = 1 - \context { - \Score - \remove "Bar_number_engraver" - } - \context { - \Staff - \remove "Clef_engraver" - \remove "Key_engraver" - \override StaffSymbol #'transparent = ##t - \remove "Time_signature_engraver" - \remove "Bar_engraver" - minimumVerticalExtent = ##f - } - \context { - \Voice - \remove Ligature_bracket_engraver - \consists Vaticana_ligature_engraver - \override NoteHead #'style = #'vaticana_punctum - \override Stem #'transparent = ##t - } - } -} +\paper { \neumeDemoPaper }} @end lilypond @tab @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=1.0\cm] \include "gregorian-init.ly" \score { - \notes \transpose c c' { + \transpose c c' { % Torculus Auctus Descendens Initio Debilis \[ \deminutum a \pes b \flexa \auctum \descendens g \] s^\markup {"C"} } - \paper { - interscoreline = 1 - \context { - \Score - \remove "Bar_number_engraver" - } - \context { - \Staff - \remove "Clef_engraver" - \remove "Key_engraver" - \override StaffSymbol #'transparent = ##t - \remove "Time_signature_engraver" - \remove "Bar_engraver" - minimumVerticalExtent = ##f - } - \context { - \Voice - \remove Ligature_bracket_engraver - \consists Vaticana_ligature_engraver - \override NoteHead #'style = #'vaticana_punctum - \override Stem #'transparent = ##t - } - } -} +\paper { \neumeDemoPaper }} @end lilypond @tab @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=1.0\cm] \include "gregorian-init.ly" \score { - \notes \transpose c c' { + \transpose c c' { % Torculus Deminutus Initio Debilis \[ \deminutum a \pes b \flexa \deminutum g \] s^\markup {"D"} } - \paper { - interscoreline = 1 - \context { - \Score - \remove "Bar_number_engraver" - } - \context { - \Staff - \remove "Clef_engraver" - \remove "Key_engraver" - \override StaffSymbol #'transparent = ##t - \remove "Time_signature_engraver" - \remove "Bar_engraver" - minimumVerticalExtent = ##f - } - \context { - \Voice - \remove Ligature_bracket_engraver - \consists Vaticana_ligature_engraver - \override NoteHead #'style = #'vaticana_punctum - \override Stem #'transparent = ##t - } - } -} +\paper { \neumeDemoPaper }} @end lilypond @item @@ -6574,103 +5969,34 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=1.0\cm] \include "gregorian-init.ly" \score { - \notes \transpose c c' { + \transpose c c' { % Porrectus \[ a \flexa g \pes b \] s^\markup {"E"} } - \paper { - interscoreline = 1 - \context { - \Score - \remove "Bar_number_engraver" - } - \context { - \Staff - \remove "Clef_engraver" - \remove "Key_engraver" - \override StaffSymbol #'transparent = ##t - \remove "Time_signature_engraver" - \remove "Bar_engraver" - minimumVerticalExtent = ##f - } - \context { - \Voice - \remove Ligature_bracket_engraver - \consists Vaticana_ligature_engraver - \override NoteHead #'style = #'vaticana_punctum - \override Stem #'transparent = ##t - } - } -} +\paper { \neumeDemoPaper }} @end lilypond @tab @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=1.0\cm] \include "gregorian-init.ly" \score { - \notes \transpose c c' { + \transpose c c' { % Porrectus Auctus Descendens \[ a \flexa g \pes \auctum \descendens b \] s^\markup {"F"} } - \paper { - interscoreline = 1 - \context { - \Score - \remove "Bar_number_engraver" - } - \context { - \Staff - \remove "Clef_engraver" - \remove "Key_engraver" - \override StaffSymbol #'transparent = ##t - \remove "Time_signature_engraver" - \remove "Bar_engraver" - minimumVerticalExtent = ##f - } - \context { - \Voice - \remove Ligature_bracket_engraver - \consists Vaticana_ligature_engraver - \override NoteHead #'style = #'vaticana_punctum - \override Stem #'transparent = ##t - } - } -} +\paper { \neumeDemoPaper }} @end lilypond @tab @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=1.0\cm] \include "gregorian-init.ly" \score { - \notes \transpose c c' { + \transpose c c' { % Porrectus Deminutus \[ a \flexa g \pes \deminutum b \] s^\markup {"G"} } - \paper { - interscoreline = 1 - \context { - \Score - \remove "Bar_number_engraver" - } - \context { - \Staff - \remove "Clef_engraver" - \remove "Key_engraver" - \override StaffSymbol #'transparent = ##t - \remove "Time_signature_engraver" - \remove "Bar_engraver" - minimumVerticalExtent = ##f - } - \context { - \Voice - \remove Ligature_bracket_engraver - \consists Vaticana_ligature_engraver - \override NoteHead #'style = #'vaticana_punctum - \override Stem #'transparent = ##t - } - } -} +\paper { \neumeDemoPaper }} @end lilypond @item @@ -6679,103 +6005,35 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=1.0\cm] \include "gregorian-init.ly" \score { - \notes \transpose c c' { + \transpose c c' { % Climacus \[ \virga b \inclinatum a \inclinatum g \] s^\markup {"H"} } - \paper { - interscoreline = 1 - \context { - \Score - \remove "Bar_number_engraver" - } - \context { - \Staff - \remove "Clef_engraver" - \remove "Key_engraver" - \override StaffSymbol #'transparent = ##t - \remove "Time_signature_engraver" - \remove "Bar_engraver" - minimumVerticalExtent = ##f - } - \context { - \Voice - \remove Ligature_bracket_engraver - \consists Vaticana_ligature_engraver - \override NoteHead #'style = #'vaticana_punctum - \override Stem #'transparent = ##t - } - } + \paper { \neumeDemoPaper } } @end lilypond @tab @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=1.0\cm] \include "gregorian-init.ly" \score { - \notes \transpose c c' { + \transpose c c' { % Climacus Auctus \[ \virga b \inclinatum a \inclinatum \auctum g \] s^\markup {"I"} } - \paper { - interscoreline = 1 - \context { - \Score - \remove "Bar_number_engraver" - } - \context { - \Staff - \remove "Clef_engraver" - \remove "Key_engraver" - \override StaffSymbol #'transparent = ##t - \remove "Time_signature_engraver" - \remove "Bar_engraver" - minimumVerticalExtent = ##f - } - \context { - \Voice - \remove Ligature_bracket_engraver - \consists Vaticana_ligature_engraver - \override NoteHead #'style = #'vaticana_punctum - \override Stem #'transparent = ##t - } - } -} +\paper { \neumeDemoPaper }} @end lilypond @tab @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=1.0\cm] \include "gregorian-init.ly" \score { - \notes \transpose c c' { + \transpose c c' { % Climacus Deminutus \[ \virga b \inclinatum a \inclinatum \deminutum g \] s^\markup {"J"} } - \paper { - interscoreline = 1 - \context { - \Score - \remove "Bar_number_engraver" - } - \context { - \Staff - \remove "Clef_engraver" - \remove "Key_engraver" - \override StaffSymbol #'transparent = ##t - \remove "Time_signature_engraver" - \remove "Bar_engraver" - minimumVerticalExtent = ##f - } - \context { - \Voice - \remove Ligature_bracket_engraver - \consists Vaticana_ligature_engraver - \override NoteHead #'style = #'vaticana_punctum - \override Stem #'transparent = ##t - } - } -} +\paper { \neumeDemoPaper }} @end lilypond @item @@ -6784,103 +6042,34 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=1.0\cm] \include "gregorian-init.ly" \score { - \notes \transpose c c' { + \transpose c c' { % Scandicus \[ g \pes a \virga b \] s^\markup {"K"} } - \paper { - interscoreline = 1 - \context { - \Score - \remove "Bar_number_engraver" - } - \context { - \Staff - \remove "Clef_engraver" - \remove "Key_engraver" - \override StaffSymbol #'transparent = ##t - \remove "Time_signature_engraver" - \remove "Bar_engraver" - minimumVerticalExtent = ##f - } - \context { - \Voice - \remove Ligature_bracket_engraver - \consists Vaticana_ligature_engraver - \override NoteHead #'style = #'vaticana_punctum - \override Stem #'transparent = ##t - } - } -} +\paper { \neumeDemoPaper }} @end lilypond @tab @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=1.0\cm] \include "gregorian-init.ly" \score { - \notes \transpose c c' { + \transpose c c' { % Scandicus Auctus Descendens \[ g \pes a \pes \auctum \descendens b \] s^\markup {"L"} } - \paper { - interscoreline = 1 - \context { - \Score - \remove "Bar_number_engraver" - } - \context { - \Staff - \remove "Clef_engraver" - \remove "Key_engraver" - \override StaffSymbol #'transparent = ##t - \remove "Time_signature_engraver" - \remove "Bar_engraver" - minimumVerticalExtent = ##f - } - \context { - \Voice - \remove Ligature_bracket_engraver - \consists Vaticana_ligature_engraver - \override NoteHead #'style = #'vaticana_punctum - \override Stem #'transparent = ##t - } - } -} +\paper { \neumeDemoPaper }} @end lilypond @tab @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=1.0\cm] \include "gregorian-init.ly" \score { - \notes \transpose c c' { + \transpose c c' { % Scandicus Deminutus \[ g \pes a \pes \deminutum b \] s^\markup {"M"} } - \paper { - interscoreline = 1 - \context { - \Score - \remove "Bar_number_engraver" - } - \context { - \Staff - \remove "Clef_engraver" - \remove "Key_engraver" - \override StaffSymbol #'transparent = ##t - \remove "Time_signature_engraver" - \remove "Bar_engraver" - minimumVerticalExtent = ##f - } - \context { - \Voice - \remove Ligature_bracket_engraver - \consists Vaticana_ligature_engraver - \override NoteHead #'style = #'vaticana_punctum - \override Stem #'transparent = ##t - } - } -} +\paper { \neumeDemoPaper }} @end lilypond @item @@ -6889,69 +6078,23 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=1.0\cm] \include "gregorian-init.ly" \score { - \notes \transpose c c' { + \transpose c c' { % Salicus \[ g \oriscus a \pes \virga b \] s^\markup {"N"} } - \paper { - interscoreline = 1 - \context { - \Score - \remove "Bar_number_engraver" - } - \context { - \Staff - \remove "Clef_engraver" - \remove "Key_engraver" - \override StaffSymbol #'transparent = ##t - \remove "Time_signature_engraver" - \remove "Bar_engraver" - minimumVerticalExtent = ##f - } - \context { - \Voice - \remove Ligature_bracket_engraver - \consists Vaticana_ligature_engraver - \override NoteHead #'style = #'vaticana_punctum - \override Stem #'transparent = ##t - } - } -} +\paper { \neumeDemoPaper }} @end lilypond @tab @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=1.0\cm] \include "gregorian-init.ly" \score { - \notes \transpose c c' { + \transpose c c' { % Salicus Auctus Descendens \[ g \oriscus a \pes \auctum \descendens b \] s^\markup {"O"} } - \paper { - interscoreline = 1 - \context { - \Score - \remove "Bar_number_engraver" - } - \context { - \Staff - \remove "Clef_engraver" - \remove "Key_engraver" - \override StaffSymbol #'transparent = ##t - \remove "Time_signature_engraver" - \remove "Bar_engraver" - minimumVerticalExtent = ##f - } - \context { - \Voice - \remove Ligature_bracket_engraver - \consists Vaticana_ligature_engraver - \override NoteHead #'style = #'vaticana_punctum - \override Stem #'transparent = ##t - } - } -} +\paper { \neumeDemoPaper }} @end lilypond @tab @@ -6961,34 +6104,12 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=1.0\cm] \include "gregorian-init.ly" \score { - \notes \transpose c c' { + \transpose c c' { % Trigonus \[ \stropha b \stropha b \stropha a \] s^\markup {"P"} } - \paper { - interscoreline = 1 - \context { - \Score - \remove "Bar_number_engraver" - } - \context { - \Staff - \remove "Clef_engraver" - \remove "Key_engraver" - \override StaffSymbol #'transparent = ##t - \remove "Time_signature_engraver" - \remove "Bar_engraver" - minimumVerticalExtent = ##f - } - \context { - \Voice - \remove Ligature_bracket_engraver - \consists Vaticana_ligature_engraver - \override NoteHead #'style = #'vaticana_punctum - \override Stem #'transparent = ##t - } - } + \paper { \neumeDemoPaper } } @end lilypond @tab @@ -7290,7 +6411,7 @@ entering the chant, as the following short excerpt demonstrates << \context VaticanaVoice = "cantus" { \override Score.BarNumber #'transparent = ##t - \notes { + { \[ c'\melisma c' \flexa a \] \[ a \flexa \deminutum g\melismaEnd \] f \divisioMinima @@ -7319,7 +6440,7 @@ LilyPond has limited support for figured bass @lilypond[quote,verbatim,fragment] << - \context Voice \notes { \clef bass dis4 c d ais } + \context Voice { \clef bass dis4 c d ais } \context FiguredBass \figures { < 6 >4 < 7 >8 < 6+ [_!] > < 6 >4 <6 5 [3+] > @@ -7452,9 +6573,8 @@ indicate fermatas of differing lengths. The following fermatas are supported @lilypond[quote,raggedright] -\score { - << - \addlyrics \notes { +<< + \addlyrics { b' ^\shortfermata _\shortfermata @@ -7478,12 +6598,11 @@ supported \override LyricText #'font-family = #'typewriter "shortfermata" "fermata" "longfermata" "verylongfermata" } - >> -} +>> @end lilypond See @ref{Articulations} for general instructions how to apply scripts -such as fermatas to a @code{\notes@{@}} block. +such as fermatas to notes. @node Special notation diff --git a/Documentation/user/programming-interface.itely b/Documentation/user/programming-interface.itely index 83db8292dd..48c0470e91 100644 --- a/Documentation/user/programming-interface.itely +++ b/Documentation/user/programming-interface.itely @@ -29,7 +29,7 @@ The input format supports the notion of variable: in the following example, a music expression is assigned to a variable with the name @code{traLaLa}. @example - traLaLa = \notes @{ c'4 d'4 @} + traLaLa = @{ c'4 d'4 @} @end example @noindent @@ -38,7 +38,7 @@ There is also a form of scoping: in the following example, the @code{\paper} block also contains a @code{traLaLa} variable, which is independent of the outer @code{\traLaLa}. @example - traLaLa = \notes @{ c'4 d'4 @} + traLaLa = @{ c'4 d'4 @} \paper @{ traLaLa = 1.0 @} @end example @c @@ -50,13 +50,13 @@ Both variables and scoping are implemented in the GUILE module system. An anonymous Scheme module is attached to each scope. An assignment of the form @example - traLaLa = \notes @{ c'4 d'4 @} + traLaLa = @{ c'4 d'4 @} @end example @noindent is internally converted to a Scheme definition @example - (define traLaLa @var{Scheme value of ``@code{\notes ... }''}) + (define traLaLa @var{Scheme value of ``@code{... }''}) @end example This means that input variables and Scheme variables may be freely @@ -65,14 +65,14 @@ variable @code{traLaLa}, and duplicated using Scheme. The result is imported in a @code{\score} by means of a second variable @code{twice}: @example - traLaLa = \notes @{ c'4 d'4 @} + traLaLa = @{ c'4 d'4 @} #(define newLa (map ly:music-deep-copy (list traLaLa traLaLa))) #(define twice (make-sequential-music newLa)) - \score @{ \twice @} + @{ \twice @} @end example In the above example, music expressions can be `exported' from the @@ -83,7 +83,7 @@ of defining @code{\twice}, the example above could also have been written as @example @dots{} - \score @{ #(ly:export (make-sequential-music newLa)) @} + @{ #(ly:export (make-sequential-music newLa)) @} @end example @refbugs @@ -235,7 +235,7 @@ its argument: (ly:music-set-property! m 'elements (reverse (ly:music-property m 'elements))) m) - \score { \notes \applymusic #rev-music-1 { c4 d4 } } + \applymusic #rev-music-1 { c4 d4 } @end lilypond The use of such a function is very limited. The effect of this @@ -314,10 +314,10 @@ scheme, with the dedicated @code{#@{ ... #@}} syntax. The following two expressions give equivalent music expressions: @example mynotes = @{ \override Stem #'thickness = #4 - \notes @{ c'8 d' @} @} + @{ c'8 d' @} @} #(define mynotes #@{ \override Stem #'thickness = #4 - \notes @{ c'8 d' @} #@}) + @{ c'8 d' @} #@}) @end example The content of @code{#@{ ... #@}} is enclosed in an implicit @code{@{ @@ -334,13 +334,12 @@ setting the TextScript's padding is defined: #(use-modules (ice-9 optargs)) #(define* (textpad padding #:optional once?) (ly:export ; this is necessary for using the expression - ; directly inside a \notes block + ; directly inside a block (if once? #{ \once \override TextScript #'padding = #$padding #} #{ \override TextScript #'padding = #$padding #}))) - \score { - \notes { + { c'^"1" #(textpad 3.0 #t) % only once c'^"2" @@ -350,7 +349,6 @@ setting the TextScript's padding is defined: c'^"5" } - } @end lilypond Here, the variable @code{padding} is a number; music expression @@ -364,14 +362,12 @@ example: $music \revert TextScript #'padding #})) - \score { - \notes { + { c'^"1" \applymusic #(with-padding 3) { c'^"2" c'^"3"} c'^"4" } - } @end lilypond The function created by @code{(with-padding 3)} adds @code{\override} and @@ -379,8 +375,7 @@ The function created by @code{(with-padding 3)} adds @code{\override} and this new expression. Thus, this example is equivalent to: @example - \score @{ - \notes @{ + @{ c'^"1" @{ \override TextScript #'padding = #3 @{ c'^"2" c'^"3"@} @@ -388,7 +383,6 @@ this new expression. Thus, this example is equivalent to: @} c'^"4" @} - @} @end example This function may also be defined as a music function: @@ -399,14 +393,12 @@ This function may also be defined as a music function: $music \revert TextScript #'padding #}) - \score { - \notes { + { c'^"1" \withPadding #3 { c'^"2" c'^"3"} c'^"4" } - } @end lilypond @@ -565,12 +557,10 @@ that the text is moved to the upper left. The final result is as follows: @verbatim -\score { - \notes { \fatText + { \fatText c''^\markup \character #"Cleopatra" e'^\markup \character #"Giulio Cesare" } -} @end verbatim @lilypond[raggedright] @@ -592,12 +582,10 @@ The final result is as follows: (interpret-markup paper props (markup "" #:translate (cons -4 0) #:smallcaps name))) -\score { - \notes { \fatText + { \fatText c''^\markup \character #"Cleopatra" e'^\markup \character #"Giulio Cesare" } -} @end lilypond We have used the @code{caps} font shape, but suppose that our font diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely index a0408d0d8a..1a93fe2552 100644 --- a/Documentation/user/tutorial.itely +++ b/Documentation/user/tutorial.itely @@ -176,39 +176,6 @@ s4_" " s16_" " @end lilypond -@ignore -To recognize names like @samp{c} and @samp{d} as pitches, they have to -be entered inside a so-called @code{\notes} block. This block is -formed by enclosing notes and commands are enclosed in curly braces -@code{@{@tie{}@dots{}@tie{}@}} and adding the keyword @code{\notes} before -the opening brace - -@example -@{ - \time 3/4 - \clef bass - c2 e4 g2. - f4 e d c2 r4 -@} -@end example - -Now the piece of music is almost ready to be printed. Enclose -the @code{\notes} block in a @code{\score} block - -@example -\score @{ - \notes @{ - \time 3/4 - \clef bass - c2 e4 g2. - f4 e d c2 r4 - @} -@} -@end example - -@noindent -and the music will be converted to printable output. -@end ignore Remember to enclose the notes and commands in curly braces @code{@{@tie{}@dots{}@tie{}@}} to convert it to printable output. @@ -1157,7 +1124,7 @@ a lead sheet, for example, @lilypond[quote,raggedright] << \new ChordNames \chords { r2 c:sus4 f } - \notes \relative { + \relative { r4 c' \times 2/3 { f g g } \times 2/3 { g4( a2) } } @@ -1401,7 +1368,7 @@ By using variables, also known as identifiers, it is possible to break up complex music expressions. An identifier is assigned as follows @example -namedMusic = \notes @{ @dots{} @} +namedMusic = @{ @dots{} @} @end example @noindent @@ -1411,7 +1378,7 @@ In the next example, a two-note motive is repeated two times by using variable substitution @lilypond[quote,raggedright,verbatim,nofragment] -seufzer = \notes { +seufzer = { e'4( dis'4) } { \seufzer \seufzer } @@ -1419,7 +1386,7 @@ seufzer = \notes { The name of an identifier should have alphabetic characters only; no numbers, underscores or dashes. The assignment should be outside of -the @code{\score} block. +running music. It is possible to use variables for many other types of objects in the input. For example, @@ -1434,13 +1401,11 @@ Depending on its contents, the identifier can be used in different places. The following example uses the above variables @example -\score @{ - \notes @{ c4^\name @} \paper @{ \aFivePaper linewidth = \width @} -@} + @{ c4^\name @} @end example More information on the possible uses of identifiers is in the @@ -1461,7 +1426,7 @@ suppose that the file @file{horn-music.ly} contains the following part of a horn/bassoon duo @example -hornNotes = \notes \relative c @{ +hornNotes = \relative c @{ \time 2/4 r4 f8 a cis4 f e d @} @@ -1475,8 +1440,9 @@ Then, an individual part is made by putting the following in a file \header @{ instrument = "Horn in F" @} -\score @{ - \notes \transpose f c' \hornNotes + +@{ + \transpose f c' \hornNotes @} @end example @@ -1496,12 +1462,10 @@ tuning of a normal French Horn in@tie{}F. The transposition can be seen in the following output @lilypond[quote,raggedright] -\score { - \notes \transpose f c' \notes \relative c { + \transpose f c' \relative c { \time 2/4 r4 f8 a cis4 f e d } -} @end lilypond In ensemble pieces, one of the voices often does not play for many @@ -1528,39 +1492,34 @@ This command sets the property @code{skipBars} in the this option to the music above, leads to the following result @lilypond[quote,raggedright] -\score { - \notes \transpose f c' \relative c { +\transpose f c' \relative c { \time 2/4 \set Score.skipBars = ##t R2*3 r4 f8 a cis4 f e d } -} @end lilypond -The score is made by combining all of the music in a @code{\score} -block. Assuming that the other voice is in @code{bassoonNotes} in the -file @file{bassoon-music.ly}, a score is made with +The score is made by combining all of the music together. Assuming +that the other voice is in @code{bassoonNotes} in the file +@file{bassoon-music.ly}, a score is made with @example \include "bassoon-music.ly" \include "horn-music.ly" -\score @{ - \simultaneous @{ + << \new Staff \hornNotes \new Staff \bassoonNotes - @} -@} + >> @end example @noindent leading to @lilypond[quote,raggedright] -\score { - \notes \relative c \simultaneous { + \relative c << \new Staff { \time 2/4 R2*3 r4 f8 a cis4 f e d @@ -1570,8 +1529,7 @@ leading to r4 d,8 f | gis4 c | b bes | a8 e f4 | g d | gis f } - } -} + >> @end lilypond More in-depth information on preparing parts and scores can be found @@ -1606,26 +1564,14 @@ Documents for lilypond-book may freely mix music and text. For example, \begin@{lilypond@} - \score @{ \notes \relative c' @{ + @{ \relative c' @{ c2 g'2 \times 2/3 @{ f8 e d @} c'2 g4 - @} @} -\end@{lilypond@} - -If there is no \verb+\score+ block in the fragment, -\texttt@{lilypond-book@} will supply one - -\begin[quote]@{lilypond@} - c'4 + @} \end@{lilypond@} -\noindent -In this example two things happened. A -\verb+\score+ block was added, and the line width was set to natural -length. - Options are put in brackets. -\begin[quote,staffsize=26,verbatim]@{lilypond@} +\begin[fragment,quote,staffsize=26,verbatim]@{lilypond@} c'4 f16 \end@{lilypond@} @@ -1678,23 +1624,11 @@ Documents for lilypond-book may freely mix music and text. For example, @lilypond -\score { \notes \relative c' { +\relative c' { c2 g'2 \times 2/3 { f8 e d } c'2 g4 -} } -@end lilypond - -If there is no @code{\score} block in the fragment, -@code{lilypond-book} will supply one - -@lilypond[fragment,quote] -c'4 +} @end lilypond -@noindent -In this example two things happened. A -@code{score} block was added, and the line width was set to natural -length. - Options are put in brackets. @lilypond[fragment,quote,staffsize=26,verbatim] diff --git a/input/test/engraver-example.lyinc b/input/test/engraver-example.lyinc index 6c5ca58b9a..a07bef434a 100644 --- a/input/test/engraver-example.lyinc +++ b/input/test/engraver-example.lyinc @@ -1,6 +1,6 @@ %% texidoc = "Include file for engraver example." -\version "2.2.0" -topVoice = \notes \relative c' { +\version "2.3.8" +topVoice = \relative c' { \key d\major es8([ g] a[ fis]) b4 @@ -8,7 +8,7 @@ topVoice = \notes \relative c' { d4-> } -botVoice = \notes \relative c' { +botVoice = \relative c' { \key d\major c8[( f] b[ a)] es4 @@ -16,7 +16,7 @@ botVoice = \notes \relative c' { b4-> } -hoom = \notes \relative c { +hoom = \relative c { \key d \major \clef bass g8-. r @@ -27,7 +27,7 @@ hoom = \notes \relative c { b'4-> } -pah = \notes \relative c' { +pah = \relative c' { r8 b-. r4 r8 g8-. diff --git a/lily/include/my-lily-lexer.hh b/lily/include/my-lily-lexer.hh index bdc95f7465..bcd6799b04 100644 --- a/lily/include/my-lily-lexer.hh +++ b/lily/include/my-lily-lexer.hh @@ -24,6 +24,9 @@ bool busy_parsing (); void kill_lexer (); void set_lexer (); +/* + TODO: this has a lot of SCM objects. Smobify me. + */ class My_lily_lexer : public Includable_lexer { public: diff --git a/lily/lexer.ll b/lily/lexer.ll index 7b517b90e6..f595f73dc3 100644 --- a/lily/lexer.ll +++ b/lily/lexer.ll @@ -233,13 +233,6 @@ HYPHEN -- { start_main_input (); main_input_b_ = true; -/* -This is broken - we should switch to \notes when the pitchnames are loaded. -Then we get spanish etc. correct. --hwn. - -*/ - SCM nn = lookup_identifier ("pitchnames"); - push_note_state (alist_to_hashq (nn)); } else error (_ ("\\maininput not allowed outside init files")); diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc index 9490490ac0..0bcc095636 100644 --- a/lily/lily-guile.cc +++ b/lily/lily-guile.cc @@ -760,9 +760,9 @@ alist_to_hashq (SCM alist) { int i = scm_ilength (alist); if (i < 0) - return scm_make_vector (scm_int2num (0), SCM_EOL); + return scm_c_make_hash_table (0); - SCM tab = scm_make_vector (scm_int2num (i), SCM_EOL); + SCM tab = scm_c_make_hash_table (i); for (SCM s = alist; ly_c_pair_p (s); s = ly_cdr (s)) { SCM pt = ly_cdar (s); diff --git a/lily/my-lily-lexer.cc b/lily/my-lily-lexer.cc index d878327015..e11bf1d682 100644 --- a/lily/my-lily-lexer.cc +++ b/lily/my-lily-lexer.cc @@ -95,6 +95,9 @@ My_lily_lexer::My_lily_lexer (Sources *sources) main_input_b_ = false; add_scope (ly_make_anonymous_module (false)); + + push_note_state (scm_c_make_hash_table (0)); + } My_lily_lexer::My_lily_lexer (My_lily_lexer const &src) @@ -120,6 +123,7 @@ My_lily_lexer::My_lily_lexer (My_lily_lexer const &src) } scopes_ = scopes; + push_note_state (scm_c_make_hash_table (0)); } My_lily_lexer::~My_lily_lexer () diff --git a/lily/my-lily-parser.cc b/lily/my-lily-parser.cc index 36e11abf03..9c17543e7f 100644 --- a/lily/my-lily-parser.cc +++ b/lily/my-lily-parser.cc @@ -97,6 +97,7 @@ My_lily_parser::parse_file (String init, String name, String out_name) progress_indication ("\n"); set_yydebug (0); + lexer_->new_input (init, sources_); /* Read .ly IN_FILE, lex, parse, write \score blocks from IN_FILE to diff --git a/lily/parser.yy b/lily/parser.yy index 7fe839ccf0..5f8e017ad5 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -223,8 +223,13 @@ yylex (YYSTYPE *s, void *v) 2. \markup identifier. + (what? --hwn) + 3. \markup { } + (what? --hwn) + + 4. \repeat \repeat .. \alternative @@ -270,7 +275,6 @@ or %token INVALID %token KEY %token LYRICS -%token LYRICS_STRING %token MARK %token MIDI %token MULTI_MEASURE_REST @@ -331,6 +335,7 @@ or %token NUMBER_IDENTIFIER %token OUTPUT_DEF_IDENTIFIER %token RESTNAME +%token LYRICS_STRING %token SCM_T %token SCORE_IDENTIFIER %token STRING @@ -548,9 +553,6 @@ identifier_init: $$ = $1->self_scm (); scm_gc_unprotect_object ($$); } - | full_markup { - $$ = $1; - } | output_def { $$ = $1->self_scm (); scm_gc_unprotect_object ($$); @@ -567,15 +569,21 @@ identifier_init: scm_gc_unprotect_object ($$); } | number_expression { - $$ = $1; + $$ = $1; } | string { $$ = $1; } - | embedded_scm { + | embedded_scm { $$ = $1; } - ; + | full_markup { + $$ = $1; + } + | DIGIT { + $$ = scm_int2num ($1); + } + ; ; context_def_spec_block: CONTEXT '{' context_def_spec_body '}' @@ -1100,7 +1108,7 @@ Prefix_composite_music: SCM nn = THIS->lexer_->lookup_identifier ("pitchnames"); THIS->lexer_->push_note_state (alist_to_hashq (nn)); } - Music + Grouped_music_list { $$ = $3; THIS->lexer_->pop_state (); } @@ -1109,13 +1117,13 @@ Prefix_composite_music: SCM nn = THIS->lexer_->lookup_identifier ("drumPitchNames"); THIS->lexer_->push_note_state (alist_to_hashq (nn)); } - Music + Grouped_music_list { $$ = $3; THIS->lexer_->pop_state (); } | FIGURES { THIS->lexer_->push_figuredbass_state (); } - Music + Grouped_music_list { Music *chm = MY_MAKE_MUSIC ("UntransposableMusic"); chm->set_property ("element", $3->self_scm ()); @@ -1131,7 +1139,7 @@ Prefix_composite_music: THIS->lexer_->push_chord_state (alist_to_hashq (nn)); } - Music + Grouped_music_list { Music *chm = MY_MAKE_MUSIC ("UnrelativableMusic"); chm->set_property ("element", $3->self_scm ()); @@ -1142,7 +1150,7 @@ Prefix_composite_music: } | LYRICS { THIS->lexer_->push_lyric_state (); } - Music + Grouped_music_list { $$ = $3; THIS->lexer_->pop_state (); @@ -1349,21 +1357,27 @@ string: ; simple_string: STRING { + $$ = $1; } | LYRICS_STRING { + $$ = $1; } ; scalar: string { + $$ = $1; } | LYRICS_STRING { + $$ = $1; } | bare_int { $$ = scm_int2num ($1); } | embedded_scm { + $$ = $1; } | full_markup { + $$ = $1; } | DIGIT { $$ = scm_int2num ($1); @@ -1371,9 +1385,8 @@ scalar: string { ; /* -FIXME: remove or fix this comment. What is `This'? -This is a trick: +pre_events doesn't contain anything. It is a trick: Adding pre_events to the simple_element makes the choice between diff --git a/ly/a3-init.ly b/ly/a3-init.ly index 91808038f2..0b245b2758 100644 --- a/ly/a3-init.ly +++ b/ly/a3-init.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.8" % a3-init.ly hsize = 296.9 \mm diff --git a/ly/a4-init.ly b/ly/a4-init.ly index ca343e448f..9a8c393004 100644 --- a/ly/a4-init.ly +++ b/ly/a4-init.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.8" % a4.ly hsize = 210.0 \mm diff --git a/ly/accordion-defs-init.ly b/ly/accordion-defs-init.ly index 2ee0a90d2b..06be41c8c1 100644 --- a/ly/accordion-defs-init.ly +++ b/ly/accordion-defs-init.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.8" % Symbols needed to print accordion music % % 2' = T diff --git a/ly/book-init-init.ly b/ly/book-init-init.ly index cbb5a6c54b..8ed009a1be 100644 --- a/ly/book-init-init.ly +++ b/ly/book-init-init.ly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "2.2.0" +\version "2.3.8" \include "declarations-init.ly" diff --git a/ly/book-paper-defaults.ly b/ly/book-paper-defaults.ly index 25065e4aeb..6a415e5b11 100644 --- a/ly/book-paper-defaults.ly +++ b/ly/book-paper-defaults.ly @@ -1,4 +1,4 @@ -\version "2.3.2" +\version "2.3.8" \bookpaper { unit = #(ly:unit) diff --git a/ly/catalan.ly b/ly/catalan.ly index f042504564..0ea8b90c90 100644 --- a/ly/catalan.ly +++ b/ly/catalan.ly @@ -73,6 +73,6 @@ pitchnamesCatalan = #`( pitchnames = \pitchnamesCatalan -\version "2.2.0" +\version "2.3.8" #(ly:parser-set-note-names parser pitchnames) diff --git a/ly/center-init.ly b/ly/center-init.ly index 8c750ef92c..ea37e3a53c 100644 --- a/ly/center-init.ly +++ b/ly/center-init.ly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "2.2.0" +\version "2.3.8" \include "declarations-init.ly" diff --git a/ly/chord-modifiers-init.ly b/ly/chord-modifiers-init.ly index e5bd41aea1..e0ef33c286 100644 --- a/ly/chord-modifiers-init.ly +++ b/ly/chord-modifiers-init.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.8" chordmodifiers = #default-chord-modifier-list @@ -6,7 +6,7 @@ whiteTriangleMarkup = \markup { \override #'(font-encoding . TeX-math) "M" } blackTriangleMarkup = \markup { \override #'(font-encoding . TeX-math) "N" } -ignatzekExceptionMusic = \notes{ +ignatzekExceptionMusic = { 1-\markup { "+" } -\markup { \super "o" } % should be $\circ$ ? -\markup { \super \combine "o" "/" } @@ -16,7 +16,7 @@ ignatzekExceptionMusic = \notes{ ignatzekExceptions = #(sequential-music-to-chord-exceptions ignatzekExceptionMusic #t) -partialJazzMusic = \notes{ +partialJazzMusic = { 1-\markup { \normal-size-super "2" } -\markup { "m" } -\markup { \normal-size-super "sus4" } diff --git a/ly/declarations-init.ly b/ly/declarations-init.ly index 0c874f436d..942c554214 100644 --- a/ly/declarations-init.ly +++ b/ly/declarations-init.ly @@ -1,6 +1,6 @@ #(ly:set-option 'old-relative) -\version "2.3.2" +\version "2.3.8" breve = #(ly:make-duration -1 0) longa = #(ly:make-duration -2 0 ) maxima = #(ly:make-duration -3 0) @@ -40,7 +40,7 @@ noPagebreak = \noPageBreak % ugh noBeam = #(make-music 'BeamForbidEvent) pipeSymbol = #(make-music 'BarCheck) -foo = \notes { \pageBreak } +foo = { \pageBreak } \include "scale-definitions-init.ly" @@ -128,7 +128,7 @@ partCombineListener = \paper { \include "property-init.ly" %% reset default duration -unusedEntry = \notes { c4 } +unusedEntry = { c4 } %% must have size argument for GUILE 1.6 compat. #(define musicQuotes (make-hash-table 29)) diff --git a/ly/deutsch.ly b/ly/deutsch.ly index d58a6267b8..4669dbe756 100644 --- a/ly/deutsch.ly +++ b/ly/deutsch.ly @@ -49,6 +49,6 @@ pitchnamesDeutsch = #`( pitchnames = \pitchnamesDeutsch -\version "2.2.0" +\version "2.3.8" #(ly:parser-set-note-names parser pitchnames) diff --git a/ly/drumpitch-init.ly b/ly/drumpitch-init.ly index 58672f9a6a..5eb33c6041 100644 --- a/ly/drumpitch-init.ly +++ b/ly/drumpitch-init.ly @@ -1,5 +1,5 @@ -\version "2.2.0" +\version "2.3.8" drumPitchNames = #'((acousticbassdrum . acousticbassdrum) diff --git a/ly/dynamic-scripts-init.ly b/ly/dynamic-scripts-init.ly index 535c565e08..3f42d60c04 100644 --- a/ly/dynamic-scripts-init.ly +++ b/ly/dynamic-scripts-init.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.8" % % declare the standard dynamic identifiers. @@ -14,7 +14,9 @@ pp = #(make-dynamic-script "pp") p = #(make-dynamic-script "p") mp = #(make-dynamic-script "mp") mf = #(make-dynamic-script "mf") -f = #(make-dynamic-script "f") + +%% f is pitch. +"f" = #(make-dynamic-script "f") ff = #(make-dynamic-script "ff") fff = #(make-dynamic-script "fff") ffff = #(make-dynamic-script "ffff") diff --git a/ly/english.ly b/ly/english.ly index 5c35e15315..dda2268770 100644 --- a/ly/english.ly +++ b/ly/english.ly @@ -87,7 +87,7 @@ pitchnamesEnglish = #`( pitchnames = \pitchnamesEnglish -\version "2.2.0" +\version "2.3.8" #(ly:parser-set-note-names parser pitchnames) diff --git a/ly/espanol.ly b/ly/espanol.ly index 6fe014bcb5..0c7598d7df 100644 --- a/ly/espanol.ly +++ b/ly/espanol.ly @@ -58,6 +58,6 @@ pitchnamesEspanol = #`( pitchnames = \pitchnamesEspanol -\version "2.2.0" +\version "2.3.8" #(ly:parser-set-note-names parser pitchnames) diff --git a/ly/generate-documentation.ly b/ly/generate-documentation.ly index b748657b22..62b04086b9 100644 --- a/ly/generate-documentation.ly +++ b/ly/generate-documentation.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.8" % % Running LilyPond on this file generates the documentation diff --git a/ly/generate-interface-doc-init.ly b/ly/generate-interface-doc-init.ly index 8f77e80cee..2bdc1c9668 100644 --- a/ly/generate-interface-doc-init.ly +++ b/ly/generate-interface-doc-init.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.8" % % Running LilyPond on this file generates the short interface doc diff --git a/ly/grace-init.ly b/ly/grace-init.ly index 8cd9b0392d..cff476b7d5 100644 --- a/ly/grace-init.ly +++ b/ly/grace-init.ly @@ -1,32 +1,32 @@ -\version "2.3.1" +\version "2.3.8" -startGraceMusic = \notes { +startGraceMusic = { \context Voice \applycontext #set-start-grace-properties } -stopGraceMusic = \notes { +stopGraceMusic = { \context Voice \applycontext #set-stop-grace-properties } startAppoggiaturaMusic = -\notes { + { \context Voice \applycontext #set-start-grace-properties s1*0( } -stopAppoggiaturaMusic = \notes { +stopAppoggiaturaMusic = { \context Voice \applycontext #set-stop-grace-properties s1*0) } -startAcciaccaturaMusic = \notes { +startAcciaccaturaMusic = { \context Voice \applycontext #set-start-grace-properties s1*0( \override Stem #'stroke-style = #"grace" } -stopAcciaccaturaMusic = \notes { +stopAcciaccaturaMusic = { \revert Stem #'stroke-style \context Voice \applycontext #set-stop-grace-properties s1*0) diff --git a/ly/gregorian-init.ly b/ly/gregorian-init.ly index 3a4372d3fe..17b9472dff 100644 --- a/ly/gregorian-init.ly +++ b/ly/gregorian-init.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.8" %%%%%%%% %%%%%%%% shortcuts common for all styles of gregorian chant notation @@ -100,3 +100,29 @@ semicirculus = #(make-articulation "semicirculus") circulus = #(make-articulation "circulus") episemInitium = #(make-span-event 'TextSpanEvent START) episemFinis = #(make-span-event 'TextSpanEvent STOP) + + + +neumeDemoPaper = \paper { + interscoreline = 1 + \context { + \Score + \remove "Bar_number_engraver" + } + \context { + \Staff + \remove "Clef_engraver" + \remove "Key_engraver" + \override StaffSymbol #'transparent = ##t + \remove "Time_signature_engraver" + \remove "Bar_engraver" + minimumVerticalExtent = ##f + } + \context { + \Voice + \remove Ligature_bracket_engraver + \consists Vaticana_ligature_engraver + \override NoteHead #'style = #'vaticana_punctum + \override Stem #'transparent = ##t + } +} diff --git a/ly/init.ly b/ly/init.ly index c6a5ce4cea..3a9b903420 100644 --- a/ly/init.ly +++ b/ly/init.ly @@ -4,7 +4,7 @@ #(define-public midi-debug #f) -\version "2.2.0" +\version "2.3.8" \include "declarations-init.ly" diff --git a/ly/italiano.ly b/ly/italiano.ly index d0e0750456..e045de4558 100644 --- a/ly/italiano.ly +++ b/ly/italiano.ly @@ -86,6 +86,6 @@ pitchnamesItaliano = #`( pitchnames = \pitchnamesItaliano -\version "2.2.0" +\version "2.3.8" #(ly:parser-set-note-names parser pitchnames) diff --git a/ly/legal-init.ly b/ly/legal-init.ly index 6ab5ebe4d6..d0aa7c509d 100644 --- a/ly/legal-init.ly +++ b/ly/legal-init.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.8" % legal-init.ly hsize = 8.5 \in diff --git a/ly/letter-init.ly b/ly/letter-init.ly index 03eb7a3af8..56d7ef8f7b 100644 --- a/ly/letter-init.ly +++ b/ly/letter-init.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.8" % letter-init.ly hsize = 8.5 \in diff --git a/ly/midi-init.ly b/ly/midi-init.ly index 2dfad3904e..de01cd0a31 100644 --- a/ly/midi-init.ly +++ b/ly/midi-init.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.8" \midi { \tempo 4=60 \include "performer-init.ly" diff --git a/ly/music-functions-init.ly b/ly/music-functions-init.ly index e13994fe3f..e644e203ea 100644 --- a/ly/music-functions-init.ly +++ b/ly/music-functions-init.ly @@ -1,4 +1,4 @@ -\version "2.3.2" +\version "2.3.8" applymusic = #(def-music-function (location func music) (procedure? ly:music?) diff --git a/ly/nederlands.ly b/ly/nederlands.ly index f41e204c84..c57fe1f0f0 100644 --- a/ly/nederlands.ly +++ b/ly/nederlands.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.8" %{ common dutch names for notes. es means flat, is means sharp diff --git a/ly/norsk.ly b/ly/norsk.ly index 5c68698988..1ff51a11a4 100644 --- a/ly/norsk.ly +++ b/ly/norsk.ly @@ -105,6 +105,6 @@ pitchnamesNorsk = #`( pitchnames =\pitchnamesNorsk -\version "2.2.0" +\version "2.3.8" #(ly:parser-set-note-names parser pitchnames) diff --git a/ly/params-init.ly b/ly/params-init.ly index 76d9c2b5da..0db6b1b682 100644 --- a/ly/params-init.ly +++ b/ly/params-init.ly @@ -1,2 +1,2 @@ -\version "2.2.0" +\version "2.3.8" diff --git a/ly/part-paper-init.ly b/ly/part-paper-init.ly index 13aa8fddac..9dd983d869 100644 --- a/ly/part-paper-init.ly +++ b/ly/part-paper-init.ly @@ -1,4 +1,4 @@ -\version "2.3.2" +\version "2.3.8" % JUNKME %part-paper-init.ly diff --git a/ly/performer-init.ly b/ly/performer-init.ly index 9f0d421bd3..c02cf3b7bc 100644 --- a/ly/performer-init.ly +++ b/ly/performer-init.ly @@ -1,4 +1,4 @@ -\version "2.3.2" +\version "2.3.8" % % setup for Request->Element conversion. Guru-only diff --git a/ly/portugues.ly b/ly/portugues.ly index a246f66380..2c2d6268cc 100644 --- a/ly/portugues.ly +++ b/ly/portugues.ly @@ -86,6 +86,6 @@ pitchnamesPortuguese = #`( pitchnames = \pitchnamesPortuguese -\version "2.2.0" +\version "2.3.8" #(ly:parser-set-note-names parser pitchnames) diff --git a/ly/property-init.ly b/ly/property-init.ly index d5289bd14f..3741d33ab8 100644 --- a/ly/property-init.ly +++ b/ly/property-init.ly @@ -1,6 +1,6 @@ % property-init.ly -\version "2.2.0" +\version "2.3.8" stemUp = \override Stem #'direction = #1 stemDown = \override Stem #'direction = #-1 @@ -97,7 +97,7 @@ normalsize = { % End the incipit and print a ``normal line start''. -endincipit = \notes \context Staff { +endincipit = \context Staff { \partial 16 s16 % Hack to handle e.g. \bar ".|" \endincipit \once \override Staff.Clef #'full-size-change = ##t \once \override Staff.Clef #'non-default = ##t diff --git a/ly/scale-definitions-init.ly b/ly/scale-definitions-init.ly index c6a0f65a77..d7b5681630 100644 --- a/ly/scale-definitions-init.ly +++ b/ly/scale-definitions-init.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.8" major = #`( diff --git a/ly/script-init.ly b/ly/script-init.ly index 6d6bb9aab0..29ac0e5fe9 100644 --- a/ly/script-init.ly +++ b/ly/script-init.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.8" dashHat= "marcato" diff --git a/ly/spanners-init.ly b/ly/spanners-init.ly index 6e6ffe1e34..781cd31df8 100644 --- a/ly/spanners-init.ly +++ b/ly/spanners-init.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.8" startGroup = #(make-span-event 'NoteGroupingEvent START) stopGroup = #(make-span-event 'NoteGroupingEvent STOP) @@ -14,21 +14,21 @@ stopTextSpan = #(make-span-event 'TextSpanEvent STOP) % TODO: junkme! -cresc = \notes { +cresc = { #(ly:export (make-event-chord (list cr))) \set crescendoText = \markup { \italic "cresc." } \set crescendoSpanner = #'dashed-line } -dim = \notes { +dim = { #(ly:export (make-event-chord (list decr))) \set decrescendoText = \markup { \italic "dim." } \set decrescendoSpanner = #'dashed-line } -enddim = \notes { +enddim = { #(ly:export (make-event-chord (list enddecr))) \unset decrescendoText \unset decrescendoSpanner @@ -36,7 +36,7 @@ enddim = \notes { % ah, this is handy: maybe drop resetting of properties in % dynamic-engraver ? -endcresc = \notes { +endcresc = { #(ly:export (make-event-chord (list endcr))) \unset crescendoText \unset crescendoSpanner diff --git a/ly/suomi.ly b/ly/suomi.ly index 21b0dab45f..5bca94db57 100644 --- a/ly/suomi.ly +++ b/ly/suomi.ly @@ -48,6 +48,6 @@ pitchnamesSuomi = #`( pitchnames = \pitchnamesSuomi -\version "2.2.0" +\version "2.3.8" #(ly:parser-set-note-names parser pitchnames) diff --git a/ly/svenska.ly b/ly/svenska.ly index 38905bd4cc..ecdf8c9884 100644 --- a/ly/svenska.ly +++ b/ly/svenska.ly @@ -42,6 +42,6 @@ pitchnamesSvenska = #`( ) pitchnames = \pitchnamesSvenska -\version "2.2.0" +\version "2.3.8" #(ly:parser-set-note-names parser pitchnames) diff --git a/ly/tabloid-init.ly b/ly/tabloid-init.ly index 672376b01c..49c4e8de02 100644 --- a/ly/tabloid-init.ly +++ b/ly/tabloid-init.ly @@ -1,4 +1,4 @@ -\version "2.2.0" +\version "2.3.8" % tabloid-init.ly diff --git a/ly/vlaams.ly b/ly/vlaams.ly index d16aec92c2..733bc87435 100644 --- a/ly/vlaams.ly +++ b/ly/vlaams.ly @@ -1,4 +1,4 @@ -\version "2.2.0" %hier stond 2.1.36, mocht ik dat wel veranderen? +\version "2.3.8" %hier stond 2.1.36, mocht ik dat wel veranderen? %{ -- 2.39.2