From 99435e09d86be8e58d438b379bc734b7cb5a728a Mon Sep 17 00:00:00 2001 From: hanwen Date: Tue, 26 Aug 2003 16:48:15 +0000 Subject: [PATCH] * Documentation/user/music-glossary.tely (Top): uncomment font-style statements. * lily/beam-engraver.cc: move new-beam-event to beam-event * GNUmakefile.in (web-clean): remake share/ after web-clean. --- ChangeLog | 3 + Documentation/user/GNUmakefile | 5 ++ Documentation/user/music-glossary.tely | 152 ++++++++++++++++++--------------- 3 files changed, 90 insertions(+), 70 deletions(-) diff --git a/ChangeLog b/ChangeLog index eb1287f2f3..25d67d2aca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2003-08-26 Han-Wen Nienhuys + * Documentation/user/music-glossary.tely (Top): uncomment + font-style statements. + * input/test/force-hshift.ly: revise example. * Documentation/bibliography/engraving.bib (note): typos. diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile index 72362dc6cd..19b9675ad2 100644 --- a/Documentation/user/GNUmakefile +++ b/Documentation/user/GNUmakefile @@ -153,3 +153,8 @@ $(outdir)/interfaces.itexi: endif +local-clean: local-delete + +local-delete: + -rm -f $(outdir)/lily-1* + -rm -f $(outdir)/* diff --git a/Documentation/user/music-glossary.tely b/Documentation/user/music-glossary.tely index fd400c31e9..11c8bffe85 100644 --- a/Documentation/user/music-glossary.tely +++ b/Documentation/user/music-glossary.tely @@ -14,6 +14,13 @@ PostScript} and @uref{music-glossary.pdf,PDF}. @c License PD, BSD-ish, GNU GPL, GNU FDL? Copyright @copyright{} 1999--2003 by the authors + + + Permission is granted to copy, distribute and/or modify this document + under the terms of the GNU Free Documentation License, Version 1.1 + or any later version published by the Free Software Foundation, + without Invariant Sections. + @end titlepage @@ -39,7 +46,12 @@ Christian Mondrup @* Copyright 1999--2003 by the authors -@c License PD, BSD-ish, GNU GPL, GNU FDL? + + Permission is granted to copy, distribute and/or modify this document + under the terms of the GNU Free Documentation License, Version 1.1 + or any later version published by the Free Software Foundation, + without Invariant Sections. + @* @@ -169,7 +181,7 @@ accidental. @lilypond[notime] \property Score.automaticBars = ##f -\property Voice.TextScript \set #'font-style = #'large +%\property Voice.TextScript \set #'font-style = #'large \addlyrics \context Staff \notes\relative c'' { gis1 s s gisis s s ges s s geses s s g! @@ -318,7 +330,7 @@ the duration of the long a. is proportional to that of the main note. \key d \major \time 4/4 -\property Score.TextScript \set #'font-style = #'large +%\property Score.TextScript \set #'font-style = #'large <>4_"notation" r { \property Voice.Stem \override #'flag-style = #'() \grace g16 @@ -332,7 +344,7 @@ fis8 e16 fis g8 fis16 g | \cadenzaOn a4 \bar "||" \cadenzaOff } \notes\relative c'' { -<>4_"performance" r g16 () fis e fis a () g fis g | +<>4_"performance" r g16 ( fis) e fis a ( g) fis g | \cadenzaOn a4 \bar "||" \cadenzaOff } @end lilypond @@ -342,10 +354,10 @@ An appoggiatura may have more notes preceding the main note. \notes\relative c'' { \key as \major \time 2/4 - \property Score.TextScript \set #'font-style = #'large +% \property Score.TextScript \set #'font-style = #'large \grace { bes16 } as8_"notation" as16 bes as8 g | - \grace { [as16-( bes] } << c as >>4-) - \grace { [as16-( bes] } << c as >>4-) \bar "||" + \grace { as16[( bes] } << c as >>4-) + \grace { as16[( bes] } << c as >>4-) \bar "||" \grace { bes16 } as8_"performance" as16 bes as8 g | < \context Voice = va { \stemUp\tieUp as32 bes c8. as32 bes c8. } \context Voice = vb { \stemDown\tieDown as16 ~ as8. as16 ~ as8. } > @@ -375,8 +387,8 @@ N: ?. \clef bass < \context Voice = va { \stemUp - r16 e8. () e4 r16 e8. () e4 | - r16 d8. () d4 r16 d8. () d4 } + r16 e8. ( e4) r16 e8. ( e4) | + r16 d8. ( d4) r16 d8. ( d4) } \context Voice = vb { \stemDown c2 c | c c } > @@ -528,12 +540,12 @@ The number of beams determine the note value of the connected notes. @lilypond[notime] \property Score.automaticBars = ##f -\property Voice.TextScript \set #'font-style = #'large +%\property Voice.TextScript \set #'font-style = #'large \notes\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 - [g64_"1/64" s32 g64 s32 g64 s32 g64] s32 } + g8_"1/8"[ g g g] s16 + g16_"1/16"[ g g g] s16 + g32_"1/32"[ s32 g32 s32 g32 s32 g32] s16 + g64_"1/64"[ s32 g64 s32 g64 s32 g64] s32 } @end lilypond @aitem{beat} @@ -664,7 +676,7 @@ lines. @lilypond[notime] \property Score.automaticBars = ##f \property Score.Clef \override #'full-size-change = ##t -\property Score.LyricText \set #'font-style = #'large +%\property Score.LyricText \set #'font-style = #'large \addlyrics \context Staff \notes\relative c' { \clef soprano c1 s s @@ -762,7 +774,7 @@ chords are denoted open chords @lilypond[notime] \property Score.automaticBars = ##f -\property Voice.TextScript \set #'font-style = #'large +%\property Voice.TextScript \set #'font-style = #'large \addlyrics \context Staff \notes\relative c'' { <>1 s s @@ -1015,7 +1027,7 @@ abbreviation ``cresc.''. @lilypond \key g \major \time 4/4 -\notes\relative c'' { g4 \< a b c | \! d1 \bar "|." } +\notes\relative c'' { g4 \< a b c | d1\! \bar "|." } @end lilypond @aitem{cue-notes} @@ -1107,7 +1119,7 @@ Abbreviated ``d.s.''. Repetition, not from the beginning, but from another place frequently near the beginning marked by a sign: @lilypond -\property Voice.TextScript \set #'font-style = #'large +%\property Voice.TextScript \set #'font-style = #'large \property Voice.TextScript \set #'font-shape = #'italic \key g \major \time 4/4 \notes\relative c'' { d1 | g,4^\segno a b c | b a g2_"d.s." \bar "|." } @@ -1129,7 +1141,7 @@ or the abbreviation ``decresc.''. @lilypond \notes\relative c'' { \key g \major \time 4/4 - d4 \> c b a | \! g1 \bar "|." + d4 \> c b a | g1 \! \bar "|." } @end lilypond @@ -1166,8 +1178,8 @@ also to some extent in newer jazz music. @lilypond[notime,linewidth=110mm] \property Score.automaticBars = ##f -\property Score.LyricText \set #'font-style = #'large -\property Score.TextScript \set #'font-style = #'large +%\property Score.LyricText \set #'font-style = #'large +%\property Score.TextScript \set #'font-style = #'large \addlyrics \context Staff \notes\relative c' { c1 d @@ -1181,8 +1193,8 @@ also to some extent in newer jazz music. @lilypond[notime] \property Score.automaticBars = ##f -\property Score.LyricText \set #'font-style = #'large -\property Score.TextScript \set #'font-style = #'large +%\property Score.LyricText \set #'font-style = #'large +%\property Score.TextScript \set #'font-style = #'large \addlyrics \context Staff \notes\relative c' { d1 @@ -1196,8 +1208,8 @@ also to some extent in newer jazz music. @lilypond[notime] \property Score.automaticBars = ##f -\property Score.LyricText \set #'font-style = #'large -\property Score.TextScript \set #'font-style = #'large +%\property Score.LyricText \set #'font-style = #'large +%\property Score.TextScript \set #'font-style = #'large \addlyrics \notes\relative c' { \property Voice.TextScript \set #'padding = #-4 @@ -1210,8 +1222,8 @@ also to some extent in newer jazz music. @lilypond[notime] \property Score.automaticBars = ##f -\property Score.LyricText \set #'font-style = #'large -\property Score.TextScript \set #'font-style = #'large +%\property Score.LyricText \set #'font-style = #'large +%\property Score.TextScript \set #'font-style = #'large \addlyrics \notes\relative c' { f1 g a @@ -1225,8 +1237,8 @@ also to some extent in newer jazz music. @lilypond[notime] \property Score.automaticBars = ##f -\property Score.LyricText \set #'font-style = #'large -\property Score.TextScript \set #'font-style = #'large +%\property Score.LyricText \set #'font-style = #'large +%\property Score.TextScript \set #'font-style = #'large \addlyrics \notes\relative c'' { g1 a @@ -1239,8 +1251,8 @@ also to some extent in newer jazz music. @lilypond[notime] \property Score.automaticBars = ##f -\property Score.LyricText \set #'font-style = #'large -\property Score.TextScript \set #'font-style = #'large +%\property Score.LyricText \set #'font-style = #'large +%\property Score.TextScript \set #'font-style = #'large \addlyrics \notes\relative c'' { a1 @@ -1259,8 +1271,8 @@ harmonic minor scale type an augmented second (A) occurs between the 6th and @lilypond[notime] \property Score.automaticBars = ##f -\property Score.LyricText \set #'font-style = #'large -\property Score.TextScript \set #'font-style = #'large +%\property Score.LyricText \set #'font-style = #'large +%\property Score.TextScript \set #'font-style = #'large \addlyrics \notes\relative c' { c1 d @@ -1274,8 +1286,8 @@ harmonic minor scale type an augmented second (A) occurs between the 6th and @lilypond[notime] \property Score.automaticBars = ##f -\property Score.LyricText \set #'font-style = #'large -\property Score.TextScript \set #'font-style = #'large +%\property Score.LyricText \set #'font-style = #'large +%\property Score.TextScript \set #'font-style = #'large \addlyrics \notes\relative c'' { a1 @@ -1289,8 +1301,8 @@ harmonic minor scale type an augmented second (A) occurs between the 6th and @lilypond[notime] \property Score.automaticBars = ##f -\property Score.LyricText \set #'font-style = #'large -\property Score.TextScript \set #'font-style = #'large +%\property Score.LyricText \set #'font-style = #'large +%\property Score.TextScript \set #'font-style = #'large \addlyrics \notes\relative c'' { a1 @@ -1304,8 +1316,8 @@ harmonic minor scale type an augmented second (A) occurs between the 6th and @lilypond[notime] \property Score.automaticBars = ##f -\property Score.LyricText \set #'font-style = #'large -\property Score.TextScript \set #'font-style = #'large +%\property Score.LyricText \set #'font-style = #'large +%\property Score.TextScript \set #'font-style = #'large \addlyrics \notes\relative c'' { a1 @@ -1650,7 +1662,7 @@ but equal pitch. @lilypond[notime] \property Score.automaticBars = ##f -\property Score.TextScript \set #'font-style = #'large +%\property Score.TextScript \set #'font-style = #'large \addlyrics \context Staff \notes\relative c'' { gis1 s s as s s <> s s <> s s @@ -1722,7 +1734,7 @@ symbol indicates playing an octave lower (for example on double bass @lilypond[notime] \property Score.automaticBars = ##f \property Staff.Clef \override #'full-size-change = ##t -\property Score.LyricText \set #'font-style = #'large +%\property Score.LyricText \set #'font-style = #'large \addlyrics \notes\relative c { \clef varbaritone @@ -1814,7 +1826,7 @@ less than a quarter note. The number of flags determines the @lilypond[notime] \property Score.automaticBars = ##f -\property Score.TextScript \set #'font-style = #'large +%\property Score.TextScript \set #'font-style = #'large \notes\relative c'' { g8_"1/8" s8 g16_"1/16" s8 @@ -1898,8 +1910,8 @@ variants of the base chords. @lilypond[notime] \property Score.automaticBars = ##f -\property Score.LyricText \set #'font-style = #'large -\property Score.TextScript \set #'font-style = #'large +%\property Score.LyricText \set #'font-style = #'large +%\property Score.TextScript \set #'font-style = #'large \addlyrics \context Voice \notes\relative c'' { <>1 << a f d >> << b g e >> @@ -1938,7 +1950,7 @@ scores are notated like that). @lilypond[notime] \property Score.automaticBars = ##f \property Staff.Clef \set #'full-size-change = ##t -\property Score.LyricText \set #'font-style = #'large +%\property Score.LyricText \set #'font-style = #'large \addlyrics \notes\relative c'' { \clef french @@ -2064,7 +2076,7 @@ section. @aref{functional harmony}. \partial 4 << c g e >>4 | << c a f >> << b g d >> << c g e >>2 } - \property Score.LyricText \set #'font-style = #'large +% %\property Score.LyricText \set #'font-style = #'large \addlyrics \context Staff = SB \relative c { \clef bass @@ -2095,7 +2107,7 @@ Consonances: @lilypond[notime] \property Score.automaticBars = ##f -\property Score.TextScript \set #'font-style = #'large +%\property Score.TextScript \set #'font-style = #'large \context Voice \notes\relative c'' { <>1_"unisone " s <>_"third " s @@ -2111,7 +2123,7 @@ Dissonances: @lilypond[notime] \property Score.automaticBars = ##f -\property Score.TextScript \set #'font-style = #'large +%\property Score.TextScript \set #'font-style = #'large \context Voice \notes\relative c'' { <>1_"second " s s <>_"seventh " s s @@ -2154,8 +2166,8 @@ of such two forms an octave. @lilypond[notime] \property Score.automaticBars = ##f -\property Score.LyricText \set #'font-style = #'large -\property Score.TextScript \set #'font-style = #'large +%\property Score.LyricText \set #'font-style = #'large +%\property Score.TextScript \set #'font-style = #'large \addlyrics \context Voice \notes\relative c'' { << g g >>1 s @@ -2175,8 +2187,8 @@ of such two forms an octave. @lilypond[notime] \property Score.automaticBars = ##f -\property Score.LyricText \set #'font-style = #'large -\property Score.TextScript \set #'font-style = #'large +%\property Score.LyricText \set #'font-style = #'large +%\property Score.TextScript \set #'font-style = #'large \addlyrics \context Staff \notes\relative c'' { << g c >>^"perfect" s @@ -2196,8 +2208,8 @@ of such two forms an octave. @lilypond[notime] \property Score.automaticBars = ##f -\property Score.LyricText \set #'font-style = #'large -\property Score.TextScript \set #'font-style = #'large +%\property Score.LyricText \set #'font-style = #'large +%\property Score.TextScript \set #'font-style = #'large \addlyrics \context Staff \notes\relative c'' { << gis f'! >>1^"dimin" s @@ -2230,7 +2242,7 @@ The difference between an interval and an octave. @lilypond[notime] \property Score.automaticBars = ##f -\property Score.TextScript \set #'font-style = #'large +%\property Score.TextScript \set #'font-style = #'large \context Staff \notes\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 "||" @@ -2352,7 +2364,7 @@ unlike (b) @emph{leggiero} or @emph{non-legato}, (c) @emph{portato} and c4-. d-. e-. \bar "||" } \context Lyrics \lyrics { - \property Lyrics . LyricText \set #'font-style = #'large +% \property Lyrics . LyricText \set #'font-style = #'large a b "" "" c @@ -2712,7 +2724,7 @@ subject. @lilypond \property Score.TimeSignature \override #'style = #'() -\property Score.TextScript \set #'font-style = #'large +%\property Score.TextScript \set #'font-style = #'large \notes\relative c'' { \time 4/4 \key g \major @@ -2843,7 +2855,7 @@ but sometimes (mostly in pre baroque music) the double length note value @emph{longa} is used. @lilypond[notime] -\property Score.TextScript \set #'font-style = #'large +%\property Score.TextScript \set #'font-style = #'large \property Score.automaticBars = ##f \notes\relative c'' { \property Voice.NoteHead \override #'style = #'mensural @@ -2854,7 +2866,7 @@ but sometimes (mostly in pre baroque music) the double length note value @end lilypond @lilypond[notime] -\property Score.TextScript \set #'font-style = #'large +%\property Score.TextScript \set #'font-style = #'large \property Score.automaticBars = ##f \notes\relative c'' { r\longa_"longa" r\breve_"breve" @@ -2866,7 +2878,7 @@ An augmentation dot after a note multiplies the duration by one and a half. Another dot adds yet a fourth of the duration. @lilypond -\property Score.TextScript \set #'font-style = #'large +%\property Score.TextScript \set #'font-style = #'large \notes\relative c'' { \time 4/4 g4._"pointed" g8 g2 | g4 () g8 g g2 \bar "||" @@ -2879,7 +2891,7 @@ Subdivisions by@w{ }2 (@emph{tuplets}) or@w{ }4 (@emph{quadruplets}) of dotted notes are also frequently used. @lilypond -\property Score.TextScript \set #'font-style = #'large +%\property Score.TextScript \set #'font-style = #'large \notes\relative c'' { \time 4/4 \times 2/3 {g8_"triplets" g g} g4 g8 g g4 \bar "||" @@ -2933,7 +2945,7 @@ the upper note is played first. @lilypond < \context Staff = sa { - \property Score.TextScript \set #'font-style = #'large +% \property Score.TextScript \set #'font-style = #'large \notes\relative c'' { c2._"pre-1850" b4\trill | c1 \bar "||" c2._"post-1850" b4\trill | c1 \bar "||" @@ -2952,7 +2964,7 @@ Other frequently used ornaments are the @emph{turn}, the @emph{mordent} and the @lilypond < \context Staff = sa { - \property Score.TextScript \set #'font-style = #'large +% \property Score.TextScript \set #'font-style = #'large \notes\relative c'' { a4_"turn" b\turn c2 \bar "||" g4_"mordent" a b\mordent a \bar "||" @@ -3225,7 +3237,7 @@ with the same @aref{key signature}. @lilypond[notime] \property Score.automaticBars = ##f -\property Score.TextScript \set #'font-style = #'large +%\property Score.TextScript \set #'font-style = #'large \notes\relative c' { \key es \major es1_"e flat major" f g as bes c d es @@ -3235,7 +3247,7 @@ with the same @aref{key signature}. @lilypond[notime] \property Score.automaticBars = ##f -\property Score.TextScript \set #'font-style = #'large +%\property Score.TextScript \set #'font-style = #'large \notes\relative c' { \key es \major c1_"c minor" d es f g a! b! c \bar "||" @@ -3353,7 +3365,7 @@ sub@-do@-mi@-nant (S) and V = dominant (D). @lilypond[notime] \property Score.automaticBars = ##f -\property Score.LyricText \set #'font-style = #'large +%\property Score.LyricText \set #'font-style = #'large %\property Lyrics.minVerticalAlign = #8 \addlyrics \context Staff \notes\relative c' { @@ -3670,7 +3682,7 @@ whole note. @aref{beam}. @lilypond[notime] \property Score.autoBeaming = ##f \property Score.automaticBars = ##f -\property Score.TextScript \set #'font-style = #'large +%\property Score.TextScript \set #'font-style = #'large \notes\relative c'' { g2_"1/2" g' s16 g,4_"1/4" g' s16 @@ -3809,7 +3821,7 @@ the underlaying (normal) pulse and the actual (abnormal) rhythm. \notes\relative c' { \partial 4 d8 dis | - e c'4 e,8 c'4 e,8 c' ( | ) c2 + e c'4 e,8 c'4 e,8 c' ( | c2) } @end lilypond @@ -3973,7 +3985,7 @@ with figures designating the chief @aref{interval}s and es8 c d bes c as bes16 as g f | es4 } \context Lyrics \lyrics { - \property Lyrics . LyricText \set #'font-style = #'Large +% \property Lyrics . LyricText \set #'font-style = #'Large \property Lyrics . VerticalAlign \override #'threshold = #'(6 . 12) < { "" "6" "" "4" "" "6" "" "" "6" "4" } { "" "" "" "2" "" "" "" "" "" "2" } > @@ -4109,7 +4121,7 @@ a @aref{chord}, usually in the distance of a third @lilypond[notime] \property Score.automaticBars = ##f -\property Score.TextScript \set #'font-style = #'large +%\property Score.TextScript \set #'font-style = #'large \notes\relative c' { e2:32_"a" f:32 [ e8:16 f:16 g:16 a:16 ] s4 -- 2.11.4.GIT