From: Han-Wen Nienhuys Date: Fri, 16 Mar 2001 09:56:30 +0000 (+0100) Subject: release: 1.3.138 X-Git-Tag: release/1.3.138 X-Git-Url: https://git.donarmstrong.com/lilypond.git?a=commitdiff_plain;h=refs%2Ftags%2Frelease%2F1.3.138;p=lilypond.git release: 1.3.138 ============ * Bugfix: ly2dvi: handle input files with multiple extensions. * Minor doco updates. * Bugfix: ly2dvi: can't remove cwd on Solaris. * Better --enable-conf=CONF message, better INSTALL.tely documentation. * Bugfix: built of Documentation/user for different conf=CONF. * Don't append "." to version string without my_patch_level. * Faked titling for tutorial example. * Bugfix: don't override GUILE environment settings. * Small refman fixes. * Better tutorial orchestral score example. * Bugfix: input/test/hshift.ly * Fixed looks of configure options. * Bugfix: ly2dvi: linewidth < 0. * Bugfix: documentation build: fixed two macros in refman that makeinfo groks, but make texi2dvi barf. * Bugfix: listing of engraver contexts in autogenerated documentation. 1.3.137. --- diff --git a/CHANGES b/CHANGES index 52e9b3af52..987b9849e9 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,3 @@ ---- ../lilypond-1.3.137.jcn3/CHANGES Thu Mar 15 18:57:45 2001 -++ b/CHANGES Fri Mar 16 09:55:00 2001 -@@ -1,3 +1,10 @@ 1.3.137.jcn4 ============ @@ -8,14 +5,6 @@ * Minor doco updates. - 1.3.136.jcn3 - ============ - --- ../lilypond-1.3.137.jcn2/CHANGES Wed Mar 14 23:37:02 2001 -++ b/CHANGES Thu Mar 15 18:57:45 2001 -@@ -1,3 +1,18 @@ -1.3.136.jcn3 -============ - * Bugfix: ly2dvi: can't remove cwd on Solaris. * Better --enable-conf=CONF message, better INSTALL.tely documentation. @@ -28,14 +17,6 @@ * Bugfix: don't override GUILE environment settings. - 1.3.136.jcn2 - ============ - --- ../lilypond-1.3.137.jcn1/CHANGES Mon Mar 12 22:39:39 2001 -++ b/CHANGES Wed Mar 14 23:37:02 2001 -@@ -1,3 +1,14 @@ -1.3.136.jcn2 -============ - * Small refman fixes. * Better tutorial orchestral score example. @@ -44,29 +25,33 @@ * Fixed looks of configure options. - 1.3.136.jcn1 - ============ - --- ../lilypond-1.3.137/CHANGES Sun Mar 11 20:00:15 2001 -++ b/CHANGES Mon Mar 12 22:39:39 2001 -@@ -1,3 +1,13 @@ -1.3.136.jcn1 -============ - * Bugfix: ly2dvi: linewidth < 0. -* Bugfix: documentation build: fixed two macros in refman, that +* Bugfix: documentation build: fixed two macros in refman that makeinfo groks, but make texi2dvi barf. -* Bugfix: listing of engraver contexts in autogerated documentation. +* Bugfix: listing of engraver contexts in autogenerated documentation. - 1.3.136.hwn2 - ============ - 1.3.137.rz1 +1.3.137.uu1 =========== -* Added nested staffgroups/choirstaffs support +* Added function (ly-music-name ), returns the name of a music objects as a +string. + +* Bugfix: \relative on \chords is no-op. (Added Un_relativable_music) + +* Refman documentation fixes. + +* Property undefine: + + \property X.Y \unset + +undoes \property X.Y = Z. \unset is confusingly asymetric with \set. + +* removed ChordNamesVoice -* Finished german-chords.ly and moved it to ly/ +* added \alias STRING ; to translator definition, so \name +RhythmicStaff, \alias Staff is found for \property Staff.XXX 1.3.136.hwn2 ============ diff --git a/Documentation/user/appendices.itely b/Documentation/user/appendices.itely new file mode 100644 index 0000000000..800cd82d63 --- /dev/null +++ b/Documentation/user/appendices.itely @@ -0,0 +1,200 @@ +@node Refman appendix +@appendix Refman appendix + +@menu +* Lyrics mode definition:: +* American Chords :: +* Jazz chords:: +* MIDI instruments:: +@end menu + +@node Lyrics mode definition +@section Lyrics mode definition + +A word in Lyrics mode begins with: an alphabetic character, @code{_}, +@code{?}, @code{!}, @code{:}, @code{'}, the control characters @code{^A} +through @code{^F}, @code{^Q} through @code{^W}, @code{^Y}, @code{^^}, +any 8-bit character with ASCII code over 127, or a two-character +combination of a backslash followed by one of @code{`}, @code{'}, +@code{"}, or @code{^}. + +Subsequent characters of a word can be any character that is not a digit +and not white space. One important consequence of this is that a word +can end with `@code{@}}', which may be confusing. However, LilyPond will +issue a warning. Any @code{_} character which appears in an unquoted +word is converted to a space. This provides a mechanism for introducing +spaces into words without using quotes. Quoted words can also be used +in Lyrics mode to specify words that cannot be written with the above +rules. + + +@node American Chords +@section American Chords + + +@quotation +@lilypond[verbatim] +\include "english.ly" + +scheme = \chords { + c % Major triad + cs:m % Minor triad + df:m5- % Diminished triad + c:5^3 % Root-fifth chord + c:4^3 % Suspended fourth triad + c:5+ % Augmented triad + c:2^3 % "2" chord + c:m5-.7- % Diminished seventh + c:7+ % Major seventh + c:7.4^3 % Dominant seventh suspended fourth + c:5+.7 % Augmented dominant seventh + c:m5-.7 % "Half" diminished seventh + c:5-.7 % Dominant seventh flat fifth + c:5-.7+ % Major seventh flat fifth + c:m7+ % Minor-major seventh + c:m7 % Minor seventh + c:7 % Dominant seventh + c:6 % Major sixth + c:m6 % Minor sixth + c:9^7 % Major triad w/added ninth + c:6.9^7 % Six/Nine chord + c:9 % Dominant ninth + c:7+.9 % Major ninth + c:m7.9 % Minor ninth +} + +\score { + \notes < + \context ChordNames \scheme + \context Staff \transpose c'' \scheme + > + \paper { + \translator { + \ChordNamesContext + ChordName \override #'word-space = #1 + ChordName \override #'style = #'american + } + } +} +@end lilypond +@end quotation + +@node Jazz chords +@section Jazz chords + +Similarly, Jazz style chord names are implemented as a variation on +American style names: +@quotation +@lilypond[verbatim] +scheme = \chords { + % major chords + c + c:6 % 6 = major triad with added sixth + c:maj % triangle = maj + c:6.9^7 % 6/9 + c:9^7 % add9 + + % minor chords + c:m % m = minor triad + c:m.6 % m6 = minor triad with added sixth + c:m.7+ % m triangle = minor major seventh chord + c:3-.6.9^7 % m6/9 + c:m.7 % m7 + c:3-.9 % m9 + c:3-.9^7 % madd9 + + % dominant chords + c:7 % 7 = dominant + c:7.5+ % +7 = augmented dominant + c:7.5- % 7b5 = hard diminished dominant + c:9 % 7(9) + c:9- % 7(b9) + c:9+ % 7(#9) + c:13^9.11 % 7(13) + c:13-^9.11 % 7(b13) + c:13^11 % 7(9,13) + c:13.9-^11 % 7(b9,13) + c:13.9+^11 % 7(#9,13) + c:13-^11 % 7(9,b13) + c:13-.9-^11 % 7(b9,b13) + c:13-.9+^11 % 7(#9,b13) + + % half diminished chords + c:m5-.7 % slashed o = m7b5 + c:9.3-.5- % o/7(pure 9) + + % diminished chords + c:m5-.7- % o = diminished seventh chord +} + +\score { + \notes < + \context ChordNames \scheme + \context Staff \transpose c'' \scheme + > + \paper { + \translator { + \ChordNamesContext + ChordName \override #'word-space = #1 + ChordName \override #'style = #'jazz + } + } +} +@end lilypond +@end quotation + + +[barnumbers look silly, fixme.] + + + +@node MIDI instruments +@section MIDI instruments + +[todo: make nicely formatted table] + +@example +"acoustic grand" "contrabass" "lead 7 (fifths)" +"bright acoustic" "tremolo strings" "lead 8 (bass+lead)" +"electric grand" "pizzicato strings" "pad 1 (new age)" +"honky-tonk" "orchestral strings" "pad 2 (warm)" +"electric piano 1" "timpani" "pad 3 (polysynth)" +"electric piano 2" "string ensemble 1" "pad 4 (choir)" +"harpsichord" "string ensemble 2" "pad 5 (bowed)" +"clav" "synthstrings 1" "pad 6 (metallic)" +"celesta" "synthstrings 2" "pad 7 (halo)" +"glockenspiel" "choir aahs" "pad 8 (sweep)" +"music box" "voice oohs" "fx 1 (rain)" +"vibraphone" "synth voice" "fx 2 (soundtrack)" +"marimba" "orchestra hit" "fx 3 (crystal)" +"xylophone" "trumpet" "fx 4 (atmosphere)" +"tubular bells" "trombone" "fx 5 (brightness)" +"dulcimer" "tuba" "fx 6 (goblins)" +"drawbar organ" "muted trumpet" "fx 7 (echoes)" +"percussive organ" "french horn" "fx 8 (sci-fi)" +"rock organ" "brass section" "sitar" +"church organ" "synthbrass 1" "banjo" +"reed organ" "synthbrass 2" "shamisen" +"accordion" "soprano sax" "koto" +"harmonica" "alto sax" "kalimba" +"concertina" "tenor sax" "bagpipe" +"acoustic guitar (nylon)" "baritone sax" "fiddle" +"acoustic guitar (steel)" "oboe" "shanai" +"electric guitar (jazz)" "english horn" "tinkle bell" +"electric guitar (clean)" "bassoon" "agogo" +"electric guitar (muted)" "clarinet" "steel drums" +"overdriven guitar" "piccolo" "woodblock" +"distorted guitar" "flute" "taiko drum" +"guitar harmonics" "recorder" "melodic tom" +"acoustic bass" "pan flute" "synth drum" +"electric bass (finger)" "blown bottle" "reverse cymbal" +"electric bass (pick)" "skakuhachi" "guitar fret noise" +"fretless bass" "whistle" "breath noise" +"slap bass 1" "ocarina" "seashore" +"slap bass 2" "lead 1 (square)" "bird tweet" +"synth bass 1" "lead 2 (sawtooth)" "telephone ring" +"synth bass 2" "lead 3 (calliope)" "helicopter" +"violin" "lead 4 (chiff)" "applause" +"viola" "lead 5 (charang)" "gunshot" +"cello" "lead 6 (voice)" +@end example diff --git a/Documentation/user/lilypond.tely b/Documentation/user/lilypond.tely index df41118a1e..fb4aeb07f9 100644 --- a/Documentation/user/lilypond.tely +++ b/Documentation/user/lilypond.tely @@ -80,8 +80,9 @@ this and other documentation. * Internals:: How it all works. * Literature:: additional reading * Index of internals:(lilypond-internals). Auto generated detailed documentation. -* Index:: Unified index. -* Function Index:: Function index. +* Index:: Unified index. +* Function Index:: Function index. +* Refman appendix:: * GNU Free Documentation License:: FDL. @end menu @end ifnottex @@ -114,6 +115,7 @@ this and other documentation. @printindex fn +@mbinclude appendices.itely @mbinclude fdl.itexi @bye diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely index 1949f18f41..d3dd01d641 100644 --- a/Documentation/user/refman.itely +++ b/Documentation/user/refman.itely @@ -17,6 +17,11 @@ @end ignore +@macro refbugs +@unnumberedsubsec Bugs +@end macro + + @c .{Reference Manual} @node Reference Manual @@ -44,8 +49,9 @@ revision of this document was for LilyPond 1.3.136. * Page layout:: * Sound:: * Music entry:: -* Engravers:: +* Interpretation context:: * Syntactic details:: +* Lexical details:: @end menu @c . {Overview} @@ -361,10 +367,18 @@ exactly the same concept. @lilypond[fragment, singleline] c'2 c'4 ~ c'4 @end lilypond + +@refbugs + At present, the tie is implemented as a separate thing, temporally located in between the notes. There is also no way to convert between tied notes, dotted notes and plain notes. +Tieing only a subset of the note heads of a chord is not supported in a +simple way. It can be achieved by moving the tie-engraver into Thread +context and turning off ties per Thread. + + @c . {Tuplets} @menu * Tuplets:: @@ -576,7 +590,6 @@ Internally, this is a short-cut for doing [TODO: discuss options for layout] - @c . {Partial} @subsubsection Partial @cindex Partial @@ -622,6 +635,23 @@ You are encouraged to use @code{\repeat} for repetitions. See documentation. +@cindex Bar_line_engraver +@cindex whichBar +@cindex repeatCommands +@cindex defaultBarType + +Bar lines are created by the @code{Bar_line_engraver}. That engraver examines +@code{whichBar} at every moment. Whenever it is set to a string, it will +create a bar with that type. @code{whichBar} is usually set +automatically: at the start of a measure it is set to +@code{defaultBarType}. The contents of @code{repeatCommands} is used to +override default measure bars. + +@code{whichBar} can also be set directly, using @code{\property} or +@code{\bar ; }. These settings take precedence over automatic @code{whichBar} +settings. + + @c . {Polyphony} @node Polyphony @section Polyphony @@ -851,6 +881,7 @@ stems might look better: @end lilypond @end quotation + Similarly, the curvature of a slur is adjusted to stay clear of note heads and stems. When that would increase the curvature too much, the slur is reverted to its default shape. The threshold for this decision @@ -863,7 +894,7 @@ express this by increasing the @code{beautiful} value: [dit voorbeeld is te lang: junken, of inkorten] @quotation -@lilypond[verbatim] +@lilypond[verbatim,singleline] \score { \notes \context PianoStaff < \time 6/4; @@ -877,7 +908,6 @@ express this by increasing the @code{beautiful} value: > > \paper { - linewidth = -1.; \translator { \VoiceContext Slur \override #'beautiful = #5.0 @@ -904,7 +934,9 @@ express this by increasing the @code{beautiful} value: @cindex phrasing mark A phrasing slur (or phrasing mark) connects chords and is used to -indicate a musical sentence. It is entered using @code{\(} and @code{\)}. +indicate a musical sentence. It is entered using @code{\(} and +@code{\)}. + @lilypond[fragment,verbatim,center,relative] \time 6/4; c''\((d)e f(e)\)d @end lilypond @@ -925,6 +957,34 @@ Currently, only tick marks are supported, comma style breath marks are not. The grob for this object is called @code{Voice.BreathingSign}. +@refbugs + + Currently, only tick marks are supported, comma style breath marks are +not. + + +@c . {Tempo} +@node Tempo +@subsection Tempo +@cindex Tempo +@cindex beats per minute +@cindex metronome marking + +@cindex @code{\tempo} +@example + \tempo @var{duration} = @var{perminute} @code{;} +@end example + +Used to specify the tempo. For example, @code{\tempo 4 = 76;} requests +output with 76 quarter notes per minute. + +@refbugs + +The tempo setting is not printed, but is currently only used in the MIDI +output. + + + @c . {Text spanner} @menu @@ -947,7 +1007,7 @@ LilyPond will respond by creating a @code{Voice.TextSpanner} grob. The string to be printed, as well as the style is set through grob properties. -An application ---or rather, a hack---is to fake octavation indications. +An application---or rather, a hack---is to fake octavation indications. @lilypond[fragment,relative,verbatim] \relative c' { a'''' b c a \property Voice.TextSpanner \set #'type = #'dotted-line @@ -1016,8 +1076,6 @@ name of the corresponding symbol appearing underneath. } } @end lilypond -All of these note ornaments appear in the printed output but have no -effect on the MIDI rendering of the music. To save typing work, some shorthands are available: @lilypond[singleline] @@ -1042,10 +1100,6 @@ Fingering instructions can also be entered in this shorthand. c'4-1 c'4-2 c'4-3 c'4-4 @end lilypond -Unfortunately, there is no support adding fingering instructions to -individual note heads. Some hacks exist, though. See -@file{input/test/script-horizontal.ly}. - @cindex @code{\script} @cindex scripts @@ -1064,6 +1118,15 @@ helpful identifier definitions appear in @file{script.ly}. For information on how to add scripts, consult @file{scm/script.scm}. +@refbugs + +All of these note ornaments appear in the printed output but have no +effect on the MIDI rendering of the music. + +Unfortunately, there is no support adding fingering instructions or +ornaments to individual note heads. Some hacks exist, though. See +@file{input/test/script-horizontal.ly}. + @c . {Text scripts} @node Text scripts @@ -1096,7 +1159,7 @@ string or a markup text. @example foo = \textscript #'(finger "6") - @dots{} + [..] c4-\foo @end example @@ -1163,6 +1226,8 @@ A grace note expression has duration 0; the next real note is assumed to be the main note. If you want the note to appear after the main note, set @code{Voice.graceAlignPosition} to @code{1}. +@refbugs + The present implementation of grace notes is not robust and generally kludgy. We expect it to change after LilyPond 1.4. Syntax changes might also be implemented. @@ -1192,6 +1257,8 @@ note: @end lilypond @end quotation +@refbugs + Printing of an additional text (such as @emph{gliss.}) must be done manually. @@ -1379,6 +1446,8 @@ the specified number of repeats. @end lilypond @end quotation +@refbugs + As you can see, LilyPond doesn't remember the timing information, nor are slurs or ties repeated, so you have to reset timing information after a repeat, e.g. using a bar-check (See @ref{Bar check}), @@ -1417,8 +1486,6 @@ command can be @end lilypond -[explain precendence: \bar, repeatCommands, whichBar, defaultBarType] - @node Tremolo repeats @subsection Tremolo repeats @cindex tremolo beams @@ -1436,6 +1503,9 @@ style. } @end lilypond +@refbugs + + At present, the spacing between tremolo beams is not regular, since the spacing engine does not notice that not all notes are printed. @@ -1456,6 +1526,9 @@ length is omitted, then then the last value (stored in Using this mechanism pays off when you entering many tremolos, since the default argument saves a lot of typing. +@refbugs + + Tremolos in this style do not carry over into the MIDI output. @@ -1553,21 +1626,24 @@ context which is a direct child of the a context of type @subsection Pedals @cindex Pedals -Piano pedals can be entered using the span requests (See @ref{Span -requests}) of the types @code{Sustain}, @code{UnaChorda} and -@code{Sostenuto}: +Piano pedal instruction can be expressed using +@code{\sustainDown}, @code{\sustainUp}, @code{\unaChorda}, +@code{\treChorde}, @code{\sostenutoDown} and @code{\sostenutoUp}. + +These identifiers are short hands for spanner commands of the types +@code{Sustain}, @code{UnaChorda} and @code{Sostenuto}: @lilypond[fragment,verbatim] -c''4 \spanrequest \start "Sustain" c4 c4 \spanrequest \stop "Sustain" +c''4 \spanrequest \start "Sustain" c''4 c''4 \spanrequest \stop "Sustain" @end lilypond -For these verbose expressions, standard shorthands have been defined: -@code{sustainDown}, @code{sustainUp}, @code{unaChorda}, -@code{treChorde}, @code{sostenutoDown} and @code{sostenutoUp}. The -symbols that are printed can be modified by setting +The symbols that are printed can be modified by setting @code{pedal@var{X}Strings}, where @var{X} is one of the pedal types. Refer to the generated documentation for more information. +@refbugs + + Currently, brackets are not supported, only text markings (ie. *Ped style). @@ -1604,18 +1680,23 @@ to the chords in both staffs, and set @end lilypond @end quotation -This command creates @code{Arpeggio} grobs. It is not possible to mix +This command creates @code{Arpeggio} grobs. + +@refbugs + + It is not possible to mix connected arpeggios and unconnected arpeggios at the same time. @c . {Follow Thread} @node Follow Thread @subsection Follow Thread + @cindex follow thread @cindex staff switching @cindex cross staff -[todo: different name, eg. voice line ? ] +[todo: figure out different name, eg. voice line, switch indicator ? ] @cindex @code{followThread} @@ -1655,151 +1736,80 @@ can be printed automatically. This is enabled if the property @subsection Lyrics mode @cindex Lyrics mode -@cindex lyric mode -@cindex @code{\lyrics} +To print lyrics in LilyPond, you must first make a music expression from +the lyric text. When they're in a music expression, that music +expression can be printed by selecting an appropriate context. We shall +discuss lyric printing in this order. -Lyrics mode is introduced by the keyword @code{\lyrics}. This mode has -rules that make it easy to include punctuation and diacritical marks in -words: The purpose of Lyrics mode is that you can enter lyrics in @TeX{} -format or a standard encoding without needing quotes. The precise -definition of this mode is ludicrous, and this will remain so until the -authors of LilyPond acquire a deeper understanding of character -encoding, or someone else steps up to fix this. - -A word in Lyrics mode begins with: an alphabetic character, @code{_}, -@code{?}, @code{!}, @code{:}, @code{'}, the control characters @code{^A} -through @code{^F}, @code{^Q} through @code{^W}, @code{^Y}, @code{^^}, -any 8-bit character with ASCII code over 127, or a two-character -combination of a backslash followed by one of @code{`}, @code{'}, -@code{"}, or @code{^}. - -Subsequent characters of a word can be any character that is not a digit -and not white space. One important consequence of this is that a word -can end with `@code{@}}', which may be confusing. However, LilyPond will -issue a warning. Any @code{_} character which appears in an unquoted -word is converted to a space. This provides a mechanism for introducing -spaces into words without using quotes. Quoted words can also be used -in Lyrics mode to specify words that cannot be written with the above -rules. Here are some examples. Not all of these words are printable by -@TeX{}. -@example -Ah! % a word -2B_||_!2B % not a word because it starts with a digit -``Hello'' % not a word because it starts with ` -_ _ _ _ % 4 words, each one a space -@end example +@cindex lyric mode +@cindex @code{\lyrics} -Since combinations of numbers and dots are used for indicating -durations, you can not enter real numbers in this mode. +You can enter lyrics in a special input mode of LilyPond. This mode is +called Lyrics mode, and it is introduced by the keyword @code{\lyrics}. +The purpose of this mode is that you can enter lyrics as plain text, +punctuation and accents without any hassle. -@cindex lyrics expressions +The precise definition of this mode is in @ref{Lyrics mode +definition}. The definition itself is ludicrous, and this will remain so +until the authors of LilyPond acquire a deeper understanding of +character encoding, or someone else steps up to fix this. Syllables are entered like notes, with pitches replaced by text. For -example, @code{Twin-4 kle4 twin-4 kle4} enters four syllables, each -with quarter note duration. Note that the hyphen has no special -meaning for lyrics, and does not introduce special symbols. See -@ref{Lexical modes} for a description of what is interpreted as -lyrics. +example, @code{Twin- kle twin- kle} enters four syllables. Note that +the hyphen has no special meaning for lyrics, and does not introduce +special symbols. Spaces can be introduced into a lyric either by using quotes (@code{"}) or by using an underscore without quotes: @code{He_could4 -not4}. All unquoted underscores are converted to spaces. Printing -lyrics is discussed in the next section. - +not4}. All unquoted underscores are converted to spaces. @c . {Printing lyrics} @node Printing lyrics @subsection Printing lyrics @cindex lyrics +Normally, you will want to have notes and syllables matched +automatically. This is accomplished using @code{\addlyrics}, which is +documented in @ref{Automatic syllable durations}. Setting +@code{automaticMelismata} in the melody staff, will cause slurs to be +interpreted as melismata. Lyric syllables must be interpreted within a +@code{Lyrics} context in order to printing them. -Lyric syllables must be interpreted within a @code{Lyrics} context for -printing them. Here is a full example: - -@quotation -@lilypond[verbatim] -\score { - < - \notes \transpose c'' { - c d e c | c d e c | - e f g2 | e4 f g2 \bar "|."; - } +@lilypond[verbatim,singleline] +\addlyrics \notes \relative c' { + \time 7/4; + \property Staff.automaticMelismata = ##t + d'2 c4 b2 a2 + b2 c4 b4 () a4 g2 } \context Lyrics \lyrics { - Va-4 der Ja- cob Va- der Ja- cob - Slaapt gij nog?2 Slaapt4 gij nog?2 - } - > -} - + Join us now and + share the so -- ftware; } @end lilypond -@end quotation - - - @cindex extender @cindex lyric extender +@cindex melisma -You may want a continuous line after the syllables to show melismata. -To achieve this effect, add a @code{__} lyric as a separate word -after the lyric to be extended. This will create an extender, a line -that extends over the entire duration of the lyric. This line will -run all the way to the start of the next lyric, so you may want to -shorten it by using a blank lyric (using @code{_}). - -@quotation - -@lilypond[verbatim] -\score { - < - \notes \relative c'' { - a4 () b () c () d | c () d () b () a | c () d () b () a - } - \context Lyrics \lyrics { - foo1 __ | bar2. __ _4 | baz1 __ - } - > -} - -@end lilypond -@end quotation +As you can see, extender lines are entered as @code{__}. This will +create an extender, a line that extends over the entire duration of the +lyric. This line will run all the way to the start of the next lyric, +so you may want to shorten it by using a blank lyric (using @code{_}). -@cindex Lyric hyphen +@cindex hyphen If you want to have hyphens centered between syllables (rather than attached to the end of the first syllable) you can use the special `@code{-}@code{-}' lyric as a separate word between syllables. This will result in a hyphen which length varies depending on the space between syllables, and which will be centered between the syllables. -For example: - -@quotation - -@lilypond[verbatim] -\score { - < - \notes \transpose c'' { - c d e c | c d e c | - e f g2 | e4 f g2 \bar "|."; - } - \context Lyrics \lyrics { - Va4 -- der Ja -- cob | Va -- der Ja -- cob | - Slaapt gij nog?2 | Slaapt4 gij nog?2 - } - > -} - -@end lilypond -@end quotation +@cindex Lyric hyphen -@c . {Automatic syllable durations} @node Automatic syllable durations @subsection Automatic syllable durations @cindex Automatic syllable durations - @cindex automatic lyric durations @cindex @code{\addlyrics} @@ -1820,7 +1830,6 @@ If the property @code{automaticMelismata} is set in the context of @var{musicexpr1}, no lyrics will be put on slurred or tied notes. -@quotation @lilypond[verbatim,fragment] \addlyrics \transpose c'' { @@ -1830,13 +1839,24 @@ notes. \context Lyrics \lyrics { do4 re mi fa } @end lilypond -@end quotation -You should use a single rhythm melody, and single rhythm lyrics (a -constant duration is the obvious choice). If you do not, you will get -undesired effects when using multiple stanzas: +If you want the lyric lines to be above the melody staff, or in some +other, more complex configuration, then build that configuration first +using simultaneous music, and use @code{\addlyrics} after that. + +@lilypond[verbatim, singleline] +\notes < + \context Lyrics = LA { s1 } + \context Staff = SA { s1 } + \addlyrics + \context Staff = SA \relative c' { c4 e g g } + \context Lyrics = LA \lyrics { geen ge -- don -- der } > +@end lilypond + +For @code{\addlyrics} you should use a single rhythm melody, and single +rhythm lyrics (a constant duration is the obvious choice). If you do +not, you can get undesired effects when using multiple stanzas: -@quotation @lilypond[verbatim,fragment] \addlyrics \transpose c'' { @@ -1845,9 +1865,7 @@ undesired effects when using multiple stanzas: \context Lyrics \lyrics < { do4 re mi fa } { do8 re mi fa } > - @end lilypond -@end quotation It is valid (but probably not very useful) to use notes instead of lyrics for @var{musicexpr2}. @@ -1870,7 +1888,8 @@ identity is @code{duet}, and the identities of the LyricsVoices are @lilypond[singleline,verbatim] \score { \addlyrics - \notes \relative c'' \context Voice = duet { \time 3/4; g2 e4 a2 f4 g2. } + \notes \relative c'' \context Voice = duet { \time 3/4; + g2 e4 a2 f4 g2. } \lyrics \context Lyrics < \context LyricsVoice = "duet-1" { \property LyricsVoice . stanza = "Bert" @@ -1893,11 +1912,35 @@ first system) and @code{LyricsVoice.stz} for the following systems. @section Chords @cindex Chords -[chords vs. simultaneous music] +LilyPond has support for both entering and printing chords. Chords are +a harmonic device that is characterized by a set of pitches. It is +something different from simultaneous music, although you can express a +chord using simultaneous music. In fact, chords are internally stored as +simultaneous music expressions. This means you can enter chords by name, +and print them as note head, or enter as notes and print as chord names: + + +@lilypond[verbatim,singleline] +twoWays = \notes \transpose c'' { + \chords { + c1 f:sus4 bes/f + } + + + + } + +\score { + < \context ChordNames \twoWays + \context Staff \twoWays > } +@end lilypond + +Note that this example also shows that the LilyPond chord does not +attempt to be intelligent, if you enter @code{f bes d}, it does no +attempt to find out whether it this is an inversion. @menu * Chords mode:: -* Entering named chords:: * Printing named chords:: @end menu @@ -1906,25 +1949,15 @@ first system) and @code{LyricsVoice.stz} for the following systems. @subsection Chords mode @cindex Chords mode -Chord mode is introduced by the keyword -@code{\chords}. It is similar to Note mode, but -words are also looked up in a chord modifier table (containing -@code{maj}, @code{dim}, etc). - -Since combinations of numbers and dots are used for indicating -durations, you can not enter real numbers in this mode. Dashes -and carets are used to indicate chord additions and subtractions, -so scripts can not be entered in Chord mode. +Chord mode is a mode where you can input sets of pitches using common +names. It is introduced by the keyword @code{\chords}. It is similar +to note mode, but words are also looked up in a chord modifier table +(containing @code{maj}, @code{dim}, etc). -@c . {Entering named chords} -@node Entering named chords -@subsection Entering named chords -@cindex Chords names - -Chord names are a way to generate simultaneous music expressions that -correspond with traditional chord names. It can only be used in -Chord mode (see @ref{Lexical modes}). +Dashes and carets are used to indicate chord additions and subtractions, +so articulation scripts can not be entered in Chord mode. +The syntax for named chords is as follows: @example @var{tonic}[@var{duration}][@code{-}@var{modifiers}][@code{^}@var{subtractions}][@code{/}@var{inversion}][@code{/+}@var{bass}]. @@ -1940,7 +1973,6 @@ the specified interval and all lower odd numbered intervals to the chord, and it may lower or raise the specified interval. Intervals must be separated by a dot (@code{.}). - Throughout these examples, chords have been shifted around the staff using @code{\transpose}. @@ -1997,11 +2029,10 @@ separated by dots. @end lilypond @cindex @code{/} -Chord inversions can be specified by appending `@code{/}' and -the name of a single note to a chord. This has the effect of -lowering the specified note by an octave so it becomes the lowest -note in the chord. If the specified note is not in the chord, a -warning will be printed. +Chord inversions can be specified by appending `@code{/}' and the name +of a single note to a chord. In a chord inversion, the inverted note is +transposed down until it is the lowest note in the chord. If the +specified note is not in the chord, a warning will be printed. @lilypond[fragment,verbatim,center] \transpose c''' { @@ -2027,28 +2058,22 @@ so it becomes the lowest note in the chord. @end lilypond -The most interesting application is printing chord names, which is -explained in the next subsection. -You should not combine @code{\relative} with named chords. [FIXME] + @c . {Printing named chords} @node Printing named chords @subsection Printing named chords - - - - @cindex printing chord names @cindex chord names @cindex chords @cindex @code{ChordNames} -@cindex @code{ChordNameVoice} -For displaying printed chord names, use the @code{ChordNames} and -@code{ChordNameVoice} contexts. The chords may be entered either using -the notation described above, or directly using simultaneous music. + +For displaying printed chord names, use the @code{ChordNames} context. +The chords may be entered either using the notation described above, or +directly using simultaneous music. @quotation @lilypond[verbatim,singleline] @@ -2057,19 +2082,18 @@ scheme = \notes { } \score { \notes< - \context ChordNamesVoice \scheme + \context ChordNames \scheme \context Staff \transpose c'' \scheme > } @end lilypond @end quotation -You can make the chord changes stand out more by setting property +You can make the chord changes stand out by setting property @code{ChordNames.chordChanges} to true. This will only display chord -names when there's a change in the chords scheme, but always display the -chord name after a line break: +names when there's a change in the chords scheme and at the start of the +line. -@c bug @quotation @lilypond[verbatim] scheme = \chords { @@ -2078,26 +2102,20 @@ scheme = \chords { \score { \notes < - \context ChordNames \scheme + \context ChordNames { + \property ChordNames.chordChanges = ##t + \scheme } \context Staff \transpose c'' \scheme - > - \paper{ - linewidth = 40 * \staffspace; - \translator { - \ChordNamesContext - chordChanges = ##t - } - } -} + > } @end lilypond @end quotation +LilyPond examines chords specified as lists of notes to determine a name +to give the chord. LilyPond will not try to identify chord inversions or +added base, which may result in strange chord names when chords are +entered as a list of pitches: - -LilyPond examines chords specified as lists of notes to determine a -name to give the chord. LilyPond will not try to -identify chord inversions or added base, which may result in strange -chord names when chords are entered as a list of pitches: +[base vs. bass ?] @quotation @lilypond[verbatim,center,singleline] @@ -2116,151 +2134,38 @@ scheme = \notes { @end lilypond @end quotation -To specify chord inversions, append @code{/}. To specify an -added bass note, append @code{/+ -} -@end lilypond -@end quotation - -The chord names that LilyPond should print are fully customizable. The -code to print chord names is written in Scheme. It can be found in -@file{scm/chord-name.scm}. Chord names are based on Banter style -naming, which is unambiguous and has a logical structure. Typical -American style chord names are implemented as a variation on Banter -names, they can be selected by setting property @code{ChordName.style} -to @code{american}: - -@quotation -@lilypond[verbatim] -\include "english.ly" - -scheme = \chords { - c % Major triad - cs:m % Minor triad - df:m5- % Diminished triad - c:5^3 % Root-fifth chord - c:4^3 % Suspended fourth triad - c:5+ % Augmented triad - c:2^3 % "2" chord - c:m5-.7- % Diminished seventh - c:7+ % Major seventh - c:7.4^3 % Dominant seventh suspended fourth - c:5+.7 % Augmented dominant seventh - c:m5-.7 % "Half" diminished seventh - c:5-.7 % Dominant seventh flat fifth - c:5-.7+ % Major seventh flat fifth - c:m7+ % Minor-major seventh - c:m7 % Minor seventh - c:7 % Dominant seventh - c:6 % Major sixth - c:m6 % Minor sixth - c:9^7 % Major triad w/added ninth - c:6.9^7 % Six/Nine chord - c:9 % Dominant ninth - c:7+.9 % Major ninth - c:m7.9 % Minor ninth -} -\score { - \notes < - \context ChordNames \scheme - \context Staff \transpose c'' \scheme - > - \paper { - \translator { - \ChordNamesContext - ChordName \override #'word-space = #1 - ChordName \override #'style = #'american - } - } -} -@end lilypond -@end quotation +By default LilyPond uses chord name system proposed by Harald Banter +(See @ref{Literature}). The system is is unambiguous and has a logical +structure. Typical American style chord names may be selected by +setting the @code{style} property of the @code{ChordNames.ChordName} +grob to @code{'american}. Similarly @code{'jazz} selects Jazz +chordnames. -Similarly, Jazz style chord names are implemented as a variation on -American style names: -@quotation -@lilypond[verbatim] -scheme = \chords { - % major chords - c - c:6 % 6 = major triad with added sixth - c:maj % triangle = maj - c:6.9^7 % 6/9 - c:9^7 % add9 - - % minor chords - c:m % m = minor triad - c:m.6 % m6 = minor triad with added sixth - c:m.7+ % m triangle = minor major seventh chord - c:3-.6.9^7 % m6/9 - c:m.7 % m7 - c:3-.9 % m9 - c:3-.9^7 % madd9 - - % dominant chords - c:7 % 7 = dominant - c:7.5+ % +7 = augmented dominant - c:7.5- % 7b5 = hard diminished dominant - c:9 % 7(9) - c:9- % 7(b9) - c:9+ % 7(#9) - c:13^9.11 % 7(13) - c:13-^9.11 % 7(b13) - c:13^11 % 7(9,13) - c:13.9-^11 % 7(b9,13) - c:13.9+^11 % 7(#9,13) - c:13-^11 % 7(9,b13) - c:13-.9-^11 % 7(b9,b13) - c:13-.9+^11 % 7(#9,b13) - - % half diminished chords - c:m5-.7 % slashed o = m7b5 - c:9.3-.5- % o/7(pure 9) - - % diminished chords - c:m5-.7- % o = diminished seventh chord -} +Routines that determine the names to be printed are written in Scheme, +and may be customized by the user. The code can be found in +@file{scm/chord-name.scm}. -\score { - \notes < - \context ChordNames \scheme - \context Staff \transpose c'' \scheme - > - \paper { - \translator { - \ChordNamesContext - ChordName \override #'word-space = #1 - ChordName \override #'style = #'jazz - } - } -} -@end lilypond -@end quotation +[3 short examples showing differences between american, banter and jazz] @node Writing parts @section Writing parts +Orchestral music involves some special notation, both in the full score, +as in the individual parts. This section explains how to tackle common +problems in orchestral music. + + @c . {Transpose} @menu * Rehearsal marks:: +* Bar numbers:: * Instrument names:: * Transpose:: * Sound output for transposing instruments:: * Multi measure rests:: * Automatic part combining:: +* Hara-kiri staffs:: @end menu @c . {Rehearsal marks} @@ -2293,6 +2198,18 @@ incremented. } @end lilypond +@node Bar numbers +@subsection Bar numbers + +Bar numbers are printed at the start of the line by default. This is +done by the @code{Bar_number_engraver} in the Score context. + +@refbugs + +It is currently not possible to make boxed bar numbers, or print them at +regular intervals. + + @node Instrument names @subsection Instrument names @@ -2303,7 +2220,7 @@ used, for the next ones @code{instr} is used. @lilypond[verbatim,singleline] \score { \notes { - \property Staff.instrument = "instr " { c''4 } } + \property Staff.instrument = "ploink " { c''4 } } \paper { \translator { \StaffContext \consists "Instrument_name_engraver"; } } } @@ -2355,8 +2272,8 @@ effect music that appears inside a @code{\transpose}. When you want to play a score containing transposed and untransposed instruments, you have to instruct LilyPond the pitch offset (in -semitones) for the transposed instruments. This is done using -@code{transposing}. +semitones) for the transposed instruments. This is done using the +@code{transposing} property. It does not affect printed output. @cindex @code{transposing} @@ -2397,13 +2314,10 @@ multimeasure rest. Automatic part combining is used to merge two parts of music onto on staff in an intelligent way. It is aimed primarily at typesetting Hymns and orchestral scores. When the two parts are identical for a period of -time, only will be shown. In places where the two parts differ, stem +time, only one is shown. In places where the two parts differ, stem directions are set automatically. Also, soli and @`{a} due parts can be identified and marke. - -@subsubsection Part combine syntax - The syntax for part combining is @example @@ -2414,11 +2328,7 @@ where the pieces of music @var{musicexpr1} and @var{musicexpr2} will be combined into one context @var{context}. The names of the music expressions must start with the prefixes @code{one} and @code{two}. -@subsubsection Part combine usage - -@cindex @code{Thread_devnull_engraver} -@cindex @code{Voice_engraver} -@cindex @code{A2_engraver} +[Name of music expressions? is that context name? ] The most useful function of the part combiner to combining threads into one voice, as common for wind parts in orchestral scores: @@ -2427,62 +2337,43 @@ one voice, as common for wind parts in orchestral scores: \context Staff < \context Voice=one \partcombine Voice \context Thread=one \notes\relative c'' { - g a b r + g g a b r2 } \context Thread=two \notes\relative c'' { - g r2 f4 + g g r2 g4 f4 } > @end lilypond -If you have developed a bit of a feel for LilyPond's functioning, you -will notice that what you see above is quite unusual. The first -@code{g} appears only once, although it was specified twice (once in -each Thread). That is the work of the -@code{Thread_devnull_engraver}@footnote{On unix systems, the file -@file{/dev/null} is special device: anything written to it is -discarded.}, that works closely together with the part combiner. When -the part combiner notices that two threads are identical, it tells the -@code{Thread_devnull_engraver} to discard everything in the second -thread. - -Similarly, the markings @emph{@`{a}2}, @emph{Solo} and @emph{Solo II}, -are created by the @code{A2_engraver}. The @code{A2_engraver} also acts -upon instructions of the part combiner. Another thing that the -@code{A2_engraver} does, is forcing of stem, slur and tie directions, -always when both threads are not identical; up for the musicexpr called -@code{one}, down for the musicexpr called @code{two}. +Notice that the first @code{g} appears only once, although it was +specified twice (once in each Thread). Also note that stem, slur and tie +directions are set automatically, depending whether there is a solo or +unisono. There is actually a third engraver involved in part combining; the @code{Voice_devnull_engraver}. This one takes care of removing -redundant spanners such as beams, slurs, ties, crescendi, etc. +redundant spanners such as beams, slurs, ties, crescendi, etc. Note that +the Thread called one always gets up stems, and "solo", while @code{two} +always gets down stems and "Solo II". If you just want the splitting of Threads and setting of directions, and -not the textual markings, you may set the property @var{soloADue} to false: +not the textual markings, you may set the property @var{soloADue} to +false. There are a number of other properties that you can use to tweak +the behavior of part combining, refer to the automatically generated +documentation. Look for @code{Thread_devnull_engraver} +@code{Voice_engraver} and @code{A2_engraver}. -@lilypond[verbatim,singleline] - \score { - \notes \context Staff < - \context Voice=one \partcombine Voice - \context Thread=one\relative c'' { - b4 a c g - } - \context Thread=two\relative c'' { - d,2 a4 g' - } - > - \paper{ - \translator { - \VoiceContext - soloADue = ##f - } - } -} -@end lilypond +@cindex @code{Thread_devnull_engraver} +@cindex @code{Voice_engraver} +@cindex @code{A2_engraver} + +@node Hara-kiri staffs +@subsection Hara-kiri staffs + + +[TODO]@footnote{Harakiri, also called Seppuku, is the ritual suicide of +the Japanese Samourai warriors.} -There are a number of other properties that you can use to tweak the -behavior of part combining, refer to the automatically generated -documentation of the involved engravers and the examples in the tutorial. @c . {Custodes} @@ -2515,8 +2406,8 @@ performance, thus enhancing readability of a score. Custodes were frequently used in music notation until the 16th century. There were different appearences for different notation styles. Nowadays, they have survived only in special forms of musical notation -such as via the editio vaticana dating back to the beginning of the 20th -century. +such as via the @emph{editio vaticana} dating back to the beginning of +the 20th century. For typesetting custodes, just put a @code{Custos_engraver} into the @code{StaffContext} when declaring the @code{\paper} block. In this @@ -2525,7 +2416,7 @@ by setting the custos @code{style} property. Currently supported styles are @code{vaticana}, @code{medicaea}, @code{hufnagel} and @code{mensural}. -@quotation +@example \paper @{ \translator @{ \StaffContext @@ -2533,17 +2424,17 @@ are @code{vaticana}, @code{medicaea}, @code{hufnagel} and Custos \override #'style = #'mensural; @} @} -@end quotation +@end example The property can also be set locally, for example in a @code{\notes} block: -@quotation +@example \notes @{ \property Staff.Custos \override #'style = #'vaticana c'1 d' e' d' \break c' d' e' d' @} -@end quotation +@end example @c . {Tuning output} @node Tuning output @@ -2551,14 +2442,15 @@ block: LilyPond tries to take as much formatting as possible out of your hands. Nevertheless, there are situations where it needs some help, or -where you want to override its decisions. +where you want to override its decisions. In this section we discuss +ways to do just that. + +Notation output is specified in so called grobs (graphic objects). Each +grob carries with it a set of properties (grob properties) specific to +that object. For example, a stem grob has properties that specify its +direction, length and thickness. -Here we discuss how you can do that. -Notational output is specified in so called grobs (graphic -objects). Each grob carries with it a set of properties (grob -properties) specific to that grob. For example, a stem grob has grob -properties that specify its direction, length and thickness. The most common way of tuning the output is to alter the values of these properties. There are two ways of doing that: first, you can @@ -2566,6 +2458,8 @@ specifically select a set of grobs at one point, and set properties as you wish, or secondly, you can (temporarily) modify the definition of a grob, thereby affecting an entire group of grobs. +[Todo: onduidelijk] + @menu * Tuning groups of grobs :: * Tuning per grob :: @@ -2578,12 +2472,14 @@ grob, thereby affecting an entire group of grobs. @cindex grob description -A grob definition is an association list, that is stored in a context +A grob definition is a Scheme association list, that is stored in a context property. By assigning to that property (using plain @code{\property}), -you can change the resulting grobs. +you can change the resulting grobs. + @lilypond[verbatim, fragment] c'4 \property Voice.Stem \override #'meta = #'((interfaces . ())) c'4 @end lilypond + The @code{\property} statement effectively empties the definition of the Stem object. One of the effects is that property specifying how it should be printed is erased, with the effect of rendering it invisible. @@ -2592,12 +2488,12 @@ should be printed is erased, with the effect of rendering it invisible. @cindex \revert @cindex \set - This mechanism is fairly crude, since you can only set, but not modify, the definition of a grob. For this reason, there is a more advanced mechanism: you can add a property on top of an existing definition, or remove a property: @code{\override} adds a settings, @code{\revert} removes that setting. + @lilypond[verbatim] c'4 \property Voice.Stem \override #'thickness = #4.0 c'4 \property Voice.Stem \revert #'thickness @@ -2607,8 +2503,8 @@ c'4 For the digirati, the grob description is an Scheme association list. Since it is singly linked, we can treat it as a stack, and @code{\override} and @code{\revert} are just push and pop -operations. This pushing and popping is also used in the -@code{autoBeamSettings} property. +operations. This pushing and popping is also used for overriding automatic +beaming settings. If you revert a setting which was not set in the first place, then it has no effect. However, if the setting was set as a system default, it @@ -2616,8 +2512,8 @@ may remove the default value, and this may give surprising results, including crashes. In other words, if you use @code{\override} and @code{\revert}, be sure to balance the overrides and reverts. -If balancing them is too much work, use the following shorthand: -@code{\set} performs a revert followed by an override: +If balancing them is too much work, use the @code{\set} shorthand. It +performs a revert followed by an override: @example \property Voice.Stem \set #'thickness = #2.0 @end example @@ -2631,6 +2527,8 @@ Formally the syntax for these constructions is Here @var{symbol} is a Scheme expression of symbol type, @var{context} and @var{grobname} are strings and @var{value} is a Scheme expression. +@refbugs + LilyPond will hang or crash if @var{value} contains cyclic references. @@ -2646,8 +2544,8 @@ Syntax is as follows @example \outputproperty @var{predicate} @var{symbol} = @var{value} @end example -Here @code{predicate} is a Scheme functoin taking a grob a argument -argument, and returning a boolean. This statement is processed by the +Here @code{predicate} is a Scheme function taking a grob argument, and +returning a boolean. This statement is processed by the @code{Output_property_engraver}. It instructs the engraver to feed all grobs that it sees to @var{predicate}. Whenever the predicate returns true, the grob property @var{symbol} will be set to @var{value}. @@ -2677,7 +2575,7 @@ them up and right. Move the text "m.d.", but not the fingering instruction "2". @lilypond[verbatim,singleline] #(define (make-text-checker text) - (lambda (grob) (equal? text (ly-get-elt-property grob 'text)))) + (lambda (grob) (equal? text (ly-get-grob-property grob 'text)))) \score { \notes\relative c''' { @@ -2700,11 +2598,13 @@ question is not answered in this manual (although you may encounter some examples.). Grob properties are tied directly to the implementation of LilyPond, and -they are thus a moving target. Refer to the automatically generated -documentation of the internals (available from the website). - -You need the following information +they are thus a moving target. Documentation of such variables are part +of the generated documentation: this documentation is generated from the +sourcecode of lily for each version, so it is usually mch more up to +date than this manual. It should be available from the same place where +you got this manual. +To decide how to tune a grob, you need to find the following information @itemize @bullet @item which grob to modify @@ -2732,17 +2632,17 @@ LilyPond has an internal mechanism to typeset texts. You can form text markup expressions by composing scheme expressions in the following way. -@lilypond[verbatim] -\score { - \notes \relative c' { - b-#"italic" - c-#'(upright "upright") - c-#'((bold upright) "bold") - d-#'(lines "one" ((bold upright) "two")) - e-#'(music (named "noteheads-2" "flags-u3")) + +[BUG] + +@lilypond[verbatim, singleline] + \relative c' { + b_#"italic" + c^#'(upright "upright") + c_#'((bold upright) "bold") + d^#'(lines "one" ((bold upright) "two")) + e_#'(music (named "noteheads-2" "flags-u3")) } - \paper { linewidth = 10.\cm; } -} @end lilypond Normally, the Scheme markup text is stored in the @code{text} property @@ -2757,8 +2657,8 @@ abbrev: @code{rows lines roman music bold italic named super sub text} @end example The markup is broken down and converted into a list of grob properties, -which are prepended to the grop's property list. The -@var{key}-@var{value} pair is a grob property. +which are prepended to the property list. The @var{key}-@var{value} +pair is a grob property. The following abbreviations are currently defined: @@ -2789,6 +2689,8 @@ horizontal mode: set all text on one line (default) @var{fontstyle} may be any of @code{finger volta timesig mmrest mark script large Large dynamic} +[wat is het verschil tussen fontstyle en abbrev?] + It is possible to use @TeX{} commands in the strings, but this should be avoided because this makes it impossible for LilyPond to compute the @@ -2835,7 +2737,13 @@ where each of the items is one of \stylesheet @var{alist} @end example - See @file{font.scm} for details of @var{alist}. + See @file{scm/font.scm} for details of @var{alist}. +@item an \elementdescriptions declaration. + @example + \elementdescriptions @var{alist} + @end example + See @file{scm/grob-description.scm} for details of @var{alist}. + @end itemize @c . {Paper variables} @@ -2853,7 +2761,8 @@ The paper block has some variables you may want to use or change: @item @code{staffspace} The distance between two staff lines, calculated from the center - of the lines. You should use either this or @code{stafflinethickness} + of the lines. If you want scale independent output, then you should +use either this or @code{stafflinethickness} as a unit for distances you modify. @cindex @code{linewidth} @@ -2867,18 +2776,25 @@ If set to a negative value, a single @item @code{textheight} Sets the total height of the music on each page. Only used by - ly2dvi. +@code{ly2dvi}. + @cindex @code{interscoreline} @item @code{interscoreline} - Sets the spacing between the score lines. Defaults to 16 pt. + Sets the spacing between systems. +Not set by default. @cindex @code{interscorelinefill} + + @item @code{interscorelinefill} If set to a positive number, the distance between the score lines will stretch in order to fill the full page. In that case @code{interscoreline} specifies the minimum spacing. - Defaults to 0. + + Not set by default. + + @cindex @code{stafflinethickness} @item @code{stafflinethickness} @@ -2936,7 +2852,7 @@ not take effect if the font is not loaded and selected afterwards. @} @end example -The file "paper16.ly" will now include a file named @file{a4.ly}, which +The file @code{paper16.ly} will now include a file named @file{a4.ly}, which will set the paper variables @code{hsize} and @code{vsize} (used by @code{ly2dvi}) @@ -2961,7 +2877,7 @@ Occasionally you might want to override the automatic breaks; you can do this by specifying @code{\break}. This will force a line break at this point. Do remember that line breaks can only occur at places where there are barlines. If you want to have a line break where there is no -barline, you can force a barline by entering @code{\bar "";}. +barline, you can force an invisible barline by entering @code{\bar "";}. Similarly, @code{\noBreak} forbids a line break at a certain point. @@ -2973,11 +2889,13 @@ the penalty command: \penalty @var{int} @code{;} @end example -This imposes encourages or discourages LilyPond to make a line break -at this point. +This encourages or discourages LilyPond to make a line break at this +point. -@strong{Warning} do not use @code{\penalty} directly. It is rather -kludgy, and slated for rewriting. +@refbugs + +The scaling of the @code{\penalty} argument is not well-defined. The +command is rather kludgy, and slated for rewriting. @c . {Page break} @node Page break @@ -2987,13 +2905,10 @@ kludgy, and slated for rewriting. @cindex breaking pages -Page breaks are normally computed by @TeX{}, so they are not under direct -control. However, you can insert a commands into the @file{.tex} output to -instruct @TeX{} where to break pages. For more details, see the -example file @file{input/test/between-systems.ly} - -[or -> Tricks? ] - +Page breaks are normally computed by @TeX{}, so they are not under +direct control of LilyPond. However, you can insert a commands into the +@file{.tex} output to instruct @TeX{} where to break pages. For more +details, see the example file @file{input/test/between-systems.ly} @@ -3004,17 +2919,22 @@ example file @file{input/test/between-systems.ly} @section Sound @cindex Sound -LilyPond allows MIDI output, with the purpose of proof-hearing the music -you enter. The performance lacks lots of interesting effects, such as -swing, articulation, slurring, tieing, etc. +LilyPond can produce MIDI output. The performance lacks lots of +interesting effects, such as swing, articulation, slurring, tieing, +etc., but it is good enough for proof-hearing the music you enter. + +Dynamics and tempo changes are interpreted. [TODO: mention volume +control/Instrument Equaliser] -Also note that it is not possible to use the percussion channel -(generally channel 10 of a MIDI file). + +@refbugs + +It is currently not possible to use the percussion channel (generally +channel 10 of a MIDI file). @menu * MIDI block:: * MIDI instrument names:: -* Tempo:: @end menu @c . {MIDI block} @@ -3042,93 +2962,27 @@ Context definitions follow precisely the same syntax as within the \paper block. Translation modules for sound are called performers. The contexts for MIDI output are defined in @file{ly/performer.ly}. -[Volume control] -[Instrument Equaliser] - -FIXME: would it be useful to refer to files like scm/midi.scm, -or to give examples of how to tweak MIDI output volume? - -@c . {MIDI instrument names} @node MIDI instrument names @subsection MIDI instrument names + @cindex instrument names @cindex @code{Staff.midiInstrument} @cindex @code{Staff.instrument} The MIDI instrument name is set by the @code{Staff.midiInstrument} property or, if that property is not set, the @code{Staff.instrument} -property. The instrument name should be chosen from the following list. -If the selected string does not exactly match, then LilyPond uses the -default piano. - -[FIXME: to appendix ] - - -@example -"acoustic grand" "contrabass" "lead 7 (fifths)" -"bright acoustic" "tremolo strings" "lead 8 (bass+lead)" -"electric grand" "pizzicato strings" "pad 1 (new age)" -"honky-tonk" "orchestral strings" "pad 2 (warm)" -"electric piano 1" "timpani" "pad 3 (polysynth)" -"electric piano 2" "string ensemble 1" "pad 4 (choir)" -"harpsichord" "string ensemble 2" "pad 5 (bowed)" -"clav" "synthstrings 1" "pad 6 (metallic)" -"celesta" "synthstrings 2" "pad 7 (halo)" -"glockenspiel" "choir aahs" "pad 8 (sweep)" -"music box" "voice oohs" "fx 1 (rain)" -"vibraphone" "synth voice" "fx 2 (soundtrack)" -"marimba" "orchestra hit" "fx 3 (crystal)" -"xylophone" "trumpet" "fx 4 (atmosphere)" -"tubular bells" "trombone" "fx 5 (brightness)" -"dulcimer" "tuba" "fx 6 (goblins)" -"drawbar organ" "muted trumpet" "fx 7 (echoes)" -"percussive organ" "french horn" "fx 8 (sci-fi)" -"rock organ" "brass section" "sitar" -"church organ" "synthbrass 1" "banjo" -"reed organ" "synthbrass 2" "shamisen" -"accordion" "soprano sax" "koto" -"harmonica" "alto sax" "kalimba" -"concertina" "tenor sax" "bagpipe" -"acoustic guitar (nylon)" "baritone sax" "fiddle" -"acoustic guitar (steel)" "oboe" "shanai" -"electric guitar (jazz)" "english horn" "tinkle bell" -"electric guitar (clean)" "bassoon" "agogo" -"electric guitar (muted)" "clarinet" "steel drums" -"overdriven guitar" "piccolo" "woodblock" -"distorted guitar" "flute" "taiko drum" -"guitar harmonics" "recorder" "melodic tom" -"acoustic bass" "pan flute" "synth drum" -"electric bass (finger)" "blown bottle" "reverse cymbal" -"electric bass (pick)" "skakuhachi" "guitar fret noise" -"fretless bass" "whistle" "breath noise" -"slap bass 1" "ocarina" "seashore" -"slap bass 2" "lead 1 (square)" "bird tweet" -"synth bass 1" "lead 2 (sawtooth)" "telephone ring" -"synth bass 2" "lead 3 (calliope)" "helicopter" -"violin" "lead 4 (chiff)" "applause" -"viola" "lead 5 (charang)" "gunshot" -"cello" "lead 6 (voice)" -@end example - +property. The instrument name should be chosen from the list in +@ref{MIDI Instrument}. +@refbugs +If the selected string does not exactly match, then LilyPond uses the +default piano. It is not possible to select an instrument by number. -@c . {Tempo} -@node Tempo -@subsection Tempo -@cindex Tempo -@cindex beats per minute -@cindex metronome marking -@cindex @code{\tempo} -@example - \tempo @var{duration} = @var{perminute} @code{;} -@end example -Used to specify the tempo. For example, @code{\tempo 4 = 76;} requests -output with 76 quarter notes per minute. @@ -3208,10 +3062,10 @@ the pitch as a notename, you have to be in note mode, so there must be a surrounding @code{\notes} keyword (which is not shown here). -The relative conversion will not affect @code{\transpose} or -@code{\relative} sections in its argument. If you want to use -relative within transposed music, you must place an additional -@code{\relative} inside the @code{\transpose}. +The relative conversion will not affect @code{\transpose}, +@code{\chords} or @code{\relative} sections in its argument. If you +want to use relative within transposed music, you must place an +additional @code{\relative} inside the @code{\transpose}. @c . {Bar check} @@ -3240,10 +3094,9 @@ A bar check is entered using the bar symbol, @code{|} [todo] -@c . {Engravers} -@node Engravers -@section Engravers -@cindex engravers +@node Interpretation context +@section Interpretation context + @menu * Notation Contexts:: * Creating contexts:: @@ -3253,9 +3106,6 @@ A bar check is entered using the bar symbol, @code{|} * Defining new contexts:: @end menu -@c . {Music expressions} - - @c . {Notation Contexts} @node Notation Contexts @@ -3401,6 +3251,20 @@ contained contexts. This means that a property valid for the @code{Voice} context can be set in the @code{Score} context (for example) and thus take effect in all @code{Voice} contexts. +Properties can be unset using the following expression: +@example + \property @var{contextname}.@var{propname} \unset +@end example + +This removes the definition of @var{propname} in @var{contextname}. If +@var{propname} was not defined in @var{contextname} (but was inherited +from a higher context), then this has no effect. + + +@refbugs + +@code{\property \unset} is not the inverse of @code{\property \set} + @@ -3476,9 +3340,8 @@ identifiers are: @cindex @code{HaraKiriStaffContext} @item @code{HaraKiriStaffContext} - Staff context that does not print if it only contains rests. - Useful for orchestral scores.@footnote{Harakiri, also called - Seppuku, is the ritual suicide of the Japanese Samourai warriors.} + Staff context that does not print if it only contains rests. See +@ref{Hara-kiri staffs}. @end table @node Defining new contexts @@ -3626,7 +3489,6 @@ called @emph{performers}. * Music expressions:: * Manipulating music expressions:: * Assignments:: -* Lexical details:: * Lexical modes:: * Ambiguities:: @end menu @@ -3771,15 +3633,6 @@ for sequential and @code{<} @var{musicexprlist} @code{>} @end example for simultaneous music. -Other compound music expressions include -@example - \repeat @var{expr} - \transpose @var{pitch} @var{expr} - \apply @var{func} @var{expr} - \context @var{type} = @var{id} @var{expr} - \times @var{fraction} @var{expr} -@end example - In principle, the way in which you nest sequential and simultaneous to produce music is not relevant. In the following example, three chords are expressed in two different ways: @@ -3791,25 +3644,15 @@ are expressed in two different ways: } @end lilypond -However, in some cases, LilyPond will also try to choose contexts, and -use the structure of the music expression to do so. This can have -undesired effects: for example, LilyPond will create a separate staff -for each note if you start a @code{\score} with a chord: -@lilypond[verbatim,center,singleline] - \score { - \notes - } -@end lilypond - The solution is to explicitly instantiate the context you desire. -In this case this is typically a Voice context -@lilypond[verbatim,center,singleline] - \score { - \notes\context Voice - } -@end lilypond -If you use @code{\context Staff} you will get separate stems for each -note head, leading to collisions, so don't use that. +Other compound music expressions include +@example + \repeat @var{expr} + \transpose @var{pitch} @var{expr} + \apply @var{func} @var{expr} + \context @var{type} = @var{id} @var{expr} + \times @var{fraction} @var{expr} +@end example @c . {Manipulating music expressions} @@ -3846,10 +3689,12 @@ about how music is stored. For more information on what is possible, see the @ref{Tricks} and the automatically generated documentation. -As always: directly accessing internal representations is dangerous: the -implementation is subject to changes, so you should not use this if -possible. +Directly accessing internal representations is dangerous: the +implementation is subject to changes, so you should avoid this feature +if possible. + + @c . {Span requests} @menu @@ -3923,35 +3768,132 @@ copied. For this reason, an identifier reference must always be the first item in a block. @example \paper @{ - foo = 1.0 - \paperIdent % wrong and invalid + foo = 1.0 + \paperIdent % wrong and invalid @} \paper @{ - \paperIdent % correct - foo = 1.0 @} + \paperIdent % correct + foo = 1.0 @} +@end example + + +@c . {Lexical modes} +@node Lexical modes +@subsection Lexical modes +@cindex Lexical modes +@cindex input mode +@cindex mode, input +@cindex @code{\notes} +@cindex @code{\chords} +@cindex @code{\lyrics} + +To simplify entering notes, lyrics, and chords, LilyPond has three +special input modes on top of the default mode: note, lyrics and chords +mode. These input modes change the way that normal, unquoted words are +interpreted: for example, the word @code{cis} may be interpreted as a +C-sharp, as a lyric syllable `cis' or as a C-sharp major triad +respectively. + +A mode switch is entered as a compound music expressions +@example +@code{\notes} @var{musicexpr} +@code{\chords} @var{musicexpr} +@code{\lyrics} @var{musicexpr}. @end example +In each of these cases, these expressions do not add anything to the +meaning of their arguments. They are just a way to indicate that the +arguments should be parsed in indicated mode. The modes are treated in +more detail in the @ref{Note entry}, @ref{Lyrics} and +@ref{Chords}. + +You may nest different input modes. + +@c . {Ambiguities} +@node Ambiguities +@subsection Ambiguities +@cindex ambiguities +@cindex grammar + + +The grammar contains a number of ambiguities. We hope to resolve them at +some time. + +@itemize @bullet + @item The assignment + + @example +foo = bar +@end example + + can be interpreted as making a string identifier @code{\foo} + containing @code{"bar"}, or a music identifier @code{\foo} + containing the syllable `bar'. + + @item The assignment + + @example +foo = -6 +@end example + + can be interpreted as making an integer identifier + containing -6, or a Request identifier containing the + fingering `6' (with neutral direction). + + @item If you do a nested repeat like + + @quotation + +@example +\repeat @dots{} +\repeat @dots{} +\alternative +@end example + + @end quotation + + then it is ambiguous to which @code{\repeat} the + @code{\alternative} belongs. This is the classic if-then-else + dilemma. It may be solved by using braces. + + @item (an as yet unidentified ambiguity :-) +@end itemize + + @c . {Lexical details} @node Lexical details -@subsection Lexical details -@cindex Lexical details +@section Lexical details + @menu +* Comments:: +* Direct Scheme:: +* Keywords:: +* Integers:: +* Reals:: +* Strings:: +* Main input:: +* File inclusion:: +* Version information:: @end menu -@c . {Comments} -@subsubsection Comments -@cindex Comments -@cindex @code{%} +@node Comments +@subsection Comments + +@cindex comments +@cindex block comment +@cindex line comment +@cindex @code{%} A one line comment is introduced by a @code{%} character. Block comments are started by @code{%@{} and ended by @code{%@}}. They cannot be nested. -@c . {Direct Scheme} -@subsubsection Direct Scheme +@node Direct Scheme +@subsection Direct Scheme + @cindex Scheme @cindex GUILE @cindex Scheme, in-line code @@ -3979,8 +3921,8 @@ the website @uref{http://www.schemers.org/} for more information on Scheme. -@c . {Keywords} -@subsubsection Keywords +@node Keywords +@subsection Keywords @cindex Keywords @@ -4000,8 +3942,8 @@ script stylesheet skip textscript tempo translator transpose type @end example -@c . {Integers} -@subsubsection Integers +@node Integers +@subsection Integers @cindex integers @cindex @code{+} @@ -4013,8 +3955,8 @@ Formed from an optional minus sign followed by digits. Arithmetic operations cannot be done with integers, and integers cannot be mixed with reals. -@c . {Reals} -@subsubsection Reals +@node Reals +@subsection Reals @cindex real numbers @@ -4039,8 +3981,8 @@ points, inches and centimeters, respectively. This converts the number to a real that is the internal representation of dimensions. -@c . {Strings} -@subsubsection Strings +@node Strings +@subsection Strings @cindex string @cindex concatenate @@ -4056,8 +3998,8 @@ The tokenizer accepts the following commands. They have no grammatical function, hence they can appear anywhere in the input. -@c . {Main input} -@subsubsection Main input +@node Main input +@subsection Main input @cindex Main input @cindex @code{\maininput} @@ -4065,11 +4007,8 @@ function, hence they can appear anywhere in the input. The @code{\maininput} command is used in init files to signal that the user file must be read. This command cannot be used in a user file. -@c . {File inclusion} -@subsubsection Main input -@cindex Main input - -@subsubsection File inclusion +@node File inclusion +@subsection File inclusion @cindex @code{\include} @example \include @var{filename} @@ -4079,7 +4018,9 @@ Include @var{filename}. The argument @var{filename} may be a quoted string (an unquoted string will not work here!) or a string identifier. The full filename including the @file{.ly} extension must be given, -@subsubsection Version information + +@node Version information +@subsection Version information @cindex @code{\version} @example \version @var{string} ; @@ -4094,115 +4035,6 @@ See @ref{convert-ly} for more information on @code{convert-ly}. @cindex convert-ly -@c . {Pitch names} -@subsubsection Defining pitch names -@cindex Lexical modes -@cindex definining pitch names -@cindex pitch names, definining -@cindex note names -@cindex chord modifier names - -A @code{\paper} block at top level sets the default paper block. A -@code{\midi} block at top level works similarly. - -@c . {Assignments} -@subsubsection Assignments -@cindex assignments -@cindex @code{#} - -Identifier assignments may appear at top level. @ref{Assignments} - - - -@c . {Direct scheme} -@subsubsection Direct scheme -@cindex Direct scheme - -Scheme statements maybe issued to produce interesting side-effects. - - -@c . {Lexical modes} -@node Lexical modes -@subsection Lexical modes -@cindex Lexical modes -@cindex input mode -@cindex mode, input -@cindex @code{\notes} -@cindex @code{\chords} -@cindex @code{\lyrics} - -To simplify entering notes, lyrics, and chords, LilyPond has three -special input modes on top of the default mode: note, lyrics and chords -mode. These input modes change the way that normal, unquoted words are -interpreted: for example, the word @code{cis} may be interpreted as a -C-sharp, as a lyric syllable `cis' or as a C-sharp major triad -respectively. - -A mode switch is entered as a compound music expressions -@example -@code{\notes} @var{musicexpr} -@code{\chords} @var{musicexpr} -@code{\lyrics} @var{musicexpr}. -@end example - -In each of these cases, these expressions do not add anything to the -meaning of their arguments. They are just a way to indicate that the -arguments should be parsed in indicated mode. The modes are treated in -more detail in the @ref{Note entry}, @ref{Lyrics} and -@ref{Chords}. - -You may nest different input modes. - -@c . {Ambiguities} -@node Ambiguities -@subsection Ambiguities -@cindex ambiguities -@cindex grammar - - -The grammar contains a number of ambiguities. We hope to resolve them at -some time. - -@itemize @bullet - @item The assignment - - @example -foo = bar -@end example - - can be interpreted as making a string identifier @code{\foo} - containing @code{"bar"}, or a music identifier @code{\foo} - containing the syllable `bar'. - - @item The assignment - - @example -foo = -6 -@end example - - can be interpreted as making an integer identifier - containing -6, or a Request identifier containing the - fingering `6' (with neutral direction). - - @item If you do a nested repeat like - - @quotation - -@example -\repeat @dots{} -\repeat @dots{} -\alternative -@end example - - @end quotation - - then it is ambiguous to which @code{\repeat} the - @code{\alternative} belongs. This is the classic if-then-else - dilemma. It may be solved by using braces. - - @item (an as yet unidentified ambiguity :-) -@end itemize - diff --git a/Documentation/user/tricks.itely b/Documentation/user/tricks.itely index 8a7e3a539d..21063ef65b 100644 --- a/Documentation/user/tricks.itely +++ b/Documentation/user/tricks.itely @@ -184,41 +184,6 @@ No staff, no clef, squash pitches @end lilypond -@node Part combiner -@section Part combiner - -@lilypond[verbatim] -\score{ - \context Staff = flauti < - \time 4/4; - \context Voice=one \partcombine Voice - \context Thread=one \notes\relative c'' { - c4 d e f | b,4 d c d | r2 e4 f | c4 d e f | - c4 r e f | c4 r e f | c4 r a r | a a r a | - a2 \property Voice.soloADue = ##f a | - } - \context Thread=two \notes\relative c'' { - g4 b d f | r2 c4 d | a c c d | a4. b8 c4 d - c r e r | r2 s2 | a,4 r a r | a r r a | - a2 \property Voice.soloADue = ##f a | - } - > - \paper{ - linewidth = 80 * \staffspace; - \translator{ - \ThreadContext - \consists Rest_engraver; - } - \translator{ - \VoiceContext - \remove Rest_engraver; - } - } -} -@end lilypond - - - @node Markup text @section Markup text diff --git a/INSTALL.txt b/INSTALL.txt index 971cd7d7aa..04c5df23e8 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -222,9 +222,11 @@ accordingly. ``--enable-profiling'' Compile with support for profiling. -``--enable-config'' - Output to a different configuration file. Needed for - multi-platform builds +``--enable-config=CONF'' + Output to different configuration files. Enables different binary + builds alongside eachother, eg, multi-configuration (debugging, + profiling), or multi-platform builds. Use `make conf=CONF' to + build for a specific configuration. All options are documented in the `configure' help The option `--enable-optimise' is recommended for Real Life usage. @@ -241,10 +243,11 @@ contain all files generated during compilation). Configuring for multiple platforms ================================== - If you want to compile LilyPond with different configuration -settings, then, you can use the `--enable-config' option. Example: -suppose I want to build with and without profiling. Then I'd use the -following for the normal build, + If you want to build multiple versions of LilyPond with different +configuration settings, you can use the `--enable-config=CONF' option. +You should use `make conf=CONF' to generate the output in `out-CONF'. +Example: suppose I want to build with and without profiling. Then I'd +use the following for the normal build, ./configure --prefix=~ --disable-optimise --enable-checking @@ -255,8 +258,8 @@ following for the normal build, ./configure --prefix=~ --enable-profiling --enable-config=prof --enable-optimise --disable-checking - make config=prof - make config=prof install + make conf=prof + make conf=prof install Installing ========== diff --git a/VERSION b/VERSION index 155184f956..90f434aee4 100644 --- a/VERSION +++ b/VERSION @@ -1,8 +1,8 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=3 -PATCH_LEVEL=137 -MY_PATCH_LEVEL=jcn4 +PATCH_LEVEL=138 +MY_PATCH_LEVEL= # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/configure b/configure index ace0959706..6aa2c3149c 100755 --- a/configure +++ b/configure @@ -65,25 +65,29 @@ ac_help= ac_default_prefix=/usr/local # Any additions from configure.in: ac_help="$ac_help - enable-config=FILE put configure settings in config-FILE.make" + --enable-config=CONF put settings in config-CONF.make and config-CONF.h; + do \`make conf=CONF' to get output in ./out-CONF" ac_help="$ac_help - enable-checking set runtime checks (assert calls). Default: on" + --enable-checking set runtime checks (assert calls). Default: on" ac_help="$ac_help - enable-optimise use maximal speed optimisations. Default: off" + --enable-debugging compile with debugging info. Default: on" ac_help="$ac_help - enable-profiling compile with gprof support. Default: off" + --enable-optimise use maximal speed optimisations. Default: off" ac_help="$ac_help - enable-debugging set debug info. Default: on" + --enable-profiling compile with gprof support. Default: off" ac_help="$ac_help - enable-mingw-prefix=DIR set the mingw32 directory (standalone windows32 exes)" + --enable-mingw-prefix=DIR + set the mingw32 directory (standalone windows32 exes)" ac_help="$ac_help - with-localedir=LOCALE use LOCALE as locale dir. Default: PREFIX/share/locale " + --with-localedir=LOCALE use LOCALE as locale dir. Default: + PREFIX/share/locale " ac_help="$ac_help - with-lang=LANG use LANG as language to emit messages" + --with-lang=LANG use LANG as language to emit messages" ac_help="$ac_help - enable-tfm-path=PATH set path of tex directories where tfm files live, esp.: cmr10.tfm. Default: use kpsewhich" + --enable-tfm-path=PATH set path of tex directories where tfm files live, + esp.: cmr10.tfm. Default: use kpsewhich" ac_help="$ac_help - enable-kpathsea use kpathsea lib. Default: on" + --with-kpathsea use kpathsea lib. Default: on" # Initialize some variables set by options. # The variables have the same names as the options, with @@ -627,12 +631,12 @@ fi fi echo $ac_n "checking Package""... $ac_c" 1>&6 -echo "configure:631: checking Package" >&5 +echo "configure:635: checking Package" >&5 if test "x$PACKAGE" = "xSTEPMAKE"; then echo "$ac_t""Stepmake package!" 1>&6 echo $ac_n "checking builddir""... $ac_c" 1>&6 -echo "configure:636: checking builddir" >&5 +echo "configure:640: checking builddir" >&5 if test "$srcdir" = "."; then builddir=. else @@ -670,7 +674,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. echo "$ac_t""$PACKAGE" 1>&6 echo $ac_n "checking builddir""... $ac_c" 1>&6 -echo "configure:674: checking builddir" >&5 +echo "configure:678: checking builddir" >&5 if test "$srcdir" = "."; then builddir=. srcdir_build=no @@ -690,7 +694,7 @@ echo "configure:674: checking builddir" >&5 fi echo $ac_n "checking for stepmake""... $ac_c" 1>&6 -echo "configure:694: checking for stepmake" >&5 +echo "configure:698: checking for stepmake" >&5 # Check for installed stepmake if test -d $stepmake; then echo "$ac_t""$stepmake" 1>&6 @@ -811,7 +815,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:815: checking host system type" >&5 +echo "configure:819: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -836,7 +840,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:840: checking for $ac_word" >&5 +echo "configure:844: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MAKE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -871,7 +875,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:875: checking for $ac_word" >&5 +echo "configure:879: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_FIND'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -908,7 +912,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:912: checking for $ac_word" >&5 +echo "configure:916: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_TAR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -943,7 +947,7 @@ test -n "$TAR" || TAR="error" # Extract the first word of "bash", so it can be a program name with args. set dummy bash; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:947: checking for $ac_word" >&5 +echo "configure:951: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_BASH'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -983,7 +987,7 @@ fi # Extract the first word of "bash", so it can be a program name with args. set dummy bash; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:987: checking for $ac_word" >&5 +echo "configure:991: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_SHELL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1020,7 +1024,7 @@ fi # Extract the first word of "bash", so it can be a program name with args. set dummy bash; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1024: checking for $ac_word" >&5 +echo "configure:1028: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_BASH'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1061,7 +1065,7 @@ fi # Extract the first word of "${PYTHON:-python}", so it can be a program name with args. set dummy ${PYTHON:-python}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1065: checking for $ac_word" >&5 +echo "configure:1069: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1221,12 +1225,13 @@ if test "${enable_checking+set}" = set; then fi - # actually, the default is: tja='-O' to get inlining... - # off='' --jcn + # Check whether --enable-debugging or --disable-debugging was given. +if test "${enable_debugging+set}" = set; then + enableval="$enable_debugging" + debug_b=$enableval +fi + - #actually, that sucks. - # tja looks like a typo. Default is optimisation off. --hwn - # Check whether --enable-optimise or --disable-optimise was given. if test "${enable_optimise+set}" = set; then enableval="$enable_optimise" @@ -1241,13 +1246,6 @@ if test "${enable_profiling+set}" = set; then fi - # Check whether --enable-debugging or --disable-debugging was given. -if test "${enable_debugging+set}" = set; then - enableval="$enable_debugging" - debug_b=$enableval -fi - - # Check whether --enable-mingw-prefix or --disable-mingw-prefix was given. if test "${enable_mingw_prefix+set}" = set; then enableval="$enable_mingw_prefix" @@ -1292,7 +1290,7 @@ EOF # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1296: checking for $ac_word" >&5 +echo "configure:1294: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1322,7 +1320,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1326: checking for $ac_word" >&5 +echo "configure:1324: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1373,7 +1371,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1377: checking for $ac_word" >&5 +echo "configure:1375: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1405,7 +1403,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1409: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1407: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1416,12 +1414,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1420 "configure" +#line 1418 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1447,12 +1445,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1451: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1449: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1456: checking whether we are using GNU C" >&5 +echo "configure:1454: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1461,7 +1459,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1465: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1463: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1480,7 +1478,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1484: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1482: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1527,7 +1525,7 @@ fi # AC_HAVE_HEADERS(limits.h malloc.h string.h unistd.h values.h) echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1531: checking how to run the C preprocessor" >&5 +echo "configure:1529: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1542,13 +1540,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1552: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1550: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1559,13 +1557,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1569: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1567: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1576,13 +1574,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1586: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1584: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1610,17 +1608,17 @@ for ac_hdr in assert.h sys/stat.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1614: checking for $ac_hdr" >&5 +echo "configure:1612: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1624: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1622: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1647,12 +1645,12 @@ fi done echo $ac_n "checking whether stat file-mode macros are broken""... $ac_c" 1>&6 -echo "configure:1651: checking whether stat file-mode macros are broken" >&5 +echo "configure:1649: checking whether stat file-mode macros are broken" >&5 if eval "test \"`echo '$''{'ac_cv_header_stat_broken'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1712,7 +1710,7 @@ EOF fi echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:1716: checking how to run the C++ preprocessor" >&5 +echo "configure:1714: checking how to run the C++ preprocessor" >&5 if test -z "$CXXCPP"; then if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1725,12 +1723,12 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross CXXCPP="${CXX-g++} -E" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1734: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1732: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1767,7 +1765,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1771: checking for $ac_word" >&5 +echo "configure:1769: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1799,7 +1797,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1803: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:1801: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1810,12 +1808,12 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext << EOF -#line 1814 "configure" +#line 1812 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:1819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1817: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1841,12 +1839,12 @@ if test $ac_cv_prog_cxx_works = no; then { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1845: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1843: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:1850: checking whether we are using GNU C++" >&5 +echo "configure:1848: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1855,7 +1853,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1859: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1857: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -1874,7 +1872,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}" ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:1878: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:1876: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1908,17 +1906,17 @@ fi ac_safe=`echo "FlexLexer.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for FlexLexer.h""... $ac_c" 1>&6 -echo "configure:1912: checking for FlexLexer.h" >&5 +echo "configure:1910: checking for FlexLexer.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1922: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1920: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1969,12 +1967,12 @@ fi echo $ac_n "checking whether explicit instantiation is needed""... $ac_c" 1>&6 -echo "configure:1973: checking whether explicit instantiation is needed" >&5 +echo "configure:1971: checking whether explicit instantiation is needed" >&5 if eval "test \"`echo '$''{'lily_cv_need_explicit_instantiation'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < struct foo { static int baz; }; @@ -1984,7 +1982,7 @@ int main() { return foo::baz; ; return 0; } EOF -if { (eval echo configure:1988: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lily_cv_need_explicit_instantiation=no else @@ -2011,7 +2009,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2015: checking for $ac_word" >&5 +echo "configure:2013: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2054,7 +2052,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2058: checking for $ac_word" >&5 +echo "configure:2056: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_BISON'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2089,7 +2087,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2093: checking for $ac_word" >&5 +echo "configure:2091: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_FLEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2157,7 +2155,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2161: checking for $ac_word" >&5 +echo "configure:2159: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2190,7 +2188,7 @@ test -n "$AR" || AR="error" # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2194: checking for $ac_word" >&5 +echo "configure:2192: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2246,7 +2244,7 @@ fi echo $ac_n "checking language""... $ac_c" 1>&6 -echo "configure:2250: checking language" >&5 +echo "configure:2248: checking language" >&5 case "$language" in En* | en* | Am* | am* | US* | us*) lang=English;; @@ -2282,7 +2280,7 @@ EOF echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6 -echo "configure:2286: checking for gettext in -lintl" >&5 +echo "configure:2284: checking for gettext in -lintl" >&5 ac_lib_var=`echo intl'_'gettext | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2290,7 +2288,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2334,12 +2332,12 @@ fi for ac_func in gettext do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2338: checking for $ac_func" >&5 +echo "configure:2336: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2367: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2397,7 +2395,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2401: checking for $ac_word" >&5 +echo "configure:2399: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2428,7 +2426,7 @@ done test -n "$MSGFMT" || MSGFMT="\$(SHELL) \$(step-bindir)/fake-msgfmt.sh " echo $ac_n "checking whether msgfmt accepts -o""... $ac_c" 1>&6 -echo "configure:2432: checking whether msgfmt accepts -o" >&5 +echo "configure:2430: checking whether msgfmt accepts -o" >&5 msgfmt_output="`msgfmt -o bla 2>&1 | grep usage`" if test "$msgfmt_output" = ""; then echo "$ac_t""yes" 1>&6 @@ -2456,7 +2454,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2460: checking for $ac_word" >&5 +echo "configure:2458: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_METAFONT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2492,7 +2490,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2496: checking for $ac_word" >&5 +echo "configure:2494: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MFONT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2530,7 +2528,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2534: checking for $ac_word" >&5 +echo "configure:2532: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_METAPOST'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2566,7 +2564,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2570: checking for $ac_word" >&5 +echo "configure:2568: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MPOST'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2605,7 +2603,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2609: checking for $ac_word" >&5 +echo "configure:2607: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_INIMETAFONT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2641,7 +2639,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2645: checking for $ac_word" >&5 +echo "configure:2643: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_INIMFONT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2679,7 +2677,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2683: checking for $ac_word" >&5 +echo "configure:2681: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_INIMETAPOST'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2715,7 +2713,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2719: checking for $ac_word" >&5 +echo "configure:2717: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_INIMPOST'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2749,7 +2747,7 @@ test -n "$INIMPOST" || INIMPOST="-echo no inimp or inimpost" fi echo $ac_n "checking for working metafont mode""... $ac_c" 1>&6 -echo "configure:2753: checking for working metafont mode" >&5 +echo "configure:2751: checking for working metafont mode" >&5 modelist='ljfour lj4 lj3 lj2 ljet laserjet' for MFMODE in $modelist; do $METAFONT "\mode:=$MFMODE; mode_setup; end." > /dev/null 2>&1 @@ -2760,7 +2758,7 @@ echo "configure:2753: checking for working metafont mode" >&5 echo "$ac_t""$MFMODE" 1>&6 echo $ac_n "checking for mfplain.mp""... $ac_c" 1>&6 -echo "configure:2764: checking for mfplain.mp" >&5 +echo "configure:2762: checking for mfplain.mp" >&5 # # For now let people define these in their environments # @@ -2768,7 +2766,7 @@ echo "configure:2764: checking for mfplain.mp" >&5 echo "$ac_t""$MFPLAIN_MP" 1>&6 echo $ac_n "checking for inimetapost flags""... $ac_c" 1>&6 -echo "configure:2772: checking for inimetapost flags" >&5 +echo "configure:2770: checking for inimetapost flags" >&5 if test ${INIMETAPOST} = "inimp" ; then : ${INIMETAPOST_FLAGS=''} else @@ -2801,7 +2799,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2805: checking for $ac_word" >&5 +echo "configure:2803: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_KPSEWHICH'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2832,7 +2830,7 @@ done test -n "$KPSEWHICH" || KPSEWHICH="no" echo $ac_n "checking for tfm path""... $ac_c" 1>&6 -echo "configure:2836: checking for tfm path" >&5 +echo "configure:2834: checking for tfm path" >&5 TFM_FONTS="cmr msam" @@ -2860,13 +2858,13 @@ echo "configure:2836: checking for tfm path" >&5 ## First, let's just see if we can find Guile at all. echo $ac_n "checking "for guile-config"""... $ac_c" 1>&6 -echo "configure:2864: checking "for guile-config"" >&5 +echo "configure:2862: checking "for guile-config"" >&5 for guile_config in guile-config $target-guile-config $build-guile-config; do echo "$ac_t"""$guile_config"" 1>&6 if ! $guile_config --version > /dev/null 2>&1 ; then echo "configure: warning: "cannot execute $guile_config"" 1>&2 echo $ac_n "checking "if we are cross compiling"""... $ac_c" 1>&6 -echo "configure:2870: checking "if we are cross compiling"" >&5 +echo "configure:2868: checking "if we are cross compiling"" >&5 guile_config=error else break @@ -2877,7 +2875,7 @@ echo "configure:2870: checking "if we are cross compiling"" >&5 exit 1 fi echo $ac_n "checking "Guile version"""... $ac_c" 1>&6 -echo "configure:2881: checking "Guile version"" >&5 +echo "configure:2879: checking "Guile version"" >&5 need_guile_version="1.3.4" need_guile_version_numeric=100304 guile_version=`$guile_config --version 2>&1 | awk '{print $NF}'` @@ -2896,7 +2894,7 @@ else {last =0}} ## The GUILE_FLAGS macro. echo $ac_n "checking for Guile""... $ac_c" 1>&6 -echo "configure:2900: checking for Guile" >&5 +echo "configure:2898: checking for Guile" >&5 if ! $guile_config link > /dev/null ; then echo "$ac_t"""cannot execute $guile_config"" 1>&6 { echo "configure: error: "cannot find guile-config; is Guile installed?"" 1>&2; exit 1; } @@ -2911,7 +2909,7 @@ echo "configure:2900: checking for Guile" >&5 # Extract the first word of "guile", so it can be a program name with args. set dummy guile; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2915: checking for $ac_word" >&5 +echo "configure:2913: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GUILE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2949,9 +2947,9 @@ fi kpathsea_b=yes - # Check whether --enable-kpathsea or --disable-kpathsea was given. -if test "${enable_kpathsea+set}" = set; then - enableval="$enable_kpathsea" + # Check whether --with-kpathsea or --without-kpathsea was given. +if test "${with_kpathsea+set}" = set; then + withval="$with_kpathsea" kpathsea_b=$enableval fi @@ -2961,17 +2959,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2965: checking for $ac_hdr" >&5 +echo "configure:2963: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2975: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2973: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2998,7 +2996,7 @@ fi done echo $ac_n "checking for kpse_find_file in -lkpathsea""... $ac_c" 1>&6 -echo "configure:3002: checking for kpse_find_file in -lkpathsea" >&5 +echo "configure:3000: checking for kpse_find_file in -lkpathsea" >&5 ac_lib_var=`echo kpathsea'_'kpse_find_file | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3006,7 +3004,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lkpathsea $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3053,12 +3051,12 @@ fi for ac_func in kpse_find_file do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3057: checking for $ac_func" >&5 +echo "configure:3055: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3113,7 +3111,7 @@ done fi echo $ac_n "checking whether to use kpathsea""... $ac_c" 1>&6 -echo "configure:3117: checking whether to use kpathsea" >&5 +echo "configure:3115: checking whether to use kpathsea" >&5 if test $kpathsea_b = yes; then echo "$ac_t""yes" 1>&6 KPATHSEA=1 @@ -3134,7 +3132,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3138: checking for $ac_word" >&5 +echo "configure:3136: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_BIBTEX2HTML'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3175,7 +3173,7 @@ test -n "$BIBTEX2HTML" || BIBTEX2HTML="error" echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -echo "configure:3179: checking for 8-bit clean memcmp" >&5 +echo "configure:3177: checking for 8-bit clean memcmp" >&5 if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3183,7 +3181,7 @@ else ac_cv_func_memcmp_clean=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_memcmp_clean=yes else @@ -3214,12 +3212,12 @@ echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6 test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}" echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:3218: checking for vprintf" >&5 +echo "configure:3216: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3247: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -3269,12 +3267,12 @@ fi if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:3273: checking for _doprnt" >&5 +echo "configure:3271: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -3327,12 +3325,12 @@ fi for ac_func in memmem snprintf vsnprintf gettext isinf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3331: checking for $ac_func" >&5 +echo "configure:3329: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3397,7 +3395,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3401: checking for $ac_word" >&5 +echo "configure:3399: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MAKEINFO'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3430,7 +3428,7 @@ test -n "$MAKEINFO" || MAKEINFO="error" # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3434: checking for $ac_word" >&5 +echo "configure:3432: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else diff --git a/input/les-nereides.ly b/input/les-nereides.ly index 1ec8d19574..dc4e04f823 100644 --- a/input/les-nereides.ly +++ b/input/les-nereides.ly @@ -25,8 +25,8 @@ cpp -P -traditional -o l-fake.ly -DFAKE_GRACE les-nereides.ly #(define (make-text-checker text) (lambda (elt) ;; huh, string-match undefined? - ;; (string-match text (ly-get-elt-property elt 'text)) - (equal? text (ly-get-elt-property elt 'text)) + ;; (string-match text (ly-get-grob-property elt 'text)) + (equal? text (ly-get-grob-property elt 'text)) )) diff --git a/input/test/test-german-chords.ly b/input/test/test-german-chords.ly deleted file mode 100644 index 0df2a1a39d..0000000000 --- a/input/test/test-german-chords.ly +++ /dev/null @@ -1,14 +0,0 @@ -\include "german-chords.ly" -% #(set! german-Bb #t) - -ch = \chords { beses1/+beses bes/+bes b/+b bis/+bis ases/+ases as/+as a/+a ais/+ais fisis/+fisis} - - -\score { - < - \context ChordNames=ch {\ch} - \context Staff=st \chords {\ch} - > - \paper {} -} - diff --git a/input/tricks/german-chords.ly b/input/tricks/german-chords.ly index e69de29bb2..b04aa71cb8 100644 --- a/input/tricks/german-chords.ly +++ b/input/tricks/german-chords.ly @@ -0,0 +1,37 @@ + +% german-chords.ly: +% german/norwegian/danish? + + +#(define (pitch->chord-name-text-banter pitch) + (if (equal? (cdr pitch) '(6 0)) + '("H") + (if (equal? (cdr pitch) '(6 -1)) '("B") + (pitch->text pitch)))) + +#(define (pitch->note-name-text-banter pitch) + (if (equal? (cdr pitch) '(6 -1)) '("b") + (cons + (string-append + (if (equal? (cadr pitch) 6) "h" + (make-string 1 (integer->char (+ (modulo (+ (cadr pitch) 2) 7) 97)))) + (case (caddr pitch) + ((-1) "eses") + ((-1) "es") + ((0) "") + ((1) "is") + ((2) "isis"))) + '()))) + + + +\score { + < + \context ChordNames \chords { b1/+b bes/+bes bis/+bis } + \notes\transpose c'' \chords { b1/+b bes/+bes bis/+bis } + > + \paper { + linewidth = -1; + } +} + diff --git a/input/tricks/move-specific-text.ly b/input/tricks/move-specific-text.ly index 572a34c58b..2fe4a71523 100644 --- a/input/tricks/move-specific-text.ly +++ b/input/tricks/move-specific-text.ly @@ -1,6 +1,6 @@ #(define (make-text-checker text) - (lambda (grob) (equal? text (ly-get-elt-property grob 'text)))) + (lambda (grob) (equal? text (ly-get-grob-property grob 'text)))) \score { \notes\relative c''' { diff --git a/lily/grob.cc b/lily/grob.cc index f151def2e2..98f0601722 100644 --- a/lily/grob.cc +++ b/lily/grob.cc @@ -868,8 +868,8 @@ init_functions () { interfaces_sym = scm_permanent_object (ly_symbol2scm ("interfaces")); - scm_make_gsubr ("ly-get-elt-property", 2, 0, 0, (Scheme_function_unknown)ly_get_grob_property); - scm_make_gsubr ("ly-set-elt-property", 3, 0, 0, (Scheme_function_unknown)ly_set_grob_property); + scm_make_gsubr ("ly-get-grob-property", 2, 0, 0, (Scheme_function_unknown)ly_get_grob_property); + scm_make_gsubr ("ly-set-grob-property", 3, 0, 0, (Scheme_function_unknown)ly_set_grob_property); scm_make_gsubr ("ly-get-spanner-bound", 2 , 0, 0, (Scheme_function_unknown) spanner_get_bound); } diff --git a/lily/include/property-iterator.hh b/lily/include/property-iterator.hh index e72a0a894f..e1ac8ae2ae 100644 --- a/lily/include/property-iterator.hh +++ b/lily/include/property-iterator.hh @@ -28,6 +28,22 @@ protected: virtual void process (Moment); }; + + + +/** + Iterate a property. + */ +class Property_unset_iterator : public Simple_music_iterator +{ +public: + VIRTUAL_COPY_CONS (Music_iterator); + static SCM constructor_cxx_function; + /* construction */ +protected: + virtual void process (Moment); +}; + class Push_property_iterator : public Simple_music_iterator { public: diff --git a/lily/include/scm-hash.hh b/lily/include/scm-hash.hh index 22c630f9cf..5215476963 100644 --- a/lily/include/scm-hash.hh +++ b/lily/include/scm-hash.hh @@ -69,7 +69,7 @@ public: up. */ void set (SCM k, SCM v); SCM get (SCM k) const; - + void remove (SCM k); Scheme_hash_table (); void operator = (Scheme_hash_table const &); Scheme_hash_table (Scheme_hash_table const &); diff --git a/lily/include/translator-def.hh b/lily/include/translator-def.hh index d9c6d9643e..77082e268d 100644 --- a/lily/include/translator-def.hh +++ b/lily/include/translator-def.hh @@ -31,6 +31,7 @@ private: SCM property_ops_; public: SCM type_name_; + SCM type_aliases_; SCM translator_group_type_; SCM modify_definition (SCM, SCM, bool); diff --git a/lily/include/translator-group.hh b/lily/include/translator-group.hh index 3f444e468b..edc09238fa 100644 --- a/lily/include/translator-group.hh +++ b/lily/include/translator-group.hh @@ -31,7 +31,6 @@ class Translator_group : public virtual Translator { Scheme_hash_table *properties_dict () const; int iterator_count_; - friend class Interpretation_context_handle; protected: ~Translator_group (); @@ -40,6 +39,7 @@ public: void execute_single_pushpop_property (SCM prop, SCM sym, SCM val); SCM get_property (SCM name_sym) const; void set_property (String var_name, SCM value); + void unset_property (SCM var_sym); void set_property (SCM var_sym, SCM value); Translator_group *where_defined (SCM name_sym) const; diff --git a/lily/include/un-relativable-music.hh b/lily/include/un-relativable-music.hh new file mode 100644 index 0000000000..86885ca1be --- /dev/null +++ b/lily/include/un-relativable-music.hh @@ -0,0 +1,25 @@ +/* + un-relativable-music.hh -- declare + + source file of the GNU LilyPond music typesetter + + (c) 2001 Han-Wen Nienhuys + + */ + +#ifndef UN_RELATIVABLE_MUSIC_HH +#define UN_RELATIVABLE_MUSIC_HH + +#include "music-wrapper.hh" + +class Un_relativable_music: public Music_wrapper +{ +public: + Un_relativable_music (); + Pitch to_relative_octave (Pitch); + VIRTUAL_COPY_CONS(Music); +}; + + +#endif /* UN_RELATIVABLE_MUSIC_HH */ + diff --git a/lily/music.cc b/lily/music.cc index 75bf2746fb..48cefa0766 100644 --- a/lily/music.cc +++ b/lily/music.cc @@ -276,11 +276,27 @@ ly_make_music (SCM type) } } +SCM +ly_music_name (SCM mus) +{ + Music * m = unsmob_music (mus); + const char *nm =""; + if (!m) + { + warning (_ ("ly_music_name (): Not a music expression")); + scm_write (mus, scm_current_error_port ()); + } + else + nm = classname (m); + return ly_str02scm (nm); +} + static void init_functions () { scm_make_gsubr ("ly-get-mus-property", 2, 0, 0, (Scheme_function_unknown)ly_get_mus_property); scm_make_gsubr ("ly-set-mus-property", 3, 0, 0, (Scheme_function_unknown)ly_set_mus_property); - scm_make_gsubr ("ly-make-music", 1, 0, 0, (Scheme_function_unknown)ly_make_music); + scm_make_gsubr ("ly-make-music", 1, 0, 0, (Scheme_function_unknown)ly_make_music); + scm_make_gsubr ("ly-music-name", 1, 0, 0, (Scheme_function_unknown)ly_music_name); } ADD_SCM_INIT_FUNC (musicscm,init_functions); diff --git a/lily/my-lily-lexer.cc b/lily/my-lily-lexer.cc index 9000acf6e6..305afcfe03 100644 --- a/lily/my-lily-lexer.cc +++ b/lily/my-lily-lexer.cc @@ -25,6 +25,7 @@ #include "moment.hh" static Keyword_ent the_key_tab[]={ + {"alias", ALIAS}, {"apply", APPLY}, {"arpeggio", ARPEGGIO }, {"autochange", AUTOCHANGE}, @@ -87,6 +88,7 @@ static Keyword_ent the_key_tab[]={ {"translator", TRANSLATOR}, {"transpose", TRANSPOSE}, {"type", TYPE}, + {"unset", UNSET}, {0,0} }; diff --git a/lily/parser.yy b/lily/parser.yy index 985662ab79..4593fea92f 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -42,7 +42,7 @@ #include "part-combine-music.hh" #include "scm-hash.hh" #include "auto-change-iterator.hh" - +#include "un-relativable-music.hh" #include "chord.hh" bool @@ -136,6 +136,7 @@ yylex (YYSTYPE *s, void * v_l) /* tokens which are not keywords */ %token AUTOCHANGE +%token ALIAS %token APPLY %token ARPEGGIO %token DYNAMICSCRIPT @@ -200,6 +201,7 @@ yylex (YYSTYPE *s, void * v_l) %token TRANSLATOR %token TRANSPOSE %token TYPE +%token UNSET %token CONTEXT /* escaped */ @@ -480,6 +482,10 @@ translator_spec_body: | translator_spec_body CONSISTS STRING semicolon { unsmob_translator_def ($$)->add_element ($3); } + | translator_spec_body ALIAS STRING semicolon { + Translator_def*td = unsmob_translator_def ($$); + td->type_aliases_ = gh_cons ($3, td->type_aliases_); + } | translator_spec_body ELEMENTDESCRIPTIONS embedded_scm { for (SCM p = $3; gh_pair_p (p); p = gh_cdr (p)) unsmob_translator_def ($$) @@ -860,7 +866,10 @@ Composite_music: { THIS->lexer_p_->push_chord_state (); } Music { - $$ = $3; + Music * chm = new Un_relativable_music ; + chm->set_mus_property ("element", $3->self_scm ()); + $$ = chm; + THIS->lexer_p_->pop_state (); } | LYRICS @@ -948,6 +957,22 @@ property_def: csm-> set_mus_property ("context-type", $2); } + | PROPERTY STRING '.' STRING UNSET { + Music *t = new Music (SCM_EOL); + + t->set_mus_property ("iterator-ctor", + Property_unset_iterator::constructor_cxx_function); + t->set_mus_property ("symbol", scm_string_to_symbol ($4)); + + Context_specced_music *csm = new Context_specced_music (SCM_EOL); + csm->set_mus_property ("element", t->self_scm ()); + scm_unprotect_object (t->self_scm ()); + + $$ = csm; + $$->set_spot (THIS->here_input ()); + + csm-> set_mus_property ("context-type", $2); + } | PROPERTY STRING '.' STRING SET embedded_scm '=' embedded_scm { Music *t = new Music (SCM_EOL); t->set_mus_property ("iterator-ctor", diff --git a/lily/property-iterator.cc b/lily/property-iterator.cc index 171a872b3f..1967bea297 100644 --- a/lily/property-iterator.cc +++ b/lily/property-iterator.cc @@ -31,6 +31,18 @@ Property_iterator::process (Moment m) Simple_music_iterator::process (m); } +void +Property_unset_iterator::process (Moment m) +{ + SCM sym = music_l_->get_mus_property ("symbol"); + if (gh_symbol_p (sym)) + { + report_to_l ()->unset_property (sym); + } + Simple_music_iterator::process (m); +} + + void Push_property_iterator::process (Moment m) { @@ -57,6 +69,8 @@ Pop_property_iterator::process (Moment m) Simple_music_iterator::process (m); } + IMPLEMENT_CTOR_CALLBACK (Pop_property_iterator); IMPLEMENT_CTOR_CALLBACK (Push_property_iterator); IMPLEMENT_CTOR_CALLBACK (Property_iterator); +IMPLEMENT_CTOR_CALLBACK(Property_unset_iterator); diff --git a/lily/scm-hash.cc b/lily/scm-hash.cc index 2dfca6d4e6..08cac97094 100644 --- a/lily/scm-hash.cc +++ b/lily/scm-hash.cc @@ -98,6 +98,11 @@ Scheme_hash_table::get (SCM k)const return (* (Scheme_hash_table*)this)[k]; } +void +Scheme_hash_table::remove (SCM k) +{ + Scm_stl_map::erase (k); +} Scheme_hash_table::~Scheme_hash_table () { diff --git a/lily/system-start-delimiter-engraver.cc b/lily/system-start-delimiter-engraver.cc index 27ee99dc86..1f4504a733 100644 --- a/lily/system-start-delimiter-engraver.cc +++ b/lily/system-start-delimiter-engraver.cc @@ -53,14 +53,6 @@ System_start_delimiter_engraver::acknowledge_grob (Grob_info inf) if (gh_symbol_p (gl) && gl == ly_symbol2scm ("brace") && gh_symbol_p (my_gl) && my_gl == ly_symbol2scm ("bracket")) inf.elem_l_->translate_axis (-1.0, X_AXIS); // ugh - else if (gh_symbol_p (gl) && gl == ly_symbol2scm ("bracket") - && gh_symbol_p (my_gl) && my_gl == ly_symbol2scm ("bracket")) - { - inf.elem_l_->translate_axis ( -0.8, X_AXIS); // ugh - inf.elem_l_->set_grob_property ("arch-height", - gh_double2scm(gh_scm2double(inf.elem_l_->get_grob_property - ("arch-height"))+0.5)); - } } } diff --git a/lily/translator-def.cc b/lily/translator-def.cc index 917a31d7f0..6150a66d11 100644 --- a/lily/translator-def.cc +++ b/lily/translator-def.cc @@ -31,6 +31,8 @@ SCM Translator_def::mark_smob (SCM smob) { Translator_def* me = (Translator_def*) SCM_CELL_WORD_1 (smob); + + scm_gc_mark (me->type_aliases_); scm_gc_mark (me->consists_name_list_); scm_gc_mark (me->accepts_name_list_); scm_gc_mark (me->end_consists_name_list_); @@ -53,6 +55,7 @@ ADD_SCM_INIT_FUNC (transdef, foo_init); Translator_def::Translator_def () { + type_aliases_ = SCM_EOL; translator_group_type_ = SCM_EOL; accepts_name_list_ = SCM_EOL; consists_name_list_ = SCM_EOL; @@ -71,7 +74,7 @@ Translator_def::Translator_def (Translator_def const & s) end_consists_name_list_ = scm_list_copy (s.end_consists_name_list_); accepts_name_list_ = scm_list_copy (s.accepts_name_list_); property_ops_ = scm_list_copy (s.property_ops_); - + type_aliases_ = s.type_aliases_; translator_group_type_ = s.translator_group_type_; type_name_ = s.type_name_; } @@ -177,12 +180,21 @@ Translator_def::path_to_acceptable_translator (SCM type_str, Music_output_def* o Link_array best_result; for (int i=0; i < accepted_arr.size (); i++) - if (scm_equal_p (accepted_arr[i]->type_name_, type_str) == SCM_BOOL_T) - { - best_result.push (accepted_arr[i]); - return best_result; - } + { + bool found =false; + if (scm_equal_p (accepted_arr[i]->type_name_, type_str) == SCM_BOOL_T) + found = true; + + for (SCM s = accepted_arr[i]->type_aliases_; !found && gh_pair_p (s); s = gh_cdr (s)) + found = found || (gh_equal_p (gh_car (s), type_str)); + if (found) + { + best_result.push (accepted_arr[i]); + return best_result; + } + } + int best_depth= INT_MAX; for (int i=0; i < accepted_arr.size (); i++) { diff --git a/lily/translator-group.cc b/lily/translator-group.cc index d1276c95ec..ff63c26e16 100644 --- a/lily/translator-group.cc +++ b/lily/translator-group.cc @@ -294,12 +294,23 @@ Translator_group::set_property (String id, SCM val) set_property (ly_symbol2scm (id.ch_C ()), val); } + void Translator_group::set_property (SCM sym, SCM val) { properties_dict ()->set (sym, val); } +/* + TODO: look up to check whether we have inherited var? + */ +void +Translator_group::unset_property (SCM sym) +{ + properties_dict ()->remove (sym); +} + + /* Push or pop (depending on value of VAL) a single entry (ELTPROP . VAL) entry from a translator property list by name of PROP diff --git a/lily/un-relativable-music.cc b/lily/un-relativable-music.cc new file mode 100644 index 0000000000..f15bfa72a8 --- /dev/null +++ b/lily/un-relativable-music.cc @@ -0,0 +1,25 @@ +/* + un-relativable-music.cc -- implement Un_relativable_music + + source file of the GNU LilyPond music typesetter + + (c) 2001 Han-Wen Nienhuys + + */ + +#include "un-relativable-music.hh" + + +Un_relativable_music::Un_relativable_music ( ) +{ + set_mus_property ("type", ly_symbol2scm ("un-relativable-music")); +} + +Pitch +Un_relativable_music::to_relative_octave (Pitch p) +{ + return p; +} + +ADD_MUSIC(Un_relativable_music); + diff --git a/ly/engraver.ly b/ly/engraver.ly index 2f266e3bef..152aacde5b 100644 --- a/ly/engraver.ly +++ b/ly/engraver.ly @@ -68,8 +68,6 @@ ChoirStaffContext = \translator { \accepts "RhythmicStaff"; \accepts "GrandStaff"; \accepts "PianoStaff"; - \accepts "StaffGroup"; - \accepts "ChoirStaff"; \accepts "Lyrics"; \accepts "ChordNames"; } @@ -247,8 +245,6 @@ StaffGroupContext= \translator { \accepts "RhythmicStaff"; \accepts "GrandStaff"; \accepts "PianoStaff"; - \accepts "StaffGroup"; - \accepts "ChoirStaff"; \accepts "Lyrics"; \accepts "ChordNames"; @@ -289,16 +285,6 @@ LyricsContext = \translator { \accepts "LyricsVoice"; } -ChordNamesVoiceContext = \translator { - \type "Engraver_group_engraver"; - \name ChordNamesVoice ; - - \consists "Output_property_engraver"; - \consistsend "Axis_group_engraver"; - \consists "Separating_line_group_engraver"; - \consists "Chord_name_engraver"; - \consists "Skip_req_swallow_translator"; -} ChordNamesContext = \translator { \type "Engraver_group_engraver"; @@ -308,10 +294,12 @@ ChordNamesContext = \translator { \consists "Property_engraver"; \consists "Output_property_engraver"; - \accepts "ChordNamesVoice"; + \consists "Separating_line_group_engraver"; + \consists "Chord_name_engraver"; + \consists "Skip_req_swallow_translator"; + \consistsend "Axis_group_engraver"; VerticalAxisGroup \override #'invisible-staff = ##t - \consistsend "Axis_group_engraver"; } diff --git a/ly/german-chords.ly b/ly/german-chords.ly deleted file mode 100644 index e158592b34..0000000000 --- a/ly/german-chords.ly +++ /dev/null @@ -1,39 +0,0 @@ - -% german-chords.ly: -% german/norwegian/danish? - -% To get Bb instead of B, use -% \include "german-chords.ly" -% #(set! german-Bb #t) - -#(define german-Bb #f) - -#(define (pitch->chord-name-text-banter pitch) - (if (equal? (cdr pitch) '(6 -1)) - (if german-Bb - (cons "B" (accidental->text -1)) - '("B") - ) - (cons - (list-ref '("C" "D" "E" "F" "G" "A" "H") (cadr pitch)) - (accidental->text (caddr pitch)) - ) - ) - ) - - -#(define (pitch->note-name-text-banter pitch) - (if (equal? (cdr pitch) '(6 -1)) - '("b") - (cons - (string-append - (list-ref '("c" "d" "e" "f" "g" "a" "h") (cadr pitch)) - (if (or (equal? (cadr pitch) 2) (equal? (cadr pitch) 5)) - (list-ref '( "ses" "s" "" "is" "isis") (+ 2 (caddr pitch))) - (list-ref '("eses" "es" "" "is" "isis") (+ 2 (caddr pitch))) - ) - ) - '() - ) - ) - ) diff --git a/ly/params.ly b/ly/params.ly index 6ac3908098..4b9a7a9309 100644 --- a/ly/params.ly +++ b/ly/params.ly @@ -20,7 +20,6 @@ outputscale = \staffheight / 4.0; \translator { \VoiceContext} \translator { \StaffGroupContext } \translator { \ChordNamesContext } -\translator { \ChordNamesVoiceContext} \translator { \GrandStaffContext} \translator { \LyricsContext } \translator { \ThreadContext} diff --git a/make/out/lilypond.lsm b/make/out/lilypond.lsm index 70da24d590..15f54ecda4 100644 --- a/make/out/lilypond.lsm +++ b/make/out/lilypond.lsm @@ -1,15 +1,15 @@ Begin3 Title: LilyPond -Version: 1.3.137 -Entered-date: 11MAR01 +Version: 1.3.138 +Entered-date: 16MAR01 Description: @BLURB@ Keywords: music notation typesetting midi fonts engraving Author: hanwen@cs.uu.nl (Han-Wen Nienhuys) janneke@gnu.org (Jan Nieuwenhuizen) Maintained-by: hanwen@stack.nl (Han-Wen Nienhuys) Primary-site: sunsite.unc.edu /pub/Linux/apps/sound/convert - 1000k lilypond-1.3.137.tar.gz + 1000k lilypond-1.3.138.tar.gz Original-site: ftp.cs.uu.nl /pub/GNU/LilyPond/development/ - 1000k lilypond-1.3.137.tar.gz + 1000k lilypond-1.3.138.tar.gz Copying-policy: GPL End diff --git a/make/out/lilypond.spec b/make/out/lilypond.spec index ba3bd25a7e..b0faa96c9d 100644 --- a/make/out/lilypond.spec +++ b/make/out/lilypond.spec @@ -1,11 +1,11 @@ %define info yes Name: lilypond -Version: 1.3.137 +Version: 1.3.138 Release: 1 License: GPL Group: Applications/Publishing -Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.3.137.tar.gz +Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.3.138.tar.gz Summary: A program for printing sheet music. URL: http://www.cs.uu.nl/~hanwen/lilypond # Icon: lilypond-icon.gif diff --git a/scm/beam.scm b/scm/beam.scm index 3fa8fc33ce..f7afad28fc 100644 --- a/scm/beam.scm +++ b/scm/beam.scm @@ -39,7 +39,7 @@ ;; which should be 1 (== 1 interline) (define (mean a b) (* 0.5 (+ a b))) (define (default-beam-dy-quants beam stafflinethick) - (let ((thick (ly-get-elt-property beam 'thickness)) + (let ((thick (ly-get-grob-property beam 'thickness)) ) (list 0 (mean thick stafflinethick) (+ thick stafflinethick) 1) @@ -52,7 +52,7 @@ (define (default-beam-y-quants beam multiplicity dy staff-line) (let* ((beam-straddle 0) - (thick (ly-get-elt-property beam 'thickness)) + (thick (ly-get-grob-property beam 'thickness)) (beam-sit (/ (+ thick staff-line) 2)) (beam-hang (- 1 (/ (- thick staff-line) 2))) (quants (list beam-hang)) @@ -67,7 +67,7 @@ (define (beam-traditional-y-quants beam multiplicity dy staff-line) (let* ((beam-straddle 0) - (thick (ly-get-elt-property beam 'thickness)) + (thick (ly-get-grob-property beam 'thickness)) (beam-sit (/ (+ thick staff-line) 2)) (beam-hang (- 1 (/ (- thick staff-line) 2))) (quants '()) diff --git a/scm/c++.scm b/scm/c++.scm index b995d72b30..045002d357 100644 --- a/scm/c++.scm +++ b/scm/c++.scm @@ -101,8 +101,8 @@ (define (make-type-checker symbol) (lambda (elt) ;;(display symbol) - ;;(eq? #t (ly-get-elt-property elt symbol)) - (not (eq? #f (memq symbol (ly-get-elt-property elt 'interfaces)))))) + ;;(eq? #t (ly-get-grob-property elt symbol)) + (not (eq? #f (memq symbol (ly-get-grob-property elt 'interfaces)))))) (define (index-cell cell dir) diff --git a/scm/chord-name.scm b/scm/chord-name.scm index 5bbb2017e4..bcdf7aaa1f 100644 --- a/scm/chord-name.scm +++ b/scm/chord-name.scm @@ -253,9 +253,11 @@ (define (pitch->note-name pitch) (cons (cadr pitch) (caddr pitch))) - -(define (accidental->text acc) - (if (= acc 0) + +(define (pitch->text pitch) + (cons + (make-string 1 (integer->char (+ (modulo (+ (cadr pitch) 2) 7) 65))) + (if (= (caddr pitch) 0) '() (list (append '(music) @@ -266,15 +268,7 @@ (list (append '((raise . 0.6)) (list (string-append "accidentals-" - (number->string acc)))))))))))) -) - -(define (pitch->text pitch) - (cons - (make-string 1 (integer->char (+ (modulo (+ (cadr pitch) 2) 7) 65))) - (accidental->text (caddr pitch)) - ) -) + (number->string (caddr pitch))))))))))))))) ;;; Hooks to override chord names and note names, ;;; see input/tricks/german-chords.ly diff --git a/scm/slur.scm b/scm/slur.scm index c15dd9bf33..abfa9e2a89 100644 --- a/scm/slur.scm +++ b/scm/slur.scm @@ -7,13 +7,13 @@ ;;; (define (attached-to-stem slur dir) - (let* ((note-columns (ly-get-elt-property slur 'note-columns)) + (let* ((note-columns (ly-get-grob-property slur 'note-columns)) (col (if (= dir 1) (car note-columns) (car (reverse note-columns)))) - (stem (ly-get-elt-property col 'stem))) + (stem (ly-get-grob-property col 'stem))) (and (eq? col (ly-get-spanner-bound slur dir)) stem - (ly-get-elt-property stem 'heads)))) + (ly-get-grob-property stem 'heads)))) ;; Slur-extremity-rules is a list of rules. Each rule is a pair @@ -37,7 +37,7 @@ ;; urg: don't crash on a slur without note-columns (cons (lambda (slur dir) - (< (length (ly-get-elt-property slur 'note-columns)) 1)) 'head) + (< (length (ly-get-grob-property slur 'note-columns)) 1)) 'head) ;; (cons (lambda (slur dir) (begin (display "before loose-end") (newline))#f) #f) (cons (lambda (slur dir) (not (attached-to-stem slur dir))) 'loose-end) @@ -46,12 +46,12 @@ (cons (lambda (slur dir) ;; urg, code dup - (let* ((note-columns (ly-get-elt-property slur 'note-columns)) + (let* ((note-columns (ly-get-grob-property slur 'note-columns)) (col (if (= dir 1) (car note-columns) (car (reverse note-columns)))) - (stem (ly-get-elt-property col 'stem))) + (stem (ly-get-grob-property col 'stem))) (and stem - (not (= (ly-get-elt-property slur 'direction) - (ly-get-elt-property stem 'direction)))))) 'head) + (not (= (ly-get-grob-property slur 'direction) + (ly-get-grob-property stem 'direction)))))) 'head) ;; (cons (lambda (slur dir) (begin (display "before stem") (newline))#f) #f) @@ -60,13 +60,13 @@ (and (attached-to-stem slur dir) ;; and got beam ;; urg, code dup - (let* ((note-columns (ly-get-elt-property slur 'note-columns)) + (let* ((note-columns (ly-get-grob-property slur 'note-columns)) (col (if (= dir 1) (car note-columns) (car (reverse note-columns)))) - (stem (ly-get-elt-property col 'stem))) + (stem (ly-get-grob-property col 'stem))) (and stem - (ly-get-elt-property stem 'beam) + (ly-get-grob-property stem 'beam) ;; and beam on same side as slur - (let ((beaming (ly-get-elt-property stem 'beaming))) + (let ((beaming (ly-get-grob-property stem 'beaming))) ;; (display "beaming (") (display dir) (display "): ") (write beaming) (newline) (if (pair? beaming) (>= (if (= dir -1) (cdr beaming) (car beaming)) diff --git a/scm/translator-description.scm b/scm/translator-description.scm index 389a35bc93..b6df65af41 100644 --- a/scm/translator-description.scm +++ b/scm/translator-description.scm @@ -112,7 +112,16 @@ interesting items (ie. note heads, lyric syllables and normal rests)" 'A2_engraver (engraver-description "A2_engraver" - "Part combine engraver for orchestral scores." + "Part combine engraver for orchestral scores. + +The markings @emph{@`{a}2}, @emph{Solo} and @emph{Solo II}, are +created by this engraver. It also acts upon instructions of the part +combiner. Another thing that the this engraver, is forcing of stem, +slur and tie directions, always when both threads are not identical; +up for the musicexpr called @code{one}, down for the musicexpr called +@code{two}. + +" '(TextScript) '( combineParts @@ -688,8 +697,15 @@ bar lines, and draws a single span-bar across them." 'Thread_devnull_engraver (engraver-description "Thread_devnull_engraver" - "Kill elements whenever we are Voice called `two' and -either unison, unisilence or soloADue is set" + "Kill elements whenever we are Voice called `two' and either +unison, unisilence or soloADue is set.@footnote{On unix systems, the +file @file{/dev/null} is special device: anything written to it is +discarded.}. This engraver works closely together with the part +combiner. When the part combiner notices that two threads are +identical, it tells the @code{Thread_devnull_engraver} to discard +everything in the second thread. +" + '() '())) diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py index c37c2b6ab1..d5d8162396 100644 --- a/scripts/convert-ly.py +++ b/scripts/convert-ly.py @@ -677,6 +677,14 @@ if 1: conversions.append (((1,3,122), conv, 'drarnChords -> chordChanges, \\musicalpitch -> \\pitch')) +if 1: + def conv (str): + str = re.sub ('ly-([sg])et-elt-property', 'ly-\\1et-grob-property', str) + return str + + conversions.append (((1,3,136), conv, 'ly-X-elt-property -> ly-X-grob-property')) + + ############################ diff --git a/stepmake/configure b/stepmake/configure index d47af1e8c1..12481314a9 100755 --- a/stepmake/configure +++ b/stepmake/configure @@ -65,11 +65,13 @@ ac_help= ac_default_prefix=/usr/local # Any additions from configure.in: ac_help="$ac_help - enable-config=FILE put configure settings in config-FILE.make" + --enable-config=CONF put settings in config-CONF.make and config-CONF.h; + do \`make conf=CONF' to get output in ./out-CONF" ac_help="$ac_help - with-localedir=LOCALE use LOCALE as locale dir. Default: PREFIX/share/locale " + --with-localedir=LOCALE use LOCALE as locale dir. Default: + PREFIX/share/locale " ac_help="$ac_help - with-lang=LANG use LANG as language to emit messages" + --with-lang=LANG use LANG as language to emit messages" # Initialize some variables set by options. # The variables have the same names as the options, with @@ -613,12 +615,12 @@ fi fi echo $ac_n "checking Package""... $ac_c" 1>&6 -echo "configure:617: checking Package" >&5 +echo "configure:619: checking Package" >&5 if test "x$PACKAGE" = "xSTEPMAKE"; then echo "$ac_t""Stepmake package!" 1>&6 echo $ac_n "checking builddir""... $ac_c" 1>&6 -echo "configure:622: checking builddir" >&5 +echo "configure:624: checking builddir" >&5 if test "$srcdir" = "."; then builddir=. else @@ -656,7 +658,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. echo "$ac_t""$PACKAGE" 1>&6 echo $ac_n "checking builddir""... $ac_c" 1>&6 -echo "configure:660: checking builddir" >&5 +echo "configure:662: checking builddir" >&5 if test "$srcdir" = "."; then builddir=. srcdir_build=no @@ -676,7 +678,7 @@ echo "configure:660: checking builddir" >&5 fi echo $ac_n "checking for stepmake""... $ac_c" 1>&6 -echo "configure:680: checking for stepmake" >&5 +echo "configure:682: checking for stepmake" >&5 # Check for installed stepmake if test -d $stepmake; then echo "$ac_t""$stepmake" 1>&6 @@ -797,7 +799,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:801: checking host system type" >&5 +echo "configure:803: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -822,7 +824,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:826: checking for $ac_word" >&5 +echo "configure:828: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MAKE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -857,7 +859,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:861: checking for $ac_word" >&5 +echo "configure:863: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_FIND'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -894,7 +896,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:898: checking for $ac_word" >&5 +echo "configure:900: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_TAR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -929,7 +931,7 @@ test -n "$TAR" || TAR="error" # Extract the first word of "bash", so it can be a program name with args. set dummy bash; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:933: checking for $ac_word" >&5 +echo "configure:935: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_BASH'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -969,7 +971,7 @@ fi # Extract the first word of "bash", so it can be a program name with args. set dummy bash; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:973: checking for $ac_word" >&5 +echo "configure:975: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_SHELL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1006,7 +1008,7 @@ fi # Extract the first word of "bash", so it can be a program name with args. set dummy bash; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1010: checking for $ac_word" >&5 +echo "configure:1012: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_BASH'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1047,7 +1049,7 @@ fi # Extract the first word of "${PYTHON:-python}", so it can be a program name with args. set dummy ${PYTHON:-python}; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1051: checking for $ac_word" >&5 +echo "configure:1053: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1220,7 +1222,7 @@ fi echo $ac_n "checking language""... $ac_c" 1>&6 -echo "configure:1224: checking language" >&5 +echo "configure:1226: checking language" >&5 case "$language" in En* | en* | Am* | am* | US* | us*) lang=English;; @@ -1255,7 +1257,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1259: checking for $ac_word" >&5 +echo "configure:1261: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MAKEINFO'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else