by ... a lot .... Ahem.
* scm/define-music-types.scm (music-descriptions): idem.
* lily/beam-engraver.cc: move new-beam-event to beam-event
* input/regression/bar-number.ly: remove unnecessary old-relative
options.
* lily/parser.yy (Composite_music): add \newcontext
* scripts/convert-ly.py (conv): dashes rule.
Apply rule.
2003-08-26 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ * lily/parser.yy (relative_music): whoops. All \relative were off
+ by ... a lot .... Ahem.
+
* scm/define-music-types.scm (music-descriptions): idem.
* lily/beam-engraver.cc: move new-beam-event to beam-event
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header {
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header{
texidoc="
-
+#(ly:set-option 'old-relative)
\header {
texidoc = "Tied accidentaled notes (which cause reminder accidentals) don't wreak havoc in
the spacing when unbroken."
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header{
-#(ly:set-option 'old-relative)
\version "1.9.1"
\header{
\emptyText
\repeat volta 2 { \time 4/4 c4^"cuivr\\'e"_\fermata }
\alternative {
- { \property Voice.TextScript \set #'font-style = #'italic d-4_"cantabile" }
+ {
+ d-4_\markup { \italic "cantabile" } }
{ e } } \grace { c16 }
- \property Voice.TextScript \set #'font-style = #'large
- f4\ff^""^"Largo" \mark "B" g
+
+ f4\ff^""^\markup { \large "Largo" } \mark "B" g
}
\paper { raggedright = ##t
% \translator {\BarNumberingStaffContext} }
-
+#(ly:set-option 'old-relative)
\header {
texidoc = "Ambituses indicate pitch ranges for voices.
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header {
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header{
texidoc="
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header{
-
+#(ly:set-option 'old-relative)
\header
{
texidoc = "Automatic beaming is also done on tuplets."
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header {
-
+#(ly:set-option 'old-relative)
\header {
texidoc="Test automatic beamer: the last measure should have a single beam."
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header {
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header {
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header{ texidoc="Automatic kneeing. A knee is made when a horizontal
-
+#(ly:set-option 'old-relative)
\header {
texidoc = "Beams can be printed across line breaks if forced.
"
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header{
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header{
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header{
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header{
texidoc="
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header { texidoc = "@cindex Beam Damp
Beams are less steep than the notes they encompass. " }
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header{
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header{
texidoc="
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header {
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header {
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header {
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header {
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header{
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header {
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header {
texidoc = "Explicit beams may cross barlines. "
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header{
texidoc="
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header {
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header{
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header
{
-
+#(ly:set-option 'old-relative)
\header {
texidoc = "The number of beams doesn't change on a rest."
}
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header{
texidoc="
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header{
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header{
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header {
texidoc = "Automatic beaming works also in ternary time sigs."
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header{
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header {
texidoc = "Beams (simple)."
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header{
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header{
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header {
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header {
texidoc = "Clusters are a device to denote that a complete range of
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header{
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header {
texidoc = "Dots move to the right when a collision with the (up)flag happens."
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header{
texidoc = "Broken crescendi should be open on one side."
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header {texidoc = "Dynamic letters are kerned, and their weight
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header{
texidoc=" Dynamics appear below or above the staff. If multiple
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header {
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header {
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header{
texidoc = "
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header { texidoc = "The magnification can be set for any font. Note
that this doesn't change variable symbols such as beams or slurs. " }
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header{
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header
{
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header {
texidoc = "Bar line should come before the grace note."
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header {
-
+#(ly:set-option 'old-relative)
\header
{
texidoc = "Grace beams and normal beams may occur simultaneously.
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header{
% ?
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header {
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header {
texidoc = "Another nested grace situation."
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header {
texidoc = "Partcombiner and grace notes can go together."
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header {
texidoc = "Pieces may begin with grace notes."
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header{
texidoc = "Here startGraceMusic should set no-stem-extend to true;
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header{
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header {
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header {
texidoc = "Instrument names are also printed on partial starting measures."
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header { texidoc = "Tests placement of accidentals in every clef. " }
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header { texidoc = "Key signatures can be set per pitch
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header{
texidoc="
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header{
texidoc="
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header{
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header{
texidoc="Lyric phrasing
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header
{
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header {
-
+#(ly:set-option 'old-relative)
\header
{
-
+#(ly:set-option 'old-relative)
\header {
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header{
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header { texidoc=" You can write molecule callbacks in Scheme, thus
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header{
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header {
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header {
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header{
-
+#(ly:set-option 'old-relative)
\header
{
-
+#(ly:set-option 'old-relative)
\header
{
texidoc = "Ottava brackets are supported, through the
-
+#(ly:set-option 'old-relative)
\header { texidoc = "
Setting @code{\outputproperty} is a clumsy and deprecated way of changing
-
+#(ly:set-option 'old-relative)
\version "1.9.1"
\header {
texidoc="Multi measure rests of second voice should not disappear."
-#(ly:set-option 'old-relative)
\version "1.9.1"
\header { texidoc = "@cindex Bar line lyric only
You can move around @code{Bar_engraver} and
}
\score {
-\notes \relative c' \context ChoirStaff = groupie <
- \context Staff = SA { c1 c1 c1}
+\notes \relative c' \context ChoirStaff <
+ \newcontext Staff { c1 c1 c1}
\context Lyrics \lyrics <
{ bla1 die bla }
{ foo bar foo }
{ foo bar foo }
>
- \context Staff = SB { c1 c1 c1}
-
- >
+ \newcontext Staff { c1 c1 c1}
+ >
\paper {
" }
\score{
- \context Staff=one \notes\relative c''{
+ \notes\relative c''{
r4 r8[ g a]
bes8[ r16 f g a]
bes8[ r16 \property Voice.stemLeftBeamCount = #1 f g a]
\score {
\notes <
\context ChordNames { \scm }
- \context ChordNames = CA {
+ \newcontext ChordNames {
\property ChordNames.instrument = #"german"
\germanChords \scm }
- \context ChordNames = CB {
+ \newcontext ChordNames {
\property ChordNames.instrument =#"semi-german"
\semiGermanChords \scm }
\context Voice { \scm } >
\property ChordNames.instrument = #"Ignatzek (default)"
\property ChordNames.instr = #"Def"
\chs }
- \context ChordNames = ALT {
+ \newcontext ChordNames {
\property ChordNames.instrument = #"Alternative"
\property ChordNames.instr = #"Alt"
\jazzAltProperties
% making this file take up to 4 pages.
%{
- \context ChordNames = BANTER {
+ \newcontext ChordNames {
\banterProperties
\chs
}
R1
\property Voice.MultiMeasureRest \revert #'staff-position
}
- \context Voice = cue { s2
+ \newcontext Voice { s2
\clef tenor
%% this should probably be put into an identifier.
\score {
\notes {
- \context Staff = staff \addlyrics \notes \transpose c c' {
+ \newcontext Staff \addlyrics \notes \transpose c c' {
\property Score.timing = ##f
\property Score.barAlways = ##t
\property Voice.TextScript \set #'padding = #3
\caesura
g4( a) g e( f) e
}
- \context Lyrics = lyrics \lyrics {
+ \newcontext Lyrics \lyrics {
Blah blub, blah blam.
Blah blub, blah blam.
Blah blub, blah blam.
-#(ly:set-option 'old-relative)
+
\version "1.9.1"
\header {
texidoc="@cindex Force hshift
Force hshift to override collisions. " }
\score {
- \context Voice \notes\relative c {
-
- \context Staff <
- \context Voice = VA {
+ \notes\relative c'
+ \context Staff < {
\property Voice.NoteColumn \override #'force-hshift = #0.1
\stemUp
\property Voice.NoteColumn \override #'horizontal-shift = #1
- <<g' d'>>
- }
- \context Voice = VB {
+ <<d a'>>
+ } \\
+ {
\stemDown
\property Voice.NoteColumn \override #'horizontal-shift = #1
\property Voice.NoteColumn \override #'force-hshift = #-0.1
- <<bes f'>>
+ <<b f'>>
}
- >
- }
+ >
\paper {
raggedright = ##t
}
scm_gc_unprotect_object (p->self_scm ());
+ Pitch retpitch = p->to_relative_octave (pit);
if (lily_1_8_relative)
- $$->set_mus_property ("last-pitch", p->to_relative_octave (pit).smobbed_copy ());
-
+ $$->set_mus_property ("last-pitch", retpitch.smobbed_copy ());
}
;
(description . "Starts or stops a beam. Syntax for manual control:
c8-[ c c-] c8")
(internal-class-name . "Event")
- (types . (general-music event new-beam-event span-event))
+ (types . (general-music event beam-event span-event))
))
(BreakEvent
. (
. (
(description . "A tie. Entered as @var{note}-~.")
(internal-class-name . "Event")
- (types . (general-music new-tie-event event))
+ (types . (general-music tie-event event))
))
(TremoloEvent
. (
if 1:
def conv (str):
+ if re.search ("font-style",str):
+ sys.stderr.write ("font-style is deprecated. Please remove.")
+ raise FatalConversionError()
+
str = re.sub (r'-\\markup', r'@\\markup', str)
str = re.sub (r'-\\', r'\\', str)
str = re.sub (r'-\)', ')', str)
projects / lilypond.git / commitdiff