Index: Documentation/notation/input.itely |
diff --git a/Documentation/notation/input.itely b/Documentation/notation/input.itely |
index 7e9019327806c4ccdd1c2dda373d1cb1164316b9..2256df68b6402f8f19675d4decfc79994f665e8e 100644 |
--- a/Documentation/notation/input.itely |
+++ b/Documentation/notation/input.itely |
@@ -48,7 +48,7 @@ delimited by curly brackets: |
@example |
\score @{ |
-... |
+ @dots{} |
@} |
@end example |
@@ -200,6 +200,7 @@ title, like the book itself, by specifying a @code{\header} block. |
\score @{ @dots{} @} |
@dots{} |
@} |
+ |
\bookpart @{ |
\header @{ |
subtitle = "Second part" |
@@ -288,8 +289,8 @@ music expression will be translated into |
@} |
@} |
@} |
- \layout @{ @} |
- \header @{ @} |
+ \layout @{ @} |
+ \header @{ @} |
@} |
@end example |
@@ -482,19 +483,28 @@ may use any @ref{Formatting text}, commands in the header. |
\book { |
\header { |
dedication = "dedicated to me" |
- title = \markup \center-column { "Title first line" "Title second line, |
-longer" } |
+ title = \markup { |
+ \center-column { "Title first line" "Title second line, longer" } |
+ } |
subtitle = "the subtitle," |
subsubtitle = #(string-append "subsubtitle LilyPond version " |
-(lilypond-version)) |
+ (lilypond-version)) |
poet = "Poet" |
- composer = \markup \center-column { "composer" \small "(1847-1973)" } |
+ composer = \markup { |
+ \center-column { "composer" \small "(1847-1973)" } |
+ } |
texttranslator = "Text Translator" |
- meter = \markup { \teeny "m" \tiny "e" \normalsize "t" \large "e" \huge |
-"r" } |
- arranger = \markup { \fontsize #8.5 "a" \fontsize #2.5 "r" \fontsize |
-#-2.5 "r" \fontsize #-5.3 "a" \fontsize #7.5 "nger" } |
- instrument = \markup \bold \italic "instrument" |
+ meter = \markup { |
+ \teeny "m" \tiny "e" \normalsize "t" \large "e" \huge "r" |
+ } |
+ arranger = \markup { |
+ \fontsize #8.5 "a" |
+ \fontsize #2.5 "r" |
+ \fontsize #-2.5 "r" |
+ \fontsize #-5.3 "a" |
+ \fontsize #7.5 "nger" |
+ } |
+ instrument = \markup { \bold \italic "instrument" } |
piece = "Piece" |
} |
@@ -505,9 +515,7 @@ longer" } |
opus = "opus1" |
} |
} |
- \markup { |
- and now... |
- } |
+ \markup { and now... } |
\score { |
{ c'1 } |
\header { |
@@ -558,7 +566,7 @@ You may change this behavior (and print all the headers when defining |
@code{\header} inside @code{\score}) by using |
@example |
-\paper@{ |
+\paper @{ |
print-all-headers = ##t |
@} |
@end example |
@@ -639,10 +647,10 @@ composer flush right on a single line. |
@verbatim |
\paper { |
bookTitleMarkup = \markup { |
- \fill-line { |
- \fromproperty #'header:title |
- \fromproperty #'header:composer |
- } |
+ \fill-line { |
+ \fromproperty #'header:title |
+ \fromproperty #'header:composer |
+ } |
} |
} |
@end verbatim |
@@ -661,14 +669,19 @@ point is placed, using the @code{\page-ref} markup command. |
\label #'firstScore |
\score { |
{ |
- c'1 |
- \pageBreak \mark A \label #'markA |
- c'1 |
+ c'1 | |
+ \pageBreak |
+ \mark A \label #'markA |
+ c'1 | |
} |
} |
- \markup { The first score begins on page \page-ref #'firstScore "0" "?" } |
- \markup { Mark A is on page \page-ref #'markA "0" "?" } |
+ \markup { |
+ The first score begins on page \page-ref #'firstScore "0" "?" |
+ } |
+ \markup { |
+ Mark A is on page \page-ref #'markA "0" "?" |
+ } |
} |
@end lilypond |
@@ -709,16 +722,16 @@ top-level, or inside a music expression. |
\markuplines \table-of-contents |
\pageBreak |
-\tocItem \markup "First score" |
+\tocItem \markup { "First score" } |
\score { |
{ |
c'4 % ... |
- \tocItem \markup "Some particular point in the first score" |
+ \tocItem \markup { "Some particular point in the first score" } |
d'4 % ... |
} |
} |
-\tocItem \markup "Second score" |
+\tocItem \markup { "Second score" } |
\score { |
{ |
e'4 % ... |
@@ -735,13 +748,17 @@ number. These variables may be changed by the user: |
@verbatim |
\paper { |
%% Translate the toc title into French: |
- tocTitleMarkup = \markup \huge \column { |
- \fill-line { \null "Table des matières" \null } |
- \hspace #1 |
+ tocTitleMarkup = \markup { |
+ \huge \column { |
+ \fill-line { \null "Table des matières" \null } |
+ \hspace #1 |
+ } |
} |
%% use larger font size |
- tocItemMarkup = \markup \large \fill-line { |
- \fromproperty #'toc:text \fromproperty #'toc:page |
+ tocItemMarkup = \markup { |
+ \large \fill-line { |
+ \fromproperty #'toc:text \fromproperty #'toc:page |
+ } |
} |
} |
@end verbatim |
@@ -762,30 +779,38 @@ in the table of contents of an opera: |
@verbatim |
\paper { |
- tocActMarkup = \markup \large \column { |
- \hspace #1 |
- \fill-line { \null \italic \fromproperty #'toc:text \null } |
- \hspace #1 |
+ tocActMarkup = \markup { |
+ \large \column { |
+ \hspace #1 |
+ \fill-line { \null \italic \fromproperty #'toc:text \null } |
+ \hspace #1 |
+ } |
} |
} |
tocAct = |
-#(define-music-function (parser location text) (markup?) |
+#(define-music-function |
+ (parser location text) |
+ (markup?) |
(add-toc-item! 'tocActMarkup text)) |
@end verbatim |
@lilypond[line-width=11.0\cm] |
\header { tagline = ##f } |
\paper { |
- tocActMarkup = \markup \large \column { |
- \hspace #1 |
- \fill-line { \null \italic \fromproperty #'toc:text \null } |
- \hspace #1 |
+ tocActMarkup = \markup { |
+ \large \column { |
+ \hspace #1 |
+ \fill-line { \null \italic \fromproperty #'toc:text \null } |
+ \hspace #1 |
+ } |
} |
} |
tocAct = |
-#(define-music-function (parser location text) (markup?) |
+#(define-music-function |
+ (parser location text) |
+ (markup?) |
(add-toc-item! 'tocActMarkup text)) |
\book { |
@@ -973,39 +998,35 @@ may be combined on one staff, see @ref{Automatic part combining}. |
Here is an example: |
@lilypond[verbatim,quote] |
-sopranoMusic = \relative c'' { a4 b c b8( a) } |
-altoMusic = \relative g' { e4 e e f } |
-tenorMusic = \relative c' { c4 b e d8( c) } |
-bassMusic = \relative c' { a4 gis a d, } |
-allLyrics = \lyricmode {King of glo -- ry } |
+sopranoMusic = \relative c'' { a4 b c b8( a) } |
+altoMusic = \relative g' { e4 e e f } |
+tenorMusic = \relative c' { c4 b e d8( c) } |
+bassMusic = \relative c' { a4 gis a d, } |
+ |
+allLyrics = \lyricmode { King of glo -- ry } |
+ |
<< |
\new Staff = "Soprano" \sopranoMusic |
- \new Lyrics \allLyrics |
+ \new Lyrics \lyricsto "Soprano" \allLyrics |
+ |
\new Staff = "Alto" \altoMusic |
- \new Lyrics \allLyrics |
- \new Staff = "Tenor" { |
- \clef "treble_8" |
- \tenorMusic |
- } |
- \new Lyrics \allLyrics |
- \new Staff = "Bass" { |
- \clef "bass" |
- \bassMusic |
- } |
- \new Lyrics \allLyrics |
+ \new Lyrics \lyricsto "Alto" \allLyrics |
+ |
+ \new Staff = "Tenor" { \clef "treble_8" \tenorMusic } |
+ \new Lyrics \lyricsto "Tenor" \allLyrics |
+ |
+ \new Staff = "Bass" { \clef "bass" \bassMusic } |
+ \new Lyrics \lyricsto "Bass" \allLyrics |
+ |
\new PianoStaff << |
\new Staff = "RH" { |
\set Staff.printPartCombineTexts = ##f |
- \partcombine |
- \sopranoMusic |
- \altoMusic |
+ \partcombine \sopranoMusic \altoMusic |
} |
\new Staff = "LH" { |
\set Staff.printPartCombineTexts = ##f |
\clef "bass" |
- \partcombine |
- \tenorMusic |
- \bassMusic |
+ \partcombine \tenorMusic \bassMusic |
} |
>> |
>> |
@@ -1085,7 +1106,7 @@ Alternatively, it is sometimes easier to exclude sections of music: |
music = \relative g' { |
g8. c32 d |
\tag #'trills { d8.\trill } |
- \tag #'expand {\repeat unfold 3 { e32 d } } |
+ \tag #'expand { \repeat unfold 3 { e32 d } } |
c32 d |
} |
@@ -1124,9 +1145,9 @@ music = \relative c'' { |
\tag #'b \tag #'both { b4 b b b } |
} |
<< |
-\keepWithTag #'a \music |
-\keepWithTag #'b \music |
-\keepWithTag #'both \music |
+ \keepWithTag #'a \music |
+ \keepWithTag #'b \music |
+ \keepWithTag #'both \music |
>> |
@end lilypond |
@@ -1135,15 +1156,15 @@ music expression to remove several differently named tagged sections: |
@lilypond[verbatim,quote] |
music = \relative c'' { |
-\tag #'A { a4 a a a } |
-\tag #'B { b4 b b b } |
-\tag #'C { c4 c c c } |
-\tag #'D { d4 d d d } |
+ \tag #'A { a4 a a a } |
+ \tag #'B { b4 b b b } |
+ \tag #'C { c4 c c c } |
+ \tag #'D { d4 d d d } |
} |
{ |
-\removeWithTag #'B |
-\removeWithTag #'C |
-\music |
+ \removeWithTag #'B |
+ \removeWithTag #'C |
+ \music |
} |
@end lilypond |
@@ -1236,9 +1257,7 @@ portuguese = \lyricmode { |
à vo -- cê uma can -- ção legal |
} |
-\relative c' { |
- c2 d e f g f e |
-} |
+\relative c' { c2 d | e2 f | g2 f | e1 | } |
\addlyrics { \bulgarian } |
\addlyrics { \hebrew } |
\addlyrics { \portuguese } |
@@ -1274,10 +1293,10 @@ lyrics and as stand-alone text below the score: |
@lilypond[quote,verbatim] |
\score { |
\relative c'' { |
- c1 \mark \markup { \char ##x03EE } |
- c1_\markup { \tiny { \char ##x03B1 " to " \char ##x03C9 } } |
+ c1 \mark \markup { \char ##x03EE } | |
+ c1_\markup { \tiny { \char ##x03B1 " to " \char ##x03C9 } } | |
} |
- \addlyrics { O \markup { \concat { Ph \char ##x0153 be! } } } |
+ \addlyrics { O | \markup { \concat { Ph \char ##x0153 be! } } } |
} |
\markup { "Copyright 2008--2010" \char ##x00A9 } |
@end lilypond |
@@ -1302,14 +1321,18 @@ using the command line. For example, |
@example |
@{ |
- \displayLilyMusic \transpose c a, @{ c4 e g a bes @} |
+ \displayLilyMusic \transpose c a, @{ c4 e g a | bes4 d f g | @} |
@} |
@end example |
will display |
@example |
-@{ a,4 cis e fis g @} |
+@{ |
+ a, cis e fis | |
+ g b, d e | |
+ |
+@} |
@end example |
By default, LilyPond will print these messages to the console |
@@ -1346,11 +1369,9 @@ separately. For example, including the following definition |
@verbatim |
\layout { |
- clip-regions |
- = #(list |
- (cons |
- (make-rhythmic-location 5 1 2) |
- (make-rhythmic-location 7 3 4))) |
+ clip-regions = |
+ #(list (cons (make-rhythmic-location 5 1 2) |
+ (make-rhythmic-location 7 3 4))) |
} |
@end verbatim |
@@ -1409,7 +1430,7 @@ been warned. |
\set Score.skipTypesetting = ##t |
e8 e e e e e e e |
\set Score.skipTypesetting = ##f |
- c8 d b bes a g c2 |
+ c8 d b bes a g | |
} |
@end lilypond |
@@ -1559,7 +1580,7 @@ The line above will set the default extension for MIDI files to |
Alternatively, this option can also be supplied on the command line: |
@example |
-lilypond … -dmidi-extension=midi lilyFile.ly |
+lilypond -dmidi-extension=midi myfile.ly |
@end example |
@@ -1580,7 +1601,7 @@ The name should be chosen from the list in @ref{MIDI instruments}. |
@end example |
@example |
-\new Staff \with @{midiInstrument = #"cello"@} @{ |
+\new Staff \with @{ midiInstrument = #"cello" @} @{ |
@var{...notes...} |
@} |
@end example |
@@ -1760,14 +1781,14 @@ in the MIDI output. This is achieved by applying the |
@code{\unfoldRepeats} music function. This function changes all |
repeats to unfold repeats. |
-@lilypond[quote,verbatim] |
+@lilypond[quote,verbatim,relative=1] |
\unfoldRepeats { |
- \repeat tremolo 8 { c'32 e' } |
- \repeat percent 2 { c''8 d'' } |
- \repeat volta 2 { c'4 d' e' f' } |
+ \repeat tremolo 8 { c32 e } |
+ \repeat percent 2 { c'8 d } | |
+ \repeat volta 2 { c,4 d e f | } |
\alternative { |
- { g' a' a' g' } |
- { f' e' d' c' } |
+ { g4 a a g | } |
+ { f4 e d c | } |
} |
} |
\bar "|." |
@@ -1821,9 +1842,9 @@ found, or calls the default function otherwise. |
@lilypond[verbatim,quote] |
#(define (myDynamics dynamic) |
- (if (equal? dynamic "rfz") |
- 0.9 |
- (default-dynamic-absolute-volume dynamic))) |
+ (if (equal? dynamic "rfz") |
+ 0.9 |
+ (default-dynamic-absolute-volume dynamic))) |
\score { |
\new Staff { |
@@ -1831,7 +1852,7 @@ found, or calls the default function otherwise. |
\set Score.dynamicAbsoluteVolumeFunction = #myDynamics |
\new Voice { |
\relative c'' { |
- a4\pp b c-\rfz |
+ a4\pp b c2-\rfz |
} |
} |
} |
@@ -1871,18 +1892,18 @@ volume is limited to the range 0.2 - 0.5. |
\time 2/2 |
\set Staff.midiInstrument = #"flute" |
\new Voice \relative c''' { |
- r2 g\mp g fis~ |
- fis4 g8 fis e2~ |
- e4 d8 cis d2 |
+ r2 g\mp g fis~ | |
+ fis4 g8 fis e2~ | |
+ e4 d8 cis d2 | |
} |
} |
\new Staff { |
\key g \major |
\set Staff.midiInstrument = #"clarinet" |
\new Voice \relative c'' { |
- b1\p a2. b8 a |
- g2. fis8 e |
- fis2 r |
+ b1\p a2. b8 a | |
+ g2. fis8 e | |
+ fis2 r | |
} |
} |
>> |
@@ -1921,9 +1942,9 @@ correctly. |
\set Staff.midiMinimumVolume = #0.7 |
\set Staff.midiMaximumVolume = #0.9 |
\new Voice \relative c''' { |
- r2 g\mp g fis~ |
- fis4 g8 fis e2~ |
- e4 d8 cis d2 |
+ r2 g\mp g fis~ | |
+ fis4 g8 fis e2~ | |
+ e4 d8 cis d2 | |
} |
} |
\new Staff { |
@@ -1932,9 +1953,9 @@ correctly. |
\set Staff.midiMinimumVolume = #0.3 |
\set Staff.midiMaximumVolume = #0.6 |
\new Voice \relative c'' { |
- b1\p a2. b8 a |
- g2. fis8 e |
- fis2 r |
+ b1\p a2. b8 a | |
+ g2. fis8 e | |
+ fis2 r | |
} |
} |
>> |
@@ -1973,16 +1994,13 @@ to the same values as the previous example. |
#(define my-instrument-equalizer-alist '()) |
#(set! my-instrument-equalizer-alist |
- (append |
- '( |
- ("flute" . (0.7 . 0.9)) |
- ("clarinet" . (0.3 . 0.6))) |
- my-instrument-equalizer-alist)) |
+ (append '(("flute" . (0.7 . 0.9)) |
+ ("clarinet" . (0.3 . 0.6))) |
+ my-instrument-equalizer-alist)) |
#(define (my-instrument-equalizer s) |
- (let ((entry (assoc s my-instrument-equalizer-alist))) |
- (if entry |
- (cdr entry)))) |
+ (let ((entry (assoc s my-instrument-equalizer-alist))) |
+ (if entry (cdr entry)))) |
\score { |
<< |
@@ -1992,18 +2010,18 @@ to the same values as the previous example. |
\set Score.instrumentEqualizer = #my-instrument-equalizer |
\set Staff.midiInstrument = #"flute" |
\new Voice \relative c''' { |
- r2 g\mp g fis~ |
- fis4 g8 fis e2~ |
- e4 d8 cis d2 |
+ r2 g\mp g fis~ | |
+ fis4 g8 fis e2~ | |
+ e4 d8 cis d2 | |
} |
} |
\new Staff { |
\key g \major |
\set Staff.midiInstrument = #"clarinet" |
\new Voice \relative c'' { |
- b1\p a2. b8 a |
- g2. fis8 e |
- fis2 r |
+ b1\p a2. b8 a | |
+ g2. fis8 e | |
+ fis2 r | |
} |
} |
>> |
@@ -2034,12 +2052,12 @@ copied out and compiled to test microtones in your MIDI player. |
@lilypond[verbatim,quote] |
\score { |
\relative c' { |
- c4 cih cis cisih |
- d4 dih ees eeh |
- e4 eih f fih |
- fis4 fisih g gih |
- gis4 gisih a aih |
- bes4 beh b bih |
+ c4 cih cis cisih | |
+ d4 dih ees eeh | |
+ e4 eih f fih | |
+ fis4 fisih g gih | |
+ gis4 gisih a aih | |
+ bes4 beh b bih | |
} |
\layout {} |
\midi {} |