From 580608695d938d594ec26bef1667890a4fedcde2 Mon Sep 17 00:00:00 2001 From: hanwen Date: Tue, 9 Sep 2003 11:08:11 +0000 Subject: [PATCH] * stepmake/GNUmakefile.in: remove nested stepmake packaging stuff. * VERSION: remove --- ChangeLog | 29 ++ .../bibliography/computer-notation.bib | 10 +- Documentation/topdocs/INSTALL.texi | 10 +- Documentation/user/cheatsheet.itely | 14 +- Documentation/user/internals.itely | 26 +- Documentation/user/introduction.itely | 4 +- Documentation/user/lilypond-book.itely | 8 +- Documentation/user/music-glossary.tely | 168 ++++----- Documentation/user/refman.itely | 330 +++++++++--------- Documentation/user/tutorial.itely | 86 ++--- GNUmakefile.in | 2 +- VERSION | 11 - config.make.in | 6 + configure.in | 19 +- input/regression/chord-name-exceptions.ly | 4 +- input/test/chord-names-jazz.ly | 4 +- lily/axis-group-engraver.cc | 7 +- lily/chord-name-engraver.cc | 2 +- lily/glissando-engraver.cc | 10 +- lily/hairpin.cc | 3 + lily/hara-kiri-group-spanner.cc | 9 +- ly/engraver-init.ly | 3 +- make/stepmake.make | 1 - make/toplevel-version.make | 9 +- scm/chord-ignatzek-names.scm | 49 ++- scm/define-grob-properties.scm | 4 +- scm/define-grobs.scm | 3 +- scripts/abc2ly.py | 12 +- scripts/convert-ly.py | 7 + scripts/etf2ly.py | 4 +- scripts/midi2ly.py | 12 +- scripts/mup2ly.py | 10 +- scripts/musedata2ly.py | 6 +- scripts/pmx2ly.py | 10 +- stepmake/GNUmakefile | 34 ++ stepmake/GNUmakefile.in | 60 ---- stepmake/VERSION | 9 - stepmake/aclocal.m4 | 1 - stepmake/bin/GNUmakefile | 2 +- stepmake/bin/make-version.py | 6 +- stepmake/config.make.in | 74 ---- stepmake/make/GNUmakefile | 14 - stepmake/make/generic-rules.make | 11 - stepmake/make/generic-targets.make | 19 - stepmake/make/generic-vars.make | 19 - stepmake/make/srcdir.make.in | 43 --- stepmake/make/stepmake.lsm.in | 15 - stepmake/make/stepmake.make | 90 ----- stepmake/make/stepmake.spec.in | 26 -- stepmake/make/substitute.make | 18 - stepmake/make/toplevel-version.make | 7 - stepmake/make/user.make | 15 - stepmake/stepmake/GNUmakefile | 2 +- stepmake/stepmake/generic-targets.make | 13 +- stepmake/stepmake/makedir-targets.make | 2 - stepmake/stepmake/pod-rules.make | 2 +- stepmake/stepmake/script-rules.make | 12 +- 57 files changed, 538 insertions(+), 848 deletions(-) delete mode 100644 VERSION create mode 100644 stepmake/GNUmakefile delete mode 100644 stepmake/GNUmakefile.in delete mode 100644 stepmake/VERSION delete mode 100644 stepmake/config.make.in delete mode 100644 stepmake/make/GNUmakefile delete mode 100644 stepmake/make/generic-rules.make delete mode 100644 stepmake/make/generic-targets.make delete mode 100644 stepmake/make/generic-vars.make delete mode 100644 stepmake/make/srcdir.make.in delete mode 100644 stepmake/make/stepmake.lsm.in delete mode 100644 stepmake/make/stepmake.make delete mode 100644 stepmake/make/stepmake.spec.in delete mode 100644 stepmake/make/substitute.make delete mode 100644 stepmake/make/toplevel-version.make delete mode 100644 stepmake/make/user.make diff --git a/ChangeLog b/ChangeLog index f9b5f0ae2c..6768cec2fc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,32 @@ +2003-09-09 Han-Wen Nienhuys + + * stepmake/GNUmakefile.in: remove nested stepmake packaging stuff. + + * VERSION: remove + + * scripts/*2ly.py: update <> syntax + +2003-09-09 Han-Wen Nienhuys + + * lily/chord-name-engraver.cc (process_music): add origin for + chord name. + + * input/regression/chord-name-exceptions.ly (theMusic): add base too. + + * scm/chord-ignatzek-names.scm (ignatzek-chord-names): bugfix: do + bass notes for exceptions too. + + * scm/define-grobs.scm (all-grob-descriptions): rename + HaraKiriVerticalGroup to RemoveEmptyVerticalGroup + + * scm/define-grob-properties.scm (remove-first): add remove-first + property for orchestral scores. + + * Documentation/user/*.itely: switch <<>> and <> + + * lily/glissando-engraver.cc (process_music): bugfix: move line to + last_line only once. This fixes the two consecutive glissandi problem. + 2003-09-09 Juergen Reuter * lily/vaticana-ligature-engraver.cc: bugfix: fixed programming diff --git a/Documentation/bibliography/computer-notation.bib b/Documentation/bibliography/computer-notation.bib index 23d915aecc..ec4b3fdc93 100644 --- a/Documentation/bibliography/computer-notation.bib +++ b/Documentation/bibliography/computer-notation.bib @@ -96,8 +96,7 @@ for music composition} author = {Donald Byrd}, school = {Indiana University}, -note = {Describes the SMUT (sic) system for automated music printout.} - + note = {Describes the SMUT (sic) system for automated music printout.} } @InProceedings{assayaag86, @@ -683,12 +682,11 @@ users in mind) (sic) HWN}, } @Article {smdl-web, - author={unknown}, title = {SMDL, Standard Musical Description Language}, pdf= {ftp://ftp.ornl.gov/pub/sgml/wg8/smdl/10743.pdf}, - note={ISO/IEC DIS 10743 - -SGML instance for describing music. Very comprehensive in music + number={ISO/IEC DIS 10743}, + year = {1992} + annote = {SGML instance for describing music. Very comprehensive in music definition, but no support for notation / performance whatsoever (They basically say: "You can embed a NIFF or MIDI file")} diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi index 11eddc48ad..6fa01b93b9 100644 --- a/Documentation/topdocs/INSTALL.texi +++ b/Documentation/topdocs/INSTALL.texi @@ -174,6 +174,14 @@ newer), work. @end itemize +The HTML files can be installed into the standard documentation path +by issuing + +@example + make out=www web-install +@end example + + @section Building LilyPond To install GNU LilyPond, type @@ -210,8 +218,6 @@ If you are installing LilyPond somewhere else, unpack the appropriate files as shown, and move them to the appropriate paths. Of course, the .deb version number should correspond to what you are installing. - - If you are doing an upgrade, you should remove all @file{feta} @code{.pk} and @code{.tfm} files. A script has been provided to do the work for you, see @file{buildscripts/clean-fonts.sh}. diff --git a/Documentation/user/cheatsheet.itely b/Documentation/user/cheatsheet.itely index bf879584be..1aa9b63fc5 100644 --- a/Documentation/user/cheatsheet.itely +++ b/Documentation/user/cheatsheet.itely @@ -149,12 +149,12 @@ a8-[ b-] @end lilypond -@item @code{< \new Staff ... >} +@item @code{<< \new Staff ... >>} @tab more staves @tab @lilypond[fragment] -< \new Staff { c'1 } - \new Staff { c'1 } > +<< \new Staff { c'1 } + \new Staff { c'1 } >> @end lilypond @@ -201,11 +201,11 @@ a\> a a\! @end lilypond -@item @code{<< >>} +@item @code{< >} @tab chord @tab @lilypond[fragment, relative 1] -<> + @end lilypond @@ -263,11 +263,11 @@ a\> a a\! \context ChordNames \chords { c:dim f:maj7 } @end lilypond -@item @code{< @dots{} \\ @dots{} >} +@item @code{<< @dots{} \\ @dots{} >>} @tab polyphony @tab @lilypond[fragment,relative 1] -\context Staff < c \\ g' > +\context Staff << c \\ g' >> @end lilypond diff --git a/Documentation/user/internals.itely b/Documentation/user/internals.itely index f9e647e62f..f777bfe315 100644 --- a/Documentation/user/internals.itely +++ b/Documentation/user/internals.itely @@ -90,7 +90,7 @@ If no such context exists, it will be created: @lilypond[verbatim,singleline] \score { \notes \relative c'' { - c4 f + c4 <> f } } @end lilypond @@ -626,8 +626,8 @@ manipulated using Scheme functions. Notes, rests, lyric syllables are music expressions. Small music expressions may be combined to form larger ones, for example, by -enclosing a list of expressions in @code{\sequential @{ @}} or @code{< ->}. In the following example, a compound expression is formed out of +enclosing a list of expressions in @code{\sequential @{ @}} or @code{<< +>>}. In the following example, a compound expression is formed out of the quarter note @code{c} and a quarter note @code{d}: @example @@ -637,8 +637,8 @@ the quarter note @code{c} and a quarter note @code{d}: @cindex Sequential music @cindex @code{\sequential} @cindex sequential music -@cindex @code{<} -@cindex @code{>} +@cindex @code{<<} +@cindex @code{>>} @cindex Simultaneous music @cindex @code{\simultaneous} @@ -660,7 +660,7 @@ For both, there is a shorthand: for sequential and @example -@code{<} @var{musicexprlist} @code{>} +@code{<<} @var{musicexprlist} @code{>>} @end example @noindent @@ -671,13 +671,13 @@ are expressed in two different ways: @lilypond[fragment,verbatim,center,quote] \notes \context Voice { - - < { a b c' } { c' d' e' } > + <> <> <> + << { a b c' } { c' d' e' } >> } @end lilypond -However, using @code{<} and @code{>} for entering chords leads to +However, using @code{<<} and @code{>>} for entering chords leads to various peculiarities. For this reason, a special syntax -for chords was introduced in version 1.7: @code{<< >>}. +for chords was introduced in version 1.7: @code{< >}. @@ -813,15 +813,15 @@ A slightly more elaborate example is in Some of the input syntax is also implemented as recursive music functions. For example, the syntax for polyphony @example - < a \\ b> + << a \\ b>> @end example @noindent is actually implemented as a recursive function that replaces the above by the internal equivalent of @example - < \context Voice = "1" @{ \voiceOne a @} - \context Voice = "2" @{ \voiceTwo b @} > + << \context Voice = "1" @{ \voiceOne a @} + \context Voice = "2" @{ \voiceTwo b @} >> @end example Other applications of @code{\apply} are writing out repeats diff --git a/Documentation/user/introduction.itely b/Documentation/user/introduction.itely index 302074d56d..a26ad1e63b 100644 --- a/Documentation/user/introduction.itely +++ b/Documentation/user/introduction.itely @@ -399,10 +399,10 @@ simplest application is printing notes: By adding chord names and lyrics we obtain a lead sheet: @lilypond[raggedright] -\score { < +\score { << \context ChordNames \chords { c2 c f2 c } \notes \relative c' { \time 2/4 c4 c g'4 g a4 a g2 } - \context Lyrics \lyrics { twin4 kle twin kle lit tle star2 } > } + \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/lilypond-book.itely b/Documentation/user/lilypond-book.itely index 8df747b1f3..eaa88d7585 100644 --- a/Documentation/user/lilypond-book.itely +++ b/Documentation/user/lilypond-book.itely @@ -85,13 +85,13 @@ produces Then the short version: @example -@@lilypond[11pt]@{<>@} +@@lilypond[11pt]@{@} @end example @noindent produces -@lilypond[11pt]{ <> } +@lilypond[11pt]{ } @command{lilypond-book} knows the default margins and a few paper sizes. One of these commands should be in the beginning of the document: @@ -153,13 +153,13 @@ produces Then the short version: @example -\lilypond[11pt]@{<>@} +\lilypond[11pt]@{@} @end example @noindent produces -@lilypond[11pt]{<>} +@lilypond[11pt]{} The linewidth of the music will be adjust by examining the commands in the document preamble, the part of the document before diff --git a/Documentation/user/music-glossary.tely b/Documentation/user/music-glossary.tely index 19158b3b13..cd7afdc323 100644 --- a/Documentation/user/music-glossary.tely +++ b/Documentation/user/music-glossary.tely @@ -331,7 +331,7 @@ the duration of the long a. is proportional to that of the main note. \time 4/4 %\property Score.TextScript \set #'font-style = #'large -<>4_"notation" r +4_"notation" r { \property Voice.Stem \override #'flag-style = #'() \grace g16 \property Voice.Stem \revert #'flag-style @@ -344,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 @@ -356,11 +356,11 @@ An appoggiatura may have more notes preceding the main note. \time 2/4 % \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. } > + << \context Voice = va { \stemUp\tieUp as32 bes c8. as32 bes c8. } + \context Voice = vb { \stemDown\tieDown as16 ~ as8. as16 ~ as8. } >> \bar "||" } @end lilypond @@ -377,7 +377,7 @@ FI: arpeggio, murtosointu, N: ?. @lilypond -\notes \context PianoStaff < +\notes \context PianoStaff << \context Staff = SA \relative c'' { \time 4/4 \clef treble @@ -385,15 +385,15 @@ N: ?. r8 a,16 d f a, d f r8 a,16 d f a, d f \bar "||" } \context Staff = SB \relative c' { \clef bass - < \context Voice = va { + << \context Voice = va { \stemUp r16 e8. ( e4) r16 e8. ( e4) | r16 d8. ( d4) r16 d8. ( d4) } \context Voice = vb { \stemDown - c2 c | c c } > + c2 c | c c } >> } -> +>> @end lilypond @aitem{ascending interval} @@ -590,16 +590,16 @@ for connecting piano staves, angular brackets for connecting parts in an orchestral or choral score. @lilypond -\notes\context GrandStaff < +\notes\context GrandStaff << \relative c''\context Staff = SA { \clef treble g4 e c2 } - \relative c \context Staff = SB { \clef bass c1 \bar "|." } > + \relative c \context Staff = SB { \clef bass c1 \bar "|." } >> @end lilypond @lilypond -\context StaffGroup < +\context StaffGroup << % \property StaffGroup.minVerticalAlign = #12 \notes\relative c'' \context Staff = SA { \clef treble g4 e c2 } - \notes\relative c \context Staff = SB { \clef bass c1 \bar "|." } > + \notes\relative c \context Staff = SB { \clef bass c1 \bar "|." } >> @end lilypond @aitem{brass} @@ -777,12 +777,12 @@ chords are denoted open chords %\property Voice.TextScript \set #'font-style = #'large \addlyrics \context Staff \notes\relative c'' { - <>1 s s - <> s s - <> s s - <> s s - <> s s - <> s s + 1 s s + s s + s s + s s + s s + s s } \context Lyrics \lyrics{ \property Lyrics . LyricText \override #'alignment = #-1 @@ -957,12 +957,12 @@ composition methods. @lilypond[11pt,noquote] \property Score.TimeSignature \override #'style = #'() -\notes\context PianoStaff < +\notes\context PianoStaff << \context Staff = SA \relative c' { \key bes \major \time 4/4 \clef treble - < \context Voice = rha { + << \context Voice = rha { \stemUp r1 | r2 r8 g'8 bes d, | cis4 d r8 e!16 f g8 f16 e | @@ -972,12 +972,12 @@ composition methods. \stemDown r1 | r | r | r2 s8 } - > + >> } \context Staff = SB \relative c' { \clef bass \key bes \major - < \context Voice = lha { + << \context Voice = lha { \stemUp r8 d es g, fis4 g | r8 a16 bes c8 bes16 a bes4 g | r8 a16 g f8 g16 a bes8 g e! cis' | @@ -986,9 +986,9 @@ composition methods. \context Voice = lhb { \stemDown r1 | r | r | r2 s8 - } > + } >> } -> +>> @end lilypond @aitem{counter tenor} @@ -1067,7 +1067,7 @@ of the 20th century \property Staff.Custos \set #'style = #'hufnagel c'1 - \break << d' a' f''>>1 + \break < d' a' f''>1 } \paper { \translator { @@ -1665,7 +1665,7 @@ but equal pitch. %\property Score.TextScript \set #'font-style = #'large \addlyrics \context Staff \notes\relative c'' { - gis1 s s as s s <> s s <> s s + gis1 s s as s s s s s s } \context Lyrics \lyrics { \property Lyrics . LyricText \override #'alignment = #-1 @@ -1914,8 +1914,8 @@ variants of the base chords. %\property Score.TextScript \set #'font-style = #'large \addlyrics \context Voice \notes\relative c'' { - <>1 << a f d >> << b g e >> - <> << d b g >> << e c a >> << f d b >> } + 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$" } @end lilypond @@ -2068,13 +2068,13 @@ Sequence of chords that terminate a musical phrase or section. @aref{functional harmony}. @lilypond -\notes\context PianoStaff < +\notes\context PianoStaff << \context Staff = SA \relative c'' { \time 4/4 \clef treble \context Voice - \partial 4 << c g e >>4 | - << c a f >> << b g d >> << c g e >>2 + \partial 4 < c g e >4 | + < c a f > < b g d > < c g e >2 } % %\property Score.LyricText \set #'font-style = #'large \addlyrics @@ -2086,7 +2086,7 @@ section. @aref{functional harmony}. \context Lyrics \lyrics { T S D T } -> +>> @end lilypond @aitem{harmony} @@ -2109,13 +2109,13 @@ Consonances: \property Score.automaticBars = ##f %\property Score.TextScript \set #'font-style = #'large \context Voice \notes\relative c'' { - <>1_"unisone " s - <>_"third " s - <>_"fourth " s - <>_"fifth " s - <>_"sixth " s - <>_"octave " s - <>_"decime" s s + 1_"unisone " s + _"third " s + _"fourth " s + _"fifth " s + _"sixth " s + _"octave " s + _"decime" s s } @end lilypond @@ -2125,9 +2125,9 @@ Dissonances: \property Score.automaticBars = ##f %\property Score.TextScript \set #'font-style = #'large \context Voice \notes\relative c'' { - <>1_"second " s s - <>_"seventh " s s - <>_"ninth" s s + 1_"second " s s + _"seventh " s s + _"ninth" s s } @end lilypond @@ -2170,14 +2170,14 @@ of such two forms an octave. %\property Score.TextScript \set #'font-style = #'large \addlyrics \context Voice \notes\relative c'' { - << g g >>1 s - << g as >>^"minor" s - << g a! >> s - << g ais >>^"augm" s - << gis bes >>^"dimin" s - << g! bes >>^"minor" s - << g b! >>^"major" s - << g bis >>^"augm" s + < g g >1 s + < g as >^"minor" s + < g a! > s + < g ais >^"augm" s + < gis bes >^"dimin" s + < g! bes >^"minor" s + < g b! >^"major" s + < g bis >^"augm" s } \context Lyrics \lyrics { "unisone " "second " "second " "second " @@ -2191,14 +2191,14 @@ of such two forms an octave. %\property Score.TextScript \set #'font-style = #'large \addlyrics \context Staff \notes\relative c'' { - << g c >>^"perfect" s - << g cis >>^"augm" s - << g d' >>^"perfect" s - << g des' >> ^"dim" s - << gis es' >>^"dimin" s - << g! es' >>^"minor" s - << g e'! >>^"major" s - << g eis' >>^"augm" s + < g c >^"perfect" s + < g cis >^"augm" s + < g d' >^"perfect" s + < g des' > ^"dim" s + < gis es' >^"dimin" s + < g! es' >^"minor" s + < g e'! >^"major" s + < g eis' >^"augm" s } \context Lyrics \lyrics { "fourth " "fourth " "fifth " "fifth " @@ -2212,14 +2212,14 @@ of such two forms an octave. %\property Score.TextScript \set #'font-style = #'large \addlyrics \context Staff \notes\relative c'' { - << gis f'! >>1^"dimin" s - << g! f'! >>^"minor" s - << g fis' >>^"major" s - << g g' >> s - << g as' >>^"minor" s - << g a'! >>^"major" s - << g bes' >>^"minor" s - << g b'! >>^"major" s + < gis f'! >1^"dimin" s + < g! f'! >^"minor" s + < g fis' >^"major" s + < g g' > s + < g as' >^"minor" s + < g a'! >^"major" s + < g bes' >^"minor" s + < g b'! >^"major" s } \context Lyrics \lyrics { "seventh " "seventh " "seventh " "octave " @@ -2244,9 +2244,9 @@ The difference between an interval and an octave. \property Score.automaticBars = ##f %\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 "||" - << g, c >>_"fourth " s s << g' c, >>_"fifth " s s \bar "||" + < 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 "||" } @end lilypond @@ -2943,7 +2943,7 @@ note first while in the music from the preceding baroque and classic periods the upper note is played first. @lilypond -< +<< \context Staff = sa { % \property Score.TextScript \set #'font-style = #'large \notes\relative c'' { @@ -2955,14 +2955,14 @@ the upper note is played first. c2. c32 b c b c b c b | c1 c2. b32 c b c \times 4/5 { b c b c b } | c1 } -> +>> @end lilypond Other frequently used ornaments are the @emph{turn}, the @emph{mordent} and the @emph{prall} (inverted mordent). @lilypond -< +<< \context Staff = sa { % \property Score.TextScript \set #'font-style = #'large \notes\relative c'' { @@ -2976,7 +2976,7 @@ Other frequently used ornaments are the @emph{turn}, the @emph{mordent} and the g4 a b16-[ a b8] a4 e'4 e32[ d e d ~ d8] c2 } -> +>> @end lilypond @aref{appoggiatura}. @@ -3372,8 +3372,8 @@ sub@-do@-mi@-nant (S) and V = dominant (D). c1 d e f g a b c } \context Lyrics \lyrics { - < { I II III IV V VI VII I } - { T "" "" S D } > + << { I II III IV V VI VII I } + { T "" "" S D } >> } @end lilypond @@ -3965,18 +3965,18 @@ with figures designating the chief @aref{interval}s and @aref{chord}s to be played above the bass notes. @lilypond -\context GrandStaff < +\context GrandStaff << \context Staff = lh \notes\relative c'' { \time 4/4 \key es \major \clef treble - < \context Voice = rha { + << \context Voice = rha { \stemUp es4 d c bes | bes } \context Voice = rhb { \stemDown - << bes g >>8 as << as f >> g << g es >> f << d f >> es | << g es >>4 } - > + < bes g >8 as < as f > g < g es > f < d f > es | < g es >4 } + >> } \addlyrics \context Staff = rh \notes\relative c' { @@ -3987,10 +3987,10 @@ with figures designating the chief @aref{interval}s and \context Lyrics \lyrics { % \property Lyrics . LyricText \set #'font-style = #'Large \property Lyrics . VerticalAlign \override #'threshold = #'(6 . 12) - < { "" "6" "" "4" "" "6" "" "" "6" "4" } - { "" "" "" "2" "" "" "" "" "" "2" } > + << { "" "6" "" "4" "" "6" "" "" "6" "4" } + { "" "" "" "2" "" "" "" "" "" "2" } >> } -> +>> @end lilypond @aitemii{tie,bind} diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely index 3fd4e134f2..32f4edf3b9 100644 --- a/Documentation/user/refman.itely +++ b/Documentation/user/refman.itely @@ -191,8 +191,8 @@ ways. For more information, refer to @ref{Accidentals}. @node Chords @subsection Chords -A chord is formed by a enclosing a set of pitches in @code{<<} and -@code{>>}. A chord may be followed by a duration, and a set of +A chord is formed by a enclosing a set of pitches in @code{<} and +@code{>}. A chord may be followed by a duration, and a set of articulations, just like simple notes. @@ -247,10 +247,10 @@ other situations, you should use the @code{\skip} command: @lilypond[singleline,verbatim] \score { - \context Staff < + \context Staff << { \time 4/8 \skip 2 \time 4/4 } \notes\relative c'' { a2 a1 } - > + >> } @end lilypond @@ -391,7 +391,7 @@ slurs, which indicate articulation, or phrasing slurs, which indicate musical phrasing. A tie is entered using the tilde symbol `@code{~}': @lilypond[fragment,verbatim,center] - e' ~ e' <> ~ <> + e' ~ e' ~ @end lilypond When a tie is applied to a chord, all note heads whose pitches match @@ -615,9 +615,9 @@ to determine the first note of the next chord: @lilypond[fragment,verbatim,center] \relative c' { - c <> - <> - <> + c + + } @end lilypond @cindex @code{\notes} @@ -1121,12 +1121,12 @@ automatically applied to all staves. The resulting bar lines are connected between different staves of a @internalsref{StaffGroup}: @c @lilypond[fragment, verbatim] -< \context StaffGroup < +<< \context StaffGroup << \new Staff { e'4 d' \bar "||" f' e' } - \new Staff { \clef bass c4 g e g } > -\new Staff { \clef bass c2 c2 } > + \new Staff { \clef bass c4 g e g } >> +\new Staff { \clef bass c2 c2 } >> @end lilypond @@ -1178,7 +1178,7 @@ small, short-lived voices or for single chords: @lilypond[verbatim,fragment] \context Staff \relative c'' { - c4 < { f d e } \\ { b c2 } > c4 < g' \\ b, \\ f' \\ d > + c4 << { f d e } \\ { b c2 } >> c4 << g' \\ b, \\ f' \\ d >> } @end lilypond @@ -1195,39 +1195,39 @@ a stem directions and horizontal shift for each part: @lilypond[singleline, verbatim] \relative c'' -\context Staff < \new Voice { \voiceOne cis2 b } +\context Staff << \new Voice { \voiceOne cis2 b } \new Voice { \voiceThree b4 ais ~ ais4 gis4 } - \new Voice { \voiceTwo fis4~ fis4 f ~ f } > + \new Voice { \voiceTwo fis4~ fis4 f ~ f } >> @end lilypond Normally, note heads with a different number of dots are not merged, but when the object property @code{merge-differently-dotted} is set in the @internalsref{NoteCollision} object, they are merged: @lilypond[verbatim,fragment,singleline] -\relative c'' \context Voice < { +\relative c'' \context Voice << { g8 g8 \property Staff.NoteCollision \override #'merge-differently-dotted = ##t g8 g8 } \\ { g8.[ f16] g8.[ f16] } - > + >> @end lilypond Similarly, you can merge half note heads with eighth notes, by setting @code{merge-differently-headed}: @lilypond[fragment, relative=2,verbatim] -\context Voice < { +\context Voice << { c8 c4. \property Staff.NoteCollision \override #'merge-differently-headed = ##t - c8 c4. } \\ { c2 c2 } > + c8 c4. } \\ { c2 c2 } >> @end lilypond LilyPond also vertically shifts rests that are opposite of a stem: @lilypond[singleline,fragment,verbatim] -\context Voice < c''4 \\ r4 > +\context Voice << c''4 \\ r4 >> @end lilypond @@ -1535,28 +1535,28 @@ staff then issue @code{\pianoAccidentals} first thing after the creation of the piano staff: @example \score @{ - \notes \relative c'' < + \notes \relative c'' << \new Staff @{ cis4 d e2 @} - \context GrandStaff < + \context GrandStaff << \pianoAccidentals \new Staff @{ cis4 d e2 @} \new Staff @{ es2 c @} - > + >> \new Staff @{ es2 c @} - > + >> @} @end example @lilypond[singleline] \score { - \notes \relative c'' < + \notes \relative c'' << \new Staff { cis4 d e2 } - \context GrandStaff < + \context GrandStaff << \pianoAccidentals \new Staff { cis4 d e2 } \new Staff { es2 c } - > + >> \new Staff { es2 c } - > + >> \paper { \translator { \StaffContext @@ -1587,12 +1587,12 @@ rule is similar to @code{\defaultAccidentals}. because accidentals from one voice do not get cancelled in other voices: @lilypond[singleline,relative,fragment,verbatim,quote] - \context Staff < + \context Staff << \voiceAccidentals - < + << { es g } \\ { c, e } - > > + >> >> @end lilypond Hence you should only use @code{\voiceAccidentals} if the voices are to be read solely by individual musicians. If the staff is to be @@ -1748,8 +1748,8 @@ input file: @lilypond[singleline,fragment,verbatim] \property Staff.autoAccidentals = #'( Staff (any-octave . 0) ) -cis'4 <> r2 | cis'4 <> r2 -| <> r | <> r | +cis'4 r2 | cis'4 r2 +| r | r | @end lilypond This problem can be solved by manually inserting @code{!} and @code{?} @@ -1778,7 +1778,7 @@ A slur indicates that notes are to be played bound or @emph{legato}. They are entered using parentheses: @lilypond[fragment,verbatim,center] f'( g')( a') a'8[ b'(] a'4 g'2 f'4) - <>2( <>2) + 2( 2) @end lilypond @@ -2104,14 +2104,14 @@ You can use the thumb-script to indicate that a note should be played with your thumb (used in cello music): @lilypond[verbatim, singleline, fragment] - <>8(_\thumb[ <>)_\thumb - <>(_\thumb <>)_\thumb] + 8(_\thumb[ )_\thumb + (_\thumb )_\thumb] @end lilypond Fingerings for chords can also be added to individual notes of the chord by adding them after the pitches: @lilypond[verbatim,singleline,fragment,relative=1] - << c-1 e-2 g-3 b-5 >> 4 + < c-1 e-2 g-3 b-5 > 4 @end lilypond Setting @code{fingeringOrientations} will put fingerings next @@ -2119,9 +2119,9 @@ to note heads: @lilypond[verbatim,singleline,fragment,relative=1] \property Voice.fingeringOrientations = #'(left down) - <> 4 + 4 \property Voice.fingeringOrientations = #'(up right down) - <> 4 + 4 @end lilypond @seealso @@ -2205,7 +2205,7 @@ denotes the logical time, one denotes the grace timing. The above example is shown here with timing tuples: @lilypond[singleline] -< +<< \relative c''{ c4 \grace c16 c4 \grace { c16[ d16] } c4 @@ -2220,7 +2220,7 @@ example is shown here with timing tuples: \markup { (\fraction 2 4 , \fraction "-1" 16 ) } 16 } \markup { ( \fraction 2 4 , 0 ) } - } > + } >> @end lilypond @@ -2229,8 +2229,8 @@ In the following example, there are two sixteenth graces notes for every eighth grace note: @lilypond[relative=2,verbatim,fragment] -< \new Staff { e4 \grace { c16[ d e f] } e4 } - \new Staff { c'4 \grace { g8[ b] } c4 } > +<< \new Staff { e4 \grace { c16[ d e f] } e4 } + \new Staff { c'4 \grace { g8[ b] } c4 } >> @end lilypond @@ -2239,8 +2239,8 @@ If you want to end a note with a grace note, then the standard trick is to put the grace notes before a phantom ``space note'', e.g. @lilypond[fragment,verbatim, relative=2] \context Voice { - < { d1^\trill ( } - { s2 \grace { c16[ d] } } > + << { d1^\trill ( } + { s2 \grace { c16[ d] } } >> c4) } @end lilypond @@ -2304,8 +2304,8 @@ such as key signatures, barlines, etc. are also synchronized. Take care when you mix staves with grace notes and staves without, for example, @lilypond[relative=2,verbatim,fragment] -< \new Staff { e4 \bar "|:" \grace c16 d4 } - \new Staff { c4 \bar "|:" d4 } > +<< \new Staff { e4 \bar "|:" \grace c16 d4 } + \new Staff { c4 \bar "|:" d4 } >> @end lilypond Grace sections should only be used within sequential music @@ -2396,7 +2396,7 @@ use spacer notes if multiple marks during one note are needed: @lilypond[fragment,verbatim,center,quote] c''\< c''\! d''\decr e''\rced - < f''1 { s4 s4\< s4\! \> s4\! } > + << f''1 { s4 s4\< s4\! \> s4\! } >> @end lilypond This may give rise to very short hairpins. Use @code{minimum-length} in @internalsref{Voice}.@internalsref{Hairpin} to lengthen them, for @@ -2747,11 +2747,11 @@ adding a script: up = \notes { crashcymbal4 hihat8 halfopenhihat hh hh hh openhihat } down = \notes { bassdrum4 snare8 bd r bd sn4 } \score { - \apply #(drums->paper 'drums) \context Staff < + \apply #(drums->paper 'drums) \context Staff << \clef percussion \new Voice { \voiceOne \up } \new Voice { \voiceTwo \down } - > + >> } @end lilypond @@ -2768,13 +2768,13 @@ nam = \lyrics { cymc cyms cymr hh hhc hho hhho hhp cb hc mus = \notes { cymc cyms cymr hh hhc hho hhho hhp cb hc bd sn ss tomh tommh tomml toml tomfh tomfl s16 } \score { - < - \apply #(drums->paper 'drums) \context Staff < + << + \apply #(drums->paper 'drums) \context Staff << \clef percussion \mus - > + >> \context Lyrics \nam - > + >> \paper { linewidth = 100.0\mm \translator { @@ -2806,13 +2806,13 @@ to typeset timbales on a two line staff: nam = \lyrics { timh ssh timl ssl cb } mus = \notes { timh ssh timl ssl cb s16 } \score { - < - \apply #(drums->paper 'timbales) \context Staff < + << + \apply #(drums->paper 'timbales) \context Staff << \clef percussion \mus - > + >> \context Lyrics \nam - > + >> \paper { \translator { \StaffContext @@ -2838,13 +2838,13 @@ to typeset congas on a two line staff: nam = \lyrics { cgh cgho cghm ssh cgl cglo cglm ssl } mus = \notes { cgh cgho cghm ssh cgl cglo cglm ssl s16 } \score { - < - \apply #(drums->paper 'congas) \context Staff < + << + \apply #(drums->paper 'congas) \context Staff << \clef percussion \mus - > + >> \context Lyrics \nam - > + >> \paper { \translator { \StaffContext @@ -2869,13 +2869,13 @@ to typeset bongos on a two line staff: nam = \lyrics { boh boho bohm ssh bol bolo bolm ssl } mus = \notes { boh boho bohm ssh bol bolo bolm ssl s16 } \score { - < - \apply #(drums->paper 'bongos) \context Staff < + << + \apply #(drums->paper 'bongos) \context Staff << \clef percussion \mus - > + >> \context Lyrics \nam - > + >> \paper { \translator { \StaffContext @@ -2899,13 +2899,13 @@ to typeset all kinds of simple percussion on one line staves: nam = \lyrics { tri trio trim gui guis guil cb cl tamb cab mar hc } mus = \notes { tri trio trim gui guis guil cb cl tamb cab mar hc s16 } \score { - < - \apply #(drums->paper 'percussion) \context Staff < + << + \apply #(drums->paper 'percussion) \context Staff << \clef percussion \mus - > + >> \context Lyrics \nam - > + >> \paper { \translator { \StaffContext @@ -2938,11 +2938,11 @@ list at the top of your file: up = \notes { hh8 hh hh hh hhp4 hhp } down = \notes { bd4 sn bd toml8 toml } \score { - \apply #(drums->paper 'mydrums) \context Staff < + \apply #(drums->paper 'mydrums) \context Staff << \clef percussion \new Voice { \voiceOne \up } \new Voice { \voiceTwo \down } - > + >> } @end lilypond @@ -2968,14 +2968,14 @@ down = \notes { bassdrum4 snare8 bd r bd sn4 } \include "nederlands.ly" bass = \notes \transpose c c,, { a4. e8 r e g e } \score { - < - \apply #(drums->paper 'drums) \new Staff < + << + \apply #(drums->paper 'drums) \new Staff << \clef percussion \new Voice { \voiceOne \up } \new Voice { \voiceTwo \down } - > + >> \new Staff { \clef "F_8" \bass } - > + >> } @end lilypond @@ -2991,18 +2991,18 @@ none of the scheme functions to get the correct MIDI output: @example \score @{ - \apply #(drums->paper 'mydrums) \context Staff < + \apply #(drums->paper 'mydrums) \context Staff << \clef percussion @{ \up @} \\ @{ \down @} - > + >> \paper@{@} @} \score @{ - \context Staff < + \context Staff << \property Staff.instrument = #'drums \up \down - > + >> \midi@{@} @} @end example @@ -3068,14 +3068,14 @@ point), and it looks ahead skipping over rests to switch in advance. Here is a practical example: @lilypond[verbatim,singleline,quote] -\score { \notes \context PianoStaff < +\score { \notes \context PianoStaff << \context Staff = "up" { - \autochange Staff \context Voice = VA < \relative c' { - g4 a b c d r4 a g } > } + \autochange Staff \context Voice = VA << \relative c' { + g4 a b c d r4 a g } >> } \context Staff = "down" { \clef bass s1*2 -} > } +} >> } @end lilypond @noindent @@ -3188,7 +3188,7 @@ You can specify an arpeggio sign on a chord by attaching an @lilypond[fragment,relative,verbatim] - <>\arpeggio + \arpeggio @end lilypond When an arpeggio crosses staves, you attach an arpeggio to the chords @@ -3196,11 +3196,11 @@ in both staves, and set @internalsref{PianoStaff}.@code{connectArpeggios}: @lilypond[fragment,relative,verbatim] - \context PianoStaff < + \context PianoStaff << \property PianoStaff.connectArpeggios = ##t - \new Staff { <>\arpeggio } - \new Staff { \clef bass <>\arpeggio } - > + \new Staff { \arpeggio } + \new Staff { \clef bass \arpeggio } + >> @end lilypond The direction of the arpeggio is sometimes denoted by adding an @@ -3210,9 +3210,9 @@ arrowhead to the wiggly line. This can be typeset by setting @lilypond[fragment,relative,verbatim] \context Voice { \property Voice.Arpeggio \set #'arpeggio-direction = #1 - <>\arpeggio + \arpeggio \property Voice.Arpeggio \set #'arpeggio-direction = #-1 - <>\arpeggio + \arpeggio } @end lilypond @@ -3225,7 +3225,7 @@ arpeggiate the chord. To draw these brackets, set the @lilypond[fragment,relative,verbatim] \property PianoStaff.Arpeggio \override #'molecule-callback = \arpeggioBracket - <>\arpeggio + \arpeggio @end lilypond @refcommands @@ -3261,7 +3261,7 @@ can be printed automatically. This is enabled if the property @code{PianoStaff.followVoice} is set to true: @lilypond[fragment,relative,verbatim] - \context PianoStaff < + \context PianoStaff << \property PianoStaff.followVoice = ##t \context Staff \context Voice { c1 @@ -3269,7 +3269,7 @@ can be printed automatically. This is enabled if the property b2 a } \context Staff=two { \clef bass \skip 1*2 } - > + >> @end lilypond The associated object is @internalsref{VoiceFollower}. @@ -3405,12 +3405,12 @@ Normally, this will put the lyrics below the staff. 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 \notes << \new Lyrics @{ s1 @} \new Staff @{ s1 @} \new Lyrics @{ s1 @} \new Staff @{ s1 @} -> +>> @end example and then combine the appropriate melodies and lyric lines: @example @@ -3421,11 +3421,11 @@ and then combine the appropriate melodies and lyric lines: putting both together, you would get @example -\context ChoirStaff \notes < +\context ChoirStaff \notes << \new Lyrics @dots{} \new Staff @dots{} \addlyrics @dots{} -> +>> @end example @cindex SATB @@ -3484,14 +3484,14 @@ The complete example is shown here: \addlyrics \notes \relative c'' \context Voice = duet { \time 3/4 g2 e4 a2 f4 g2. } - \lyrics \context Lyrics < + \lyrics \context Lyrics << \context LyricsVoice = "duet-1" { \property LyricsVoice . stanza = "Bert" Hi, my name is bert. } \context LyricsVoice = "duet-2" { \property LyricsVoice . stanza = "Ernie" Ooooo, ch\'e -- ri, je t'aime. } - > + >> } @end lilypond @@ -3579,10 +3579,10 @@ lower = \notes \relative c { } \score { \context ChoirStaff { - < + << \new Staff { \upper } \new Staff { \lower } - > + >> } \paper { \translator { @@ -3647,10 +3647,10 @@ frag = \notes { e8 fis gis a b cis' dis' e' } \score { - \context StaffGroup < + \context StaffGroup << \context Staff { \clef "G_8" \frag } \context TabStaff { \frag } - > + >> } @end lilypond @@ -3685,7 +3685,7 @@ by default middle C, in string order. Thus, the notes are e, a, d, and g: @lilypond[fragment,verbatim] - \context TabStaff < + \context TabStaff << \outputproperty #(make-type-checker 'staff-symbol-interface) #'line-count = #4 @@ -3694,7 +3694,7 @@ g: \notes { a,4 c' a e' e c' a e' } - > + >> @end lilypond It is possible to change the Scheme function to format the tablature @@ -3715,7 +3715,7 @@ implemented yet. @cindex Chords LilyPond has support for both printing chord names. Chords may be -entered in musical chord notation, i.e. @code{<< .. >>}, but they can +entered in musical chord notation, i.e. @code{< .. >}, but they can also be entered by name. Internally, the chords are represented as a set of pitches, so they can be transposed: @@ -3725,14 +3725,14 @@ twoWays = \notes \transpose c c' { \chords { c1 f:sus4 bes/f } - <> - <> - <> + + + } \score { - < \context ChordNames \twoWays - \context Voice \twoWays > } + << \context ChordNames \twoWays + \context Voice \twoWays >> } @end lilypond This example also shows that the chord printing routines do not try to @@ -3875,17 +3875,17 @@ last: For displaying printed chord names, use the @internalsref{ChordNames} context. The chords may be entered either using the notation -described above, or directly using @code{<<} and @code{>>}: +described above, or directly using @code{<} and @code{>}: @lilypond[verbatim,singleline] scheme = \notes { - \chords {a1 b c} <> <> + \chords {a1 b c} } \score { - \notes< + \notes<< \context ChordNames \scheme \context Staff \scheme - > + >> } @end lilypond @@ -3899,12 +3899,12 @@ scheme = \chords { c1:m c:m \break c:m c:m d } \score { - \notes < + \notes << \context ChordNames { \property ChordNames.chordChanges = ##t \scheme } \context Staff \transpose c c' \scheme - > + >> } @end lilypond @@ -3993,7 +3993,7 @@ chart}. Turning on these styles is described in the input file Chord names are determined solely from the list of pitches. Chord inversions are not identified, and neither are added bass notes. This may result in strange chord names when chords are entered with the -@code{<< .. >>} syntax. +@code{< .. >} syntax. @@ -4152,11 +4152,11 @@ names: @lilypond[fragment,verbatim,singleline] \notes { \property Staff.instrument = \markup { - \column << "Clarinetti" + \column < "Clarinetti" { "in B" \smaller \musicglyph #"accidentals--1" } - >> + > } { c''1 } } @@ -4332,7 +4332,7 @@ combiner: putting parts on one staff, and setting stem directions and polyphony: @lilypond[verbatim,singleline,fragment] - \context Staff < + \context Staff << \context Voice=one \partcombine Voice \context Thread=one \relative c'' { g a( b) r @@ -4340,7 +4340,7 @@ polyphony: \context Thread=two \relative c'' { g r4 r f } - > + >> @end lilypond The first @code{g} appears only once, although it was @@ -4354,7 +4354,7 @@ If you just want the merging parts, and not the textual markings, you may set the property @var{soloADue} to false: @lilypond[verbatim,singleline,fragment] - \context Staff < + \context Staff << \property Staff.soloADue = ##f \context Voice=one \partcombine Voice \context Thread=one \relative c'' { @@ -4363,7 +4363,7 @@ may set the property @var{soloADue} to false: \context Thread=two \relative c'' { d,2 a4 g' } - > + >> @end lilypond @seealso @@ -4382,7 +4382,7 @@ off, the part combiner may typeset @code{a2} more than once in a measure: @lilypond[fragment,singleline] - \context Staff < + \context Staff << \context Voice=one \partcombine Voice \context Thread=one \relative c'' { c b c b c a c a @@ -4390,7 +4390,7 @@ measure: \context Thread=two \relative c'' { b b b b f a f a } - > + >> @end lilypond The part combiner is rather buggy, and it will be replaced by a better @@ -4422,10 +4422,10 @@ in this example disappears in the second line: @lilypond[verbatim] \score { - \notes \relative c' < + \notes \relative c' << \new Staff { e4 f g a \break c1 } \new Staff { c4 d e f \break R1 } - > + >> \paper { linewidth = 6.\cm \translator { \RemoveEmptyStaffContext } @@ -4433,6 +4433,10 @@ in this example disappears in the second line: } @end lilypond +In orchestral scores, the first page usually shows all staffs in +full. To prevent empty staffs from being discarded from the first +page, set @code{remove-first} to false in +@internalsref{RemoveEmptyVerticalGroup}. @node Different editions from one source @subsection Different editions from one source @@ -4446,15 +4450,15 @@ for the full score, and one with cue notes for the instrumental part: @example c1 - \relative c' < - \tag #'part < + \relative c' << + \tag #'part << R1 \\ @{ \property Voice.fontSize = #-1 c4_"cue" f2 g4 @} - > + >> \tag #'score R1 - > + >> c1 @end example @@ -4638,24 +4642,24 @@ select ancient accidentals. Currently supported styles are \fatText s ^\markup { - \column << + \column < "vaticana" { " " \musicglyph #"accidentals-vaticana-1" " " \musicglyph #"accidentals-vaticana0" } - >> - \column << + > + \column < "medicaea" { " " \musicglyph #"accidentals-medicaea-1" } - >> - \column << + > + \column < "hufnagel" { " " \musicglyph #"accidentals-hufnagel-1" } - >> - \column << + > + \column < "mensural" { " " \musicglyph #"accidentals-mensural-1" " " \musicglyph #"accidentals-mensural1" } - >> + > } } \paper { @@ -5156,22 +5160,22 @@ supported are @code{vaticana}, @code{medicaea}, @code{hufnagel} and \fatText s ^\markup { - \column << + \column < "vaticana" { " " \musicglyph #"custodes-vaticana-u0" } - >> - \column << + > + \column < "medicaea" { " " \musicglyph #"custodes-medicaea-u0" } - >> - \column << + > + \column < "hufnagel" { " " \musicglyph #"custodes-hufnagel-u0" } - >> - \column << + > + \column < "mensural" { " " \musicglyph #"custodes-mensural-u0" } - >> + > } } \paper { @@ -7090,14 +7094,14 @@ Trigonus: apply equal spacing, regardless of pitch. LilyPond has limited support for figured bass: @lilypond[verbatim,fragment] -< +<< \context Voice \notes { \clef bass dis4 c d ais} \context FiguredBass \figures { - < 6 >4 < 7 >8 < 6+ [_!] > + < 6 >4 < 7 >8 < 6+ [_!] > < 6 >4 <6 5 [3+] > } - > + >> @end lilypond The support for figured bass consists of two parts: there is an input @@ -7106,7 +7110,7 @@ as numbers, and there is a context called @internalsref{FiguredBass} that takes care of making @internalsref{BassFigure} objects. In figures input mode, a group of bass figures is delimited by -@code{<} and @code{>}. The duration is entered after the @code{>}: +@code{<} and @code{>}. The duration is entered after the @code{>>}: @example <4 6> @end example @@ -7240,7 +7244,7 @@ cluster-notes. Cluster notes are created by applying the function @code{notes-to-clusters} to a sequence of chords, e.g. @c @lilypond[relative 1,verbatim] - \apply #notes-to-clusters { <> <> } + \apply #notes-to-clusters { } @end lilypond The following example (from @@ -7263,8 +7267,8 @@ ordinary notes and clusters. @refbugs -Music expressions like @code{< @{ g8 e8 @} a4 >} are not printed -accurately. Use @code{<>8 <>8} instead. +Music expressions like @code{<< @{ g8 e8 @} a4 >>} are not printed +accurately. Use @code{8 8} instead. @@ -7284,7 +7288,7 @@ The following are supported @lilypond[singleline] \score { - < \addlyrics \notes { + << \addlyrics \notes { b' ^\shortfermata _\shortfermata @@ -7306,7 +7310,7 @@ The following are supported } \context Lyrics \lyrics { "shortfermata" "fermata" "longfermata" "verylongfermata" - } > + } >> } @end lilypond @@ -8015,14 +8019,14 @@ should be a key/value pair, e.g. In markup mode you can compose expressions, similar to mathematical expressions, XML documents and music expressions. The braces group notes into horizontal lines. Other types of lists also exist: you can -stack expressions grouped with @code{<<}, and @code{>>} vertically with +stack expressions grouped with @code{<}, and @code{>} vertically with the command @code{\column}. Similarly, @code{\center} aligns texts by their center lines: @lilypond[verbatim,fragment,relative=1] - c1^\markup { \column << a bbbb c >> } - c1^\markup { \center << a bbbb c >> } - c1^\markup { \line << a b c >> } + c1^\markup { \column < a bbbb c > } + c1^\markup { \center < a bbbb c > } + c1^\markup { \line < a b c > } @end lilypond The markup mechanism is extensible. Refer to @@ -8298,9 +8302,9 @@ point. For linebreaks at regular intervals use @code{\break} separated by skips and repeated with @code{\repeat}: @example -< \repeat unfold 7 @{ s1 * 4 \break @} +<< \repeat unfold 7 @{ s1 * 4 \break @} @emph{the real music} -> +>> @end example @noindent diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely index 97879f8034..183aba4a12 100644 --- a/Documentation/user/tutorial.itely +++ b/Documentation/user/tutorial.itely @@ -654,7 +654,7 @@ staff is marked by adding @code{\context Staff} before it. These In this example, @code{\simultaneous } indicates that both music fragments happen at the same time, and must be printed stacked -vertically. The notation @code{< .. >} can also be used as a +vertically. The notation @code{<< .. >>} can also be used as a shorthand for @code{\simultaneous @{ .. @}}. @code{\context} introduces a ``notation context''. To understand this @@ -686,7 +686,7 @@ We can now typeset a melody with two staves: @lilypond[verbatim,singleline] \score { \notes - < \new Staff { + << \new Staff { \time 3/4 \clef violin \relative c'' { @@ -698,7 +698,7 @@ We can now typeset a melody with two staves: c2 e4 g2. f4 e d c2. } - > + >> \paper {} } @end lilypond @@ -708,7 +708,7 @@ The example shows how small chunks of music, for example, the notes @code{c2}, @code{e4}, etc. of the second staff, are combined to form a larger chunk by enclosing it in braces. Again, a larger chunk is formed by prefix @code{\context Staff} to it, and that chunk is -combined with @code{< >}. This mechanism is similar with mathematical +combined with @code{<< >>}. This mechanism is similar with mathematical formulas: in a formula, a so-called expression is formed by combining simpler expressions into larger expressions. For example, @@ -727,17 +727,17 @@ is a sequence of expressions, where each expression is contained in the next one. The simplest expressions are numbers and operators (like +, * and /). Parentheses are used to group expressions. In LilyPond input, a similar mechanism is used. Here, the simplest -expressions are notes and rests. By enclosing expressions in @code{< ->} and @code{@{ @}}, more complex music is formed. The @code{\context} +expressions are notes and rests. By enclosing expressions in @code{<< +>>} and @code{@{ @}}, more complex music is formed. The @code{\context} also forms new expressions; prepending it to a music expression yields a new expression. Like mathematical expressions, music expressions can be nested arbitrarily deep, e.g. @lilypond[verbatim,relative 1] - { c - < { e f } { c } - > + { c <> + << { e f } { c <> } + >> } @end lilypond @@ -749,14 +749,14 @@ eases reading, and helps you insert the right amount of closing braces at the end of an expression. For example, @example \score @{ - \notes < + \notes << @{ @dots{} @} @{ @dots{} @} - > + >> @} @end example @@ -855,10 +855,10 @@ respectively. @cindex chords Chords can be made by -surrounding pitches with @code{<<} and @code{>}>: +surrounding pitches with @code{<} and @code{>}: @quotation @lilypond[relative 0, fragment,verbatim] -r4 <>4 <>8 +r4 4 8 @end lilypond @end quotation @separate @@ -868,17 +868,17 @@ You can combine beams and ties with chords. Beam and tie markings must be placed outside the chord markers: @quotation @lilypond[relative 0, fragment,verbatim] -r4 <>8[ <>]-~ <> +r4 8[ ]-~ @end lilypond @end quotation @quotation @example -r4 <>8\>( <> <> <>8\!) +r4 8\>( 8\!) @end example @lilypond[relative 0, fragment] \slurUp -r4 <>8\>( <> <> <>8\!) +r4 8\>( 8\!) @end lilypond @end quotation @separate @@ -1083,7 +1083,7 @@ root of the chord), and a durations following that: @noindent The result of @code{\chords} is a list of chords, and is equivalent -to entering chords with @code{<<@dots{}>>}. +to entering chords with @code{<@dots{}>}. Other chords can be created by adding modifiers, after a colon. The following example shows a few common modifiers: @@ -1105,18 +1105,18 @@ a lead sheet, for example, @example \score @{ - < + << \context ChordNames \chords @{ @emph{chords} @} \addlyrics \notes @emph{the melody} \context Lyrics \lyrics @{ @emph{the text} @} - > + >> \paper @{ @} @} @end example @lilypond[] \score { - < + << \context ChordNames \chords { r8 c2:sus4 f } \addlyrics \notes \relative c' { @@ -1124,7 +1124,7 @@ a lead sheet, for example, c8 \times 2/3 { f g g } \times 2/3 { g4( a2) } } \context Lyrics \lyrics { I want to break free __ } - > + >> \paper{ raggedright = ##t } } @end lilypond @@ -1184,7 +1184,7 @@ example, @cindex bibliographic information @cindex titles @cindex composer - +@cindex Engraved by LilyPond When the file is processed by @code{lilypond}, the title and composer specified are printed above the music. The `tagline' is a short line @@ -1238,39 +1238,39 @@ Entering such parts is done by entering each voice as a sequence (with voices with @code{\\}: @example - < @{ a4 g2 f4-~ f4 @} \\ - @{ r4 g4 f2 f4 @} > + << @{ a4 g2 f4-~ f4 @} \\ + @{ r4 g4 f2 f4 @} >> @end example @lilypond[relative 1] -\context Staff < { a4 g2 f4-~ f4 } \\ - { r4 g4 f2 f4 } > +\context Staff << { a4 g2 f4-~ f4 } \\ + { r4 g4 f2 f4 } >> @end lilypond For polyphonic music typesetting, spacer rests can also be convenient: these are rests that do not print. It is useful for filling up voices that temporarily do not play: @example - < @{ a4 g2 f4-~ f4 @} \\ - @{ s4 g4 f2 f4 @} > + << @{ a4 g2 f4-~ f4 @} \\ + @{ s4 g4 f2 f4 @} >> @end example @lilypond[relative 1] -\context Staff < { a4 g2 f4-~ f4 } \\ - { s4 g4 f2 f4 } > +\context Staff << { a4 g2 f4-~ f4 } \\ + { s4 g4 f2 f4 } >> @end lilypond Again, these expressions can be nested arbitrarily: @lilypond[fragment] -< +<< \new Staff \relative c'' - < { a4 g2 f4-~ f4 } \\ - { s4 g4 f2 f4 } > + << { a4 g2 f4-~ f4 } \\ + { s4 g4 f2 f4 } >> \new Staff - < { \clef bass <>1 } \\ + << { \clef bass 1 } \\ { f4 d e2 } - > -> + >> +>> @end lilypond @@ -1288,25 +1288,25 @@ Piano music is always typeset in two staves connected by a brace. Printing such a staff is done similar to the polyphonic example in @ref{Combining music into compound expressions}: @example - < \new Staff @{ @dots{} @} + << \new Staff @{ @dots{} @} \new Staff @{ @dots{} @} - > + >> @end example but now this entire expression must be interpreted as a @code{PianoStaff}: @example - \context PianoStaff < \context Staff @dots{} > + \context PianoStaff << \context Staff @dots{} >> @end example Here is a full-fledged example: @lilypond[relative 0,fragment] \context PianoStaff - < \new Staff { \time 2/4 + << \new Staff { \time 2/4 c4 c g' g } \new Staff { \clef bass c,, c' e c } - > + >> @end lilypond More information on formatting piano music is in @ref{Piano music}. @@ -1476,12 +1476,12 @@ voice. By introducing a tie in a different voice, and blanking a stem in that voice, the tie appears to cross voices: @lilypond[fragment,relative 1,verbatim] -\context Staff < { +\context Staff << { \once \property Voice.Stem \set #'transparent = ##t b8~ b8 } \\ { b[ g8] - } > + } >> @end lilypond @item diff --git a/GNUmakefile.in b/GNUmakefile.in index 5d63d3513c..da38ccb360 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -20,7 +20,7 @@ SCRIPTS = configure aclocal.m4 autogen.sh README_FILES = ChangeLog COPYING DEDICATION ROADMAP THANKS README_TXT_FILES = AUTHORS.txt README.txt INSTALL.txt NEWS.txt IN_FILES := $(wildcard *.in) -EXTRA_DIST_FILES = $(wildcard *.el) lilypond.vim vimrc VERSION $(README_FILES) $(SCRIPTS) $(IN_FILES) emacsclient.patch server.el.patch darwin.patch .cvsignore lexer-gcc-3.1.sh +EXTRA_DIST_FILES = $(wildcard *.el) lilypond.vim vimrc $(README_FILES) $(SCRIPTS) $(IN_FILES) emacsclient.patch server.el.patch darwin.patch .cvsignore lexer-gcc-3.1.sh NON_ESSENTIAL_DIST_FILES = $(README_TXT_FILES) INSTALLATION_DIR=$(local_lilypond_datadir) INSTALLATION_FILES=$(config_make) VERSION diff --git a/VERSION b/VERSION deleted file mode 100644 index 9fdaf45b6e..0000000000 --- a/VERSION +++ /dev/null @@ -1,11 +0,0 @@ -PACKAGE_NAME=LilyPond -MAJOR_VERSION=1 -MINOR_VERSION=9 -PATCH_LEVEL=5 -MY_PATCH_LEVEL= - -# Use the above to send patches: MY_PATCH_LEVEL is always empty for a -# released version. -# -# Please don't move these comments up; the patch should fail if -# the previous version was wrong. diff --git a/config.make.in b/config.make.in index fdfadb5a34..ef14aaee80 100644 --- a/config.make.in +++ b/config.make.in @@ -3,6 +3,12 @@ MISSING_OPTIONAL = @OPTIONAL@ MISSING_REQUIRED = @REQUIRED@ +PACKAGE_NAME = @PACKAGE_NAME@ +MAJOR_VERSION = @MAJOR_VERSION@ +MINOR_VERSION = @MINOR_VERSION@ +PATCH_LEVEL = @PATCH_LEVEL@ +MY_PATCH_LEVEL = @MY_PATCH_LEVEL@ + # @configure_input@ package-depth = @package_depth@ diff --git a/configure.in b/configure.in index d9fd097efa..c5a5720bde 100644 --- a/configure.in +++ b/configure.in @@ -9,17 +9,30 @@ AC_INIT AC_CONFIG_AUX_DIR([stepmake/bin]) # For stepmake package: # AC_CONFIG_AUX_DIR(bin) + + +export PACKAGE_NAME=LilyPond +export MAJOR_VERSION=1 +export MINOR_VERSION=9 +export PATCH_LEVEL=5 +export MY_PATCH_LEVEL= + + STEPMAKE_INIT +AC_SUBST(PACKAGE_NAME) +AC_SUBST(MAJOR_VERSION) +AC_SUBST(MINOR_VERSION) +AC_SUBST(PATCH_LEVEL) +AC_SUBST(MY_PATCH_LEVEL) + + # List a file that identifies your package. AC_CONFIG_SRCDIR([lily/main.cc]) # Move to aclocal.m4? AC_CONFIG_HEADER([$CONFIGFILE.h:config.hh.in]) -# For all packages except the StepMake package itself -AC_CONFIG_SUBDIRS(stepmake) - # Uncomment the configuration options your package needs. # must come before any header checks diff --git a/input/regression/chord-name-exceptions.ly b/input/regression/chord-name-exceptions.ly index 27c5dc2087..6a2420e0a9 100644 --- a/input/regression/chord-name-exceptions.ly +++ b/input/regression/chord-name-exceptions.ly @@ -32,9 +32,9 @@ chExceptions = #(append ignatzekExceptions) theMusic = \chords { - c:7sus4 c:dim7 + c:7sus4 c:dim7/+f \property Current.chordNameExceptions = #chExceptions - c:7sus4 c:dim7 } + c:7sus4 c:dim7/+f } \score { diff --git a/input/test/chord-names-jazz.ly b/input/test/chord-names-jazz.ly index 6cb5be14cf..1e8fbf5036 100644 --- a/input/test/chord-names-jazz.ly +++ b/input/test/chord-names-jazz.ly @@ -112,7 +112,7 @@ banterProperties = \sequential { \score{ << - \context ChordNames { + \new ChordNames { \property ChordNames.instrument = #"Ignatzek (default)" \property ChordNames.instr = #"Def" \chs } @@ -132,7 +132,7 @@ banterProperties = \sequential { \chs } %} - \context Staff \notes \transpose c c' { \chs } + \new Staff \notes \transpose c c' { \chs } >> \paper{ indent = 3.\cm diff --git a/lily/axis-group-engraver.cc b/lily/axis-group-engraver.cc index bd728738f3..f2750d7732 100644 --- a/lily/axis-group-engraver.cc +++ b/lily/axis-group-engraver.cc @@ -145,8 +145,8 @@ Hara_kiri_engraver::add_element (Grob*e) Spanner* Hara_kiri_engraver::get_spanner () const { - Spanner * sp = new Spanner (get_property ("HaraKiriVerticalGroup")); - + Spanner * sp = new Spanner (get_property ("RemoveEmptyVerticalGroup")); + return sp; } @@ -160,6 +160,7 @@ Hara_kiri_engraver::acknowledge_grob (Grob_info i) } } + Hara_kiri_engraver::Hara_kiri_engraver() { } @@ -167,7 +168,7 @@ Hara_kiri_engraver::Hara_kiri_engraver() ENTER_DESCRIPTION(Hara_kiri_engraver, /* descr */ "Like Axis_group_engraver, but make a hara kiri spanner, and add " "interesting items (ie. note heads, lyric syllables and normal rests) ", -/* creats*/ "HaraKiriVerticalGroup", +/* creats*/ "RemoveEmptyVerticalGroup", /* accepts */ "", /* acks */ "grob-interface", /* reads */ "", diff --git a/lily/chord-name-engraver.cc b/lily/chord-name-engraver.cc index 969fa9c18c..619b51a639 100644 --- a/lily/chord-name-engraver.cc +++ b/lily/chord-name-engraver.cc @@ -106,7 +106,7 @@ Chord_name_engraver::process_music () chord_name_ = new Item (get_property ("ChordName")); chord_name_->set_grob_property("text", markup); - announce_grob(chord_name_, SCM_EOL); + announce_grob(chord_name_, notes_[0]->self_scm ()); SCM s = get_property ("chordChanges"); if (to_boolean (s) && gh_pair_p (last_chord_) && gh_equal_p (chord_as_scm, last_chord_)) diff --git a/lily/glissando-engraver.cc b/lily/glissando-engraver.cc index 9435968bd3..7976601b72 100644 --- a/lily/glissando-engraver.cc +++ b/lily/glissando-engraver.cc @@ -55,8 +55,6 @@ Glissando_engraver::process_music () { if (event_) { - last_line_ = line_; - line_ = new Spanner (get_property ("Glissando")); announce_grob (line_, event_->self_scm ()); } @@ -86,8 +84,12 @@ Glissando_engraver::stop_translation_timestep () typeset_grob (last_line_); last_line_ =0; } - - last_line_ = line_; + if (line_) + { + if ( last_line_) + programming_error ("Overwriting glissando."); + last_line_ = line_; + } line_ = 0; event_ = 0; } diff --git a/lily/hairpin.cc b/lily/hairpin.cc index 723244c025..af539b871b 100644 --- a/lily/hairpin.cc +++ b/lily/hairpin.cc @@ -116,6 +116,9 @@ Hairpin::brew_molecule (SCM smob) endh = height; } + /* + TODO: set line style. + */ Molecule mol = Lookup::line (thick, Offset (0, starth), Offset (width, endh)); diff --git a/lily/hara-kiri-group-spanner.cc b/lily/hara-kiri-group-spanner.cc index 83a4f27068..8fdcc19bc8 100644 --- a/lily/hara-kiri-group-spanner.cc +++ b/lily/hara-kiri-group-spanner.cc @@ -30,10 +30,17 @@ Hara_kiri_group_spanner::y_extent (SCM element_smob, SCM scm_axis) void Hara_kiri_group_spanner::consider_suicide (Grob*me) { + Spanner*sp = dynamic_cast (me); SCM worth = me->get_grob_property ("items-worth-living"); if (gh_pair_p (worth)) return ; + if (!to_boolean (me->get_grob_property ("remove-first")) + && broken_spanner_index (sp) == 0) + { + return ; + } + Link_array childs = Axis_group_interface::get_children (me); for (int i = 0; i < childs.size (); i++) childs[i]->suicide (); @@ -98,5 +105,5 @@ ADD_INTERFACE (Hara_kiri_group_spanner,"hara-kiri-group-interface", we don't contain any interesting items after linebreaking, then \ gracefully commit suicide. Objective: don't disgrace Lily by \ typesetting empty lines in orchestral scores.", \ - "items-worth-living"); + "items-worth-living remove-first"); diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly index 890cf72f78..5c5c763d8c 100644 --- a/ly/engraver-init.ly +++ b/ly/engraver-init.ly @@ -347,7 +347,7 @@ LyricsContext = \translator { ChordNamesContext = \translator { \type "Engraver_group_engraver" \name ChordNames -\description " Typesets chord names." + \description "Typesets chord names." \consists "Rest_swallow_translator" \consists "Output_property_engraver" @@ -355,6 +355,7 @@ ChordNamesContext = \translator { \consists "Chord_name_engraver" \consists "Skip_event_swallow_translator" \consistsend "Hara_kiri_engraver" + minimumVerticalExtent = #'(0 . 2.5) extraVerticalExtent = ##f verticalExtent = ##f diff --git a/make/stepmake.make b/make/stepmake.make index dee7d04835..6b54d35c60 100644 --- a/make/stepmake.make +++ b/make/stepmake.make @@ -1,7 +1,6 @@ # make/Stepmake.make include $(depth)/make/toplevel-version.make - # Use alternate configurations alongside eachother: # # ./configure --enable-config=debug diff --git a/make/toplevel-version.make b/make/toplevel-version.make index 4a1e24e9e2..37d7e5a2ce 100644 --- a/make/toplevel-version.make +++ b/make/toplevel-version.make @@ -1,8 +1,7 @@ # Toplevel_version.make -include $(depth)/VERSION -TOPLEVEL_MAJOR_VERSION:=$(MAJOR_VERSION) -TOPLEVEL_MINOR_VERSION:=$(MINOR_VERSION) -TOPLEVEL_PATCH_LEVEL:=$(PATCH_LEVEL) +TOPLEVEL_MAJOR_VERSION=$(MAJOR_VERSION) +TOPLEVEL_MINOR_VERSION=$(MINOR_VERSION) +TOPLEVEL_PATCH_LEVEL=$(PATCH_LEVEL) # use to send patches, always empty for released version: -TOPLEVEL_MY_PATCH_LEVEL:=$(MY_PATCH_LEVEL) +TOPLEVEL_MY_PATCH_LEVEL=$(MY_PATCH_LEVEL) diff --git a/scm/chord-ignatzek-names.scm b/scm/chord-ignatzek-names.scm index 3e19987611..3a23a4a05f 100644 --- a/scm/chord-ignatzek-names.scm +++ b/scm/chord-ignatzek-names.scm @@ -1,11 +1,12 @@ ;;; -;;; chord-name.scm -- chord name utility functions +;;; chord-ignatzek-names.scm -- chord name utility functions ;;; ;;; source file of the GNU LilyPond music typesetter ;;; ;;; (c) 2000--2003 Han-Wen Nienhuys + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; @@ -202,7 +203,7 @@ work than classifying the pitches." alterations suffixes add-markups) sep)) - (base-stuff (if bass-pitch + (base-stuff (if (ly:pitch? bass-pitch) (list sep (name-note bass-pitch)) '())) ) @@ -213,10 +214,25 @@ work than classifying the pitches." (markup-join prefixes sep) (make-super-markup to-be-raised-stuff)) base-stuff)) - (make-line-markup base-stuff) + (make-line-markup base-stuff) )) + (define (ignatzek-format-exception + root + exception-markup + bass-pitch) + + (make-line-markup + `( + ,(name-root root) + ,exception-markup + . + ,(if (ly:pitch? bass-pitch) + (list (ly:get-context-property context 'chordNameSeparator) + (name-note bass-pitch)) + '())))) + (let* ( (root (car in-pitches)) @@ -227,14 +243,15 @@ work than classifying the pitches." (suffixes '()) (add-steps '()) (main-name #f) - (bass-note #f) + (bass-note + (if (ly:pitch? inversion) + inversion + bass)) (alterations '()) ) - - (if - exception - (make-line-markup - (list (name-root root) exception)) + + (if exception + (ignatzek-format-exception root exception bass-note) (begin ; no exception. @@ -280,13 +297,6 @@ work than classifying the pitches." (set! alterations (delq main-name alterations)) (set! add-steps (delq main-name add-steps)) - (if (ly:pitch? inversion) - (set! bass-note inversion) - ) - - (if (ly:pitch? bass) - (set! bass-note bass) - ) ;; chords with natural (5 7 9 11 13) or leading subsequence. ;; etc. are named by the top pitch, without any further @@ -302,8 +312,9 @@ work than classifying the pitches." (set! main-name (last alterations)) (set! alterations '()) )) - + (ignatzek-format-chord-name root prefixes main-name alterations add-steps suffixes bass-note) - ) - )))) + ))) + )) + diff --git a/scm/define-grob-properties.scm b/scm/define-grob-properties.scm index 10214e9eaf..c7a821c437 100644 --- a/scm/define-grob-properties.scm +++ b/scm/define-grob-properties.scm @@ -285,7 +285,6 @@ space to add. For barline, space after a thick line.") (grob-property-description 'layer number? "The output layer [0..2]. The default is 1.") (grob-property-description 'left-position number? "position of left part of spanner.") -(grob-property-description 'right-position number? "position of right part of spanner.") (grob-property-description 'left-padding ly:dimension? "space left of accs.") (grob-property-description 'length ly:dimension? "Stem length for unbeamed stems, only for user override.") @@ -374,7 +373,10 @@ as a real penalty.") (grob-property-description 'positions pair? "cons of staff positions (LEFT . RIGHT") (grob-property-description 'prefix-set number? "DOCME") (grob-property-description 'ratio number? "Slur parameter. See height-limit.") +(grob-property-description 'remove-first boolean? + "Remove the first staff of a orchestral score?") (grob-property-description 'right-padding ly:dimension? "space right of accs.") +(grob-property-description 'right-position number? "position of right part of spanner.") (grob-property-description 'right-trim-amount ly:dimension? "shortening of the lyric extender on the right.") (grob-property-description 'script-priority number? "A sorting key that determines in what order a script is within a stack of scripts.") (grob-property-description 'self-alignment-X number-or-grob? "real number: -1 = diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm index 16fe53fe1b..aca39f17bb 100644 --- a/scm/define-grobs.scm +++ b/scm/define-grobs.scm @@ -377,10 +377,11 @@ )) - (HaraKiriVerticalGroup + (RemoveEmptyVerticalGroup . ( (Y-offset-callbacks . (,Hara_kiri_group_spanner::force_hara_kiri_callback)) (Y-extent-callback . ,Hara_kiri_group_spanner::y_extent) + (remove-first . #t) (axes . (1)) (meta . ((interfaces . (axis-group-interface hara-kiri-group-interface item-interface spanner-interface)))) )) diff --git a/scripts/abc2ly.py b/scripts/abc2ly.py index 73f59b3be4..bde1e8cfe5 100644 --- a/scripts/abc2ly.py +++ b/scripts/abc2ly.py @@ -173,11 +173,11 @@ def dump_header (outf,hdr): def dump_lyrics (outf): if (len(lyrics)): - outf.write("\n\\score\n{\n \\context Lyrics\n <\n") + outf.write("\n\\score\n{\n \\context Lyrics\n <<\n") for i in range (len (lyrics)): outf.write ( lyrics [i]) outf.write ("\n") - outf.write(" >\n \\paper{}\n}\n") + outf.write(" >>\n \\paper{}\n}\n") def dump_default_bar (outf): """ @@ -240,7 +240,7 @@ def try_parse_q(a): def dump_score (outf): outf.write (r"""\score{ - \notes < + \notes << """) ks = voice_idx_dict.keys (); @@ -260,7 +260,7 @@ def dump_score (outf): outf.write ("\t \\voice%s " % m) outf.write ("\n\t}\n") if len ( slyrics [voice_idx_dict[k]] ): - outf.write ("\n\t\\context Lyrics=\"%s\" \n\t<\t" % k) + outf.write ("\n\t\\context Lyrics=\"%s\" \n\t<<\t" % k) if re.match('[1-9]',k): m = alphabet[string.atoi(k)] else: @@ -268,8 +268,8 @@ def dump_score (outf): for i in range (len(slyrics[voice_idx_dict[k]])): l=alphabet[i] outf.write("\n\t { \\words%sV%s }" % ( m, l) ) - outf.write ( "\n\t>\n" ) - outf.write ("\n >") + outf.write ( "\n\t>>\n" ) + outf.write ("\n >>") outf.write ("\n\t\\paper {\n") if part_names: outf.write ("\t \\translator \n\t {\n") diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py index 53dda4c13b..d30bf71a5b 100644 --- a/scripts/convert-ly.py +++ b/scripts/convert-ly.py @@ -1495,6 +1495,13 @@ def conv (str): conversions.append (((1,9,4), conv, 'Swap < > and << >>')) +def conv (str): + str = re.sub ('HaraKiriVerticalGroup', 'RemoveEmptyVerticalGroup', str) + + return str + +conversions.append (((1,9,5), conv, 'HaraKiriVerticalGroup -> RemoveEmptyVerticalGroup')) + ################################ # END OF CONVERSIONS ################################ diff --git a/scripts/etf2ly.py b/scripts/etf2ly.py index c1767db5b8..335d363025 100644 --- a/scripts/etf2ly.py +++ b/scripts/etf2ly.py @@ -595,7 +595,7 @@ class Staff: stafdef = stafdef + ' \\' + i - str = str + '%s = \\context Staff = %s <\n %s\n >\n' % \ + str = str + '%s = \\context Staff = %s <<\n %s\n >>\n' % \ (self.staffid (), self.staffid (), stafdef) return str @@ -726,7 +726,7 @@ class Chord: if not self.pitches: s = 'r' if len (self.pitches) > 1: - s = '<< %s >>' % s + s = '<%s>' % s s = s + '%d%s' % (self.duration[0], '.'* self.duration[1]) s = self.note_prefix + s + self.note_suffix diff --git a/scripts/midi2ly.py b/scripts/midi2ly.py index 0ab2f9203f..58fd49f5bb 100644 --- a/scripts/midi2ly.py +++ b/scripts/midi2ly.py @@ -785,12 +785,12 @@ def dump_chord (ch): s = s + dump (notes[0]) elif len (notes) > 1: global reference_note - s = s + '<<' + s = s + '<' s = s + notes[0].dump (dump_dur = 0) r = reference_note for i in notes[1:]: s = s + i.dump (dump_dur = 0 ) - s = s + '>>' + s = s + '>' s = s + notes[0].duration.dump() reference_note = r @@ -906,7 +906,7 @@ def dump_track (channels, n): s = s + ' ' + dump_channel (channels[i][0], skip) s = s + '}\n\n' - s = s + '%s = <\n' % track + s = s + '%s = <<\n' % track if clef.type != 2: s = s + clef.dump () + '\n' @@ -920,7 +920,7 @@ def dump_track (channels, n): else: s = s + ' \\context Voice = %s \\%s\n' % (channel, track + channel) - s = s + '>\n\n' + s = s + '>>\n\n' return s def thread_first_item (thread): @@ -989,7 +989,7 @@ def convert_midi (f, o): for i in range (len (tracks)): s = s + dump_track (tracks[i], i) - s = s + '\n\\score {\n <\n' + s = s + '\n\\score {\n <<\n' for i in range (len (tracks)): track = track_name (i) item = track_first_item (tracks[i]) @@ -997,7 +997,7 @@ def convert_midi (f, o): s = s + ' \\context Staff=%s \\%s\n' % (track, track) elif item and item.__class__ == Text: s = s + ' \\context Lyrics=%s \\%s\n' % (track, track) - s = s + ' >\n}\n' + s = s + ' >>\n}\n' progress (_ ("%s output to `%s'...") % ('LY', o)) diff --git a/scripts/mup2ly.py b/scripts/mup2ly.py index c42d8154a5..bb071d6d10 100644 --- a/scripts/mup2ly.py +++ b/scripts/mup2ly.py @@ -638,8 +638,8 @@ class Staff: str = str + v.dump() refs = refs + '\n \\' + v.idstring () str = str + ''' -%s = \context Staff = %s <%s -> +%s = \context Staff = %s <<%s +>> ''' % (self.idstring (), self.idstring (), refs) return str @@ -727,7 +727,7 @@ class Chord: str = self.note_prefix +str + self.note_suffix if len (self.pitches) > 1: - str = '<<%s>>' % str + str = '<%s>' % str elif self.multimeasure: str = 'R' elif len (self.pitches) == 0: @@ -1100,8 +1100,8 @@ class Parser: str = str + ''' \score { - <%s - > + <<%s + >> \paper {} \midi {} } diff --git a/scripts/musedata2ly.py b/scripts/musedata2ly.py index cd750857a1..039da2d166 100644 --- a/scripts/musedata2ly.py +++ b/scripts/musedata2ly.py @@ -232,11 +232,11 @@ class Chord: str = str + pitch_to_lily_string (p) if len (self.pitches) > 1: - str = '<<%s>>' % str + str = '<%s>' % str elif len (self.pitches) == 0: str = 'r' - str = str + sd + '-(' * len (self.slurstart) + '-)' * len (self.slurstart) + str = str + sd + '(' * len (self.slurstart) + ')' * len (self.slurstart) for s in self.scripts: str = str + '-' + s @@ -618,7 +618,7 @@ for f in files: found_ids = found_ids + '\\%s\n' % id -found_ids = '\n\n\n\\score { < %s > } ' % found_ids +found_ids = '\n\n\n\\score { << %s >> } ' % found_ids ly_head = '' if ref_file: diff --git a/scripts/pmx2ly.py b/scripts/pmx2ly.py index 060cf52731..1e3a26f0a0 100644 --- a/scripts/pmx2ly.py +++ b/scripts/pmx2ly.py @@ -135,8 +135,8 @@ class Slur: e= self.end_chord if e and s: - s.note_suffix = s.note_suffix + '-(' - e.note_prefix = e.note_suffix + '-)' + s.note_suffix = s.note_suffix + '(' + e.note_prefix = e.note_suffix + ')' else: sys.stderr.write ("\nOrphaned slur") @@ -283,7 +283,7 @@ class Staff: str = str + v.dump() refs = refs + '\\' + v.idstring ()+ ' ' - str = str + '\n\n%s = \\context Staff = %s \n < \n %s >\n\n\n'% (self.idstring (), self.idstring (), refs) + str = str + '\n\n%s = \\context Staff = %s \n << \n %s >>\n\n\n'% (self.idstring (), self.idstring (), refs) return str class Tuplet: @@ -344,7 +344,7 @@ class Chord: str = str + pitch_to_lily_string (p) if len (self.pitches) > 1: - str = '<<%s>>' % str + str = '<%s>' % str elif len (self.pitches) == 0: str = 'r' @@ -760,7 +760,7 @@ Huh? Unknown directive `%s', before `%s'""" % (c, left[:20] )) str = str + s.dump () refs = '\\' + s.idstring() + refs - str = str + "\n\n\\score { <\n %s\n > }" % refs + str = str + "\n\n\\score { <<\n %s\n >> }" % refs return str diff --git a/stepmake/GNUmakefile b/stepmake/GNUmakefile new file mode 100644 index 0000000000..fc687d50c9 --- /dev/null +++ b/stepmake/GNUmakefile @@ -0,0 +1,34 @@ +# -*-Makefile-*- +# title specific top level makefile for StepMake + +# subdir level: +# +depth = .. + +# descent order into subdirectories: +# +SUBDIRS = bin stepmake + +# list of distribution files: +# +SCRIPTS = aclocal.m4 +README_FILES = CHANGES README TODO +README_TXT_FILES = +EXTRA_DIST_FILES = $(README_FILES) $(SCRIPTS) +NON_ESSENTIAL_DIST_FILES = $(README_TXT_FILES) +# + +# bootstrap stepmake: +# +STEPMAKE_TEMPLATES= texinfo +include $(depth)/make/stepmake.make + +# don't install stepmake +install: local-install + @echo Not installing stepmake + +bla: + echo $(TOPLEVEL_MAJOR_VERSION) + +localclean: + rm -f bin/*.pyc diff --git a/stepmake/GNUmakefile.in b/stepmake/GNUmakefile.in deleted file mode 100644 index be4e43a832..0000000000 --- a/stepmake/GNUmakefile.in +++ /dev/null @@ -1,60 +0,0 @@ -# -*-Makefile-*- -# title specific top level makefile for StepMake - -# subdir level: -# -depth = . -# - -# descent order into subdirectories: -# -ifeq ($(PACKAGE),STEPMAKE) -SUBDIRS = bin make stepmake -else -SUBDIRS = stepmake -endif -# - -# list of distribution files: -# -SCRIPTS = configure aclocal.m4 autogen.sh -README_FILES = CHANGES README TODO -README_TXT_FILES = -EXTRA_DIST_FILES = $(IN_FILES) VERSION $(README_FILES) $(SCRIPTS) INSTALL.texi -NON_ESSENTIAL_DIST_FILES = $(README_TXT_FILES) -# - -# bootstrap stepmake: -# -STEPMAKE_TEMPLATES=toplevel texinfo -include $(depth)/make/stepmake.make -# - -# 2nd: THIS IS NO MISTAKE -# this makes lilypond's make dist descent into stepmake -# should check if we can remove the above -# descent order into subdirectories: -# -ifeq ($(PACKAGE),STEPMAKE) -SUBDIRS = bin make stepmake -else -SUBDIRS = stepmake -# don't install stepmake -install: local-install - @echo Not installing stepmake -endif -# - -#urg urg -stepmake/aclocal.m4: - -$(LN) aclocal.m4 $@ - -ifeq ($(PACKAGE),STEPMAKE) -INSTALLATION_DIR=$(package_datadir) -INSTALLATION_FILES=$(DIST_FILES) $(NON_ESSENTIAL_DIST_FILES) GNUmakefile config.make config.status -include $(stepdir)/install-targets.make -endif - -localclean: - rm -f bin/*.pyc - rm -f stepmake/stepmake stepmake/bin stepmake/aclocal.m4 diff --git a/stepmake/VERSION b/stepmake/VERSION deleted file mode 100644 index adb34a0132..0000000000 --- a/stepmake/VERSION +++ /dev/null @@ -1,9 +0,0 @@ -PACKAGE_NAME=StepMake -MAJOR_VERSION=0 -MINOR_VERSION=1 -PATCH_LEVEL=81 -MY_PATCH_LEVEL= - -# use the above to send patches, always empty for released version: -# please don't move these comments up; the patch should fail if -# the previous version was wrong. diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4 index 086c69befc..4fb45c386a 100644 --- a/stepmake/aclocal.m4 +++ b/stepmake/aclocal.m4 @@ -510,7 +510,6 @@ AC_DEFUN(STEPMAKE_GXX, [ AC_DEFUN(STEPMAKE_INIT, [ AC_PREREQ(2.50) - . $srcdir/VERSION FULL_VERSION=$MAJOR_VERSION.$MINOR_VERSION.$PATCH_LEVEL if test x$MY_PATCH_LEVEL != x; then FULL_VERSION=$FULL_VERSION.$MY_PATCH_LEVEL diff --git a/stepmake/bin/GNUmakefile b/stepmake/bin/GNUmakefile index 4ca8cd1a8f..c5da573a94 100644 --- a/stepmake/bin/GNUmakefile +++ b/stepmake/bin/GNUmakefile @@ -1,6 +1,6 @@ # bin/Makefile -depth = .. +depth = ../.. EXTRA_DIST_FILES = install-sh config.sub config.guess STEPMAKE_TEMPLATES=script install diff --git a/stepmake/bin/make-version.py b/stepmake/bin/make-version.py index 3c7089db81..1319b2875b 100644 --- a/stepmake/bin/make-version.py +++ b/stepmake/bin/make-version.py @@ -1,6 +1,7 @@ import re import sys +import getopt vf = 'VERSION' @@ -11,9 +12,8 @@ f = open (vf) ls = f.readlines () mypatch = 0 defs = [] -for l in ls: - l = re.sub ('#.*','', l) - m = re.search ('([^ =]*)[\t ]*=[ \t]*([^ \t]*)[ \t]*\n', l) +for a in sys.argv[1:] + m = re.search ('([^ =]*)=([^ \t]*)[ \t]*\n', a) if m: defs.append ((m.group(1), m.group(2))) diff --git a/stepmake/config.make.in b/stepmake/config.make.in deleted file mode 100644 index 44bbf17fbc..0000000000 --- a/stepmake/config.make.in +++ /dev/null @@ -1,74 +0,0 @@ -# -*-Makefile-*- - -# @configure_input@ - -package-depth = @package_depth@ - -USER_CFLAGS = @CFLAGS@ -USER_CXXFLAGS = @CXXFLAGS@ @CPPFLAGS@ -USER_LDFLAGS = - -CC = @CC@ -CXX = @CXX@ -GCC = @GCC@ -LD = @LD@ -PACKAGE = @PACKAGE@ -package = @package@ -PACKAGE_NAME = @PACKAGE_NAME@ -stepmake = @stepmake@ -state-vector = @STATE_VECTOR@ -CONFIGSUFFIX = @CONFIGSUFFIX@ -MAKEINFO_PROGRAM = @MAKEINFO@ -ICFLAGS = @ICFLAGS@ -ILDFLAGS = @ILDFLAGS@ -builddir = @ugh_ugh_autoconf250_builddir@ -libdir = @libdir@ -prefix = @prefix@ -srcdir = @srcdir@ -TEXPREFIX = @TEXPREFIX@ -TEXDIR = @TEXDIR@ -MFDIR = @MFDIR@ -mandir = @mandir@ -infodir = @infodir@ -exec_prefix = @exec_prefix@ -bindir = @bindir@ -includedir = @includedir@ -datadir = @datadir@ -localedir = @localedir@ -EXTRA_LIBES = @EXTRA_LIBES@ @LIBS@ -RANLIB = @RANLIB@ -DEFS = @DEFS@ -#SET_MAKE = @SET_MAKE@ -DEFINES = @DEFS@ @DEFINES@ -COMPILEINFO = @COMPILEINFO@ -DOTEXE = @DOTEXE@ -INSTALL = @INSTALL@ -BASH = @BASH@ -BISON = @BISON@ -FIND = @FIND@ -FLEX = @FLEX@ -INIMETAFONT = @INIMETAFONT@ -INIMETAPOST = @INIMETAPOST@ -LN = @LN@ -LN_S = @LN_S@ -METAFONT = @METAFONT@ -METAPOST = @METAPOST@ -MSGFMT = @MSGFMT@ -PATHSEP = @PATHSEP@ -PERL = @PERL@ -PYTHON = @PYTHON@ -SHELL = @SHELL@ -STRIPROFF = @STRIPROFF@ -TAR= @TAR@ -TBL = @TBL@ -TROFF = @TROFF@ -YODL= @YODL@ -YODL2HTML= @YODL2HTML@ -YODL2LATEX= @YODL2LATEX@ -YODL2LESS_DIR= @YODL2LESS_DIR@ -YODL2MAN= @YODL2MAN@ -YODL2MSLESS= @YODL2MSLESS@ -YODL2TEXINFO= @YODL2TEXINFO@ -YODL2TXT= @YODL2TXT@ -ZIP = @ZIP@ - diff --git a/stepmake/make/GNUmakefile b/stepmake/make/GNUmakefile deleted file mode 100644 index fab275e872..0000000000 --- a/stepmake/make/GNUmakefile +++ /dev/null @@ -1,14 +0,0 @@ -# file make/Makefile - -depth = .. -STEPMAKE_TEMPLATES=makedir install -BLURBS=BLURB # COPERTINA FLAPTEKST - -ifneq ($(strip $(state-vector)),) -EXTRA_DIST_FILES = STATE-VECTOR -endif - -include $(depth)/make/stepmake.make - -INSTALLATION_DIR=$(datadir)/make -INSTALLATION_FILES=$(DIST_FILES) diff --git a/stepmake/make/generic-rules.make b/stepmake/make/generic-rules.make deleted file mode 100644 index 224a5bf1eb..0000000000 --- a/stepmake/make/generic-rules.make +++ /dev/null @@ -1,11 +0,0 @@ -# title package specific rules - -#UGH - -include $(depth)/make/substitute.make - -$(outdir)/%: %.in - rm -f $@ - cat $< | sed $(sed-atfiles) $(sed-atvariables) > $@ - - diff --git a/stepmake/make/generic-targets.make b/stepmake/make/generic-targets.make deleted file mode 100644 index 134615d18d..0000000000 --- a/stepmake/make/generic-targets.make +++ /dev/null @@ -1,19 +0,0 @@ -# title package specific targets - -.PHONY : check-dist-deps check-make-deps check-rpm-doc-deps check-html-deps check-web-doc check-rpm-icons - -#check-html-deps: -# $(MAKE) -C $(depth)/Documentation html - -#check-web-doc: -# $(MAKE) CONFIGSUFFIX='www' -C Documentation outdirs -# $(MAKE) CONFIGSUFFIX='www' -C Documentation WWW - -# check-rpm-doc-deps: -# $(MAKE) -C $(depth)/Documentation gifs - -#check-rpm-icons: - -#check-make-deps: -# $(MAKE) -C $(depth)/make - diff --git a/stepmake/make/generic-vars.make b/stepmake/make/generic-vars.make deleted file mode 100644 index a25ab5af61..0000000000 --- a/stepmake/make/generic-vars.make +++ /dev/null @@ -1,19 +0,0 @@ -# title package specific variables -# -# do not change this file for site-wide extensions; please use -# make/$(outdir)/Site.make; -# -# Any change in files in this directory (make/) would be distributed, if -# you do make dist -# - -# dummydeps -# -DUMMYDEPS=\ - -# - -STEPMAKE_INCLUDES = -STEPMAKE_LDFLAGS = -STEPMAKE_LIBES = - diff --git a/stepmake/make/srcdir.make.in b/stepmake/make/srcdir.make.in deleted file mode 100644 index 70956185f8..0000000000 --- a/stepmake/make/srcdir.make.in +++ /dev/null @@ -1,43 +0,0 @@ -# -*-Makefile-*- -# specific srcdir makefile for StepMake - -depth=.. - -# Don't try to outsmart us, you puny computer! -ifeq (0,${MAKELEVEL}) - MAKE:=$(MAKE) --no-builtin-rules -endif - -# Use alternate configurations alongside eachother: -# -# ./configure --enable-configsuffix=debug -# make conf=debug -# -# uses config-debug.make and config-debug.h; output goes to out-debug. -# -ifdef conf - CONFIGSUFFIX=-$(conf) -endif - -# Use same configuration, but different output directory: -# -# make out=WWW -# -# uses config.make and config.h; output goes to out-WWW. -# -ifdef out - outbase=out-$(out) -else - outbase=out$(CONFIGSUFFIX) -endif - -config = config$(CONFIGSUFFIX).make - -include $(config) - -SRCDIR=$(MAKE) -C $(srcdir) -f GNUmakefile.in builddir=$(builddir) $@ - -default: all - -%: - $(SRCDIR) diff --git a/stepmake/make/stepmake.lsm.in b/stepmake/make/stepmake.lsm.in deleted file mode 100644 index 1e00adf0f7..0000000000 --- a/stepmake/make/stepmake.lsm.in +++ /dev/null @@ -1,15 +0,0 @@ -Begin3 -Title: StepMake -Version: @TOPLEVEL_VERSION@ -Entered-date: @DATE@ -Description: @BLURB@ -Keywords: music notation typesetting midi fonts engraving -Author: janneke@gnu.org (Jan Nieuwenhuizen) - hanwen@cs.ruu.nl (Han-Wen Nienhuys) -Maintained-by: janneke@gnu.org (Jan Nieuwenhuizen) -Primary-site: sunsite.unc.edu /pub/Linux/apps/sound/convert - 40k @package@-@TOPLEVEL_VERSION@.tar.gz -Original-site: pcnov095.win.tue.nl /pub/lilypond/development/ - 40k @package@-@TOPLEVEL_VERSION@.tar.gz -Copying-policy: GPL -End diff --git a/stepmake/make/stepmake.make b/stepmake/make/stepmake.make deleted file mode 100644 index 8b79b35e43..0000000000 --- a/stepmake/make/stepmake.make +++ /dev/null @@ -1,90 +0,0 @@ -# make/Stepmake.make - -include $(depth)/make/toplevel-version.make - -# Use alternate configurations alongside eachother: -# -# ./configure --enable-config=debug -# make conf=debug -# -# uses config-debug.make and config-debug.h; output goes to out-debug. -# -ifdef conf - CONFIGSUFFIX=-$(conf) -endif - -# Use same configuration, but different output directory: -# -# make out=www -# -# uses config.make and config.h; output goes to out-www. -# -ifdef out - outbase=out-$(out) -else - outbase=out$(CONFIGSUFFIX) -endif - -ifdef config - config_make=$(config) -else - ifeq ($(builddir),) - config_make=$(depth)/config$(CONFIGSUFFIX).make - else - config_make=$(builddir)/config$(CONFIGSUFFIX).make - endif -endif - -ifeq ($(builddir),) - outroot=. -else - outroot=$(builddir)/$(patsubst $(shell cd $(depth); pwd)%,%,$(pwd)) -endif - -include $(config_make) - -outdir=$(outroot)/$(outbase) -config_h=$(builddir)/config$(CONFIGSUFFIX).h - -# The outdir that was configured for: best guess to find binaries -outconfbase=out$(CONFIGSUFFIX) -outconfdir=$(outroot)/$(outconfbase) - -# user package -# stepdir = $(stepmake)/stepmake -# for stepmake package -stepdir = $(depth)/stepmake - -STEPMAKE_TEMPLATES := generic $(STEPMAKE_TEMPLATES) -LOCALSTEPMAKE_TEMPLATES:= generic $(LOCALSTEPMAKE_TEMPLATES) - - -# Don't try to outsmart us, you puny computer! -# Well, UGH. This only removes builtin rules from -# subsequent $(MAKE)s, *not* from the current run! -ifeq ($(BUILTINS_REMOVED),) - export BUILTINS_REMOVED = yes - MAKE:=$(MAKE) --no-builtin-rules - include $(stepdir)/no-builtin-rules.make -endif -.SUFFIXES: - -all: - --include $(addprefix $(depth)/make/,$(addsuffix -inclusions.make, $(LOCALSTEPMAKE_TEMPLATES))) - --include $(addprefix $(stepdir)/,$(addsuffix -inclusions.make, $(STEPMAKE_TEMPLATES))) - - -include $(addprefix $(stepdir)/,$(addsuffix -vars.make, $(STEPMAKE_TEMPLATES))) - -# ugh. need to do this because of PATH :=$(topdir)/..:$(PATH) -include $(addprefix $(depth)/make/,$(addsuffix -vars.make, $(LOCALSTEPMAKE_TEMPLATES))) - - -include $(addprefix $(depth)/make/,$(addsuffix -rules.make, $(LOCALSTEPMAKE_TEMPLATES))) -include $(addprefix $(stepdir)/,$(addsuffix -rules.make, $(STEPMAKE_TEMPLATES))) -include $(addprefix $(depth)/make/,$(addsuffix -targets.make, $(LOCALSTEPMAKE_TEMPLATES))) -include $(addprefix $(stepdir)/,$(addsuffix -targets.make, $(STEPMAKE_TEMPLATES))) - - diff --git a/stepmake/make/stepmake.spec.in b/stepmake/make/stepmake.spec.in deleted file mode 100644 index ded7146fe6..0000000000 --- a/stepmake/make/stepmake.spec.in +++ /dev/null @@ -1,26 +0,0 @@ -Name: @package@ -Version: @TOPLEVEL_VERSION@ -Release: 1 -Copyright: GPL -Group: Development -Source0: pcnov095.win.tue.nl:/pub/lilypond/development/@package@-@TOPLEVEL_VERSION@.tar.gz -Summary: generic make package -Packager: janneke@gnu.org (Jan Nieuwenhuizen) -Buildroot: /tmp/stepmake-install - -%description -@BLURB@ - -%prep -%setup -%build -./configure --prefix=/usr -make all -%install -rm -rf $RPM_BUILD_ROOT -make prefix="$RPM_BUILD_ROOT/usr" install -%files -# urg -/usr/bin/make-patch -%post - diff --git a/stepmake/make/substitute.make b/stepmake/make/substitute.make deleted file mode 100644 index 5c12e737dd..0000000000 --- a/stepmake/make/substitute.make +++ /dev/null @@ -1,18 +0,0 @@ -# Substitute.make - -include $(stepdir)/substitute-vars.make -ATVARIABLES = \ - BASH\ - DATE\ - date\ - DIR_DATADIR\ - PACKAGE\ - package\ - PERL\ - PYTHON\ - SHELL\ - TOPLEVEL_VERSION\ - step-bindir\ - abs-step-bindir\ - - diff --git a/stepmake/make/toplevel-version.make b/stepmake/make/toplevel-version.make deleted file mode 100644 index a79dd82674..0000000000 --- a/stepmake/make/toplevel-version.make +++ /dev/null @@ -1,7 +0,0 @@ - -include $(depth)/VERSION -TOPLEVEL_MAJOR_VERSION:=$(MAJOR_VERSION) -TOPLEVEL_MINOR_VERSION:=$(MINOR_VERSION) -TOPLEVEL_PATCH_LEVEL:=$(PATCH_LEVEL) -# use to send patches, always empty for released version: -TOPLEVEL_MY_PATCH_LEVEL:=$(MY_PATCH_LEVEL) diff --git a/stepmake/make/user.make b/stepmake/make/user.make deleted file mode 100644 index 598bc732fb..0000000000 --- a/stepmake/make/user.make +++ /dev/null @@ -1,15 +0,0 @@ -# title user changeable settings -# file make/User.make - -# will be split into CFLAGS/EXTRA_CFLAGS etc, -# so that defineable generically and per module - -# -# -lefence = ElectricFence. -# -# ElectricFence is a memory debugger which uses the -# VM hardware to trap malloc/free errors. -# - -EXTRALIB+= #-lefence - diff --git a/stepmake/stepmake/GNUmakefile b/stepmake/stepmake/GNUmakefile index 9c4cf823ef..a2336555bd 100644 --- a/stepmake/stepmake/GNUmakefile +++ b/stepmake/stepmake/GNUmakefile @@ -2,7 +2,7 @@ # subdir level: # -depth = .. +depth = ../.. # # descent order into subdirectories: diff --git a/stepmake/stepmake/generic-targets.make b/stepmake/stepmake/generic-targets.make index 8aa0c34d04..0d3eb08a0c 100644 --- a/stepmake/stepmake/generic-targets.make +++ b/stepmake/stepmake/generic-targets.make @@ -95,12 +95,13 @@ TAGS: $(LOOP) -# ugh . -> $(outdir) -$(outdir)/VERSION: $(depth)/VERSION - cp -p $< $@ - -$(outdir)/version.hh: $(outdir)/VERSION - $(PYTHON) $(step-bindir)/make-version.py $< > $@ +$(outdir)/version.hh: $(config_make) + $(PYTHON) $(step-bindir)/make-version.py PACKAGE_NAME=$(PACKAGE_NAME) \ + MAJOR_VERSION=$(MAJOR_VERSION) \ + MINOR_VERSION=$(MINOR_VERSION) \ + MY_PATCH_LEVEL=$(MY_PATCH_LEVEL) \ + PATCH_LEVEL=$(PATCH_LEVEL) \ + > $@ $(outdir)/config.h: $(config_h) cp -p $< $@ diff --git a/stepmake/stepmake/makedir-targets.make b/stepmake/stepmake/makedir-targets.make index e175c3e807..0a63d9f7ab 100644 --- a/stepmake/stepmake/makedir-targets.make +++ b/stepmake/stepmake/makedir-targets.make @@ -1,5 +1,3 @@ spec: $(OUTSPEC_FILES) -$(OUTSPEC_FILES): $(depth)/VERSION -$(OUTLSM_FILES): $(depth)/VERSION diff --git a/stepmake/stepmake/pod-rules.make b/stepmake/stepmake/pod-rules.make index e490e9424c..d0b4628b4c 100644 --- a/stepmake/stepmake/pod-rules.make +++ b/stepmake/stepmake/pod-rules.make @@ -13,7 +13,7 @@ POD2HTML_5004=$(POD2HTML) --noindex --infile $< --outfile=$@; sh $(depth)/bin/a do_pod2html=$($(POD2HTML_VERSION)) -$(outdir)/%.html: $(outdir)/%.pod $(depth)/VERSION +$(outdir)/%.html: $(outdir)/%.pod $(do_pod2html) $(outdir)/%.pod: %.pod diff --git a/stepmake/stepmake/script-rules.make b/stepmake/stepmake/script-rules.make index 9fdd799eb3..2eb18a50fe 100644 --- a/stepmake/stepmake/script-rules.make +++ b/stepmake/stepmake/script-rules.make @@ -1,25 +1,25 @@ -$(outdir)/%: %.pl $(config_make) $(depth)/VERSION +$(outdir)/%: %.pl $(config_make) cat $< | sed $(sed-atvariables) > $@ chmod 755 $@ -$(outdir)/%: %.bash $(config_make) $(depth)/VERSION +$(outdir)/%: %.bash $(config_make) cat $< | sed $(sed-atvariables) > $@ chmod 755 $@ -$(outdir)/%: %.scm $(config_make) $(depth)/VERSION +$(outdir)/%: %.scm $(config_make) cat $< | sed $(sed-atvariables) > $@ chmod 755 $@ -$(outdir)/%: %.expect $(config_make) $(depth)/VERSION +$(outdir)/%: %.expect $(config_make) cat $< | sed $(sed-atvariables) > $@ chmod 755 $@ -$(outdir)/%: %.sh $(config_make) $(depth)/VERSION +$(outdir)/%: %.sh $(config_make) cat $< | sed $(sed-atvariables) > $@ chmod 755 $@ -$(outdir)/%: %.py $(config_make) $(depth)/VERSION +$(outdir)/%: %.py $(config_make) cat $< | sed $(sed-atvariables) > $@ chmod 755 $@ -- 2.39.5