2003-08-04 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ * input/* : postfix syntax fixes.
+
* Documentation/user/refman.itely (Text markup): add note about
raise/lower with ^ or _ .
-q@c Note: -*-texinfo-*-
+@c Note: -*-texinfo-*-
@c
@c A menu is needed before every deeper *section nesting of @node's; run
@c M-x texinfo-all-menus-update
* Running LilyPond:: Printing music.
* More about pitches and accidentals::
* Octave entry::
-* Relative octave entry::
* Combining music into compound expressions::
* Adding articulation marks to notes::
* Combining notes into chords::
it possible to use different conventions for when to print
accidentals.
+@cindex beams, by hand
+Beams are drawn automatically, but if you do not like where they are
+put, they can be entered by hand. Mark the first note to be beamed
+with @code{[} and the last one with @code{]}:
+@quotation
+@lilypond[fragment,relative 1, verbatim]
+a8-[ ais-] d-[ es r d-]
+@end lilypond
+@end quotation
+@separate
+
+Rests are described in full detail in @ref{Rests}.
+
+The notation manual discusses ties in @ref{Ties}.
+
+
@node Octave entry
@section Octave entry
-@node Relative octave entry
-@section Relative octave entry
-@c lousy example
-@c ? --hwn
-@c fragment of 1st hrn in Adams' The Chairman Dances, with creative
-@c chromatic thing pasted in front. (admittedly the original does not
-@c have a phrasing slur. The problem is that we do not want the slur
-@c and the Phrasing slur to collide. We are trying to make a good
-@c impression here.
-
-@quotation
-@lilypond[fragment,relative 1, verbatim]
-a8-(-\( ais b c-) cis2 b'2 a4 cis, c-\)
-@end lilypond
-@end quotation
-@separate
-
-@cindex beams, by hand
-Beams are drawn automatically, but if you do not like where they are
-put, they can be entered by hand. Mark the first note to be beamed
-with @code{[} and the last one with @code{]}:
-@quotation
-@lilypond[fragment,relative 1, verbatim]
-a8-[ ais-] d-[ es r d-]
-@end lilypond
-@end quotation
-@separate
-
-Rests are described in full detail in @ref{Rests}.
-
-The notation manual discusses ties in @ref{Ties}.
phrasing), you can also make a phrasing slur with @code{\(} and
@code{\)}.
+@quotation
+@lilypond[fragment,relative 1, verbatim]
+a8-(-\( ais b c-) cis2 b'2 a4 cis, c-\)
+@end lilypond
+@end quotation
+
+
More information on fingering, articulation, slurs, phrasing slurs,
and dynamics can be found in @ref{Fingering instructions},
@ref{Articulations}, @ref{Slurs}, @ref{Phrasing slurs}, and @ref{Dynamics},
EOF
- exit 2
-fi
-if [ -z "$LILYPONDPREFIX" ]; then
- datadir=`echo "@local_lilypond_datadir@" | sed 's!//!/!g'`
+
+## If the message above is printed erroneously,
+## the following commands kills the current terminal/shell.
+## hence the ZSH test above.
+
+ exit 2
else
- if [ -d "$LILYPONDPREFIX/share" ]; then
- datadir=$LILYPONDPREFIX/share/lilypond/
- fi
- echo "Setting tree to $datadir"
-fi
-# Add the installation directory to the teTeX system tree,
-# see Documentation/misc/fontinstallation
-TEXMF="{$datadir,"`kpsexpand \\$TEXMF`"}"
-export TEXMF
+ if [ -z "$LILYPONDPREFIX" ]; then
+ datadir=`echo "@local_lilypond_datadir@" | sed 's!//!/!g'`
+ else
+ if [ -d "$LILYPONDPREFIX/share" ]; then
+ datadir=$LILYPONDPREFIX/share/lilypond/
+ fi
+ echo "Setting tree to $datadir"
+ fi
-# For direct ps output: ps/lilyponddefs.ps
-## GS_LIB="$datadir/ps:"${GS_LIB:=""}
-## export GS_LIB
+ # Add the installation directory to the teTeX system tree,
+ # see Documentation/misc/fontinstallation
+ TEXMF="{$datadir,"`kpsexpand \\$TEXMF`"}"
+ export TEXMF
-# For direct ps output fonts. Add all available TeX Type1 fonts
-## GS_FONTPATH=`kpsewhich -expand-path=\\$T1FONTS`:${GS_FONTPATH:=""}
-## export GS_FONTPATH
+ # For direct ps output: ps/lilyponddefs.ps
+ ## GS_LIB="$datadir/ps:"${GS_LIB:=""}
+ ## export GS_LIB
+ # For direct ps output fonts. Add all available TeX Type1 fonts
+ ## GS_FONTPATH=`kpsewhich -expand-path=\\$T1FONTS`:${GS_FONTPATH:=""}
+ ## export GS_FONTPATH
+
+fi
[<<g, g'>>8.-\< <<g g'>>16 <<b b'>>8. <<b b'>>16-\>-\! <<d d'>>8. <<d d'>>16] |
%% score has double slur on chord.
- <<c c'>>4-( <<b c'>>-) \! r
+ <<c c'>>4-( <<b c'>>-) r-\!
<<g g'>>4. <<b b'>>8 [<<d' d, >>8.-> c16] |
%65
-#(ly:set-point-and-click 'line-column)
+% #(ly:set-point-and-click 'line-column)
opus = "BWV 924"
piece = "1"
-#(ly:set-point-and-click 'line-column)
+% #(ly:set-point-and-click 'line-column)
opus= "BWV 939"
piece = "2"
-#(ly:set-point-and-click 'line-column)
+%#(ly:set-point-and-click 'line-column)
opus= "BWV 999"
piece = "3"
-#(ly:set-point-and-click 'line-column)
+%#(ly:set-point-and-click 'line-column)
opus = "BWV 925"
piece = "4"
-#(ly:set-point-and-click 'line-column)
+%#(ly:set-point-and-click 'line-column)
piece = "5"
opus = "BWV 926"
-#(ly:set-point-and-click 'line-column)
+%#(ly:set-point-and-click 'line-column)
opus = "BWV 940"
piece = "6"
\large "Einfach ("
\note #3 #0 #1
\large " = 100)" }
- a c -] \m g,-[ \u c^3 -] \m b,-[ \u c^2 b c-] \m a,-[ \u )c^3-] |
+ a c -] \m g,-[ \u c^3 -] \m b,-[ \u c^2 b c-] \m a,-[ \u c^3-]-) |
\property Voice.TextScript \revert #'extra-offset
\m f,-[( \u c f c-] \m g,-[ \u c^4-] \m a,-[ \u c^2 a c8 c16-)-] |
\m c16-[( \u f c' f-] \m b,-[ \u f-] \m d-[ \u f^3 d' f^2-] \m c-[ \u f-)^4-] |
e des b,\< des g e_3 ces_4 d_2 f^3 d cis d |
\property Voice.PhrasingSlur \override #'extra-offset = #'(0 . 3)
\property Voice.PhrasingSlur \override #'beautiful = #42
- g\( fes des fes b g_3 \! es_1 ges_2 a^3 ges f_1 ges_2 |
+ g\( fes des fes b g_3 es_1-\! ges_2 a^3 ges f_1 ges_2 |
r ges_2 b des_1 ges b,_2 des ges,^1 b, \d des,^1 \stemDown \transpose c' c { b,-[_1 as,] |
- g,8 b,16-[ g, e, cis,] d,-\)_4 \< f, h, d_3 f_2 \! r16 }
+ g,8 b,16-[ g, e, cis,] d,-\)_4 \< f, h, d_3 f_2 r16-\! }
\property Voice.PhrasingSlur \revert #'extra-offset
\property Voice.PhrasingSlur \revert #'beautiful
s2. s
\u s4. \grace {f8(} f4-) e8 |
f g16_2 b_1 a_2 gis_1 c_2 h, c cis_1 d_2 b,_1 |
- \tieDown c4.~<<f, c >>16-\< \tieBoth <<f h>>~ << f^3 h >>8-[-\> -\! << e b^2>> -\!] |
+ \tieDown c4.~<<f, c >>16-\< \tieBoth <<f h>>~ << f^3 h >>8-[-\>-\! << e b^2>> -\!] |
\translator Staff=mid
\transpose c' c {
a4^1( g8^1 b4 a8^2 |
f8..^1 f32^1 g8^2 a8..-) \slurUp <<f f'^3>>32-( <<g g'^4>>8 |
<<a a'^5>>8..-) <<f f'^3>>32-( <<g g'^4>>8 <<a a'^5 >>4.-\>-) ~ |
- a~ \! a^\fermata \bar "|."
+ a~ a-\!^\fermata \bar "|."
}
}
r2 r4 d8-[-(_\markup { \italic \bold "con espressione" } b-) ]
a-[( g-) d'( b-)] a-[( g-) e'( c-) ]
b8-[( a-)] a4 r4 a8-[ a]
- a-[( \< b c \!cis\> ] d4 \! c-)
+ a-[( \< b c cis-\!-\> ] d4 c-\!-)
ais8-[( b-)] r8 \cresc b b-[( c-)] r c
cis-[ ( d-)] r4 r2
\endcresc g,1-\f ~ g2 ~ g8-[ a16 b] c-[( d-) e c]
% 25
c16-[ ( d c d-)] e-[ ( f e f-)] g-[( e-) c-. c-.] f-[( d-) b-. b-.]
c16-[-\p ( d c d-)] e-[ ( f e f-)] g-[( e-) c-. c-.] f-[( d-) b-. b-.]
- c8-[ \< c, c c] c-[ c c \! c ]
+ c8-[ \< c, c c] c-[ c c c-\!-]
\mark "B"
c1-\f
R1*9
c-[ ( e-) g g] g-[( f e d-)]
c4(
\grace { \longgrace e16 \endlonggrace }
- d8.-[ c16-) \< ] c8-[ c-.( c-. \! c-)-.]
+ d8.-[ c16-) \< ] c8-[ c-.( c-. c-)-.-]-\!
\mark "C"
%% this is a trick to get the sfp-s to align.
\property Voice.Hairpin \override #'transparent = ##t
- des1\sfp \> \!
- g,1\sfp \> \!
- c\sfp \> \!
- c,\sfp
+ des1\sfp \>
+ g,1\sfp-\! \>
+ c\sfp -\! \>
+ c,\sfp-\!
\property Voice.Hairpin \revert #'transparent
R1*3
r8 c-[-\p c c] c2~
c8-[ c' c c] c2~
- c8-[ \< e( g f] e-[ \! d \> c bes]
+ c8-[ \< e( g f] e-[ d-\!-\> c bes]
\mark "D"
- \! a4-) r r2
+ a4-\!-) r r2
R1*3
c4.-\p ( f8-) a,4 a |
bes8-[ (c d bes-)] g4 r8 c,
g2.~
g8-[ \> a g] f-[ e d]
< \rondotheme
- { \! s8-\p } >
+ { s8-\!-\p } >
R2.*12
r4 r8 r4 c8
% Edition breitkopf says a-flat (silly!)
fis-[ g gis]
- a-[ bes \! b]
+ a-[ bes b-]-\!
%% EB does the slur in the Rondo differently from the 1st adn 2nd time.
%% why. Should check with MS.
\relative c'' <
{
\stemDown
- f16( \> d \! b \translator Staff = down \stemUp
+ f16( \> d b-\! \translator Staff = down \stemUp
\clef treble g ~ << g e>>8-)
e-[ \translator Staff = up
%\stemUp
\clef alto
\time 3/4
- r8 <<d bes >>-( ) bes' d <<e g, c, c,>>-> r |
+ r8 <<d bes >>-( bes'-) d <<e g, c, c,>>-> r |
}
}
}
\score { \notes \relative c'' {
- c1 \< \break \! c1 \> \break \! c1
+ c1 \< \break c1-\! \> \break c1-\!
}
\paper {
linewidth = 4.\cm
e,-.-> -\f
e \rfz
c' -\mf
- c -\mp \> \!
- c \ppppp \< \!
- c \sfp
+ c -\mp \>
+ c-\!-\ppppp \<
+ c-\sfp-\!
}
}
\score{
\notes\relative c''{
a1^\sfz
-a1-\fff\> \!c,,-\pp a'' a-\p
+a1-\fff\> c,,-\!-\pp a'' a-\p
% We need this to test if we get two Dynamic line spanners
a
}
\score { \notes { \context Voice {
- < f''1 { s4 s4 \< \! s4 \> \! s4 } >
+ < f''1 { s4 s4 \< s4-\! \> s4-\! } >
}}
\paper { raggedright = ##t}
\score {
-\notes \relative c'' { c4 \> c4 \! c4 c4_\ff \> c4 \! c4 -\p }
+\notes \relative c'' { c4 \> c4 c4-\! c4_\ff \> c4 c4-\!-\p }
\paper { raggedright = ##t}
}
sopran = \notes \relative c'' {
\time 3/4 a2.( | \break
-)g2 < g4 { s8 s8 } > |
+ g2-) < g4 { s8 s8 } > |
}
text = \lyrics {
#(ly:set-point-and-click 'line-column)
one = \notes\relative c'' {
- f4 \!e-.-\f r2|
+ f4 e-\!-.-\f r2|
R1|
f2-\p-(es -)|
d1\<|
d1|
d2 d2|
d2 d2|
- \!f1-\ff |
+ f1-\!-\ff |
f1
}
\property Voice.crescendoText = #"cresc."
\property Voice.crescendoSpanner = #'dashed-line
c1\< c \break
- c1 \!c \break
+ c1 c-\! \break
}
\paper {
linewidth = 40*\staffspace
melody = \notes\relative c''{
r2 r r
r2 r r
- r4 a'8-- \< a-- a-- a-- c-- \!b-- a--\> gis f \!e
+ r4 a'8-- \< a-- a-- a-- c-- b-\!-- a--\> gis f e-\!
es8 \grace b c r4 r2 r
}
" }
\score{
\notes\relative c''{
-a1\fff\> \!a-\pp
-a\< \!a
+a1\fff\> a-\pp-\!
+a\< a-\!
\property Voice.crescendoText = \markup { \italic \bold "cresc." }
\property Voice.crescendoSpanner = #'dashed-line
-a-\mf\< a \!a
-a\< \!a
+a-\mf\< a a-\!
+a\< a-\!
}
\paper{
raggedright = ##t
\notes\relative c''{
c-\piuf
c
- c2\< \! c2
+ c2\< c2-\!
- c2\< \! c2
+ c2\< c2-\!
}
\paper{raggedright = ##t}
}
$$ = $1;
dynamic_cast<Music *> ($$)->set_mus_property ("span-direction", gh_int2scm (STOP))
;
- static int warn_count ;
- if (warn_count < 10)
- {
- $$->origin ()->warning (_("Prefix articulations are deprecated. Use postfix notation instead."));
- warn_count ++;
- }
}
;
$$ = SCM_EOL;
}
| pre_events open_event {
+ static int warn_count ;
+ if (warn_count < 10)
+ {
+ $2->origin ()->warning (_("Prefix articulations are deprecated. Use postfix notation instead."));
+ warn_count ++;
+ }
+
$$ = gh_cons ($2->self_scm(), $$);
scm_gc_unprotect_object ($2->self_scm());
}