From: Han-Wen Nienhuys Date: Fri, 20 Nov 1998 12:22:21 +0000 (+0100) Subject: release: 1.1.8 X-Git-Tag: release/1.1.8 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=fc81e281674f9d3cb627ef84e8597f14ac78a046;p=lilypond.git release: 1.1.8 --- diff --git a/Documentation/tex/tutorial.yo b/Documentation/tex/tutorial.yo index a20de9a2c0..a6186f2444 100644 --- a/Documentation/tex/tutorial.yo +++ b/Documentation/tex/tutorial.yo @@ -379,8 +379,9 @@ on entering music for now. Consequently, when we mean verb(\score { \notes { XXXX } \paper { } -}) -we will leave out the the repetitive details and just print +})COMMENT( + +) we will leave out the the repetitive details and just print code(XXXX). @@ -1010,9 +1011,7 @@ A notation context is not a primitive element of LilyPond, but rather how you can create your own contexts. - - -sect(Nested music: more than one staff) +sect(Nested music: multiple staffs) label(tutorial:more-staffs) Now we explain how to typeset music that runs in multiple staffs. @@ -1022,19 +1021,15 @@ mudela(fragment)( \type GrandStaff ) - The music consists of two notes. Perhaps this is sheet music for a -piano player, and one note is meant to be played with the left hand, -and the other with the right hand. That music would sound the same if -it were written as a single chord on a single staff, i.e., -mudela(fragment)( - -) - +In this example the music consists of two notes. The above would +sound the same if it were written as a single chord on a single staff, +i.e., COMMENT( -This is another example where we can see that there can be a difference -between a musical idea, and the way it is expressed in notation. +)mudela(fragment)( + +)COMMENT( -The Mudela construct for multiple staffs reflects the similarity +) The Mudela construct for multiple staffs reflects the similarity between the two examples: to get multiple staffs in Mudela you enter a chord, with an additional instruction to tell LilyPond that the chord does not represent notes stacked together, but staffs stacked @@ -1063,16 +1058,19 @@ verb( ) This looks reasonable, but the effect of this input is not what you -might expect (try it!). When interpreting this chord LilyPond will -start with the first entry, so a (nameless) staff is searched. Such a -staff is not found, so it is created. On this staff the code(e) note -is put. When the second code(\type) entry is read, LilyPond will -start looking for a nameless staff. The staff that contains the -code(e) is found, and the code(g) is put there as well. +might expect: +mudela(fragment)( + < \type Staff e'4 + \type Staff g4 + > +)COMMENT( -The correct solution is to label both code(\type) constructs with -different names, for example code(trebleStaff) and code(bassStaff). -This makes LilyPond distinguish between them, and create two staffs: +) Since there are no names specified for the desired staffs, LilyPond +thinks your wishes are fullfilled by putting the code(g) on the same +staff as the code(e). The correct solution is to label both staffs +with different names, for example code(trebleStaff) and +code(bassStaff). This makes LilyPond distinguish between them, and +create two staffs: mudela(verbatim,fragment)( < \type Staff = trebleStaff e'4 @@ -1082,38 +1080,34 @@ mudela(verbatim,fragment)( ) The names that you choose do not matter just as long as they are different. This is almost right, except for the brace at the left and -the clef of the second staff. The bass clef will be taken care of in -the next section. If you want a brace, then you have to tell LilyPond -that the chord you just formed is to be interpreted as a so-called -grand staff. This is also done with the code(\type) command. -mudela(verbatim,fragment)( - \type GrandStaff < - \type Staff = treblestaff e'4 - \type Staff = bassstaff g4 - > -) - +the clef of the second staff. If you want a brace, then you have to +tell LilyPond that the chord you just formed is to be interpreted as a +so-called grand staff. This is also done with the code(\type) +command. The bass clef is made with a clef command: COMMENT( +) mudela(verbatim,fragment)( + \type GrandStaff < + \type Staff = treblestaff e'4 + \type Staff = bassstaff { \clef "bass"; g4 } + >)COMMENT( +) sect(Polyphonic music (or: Notation context properties)) label(sec:polyphonic) - -In the last section we explained that a notation context can have -properties that influence the conversion from music to notation. A -simple example of such a property is the clef: the type of clef -partially determines the vertical position of note heads in a staff. -Some of these properties can be modified by commands such as +In the section on notation contexts we explained that a notation +context can have properties that influence the conversion from music +to notation. A simple example of such a property is the clef: the +type of a clef helps determines the vertical position of note heads in +a staff. Some of these properties can be modified by commands such as code(\clef) and code(\time). But there is more: notation contexts also have properties are settable in a generic fashion. We will demonstrate this feature by printing multiple voices on a staff. -In polyphonic (keyboard) music and orchestral scores often more than -one voice is printed on one staff. We'll explain how to achieve this -effect with LilyPond. The effect is not unlike the two stacked staffs -from bind(Section)ref(tutorial:more-staffs), except that we don't want -to stack staffs but voices. Thus, the general template is the following: +Printing more than one voice on a staff, is not unlike printing +multiple staffs stacked together. This suggests that the template +to follow is this: verb( \type Staff < \type Voice = one ... @@ -1122,8 +1116,8 @@ verb( ) COMMENT( ) On the ellipsis there should be music going from left to right, in -otherr words, there should be sequential music, notes enclosed in -braces. Let us try the following simple melodies: +other words, notes enclosed in braces. Let us try the following +simple melodies: mudela(fragment,verbatim)( \type "Staff" < @@ -1136,24 +1130,17 @@ two beats look like plain chords and not like separate voices. What really happened was that the stems of the upper and lower voices were printed on top of each other. - -To remedy this, engravers traditionally make the stems of the upper -and lower voice point in different directions: the stems of the lower +To remedy this, engravers traditionally make the stems of the lower voice point down, and the stems of the upper up, as shown in bind(Figure)ref(tutorial:multi-voice-fig). Surely the direction of a single stem is a property of the stem as a graphical object. But the fact that all of the stems in a voice point in the same direction is not directly graphical. Since this is a -property shared by all the stems in the voice, it is logical to -consider this property to be a property of the context code(Voice). -And this is how it's done in LilyPond: the context code(Voice) has an -attribute whose value is the direction to use -for stems. You can change it to `up' -by issuing the following phrase:footnote(The name code(ydirection) is -no mistake. The property also controls the up/down directions of -super-/subscripts, slurs, ties, etc.) - +property shared by all the stems in the voice, this property is a +property of the context code(Voice). The context code(Voice) has an +attribute whose value is the direction to use for stems. You can +change it to `up' by issuing the following phrase: verb( \property "Voice"."ydirection" = "1" ) @@ -1161,8 +1148,9 @@ verb( This command should be read as ``change the property called code(ydirection) within the current code(Voice) context to the value code(-1).'' For the property code(ydirection) the value code(1) means -`up', and code(-1) means `down'. The proper way to code the -polyphonic example is given in bind(Figure)ref(tutorial:multi-voice-fig). +`up', and code(-1) means `down'. So, the +proper way to code the polyphonic example is given in +bind(Figure)ref(tutorial:multi-voice-fig). latexcommand(\begin{figure}[h]) mudela(fragment,verbatim,center)( @@ -1179,10 +1167,14 @@ mudela(fragment,verbatim,center)( label(tutorial:multi-voice-fig) latexcommand(\end{figure}) +As you can see, this property also controls the directions of slurs, +which explains the name code(ydirection).COMMENT(hmm) + + Other properties can also be set, and they can be within different contexts. In general, you can set a property by specifying code(\property) var(contexttype)code(.)var(propertyname) code(=) -var(value). Both var(ContextType), var(PropertyName) and var(Value) +var(value). Both var(contexttype), var(propertyname) and var(value) should be strings. The effect of a property is pretty much hardwired into the @@ -1191,70 +1183,47 @@ all the possible properties in detail. Among other characteristics that can be set are the layout of slurs and beams. The initialisation file file(property.ly) explains most properties. -We conclude this section with another example of a context property. -Polyphonic music that has three or four voices can't be printed by -simply changing the directions of the stems for each voice, obviously. -Traditionally, some chords are shifted horizontally to print if this -many voices have to be printed. LilyPond can also do this, and the -property that controls the horizontal shifting is called code(hshift). -The notes in a code(Voice) context that has code(hshift) set to a true -value (i.e., non-zero or non-empty), will be shifted horizontally in -the case of a collision. The following example demonstrates the -effect. - -mudela(fragment,verbatim)( - \type "Staff" < - \type "Voice" = "one" { - \property Voice.ydirection = "1" - r4 as'4 () as'4 g'4 } - \type "Voice" = "two" { - \property Voice.ydirection = "1" - \property Voice.hshift = 1 - g'2 f'4 e'4 } - \type "Voice" = "three" { - \property Voice.ydirection = "-1" - [d'8 dis'] [d' cis'] [c' b] c'4 - } - > -) - sect(Lyrics) label(tutorial:lyrics) -Now for something completely different: Lyrics. Lyrics are also -considered to be music, although a lyric by itself does not have any -pitch. Producing lyrics has two aspects. First, you have to enter the -text, i.e., the syllables along with their durations. -After this, you have to specify how to convert these to graphics. +Since a lyrics can have durations just like notes, we consider them to +be music too. Entering lyrics in mudela has two aspects. First, you +have to enter the text, i.e., the syllables along with their +durations. After this, you have to specify how to convert these to +graphics. Lyrics consist of syllables, which are strings together with durations. Previously we only entered note names, so for entering lyrics we have to instruct LilyPond that what we enter are not note -names but words---or rather: strings. This instruction is the keyword +names but strings. This instruction is the keyword code(\lyrics). After entering this keyword you can enter a musical construct---sequential music, simultaneous music, code(\type) entries, etc.--- but with syllables instead of pitches. For example: -verb( \lyrics { 'got8 me on my knees4, Le-8 lie! }) +COMMENT( -Next comes the conversion to notation. LilyPond can't (yet) figure +)verb(\lyrics { 'got8 me on my knees4, Le-8 lie! })COMMENT( + +) Next comes the conversion to notation. LilyPond can't (yet) figure out that lyrics need different treatment than notes. As a result, the default conversion will try to put the text you entered as note heads -onto a staff, and this will fail. This default must be overriden with -a code(\type) keyword. Printing syllables of text in a line is done -by a context called code(Lyrics). You can select this context with -the code(\type) keyword. Here is a simple example: +onto a staff, and this will fail. This default must be overridden +with a code(\type) keyword. Printing syllables of text in a line is +done by a context called code(Lyrics). You can select this context +with the code(\type) keyword. Here is a simple example: +COMMENT( -mudela(fragment,verbatim)( - \type Lyrics \lyrics { 'got8 me on my knees,4 Le-8 lie! }) +)mudela(fragment,verbatim)( +\type Lyrics \lyrics { 'got8 me on my knees,4 Le-8 lie! })COMMENT( -The result is technically correct, but without a melody it -just doesn't work, so let's add a blob of cream: -mudela(fragment,verbatim)( +)The result is technically correct, but it needs a melody to make it +performable: COMMENT( + +)mudela(fragment,verbatim)( < \type Staff { c''8. c''16 bes'8. a'16 g'4 f'8 g'4. } \type Lyrics \lyrics { 'got8. me16 on8. my16 knees,4 Le-8 lie!4. } > -) COMMENT +) COMMENT( ) The strings that makes up each syllable in the lyrics block are passed along to TeX() verbatim, so if you are proficient with TeX() @@ -1262,19 +1231,20 @@ you can do various nifty things. Just keep in mind that a syllable either starts with a letter (a character in the range `code(a)' to `code(z)' or `code(A)' to `code(Z)'), or it is a string enclosed quotes. It ends with either a number for the duration, or a space. -All these tricks are demonstrated in the following example: - +These tricks are demonstrated in the following example: COMMENT( urg \type Lyrics \lyrics { 'got8 m\textbf{e}8 on8. m$\cal_Y$16 knees,4 Le-8 lie!4.} \type Lyrics \lyrics { 'got8 m{\bf e}4 on8. m$\cal_Y$16 knees,4 Le-8 lie!4.} -) +)COMMENT( -mudela(fragment,verbatim)(< +)mudela(fragment,verbatim)(< \type Staff { c''8. c''16 bes'8. a'16 g'4 f'8 g'4. } \type Lyrics \lyrics { 'got8 me8 on8. m$\cal_Y$16 "3s,"4 Le-8 lie!4.} > -) +)COMMENT( + +) COMMENT(Groen is de kleur van geluk.) COMMENT(Dat geldt zeker voor Bj"ork) @@ -1350,38 +1320,29 @@ stemdown = \property Voice.ydirection = "-1" shift = \property Voice.hshift = "1" \score { \type "Staff" \notes < - \type "Voice" = "one" { - \stemup - r4 as'4 () as'4 g'4 } - \type "Voice" = "two" { - \stemup - \shift - g'2 f'4 e'4 } - \type "Voice" = "three" { - \stemdown - [d'8 dis'] [d' cis'] [c' b] c'4 - } - > + \type "Voice" = "one" { \stemup r4 as'4 () as'4 g'4 } + \type "Voice" = "two" { \stemup \shift g'2 f'4 e'4 } + \type "Voice" = "three" { \stemdown [d'8 dis'] [d' cis'] [c' b] c'4 } > \paper{ linewidth = -1.0\pt; } -} -) +}) -Several abbreviations like code(\stemup) are defined in the -standard initialisation file file(property.ly). Setting or changing -context properties can have a similar effect as the commands that were +Several abbreviations like code(\stemup) are defined in the standard +initialisation file file(property.ly). Setting or changing context +properties can have a similar effect as the commands that were discussed in bind(Section)ref(sec:commands). Don't be fooled by the -similarity in appearance between a declared property-setting entry -and a real command. Real commands are hardcoded into the language -and they have to be terminated by semicolons. +similarity in appearance between a declared property-setting entry and +a real command like code(\clef) or code(\bar). Real commands are +hardcoded into the language and they have to be terminated by +semicolons. -You can also use identifiers to break up the heavy nesting that can occur -in the code(\score) block. Another useful application is +You can also use identifiers to break up the heavy nesting that can +occur in the code(\score) block. Another useful application is parametrisation of the music: if you use identifiers in the code(\score) block, you can make variations of the music by simply redefining those identifiers. One particular application of this is part extraction: by using identifiers and redefining them, one can -print extracted parts and a full orchestral score from the same -music definition. +print extracted parts and a full orchestral score from the same music +definition. sect(Sound output) @@ -1391,25 +1352,23 @@ You get output by combining music with definition a conversion to output. LilyPond currently supports one other conversion besides notation: the conversion from abstract music to sound. You can have LilyPond play the music that you entered. The format that is used for -this output is MIDI. The most useful purpose of this sound output is -to prooflisten your files: typing errors stand out when you listen, -especially if they involve accidentals. +this output is MIDI. The result is not very pretty, but it is useful +for prooflistening your files: typing errors stand out when you +listen, especially if they involve accidentals. The only information that you need to enter is the - nop(tempo)footnote(Unfortunately, -this the only thing that can be tuned at this -time. This is a limitation: the tempo of music can vary throughout -the music.) for the performance. The syntax for the tempo is -code(\tempo )var(duration) = var(beatsperminute);), for example: -verb( +tempo. (Unfortunately, at this time, this the only thing that can be +tuned. The syntax for the tempo is code(\tempo )var(duration) = +var(beatsperminute);), for example: COMMENT( + + +)verb( \score { ...music... \midi { \tempo 4 = 76; } }) COMMENT( -) The output was implemented in a very rudimentary -manner, so it is probably not worth listening to for any other reason. - +) sect(Contexts revisited: engravers) label(tutorial:engravers) @@ -1427,6 +1386,7 @@ it()handles specific notation constructs This characterization almost automatically explains what the definition of a context should look like: itemize( +it() It should have a name it()It should be part of the ``notation output definition,'' i.e., the code(\paper) block it() @@ -1437,100 +1397,85 @@ it() handled. ) -In practice, the context definition -looks like this: +LilyPond can create notation for a large number of symbols. This code +is split up into basic building blocks. Each building block is called +an em(engraver), and an engraver generally handles only one notation +construct: the code(Clef_engraver) takes care of the clefs, the +code(Time_signature_engraver) takes care of printing time signatures. + +A notation context is formed by a group of engravers. A special class +in LilyPond---the code(Engraver_group_engraver)---allows engravers to +cooperate in a group. A variant of this grouping object is the +code(Line_group_engraver_group), which puts the output of all the +engravers (clefs, bars, etc) into a compound object, so that these +symbols can be treated as a whole. + +This explains the following definition, which is a simplified Staff context: verb( \translator { - \type "Engraver_group_engraver"; - - \name "ContextName"; - - \accepts "..."; - \accepts "..."; - \accepts "..."; - - - - \consists " ... "; - \consists " ... "; - \consists " ... "; - - propertyname = "value"; - propertyname = "value"; - + \type "Line_group_engraver_group"; + \name Staff ; + + \consists "Bar_engraver"; + \consists "Clef_engraver"; + \consists "Key_engraver"; + \consists "Local_key_engraver"; + \consists "Time_signature_engraver"; + \consists "Staff_symbol_engraver"; + + defaultClef = treble; + + \accepts "Voice"; }) COMMENT( -) The code(\translator) keyword opens the block for translation (or -context) definition. The code(\type) keyword explains to Lily that -the context should be formed by taking an (empty) instance of -code(Engraver_group_engraver). The code(Engraver_group_engraver) is a -C++ class from the source code to Lily. The code(\accepts) entries -explain what kind of contexts this context could contain. If we were -to define a context for a staff, the definition would typically -contain code(\accepts "Voice";). - -The code(\consists) entries specify which notation constructs should -be handled. This needs a little explanation: LilyPond contains the -code for quite a large number of basic building blocks for notation -generation, and each building block handles only one notation -construct. The name of such a building block is `engraver'. You can -specify which notation construct a context should handle by specifying -which engravers should be part of the context. The code(\consists -"Foobar") entry really means ``add an instance of code(Foobar) to the -translation group.'' - +) This context, named Staff, puts its graphic objects into a compound +object (a so-called ``Line group''). At Staff level, bars, clefs, +keys, accidentals, time signatures and the staff symbol are handled. +A staff can contain a Voice context. You can also preset properties +of contexts: for instance, the clef that is printed upon starting a +Staff, is the treble clef. You can also declare contexts, and reference them. This is useful in combination with code(\remove "..."): code(\remove) does the opposite -of code(\consists) - -Finally, one can pre-set some properties in a context definition. A -new context inherits these pre-set properties, when it is created, -e.g., when LilyPond processes the code(\type) construct. - -As a practical example, we will show you how to typeset polymetric -music, i.e., music where the meter can differ for each staff. The -solution is not very complicated: normally all timing information -(time signature, rhythmic grouping) is synchronised across each staff. -In LilyPond this is expressed by having only one registration for -timing information for all staffs. To be precise, there is only one -code(Timing_engraver), and it is located in the top level context, the -code(Score) context. - -All staffs use the information in the global code(Timing_engraver) for -generating bar lines and time signatures. In polymetric music, this -timing information can be different for every staff, so we should -redefine the code(Staff) context to include and the code(Score) -context to exclude the code(Timing_engraver). +of code(\consists). -mudela(verbatim)( -polymetricpaper = \paper { - \translator { - \ScoreContext - \remove "Timing_engraver"; - } - \translator { - \StaffContext - defaultClef = bass; +The real context definitions are in the standard initialisation +file file(engraver.ly). - \consists "Timing_engraver"; - } -} -\score { - \notes < - \type Staff = one { \time 2/4; c'4 c'4 c'4 c'4 c'4 c'4 } - \type Staff = two { \time 3/4; c'4 c'4 c'4 c'4 c'4 c'4 } - > - \paper { \polymetricpaper - linewidth = -1.; +As a practical example, we will show how to typeset polymetric music, +i.e., music where the meter can differ for each staff. The solution +is not very complicated: normally all timing information (time +signature, rhythmic grouping) is synchronised across each staff. This +is done by having only one administration for timing information: in +the default configuration there is only one code(Timing_engraver), in +the code(Score) context. + +All staffs use the information in the code(Timing_engraver) for +generating bar lines and time signatures. So, we can have different +timing for every staff, by moving the code(Timing_engraver) into the + Staff context. + +mudela(verbatim)( + \score { + \notes < + \type Staff = one { \time 2/4; c'4 c'4 c'4 c'4 c'4 c'4 } + \type Staff = two { \time 3/4; c'4 c'4 c'4 c'4 c'4 c'4 } + > + \paper { + linewidth = -1.; + \translator { + \ScoreContext + \remove "Timing_engraver"; + } + \translator { + \StaffContext + \consists "Timing_engraver"; + } } } ) -As you can see, we used the identifier code(polymetricpaper) to break -up the large score block. More of these context definitions appear in -the standard initialisation file file(engraver.ly). sect(Urtexts and context selection) label(tutorial:urtext) @@ -1569,9 +1514,8 @@ music that can be had as Urtext usually is also available in enhanced and edited editions. ) and an edited edition from em(one source). We will use the first few bars of bind(J.)bind(S.)Bach's first Cello suite to demonstrate this. The example makes heavy use of space -rests: a space rest takes up time, like a rest does, but it doesn't -print anything. It can be used as a placeholder, to attach -articulation marks to. It is entered as a note with the name code(s). +rests; here they are used as a placeholder to attach articulation +marks to. mudela(verbatim)( bach = \notes \relative c { [g16 d' b' a] [b d, b' d,] } @@ -1662,13 +1606,15 @@ beam, though: the spanners won't switch along. sect(Hairy durations: triplets) +OUTDATED + In the previous section we explained an operation that changes the pitches of music, transposition. In this section we will explain an operation that modifies the duration of the notes that you enter. When notes are part of a triplet, then the real of duration of the notes are 2/3 part of what their shape indicates: mudela(fragment)( -\[/3 c'4 c'4 c'4 \]/1 +\times 2/3 { c'4 c'4 c'4 } ) To support this notion, Mudela allows you to modify the duration of a @@ -1677,7 +1623,7 @@ triplet is written as code(c'4*2/3). If you sequence a few of these notes, you get a triplet.footnote(We added a normal staff in the example to show the difference.) mudela(fragment,verbatim)( -< \type Staff = staffA { c'8*2/3 c'8*2/3 c'8*2/3 c'4} +< \type Staff = staffA { \times 2/3 { c'8 c'8 c'8 } c'4} \type Staff = staffB { c''8 c''8 c''4 } >) LilyPond knows that these notes are no normal eighth notes, but the @@ -1688,8 +1634,8 @@ they also abbreviate the code(*2/3) part. If you want brackets in stead of beams, you can use `code(\[2/3])' and `code(\]1/1)'. mudela(fragment,verbatim)( < \type Staff = staffA { - [2/3 c'8 c'8 c'8 ]1/1 - \[2/3 c'8 c'8 c'8 \]1/1 + \times 2/3 { [ c'8 c'8 c'8 } + \times 2/3 { c'8 c'8 c'8 } } \type Staff = staffB { [c''8 c''8 c''8 c''8] } >) @@ -1698,7 +1644,7 @@ Other tuplets can be entered in the same way. mudela(fragment,verbatim)( < \type Staff = staffA { \time 7/8; - [7/6 c'8 c'8 c'8 c'8 c'8 c'8 ]1/1 + \times 7/6 { [c'8 c'8 c'8 c'8 c'8 c'8] } } \type Staff = staffB { \time 7/8; @@ -1710,7 +1656,7 @@ you can abbreviate code(]1/1) on the closing beam marker to code(]/1). mudela(fragment,verbatim)( < \type Staff = staffA { - [/3 c'8 c'8 c'8 ]/1 c'4 + \times 2/3 { c'8 c'8 c'8 } c'4 } \type Staff = staffB { [c''8 c''8] c''4 } > ) diff --git a/NEWS b/NEWS index 7376da3458..a1f5cf865f 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,22 @@ +pl 8 + +pl7.jcn3 + - bf's: spanner/volta + - volta-support: via Note, Bar, and Paper-column to Bar (item) + +pl7.jcn2 + - note repeats + pl7.jcn1 - configure/guile fixes (still no check for 1.2/1.3) +pl7.hwn1 + - tutorial fixes + - tuplets over beams. + +***************** +pl 7 + pl6.jcn5 - repeatbars, volta-spanner work, alternative iteration still broken - volta symbol diff --git a/VERSION b/VERSION index 3a9d8453c5..0a70c242e4 100644 --- a/VERSION +++ b/VERSION @@ -1,8 +1,8 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=1 -PATCH_LEVEL=7 -MY_PATCH_LEVEL=jcn1 +PATCH_LEVEL=8 +MY_PATCH_LEVEL= # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/buildscripts/set-lily.sh b/buildscripts/set-lily.sh index c4ce395546..ccc61338dc 100755 --- a/buildscripts/set-lily.sh +++ b/buildscripts/set-lily.sh @@ -46,7 +46,7 @@ ln -sf $LILYPOND_SOURCEDIR/scripts/out/ly2dvi $prefix/bin/ly2dvi ln -sf $LILYPOND_SOURCEDIR/scripts/out/mudela-book $prefix/bin/mudela-book chmod 755 $LILYPOND_SOURCEDIR/buildscripts/ps-to-gifs.sh ln -sf $LILYPOND_SOURCEDIR/buildscripts/ps-to-gifs.sh $prefix/bin/ps-to-gifs - +ln -sf $LILYPOND_SOURCEDIR/mf/out/ afm if [ -f ../.gdbinit ]; then ln ../.gdbinit . diff --git a/configure b/configure index e69de29bb2..5d06ba8320 100755 --- a/configure +++ b/configure @@ -0,0 +1,3615 @@ +#! /bin/sh + +ac_help="$ac_help + --with-gtkmm-prefix=PREFIX + Prefix where GTK-- is installed (optional)" +# Check whether --with-gtkmm-prefix or --without-gtkmm-prefix was given. +if test "${with_gtkmm_prefix+set}" = set; then + withval="$with_gtkmm_prefix" + gtkmm_config_prefix="$withval" +else + gtkmm_config_prefix="" +fi + +ac_help="$ac_help + --with-gtkmm-exec-prefix=PREFIX + Exec prefix where GTK-- is installed (optional)" +# Check whether --with-gtkmm-exec-prefix or --without-gtkmm-exec-prefix was given. +if test "${with_gtkmm_exec_prefix+set}" = set; then + withval="$with_gtkmm_exec_prefix" + gtkmm_config_exec_prefix="$withval" +else + gtkmm_config_exec_prefix="" +fi + +ac_help="$ac_help + --disable-gtkmmtest Do not try to compile and run a test GTK-- program" +# Check whether --enable-gtkmmtest or --disable-gtkmmtest was given. +if test "${enable_gtkmmtest+set}" = set; then + enableval="$enable_gtkmmtest" + : +else + enable_gtkmmtest=yes +fi + + + if test x$gtkmm_config_exec_prefix != x ; then + gtkmm_config_args="$gtkmm_config_args --exec-prefix=$gtkmm_config_exec_prefix" + if test x${GTKMM_CONFIG+set} != xset ; then + GTKMM_CONFIG=$gtkmm_config_exec_prefix/bin/gtkmm-config + fi + fi + if test x$gtkmm_config_prefix != x ; then + gtkmm_config_args="$gtkmm_config_args --prefix=$gtkmm_config_prefix" + if test x${GTKMM_CONFIG+set} != xset ; then + GTKMM_CONFIG=$gtkmm_config_prefix/bin/gtkmm-config + fi + fi + + + + +# Configure paths for GTK--DRAW +# Derek Quinn Wyatt 98-08-21 (adapted from Jan Nieuwenhuizen's code) + + + +# Guess values for system-dependent variables and create Makefiles. +# Generated automatically using autoconf version 2.12 +# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. +# +# This configure script is free software; the Free Software Foundation +# gives unlimited permission to copy, distribute and modify it. + +# Defaults: +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" +ac_help="$ac_help + enable-checking set runtime checks (assert calls). Default: on" +ac_help="$ac_help + enable-optimise use maximal speed optimisations. Default: off" +ac_help="$ac_help + enable-profiling compile with gprof support. Default: off" +ac_help="$ac_help + enable-debugging set debug info. Default: on" +ac_help="$ac_help + enable-mingw-prefix=DIR set the mingw32 directory (standalone windows32 exes)" +ac_help="$ac_help + enable-printing turn on debug printing. Default: off" +ac_help="$ac_help + 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" + +# Initialize some variables set by options. +# The variables have the same names as the options, with +# dashes changed to underlines. +build=NONE +cache_file=./config.cache +exec_prefix=NONE +host=NONE +no_create= +nonopt=NONE +no_recursion= +prefix=NONE +program_prefix=NONE +program_suffix=NONE +program_transform_name=s,x,x, +silent= +site= +srcdir= +target=NONE +verbose= +x_includes=NONE +x_libraries=NONE +bindir='${exec_prefix}/bin' +sbindir='${exec_prefix}/sbin' +libexecdir='${exec_prefix}/libexec' +datadir='${prefix}/share' +sysconfdir='${prefix}/etc' +sharedstatedir='${prefix}/com' +localstatedir='${prefix}/var' +libdir='${exec_prefix}/lib' +includedir='${prefix}/include' +oldincludedir='/usr/include' +infodir='${prefix}/info' +mandir='${prefix}/man' + +# Initialize some other variables. +subdirs= +MFLAGS= MAKEFLAGS= +# Maximum number of lines to put in a shell here document. +ac_max_here_lines=12 + +ac_prev= +for ac_option +do + + # If the previous option needs an argument, assign it. + if test -n "$ac_prev"; then + eval "$ac_prev=\$ac_option" + ac_prev= + continue + fi + + case "$ac_option" in + -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;; + *) ac_optarg= ;; + esac + + # Accept the important Cygnus configure options, so we can diagnose typos. + + case "$ac_option" in + + -bindir | --bindir | --bindi | --bind | --bin | --bi) + ac_prev=bindir ;; + -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) + bindir="$ac_optarg" ;; + + -build | --build | --buil | --bui | --bu) + ac_prev=build ;; + -build=* | --build=* | --buil=* | --bui=* | --bu=*) + build="$ac_optarg" ;; + + -cache-file | --cache-file | --cache-fil | --cache-fi \ + | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) + ac_prev=cache_file ;; + -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ + | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) + cache_file="$ac_optarg" ;; + + -datadir | --datadir | --datadi | --datad | --data | --dat | --da) + ac_prev=datadir ;; + -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ + | --da=*) + datadir="$ac_optarg" ;; + + -disable-* | --disable-*) + ac_feature=`echo $ac_option|sed -e 's/-*disable-//'` + # Reject names that are not valid shell variable names. + if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then + { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } + fi + ac_feature=`echo $ac_feature| sed 's/-/_/g'` + eval "enable_${ac_feature}=no" ;; + + -enable-* | --enable-*) + ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'` + # Reject names that are not valid shell variable names. + if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then + { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } + fi + ac_feature=`echo $ac_feature| sed 's/-/_/g'` + case "$ac_option" in + *=*) ;; + *) ac_optarg=yes ;; + esac + eval "enable_${ac_feature}='$ac_optarg'" ;; + + -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ + | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ + | --exec | --exe | --ex) + ac_prev=exec_prefix ;; + -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ + | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ + | --exec=* | --exe=* | --ex=*) + exec_prefix="$ac_optarg" ;; + + -gas | --gas | --ga | --g) + # Obsolete; use --with-gas. + with_gas=yes ;; + + -help | --help | --hel | --he) + # Omit some internal or obsolete options to make the list less imposing. + # This message is too long to be a string in the A/UX 3.1 sh. + cat << EOF +Usage: configure [options] [host] +Options: [defaults in brackets after descriptions] +Configuration: + --cache-file=FILE cache test results in FILE + --help print this message + --no-create do not create output files + --quiet, --silent do not print \`checking...' messages + --version print the version of autoconf that created configure +Directory and file names: + --prefix=PREFIX install architecture-independent files in PREFIX + [$ac_default_prefix] + --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX + [same as prefix] + --bindir=DIR user executables in DIR [EPREFIX/bin] + --sbindir=DIR system admin executables in DIR [EPREFIX/sbin] + --libexecdir=DIR program executables in DIR [EPREFIX/libexec] + --datadir=DIR read-only architecture-independent data in DIR + [PREFIX/share] + --sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data in DIR + [PREFIX/com] + --localstatedir=DIR modifiable single-machine data in DIR [PREFIX/var] + --libdir=DIR object code libraries in DIR [EPREFIX/lib] + --includedir=DIR C header files in DIR [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc in DIR [/usr/include] + --infodir=DIR info documentation in DIR [PREFIX/info] + --mandir=DIR man documentation in DIR [PREFIX/man] + --srcdir=DIR find the sources in DIR [configure dir or ..] + --program-prefix=PREFIX prepend PREFIX to installed program names + --program-suffix=SUFFIX append SUFFIX to installed program names + --program-transform-name=PROGRAM + run sed PROGRAM on installed program names +EOF + cat << EOF +Host type: + --build=BUILD configure for building on BUILD [BUILD=HOST] + --host=HOST configure for HOST [guessed] + --target=TARGET configure for TARGET [TARGET=HOST] +Features and packages: + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --x-includes=DIR X include files are in DIR + --x-libraries=DIR X library files are in DIR +EOF + if test -n "$ac_help"; then + echo "--enable and --with options recognized:$ac_help" + fi + exit 0 ;; + + -host | --host | --hos | --ho) + ac_prev=host ;; + -host=* | --host=* | --hos=* | --ho=*) + host="$ac_optarg" ;; + + -includedir | --includedir | --includedi | --included | --include \ + | --includ | --inclu | --incl | --inc) + ac_prev=includedir ;; + -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ + | --includ=* | --inclu=* | --incl=* | --inc=*) + includedir="$ac_optarg" ;; + + -infodir | --infodir | --infodi | --infod | --info | --inf) + ac_prev=infodir ;; + -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) + infodir="$ac_optarg" ;; + + -libdir | --libdir | --libdi | --libd) + ac_prev=libdir ;; + -libdir=* | --libdir=* | --libdi=* | --libd=*) + libdir="$ac_optarg" ;; + + -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ + | --libexe | --libex | --libe) + ac_prev=libexecdir ;; + -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ + | --libexe=* | --libex=* | --libe=*) + libexecdir="$ac_optarg" ;; + + -localstatedir | --localstatedir | --localstatedi | --localstated \ + | --localstate | --localstat | --localsta | --localst \ + | --locals | --local | --loca | --loc | --lo) + ac_prev=localstatedir ;; + -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ + | --localstate=* | --localstat=* | --localsta=* | --localst=* \ + | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) + localstatedir="$ac_optarg" ;; + + -mandir | --mandir | --mandi | --mand | --man | --ma | --m) + ac_prev=mandir ;; + -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) + mandir="$ac_optarg" ;; + + -nfp | --nfp | --nf) + # Obsolete; use --without-fp. + with_fp=no ;; + + -no-create | --no-create | --no-creat | --no-crea | --no-cre \ + | --no-cr | --no-c) + no_create=yes ;; + + -no-recursion | --no-recursion | --no-recursio | --no-recursi \ + | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) + no_recursion=yes ;; + + -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ + | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ + | --oldin | --oldi | --old | --ol | --o) + ac_prev=oldincludedir ;; + -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ + | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ + | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) + oldincludedir="$ac_optarg" ;; + + -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) + ac_prev=prefix ;; + -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) + prefix="$ac_optarg" ;; + + -program-prefix | --program-prefix | --program-prefi | --program-pref \ + | --program-pre | --program-pr | --program-p) + ac_prev=program_prefix ;; + -program-prefix=* | --program-prefix=* | --program-prefi=* \ + | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) + program_prefix="$ac_optarg" ;; + + -program-suffix | --program-suffix | --program-suffi | --program-suff \ + | --program-suf | --program-su | --program-s) + ac_prev=program_suffix ;; + -program-suffix=* | --program-suffix=* | --program-suffi=* \ + | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) + program_suffix="$ac_optarg" ;; + + -program-transform-name | --program-transform-name \ + | --program-transform-nam | --program-transform-na \ + | --program-transform-n | --program-transform- \ + | --program-transform | --program-transfor \ + | --program-transfo | --program-transf \ + | --program-trans | --program-tran \ + | --progr-tra | --program-tr | --program-t) + ac_prev=program_transform_name ;; + -program-transform-name=* | --program-transform-name=* \ + | --program-transform-nam=* | --program-transform-na=* \ + | --program-transform-n=* | --program-transform-=* \ + | --program-transform=* | --program-transfor=* \ + | --program-transfo=* | --program-transf=* \ + | --program-trans=* | --program-tran=* \ + | --progr-tra=* | --program-tr=* | --program-t=*) + program_transform_name="$ac_optarg" ;; + + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + silent=yes ;; + + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) + ac_prev=sbindir ;; + -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ + | --sbi=* | --sb=*) + sbindir="$ac_optarg" ;; + + -sharedstatedir | --sharedstatedir | --sharedstatedi \ + | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ + | --sharedst | --shareds | --shared | --share | --shar \ + | --sha | --sh) + ac_prev=sharedstatedir ;; + -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ + | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ + | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ + | --sha=* | --sh=*) + sharedstatedir="$ac_optarg" ;; + + -site | --site | --sit) + ac_prev=site ;; + -site=* | --site=* | --sit=*) + site="$ac_optarg" ;; + + -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) + ac_prev=srcdir ;; + -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) + srcdir="$ac_optarg" ;; + + -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ + | --syscon | --sysco | --sysc | --sys | --sy) + ac_prev=sysconfdir ;; + -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ + | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) + sysconfdir="$ac_optarg" ;; + + -target | --target | --targe | --targ | --tar | --ta | --t) + ac_prev=target ;; + -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) + target="$ac_optarg" ;; + + -v | -verbose | --verbose | --verbos | --verbo | --verb) + verbose=yes ;; + + -version | --version | --versio | --versi | --vers) + echo "configure generated by autoconf version 2.12" + exit 0 ;; + + -with-* | --with-*) + ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'` + # Reject names that are not valid shell variable names. + if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then + { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } + fi + ac_package=`echo $ac_package| sed 's/-/_/g'` + case "$ac_option" in + *=*) ;; + *) ac_optarg=yes ;; + esac + eval "with_${ac_package}='$ac_optarg'" ;; + + -without-* | --without-*) + ac_package=`echo $ac_option|sed -e 's/-*without-//'` + # Reject names that are not valid shell variable names. + if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then + { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } + fi + ac_package=`echo $ac_package| sed 's/-/_/g'` + eval "with_${ac_package}=no" ;; + + --x) + # Obsolete; use --with-x. + with_x=yes ;; + + -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ + | --x-incl | --x-inc | --x-in | --x-i) + ac_prev=x_includes ;; + -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ + | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) + x_includes="$ac_optarg" ;; + + -x-libraries | --x-libraries | --x-librarie | --x-librari \ + | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) + ac_prev=x_libraries ;; + -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ + | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) + x_libraries="$ac_optarg" ;; + + -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; } + ;; + + *) + if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then + echo "configure: warning: $ac_option: invalid host type" 1>&2 + fi + if test "x$nonopt" != xNONE; then + { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } + fi + nonopt="$ac_option" + ;; + + esac +done + +if test -n "$ac_prev"; then + { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; } +fi + +trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 + +# File descriptor usage: +# 0 standard input +# 1 file creation +# 2 errors and warnings +# 3 some systems may open it to /dev/tty +# 4 used on the Kubota Titan +# 6 checking for... messages and results +# 5 compiler messages saved in config.log +if test "$silent" = yes; then + exec 6>/dev/null +else + exec 6>&1 +fi +exec 5>./config.log + +echo "\ +This file contains any messages produced by compilers while +running configure, to aid debugging if configure makes a mistake. +" 1>&5 + +# Strip out --no-create and --no-recursion so they do not pile up. +# Also quote any args containing shell metacharacters. +ac_configure_args= +for ac_arg +do + case "$ac_arg" in + -no-create | --no-create | --no-creat | --no-crea | --no-cre \ + | --no-cr | --no-c) ;; + -no-recursion | --no-recursion | --no-recursio | --no-recursi \ + | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;; + *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*) + ac_configure_args="$ac_configure_args '$ac_arg'" ;; + *) ac_configure_args="$ac_configure_args $ac_arg" ;; + esac +done + +# NLS nuisances. +# Only set these to C if already set. These must not be set unconditionally +# because not all systems understand e.g. LANG=C (notably SCO). +# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! +# Non-C LC_CTYPE values break the ctype check. +if test "${LANG+set}" = set; then LANG=C; export LANG; fi +if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi +if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi +if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi + +# confdefs.h avoids OS command line length limits that DEFS can exceed. +rm -rf conftest* confdefs.h +# AIX cpp loses on an empty file, so make sure it contains at least a newline. +echo > confdefs.h + +# A filename unique to this package, relative to the directory that +# configure is in, which we can look for to find out if srcdir is correct. +ac_unique_file=make/lilypond.lsm.in + +# Find the source files, if location was not specified. +if test -z "$srcdir"; then + ac_srcdir_defaulted=yes + # Try the directory containing this script, then its parent. + ac_prog=$0 + ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'` + test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. + srcdir=$ac_confdir + if test ! -r $srcdir/$ac_unique_file; then + srcdir=.. + fi +else + ac_srcdir_defaulted=no +fi +if test ! -r $srcdir/$ac_unique_file; then + if test "$ac_srcdir_defaulted" = yes; then + { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; } + else + { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; } + fi +fi +srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` + +# Prefer explicitly selected file to automatically selected ones. +if test -z "$CONFIG_SITE"; then + if test "x$prefix" != xNONE; then + CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" + else + CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" + fi +fi +for ac_site_file in $CONFIG_SITE; do + if test -r "$ac_site_file"; then + echo "loading site script $ac_site_file" + . "$ac_site_file" + fi +done + +if test -r "$cache_file"; then + echo "loading cache $cache_file" + . $cache_file +else + echo "creating cache $cache_file" + > $cache_file +fi + +ac_ext=c +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CPP $CPPFLAGS' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross + +if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then + # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. + if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then + ac_n= ac_c=' +' ac_t=' ' + else + ac_n=-n ac_c= ac_t= + fi +else + ac_n= ac_c='\c' ac_t= +fi + + + + +# Bootstrap StepMake configure + + + . $srcdir/VERSION + FULL_VERSION=$MAJOR_VERSION.$MINOR_VERSION.$PATCH_LEVEL + if test x$MY_PATCH_LEVEL != x; then + FULL_VERSION=$FULL_VERSION.$MY_PATCH_LEVEL + fi + + # urg: don't "fix" this: irix doesn't know about [:lower:] and [:upper:] + PACKAGE=`echo $PACKAGE_NAME | tr '[a-z]' '[A-Z]'` + package=`echo $PACKAGE_NAME | tr '[A-Z]' '[a-z]'` + + # No versioning on directory names of sub-packages + # urg, urg + stepmake=${datadir}/stepmake + presome=${prefix} + if test "$prefix" = "NONE"; then + presome=${ac_default_prefix} + fi + stepmake=`echo ${stepmake} | sed "s!\\\${prefix}!$presome!"` + + if test "x$PACKAGE" = "xSTEPMAKE"; then + echo Stepmake package! + (cd stepmake; rm -f stepmake; ln -s ../stepmake .) + (cd stepmake; rm -f bin; ln -s ../bin .) + ac_aux_dir= +for ac_dir in bin $srcdir/bin; do + if test -f $ac_dir/install-sh; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f $ac_dir/install.sh; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + fi +done +if test -z "$ac_aux_dir"; then + { echo "configure: error: can not find install-sh or install.sh in bin $srcdir/bin" 1>&2; exit 1; } +fi +ac_config_guess=$ac_aux_dir/config.guess +ac_config_sub=$ac_aux_dir/config.sub +ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. + + stepmake=stepmake + else + echo Package: $PACKAGE + # Check for installed stepmake + if test -d $stepmake; then + echo Using installed stepmake: $stepmake + else + stepmake='$(depth)'/stepmake + echo Using local stepmake: $datadir/stepmake not found + fi + ac_aux_dir= +for ac_dir in \ + $HOME/usr/local/share/stepmake/bin\ + $HOME/usr/local/lib/stepmake/bin\ + $HOME/usr/share/stepmake/bin\ + $HOME/usr/lib/stepmake/bin\ + /usr/local/share/stepmake/bin\ + /usr/local/lib/stepmake/bin\ + /usr/share/stepmake/bin\ + /usr/lib/stepmake/bin\ + stepmake/bin\ + $srcdir/\ + $HOME/usr/local/share/stepmake/bin\ + $HOME/usr/local/lib/stepmake/bin\ + $HOME/usr/share/stepmake/bin\ + $HOME/usr/lib/stepmake/bin\ + /usr/local/share/stepmake/bin\ + /usr/local/lib/stepmake/bin\ + /usr/share/stepmake/bin\ + /usr/lib/stepmake/bin\ + stepmake/bin\ + ; do + if test -f $ac_dir/install-sh; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f $ac_dir/install.sh; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + fi +done +if test -z "$ac_aux_dir"; then + { echo "configure: error: can not find install-sh or install.sh in \ + $HOME/usr/local/share/stepmake/bin\ + $HOME/usr/local/lib/stepmake/bin\ + $HOME/usr/share/stepmake/bin\ + $HOME/usr/lib/stepmake/bin\ + /usr/local/share/stepmake/bin\ + /usr/local/lib/stepmake/bin\ + /usr/share/stepmake/bin\ + /usr/lib/stepmake/bin\ + stepmake/bin\ + $srcdir/\ + $HOME/usr/local/share/stepmake/bin\ + $HOME/usr/local/lib/stepmake/bin\ + $HOME/usr/share/stepmake/bin\ + $HOME/usr/lib/stepmake/bin\ + /usr/local/share/stepmake/bin\ + /usr/local/lib/stepmake/bin\ + /usr/share/stepmake/bin\ + /usr/lib/stepmake/bin\ + stepmake/bin\ + " 1>&2; exit 1; } +fi +ac_config_guess=$ac_aux_dir/config.guess +ac_config_sub=$ac_aux_dir/config.sub +ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. + + fi + + + + + + cat >> confdefs.h <> confdefs.h </dev/null` + if test "x$STATE_VECTOR" != "x"; then + STATE_VECTOR="\$(depth)/$STATE_VECTOR" + fi + + + CONFIGSUFFIX= + # Check whether --enable-config or --disable-config was given. +if test "${enable_config+set}" = set; then + enableval="$enable_config" + CONFIGSUFFIX=$enableval +fi + + + if test "$CONFIGSUFFIX" != "" ; then + CONFIGFILE=config-$CONFIGSUFFIX + else + CONFIGFILE=config + fi + + + +# Make sure we can run config.sub. +if $ac_config_sub sun4 >/dev/null 2>&1; then : +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:761: checking host system type" >&5 + +host_alias=$host +case "$host_alias" in +NONE) + case $nonopt in + NONE) + if host_alias=`$ac_config_guess`; then : + else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; } + fi ;; + *) host_alias=$nonopt ;; + esac ;; +esac + +host=`$ac_config_sub $host_alias` +host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +echo "$ac_t""$host" 1>&6 + + for ac_prog in make +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:786: 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 + if test -n "$MAKE"; then + ac_cv_prog_MAKE="$MAKE" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_MAKE="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +MAKE="$ac_cv_prog_MAKE" +if test -n "$MAKE"; then + echo "$ac_t""$MAKE" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$MAKE" && break +done +test -n "$MAKE" || MAKE="error" + + for ac_prog in find +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:820: 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 + if test -n "$FIND"; then + ac_cv_prog_FIND="$FIND" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_FIND="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +FIND="$ac_cv_prog_FIND" +if test -n "$FIND"; then + echo "$ac_t""$FIND" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$FIND" && break +done +test -n "$FIND" || FIND="error" + + + + + for ac_prog in tar +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:857: 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 + if test -n "$TAR"; then + ac_cv_prog_TAR="$TAR" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_TAR="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +TAR="$ac_cv_prog_TAR" +if test -n "$TAR"; then + echo "$ac_t""$TAR" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$TAR" && break +done +test -n "$TAR" || TAR="error" + + for ac_prog in bash +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:891: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_BASH'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$BASH"; then + ac_cv_prog_BASH="$BASH" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_BASH="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +BASH="$ac_cv_prog_BASH" +if test -n "$BASH"; then + echo "$ac_t""$BASH" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$BASH" && break +done +test -n "$BASH" || BASH="/bin/sh" + + + # 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:924: 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 + case "$PYTHON" in + /*) + ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_PYTHON="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_path_PYTHON" && ac_cv_path_PYTHON="-echo no python" + ;; +esac +fi +PYTHON="$ac_cv_path_PYTHON" +if test -n "$PYTHON"; then + echo "$ac_t""$PYTHON" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + + + + + result="`echo \"$MAKE\" | grep echo`" + if test "x$MAKE" = "xerror" -o "x$result" != "x"; then + + echo "configure: warning: can\'t find GNU make. You should install GNU make" 1>&2 + warn_b=yes + + fi + + if test $MAKE != "error" ; then + $MAKE -v| grep GNU > /dev/null + if test "$?" = 1 + then + + echo "configure: warning: Please install *GNU* make" 1>&2 + warn_b=yes + + fi + fi + + + result="`echo \"$PYTHON\" | grep echo`" + if test "x$PYTHON" = "xerror" -o "x$result" != "x"; then + + echo "configure: warning: can\'t find python. You should install Python" 1>&2 + warn_b=yes + + fi + + + if test "x$OSTYPE" = "xcygwin32" || test "x$OSTYPE" = "xWindows_NT"; then + LN=cp # hard link does not work under cygnus-nt + LN_S=cp # symbolic link does not work for native nt + ZIP="zip -r -9" # + DOTEXE=.exe + DIRSEP='\\' + PATHSEP=';' + INSTALL="\$(SHELL) \$(stepdir)/../bin/install-dot-exe.sh -c" + else + DIRSEP='/' + PATHSEP=':' + LN=ln + LN_S='ln -s' + ZIP="zip -r -9" + INSTALL="\$(SHELL) \$(stepdir)/../bin/install-sh -c" + fi + + + + + + cat >> confdefs.h <> confdefs.h <> confdefs.h <> confdefs.h <<\EOF +#define NPRINT 1 +EOF + + DEFINES="$DEFINES -DNPRINT" + fi + + if test "$checking_b" = no; then + # ugh + cat >> confdefs.h <<\EOF +#define NDEBUG 1 +EOF + + DEFINES="$DEFINES -DNDEBUG" + fi + + if test "$optimise_b" = yes; then + OPTIMIZE="-O2 -finline-functions" + fi + + if test "$optimise_b" = no; then + OPTIMIZE="" + fi + + if test $profile_b = yes; then + EXTRA_LIBES="-pg" + OPTIMIZE="$OPTIMIZE -pg" + fi + + if test $debug_b = yes; then + OPTIMIZE="$OPTIMIZE -g" + fi + + # however, C++ support in mingw32 v 0.1.4 is still flaky + if test x$MINGWPREFIX != xno; then + ICFLAGS="-I$MINGWPREFIX/include" + ILDFLAGS="-$MINGWPREFIX/lib" + fi + + # 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:1140: 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 + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_CC="gcc" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +CC="$ac_cv_prog_CC" +if test -n "$CC"; then + echo "$ac_t""$CC" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +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:1169: 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 + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + ac_prog_rejected=no + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" + break + fi + done + IFS="$ac_save_ifs" +if test $ac_prog_rejected = yes; then + # We found a bogon in the path, so make sure we never use it. + set dummy $ac_cv_prog_CC + shift + if test $# -gt 0; then + # We chose a different compiler from the bogus one. + # However, it has the same basename, so the bogon will be chosen + # first if we set CC to just the basename; use the full file name. + shift + set dummy "$ac_dir/$ac_word" "$@" + shift + ac_cv_prog_CC="$@" + fi +fi +fi +fi +CC="$ac_cv_prog_CC" +if test -n "$CC"; then + echo "$ac_t""$CC" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } +fi + +echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +echo "configure:1217: 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. +ac_cpp='$CPP $CPPFLAGS' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross + +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; 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 + ac_cv_prog_cc_cross=no + else + ac_cv_prog_cc_cross=yes + fi +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + ac_cv_prog_cc_works=no +fi +rm -fr conftest* + +echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 +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:1251: 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:1256: 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 + cat > conftest.c <&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then + ac_cv_prog_gcc=yes +else + ac_cv_prog_gcc=no +fi +fi + +echo "$ac_t""$ac_cv_prog_gcc" 1>&6 + +if test $ac_cv_prog_gcc = yes; then + GCC=yes + 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:1280: 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 + echo 'void f(){}' > conftest.c +if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then + ac_cv_prog_cc_g=yes +else + ac_cv_prog_cc_g=no +fi +rm -f conftest* + +fi + +echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 + if test "$ac_test_CFLAGS" = set; then + CFLAGS="$ac_save_CFLAGS" + elif test $ac_cv_prog_cc_g = yes; then + CFLAGS="-g -O2" + else + CFLAGS="-O2" + fi +else + GCC= + test "${CFLAGS+set}" = set || CFLAGS="-g" +fi + + LD='$(CC)' + + + CPPFLAGS=${CPPFLAGS:-""} + + + + + + + +# AC_HAVE_HEADERS(limits.h malloc.h string.h unistd.h values.h) + +printing_b=no +# Check whether --enable-printing or --disable-printing was given. +if test "${enable_printing+set}" = set; then + enableval="$enable_printing" + printing_b=$enableval +fi + + +if test "$optimise_b" = yes; then + DEFINES="$DEFINES -DSTRING_UTILS_INLINED" + cat >> confdefs.h <<\EOF +#define STRINGS_UTILS_INLINED 1 +EOF + +fi + +echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 +echo "configure:1337: 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 +else + ac_ext=C +# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +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:1355: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out` +if test -z "$ac_err"; then + : +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + CXXCPP=/lib/cpp +fi +rm -f conftest* + ac_cv_prog_CXXCPP="$CXXCPP" +fi +fi +CXXCPP="$ac_cv_prog_CXXCPP" +echo "$ac_t""$CXXCPP" 1>&6 + + + ac_ext=C +# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cxx_cross + + for ac_prog in $CCC c++ g++ gcc CC cxx cc++ +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:1386: 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 + if test -n "$CXX"; then + ac_cv_prog_CXX="$CXX" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_CXX="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +CXX="$ac_cv_prog_CXX" +if test -n "$CXX"; then + echo "$ac_t""$CXX" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$CXX" && break +done +test -n "$CXX" || CXX="gcc" + + +echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +echo "configure:1417: 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. +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cxx_cross + +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; 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 + ac_cv_prog_cxx_cross=no + else + ac_cv_prog_cxx_cross=yes + fi +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + ac_cv_prog_cxx_works=no +fi +rm -fr conftest* + +echo "$ac_t""$ac_cv_prog_cxx_works" 1>&6 +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:1451: 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:1456: 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 + cat > conftest.C <&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then + ac_cv_prog_gxx=yes +else + ac_cv_prog_gxx=no +fi +fi + +echo "$ac_t""$ac_cv_prog_gxx" 1>&6 + +if test $ac_cv_prog_gxx = yes; then + GXX=yes + 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:1480: 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 + echo 'void f(){}' > conftest.cc +if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then + ac_cv_prog_cxx_g=yes +else + ac_cv_prog_cxx_g=no +fi +rm -f conftest* + +fi + +echo "$ac_t""$ac_cv_prog_cxx_g" 1>&6 + if test "$ac_test_CXXFLAGS" = set; then + CXXFLAGS="$ac_save_CXXFLAGS" + elif test $ac_cv_prog_cxx_g = yes; then + CXXFLAGS="-g -O2" + else + CXXFLAGS="-O2" + fi +else + GXX= + test "${CXXFLAGS+set}" = set || CXXFLAGS="-g" +fi + + + ac_safe=`echo "FlexLexer.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for FlexLexer.h""... $ac_c" 1>&6 +echo "configure:1510: 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:1520: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" +fi +rm -f conftest* +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + true +else + echo "$ac_t""no" 1>&6 + + echo "configure: warning: can"\'"t find flex header. Please install Flex headers correctly" 1>&2 + warn_b=yes + +fi + + + CPPFLAGS="$CPPFLAGS $DEFINES" + CXXFLAGS="$CXXFLAGS $OPTIMIZE" + LDFLAGS=$EXTRA_LIBES + + + + LD='$(CXX)' + + + + # ugh autoconf + if $CXX --version | grep '2\.[78]' > /dev/null || + $CXX --version | grep 'egcs' > /dev/null + then + true + else + + echo "configure: warning: can\'t find g++ 2.7" 1>&2 + warn_b=yes + + fi + + + echo $ac_n "checking whether explicit instantiation is needed""... $ac_c" 1>&6 +echo "configure:1570: 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; }; + template int foo::baz = 1; + +int main() { + return foo::baz; +; return 0; } +EOF +if { (eval echo configure:1585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then + rm -rf conftest* + lily_cv_need_explicit_instantiation=no +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + lily_cv_need_explicit_instantiation=yes +fi +rm -f conftest* +fi + +echo "$ac_t""$lily_cv_need_explicit_instantiation" 1>&6 + if test x"$lily_cv_need_explicit_instantiation"x = x"yes"x; then + cat >> confdefs.h <<\EOF +#define NEED_EXPLICIT_INSTANTIATION 1 +EOF + + fi + + + # ugh, automake: we want (and check for) bison + for ac_prog in 'bison -y' byacc +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:1612: 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 + if test -n "$YACC"; then + ac_cv_prog_YACC="$YACC" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_YACC="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +YACC="$ac_cv_prog_YACC" +if test -n "$YACC"; then + echo "$ac_t""$YACC" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$YACC" && break +done +test -n "$YACC" || YACC="yacc" + + # ugh, automake: we want (and check for) flex + # AC_PROG_LEX + # urg: automake 1.3: hope this doesn't break 1.2 ac_cv_pro_lex_root hack... + + # AC_DECL_YYTEXT + # ugh, ugh + ac_cv_prog_lex_root=lex.yy + + for ac_prog in bison +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:1654: 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 + if test -n "$BISON"; then + ac_cv_prog_BISON="$BISON" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_BISON="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +BISON="$ac_cv_prog_BISON" +if test -n "$BISON"; then + echo "$ac_t""$BISON" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$BISON" && break +done +test -n "$BISON" || BISON="error" + + for ac_prog in flex +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:1688: 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 + if test -n "$FLEX"; then + ac_cv_prog_FLEX="$FLEX" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_FLEX="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +FLEX="$ac_cv_prog_FLEX" +if test -n "$FLEX"; then + echo "$ac_t""$FLEX" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$FLEX" && break +done +test -n "$FLEX" || FLEX="error" + + + result="`echo \"$BISON\" | grep echo`" + if test "x$BISON" = "xerror" -o "x$result" != "x"; then + + echo "configure: warning: can\'t find bison. Please install Bison" 1>&2 + warn_b=yes + + fi + + + result="`echo \"$FLEX\" | grep echo`" + if test "x$FLEX" = "xerror" -o "x$result" != "x"; then + + echo "configure: warning: can\'t find flex. Please install Flex" 1>&2 + warn_b=yes + + fi + + + if test $BISON != "error"; then + bison_version=`$BISON --version| sed 's/^.*version 1.//g' ` + if test $bison_version -lt 25; then + + echo "configure: warning: Your bison is a bit old (1.$bison_version). You might have to install 1.25" 1>&2 + warn_b=yes + + fi + fi + + + + + + for ac_prog in ar +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:1755: 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 + if test -n "$AR"; then + ac_cv_prog_AR="$AR" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_AR="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +AR="$ac_cv_prog_AR" +if test -n "$AR"; then + echo "$ac_t""$AR" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$AR" && break +done +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:1787: 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 + if test -n "$RANLIB"; then + ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_RANLIB="ranlib" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":" +fi +fi +RANLIB="$ac_cv_prog_RANLIB" +if test -n "$RANLIB"; then + echo "$ac_t""$RANLIB" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + + + + +# AC_STEPMAKE_LIBTOOL + + lang=English + ALL_LINGUAS="en nl" + + # with/enable ?? + # Check whether --with-localedir or --without-localedir was given. +if test "${with_localedir+set}" = set; then + withval="$with_localedir" + localedir=$with_localedir +else + localedir='${prefix}/share/locale' +fi + + + # Check whether --with-lang or --without-lang was given. +if test "${with_lang+set}" = set; then + withval="$with_lang" + language=$with_lang +else + language=English +fi + + + echo $ac_n "checking language""... $ac_c" 1>&6 +echo "configure:1842: checking language" >&5 + case "$language" in + En* | en* | Am* | am* | US* | us*) + lang=English;; + NL | nl | Du* | du* | Ned* | ned*) + lang=Dutch;; + "") + lang=English;; + *) + lang=unknown;; + esac + echo "$ac_t""$lang" 1>&6 + + if test "$lang" = "unknown" ; then + + echo "configure: warning: $language not supported; available are: $ALL_LINGUAS" 1>&2 + warn_b=yes + + fi + + + + DIR_LOCALEDIR=${localedir} + presome=${prefix} + if test "$prefix" = "NONE"; then + presome=${ac_default_prefix} + fi + DIR_LOCALEDIR=`echo ${DIR_LOCALEDIR} | sed "s!\\\${prefix}!$presome!"` + + + cat >> confdefs.h <&6 +echo "configure:1878: 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 +else + ac_save_LIBS="$LIBS" +LIBS="-lintl $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_lib=HAVE_LIB`echo intl | sed -e 's/[^a-zA-Z0-9_]/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + cat >> confdefs.h <&6 +fi + + for ac_func in gettext +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:1930: 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 < +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +$ac_func(); +#endif + +; return 0; } +EOF +if { (eval echo configure:1961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_$ac_func=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <&6 +fi +done + + + + # AC_CHECK_PROGS(MSGFMT, msgfmt, -echo no msgfmt) + for ac_prog in msgfmt +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:1993: 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 + if test -n "$MSGFMT"; then + ac_cv_prog_MSGFMT="$MSGFMT" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_MSGFMT="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +MSGFMT="$ac_cv_prog_MSGFMT" +if test -n "$MSGFMT"; then + echo "$ac_t""$MSGFMT" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$MSGFMT" && break +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:2023: 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 + else + # urg + MSGFMT="\$(SHELL) \$(step-bindir)/fake-msgfmt.sh" + echo "$ac_t""no" 1>&6 + + echo "configure: warning: please install msgfmt from GNU gettext" 1>&2 + warn_b=yes + + fi + if test ! -n "$MSGFMT"; then + + echo "configure: warning: please install msgfmt from GNU gettext" 1>&2 + warn_b=yes + + fi + + + # urg, never know what names these teTeX guys will think up + for ac_prog in mf +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:2050: 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 + if test -n "$METAFONT"; then + ac_cv_prog_METAFONT="$METAFONT" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_METAFONT="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +METAFONT="$ac_cv_prog_METAFONT" +if test -n "$METAFONT"; then + echo "$ac_t""$METAFONT" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$METAFONT" && break +done +test -n "$METAFONT" || METAFONT="no" + + if test "x$METAFONT" = "xno"; then + for ac_prog in mfont +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:2085: 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 + if test -n "$MFONT"; then + ac_cv_prog_MFONT="$MFONT" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_MFONT="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +MFONT="$ac_cv_prog_MFONT" +if test -n "$MFONT"; then + echo "$ac_t""$MFONT" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$MFONT" && break +done +test -n "$MFONT" || MFONT="-echo no mf or mfont" + + METAFONT=$MFONT + fi + + for ac_prog in mp +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:2122: 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 + if test -n "$METAPOST"; then + ac_cv_prog_METAPOST="$METAPOST" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_METAPOST="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +METAPOST="$ac_cv_prog_METAPOST" +if test -n "$METAPOST"; then + echo "$ac_t""$METAPOST" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$METAPOST" && break +done +test -n "$METAPOST" || METAPOST="no" + + if test "x$METAPOST" = "xno"; then + for ac_prog in mpost +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:2157: 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 + if test -n "$MPOST"; then + ac_cv_prog_MPOST="$MPOST" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_MPOST="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +MPOST="$ac_cv_prog_MPOST" +if test -n "$MPOST"; then + echo "$ac_t""$MPOST" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$MPOST" && break +done +test -n "$MPOST" || MPOST="-echo no mp or mpost" + + METAPOST=$MPOST + fi + + + + +# AC_STEPMAKE_TEXMF_DIRS + + if test "x$YODL" = "x"; then + for ac_prog in striproff +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:2200: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_STRIPROFF'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$STRIPROFF"; then + ac_cv_prog_STRIPROFF="$STRIPROFF" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_STRIPROFF="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +STRIPROFF="$ac_cv_prog_STRIPROFF" +if test -n "$STRIPROFF"; then + echo "$ac_t""$STRIPROFF" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$STRIPROFF" && break +done +test -n "$STRIPROFF" || STRIPROFF="-echo no striproff" + + for ac_prog in yodl +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:2234: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_YODL'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$YODL"; then + ac_cv_prog_YODL="$YODL" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_YODL="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +YODL="$ac_cv_prog_YODL" +if test -n "$YODL"; then + echo "$ac_t""$YODL" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$YODL" && break +done +test -n "$YODL" || YODL="-echo no yodl" + + for ac_prog in yodl2html +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:2268: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_YODL2HTML'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$YODL2HTML"; then + ac_cv_prog_YODL2HTML="$YODL2HTML" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_YODL2HTML="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +YODL2HTML="$ac_cv_prog_YODL2HTML" +if test -n "$YODL2HTML"; then + echo "$ac_t""$YODL2HTML" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$YODL2HTML" && break +done +test -n "$YODL2HTML" || YODL2HTML="-echo no yodl" + + for ac_prog in yodl2latex +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:2302: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_YODL2LATEX'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$YODL2LATEX"; then + ac_cv_prog_YODL2LATEX="$YODL2LATEX" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_YODL2LATEX="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +YODL2LATEX="$ac_cv_prog_YODL2LATEX" +if test -n "$YODL2LATEX"; then + echo "$ac_t""$YODL2LATEX" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$YODL2LATEX" && break +done + + for ac_prog in yodl2man +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:2335: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_YODL2MAN'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$YODL2MAN"; then + ac_cv_prog_YODL2MAN="$YODL2MAN" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_YODL2MAN="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +YODL2MAN="$ac_cv_prog_YODL2MAN" +if test -n "$YODL2MAN"; then + echo "$ac_t""$YODL2MAN" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$YODL2MAN" && break +done +test -n "$YODL2MAN" || YODL2MAN="-echo no yodl" + + for ac_prog in yodl2msless +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:2369: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_YODL2MSLESS'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$YODL2MSLESS"; then + ac_cv_prog_YODL2MSLESS="$YODL2MSLESS" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_YODL2MSLESS="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +YODL2MSLESS="$ac_cv_prog_YODL2MSLESS" +if test -n "$YODL2MSLESS"; then + echo "$ac_t""$YODL2MSLESS" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$YODL2MSLESS" && break +done +test -n "$YODL2MSLESS" || YODL2MSLESS="-echo no yodl" + + for ac_prog in yodl2texinfo +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:2403: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_YODL2TEXINFO'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$YODL2TEXINFO"; then + ac_cv_prog_YODL2TEXINFO="$YODL2TEXINFO" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_YODL2TEXINFO="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +YODL2TEXINFO="$ac_cv_prog_YODL2TEXINFO" +if test -n "$YODL2TEXINFO"; then + echo "$ac_t""$YODL2TEXINFO" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$YODL2TEXINFO" && break +done +test -n "$YODL2TEXINFO" || YODL2TEXINFO="-echo no yodl" + + for ac_prog in yodl2txt +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:2437: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_YODL2TXT'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$YODL2TXT"; then + ac_cv_prog_YODL2TXT="$YODL2TXT" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_YODL2TXT="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +YODL2TXT="$ac_cv_prog_YODL2TXT" +if test -n "$YODL2TXT"; then + echo "$ac_t""$YODL2TXT" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$YODL2TXT" && break +done +test -n "$YODL2TXT" || YODL2TXT="-echo no yodl" + + YODL2LESS_DIR='$(bindir)/' + else + + + + + + + + + + export STRIPROFF YODL YODL2HTML YODL2LATEX YODL2MAN YODL2MSLESS YODL2TEXINFO YODL2TXT + fi + if test "x$YODL" = "-echo no yodl"; then + + echo "configure: warning: Did not find YODL (Yodl is Yet Oneother Document Language, see http://www.cs.uu.nl/~hanwen/yodl)" 1>&2 + warn_b=yes + + fi + + + # on some systems, -lguile succeeds for guile-1.3 + # others need readline, dl (or even more) + # urg, must check for different functions in libguile + # to force new check iso reading from cache + echo $ac_n "checking for scm_shell in -lguile""... $ac_c" 1>&6 +echo "configure:2492: checking for scm_shell in -lguile" >&5 +ac_lib_var=`echo guile'_'scm_shell | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lguile $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + \ + LIBS="-lguile $LIBS"; cat >> confdefs.h <<\EOF +#define HAVE_LIBGUILE 1 +EOF + +else + echo "$ac_t""no" 1>&6 +\ + echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6 +echo "configure:2538: checking for readline in -lreadline" >&5 +ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lreadline $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_lib=HAVE_LIB`echo readline | sed -e 's/^a-zA-Z0-9_/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + cat >> confdefs.h <&6 +fi + \ + echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 +echo "configure:2588: checking for dlopen in -ldl" >&5 +ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-ldl $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_lib=HAVE_LIB`echo dl | sed -e 's/^a-zA-Z0-9_/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + cat >> confdefs.h <&6 +fi + \ + echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 +echo "configure:2638: checking for socket in -lsocket" >&5 +ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lsocket $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_lib=HAVE_LIB`echo socket | sed -e 's/^a-zA-Z0-9_/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + cat >> confdefs.h <&6 +fi +\ + echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6 +echo "configure:2688: checking for tgetent in -ltermcap" >&5 +ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-ltermcap $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_lib=HAVE_LIB`echo termcap | sed -e 's/^a-zA-Z0-9_/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + cat >> confdefs.h <&6 +fi +\ + echo $ac_n "checking for fabs in -lm""... $ac_c" 1>&6 +echo "configure:2738: checking for fabs in -lm" >&5 +ac_lib_var=`echo m'_'fabs | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lm $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_lib=HAVE_LIB`echo m | sed -e 's/^a-zA-Z0-9_/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + cat >> confdefs.h <&6 +fi +\ + echo $ac_n "checking for scm_boot_guile in -lguile""... $ac_c" 1>&6 +echo "configure:2788: checking for scm_boot_guile in -lguile" >&5 +ac_lib_var=`echo guile'_'scm_boot_guile | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-lguile $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_lib=HAVE_LIB`echo guile | sed -e 's/^a-zA-Z0-9_/_/g' \ + -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` + cat >> confdefs.h <&6 +fi +\ + +fi + + if test "$ac_cv_lib_guile_scm_shell" != yes -a \ + "$ac_cv_lib_scm_boot_guile" != yes ; then + + echo "configure: warning: You should install guile 1.3 or newer" 1>&2 + warn_b=yes + + fi + + +CXXFLAGS="$CXXFLAGS -fhandle-signatures" + + +echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 +echo "configure:2853: 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 + if test "$cross_compiling" = yes; then + ac_cv_func_memcmp_clean=no +else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +then + ac_cv_func_memcmp_clean=yes +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + ac_cv_func_memcmp_clean=no +fi +rm -fr conftest* +fi + +fi + +echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6 +test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.o" + +echo $ac_n "checking for vprintf""... $ac_c" 1>&6 +echo "configure:2892: 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 < +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char vprintf(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_vprintf) || defined (__stub___vprintf) +choke me +#else +vprintf(); +#endif + +; return 0; } +EOF +if { (eval echo configure:2923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then + rm -rf conftest* + eval "ac_cv_func_vprintf=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_vprintf=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'vprintf`\" = yes"; then + echo "$ac_t""yes" 1>&6 + cat >> confdefs.h <<\EOF +#define HAVE_VPRINTF 1 +EOF + +else + echo "$ac_t""no" 1>&6 +fi + +if test "$ac_cv_func_vprintf" != yes; then +echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 +echo "configure:2947: 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 < +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char _doprnt(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub__doprnt) || defined (__stub____doprnt) +choke me +#else +_doprnt(); +#endif + +; return 0; } +EOF +if { (eval echo configure:2978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then + rm -rf conftest* + eval "ac_cv_func__doprnt=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func__doprnt=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'_doprnt`\" = yes"; then + echo "$ac_t""yes" 1>&6 + cat >> confdefs.h <<\EOF +#define HAVE_DOPRNT 1 +EOF + +else + echo "$ac_t""no" 1>&6 +fi + +fi + +for ac_func in memmem snprintf vsnprintf gettext +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +echo "configure:3005: 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 < +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func(); + +int main() { + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +$ac_func(); +#endif + +; return 0; } +EOF +if { (eval echo configure:3036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_$ac_func=no" +fi +rm -f conftest* +fi + +if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` + cat >> confdefs.h <&6 +fi +done + + +cat >> confdefs.h <> confdefs.h <&6 +echo "configure:3075: 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 + if test -n "$MAKEINFO"; then + ac_cv_prog_MAKEINFO="$MAKEINFO" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_MAKEINFO="$ac_prog" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +MAKEINFO="$ac_cv_prog_MAKEINFO" +if test -n "$MAKEINFO"; then + echo "$ac_t""$MAKEINFO" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + +test -n "$MAKEINFO" && break +done +test -n "$MAKEINFO" || MAKEINFO="error" + + + result="`echo \"$YODL2TEXINFO\" | grep echo`" + if test "x$YODL2TEXINFO" = "xerror" -o "x$result" != "x"; then + + echo "configure: warning: can\'t find yodl. You should install Yodl 1.30.2 or newer" 1>&2 + warn_b=yes + + fi + + + + trap '' 1 2 15 +cat > confcache <<\EOF +# This file is a shell script that caches the results of configure +# tests run on this system so they can be shared between configure +# scripts and configure runs. It is not useful on other systems. +# If it contains results you don't want to keep, you may remove or edit it. +# +# By default, configure uses ./config.cache as the cache file, +# creating it if it does not exist already. You can give configure +# the --cache-file=FILE option to use a different cache file; that is +# what configure does when it calls configure scripts in +# subdirectories, so they share the cache. +# Giving --cache-file=/dev/null disables caching, for debugging configure. +# config.status only pays attention to the cache file if you give it the +# --recheck option to rerun configure. +# +EOF +# The following way of writing the cache mishandles newlines in values, +# but we know of no workaround that is simple, portable, and efficient. +# So, don't put newlines in cache variables' values. +# Ultrix sh set writes to stderr and can't be redirected directly, +# and sets the high bit in the cache file unless we assign to the vars. +(set) 2>&1 | + case `(ac_space=' '; set) 2>&1` in + *ac_space=\ *) + # `set' does not quote correctly, so add quotes (double-quote substitution + # turns \\\\ into \\, and sed turns \\ into \). + sed -n \ + -e "s/'/'\\\\''/g" \ + -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p" + ;; + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. + sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p' + ;; + esac >> confcache +if cmp -s $cache_file confcache; then + : +else + if test -w $cache_file; then + echo "updating cache $cache_file" + cat confcache > $cache_file + else + echo "not updating unwritable cache $cache_file" + fi +fi +rm -f confcache + +trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 + +test "x$prefix" = xNONE && prefix=$ac_default_prefix +# Let make expand exec_prefix. +test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' + +# Any assignment to VPATH causes Sun make to only execute +# the first set of double-colon rules, so remove it if not needed. +# If there is a colon in the path, we need to keep it. +if test "x$srcdir" = x.; then + ac_vpsub='/^[ ]*VPATH[ ]*=[^:]*$/d' +fi + +trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 + +DEFS=-DHAVE_CONFIG_H + +# Without the "./", some shells look in PATH for config.status. +: ${CONFIG_STATUS=./config.status} + +echo creating $CONFIG_STATUS +rm -f $CONFIG_STATUS +cat > $CONFIG_STATUS </dev/null | sed 1q`: +# +# $0 $ac_configure_args +# +# Compiler output produced by configure, useful for debugging +# configure, is in ./config.log if it exists. + +ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]" +for ac_option +do + case "\$ac_option" in + -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) + echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" + exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; + -version | --version | --versio | --versi | --vers | --ver | --ve | --v) + echo "$CONFIG_STATUS generated by autoconf version 2.12" + exit 0 ;; + -help | --help | --hel | --he | --h) + echo "\$ac_cs_usage"; exit 0 ;; + *) echo "\$ac_cs_usage"; exit 1 ;; + esac +done + +ac_given_srcdir=$srcdir + +trap 'rm -fr `echo "$CONFIGFILE.make:config.make.in $CONFIGFILE.h:config.hh.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 +EOF +cat >> $CONFIG_STATUS < conftest.subs <<\\CEOF +$ac_vpsub +$extrasub +s%@CFLAGS@%$CFLAGS%g +s%@CPPFLAGS@%$CPPFLAGS%g +s%@CXXFLAGS@%$CXXFLAGS%g +s%@DEFS@%$DEFS%g +s%@LDFLAGS@%$LDFLAGS%g +s%@LIBS@%$LIBS%g +s%@exec_prefix@%$exec_prefix%g +s%@prefix@%$prefix%g +s%@program_transform_name@%$program_transform_name%g +s%@bindir@%$bindir%g +s%@sbindir@%$sbindir%g +s%@libexecdir@%$libexecdir%g +s%@datadir@%$datadir%g +s%@sysconfdir@%$sysconfdir%g +s%@sharedstatedir@%$sharedstatedir%g +s%@localstatedir@%$localstatedir%g +s%@libdir@%$libdir%g +s%@includedir@%$includedir%g +s%@oldincludedir@%$oldincludedir%g +s%@infodir@%$infodir%g +s%@mandir@%$mandir%g +s%@stepmake@%$stepmake%g +s%@package@%$package%g +s%@PACKAGE@%$PACKAGE%g +s%@PACKAGE_NAME@%$PACKAGE_NAME%g +s%@package_depth@%$package_depth%g +s%@AUTOGENERATE@%$AUTOGENERATE%g +s%@absolute_builddir@%$absolute_builddir%g +s%@STATE_VECTOR@%$STATE_VECTOR%g +s%@CONFIGSUFFIX@%$CONFIGSUFFIX%g +s%@host@%$host%g +s%@host_alias@%$host_alias%g +s%@host_cpu@%$host_cpu%g +s%@host_vendor@%$host_vendor%g +s%@host_os@%$host_os%g +s%@MAKE@%$MAKE%g +s%@FIND@%$FIND%g +s%@TAR@%$TAR%g +s%@BASH@%$BASH%g +s%@PYTHON@%$PYTHON%g +s%@DOTEXE@%$DOTEXE%g +s%@ZIP@%$ZIP%g +s%@LN@%$LN%g +s%@LN_S@%$LN_S%g +s%@INSTALL@%$INSTALL%g +s%@PATHSEP@%$PATHSEP%g +s%@DIRSEP@%$DIRSEP%g +s%@DIR_DATADIR@%$DIR_DATADIR%g +s%@subdirs@%$subdirs%g +s%@CC@%$CC%g +s%@LD@%$LD%g +s%@ICFLAGS@%$ICFLAGS%g +s%@ILDFLAGS@%$ILDFLAGS%g +s%@DEFINES@%$DEFINES%g +s%@EXTRA_LIBES@%$EXTRA_LIBES%g +s%@CXX@%$CXX%g +s%@CXXCPP@%$CXXCPP%g +s%@YACC@%$YACC%g +s%@BISON@%$BISON%g +s%@FLEX@%$FLEX%g +s%@AR@%$AR%g +s%@RANLIB@%$RANLIB%g +s%@localedir@%$localedir%g +s%@DIR_LOCALEDIR@%$DIR_LOCALEDIR%g +s%@MSGFMT@%$MSGFMT%g +s%@METAFONT@%$METAFONT%g +s%@MFONT@%$MFONT%g +s%@METAPOST@%$METAPOST%g +s%@MPOST@%$MPOST%g +s%@STRIPROFF@%$STRIPROFF%g +s%@YODL@%$YODL%g +s%@YODL2HTML@%$YODL2HTML%g +s%@YODL2LATEX@%$YODL2LATEX%g +s%@YODL2MAN@%$YODL2MAN%g +s%@YODL2MSLESS@%$YODL2MSLESS%g +s%@YODL2TEXINFO@%$YODL2TEXINFO%g +s%@YODL2TXT@%$YODL2TXT%g +s%@YODL2LESS_DIR@%$YODL2LESS_DIR%g +s%@LIBOBJS@%$LIBOBJS%g +s%@MAKEINFO@%$MAKEINFO%g + +CEOF +EOF + +cat >> $CONFIG_STATUS <<\EOF + +# Split the substitutions into bite-sized pieces for seds with +# small command number limits, like on Digital OSF/1 and HP-UX. +ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script. +ac_file=1 # Number of current file. +ac_beg=1 # First line for current file. +ac_end=$ac_max_sed_cmds # Line after last line for current file. +ac_more_lines=: +ac_sed_cmds="" +while $ac_more_lines; do + if test $ac_beg -gt 1; then + sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file + else + sed "${ac_end}q" conftest.subs > conftest.s$ac_file + fi + if test ! -s conftest.s$ac_file; then + ac_more_lines=false + rm -f conftest.s$ac_file + else + if test -z "$ac_sed_cmds"; then + ac_sed_cmds="sed -f conftest.s$ac_file" + else + ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file" + fi + ac_file=`expr $ac_file + 1` + ac_beg=$ac_end + ac_end=`expr $ac_end + $ac_max_sed_cmds` + fi +done +if test -z "$ac_sed_cmds"; then + ac_sed_cmds=cat +fi +EOF + +cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF +for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then + # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". + case "$ac_file" in + *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` + ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; + *) ac_file_in="${ac_file}.in" ;; + esac + + # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories. + + # Remove last slash and all that follows it. Not all systems have dirname. + ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` + if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then + # The file is in a subdirectory. + test ! -d "$ac_dir" && mkdir "$ac_dir" + ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`" + # A "../" for each directory in $ac_dir_suffix. + ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'` + else + ac_dir_suffix= ac_dots= + fi + + case "$ac_given_srcdir" in + .) srcdir=. + if test -z "$ac_dots"; then top_srcdir=. + else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;; + /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; + *) # Relative path. + srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix" + top_srcdir="$ac_dots$ac_given_srcdir" ;; + esac + + + echo creating "$ac_file" + rm -f "$ac_file" + configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure." + case "$ac_file" in + *Makefile*) ac_comsub="1i\\ +# $configure_input" ;; + *) ac_comsub= ;; + esac + + ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` + sed -e "$ac_comsub +s%@configure_input@%$configure_input%g +s%@srcdir@%$srcdir%g +s%@top_srcdir@%$top_srcdir%g +" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file +fi; done +rm -f conftest.s* + +# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where +# NAME is the cpp macro being defined and VALUE is the value it is being given. +# +# ac_d sets the value in "#define NAME VALUE" lines. +ac_dA='s%^\([ ]*\)#\([ ]*define[ ][ ]*\)' +ac_dB='\([ ][ ]*\)[^ ]*%\1#\2' +ac_dC='\3' +ac_dD='%g' +# ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE". +ac_uA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' +ac_uB='\([ ]\)%\1#\2define\3' +ac_uC=' ' +ac_uD='\4%g' +# ac_e turns "#undef NAME" without trailing blanks into "#define NAME VALUE". +ac_eA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' +ac_eB='$%\1#\2define\3' +ac_eC=' ' +ac_eD='%g' + +if test "${CONFIG_HEADERS+set}" != set; then +EOF +cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF +fi +for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then + # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". + case "$ac_file" in + *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` + ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; + *) ac_file_in="${ac_file}.in" ;; + esac + + echo creating $ac_file + + rm -f conftest.frag conftest.in conftest.out + ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` + cat $ac_file_inputs > conftest.in + +EOF + +# Transform confdefs.h into a sed script conftest.vals that substitutes +# the proper values into config.h.in to produce config.h. And first: +# Protect against being on the right side of a sed subst in config.status. +# Protect against being in an unquoted here document in config.status. +rm -f conftest.vals +cat > conftest.hdr <<\EOF +s/[\\&%]/\\&/g +s%[\\$`]%\\&%g +s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp +s%ac_d%ac_u%gp +s%ac_u%ac_e%gp +EOF +sed -n -f conftest.hdr confdefs.h > conftest.vals +rm -f conftest.hdr + +# This sed command replaces #undef with comments. This is necessary, for +# example, in the case of _POSIX_SOURCE, which is predefined and required +# on some systems where configure will not decide to define it. +cat >> conftest.vals <<\EOF +s%^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*%/* & */% +EOF + +# Break up conftest.vals because some shells have a limit on +# the size of here documents, and old seds have small limits too. + +rm -f conftest.tail +while : +do + ac_lines=`grep -c . conftest.vals` + # grep -c gives empty output for an empty file on some AIX systems. + if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi + # Write a limited-size here document to conftest.frag. + echo ' cat > conftest.frag <> $CONFIG_STATUS + sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS + echo 'CEOF + sed -f conftest.frag conftest.in > conftest.out + rm -f conftest.in + mv conftest.out conftest.in +' >> $CONFIG_STATUS + sed 1,${ac_max_here_lines}d conftest.vals > conftest.tail + rm -f conftest.vals + mv conftest.tail conftest.vals +done +rm -f conftest.vals + +cat >> $CONFIG_STATUS <<\EOF + rm -f conftest.frag conftest.h + echo "/* $ac_file. Generated automatically by configure. */" > conftest.h + cat conftest.in >> conftest.h + rm -f conftest.in + if cmp -s $ac_file conftest.h 2>/dev/null; then + echo "$ac_file is unchanged" + rm -f conftest.h + else + # Remove last slash and all that follows it. Not all systems have dirname. + ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` + if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then + # The file is in a subdirectory. + test ! -d "$ac_dir" && mkdir "$ac_dir" + fi + rm -f $ac_file + mv conftest.h $ac_file + fi +fi; done + +EOF +cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF + +exit 0 +EOF +chmod +x $CONFIG_STATUS +rm -fr confdefs* $ac_clean_files +test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 + +if test "$no_recursion" != yes; then + + # Remove --cache-file and --srcdir arguments so they do not pile up. + ac_sub_configure_args= + ac_prev= + for ac_arg in $ac_configure_args; do + if test -n "$ac_prev"; then + ac_prev= + continue + fi + case "$ac_arg" in + -cache-file | --cache-file | --cache-fil | --cache-fi \ + | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) + ac_prev=cache_file ;; + -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ + | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) + ;; + -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) + ac_prev=srcdir ;; + -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) + ;; + *) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;; + esac + done + + for ac_config_dir in stepmake; do + + # Do not complain, so a configure script can configure whichever + # parts of a large source tree are present. + if test ! -d $srcdir/$ac_config_dir; then + continue + fi + + echo configuring in $ac_config_dir + + case "$srcdir" in + .) ;; + *) + if test -d ./$ac_config_dir || mkdir ./$ac_config_dir; then :; + else + { echo "configure: error: can not create `pwd`/$ac_config_dir" 1>&2; exit 1; } + fi + ;; + esac + + ac_popdir=`pwd` + cd $ac_config_dir + + # A "../" for each directory in /$ac_config_dir. + ac_dots=`echo $ac_config_dir|sed -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'` + + case "$srcdir" in + .) # No --srcdir option. We are building in place. + ac_sub_srcdir=$srcdir ;; + /*) # Absolute path. + ac_sub_srcdir=$srcdir/$ac_config_dir ;; + *) # Relative path. + ac_sub_srcdir=$ac_dots$srcdir/$ac_config_dir ;; + esac + + # Check for guested configure; otherwise get Cygnus style configure. + if test -f $ac_sub_srcdir/configure; then + ac_sub_configure=$ac_sub_srcdir/configure + elif test -f $ac_sub_srcdir/configure.in; then + ac_sub_configure=$ac_configure + else + echo "configure: warning: no configuration information is in $ac_config_dir" 1>&2 + ac_sub_configure= + fi + + # The recursion is here. + if test -n "$ac_sub_configure"; then + + # Make the cache file name correct relative to the subdirectory. + case "$cache_file" in + /*) ac_sub_cache_file=$cache_file ;; + *) # Relative path. + ac_sub_cache_file="$ac_dots$cache_file" ;; + esac + + echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir" + # The eval makes quoting arguments work. + if eval ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir + then : + else + { echo "configure: error: $ac_sub_configure failed for $ac_config_dir" 1>&2; exit 1; } + fi + fi + + cd $ac_popdir + done +fi + + + rm -f GNUmakefile + cp make/toplevel.make.in ./GNUmakefile + chmod 444 GNUmakefile + + diff --git a/init/book-fragment.ly b/init/book-fragment.ly index f8b283faf4..3f8deb6965 100644 --- a/init/book-fragment.ly +++ b/init/book-fragment.ly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "1.0.7"; +\version "1.0.10"; \include "declarations.ly" diff --git a/init/book-init.ly b/init/book-init.ly index e2744aa352..34bac0ef49 100644 --- a/init/book-init.ly +++ b/init/book-init.ly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "1.0.7"; +\version "1.0.10"; \include "declarations.ly"; diff --git a/init/center-fragment.ly b/init/center-fragment.ly index 4bf04f5963..7e8247a243 100644 --- a/init/center-fragment.ly +++ b/init/center-fragment.ly @@ -1,7 +1,7 @@ % Toplevel initialisation file. -\version "1.0.7"; +\version "1.0.10"; \include "declarations.ly" diff --git a/init/center.ly b/init/center.ly index 5fddea855e..0245fd3d36 100644 --- a/init/center.ly +++ b/init/center.ly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "1.0.7"; +\version "1.0.10"; \include "declarations.ly" diff --git a/init/engraver.ly b/init/engraver.ly index c34f9df8f3..81f5312937 100644 --- a/init/engraver.ly +++ b/init/engraver.ly @@ -46,6 +46,7 @@ StaffContext=\translator { (\property Staff.instrument; Staff.instr for subsequent lines) to the left of a staff. %} + defaultClef = treble; marginBreakPriority = "-5"; @@ -152,7 +153,6 @@ GrandStaffContext=\translator{ ScoreContext = \translator { \type Score_engraver; \name Score; - defaultClef = treble; \consists "Timing_engraver"; diff --git a/init/fragment.ly b/init/fragment.ly index 0de947cf26..a1ce3f163b 100644 --- a/init/fragment.ly +++ b/init/fragment.ly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "1.0.7"; +\version "1.0.10"; \include "declarations.ly" diff --git a/init/init.ly b/init/init.ly index 3627b7e864..adfd6272e5 100644 --- a/init/init.ly +++ b/init/init.ly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "1.0.7"; +\version "1.0.10"; \include "declarations.ly"; diff --git a/init/lily.scm b/init/lily.scm index f813358ede..94a6810b2d 100644 --- a/init/lily.scm +++ b/init/lily.scm @@ -45,97 +45,76 @@ ;;;;;;;; TeX ;(define (tex action) -(define - (beam-tex width slope thick) - (embedded-ps-tex (beam-ps width slope thick))) +(define (beam-tex width slope thick) + (embedded-ps-tex ((ps-scm 'beam) width slope thick))) -(define - (bracket-tex h) - (embedded-ps-tex (bracket-ps h))) +(define (bracket-tex h) + (embedded-ps-tex ((ps-scm 'bracket) h))) -(define - (dashed-slur-tex thick dash l) - (embedded-ps-tex (dashed-slur-ps thick dash l))) +(define (dashed-slur-tex thick dash l) + (embedded-ps-tex ((ps-scm 'dashed-slur) thick dash l))) -(define - (crescendo-tex w h cont) - (embedded-ps-tex (crescendo-ps w h cont))) +(define (crescendo-tex w h cont) + (embedded-ps-tex ((ps-scm 'crescendo) w h cont))) -(define - (decrescendo-tex w h cont) - (embedded-ps-tex (decrescendo-ps w h cont))) +(define (decrescendo-tex w h cont) + (embedded-ps-tex ((ps-scm 'decrescendo) w h cont))) -(define - (embedded-ps-tex s) +(define (embedded-ps-tex s) (string-append "\\embeddedps{" s "}")) -(define - (end-output-tex) +(define (end-output-tex) "\n\\EndLilyPondOutput") -(define - (empty-tex) +(define (empty-tex) "%\n\\empty%\n") -(define - (experimental-on-tex) "\\turnOnExperimentalFeatures") +(define (experimental-on-tex) "\\turnOnExperimentalFeatures") -(define - (extender o h) +(define (extender o h) ((invoke-output o "invoke-dim1") "extender" h)) -(define - (font-switch-tex i) +(define (font-switch-tex i) (string-append "\\" (font i) "\n")) -(define - (font-def-tex i s) +(define (font-def-tex i s) (string-append "\\font" (font-switch-tex i) "=" s "\n")) -(define - (generalmeter-tex num den) +(define (generalmeter-tex num den) (string-append "\\generalmeter{" (number->string (inexact->exact num)) "}{" (number->string (inexact->exact den)) "}")) -(define - (header-end-tex) "\\turnOnPostScript") +(define (header-end-tex) "\\turnOnPostScript") -(define - (header-tex creator generate) +(define (header-tex creator generate) (string-append "%created by: " creator generate "\n")) -(define - (invoke-char-tex s i) +(define (invoke-char-tex s i) (string-append "\n\\" s "{" (inexact->string i 10) "}" )) -(define - (invoke-dim1-tex s d) +(define (invoke-dim1-tex s d) (string-append "\n\\" s "{" (number->dim-tex d) "}")) -(define - (lily-def-tex key val) +(define (lily-def-tex key val) (string-append "\\def\\" key "{" val "}\n")) -(define - (number->dim-tex x) +(define (number->dim-tex x) (string-append (number->string (chop-decimal x)) "pt ")) -(define - (placebox-tex x y s) +(define (placebox-tex x y s) (string-append "\\placebox{" (number->dim-tex y) "}{" (number->dim-tex x) "}{" s "}")) -(define - (rulesym-tex h w) +(define (rulesym-tex h w) (string-append "\\vrule height " (number->dim-tex (/ h 2)) " depth " (number->dim-tex (/ h 2)) @@ -143,165 +122,188 @@ ) ) -(define - (slur-tex l) - (embedded-ps-tex (slur-ps l))) +(define (slur-tex l) + (embedded-ps-tex ((ps-scm 'slur) l))) -(define - (start-line-tex) +(define (start-line-tex) (string-append "\\hbox{%\n") ) -(define - (stem-tex kern width height depth) +(define (stem-tex kern width height depth) (string-append "\\kern" (number->dim-tex kern) "\\vrule width " (number->dim-tex width) "depth " (number->dim-tex depth) "height " (number->dim-tex height) " ")) -(define - (stop-line-tex) +(define (stop-line-tex) "}\\interscoreline") -(define - (text-tex f s) +(define (text-tex f s) (string-append "\\set" f "{" s "}")) -(define - (tuplet-tex dx dy dir) - (embedded-ps-tex (tuplet-ps dx dy dir))) - +(define (tuplet-tex dx dy dir) + (embedded-ps-tex ((ps-scm 'tuplet) dx dy dir))) -(define - (volta-tex w last) - (embedded-ps-tex (volta-ps w last))) +(define (volta-tex w last) + (embedded-ps-tex ((ps-scm 'volta) w last))) ;;;;;;;;;;;; PS +(define (ps-scm action-name) + (define (beam width slope thick) + (string-append + (numbers->string (list width slope thick)) " draw_beam " )) + + (define (bracket h) + (invoke-dim1 "draw_bracket" h)) -(define - (beam-ps width slope thick) - (string-append - (numbers->string (list width slope thick)) " draw_beam " )) - -(define - (bracket-ps h) - (invoke-dim1-ps "draw_bracket" h)) - -(define - (crescendo-ps w h cont) - (string-append - (numbers->string (list w h (inexact->exact cont))) - "draw_crescendo")) - -(define - (dashed-slur-ps thick dash l) - (string-append - (apply string-append (map control->string l)) - (number->string thick) - " [ " - (if (> 1 dash) (number->string (- (* thick dash) thick)) "0") " " - (number->string (* 2 thick)) - " ] 0 draw_dashed_slur")) - -(define - (decrescendo-ps w h cont) - (string-append - (numbers->string (list w h (inexact->exact cont))) - "draw_decrescendo")) - -(define - (empty-ps) - "\n empty\n") - -(define - (end-output-ps) - "\nshowpage\n") - -(define - (experimental-on-ps) "") - -(define - (font-def-ps i s) - (string-append - "\n/" (font i) " {/" - (substring s 0 (- (string-length s) 4)) - " findfont 12 scalefont setfont} bind def\n")) - -(define - (font-switch-ps i) - (string-append (font i) " ")) - -(define - (generalmeter-ps num den) - (string-append (number->string (inexact->exact num)) " " (number->string (inexact->exact den)) " generalmeter ")) - -(define - (header-end-ps) "") -(define - (lily-def-ps key val) - (string-append - "/" key " {" val "} bind def\n")) - -(define - (header-ps creator generate) - (string-append - "%!PS-Adobe-3.0\n" - "%%Creator: " creator generate "\n")) - -(define - (invoke-char-ps s i) - (string-append - "(\\" (inexact->string i 8) ") " s " " )) - -(define - (invoke-dim1-ps s d) - (string-append - (number->string d) " " s )) - -(define - (placebox-ps x y s) - (string-append - (number->string x) " " (number->string y) " {" s "} placebox ")) - -(define - (rulesym-ps x y) - (string-append - (number->string x) " " - (number->string y) " " - "rulesym")) - -(define - (slur-ps l) - (string-append - (apply string-append (map control->string l)) - " draw_slur")) - -(define - (start-line-ps) - "\nstart_line {\n") - -(define - (stem-ps kern width height depth) - (string-append (numbers->string (list kern width height depth)) - "draw_stem" )) - -(define - (stop-line-ps) - "}\nstop_line\n") - -(define - (text-ps f s) - (string-append "(" s ") set" f " ")) - - -(define - (volta-ps w last) - (string-append - (numbers->string (list w (inexact->exact last))) - "draw_volta")) - + (define (crescendo w h cont) + (string-append + (numbers->string (list w h (inexact->exact cont))) + "draw_crescendo")) + + (define (dashed-slur thick dash l) + (string-append + (apply string-append (map control->string l)) + (number->string thick) + " [ " + (if (> 1 dash) (number->string (- (* thick dash) thick)) "0") " " + (number->string (* 2 thick)) + " ] 0 draw_dashed_slur")) + + (define (decrescendo w h cont) + (string-append + (numbers->string (list w h (inexact->exact cont))) + "draw_decrescendo")) + + (define (empty) + "\n empty\n") + + (define (end-output) + "\nshowpage\n") + + (define (experimental-on) "") + + (define (font-def i s) + (string-append + "\n/" (font i) " {/" + (substring s 0 (- (string-length s) 4)) + " findfont 12 scalefont setfont} bind def\n")) + + (define (font-switch i) + (string-append (font i) " ")) + + (define (generalmeter num den) + (string-append (number->string (inexact->exact num)) " " (number->string (inexact->exact den)) " generalmeter ")) + + (define (header-end) "") + (define (lily-def key val) + (string-append + "/" key " {" val "} bind def\n")) + + (define (header creator generate) + (string-append + "%!PS-Adobe-3.0\n" + "%%Creator: " creator generate "\n")) + + (define (invoke-char s i) + (string-append + "(\\" (inexact->string i 8) ") " s " " )) + + (define (invoke-dim1 s d) + (string-append + (number->string d) " " s )) + + (define (placebox x y s) + (string-append + (number->string x) " " (number->string y) " {" s "} placebox ")) + + (define (rulesym x y) + (string-append + (number->string x) " " + (number->string y) " " + "rulesym")) + + (define (slur l) + (string-append + (apply string-append (map control->string l)) + " draw_slur")) + + (define (start-line) + "\nstart_line {\n") + + (define (stem kern width height depth) + (string-append (numbers->string (list kern width height depth)) + "draw_stem" )) + + (define (stop-line) + "}\nstop_line\n") + + (define (text f s) + (string-append "(" s ") set" f " ")) + +(define + (unknown-tex) + "%\n\\unknown%\n") + + (define (volta w last) + (string-append + (numbers->string (list w (inexact->exact last))) + "draw_volta")) + (define (tuplet dx dy dir) + (string-append + (numbers->string (list dx dy (inexact->exact dir))) + "draw_tuplet")) + + + + ; dispatch on action-name + (cond ((eq? action-name 'all-definitions) + `(eval + (define beam ,beam) + (define tuplet ,tuplet) + (define bracket ,bracket) + (define crescendo ,crescendo) + (define volta ,volta) + (define slur ,slur) + (define dashed-slur ,dashed-slur) + (define decrescendo ,decrescendo) + (define empty ,empty) + (define end-output ,end-output) + (define font-def ,font-def) + (define font-switch ,font-switch) + (define generalmeter ,generalmeter) + (define header-end ,header-end) + (define lily-def ,lily-def) + (define header ,header) + (define invoke-char ,invoke-char) + (define invoke-dim1 ,invoke-dim1) + (define placebox ,placebox) + (define rulesym ,rulesym) + (define start-line ,start-line) + (define stem ,stem) + (define stop-line ,stop-line) + (define text ,text) + )) + ((eq? action-name 'tuplet) tuplet) + ((eq? action-name 'beam) beam) + ((eq? action-name 'bracket) bracket) + ((eq? action-name 'crescendo) crescendo) + ((eq? action-name 'volta) volta) + ((eq? action-name 'slur) slur) + ((eq? action-name 'dashed-slur) dashed-slur) + ((eq? action-name 'decrescendo) decrescendo) + (else (error "unknown tag -- PS-SCM " action-name)) + ) +) + + +(define + (unknown-ps) + "\n unknown\n") + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; output definitions (define @@ -445,6 +447,12 @@ (setnumber o s) ((invoke-output o "text") "number" s)) +; urg, howto do all these sizes; +; what about: fontjj fontj font fonti fontii +(define + (setnumber-1 o s) + ((invoke-output o "text") "numberj" s)) + (define (settext o s) ((invoke-output o "text") "text" s)) @@ -461,12 +469,6 @@ (tuplet o dx dy dir) ((invoke-output o "tuplet") dx dy dir)) -(define - (tuplet-ps dx dy dir) - (string-append - (numbers->string (list dx dy (inexact->exact dir))) - "draw_tuplet")) - (define (stem o kern width height depth) ((invoke-output o "stem") kern width height depth)) @@ -485,6 +487,10 @@ (startrepeat o h) ((invoke-output o "invoke-dim1") "startrepeat" h)) +(define + (stem o kern width height depth) + ((invoke-output o "stem") kern width height depth)) + (define (stop-line o) ((invoke-output o "stop-line"))) @@ -493,6 +499,16 @@ (stoprepeat o h) ((invoke-output o "invoke-dim1") "stoprepeat" h)) +(define + (tuplet-ps dx dy dir) + (string-append + (numbers->string (list dx dy (inexact->exact dir))) + "draw_tuplet")) + +(define + (unknown o) + ((invoke-output o "unknown"))) + (define (volta o w last) ((invoke-output o "volta") w last)) diff --git a/init/paper16.ly b/init/paper16.ly index 53ab49363d..224c81abf4 100644 --- a/init/paper16.ly +++ b/init/paper16.ly @@ -6,7 +6,7 @@ -\version "1.0.7"; +\version "1.0.10"; paper_sixteen = \paper { staffheight = 16.0\pt; diff --git a/init/paper20.ly b/init/paper20.ly index e799f529bc..e3a3013d50 100644 --- a/init/paper20.ly +++ b/init/paper20.ly @@ -5,7 +5,7 @@ \include "table13.ly"; \include "table16.ly"; -\version "1.0.7"; +\version "1.0.10"; paper_twenty = \paper { staffheight = 20.0\pt; diff --git a/init/table16.ly b/init/table16.ly index d535ebcc10..d0c76c1c8b 100644 --- a/init/table16.ly +++ b/init/table16.ly @@ -19,6 +19,7 @@ table_sixteen= "typewriter" "settypewriter" 1 0.0\pt 4.\pt 0.0\pt 8.0\pt "large" "setlarge" 1 0.0\pt 9.50\pt 0.0\pt 10.0\pt "number" "setnumber" 1 0.0\pt 6.0\pt 0.0\pt 8.0\pt + "number-1" "setnumber-1" 1 0.0\pt 4.0\pt 0.0\pt 6.0\pt "roman" "settext" 1 0.0\pt 4.5\pt 0.0\pt 8.0\pt } "dynamics" = \table { diff --git a/init/table20.ly b/init/table20.ly index 001fce9429..f9f46746a7 100644 --- a/init/table20.ly +++ b/init/table20.ly @@ -21,6 +21,7 @@ table_twenty = "Large" "setLarge" 1 0.0\pt 6.50\pt 0.0\pt 12.0\pt "mark" "setmark" 1 0.0\pt 6.50\pt 0.0\pt 12.0\pt "number" "setnumber" 1 0.0\pt 8.0\pt 0.0\pt 10.0\pt + "number-1" "setnumber-1" 1 0.0\pt 6.0\pt 0.0\pt 8.0\pt "roman" "settext" 1 0.0\pt 5.6\pt 0.0\pt 10.0\pt } diff --git a/input/bugs/core.ly b/input/bugs/core.ly new file mode 100644 index 0000000000..6b3c8abb5c --- /dev/null +++ b/input/bugs/core.ly @@ -0,0 +1,95 @@ +% +% This file prints lots of warning messages about scripts-dportato +% + +\header{ +filename = "scales.ly"; +enteredby = "HWN"; +copyright = "public domain"; +} + +%{ + Tested Features: scripts, beams, transposition, +%} + +% +% scales with accents. +% + +\version "1.0.10"; +blah = \notes { + \time 6/8; +\transpose c { + \clef "bass"; + c4. d +} + c d + \clef "violin" ; +\transpose c'' { + \transpose d { e f } } +\transpose c''' { + c4. d + %ugr + |\times 6/9 { a8 \< a a a a a a \! a a \ff \> ] } | } + \transpose c'' { + \times 6/9 { a a a a a a a a \! a ] } | } + \transpose c''' { + \times 6/9 { c,->-.-\fermata \< g,->-.-\fermata + d->-.-\fermata a->-.-\fermata + e'->-.-\fermata b'-. f''-. c'''->-.-\fermata + \! g'''->-.-\fermata \> ] } + + \times 6/9 { g'''->-.-\fermata c'''->-.-\fermata + f''->-.-\fermata b'->-.-\fermata e'->-.-\fermata + a->-.-\fermata d->-.-\fermata g,->-.-\fermata \! + c,->-.-\fermata ] } + + \times 6/9 { c,->-.-\fermata \< g,->-.-\fermata d->-.-\fermata + a->-.-\fermata + e'->-.-\fermata b'-. f''-. + c'''->-.-\fermata \! g'''->-.-\fermata \> ] } + \times 6/9 { g'''->-.-\fermata c'''->-.-\fermata + f''->-.-\fermata b'->-.-\fermata e'->-.-\fermata + a->-.-\fermata d->-.-\fermata + g,->-.-\fermata \! c,->-.-\fermata ] } + } + \transpose c'' { + \times 2/3 { c g d' ] } + \times 2/3 { d' g c ] } + \times 2/3 { f c' g' ] } + \times 2/3 { g' c' f ] } + } + \transpose c' { + \times 2/3 { c g d' ] } + \times 2/3 { d' g c ] } + \times 2/3 { f c' g' ] } + \times 2/3 { g' c' f ] } + \times 2/3 { g' c' f ] } + \time 4/4; + +c1} + + r8-"text" r8^. r8_. r8 r8 r8 r8 r8 + [c-> d-> e-> f->][g-> a-> b-> c'->] % 1 +\transpose c'' { [c'-^ b-^ a-^ g-^][f-^ e-^ d-^ c-^]} + [c'-^ b-^ a-^ g-^][f-^ e-^ d-^ c-^] + [c-. d-. e-. f-.][g-. a-. b-. c'-.] + [c'-- b-- a-- g][f-- e-- d c--] % 5 + [c-\portato d-\portato e-\portato f-\portato] + [g-\portato a-\portato b-\portato c'-\portato] + [c'-\upbow b-\upbow a-\downbow g-\downbow] + [f-\downbow e-\downbow d-\upbow c-\upbow] + [c-| d-| e-| f-|][g-| a-| b-| c'-|] + [c' b a g][f e d c] + [c d e f][g a b c'] % 10 + |[c' b a g][f e d c] + + } + + +\score{ + \notes {\blah} + \paper{ + castingalgorithm = \Wordwrap; + } +} diff --git a/input/example-3.ly b/input/example-3.ly index 426d1e7809..c3971dde48 100644 --- a/input/example-3.ly +++ b/input/example-3.ly @@ -1,4 +1,4 @@ -\version "1.0.7"; +\version "1.0.10"; one = \notes\relative c{ c'' d e f diff --git a/input/keys.ly b/input/keys.ly index bdc719a5d4..1eb19dec08 100644 --- a/input/keys.ly +++ b/input/keys.ly @@ -1,4 +1,4 @@ -\version "1.0.7"; +\version "1.0.10"; blah = \notes { diff --git a/input/kortjakje.ly b/input/kortjakje.ly index c327f45d81..b8ec9a8519 100644 --- a/input/kortjakje.ly +++ b/input/kortjakje.ly @@ -10,7 +10,7 @@ copyright = "public domain"; Tested Features: example file with comments %} -\version "1.0.7"; +\version "1.0.10"; % the % is a comment. diff --git a/input/part.ly b/input/part.ly index ffcfe99695..bcf7875e3e 100644 --- a/input/part.ly +++ b/input/part.ly @@ -1,4 +1,4 @@ -\version "1.0.7"; +\version "1.0.10"; part = \notes { c-1 c c c r1*3 diff --git a/input/pedal.ly b/input/pedal.ly index 360902ce67..d76df98ab6 100644 --- a/input/pedal.ly +++ b/input/pedal.ly @@ -28,7 +28,7 @@ % \lbheel \lbheel \lfheel \lftoe % \rbheel \rbtoe \rfheel \rftoe -\version "1.0.7"; +\version "1.0.10"; \score{ \notes { diff --git a/input/praeludium-fuga-E.ly b/input/praeludium-fuga-E.ly index 876299fdb4..9b586694f9 100644 --- a/input/praeludium-fuga-E.ly +++ b/input/praeludium-fuga-E.ly @@ -23,7 +23,7 @@ * organ staff... %} -\version "1.0.7"; +\version "1.0.10"; diff --git a/input/rhythm.ly b/input/rhythm.ly index 75558c339a..92d0a1055a 100644 --- a/input/rhythm.ly +++ b/input/rhythm.ly @@ -7,7 +7,7 @@ TestedFeatures = "multiple meters, beaming, unsynced bars, userdefd engravers"; -\version "1.0.7"; +\version "1.0.10"; ritme = \notes\transpose c'' { \time 4/4; @@ -21,7 +21,7 @@ ritme = \notes\transpose c'' { % divide measure in 5 equal parts. Usually it 2+3 or 3+2 \grouping 16*5 ; [c8 c16 c8 ] | % watch THIS! - [5/4 c16 c16 c16 c16]1/1 | + \times 5/4 { [ c16 c16 c16 c16] } | \time 2/8; c4 | c4 c4 c4 c4 diff --git a/input/scales.ly b/input/scales.ly index 4992d6ad22..58e2b102b3 100644 --- a/input/scales.ly +++ b/input/scales.ly @@ -16,7 +16,7 @@ copyright = "public domain"; % scales with accents. % -\version "1.0.7"; +\version "1.0.10"; blah = \notes { \time 6/8; \transpose c { @@ -30,41 +30,41 @@ blah = \notes { \transpose c''' { c4. d %ugr - |[6/9 a8 \< a a a a a a \! a a \ff \> ]1/1 | } + |\times 6/9 { [ a8 \< a a a a a a \! a a \ff \> ] } | } \transpose c'' { - [6/9 a a a a a a a a \! a ]1/1 | } + \times 6/9 { [ a a a a a a a a \! a ] } | } \transpose c''' { - [6/9 c,->-.-\fermata \< g,->-.-\fermata + \times 6/9 { [ c,->-.-\fermata \< g,->-.-\fermata d->-.-\fermata a->-.-\fermata e'->-.-\fermata b'-. f''-. c'''->-.-\fermata - \! g'''->-.-\fermata \> ]1/1 + \! g'''->-.-\fermata \> ] } - [6/9 g'''->-.-\fermata c'''->-.-\fermata + \times 6/9 { [ g'''->-.-\fermata c'''->-.-\fermata f''->-.-\fermata b'->-.-\fermata e'->-.-\fermata a->-.-\fermata d->-.-\fermata g,->-.-\fermata \! - c,->-.-\fermata ]1/1 + c,->-.-\fermata ] } - [6/9 c,->-.-\fermata \< g,->-.-\fermata d->-.-\fermata + \times 6/9 { [ c,->-.-\fermata \< g,->-.-\fermata d->-.-\fermata a->-.-\fermata e'->-.-\fermata b'-. f''-. - c'''->-.-\fermata \! g'''->-.-\fermata \> ]1/1 - [6/9 g'''->-.-\fermata c'''->-.-\fermata + c'''->-.-\fermata \! g'''->-.-\fermata \> ] } + \times 6/9 { [ g'''->-.-\fermata c'''->-.-\fermata f''->-.-\fermata b'->-.-\fermata e'->-.-\fermata a->-.-\fermata d->-.-\fermata - g,->-.-\fermata \! c,->-.-\fermata ]1/1 + g,->-.-\fermata \! c,->-.-\fermata ] } } \transpose c'' { - [2/3 c g d' ]1/1 - [2/3 d' g c ]1/1 - [2/3 f c' g' ]1/1 - [2/3 g' c' f ]1/1 + \times 2/3 { [ c g d' ] } + \times 2/3 { [ d' g c ] } + \times 2/3 { [ f c' g' ] } + \times 2/3 { [ g' c' f ] } } \transpose c' { - [2/3 c g d' ]1/1 - [2/3 d' g c ]1/1 - [2/3 f c' g' ]1/1 - [2/3 g' c' f ]1/1 - [2/3 g' c' f ]1/1 + \times 2/3 { [ c g d' ] } + \times 2/3 { [ d' g c ] } + \times 2/3 { [ f c' g' ] } + \times 2/3 { [ g' c' f ] } + \times 2/3 { [ g' c' f ] } \time 4/4; c1} diff --git a/input/scripts.ly b/input/scripts.ly index 797eb4f5df..89b2b97630 100644 --- a/input/scripts.ly +++ b/input/scripts.ly @@ -1,5 +1,5 @@ -\version "1.0.7"; +\version "1.0.10"; blah = \notes{ \transpose c'' { diff --git a/input/test/abbrev.ly b/input/test/abbrev.ly index d707a6c9a9..f76091d8eb 100644 --- a/input/test/abbrev.ly +++ b/input/test/abbrev.ly @@ -1,5 +1,5 @@ -\version "1.0.7"; +\version "1.0.10"; \score{ \notes \transpose c'''{ \stemup diff --git a/input/test/bar-scripts.ly b/input/test/bar-scripts.ly index e12aab30f2..ea6200dd5a 100644 --- a/input/test/bar-scripts.ly +++ b/input/test/bar-scripts.ly @@ -1,7 +1,7 @@ -\version "1.0.7"; +\version "1.0.10"; onestaff = \type Staff = foo\notes { \property Staff.instr = instr diff --git a/input/test/beam-chord.ly b/input/test/beam-chord.ly index 362c7232e2..4295813018 100644 --- a/input/test/beam-chord.ly +++ b/input/test/beam-chord.ly @@ -1,4 +1,4 @@ -\version "1.0.7"; +\version "1.0.10"; \score{ \notes\transpose c'{ diff --git a/input/test/beam-pos.ly b/input/test/beam-pos.ly index a5148faa47..5709a714d0 100644 --- a/input/test/beam-pos.ly +++ b/input/test/beam-pos.ly @@ -1,4 +1,4 @@ -\version "1.0.7"; +\version "1.0.10"; \score{ \notes\transpose c''{ diff --git a/input/test/beams.ly b/input/test/beams.ly index dad9d23498..0080b0be8d 100644 --- a/input/test/beams.ly +++ b/input/test/beams.ly @@ -6,7 +6,7 @@ copyright = "PD"; TestedFeatures = "beams and beamflags"; } -\version "1.0.7"; +\version "1.0.10"; \score{ < diff --git a/input/test/broken.ly b/input/test/broken.ly index e18db38aff..282d6e2359 100644 --- a/input/test/broken.ly +++ b/input/test/broken.ly @@ -5,7 +5,7 @@ TestedFeatures = "This file tests Feta embedded slurs" + "(Feta definitively is not an abbreviation of Font-En-TjA)"; } -\version "1.0.7"; +\version "1.0.10"; shortlong = \notes{ c4()c( c c | diff --git a/input/test/clefs.ly b/input/test/clefs.ly index 846cf62b42..c7cb1df256 100644 --- a/input/test/clefs.ly +++ b/input/test/clefs.ly @@ -1,4 +1,4 @@ -\version "1.0.7"; +\version "1.0.10"; \score { \notes{ diff --git a/input/test/collisions.ly b/input/test/collisions.ly index cc84405cfb..eca12b5158 100644 --- a/input/test/collisions.ly +++ b/input/test/collisions.ly @@ -5,7 +5,7 @@ enteredby = "HWN,JCN"; copyright = "public domain"; Tested = "test the Collision resolution "; } -\version "1.0.7"; +\version "1.0.10"; diff --git a/input/test/defaultbars.ly b/input/test/defaultbars.ly index ef013933d2..cb9b5e45f7 100644 --- a/input/test/defaultbars.ly +++ b/input/test/defaultbars.ly @@ -1,4 +1,4 @@ -\version "1.0.7"; +\version "1.0.10"; \score { diff --git a/input/test/denneboom.ly b/input/test/denneboom.ly index bdbf2ee191..a8993c5455 100644 --- a/input/test/denneboom.ly +++ b/input/test/denneboom.ly @@ -7,7 +7,7 @@ TestedFeatures = "This file tests silly line shapes"; \include "paper20.ly" -\version "1.0.7"; +\version "1.0.10"; oden = \lyrics{ O8 | diff --git a/input/test/dotted-slur.ly b/input/test/dotted-slur.ly index 29140d0b45..148d2dd6d5 100644 --- a/input/test/dotted-slur.ly +++ b/input/test/dotted-slur.ly @@ -1,4 +1,4 @@ -\version "1.0.7"; +\version "1.0.10"; \score{ \notes{ diff --git a/input/test/find-quarts.ly b/input/test/find-quarts.ly index 6a1dedc89c..abeae4c46f 100644 --- a/input/test/find-quarts.ly +++ b/input/test/find-quarts.ly @@ -1,4 +1,4 @@ -\version "1.0.7"; +\version "1.0.10"; \score{ \notes \relative c { diff --git a/input/test/font-body.ly b/input/test/font-body.ly index b7a5c7d520..f3f1b91977 100644 --- a/input/test/font-body.ly +++ b/input/test/font-body.ly @@ -1,4 +1,4 @@ -\version "1.0.7"; +\version "1.0.10"; FontBody= \notes\transpose c''{ \bar "|:"; diff --git a/input/test/font.ly b/input/test/font.ly index 7692b8c90b..b7f7ddb569 100644 --- a/input/test/font.ly +++ b/input/test/font.ly @@ -7,7 +7,7 @@ description = "This file tests the Feta music font"; % "(Feta definitively is not an abbreviation of Font-En-TjA)"; } -\version "1.0.7"; +\version "1.0.10"; \include "font-body.ly" \score{ diff --git a/input/test/font16.ly b/input/test/font16.ly index 2c32786c81..b50fef90e3 100644 --- a/input/test/font16.ly +++ b/input/test/font16.ly @@ -7,7 +7,7 @@ description = "This file tests the Feta music font"; % "(Feta definitively is not an abbreviation of Font-En-TjA)"; } -\version "1.0.7"; +\version "1.0.10"; \include "font-body.ly" \score{ diff --git a/input/test/gourlay.ly b/input/test/gourlay.ly index 62ca043229..049462f94d 100644 --- a/input/test/gourlay.ly +++ b/input/test/gourlay.ly @@ -4,7 +4,7 @@ copyright = "PD"; TestedFeatures = "This file tests some nasty Gourlay spacings"; } -\version "1.0.7"; +\version "1.0.10"; %{ @@ -15,7 +15,7 @@ This is taken from [Gourlay]'s paper on breaking lines \score{ \notes \type Staff \transpose c''< { \stemup d2 d | d d | d4 d2. | \break c1 } - \transpose c, { \stemdown g4 g g g | \[2/3 g2 g2 g2 \] | g4. g8 g2 | c1 } + \transpose c, { \stemdown g4 g g g | \times 2/3 { g2 g2 g2 } | g4. g8 g2 | c1 } > \paper{ linewidth = 8.\cm diff --git a/input/test/grace.ly b/input/test/grace.ly index 81db2a8871..4f35ac6a30 100644 --- a/input/test/grace.ly +++ b/input/test/grace.ly @@ -1,5 +1,5 @@ -\version "1.0.7"; +\version "1.0.10"; \include "table13.ly"; \include "table16.ly"; @@ -15,8 +15,8 @@ {\tiny g''16*1/16 b16*1/16 \normalsize a4*31/32 g fis2 | a1 } > \type Staff = c \notes\relative c < -% {\grace [2/48 g''16 b g]/1 \graceat a4 \ecarg g fis2 | a1 } - {\tiny [2/48 g''16 b g]/1 \normalsize a4*31/32 g fis2 | a1 } +% {\grace \times 2/48 { [ g''16 b g] } \graceat a4 \ecarg g fis2 | a1 } + {\tiny \times 2/48 { [ g''16 b g] } \normalsize a4*31/32 g fis2 | a1 } > > \paper { diff --git a/input/test/hara-kiri.ly b/input/test/hara-kiri.ly index 8d38bc7271..b25883fd07 100644 --- a/input/test/hara-kiri.ly +++ b/input/test/hara-kiri.ly @@ -1,4 +1,4 @@ -\version "1.0.7"; +\version "1.0.10"; toeter_i = \notes\relative c { \property Staff.instrument = "Toeters" diff --git a/input/test/keys.ly b/input/test/keys.ly index aa12b97e65..323c79ac95 100644 --- a/input/test/keys.ly +++ b/input/test/keys.ly @@ -1,4 +1,4 @@ -\version "1.0.7"; +\version "1.0.10"; %{ test key itemv breaking diff --git a/input/test/knee.ly b/input/test/knee.ly index af9d114128..420573c068 100644 --- a/input/test/knee.ly +++ b/input/test/knee.ly @@ -1,4 +1,4 @@ -\version "1.0.7"; +\version "1.0.10"; \score{ \notes\relative c'{ [c16 \stemdown c'' \stemboth c,, d] diff --git a/input/test/mark.ly b/input/test/mark.ly index e730c90c0a..6f8d82ef61 100644 --- a/input/test/mark.ly +++ b/input/test/mark.ly @@ -1,4 +1,4 @@ -\version "1.0.7"; +\version "1.0.10"; global = \notes { s1 | \mark "A"; diff --git a/input/test/multi-rest.ly b/input/test/multi-rest.ly index ac055ef54f..dda71ded61 100644 --- a/input/test/multi-rest.ly +++ b/input/test/multi-rest.ly @@ -1,4 +1,4 @@ -\version "1.0.7"; +\version "1.0.10"; voice_one = \notes\transpose c' { \stemup R1 * 2 | f'4-. r r2 | R1 * 3 | diff --git a/input/test/ossia.ly b/input/test/ossia.ly index 531b549afa..cbc24d27e4 100644 --- a/input/test/ossia.ly +++ b/input/test/ossia.ly @@ -1,4 +1,4 @@ -\version "1.0.7"; +\version "1.0.10"; \score { diff --git a/input/test/repeat.fly b/input/test/repeat.fly index d96792051a..a41926a8a6 100644 --- a/input/test/repeat.fly +++ b/input/test/repeat.fly @@ -1 +1 @@ -a b c d \repeat 2 { { c c c c d d d d } } \alternative { { e e e e } { e e e g } } c c c c c c c c +a b c d \repeat 2 { { c c c c d d d d e e e e } } \alternative { { e e e e } { e e e g } } c c c c c c c c diff --git a/input/test/score-bar-scripts.ly b/input/test/score-bar-scripts.ly index 72b545bc38..40a9052cce 100644 --- a/input/test/score-bar-scripts.ly +++ b/input/test/score-bar-scripts.ly @@ -1,7 +1,7 @@ -\version "1.0.7"; +\version "1.0.10"; onestaff = \type Staff = foo\notes { \property Staff.instr = instr diff --git a/input/test/sleur.ly b/input/test/sleur.ly index 70f7cfb15a..a402466907 100644 --- a/input/test/sleur.ly +++ b/input/test/sleur.ly @@ -5,7 +5,7 @@ TestedFeatures = "This file tests Feta embedded slurs" + "(Feta definitively is not an abbreviation of Font-En-TjA)"; } -\version "1.0.7"; +\version "1.0.10"; shortlong = \notes{ c4()c( c c | @@ -79,11 +79,11 @@ under = \notes\transpose c'{ eccentric = \notes\transpose c'{ \stemup - \[4/7 f( a' f f f f )f \] | - \[4/7 f( f f f f a' )f \] | + \times 4/7 { f( a' f f f f )f } | + \times 4/7 { f( f f f f a' )f } | \stemdown - \[4/7 e'( c e' e' e' e' )e' \] | - \[4/7 e'( e' e' e' e' c )e' \] | + \times 4/7 { e'( c e' e' e' e' )e' } | + \times 4/7 { e'( e' e' e' e' c )e' } | } tiltup = \notes\transpose c'{ diff --git a/input/test/slur-bug.ly b/input/test/slur-bug.ly index 10cf4bc782..62ffe16ab5 100644 --- a/input/test/slur-bug.ly +++ b/input/test/slur-bug.ly @@ -1,10 +1,10 @@ -\version "1.0.7"; +\version "1.0.10"; % bug % excentric slur can't handle this ... \score{ \notes{ \stemdown - \[4/5c8( c f,, c c\]1/1 c c c )c | + \times 4/5 {c8( c f,, c c} c c c )c | } } diff --git a/input/test/slur-damping.ly b/input/test/slur-damping.ly index 96f89df4c5..d47ac6e85d 100644 --- a/input/test/slur-damping.ly +++ b/input/test/slur-damping.ly @@ -1,5 +1,5 @@ % test damping -\version "1.0.7"; +\version "1.0.10"; \score{ \notes\relative c'{ diff --git a/input/test/slur-swap.ly b/input/test/slur-swap.ly index 1cc9dbc7c4..f52b148953 100644 --- a/input/test/slur-swap.ly +++ b/input/test/slur-swap.ly @@ -1,4 +1,4 @@ -\version "1.0.7"; +\version "1.0.10"; % urg, the direction of the slur gets swapped! \score{ diff --git a/input/test/slurs.ly b/input/test/slurs.ly index 248f64ca9f..51d0ed3429 100644 --- a/input/test/slurs.ly +++ b/input/test/slurs.ly @@ -1,5 +1,5 @@ -\version "1.0.7"; +\version "1.0.10"; \score{ \notes\transpose c'{ diff --git a/input/test/spacing.ly b/input/test/spacing.ly index baf346b551..50a9053fbb 100644 --- a/input/test/spacing.ly +++ b/input/test/spacing.ly @@ -6,7 +6,7 @@ copyright = "public domain"; TestedFeatures = "This file tests various spacings"; } -\version "1.0.7"; +\version "1.0.10"; multipart = \notes{ \type StaffGroup < @@ -21,29 +21,29 @@ multipart = \notes{ [c c] [c c] } { - [2/3 c8 c c]1/1 - [2/3 c c c]1/1 - [2/3c c c]1/1 [2/3c c c]1/1 + \times 2/3 { [ c8 c c] } + \times 2/3 { [ c c c] } + \times 2/3 { [c c c] } \times 2/3 { [c c c] } } { - [2/4 c8 c c c]1/1 - [2/4 c c c c]1/1 - [2/4c c c c]1/1 [2/4c c c c]1/1 + \times 2/4 { [ c8 c c c] } + \times 2/4 { [ c c c c] } + \times 2/4 { [c c c c] } \times 2/4 { [c c c c] } } { - [2/5 c8 c c c c]1/1 - [2/5 c c c c c]1/1 - [2/5c c c c c]1/1 [2/5c c c c c]1/1 + \times 2/5 { [ c8 c c c c] } + \times 2/5 { [ c c c c c] } + \times 2/5 { [c c c c c] } \times 2/5 { [c c c c c] } } { - [2/6c8 c c c c c]1/1 - [2/6c c c c c c]1/1 - [2/6c c c c c c]1/1 [2/6c c c c c c]1/1 + \times 2/6 { [c8 c c c c c] } + \times 2/6 { [c c c c c c] } + \times 2/6 { [c c c c c c] } \times 2/6 { [c c c c c c] } } { - [2/7c8 c c c c c c]1/1 - [2/7c c c c c c c]1/1 - [2/7c c c c c c c]1/1 [2/7c c c c c c c]1/1 + \times 2/7 { [c8 c c c c c c] } + \times 2/7 { [c c c c c c c] } + \times 2/7 { [c c c c c c c] } \times 2/7 { [c c c c c c c] } } > } diff --git a/input/test/star.ly b/input/test/star.ly new file mode 100644 index 0000000000..9ec0ea4a97 --- /dev/null +++ b/input/test/star.ly @@ -0,0 +1,127 @@ +%{ +Converted from star.mup with the aid of mup-to-ly.py +http://www.Arkkra.com/doc/star.html +http://www.Arkkra.com/doc/star.ps +%} +\header{ +title="The Star Spangled Banner"; +subtitle="(The United States National Anthem)"; +poet="Text by Francis Scott Key"; +composer="J. S. Smith"; +arranger="Arranged by William J. Krauss"; +enteredby="jcn"; +copyright="public domain"; +} + +$staff1_voice_1 = \notes { + [a8.()fis16] + \repeat 2 { { d4 fis4 a4 d'2 [fis'8. e'16] d'4 fis4 gis4 a2 [a8 a8] + fis'4. e'8 d'4 cis'2 [b8. cis'16] d'4 d'4 a4 } } + \alternative { { fis4 d4 [a8. fis16] } { fis4 d4 [fis'8. fis'16] } } + fis'4 g'4 a'4 a'2 [g'8 fis'8] e'4 fis'4 + g'4 g'2 g'4 fis'4. e'8 d'4 cis'2 [b8. cis'16] d'4 fis4 gis4 a2 a4 + d'4 d'4 [d'8()cis'8] b4 b4 b4 e'4 [g'8 ()fis'8] [e'8()d'8] + d'4~cis'4 [a8. a16] d'4.~e'8 [fis'8 g'8] a'2 [d'8 e'8] fis'4. g'8 + e'4 d'2 s4 +} + +$staff1_voice_2 = \notes { + [a8.()fis16] + \repeat 2 { { a,4 d4 e4 d4~fis4 [fis8. fis16] fis4 d4 d4 cis2 + [e8 e8] a4. a8 a4 a2 [a8. a16] a4 a4 a4 } } + \alternative { { fis4 d4 [a8. fis16] } { fis4 d4 r4 } } + a4 a4 d'4 d'2 [a8 a8] cis'4 cis'4 cis'4 cis'2 a4 a4. a8 a4 a2 + [a8. a16] d4 d4 d4 cis2 e4 fis4 e4 d4 d4 d4 dis4 g4 [g8()dis8] e4 e2 + [e8. e16] d4.~a8 [a8 a8] a2 [g8 g8] a4. a8 g4 fis2 s4 +} + +$staff2_voice_1 = \notes { + r4 + \repeat 2 { { fis4 a4 a4 b2 [cis'8. cis'16] b4 b4 b4 a2 [cis'8 cis'8] + d'4. cis'8 d'4 e'2 [e'8. e'16] d'4 d'4 a4 } } + \alternative { { fis4 d4 r4 } { fis4 d4 r4 } } + d4 e4 fis4 fis'2 [e'8 d'8] e'4 e'4 e'4 e'2 cis'4 d'4. cis'8 d'4 e'2 + [e'8. e'16] a4 a4 e4 e2 cis'4 a4 a4 a4 g4 g4 b4 b4 b4 b4 a2 + [cis'8. cis'16] a4.~cis'8 [d'8 d'8] d'2 [d'8 d'8] d'4. d'8 cis'4 + a2 s4 +} + +$staff2_voice_2 = \notes { + r4 + \repeat 2 { { d4 d4 cis4 b,2 [ais,8. ais,16] b,4 b,4 e4 a,2 [a8 a8] + d4. e8 [fis8 g8] a2 [g8. g16] fis4 fis4 a4 } } + \alternative { { fis4 d4 r4 } { fis4 d4 r4 } } + d4 d4 d4 d2 [d8 d8] a4 a4 a4 a2 a,4 d4. e8 [fis8 g8] a2 [g8. g16] + fis4 d4 e4 a,2 a4 d4 e4 fis4 g4 g4 fis4 e4 [e8()fis8] [g8()gis8] a2 + [g8. g16] fis4.~a,8 [d8 e8] fis2 [b8 b8] a4. a8 a,4 d2 s4 +} + +$text1 = \lyrics{ + Oh4 __ say. can you see,2 by8. the16 dawn's4 ear- ly light2 What8 + so8 proud-4. ly8 we4 hailed,2 At8. the16 twi-4 light's last gleam- + ing. Whose8. broad16 +} + +$text2 = \lyrics{ + _4 stripes and bright stars,2 through8 the8 per-4 il- ous fight,2 + O'er8 the8 ram-4. parts8 we4 watched,2 were8. so16 gal-4 lant- ly + _ _ _ +} + +$text3 = \lyrics{ + stream-4 ing. And8. the16 rock-4 ets' red glare,2 the8 bombs8 + burst-4 ing in air,2 gave4 proof4. through8 the4 night2 that8. + our16 flag4 was still there,2 Oh4 say, does that star- span- + gled ban- ner yet wave,2 __ O'er8. the16 land2 __ of8 the8 free2 + and8 the8 home4. of8 the4 brave.2 +} + +global = \notes { + \time 3/4; + \key D; + \partial 4; + \skip 4; + \bar "|:"; + \skip 2.*8; + \bar ":|"; + \skip 2.*16; + \skip 2.; + \bar "|."; + } + +\include "paper16.ly"; + +\score{ + \type GrandStaff < + \type Staff=staffA < + \global + \notes \transpose c'' {\voiceone \$staff1_voice_1 } + \notes \transpose c'' {\voicetwo \$staff1_voice_2 } + > + \type Lyrics = one \lyrics < +% urg, too much distance between two texts; fixme first +% \$text1 +% { \$text2 \$text3 } + { \$text1 \$text3 } + > + \type Staff=staffB < + \global + \clef bass; + {\voiceone \$staff2_voice_1 } + {\voicetwo \$staff2_voice_2 } + > + > + \paper{ + \paper_sixteen; + textheight = 230.\mm; + linewidth= 180.\mm; + \translator { + \GrandStaffContext + \accepts "Lyrics"; + } + \translator { + \BarNumberingStaffContext + } + } +} + diff --git a/input/test/stem.ly b/input/test/stem.ly index cf19937c7d..e5aa9b730b 100644 --- a/input/test/stem.ly +++ b/input/test/stem.ly @@ -8,7 +8,7 @@ of beams"; } -\version "1.0.7"; +\version "1.0.10"; beamintervals = \notes{ \time 7/4; diff --git a/input/test/test-lyrics.ly b/input/test/test-lyrics.ly index 01db413dbc..bbeba82c45 100644 --- a/input/test/test-lyrics.ly +++ b/input/test/test-lyrics.ly @@ -1,4 +1,4 @@ -\version "1.0.7"; +\version "1.0.10"; $somewhat_long = \lyrics{ \property Lyrics . textstyle = "roman" diff --git a/input/test/thumb.ly b/input/test/thumb.ly index 7b4a3a3807..c97ce8390d 100644 --- a/input/test/thumb.ly +++ b/input/test/thumb.ly @@ -7,7 +7,7 @@ % the thumb-script is used in cello music to indicate a note that should % be played with your thumb. -\version "1.0.7"; +\version "1.0.10"; \score { \notes \relative c'' { <[ a8_\thumb a'8-3(> <)b_\thumb b'-3> diff --git a/input/test/tie-bug.ly b/input/test/tie-bug.ly index e457a475e4..b6dc33c6de 100644 --- a/input/test/tie-bug.ly +++ b/input/test/tie-bug.ly @@ -1,4 +1,4 @@ -\version "1.0.7"; +\version "1.0.10"; % middle tie is wrong diff --git a/input/test/tie.ly b/input/test/tie.ly index 1d58f5ddcf..84c17e1497 100644 --- a/input/test/tie.ly +++ b/input/test/tie.ly @@ -1,4 +1,4 @@ -\version "1.0.7"; +\version "1.0.10"; tie = \notes\transpose c''{ diff --git a/input/test/title.ly b/input/test/title.ly index ff7c1b24cc..12867630b1 100644 --- a/input/test/title.ly +++ b/input/test/title.ly @@ -10,7 +10,7 @@ source = "urtext"; instrument= "Instrument"; } -\version "1.0.7"; +\version "1.0.10"; \score{ \notes diff --git a/input/test/transposition.ly b/input/test/transposition.ly index 885feb994b..8299b1b5a4 100644 --- a/input/test/transposition.ly +++ b/input/test/transposition.ly @@ -22,7 +22,7 @@ copyright = "public domain"; } -\version "1.0.7"; +\version "1.0.10"; vOne = \notes \relative c''{ \clef"violin"; diff --git a/input/test/vertical-align.ly b/input/test/vertical-align.ly index ae4540940c..0deb793131 100644 --- a/input/test/vertical-align.ly +++ b/input/test/vertical-align.ly @@ -1,5 +1,5 @@ -\version "1.0.7"; +\version "1.0.10"; \score { \notes < diff --git a/input/tril.ly b/input/tril.ly index c2b72bcd57..6a720cb966 100644 --- a/input/tril.ly +++ b/input/tril.ly @@ -5,7 +5,7 @@ TestedFeatures = "This file tests trills" + "(Feta definitively is not an abbreviation of Font-En-TjA)"; } -\version "1.0.7"; +\version "1.0.10"; \score{ \notes{ diff --git a/input/twinkle-pop.ly b/input/twinkle-pop.ly index 46c35973e3..1e95a8d65f 100644 --- a/input/twinkle-pop.ly +++ b/input/twinkle-pop.ly @@ -12,7 +12,7 @@ copyright = "public domain"; Tested Features lyrics and chords %} -\version "1.0.7"; +\version "1.0.10"; melodie = \notes\relative c { \clef"violin"; diff --git a/input/twinkle.ly b/input/twinkle.ly index 1d1520f6af..b1cd29253d 100644 --- a/input/twinkle.ly +++ b/input/twinkle.ly @@ -20,7 +20,7 @@ traditional song in various languages. Tested Features: lyrics, interleaving lyrics and staffs %} -\version "1.0.7"; +\version "1.0.10"; melody = \notes \relative c'' { \clef violin; diff --git a/lily/include/tuplet-spanner.hh b/lily/include/tuplet-spanner.hh index 1a41440aaa..2d97897d5c 100644 --- a/lily/include/tuplet-spanner.hh +++ b/lily/include/tuplet-spanner.hh @@ -18,12 +18,15 @@ public: Plet_spanner (); void add_column (Note_column*); - + void set_beam (Beam*); P tdef_p_; - Link_array column_arr_; - int visibility_i_; - + bool bracket_visibility_b_; + bool num_visibility_b_; + protected: + Beam *beam_l_; + Link_array column_arr_; + virtual Molecule* brew_molecule_p () const; VIRTUAL_COPY_CONS(Score_element); diff --git a/lily/include/volta-spanner.hh b/lily/include/volta-spanner.hh index 18fd91a939..c250189af0 100644 --- a/lily/include/volta-spanner.hh +++ b/lily/include/volta-spanner.hh @@ -18,10 +18,13 @@ class Volta_spanner : public Directional_spanner public: Volta_spanner (); - void add_column (Note_column*); +// void add_column (Note_column*); + void add_column (Bar*); - P tdef_p_; - Link_array column_arr_; + P number_p_; + P dot_p_; +// Link_array column_arr_; + Link_array column_arr_; bool last_b_; protected: diff --git a/lily/parser.yy b/lily/parser.yy index e3622cdf4f..9b27b9a120 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -47,7 +47,7 @@ // mmm Mudela_version oldest_version ("1.0.7"); -Mudela_version version ("1.0.9"); +Mudela_version version ("1.0.10"); // needed for bison.simple's malloc() and free() @@ -782,9 +782,15 @@ Composite_music: delete $2; delete $4; } - | TIMES int '/' int Music { - $$ = new Compressed_music ($2, $4, $5); + | TIMES { + THIS->remember_spot (); + } + /* CONTINUED */ + int '/' int Music + { + $$ = new Compressed_music ($3, $5, $6); + $$->set_spot (THIS->pop_spot ()); } | Repeated_music { $$ = $1; } | Simultaneous_music { $$ = $1; } @@ -806,7 +812,7 @@ Composite_music: { $$ = $3; THIS->lexer_p_->pop_state (); - } + } | relative_music { $$ = $1; } ; diff --git a/lily/repeat-engraver.cc b/lily/repeat-engraver.cc index 110169fa37..f2f2c19e97 100644 --- a/lily/repeat-engraver.cc +++ b/lily/repeat-engraver.cc @@ -16,7 +16,7 @@ #include "repeated-music.hh" #include "time-description.hh" #include "volta-spanner.hh" -#include "note-column.hh" +//#include "note-column.hh" ADD_THIS_TRANSLATOR (Repeat_engraver); @@ -30,17 +30,14 @@ Repeat_engraver::do_try_music (Music* m) if (Repeated_music* r = dynamic_cast (m)) { repeated_music_arr_.push (r); - stop_mom_arr_.push (now_moment () + r->duration ()); - // urg, something broken with alternative time... - //Moment alt_mom = now_moment () + r->repeat_p_->duration (); - Moment alt_mom = now_moment (); + stop_mom_arr_.push (now_moment () + r->repeat_p_->duration () + + r->alternative_p_->music_p_list_p_->top ()->duration ()); + Moment alt_mom = now_moment () + r->repeat_p_->duration (); for (PCursor i (r->alternative_p_->music_p_list_p_->top ()); i.ok (); i++) { alternative_music_arr_.push (i.ptr ()); alternative_start_mom_arr_.push (alt_mom); - // urg, something broken with alternative time... - // alt_mom += i->duration (); - alt_mom += Moment (1); + alt_mom += i->duration (); alternative_stop_mom_arr_.push (alt_mom); } return true; @@ -52,11 +49,12 @@ void Repeat_engraver::acknowledge_element (Score_element_info i) { Moment now = now_moment (); - if (Note_column *nc = dynamic_cast (i.elem_l_)) +// if (Note_column *c = dynamic_cast (i.elem_l_)) + if (Bar *c = dynamic_cast (i.elem_l_)) { for (int i = 0; i < volta_p_arr_.size (); i++) if ((now >= alternative_start_mom_arr_[i]) && volta_p_arr_[i]) - volta_p_arr_[i]->add_column (nc); + volta_p_arr_[i]->add_column (c); } } @@ -81,6 +79,19 @@ Repeat_engraver::do_process_requests () bar_p_arr_.push (bar_p); announce_element (Score_element_info (bar_p, repeated_music_arr_[i])); } +#if 0 //urg, try pre-ceating and announcing + Moment now = now_moment (); + for (int i = 0; i < bar_p_arr_.size (); i++) + { + if (!bar_p_arr_[i] && (now >= stop_mom_arr_[i])) + { + Bar* bar_p = new Bar; + bar_p-> type_str_ = ":|"; + bar_p_arr_[i] = bar_p; + announce_element (Score_element_info (bar_p, repeated_music_arr_[i])); + } + } +#endif int bees = volta_p_arr_.size (); for (int i = volta_p_arr_.size (); i < alternative_music_arr_.size (); i++) { @@ -89,7 +100,7 @@ Repeat_engraver::do_process_requests () v->last_b_ = true; Text_def* t = new Text_def; t->text_str_ = to_str (i - bees + 1); - v->tdef_p_.set_p (t); + v->number_p_.set_p (t); volta_p_arr_.push (v); announce_element (Score_element_info (v, alternative_music_arr_[i])); } @@ -106,6 +117,18 @@ Repeat_engraver::do_pre_move_processing () bar_p_arr_[i] = 0; } } + Moment now = now_moment (); + for (int i = volta_p_arr_.size (); i--; ) + { + if (now >= alternative_stop_mom_arr_[i]) + { + if (volta_p_arr_[i]) + { + typeset_element (volta_p_arr_[i]); + volta_p_arr_[i] = 0; + } + } + } } void @@ -114,6 +137,22 @@ Repeat_engraver::do_post_move_processing () Moment now = now_moment (); for (int i = bar_p_arr_.size (); i--; ) { +#if 0 // urg, try with pre-created and annouced :| + if (now >= stop_mom_arr_[i]) + { + if (bar_p_arr_[i]) + { + typeset_element (bar_p_arr_[i]); + bar_p_arr_.del (i); + stop_mom_arr_.del (i); + repeated_music_arr_.del (i); + } + else + { + bar_p_arr_.del (i); + } + } +#else if (now >= stop_mom_arr_[i]) { Bar* bar_p = new Bar; @@ -123,18 +162,7 @@ Repeat_engraver::do_post_move_processing () stop_mom_arr_.del (i); repeated_music_arr_.del (i); } - } - for (int i = volta_p_arr_.size (); i--; ) - { - //if (now >= alternative_start_mom_arr_[i]) - if (now >= alternative_stop_mom_arr_[i]) - { - if (volta_p_arr_[i]) - { - typeset_element (volta_p_arr_[i]); - volta_p_arr_[i] = 0; - } - } +#endif } } diff --git a/lily/repeated-music-iterator.cc b/lily/repeated-music-iterator.cc index 66180fda76..768a289b8f 100644 --- a/lily/repeated-music-iterator.cc +++ b/lily/repeated-music-iterator.cc @@ -47,19 +47,11 @@ Repeated_music_iterator::do_process_and_next (Moment m) if (!success) music_l_->warning ( _("No one to print a volta bracket")); } - if (repeat_iter_p_->ok ()) + if (repeat_iter_p_ && repeat_iter_p_->ok ()) repeat_iter_p_->process_and_next (m); else - { - if (!alternative_iter_p_) - { - delete repeat_iter_p_; - repeat_iter_p_ = 0; - alternative_iter_p_ = dynamic_cast - (get_iterator_p (repeated_music_l ()->alternative_p_)); - } - alternative_iter_p_->process_and_next (m); - } + alternative_iter_p_->process_and_next (m - + repeated_music_l ()->repeat_p_->duration ()); Music_iterator::do_process_and_next (m); } @@ -69,18 +61,47 @@ Repeated_music_iterator::next_moment () const if (repeat_iter_p_) return repeat_iter_p_->next_moment (); else if (alternative_iter_p_) - return alternative_iter_p_->next_moment (); - return 0; +// return alternative_iter_p_->next_moment (); + return alternative_iter_p_->next_moment () + + repeated_music_l ()->repeat_p_->duration (); +// return 0; + return repeated_music_l ()->repeat_p_->duration (); } bool Repeated_music_iterator::ok () const { +#if 0 if (repeat_iter_p_) return repeat_iter_p_->ok (); else if (alternative_iter_p_) return alternative_iter_p_->ok (); return false; +#elif 0 + if (repeat_iter_p_ && repeat_iter_p_->ok ()) + return true; + else if (!alternative_iter_p_) + return true; + return alternative_iter_p_->ok (); +#else // perhaps iterating stops because we return false on repeat_iter... + if (repeat_iter_p_) + { + if (repeat_iter_p_->ok ()) + return true; + else + { + // urg, we're const + Repeated_music_iterator *urg = (Repeated_music_iterator*)this; + delete urg->repeat_iter_p_; + urg->repeat_iter_p_ = 0; + urg->alternative_iter_p_ = dynamic_cast + (get_iterator_p (repeated_music_l ()->alternative_p_)); + } + } + if (alternative_iter_p_) + return alternative_iter_p_->ok (); + return false; +#endif } Repeated_music* diff --git a/lily/repeated-music.cc b/lily/repeated-music.cc index 8f51eaf519..4f22f72c27 100644 --- a/lily/repeated-music.cc +++ b/lily/repeated-music.cc @@ -29,7 +29,7 @@ Repeated_music::Repeated_music (Repeated_music const& s) { repeat_p_ = (s.repeat_p_) ? s.repeat_p_->clone () : 0; // urg? -// alternative_p_ = (Sequential_music*)(s.alternative_p_) ? s.alternative_p_->clone () : 0; + alternative_p_ = (s.alternative_p_) ? dynamic_cast (s.alternative_p_->clone ()) : 0; } void diff --git a/lily/tuplet-engraver.cc b/lily/tuplet-engraver.cc index ef7c95e233..fc7ab50eed 100644 --- a/lily/tuplet-engraver.cc +++ b/lily/tuplet-engraver.cc @@ -13,6 +13,7 @@ #include "note-column.hh" #include "compressed-music.hh" #include "text-def.hh" +#include "beam.hh" bool Tuplet_engraver::do_try_music (Music *r) @@ -50,6 +51,11 @@ Tuplet_engraver::acknowledge_element (Score_element_info i) for (int j =0; j add_column (nc); } + else if (Beam *b = dynamic_cast (i.elem_l_)) + { + for (int j = 0; j < started_span_p_arr_.size (); j++) + started_span_p_arr_[j]->set_beam (b); + } } void diff --git a/lily/tuplet-spanner.cc b/lily/tuplet-spanner.cc index 0d415a9dc1..a879a6881c 100644 --- a/lily/tuplet-spanner.cc +++ b/lily/tuplet-spanner.cc @@ -5,7 +5,10 @@ (c) 1997--1998 Jan Nieuwenhuizen */ - +/* + todo: handle breaking elegantly. + */ +#include "beam.hh" #include "atom.hh" #include "box.hh" #include "debug.hh" @@ -20,8 +23,9 @@ Plet_spanner::Plet_spanner () { - visibility_i_ = 3; - + bracket_visibility_b_ = true; + num_visibility_b_ = true; + tdef_p_.set_p(new Text_def); tdef_p_->align_dir_ = CENTER; tdef_p_->style_str_ = "italic"; @@ -33,18 +37,27 @@ Plet_spanner::brew_molecule_p () const Molecule* mol_p = new Molecule; if (column_arr_.size ()){ - Real w = width ().length (); - Real dy = column_arr_.top ()->extent (Y_AXIS) [dir_] - - column_arr_[0]->extent (Y_AXIS) [dir_]; - - + Real ncw = column_arr_.top ()->extent (X_AXIS).length (); Atom num (tdef_p_->get_atom (paper (), CENTER)); - num.translate (Offset (w/2, dy/2)); - if (visibility_i_ >= 1) - mol_p->add_atom (num); + if (beam_l_ && !bracket_visibility_b_) + { + num.translate (((Directional_spanner*)beam_l_)->center ()); + num.translate_axis (ncw, X_AXIS); + } + + if (bracket_visibility_b_) + { + Real dy = column_arr_.top ()->extent (Y_AXIS) [dir_] + - column_arr_[0]->extent (Y_AXIS) [dir_]; + Real w = width ().length () + ncw; + + num.translate (Offset (w/2, dy/2)); + mol_p->add_atom (lookup_l ()->plet (dy, w, dir_)); + } - mol_p->add_atom (lookup_l ()->plet (dy, w, dir_)); + if (num_visibility_b_) + mol_p->add_atom (num); } return mol_p; } @@ -54,7 +67,6 @@ Plet_spanner::do_add_processing () { if (column_arr_.size ()) { - set_bounds (LEFT, column_arr_[0]); set_bounds (RIGHT, column_arr_.top ()); } @@ -63,8 +75,16 @@ Plet_spanner::do_add_processing () void Plet_spanner::do_post_processing () { - if (column_arr_.size()) - translate_axis (column_arr_[0]->extent (Y_AXIS)[dir_], Y_AXIS); + if (column_arr_.size()) + translate_axis (column_arr_[0]->extent (Y_AXIS)[dir_], Y_AXIS); + + if (!broken_into_l_arr_.size () && beam_l_ + && spanned_drul_[LEFT]->column_l () == beam_l_->spanned_drul_[LEFT]->column_l () + && spanned_drul_[RIGHT]->column_l () == beam_l_->spanned_drul_[RIGHT]->column_l ()) + bracket_visibility_b_ = false; + + if (column_arr_.size () == 1) + bracket_visibility_b_ = false; } void @@ -72,6 +92,11 @@ Plet_spanner::do_substitute_dependency (Score_element* o, Score_element* n) { if (Note_column *onc = dynamic_cast (o)) column_arr_.substitute (onc, dynamic_cast (n)); + else if (Beam *b = dynamic_cast (o)) + { + if (b == beam_l_) + beam_l_ = dynamic_cast (n); + } } void @@ -88,6 +113,12 @@ Plet_spanner::set_default_dir () } } +void +Plet_spanner::set_beam (Beam *b) +{ + beam_l_ = b; + add_dependency (b); +} void Plet_spanner::add_column (Note_column*n) diff --git a/lily/volta-spanner.cc b/lily/volta-spanner.cc index 884f8c9dd2..86a16e1c32 100644 --- a/lily/volta-spanner.cc +++ b/lily/volta-spanner.cc @@ -11,7 +11,9 @@ #include "debug.hh" #include "lookup.hh" #include "molecule.hh" -#include "note-column.hh" +//#include "note-column.hh" +#include "p-col.hh" // urg +#include "bar.hh" #include "p-col.hh" #include "paper-def.hh" #include "volta-spanner.hh" @@ -27,9 +29,10 @@ Volta_spanner::Volta_spanner () { dir_ = UP; last_b_ = false; - tdef_p_.set_p (new Text_def); - tdef_p_->align_dir_ = CENTER; - tdef_p_->style_str_ = "nummer"; + number_p_.set_p (new Text_def); + number_p_->align_dir_ = LEFT; + dot_p_.set_p (new Text_def); + dot_p_->align_dir_ = LEFT; } Molecule* @@ -38,13 +41,25 @@ Volta_spanner::brew_molecule_p () const Molecule* mol_p = new Molecule; if (column_arr_.size ()){ - Real w = width ().length (); - Real dy = column_arr_.top ()->extent (Y_AXIS) [dir_] - - column_arr_[0]->extent (Y_AXIS) [dir_]; + Real dx = paper ()->internote_f (); + Real w = width ().length () - 2 * dx; + Real dy = column_arr_.top ()->extent (Y_AXIS) [dir_] > + column_arr_[0]->extent (Y_AXIS) [dir_]; + dy += 4; - Atom num (tdef_p_->get_atom (paper (), CENTER)); + Atom num (number_p_->get_atom (paper (), LEFT)); + Atom dot (dot_p_->get_atom (paper (), LEFT)); + Real gap = num.dim_.x ().length () / 2; + Offset off (num.dim_.x ().length () + gap, + num.dim_.y ().length () - 4 - gap / paper ()->internote_f ()); + // urg? + off -= Offset (0, num.dim_.y ().length () + gap / paper ()->internote_f ()); + num.translate (off); + dot.translate (off); mol_p->add_atom (num); + mol_p->add_atom (dot); mol_p->add_atom (lookup_l ()->volta (w, last_b_)); + mol_p->translate (Offset (dx, dy)); } return mol_p; } @@ -57,6 +72,9 @@ Volta_spanner::do_add_processing () set_bounds (LEFT, column_arr_[0]); set_bounds (RIGHT, column_arr_.top ()); } + number_p_->style_str_ = "number-1"; + dot_p_->text_str_ = "."; + dot_p_->style_str_ = "bold"; } void @@ -69,14 +87,17 @@ Volta_spanner::do_post_processing () void Volta_spanner::do_substitute_dependency (Score_element* o, Score_element* n) { - if (Note_column *onc = dynamic_cast (o)) - column_arr_.substitute (onc, dynamic_cast (n)); +// if (Note_column* c = dynamic_cast (o)) +// column_arr_.substitute (c, dynamic_cast (n)); + if (Bar* c = dynamic_cast (o)) + column_arr_.substitute (c, dynamic_cast (n)); } void -Volta_spanner::add_column (Note_column*n) +//Volta_spanner::add_column (Note_column* c) +Volta_spanner::add_column (Bar* c) { - column_arr_.push (n); - add_dependency (n); + column_arr_.push (c); + add_dependency (c); } diff --git a/make/out/lelievijver.lsm b/make/out/lelievijver.lsm index 5fcc48547d..189b87152a 100644 --- a/make/out/lelievijver.lsm +++ b/make/out/lelievijver.lsm @@ -1,15 +1,15 @@ Begin3 Titel: LilyPond -Versie: 1.1.7 -Inschrijf datum: 18NOV98 +Versie: 1.1.8 +Inschrijf datum: 20NOV98 Beschrijving: @FLAPTEKST@ Trefwoorden: muziek typezetten midi notatie Auteur: hanwen@stack.nl (Han-Wen Nienhuys) janneke@gnu.org (Jan Nieuwenhuizen) Onderhouden door: hanwen@cs.ruu.nl (Han-Wen Nienhuys) Voornaamste plek: sunsite.unc.edu /pub/Linux/apps - 770k lilypond-1.1.7.tar.gz + 770k lilypond-1.1.8.tar.gz Oorspronkelijke plek: ftp.cs.uu.nl /pub/GNU/LilyPond/development/ - 770k lilypond-1.1.7.tar.gz + 770k lilypond-1.1.8.tar.gz Copi-eer voorwaarden: GPL End diff --git a/make/out/lilypond.lsm b/make/out/lilypond.lsm index d845697099..561e535c6a 100644 --- a/make/out/lilypond.lsm +++ b/make/out/lilypond.lsm @@ -1,7 +1,7 @@ Begin3 Title: LilyPond -Version: 1.1.7 -Entered-date: 18NOV98 +Version: 1.1.8 +Entered-date: 20NOV98 Description: LilyPond is the GNU Project music typesetter. This program can print beautiful sheet music from a music definition file. It can also play @@ -14,8 +14,8 @@ Author: hanwen@cs.ruu.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 - 770k lilypond-1.1.7.tar.gz + 770k lilypond-1.1.8.tar.gz Original-site: ftp.cs.uu.nl /pub/GNU/LilyPond/development/ - 770k lilypond-1.1.7.tar.gz + 770k lilypond-1.1.8.tar.gz Copying-policy: GPL End diff --git a/make/out/lilypond.spec b/make/out/lilypond.spec index 298014b9e2..de3bac4d87 100644 --- a/make/out/lilypond.spec +++ b/make/out/lilypond.spec @@ -1,9 +1,9 @@ Name: lilypond -Version: 1.1.7 +Version: 1.1.8 Release: 1 Copyright: GPL Group: Applications/Publishing -Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.1.7.tar.gz +Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.1.8.tar.gz Summary: A program for printing sheet music. URL: http://www.cs.uu.nl/~hanwen/lilypond Packager: Han-Wen Nienhuys diff --git a/mudela-mode.el b/mudela-mode.el index ed33b67493..3d949865fa 100644 --- a/mudela-mode.el +++ b/mudela-mode.el @@ -39,7 +39,7 @@ "notenames" "octave" "output" "partial" "paper" "plet" "property" "pt" "shape" "relative" "include" "score" "scm" "scmfile" - "script" "skip" "table" "spandynamic" "symboltables" + "script" "skip" "table" "times" "spandynamic" "symboltables" "tempo" "texid" "textstyle" "transpose" "version" "grouping" )) (kwregex (mapconcat (lambda (x) (concat "\\\\" x)) keywords "\\|"))) @@ -98,8 +98,8 @@ (mapcar (function (lambda (x) (modify-syntax-entry (car x) (cdr x) mu-mode-syntax-table))) - '(( ?\( . "()" ) ( ?\) . ")(" ) - ( ?\[ . "(]" ) ( ?\] . ")[" ) + '(( ?\( . "." ) ( ?\) . "." ) + ( ?\[ . "." ) ( ?\] . "." ) ( ?\{ . "(}" ) ( ?\} . "){" ) ( ?\< . "(>" )( ?\> . ")>") ( ?\$ . "." ) ( ?\% . "." ) ( ?\& . "." ) diff --git a/mutopia/Coriolan/bassi-part.ly b/mutopia/Coriolan/bassi-part.ly index c0ba5963d3..af898f6404 100644 --- a/mutopia/Coriolan/bassi-part.ly +++ b/mutopia/Coriolan/bassi-part.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.0.7"; +\version "1.0.10"; \include "global.ly" \include "violoncello.ly" diff --git a/mutopia/Coriolan/clarinetti-part.ly b/mutopia/Coriolan/clarinetti-part.ly index 92fe5ab01a..45409ae85e 100644 --- a/mutopia/Coriolan/clarinetti-part.ly +++ b/mutopia/Coriolan/clarinetti-part.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.0.7"; +\version "1.0.10"; \include "global.ly" \include "clarinetti.ly" diff --git a/mutopia/Coriolan/clarinetti.ly b/mutopia/Coriolan/clarinetti.ly index cc1feb679c..f6e3f6a4cb 100644 --- a/mutopia/Coriolan/clarinetti.ly +++ b/mutopia/Coriolan/clarinetti.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.0.7"; +\version "1.0.10"; \include "clarinetto-1.ly" \include "clarinetto-2.ly" diff --git a/mutopia/Coriolan/clarinetto-1.ly b/mutopia/Coriolan/clarinetto-1.ly index 988a069d3c..4f701016ab 100644 --- a/mutopia/Coriolan/clarinetto-1.ly +++ b/mutopia/Coriolan/clarinetto-1.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.0.7"; +\version "1.0.10"; clarinetto1 = \notes \relative c { R1 *2 | d''4-.\ff r r2 | R1 *3 | e4-. r r2 | R1 *3 | diff --git a/mutopia/Coriolan/clarinetto-2.ly b/mutopia/Coriolan/clarinetto-2.ly index 005c59f809..55c562baa8 100644 --- a/mutopia/Coriolan/clarinetto-2.ly +++ b/mutopia/Coriolan/clarinetto-2.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.0.7"; +\version "1.0.10"; clarinetto2 = \notes \relative c { R1*2 bes''4-.\ff r r2 | R1*3 | cis4-. r r2 | R1 *3 | diff --git a/mutopia/Coriolan/contrabasso-part.ly b/mutopia/Coriolan/contrabasso-part.ly index c3477f67ba..b496c49bc8 100644 --- a/mutopia/Coriolan/contrabasso-part.ly +++ b/mutopia/Coriolan/contrabasso-part.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.0.7"; +\version "1.0.10"; \include "global.ly" \include "contrabasso.ly" diff --git a/mutopia/Coriolan/contrabasso.ly b/mutopia/Coriolan/contrabasso.ly index 5d1219670a..8458436588 100644 --- a/mutopia/Coriolan/contrabasso.ly +++ b/mutopia/Coriolan/contrabasso.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.0.7"; +\version "1.0.10"; contrabasso = \notes \relative c { % \translator Staff=violoncello diff --git a/mutopia/Coriolan/coriolan.ly b/mutopia/Coriolan/coriolan.ly index 0f2537d2f5..56dba64710 100644 --- a/mutopia/Coriolan/coriolan.ly +++ b/mutopia/Coriolan/coriolan.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.0.7"; +\version "1.0.10"; \include "global.ly" diff --git a/mutopia/Coriolan/corni-part.ly b/mutopia/Coriolan/corni-part.ly index 666e6a32ec..f0d3b0ab50 100644 --- a/mutopia/Coriolan/corni-part.ly +++ b/mutopia/Coriolan/corni-part.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.0.7"; +\version "1.0.10"; \include "global.ly" \include "corni.ly" diff --git a/mutopia/Coriolan/corni.ly b/mutopia/Coriolan/corni.ly index bc65252b22..8996b9c76c 100644 --- a/mutopia/Coriolan/corni.ly +++ b/mutopia/Coriolan/corni.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.0.7"; +\version "1.0.10"; \include "corno-1.ly" \include "corno-2.ly" diff --git a/mutopia/Coriolan/corno-1.ly b/mutopia/Coriolan/corno-1.ly index 212c2a5664..903812a0e7 100644 --- a/mutopia/Coriolan/corno-1.ly +++ b/mutopia/Coriolan/corno-1.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.0.7"; +\version "1.0.10"; corno1 = \notes \relative c { R1 *2 | f''4-.\ff r r2 | R1 *3 | f4-. r r2 | R1 *3 | diff --git a/mutopia/Coriolan/corno-2.ly b/mutopia/Coriolan/corno-2.ly index 01c1dc60eb..f2f941838a 100644 --- a/mutopia/Coriolan/corno-2.ly +++ b/mutopia/Coriolan/corno-2.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.0.7"; +\version "1.0.10"; corno2 = \notes \relative c { R1 *2 | d''4-.\ff r r2 | R1 *3 | d4-. r r2 | R1 *3 | diff --git a/mutopia/Coriolan/fagotti-part.ly b/mutopia/Coriolan/fagotti-part.ly index 3422f0d0a2..0e7ab52fa3 100644 --- a/mutopia/Coriolan/fagotti-part.ly +++ b/mutopia/Coriolan/fagotti-part.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.0.7"; +\version "1.0.10"; \include "global.ly" \include "fagotti.ly" diff --git a/mutopia/Coriolan/fagotti.ly b/mutopia/Coriolan/fagotti.ly index ebcbade8ab..a5f7199c29 100644 --- a/mutopia/Coriolan/fagotti.ly +++ b/mutopia/Coriolan/fagotti.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.0.7"; +\version "1.0.10"; \include "fagotto-1.ly" \include "fagotto-2.ly" diff --git a/mutopia/Coriolan/fagotto-1.ly b/mutopia/Coriolan/fagotto-1.ly index 50e40a3a76..7bdf0f1217 100644 --- a/mutopia/Coriolan/fagotto-1.ly +++ b/mutopia/Coriolan/fagotto-1.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.0.7"; +\version "1.0.10"; fagotto1 = \notes \relative c { R1 *2 | as'4-.\ff r r2 | R1 *3 | as4-. r r2 | R1 *3 | diff --git a/mutopia/Coriolan/fagotto-2.ly b/mutopia/Coriolan/fagotto-2.ly index 0a5fd2f68d..f8d9e16c73 100644 --- a/mutopia/Coriolan/fagotto-2.ly +++ b/mutopia/Coriolan/fagotto-2.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.0.7"; +\version "1.0.10"; fagotto2 = \notes \relative c { R1 *2 | f4-.\ff r r2 | R1 *3 | f4-. r r2 | R1 *3 | diff --git a/mutopia/Coriolan/flauti-part.ly b/mutopia/Coriolan/flauti-part.ly index 754bb2b315..74b79ab978 100644 --- a/mutopia/Coriolan/flauti-part.ly +++ b/mutopia/Coriolan/flauti-part.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.0.7"; +\version "1.0.10"; \include "global.ly" \include "flauti.ly" diff --git a/mutopia/Coriolan/flauti.ly b/mutopia/Coriolan/flauti.ly index 67cc15c87c..4424e0639c 100644 --- a/mutopia/Coriolan/flauti.ly +++ b/mutopia/Coriolan/flauti.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.0.7"; +\version "1.0.10"; \include "flauto-1.ly" \include "flauto-2.ly" diff --git a/mutopia/Coriolan/flauto-1.ly b/mutopia/Coriolan/flauto-1.ly index 7e52551264..2d590d84cd 100644 --- a/mutopia/Coriolan/flauto-1.ly +++ b/mutopia/Coriolan/flauto-1.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.0.7"; +\version "1.0.10"; flauto1 = \notes \relative c { R1 *2 | c'''4-.\ff r r2 | R1 *3 | d4-. r r2 | R1 *3 | diff --git a/mutopia/Coriolan/flauto-2.ly b/mutopia/Coriolan/flauto-2.ly index 8f88c1b485..daf8cbd7da 100644 --- a/mutopia/Coriolan/flauto-2.ly +++ b/mutopia/Coriolan/flauto-2.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.0.7"; +\version "1.0.10"; flauto2 = \notes \relative c { R1 *2 | as'''4-.\ff r r2 | R1 *3 | b4-. r r2 | R1 *3 | diff --git a/mutopia/Coriolan/global.ly b/mutopia/Coriolan/global.ly index 4ab55109e9..451210d76b 100644 --- a/mutopia/Coriolan/global.ly +++ b/mutopia/Coriolan/global.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.0.7"; +\version "1.0.10"; global = \notes { \time 4/4; diff --git a/mutopia/Coriolan/oboe-1.ly b/mutopia/Coriolan/oboe-1.ly index 34eae359ec..22d402bdb0 100644 --- a/mutopia/Coriolan/oboe-1.ly +++ b/mutopia/Coriolan/oboe-1.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.0.7"; +\version "1.0.10"; oboe1 = \notes \relative c'' { R1 *2 | as'4-.\ff r r2 | R1 *3 | as4-. r r2 | R1 *3 | diff --git a/mutopia/Coriolan/oboe-2.ly b/mutopia/Coriolan/oboe-2.ly index 336bddb6ed..869a894afc 100644 --- a/mutopia/Coriolan/oboe-2.ly +++ b/mutopia/Coriolan/oboe-2.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.0.7"; +\version "1.0.10"; oboe2 = \notes \relative c{ R1 *2| f''4-.\ff r r2 | R1 *3 | f4-. r r2 | R1 *3 | diff --git a/mutopia/Coriolan/oboi-part.ly b/mutopia/Coriolan/oboi-part.ly index a590de0fcd..3f4cae703b 100644 --- a/mutopia/Coriolan/oboi-part.ly +++ b/mutopia/Coriolan/oboi-part.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.0.7"; +\version "1.0.10"; \include "global.ly" \include "oboi.ly" diff --git a/mutopia/Coriolan/oboi.ly b/mutopia/Coriolan/oboi.ly index 7975c8e45e..d2fab53cd4 100644 --- a/mutopia/Coriolan/oboi.ly +++ b/mutopia/Coriolan/oboi.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.0.7"; +\version "1.0.10"; \include "oboe-1.ly" \include "oboe-2.ly" diff --git a/mutopia/Coriolan/timpani.ly b/mutopia/Coriolan/timpani.ly index d9542bf679..f167114441 100644 --- a/mutopia/Coriolan/timpani.ly +++ b/mutopia/Coriolan/timpani.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.0.7"; +\version "1.0.10"; timpani = \notes \relative c { R1 *2 | c4-.\ff r r2 | R1 *3 | c4-. r r2 | R1 *3 | diff --git a/mutopia/Coriolan/trombe-part.ly b/mutopia/Coriolan/trombe-part.ly index 88ef92f509..c046c65f52 100644 --- a/mutopia/Coriolan/trombe-part.ly +++ b/mutopia/Coriolan/trombe-part.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.0.7"; +\version "1.0.10"; \include "global.ly" \include "trombe.ly" diff --git a/mutopia/Coriolan/trombe.ly b/mutopia/Coriolan/trombe.ly index 3442f8eba7..e5f3656279 100644 --- a/mutopia/Coriolan/trombe.ly +++ b/mutopia/Coriolan/trombe.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.0.7"; +\version "1.0.10"; \include "trombo-1.ly" \include "trombo-2.ly" diff --git a/mutopia/Coriolan/trombo-1.ly b/mutopia/Coriolan/trombo-1.ly index 5ea884c1ea..a33ffe7138 100644 --- a/mutopia/Coriolan/trombo-1.ly +++ b/mutopia/Coriolan/trombo-1.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.0.7"; +\version "1.0.10"; trombo1 = \notes \relative c { R1 *2 | c''4-.\ff r r2 | R1 *3 | c4-. r r2 | R1 *3 | diff --git a/mutopia/Coriolan/trombo-2.ly b/mutopia/Coriolan/trombo-2.ly index dd034f7999..4c0887ee62 100644 --- a/mutopia/Coriolan/trombo-2.ly +++ b/mutopia/Coriolan/trombo-2.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.0.7"; +\version "1.0.10"; trombo2 = \notes \relative c { R1 *2 | c'4-.\ff r r2 | R1 *3 | c4-. r r2 | R1 *3 | diff --git a/mutopia/Coriolan/viola-1.ly b/mutopia/Coriolan/viola-1.ly index 324bbd557f..ab83e56693 100644 --- a/mutopia/Coriolan/viola-1.ly +++ b/mutopia/Coriolan/viola-1.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.0.7"; +\version "1.0.10"; viola1 = \notes \relative c { \type Voice=one diff --git a/mutopia/Coriolan/viola-2.ly b/mutopia/Coriolan/viola-2.ly index 3a5f23d680..ed02415a57 100644 --- a/mutopia/Coriolan/viola-2.ly +++ b/mutopia/Coriolan/viola-2.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.0.7"; +\version "1.0.10"; viola2 = \notes \relative c { % starts on (actualy, most part is on) same staff as viola1 diff --git a/mutopia/Coriolan/viola-part.ly b/mutopia/Coriolan/viola-part.ly index f565164a83..4db1c2cd01 100644 --- a/mutopia/Coriolan/viola-part.ly +++ b/mutopia/Coriolan/viola-part.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.0.7"; +\version "1.0.10"; \include "global.ly" \include "viola-1.ly" diff --git a/mutopia/Coriolan/violino-1-part.ly b/mutopia/Coriolan/violino-1-part.ly index e4dfecca15..5e5dbed0de 100644 --- a/mutopia/Coriolan/violino-1-part.ly +++ b/mutopia/Coriolan/violino-1-part.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.0.7"; +\version "1.0.10"; \include "global.ly" \include "violino-1.ly" diff --git a/mutopia/Coriolan/violino-1.ly b/mutopia/Coriolan/violino-1.ly index 93da1ca224..14196cc240 100644 --- a/mutopia/Coriolan/violino-1.ly +++ b/mutopia/Coriolan/violino-1.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.0.7"; +\version "1.0.10"; violino1 = \notes \relative c { c'1\ff ~ | c | r r2 | R1 | diff --git a/mutopia/Coriolan/violino-2-part.ly b/mutopia/Coriolan/violino-2-part.ly index eaebc74b0a..3860a45c60 100644 --- a/mutopia/Coriolan/violino-2-part.ly +++ b/mutopia/Coriolan/violino-2-part.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.0.7"; +\version "1.0.10"; \include "global.ly" \include "violino-2.ly" diff --git a/mutopia/Coriolan/violino-2.ly b/mutopia/Coriolan/violino-2.ly index 6c0f9e069b..cb2097cdb8 100644 --- a/mutopia/Coriolan/violino-2.ly +++ b/mutopia/Coriolan/violino-2.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.0.7"; +\version "1.0.10"; violino2 = \notes \relative c { c'1\ff ~ | c | r r2 | R1 | diff --git a/mutopia/Coriolan/violoncello-part.ly b/mutopia/Coriolan/violoncello-part.ly index c382f9943f..0bfc69ad26 100644 --- a/mutopia/Coriolan/violoncello-part.ly +++ b/mutopia/Coriolan/violoncello-part.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.0.7"; +\version "1.0.10"; \include "global.ly" \include "violoncello.ly" diff --git a/mutopia/Coriolan/violoncello.ly b/mutopia/Coriolan/violoncello.ly index 893da283d0..634f07d699 100644 --- a/mutopia/Coriolan/violoncello.ly +++ b/mutopia/Coriolan/violoncello.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.0.7"; +\version "1.0.10"; violoncello = \notes \relative c { c1\ff ~ | c | f,4-. r r2 | r1 | c'1\ff ~ | c | f,4-. r r2 | @@ -290,7 +290,7 @@ violoncello = \notes \relative c { es4-. e-. r2 | f,4-. g-. r2 | as4-"dim." r b r | R1 | c4 r r2 R1 | g4-"pizz." r r2 | R1 | c4 r r2 | [c8-.-"arco" es-.][es()d][d-. as'-.][as()g] | R1 - \[/3 c,4-"sempre pi\\`u piano" ( es c ~ \] \[/3 c as' )g \] | + \times 2/3 { c,4-"sempre pi\\`u piano" ( es c ~ } \times 2/3 { c as' )g } | r2 r4 c,( | es2. ) d4 | r2 r4 d( | as'2. )g4 ~ | g1 ( | %305 es | )d( | )as'\> ~ | as ~ | as2.()\!g4 | c,\pp r r2 | R1 | diff --git a/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Allemande.ly b/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Allemande.ly index 6a9d46309a..1da2114156 100644 --- a/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Allemande.ly +++ b/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Allemande.ly @@ -4,7 +4,7 @@ piece = "Allemande"; } -\version "1.0.7"; +\version "1.0.10"; global = \notes{ \time 4/4; diff --git a/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Capriccio.ly b/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Capriccio.ly index 733812eea8..cddc7bfacf 100644 --- a/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Capriccio.ly +++ b/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Capriccio.ly @@ -10,7 +10,7 @@ %% %% Noe liknende skjer også i mellom andre og tredje stemme i takt 28 -\version "1.0.7"; +\version "1.0.10"; global = \notes{ \time 2/4; diff --git a/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Sinfonia.ly b/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Sinfonia.ly index 003e2f4c8f..d0c682e8cf 100644 --- a/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Sinfonia.ly +++ b/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Sinfonia.ly @@ -10,7 +10,7 @@ copyright = "Public Domain"; } -\version "1.0.7"; +\version "1.0.10"; global = \notes { \time 4/4; @@ -133,7 +133,7 @@ andanteEn = \notes\relative c''{ %28 [bes'8-\fermata~ bes32 a g fis] [g bes a g fis e d c] [bes d c es d g fis e] [d c bes a bes d bes g] | - r16 [e'32 fis fis16.-\prall \[2/3 e64 fis g\]1/1 ] + r16 [e'32 fis fis16.-\prall \times 2/3 { e64 fis g] } \type Staff < { \stemup [bes,32 a g fis g32 bes16.~] [bes16 c32 bes a bes c a] [fis8. g16] } diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly index 116a6b1a2b..d469868bbd 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly @@ -12,7 +12,7 @@ enteredby = "jcn"; copyright = "public domain"; } -\version "1.0.7"; +\version "1.0.10"; one = \notes\relative c { \property Voice . textstyle = "italic" diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly index 75cd4a6db3..ae31ddfb02 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly @@ -10,7 +10,7 @@ enteredby = "jcn"; copyright = "public domain"; } -\version "1.0.7"; +\version "1.0.10"; one = \notes\relative c{ \property Voice . textstyle = "italic" r8\mf [c'-1( e-2 g-4] [e-2 c-1 bes'-5 g-3] | diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly index 35ee6bbeef..1f7f612113 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly @@ -8,7 +8,7 @@ composer = "Johann Sebastian Bach (1685-1750)"; enteredby = "jcn"; copyright = "public domain"; } -\version "1.0.7"; +\version "1.0.10"; one = \notes\relative c{ \property Voice . textstyle = "italic" diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly index 9cca66e1eb..605d3214ca 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly @@ -8,7 +8,7 @@ composer = "Johann Sebastian Bach (1685-1750)"; enteredby = "jcn"; copyright = "public domain"; } -\version "1.0.7"; +\version "1.0.10"; one = \notes\relative c{ diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly index ff3f180446..8d01b0f20a 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly @@ -8,7 +8,7 @@ composer = "Johann Sebastian Bach (1685-1750)"; enteredby = "jcn"; copyright = "public domain"; } -\version "1.0.7"; +\version "1.0.10"; one = \notes\relative c{ diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-cello.ly index c2c7499f9a..d24f8c4061 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-cello.ly @@ -15,7 +15,7 @@ copyright = "public domain"; dotted slurs %} -\version "1.0.7"; +\version "1.0.10"; \include "allemande-urtext.ly"; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-viola.ly index dc360baa91..624080a800 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-viola.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-viola.ly @@ -15,7 +15,7 @@ copyright = "public domain"; dotted slurs %} -\version "1.0.7"; +\version "1.0.10"; \include "allemande-urtext.ly"; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-cello.ly index 74d7c1a6d7..6747c7ac74 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-cello.ly @@ -15,7 +15,7 @@ copyright = "public domain"; dotted slurs %} -\version "1.0.7"; +\version "1.0.10"; \include "courante-urtext.ly"; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-viola.ly index 1d87f2507b..44eccf6910 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-viola.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-viola.ly @@ -15,7 +15,7 @@ copyright = "public domain"; dotted slurs %} -\version "1.0.7"; +\version "1.0.10"; \include "courante-urtext.ly"; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-cello.ly index 873561a58e..485c2fad5b 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-cello.ly @@ -15,7 +15,7 @@ copyright = "public domain"; dotted slurs %} -\version "1.0.7"; +\version "1.0.10"; \include "gigue-urtext.ly"; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-viola.ly index d8df62596e..e8bdd26031 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-viola.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-viola.ly @@ -15,7 +15,7 @@ copyright = "public domain"; dotted slurs %} -\version "1.0.7"; +\version "1.0.10"; \include "gigue-urtext.ly"; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly index 0c51f33c0a..29852a2f32 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly @@ -16,7 +16,7 @@ copyright = "public domain"; dotted slurs %} -\version "1.0.7"; +\version "1.0.10"; \include "menuetto-urtext.ly"; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly index f3f8547a58..b00f4aafd2 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly @@ -17,7 +17,7 @@ copyright = "public domain"; dotted slurs %} -\version "1.0.7"; +\version "1.0.10"; \include "menuetto-urtext.ly"; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-cello.ly index d6da16538f..205cef71ad 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-cello.ly @@ -15,7 +15,7 @@ copyright = "public domain"; dotted slurs %} -\version "1.0.7"; +\version "1.0.10"; \include "prelude-urtext.ly"; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-viola.ly index e8711cf72a..e31dac216f 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-viola.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-viola.ly @@ -15,7 +15,7 @@ copyright = "public domain"; dotted slurs %} -\version "1.0.7"; +\version "1.0.10"; \include "prelude-urtext.ly"; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-cello.ly index ad27e7ad6e..e26b37f593 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-cello.ly @@ -15,7 +15,7 @@ copyright = "public domain"; dotted slurs %} -\version "1.0.7"; +\version "1.0.10"; \include "sarabande-urtext.ly"; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-viola.ly index 8dbe3f31a0..91a0f23c61 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-viola.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-viola.ly @@ -15,7 +15,7 @@ copyright = "public domain"; dotted slurs %} -\version "1.0.7"; +\version "1.0.10"; \include "sarabande-urtext.ly"; diff --git a/mutopia/J.S.Bach/wtk1-fugue1.ly b/mutopia/J.S.Bach/wtk1-fugue1.ly index 2710105ec8..cf291e628c 100644 --- a/mutopia/J.S.Bach/wtk1-fugue1.ly +++ b/mutopia/J.S.Bach/wtk1-fugue1.ly @@ -11,7 +11,7 @@ copyright = "Public Domain"; %{ %} -\version "1.0.7"; +\version "1.0.10"; global = diff --git a/mutopia/J.S.Bach/wtk1-fugue2.ly b/mutopia/J.S.Bach/wtk1-fugue2.ly index 8dc78543e7..d17f35b344 100644 --- a/mutopia/J.S.Bach/wtk1-fugue2.ly +++ b/mutopia/J.S.Bach/wtk1-fugue2.ly @@ -13,7 +13,7 @@ Tested Features: stem direction, multivoice, forced accidentals. %} -\version "1.0.7"; +\version "1.0.10"; \include "nederlands.ly" % for correct parsing of note names diff --git a/mutopia/J.S.Bach/wtk1-prelude1.ly b/mutopia/J.S.Bach/wtk1-prelude1.ly index 5e2354a7c1..7265e4fb11 100644 --- a/mutopia/J.S.Bach/wtk1-prelude1.ly +++ b/mutopia/J.S.Bach/wtk1-prelude1.ly @@ -8,7 +8,7 @@ enteredby = "Shay Rojansky"; copyright = "Public Domain"; } -\version "1.0.7"; +\version "1.0.10"; global = \notes { diff --git a/mutopia/W.A.Mozart/cadenza.ly b/mutopia/W.A.Mozart/cadenza.ly index 7e7353ebf2..5367473c2a 100644 --- a/mutopia/W.A.Mozart/cadenza.ly +++ b/mutopia/W.A.Mozart/cadenza.ly @@ -13,7 +13,7 @@ Tested Features: cadenza mode Ugh.. Wish we had grace notes.... It adds another dimension to this piece of music. %} -\version "1.0.7"; +\version "1.0.10"; cad = \notes \relative c' { @@ -46,7 +46,7 @@ cad = \notes \relative c' { [d16 cis d e] f4() [f16 e d c] b4-\turn - [2/3 d8 c8 a8]1/1 + \times 2/3 { [ d8 c8 a8] } g2 \bar "" ; [g16 c, e g] [c e, g c] diff --git a/mutopia/W.A.Mozart/horn-concerto-3.ly b/mutopia/W.A.Mozart/horn-concerto-3.ly index f5b7f92c1d..537ef2a27d 100644 --- a/mutopia/W.A.Mozart/horn-concerto-3.ly +++ b/mutopia/W.A.Mozart/horn-concerto-3.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.0.7"; +\version "1.0.10"; allegro = \notes @@ -129,10 +129,10 @@ allegro = c4 r r2 r1 | % mark H - [/3 c8 ()b a ]/1 [/3 g a b]/1 [/3 c d e]/1 [/3 f()e d]/1 | - [/3 c () b a ]/1 [/3 g a b]/1 [/3 c d e]/1 [/3 f()e d]/1| - c4 \[/3 r8 [g'()e]\]/1 c4 \[/3 r8 [e () c]\]/1 | - g4 \[/3 r8 [c8() g] \]/1 [/3 e ()g e]/1 [/3c ()e c]/1| + \times 2/3 { [ c8 ()b a ] } \times 2/3 { [ g a b] } \times 2/3 { [ c d e] } \times 2/3 { [ f()e d] } | + \times 2/3 { [ c () b a ] } \times 2/3 { [ g a b] } \times 2/3 { [ c d e] } \times 2/3 { [ f()e d] }| + c4 \times 2/3 { r8 [g'()e]} c4 \times 2/3 { r8 [e () c]} | + g4 \times 2/3 { r8 [c8() g] } \times 2/3 { [ e ()g e] } \times 2/3 { [c ()e c] }| g4 r8 g'\f [a b c d]| d1(-\trill % \grace { c d } )c4 r r2 diff --git a/mutopia/gallina.ly b/mutopia/gallina.ly index ffaa8941cd..636c09b38f 100644 --- a/mutopia/gallina.ly +++ b/mutopia/gallina.ly @@ -45,7 +45,7 @@ Voice engraver by uncommenting the lines in the paper definition below. --MB %} -\version "1.0.7"; +\version "1.0.10"; global = \notes { \property StaffGroup.timeSignatureStyle = "old" diff --git a/mutopia/los-toros-oboe.ly b/mutopia/los-toros-oboe.ly index 743db375ba..c47ba35755 100644 --- a/mutopia/los-toros-oboe.ly +++ b/mutopia/los-toros-oboe.ly @@ -8,13 +8,13 @@ enteredby = "jcn"; copyright = "public domain"; latexheaders= "headers"; } -\version "1.0.7"; +\version "1.0.10"; %{ Silly latex file dropped; use ly2dvi Converted to relative octave from los-toros-oboe.ly: - :s/[^\\]'/'x/g + :s/[^\}'/'x/g :s/'x//g (511 substitutions on 155 lines) @@ -125,11 +125,11 @@ hoboonemid = \notes \relative c'{ [fis16( e a, )c] e4 ~ | [e16 d( e, c'] [)b8-. a-.] | g2 ~ | - [g8 \[/3 d16( e fis ]1/1 [)g8 d'-.] | + [g8 \times 2/3 { d16( e fis ] } [)g8 d'-.] | b2-> ~ | - [b8 \[/3 d,16( e fis ]1/1 [)g8-"cresc. poco" e'-.] | + [b8 \times 2/3 { d,16( e fis ] } [)g8-"cresc. poco" e'-.] | e2-> ~ | - [e8 \[/3 d,,16( e fis ]1/1 [)g8\f d'-.] | + [e8 \times 2/3 { d,,16( e fis ] } [)g8\f d'-.] | [d8.-> b'16-.] [g16-. d-. b-. c-.] | [d-. e-. fis-. a-.] [g8-. e-.] | fis2-> ~ | @@ -141,11 +141,11 @@ hoboonemid = \notes \relative c'{ [fis8.->( g16] )g4 ~ | % (only notes! of) five measures copied from 14 measures above - [g8 \[/3 d16( e fis ]1/1 [)g8 d'-.] | + [g8 \times 2/3 { d16( e fis ] } [)g8 d'-.] | b2->-"cresc." ~ | - [b8 \[/3 d,16( e fis ]1/1 [)g8 e'-.] | + [b8 \times 2/3 { d,16( e fis ] } [)g8 e'-.] | e2-> ~ | - [e8 \[/3 d,,16(_"h\\^atez" e fis ]1/1 [)g8\f d'-.] | + [e8 \times 2/3 { d,,16(_"h\\^atez" e fis ] } [)g8\f d'-.] | [d8.-> b16-.] [g16-.-"cresc." d'-. b-. c-.] | [d16\f\< e-. fis-. g-.] [a-. b,-. c-. \!d-.] } diff --git a/mutopia/standchen-16.ly b/mutopia/standchen-16.ly index acd5d4635e..45e3e12b10 100644 --- a/mutopia/standchen-16.ly +++ b/mutopia/standchen-16.ly @@ -9,6 +9,6 @@ description = "A schubert song in 16 pt"; copyright = "public domain"; } -\version "1.0.7"; +\version "1.0.10"; \include "standchen.ly" diff --git a/mutopia/standchen-20.ly b/mutopia/standchen-20.ly index 91b41c14bd..b1327373ec 100644 --- a/mutopia/standchen-20.ly +++ b/mutopia/standchen-20.ly @@ -9,7 +9,7 @@ copyright = "public domain"; description = "A schubert song in 20 pt"; } -\version "1.0.7"; +\version "1.0.10"; % fool make-website % \include "standchen.ly"; diff --git a/mutopia/standchen.ly b/mutopia/standchen.ly index a70465726d..abf8201317 100644 --- a/mutopia/standchen.ly +++ b/mutopia/standchen.ly @@ -16,45 +16,45 @@ multiple \paper{}s in one \score Note: Original key F. %} -\version "1.0.7"; +\version "1.0.10"; $vocal_verse1 = \notes\relative c{ % ugh: treble/bass % \clef treble; % \clef violin; \property Voice.dynamicdir=1 - [/3 g''8( )as] g \]/1 c4. g8 | - [/3 f8( )g] f \]/1 c'4 f,8 r | - g4.-> f8 [/3 f( )es] d \]/1 | + \times 2/3 { [ g''8( )as] g } c4. g8 | + \times 2/3 { [ f8( )g] f } c'4 f,8 r | + g4.-> f8 \times 2/3 { [ f( )es] d } | es2 r4 | % ugh: a whole should be a measure %r1 | R2. | R2. | - [/3 g8( )as] g \] es'4. g,8 | - [/3 f8( )g] f \] d'4. c8 | - bes4. as8 [/3 as( )g] f \] | + \times 2/3 { [ g8( )as] g } es'4. g,8 | + \times 2/3 { [ f8( )g] f } d'4. c8 | + bes4. as8 \times 2/3 { [ as( )g] f } | g2 r4 | R2. | R2. | g8. b16 es4. d8 | c8. g16 es4. c8 | - % [/3 as\grace( bes ] ) + % \times 2/3 { [ as\grace( bes ] ) % \tiny [as'16*1/16 bes16*1/16 ] -% \normalsize \[/3 [as8 g8] as8 \]31/32 c4. as8 | - [/3 as'8( )g] as \] c4. as8 | +% \normalsize \times 2/3 { [as8 g8] as8 } c4. as8 | + \times 2/3 { [ as'8( )g] as } c4. as8 | g2. | - %[/3 f\grace( g] ) - [/3 f8( )e] f \] as4. f8 | - %\tiny \[/3 [f`16*1/16 g16*1/16] \normalsize + %\times 2/3 { [ f\grace( g] ) + \times 2/3 { [ f8( )e] f } as4. f8 | + %\tiny \times 2/3 { [f`16*1/16 g16*1/16] \normalsize es!2. | g8. b16 es4. d8 | c8. g16 e4. c8 | - % [/3 a\grace( b] ) - [/3 a'!8( ) gis] a \] c4. a8 | + % \times 2/3 { [ a\grace( b] ) + \times 2/3 { [ a'!8( ) gis] a } c4. a8 | g!2. | - % [/3 a\grace( b] ) - [/3 d'8\f cis] d \] f4. b,8 | + % \times 2/3 { [ a\grace( b] ) + \times 2/3 { [ d'8\f cis] d } f4. b,8 | c!2. | } @@ -64,16 +64,16 @@ $vocal_through = \notes\relative c{ c4 b r | g4. b8 d8. c16 | b2 r4 | - e4. d8 [/3 d( )c] b \] | + e4. d8 \times 2/3 { [ d( )c] b } | a8. b16 c4-> a8 r | R2. | R2. | % 4 bars copied from end verse 1 - % [/3 a\grace( b] ) - [/3 a!8( ) gis] a \] c4. a8 | + % \times 2/3 { [ a\grace( b] ) + \times 2/3 { [ a!8( ) gis] a } c4. a8 | g!2. | - % [/3 a\grace( b] ) - [/3 d'8\f cis] d \] f4. b,8 | + % \times 2/3 { [ a\grace( b] ) + \times 2/3 { [ d'8\f cis] d } f4. b,8 | c!2. ~ | c4 r c | as2. | @@ -83,48 +83,48 @@ $vocal_through = \notes\relative c{ $lyric_verse1 = \lyrics{ % 5 - \[/3 Lei-4 se8 \] fleh-4. en8 | - \[/3 mei-4 ne8 \] Lie-4 der8 _8 | - Durch4. die8 \[/3 Nacht4 zu8 \] | + \times 2/3 { Lei-4 se8 } fleh-4. en8 | + \times 2/3 { mei-4 ne8 } Lie-4 der8 _8 | + Durch4. die8 \times 2/3 { Nacht4 zu8 } | dir;2 _4 | _4 _ _ | _ _ _ | % 11 - \[/3 In4 den8 \] stil-4. len8 | - \[/3 Hain4 her-8 \] nie-4. der8 | - Lieb-4. chen,8 \[/3 komm4 zu8 \] | + \times 2/3 { In4 den8 } stil-4. len8 | + \times 2/3 { Hain4 her-8 } nie-4. der8 | + Lieb-4. chen,8 \times 2/3 { komm4 zu8 } | mir!2 _4 | _4 _ _ | _ _ _ | % 17 Fl\"us-8. ternd16 schlan-4. ke8 | Wip-8. fel16 rau-4. schen8 | - \[/3 In4 des8 \] Mon-4. des8 | + \times 2/3 { In4 des8 } Mon-4. des8 | Licht;2. | - \[/3 In4 des8 \] Mon-4. des8 | + \times 2/3 { In4 des8 } Mon-4. des8 | Licht;2. | % 23 Des8. Ver-16 r\"a-4. thers8 | feind-8. lich16 Lau-4. schen8 | - \[/3 F\"urch-4 te8 \] Hol-4. de8 | + \times 2/3 { F\"urch-4 te8 } Hol-4. de8 | nicht2. | - \[/3 f\"urch-4 te8 \] Hol-4. de8 | + \times 2/3 { f\"urch-4 te8 } Hol-4. de8 | nicht.2. | } $lyric_verse2 = \lyrics{ % 5 - \[/3 H\"orst4 die8 \] Nach-4. ti-8 - \[/3 gal-4 len8 \] schla-4 gen?8 _8 - ach!4. sie8 \[/3 fleh-4 en8 \] + \times 2/3 { H\"orst4 die8 } Nach-4. ti-8 + \times 2/3 { gal-4 len8 } schla-4 gen?8 _8 + ach!4. sie8 \times 2/3 { fleh-4 en8 } dich,2 _4 _4 _ _ _4_ _ % 11 - \[/3 Mit4 der8 \] T\"o-4. ne8 - \[/3 s\"u-4 "\ss{}en"8 \] Kla-4. gen8 - Fleh-4. en8 \[/3 sie4 f\"ur8 \] + \times 2/3 { Mit4 der8 } T\"o-4. ne8 + \times 2/3 { s\"u-4 "\ss{}en"8 } Kla-4. gen8 + Fleh-4. en8 \times 2/3 { sie4 f\"ur8 } mich2 _4 _4_ _ _4_ _ @@ -132,17 +132,17 @@ $lyric_verse2 = \lyrics{ % 17 Sie-8. ver-16 stehn4. des8 Bus-8. ens16 Seh-4. nen8 - \[/3 Ken-4 nen8 \] Lieb-4. es-8 + \times 2/3 { Ken-4 nen8 } Lieb-4. es-8 schmerz,2. - \[/3 Ken-4 nen8 \] Lieb-4. es-8 + \times 2/3 { Ken-4 nen8 } Lieb-4. es-8 schmerz.2. % 23 R\"uh-8. ren16 mit4. den8 Sil-8. ber-16 t\"o-4. nen8 - \[/3 jed-4 es8 \] wei-4. che8 + \times 2/3 { jed-4 es8 } wei-4. che8 Herz,2. - \[/3 jed-4 es8 \] wei-4. che8 + \times 2/3 { jed-4 es8 } wei-4. che8 Herz.2. } @@ -152,13 +152,13 @@ $lyric_through = \lyrics{ we-4 gen _ | Lieb-4. chen,8 h\"o-8. re16 | mich!2 _4 | - Be-4. bend8 \[/3 harr'4 ich8\]/1 | + Be-4. bend8 \times 2/3 { harr'4 ich8} | dir8. ent-16 ge-4 gen!8 _8 | _2. | _2. | - \[/3 Komm4 be-8 \] gl\"u4. cke8 | + \times 2/3 { Komm4 be-8 } gl\"u4. cke8 | mich!2. | - \[/3 Komm4 be-8 \] gl\"u4. cke8 | + \times 2/3 { Komm4 be-8 } gl\"u4. cke8 | mich,2. __ | _2 be-4 | gl\"u-2. | @@ -184,7 +184,8 @@ $treble_verse1 = \notes\relative c{ r8 <[f c'> | r8 <[f g b> | r8 <[es g c> | - <)f8 d> <[/3 f( d> <)d b]1/1> | + <)f8 d> + \times 2/3 { < [ f( d> <)d b] > } | %10 | r8 <[g, c> | @@ -192,7 +193,7 @@ $treble_verse1 = \notes\relative c{ r8 <[f as bes> | r8 <[es g bes> <{ es'~ | d4. ~ f8}{ c'~ | bes4. ~ as8 } > - < [/3 f( as> <)d f]1/1> | + \times 2/3 { < [f( as> <)d f] > } | %16 | r8 <[f, g> | @@ -200,17 +201,20 @@ $treble_verse1 = \notes\relative c{ r8\pp <[es as c> | %20 r8 <[es g bes> | - % [/3 as\grace( bes ) - [/3 as'8( g as]1/1 c4.-> ) as8 | + % \times 2/3 { [ as\grace( bes ) + \times 2/3 { [ as'8( g as] } c4.-> ) as8 | g2. | r8 <[f, g> | r8 <[e g> | r8 <[f a c> | r8 <[e g c> | - <{[/3 f'8\f( e f]1/1 a4.-> )f8 } {\[/3 f' e f \]/1 a4. f8 } > | + \times 2/3 < + { [ f'8\f( e f] } + { f' e f } > + < {a4.- > )f8} { a4. f8 } > | } -$treble_eentje = \notes\relative c'{ +$treble_eentje = \notes \relative c'{ | <[as8.->( c> <)f16 )as]> | <[e8-. g-.(> | @@ -223,7 +227,7 @@ $treble_eentje = \notes\relative c'{ | } -$treble_through = \notes\relative c'{ +$treble_through = \notes \relative c'{ | %61 R2. | @@ -251,7 +255,9 @@ $treble_through = \notes\relative c'{ r8 <[f, a c> | %70 r8 <[e g c> | - <{[/3 f'8\f( e f]1/1 a4.-> )f8 } {\[/3 f' e f \]/1 a4. f8 } > | + \times 2/3 < { [ f'8\f( e f] } + { f' e f }> + < { a4.-> )f8 } { a4. f8 } > | r4 | r4 | \property Voice . textstyle = "italic" diff --git a/scripts/convert-mudela.py b/scripts/convert-mudela.py index f8b10a9080..19288a08b4 100644 --- a/scripts/convert-mudela.py +++ b/scripts/convert-mudela.py @@ -239,6 +239,23 @@ if 1: conversions.append ((1,0,7), conv, '\\lyric -> \\lyrics') +if 1: + def conv(lines): + newlines =[] + for x in lines: + x = re.sub ('\\\\\\[/3+', '\\\\times 2/3 { ',x) + x = re.sub ('\\[/3+', '\\\\times 2/3 { [',x) + x = re.sub ('\\\\\\[([0-9/]+)', '\\\\times \\1 {',x) + x = re.sub ('\\[([0-9/]+)', '\\\\times \\1 { [',x) + x = re.sub ('\\\\\\]([0-9/]+)', '}', x) + x = re.sub ('\\\\\\]', '}',x) + x = re.sub ('\\]([0-9/]+)', '] }', x) + + newlines.append (x) + return newlines + + conversions.append ((1,0,10), conv, '[2/3 ]1/1 -> \\times 2/3 ') + ############################ diff --git a/stepmake/configure b/stepmake/configure index 34691c9722..e69de29bb2 100755 --- a/stepmake/configure +++ b/stepmake/configure @@ -1,1807 +0,0 @@ -#! /bin/sh - -ac_help="$ac_help - --with-gtkmm-prefix=PREFIX - Prefix where GTK-- is installed (optional)" -# Check whether --with-gtkmm-prefix or --without-gtkmm-prefix was given. -if test "${with_gtkmm_prefix+set}" = set; then - withval="$with_gtkmm_prefix" - gtkmm_config_prefix="$withval" -else - gtkmm_config_prefix="" -fi - -ac_help="$ac_help - --with-gtkmm-exec-prefix=PREFIX - Exec prefix where GTK-- is installed (optional)" -# Check whether --with-gtkmm-exec-prefix or --without-gtkmm-exec-prefix was given. -if test "${with_gtkmm_exec_prefix+set}" = set; then - withval="$with_gtkmm_exec_prefix" - gtkmm_config_exec_prefix="$withval" -else - gtkmm_config_exec_prefix="" -fi - -ac_help="$ac_help - --disable-gtkmmtest Do not try to compile and run a test GTK-- program" -# Check whether --enable-gtkmmtest or --disable-gtkmmtest was given. -if test "${enable_gtkmmtest+set}" = set; then - enableval="$enable_gtkmmtest" - : -else - enable_gtkmmtest=yes -fi - - - if test x$gtkmm_config_exec_prefix != x ; then - gtkmm_config_args="$gtkmm_config_args --exec-prefix=$gtkmm_config_exec_prefix" - if test x${GTKMM_CONFIG+set} != xset ; then - GTKMM_CONFIG=$gtkmm_config_exec_prefix/bin/gtkmm-config - fi - fi - if test x$gtkmm_config_prefix != x ; then - gtkmm_config_args="$gtkmm_config_args --prefix=$gtkmm_config_prefix" - if test x${GTKMM_CONFIG+set} != xset ; then - GTKMM_CONFIG=$gtkmm_config_prefix/bin/gtkmm-config - fi - fi - - - - -# Configure paths for GTK--DRAW -# Derek Quinn Wyatt 98-08-21 (adapted from Jan Nieuwenhuizen's code) - - - -# Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf version 2.12 -# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. -# -# This configure script is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. - -# Defaults: -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" -ac_help="$ac_help - 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" - -# Initialize some variables set by options. -# The variables have the same names as the options, with -# dashes changed to underlines. -build=NONE -cache_file=./config.cache -exec_prefix=NONE -host=NONE -no_create= -nonopt=NONE -no_recursion= -prefix=NONE -program_prefix=NONE -program_suffix=NONE -program_transform_name=s,x,x, -silent= -site= -srcdir= -target=NONE -verbose= -x_includes=NONE -x_libraries=NONE -bindir='${exec_prefix}/bin' -sbindir='${exec_prefix}/sbin' -libexecdir='${exec_prefix}/libexec' -datadir='${prefix}/share' -sysconfdir='${prefix}/etc' -sharedstatedir='${prefix}/com' -localstatedir='${prefix}/var' -libdir='${exec_prefix}/lib' -includedir='${prefix}/include' -oldincludedir='/usr/include' -infodir='${prefix}/info' -mandir='${prefix}/man' - -# Initialize some other variables. -subdirs= -MFLAGS= MAKEFLAGS= -# Maximum number of lines to put in a shell here document. -ac_max_here_lines=12 - -ac_prev= -for ac_option -do - - # If the previous option needs an argument, assign it. - if test -n "$ac_prev"; then - eval "$ac_prev=\$ac_option" - ac_prev= - continue - fi - - case "$ac_option" in - -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;; - *) ac_optarg= ;; - esac - - # Accept the important Cygnus configure options, so we can diagnose typos. - - case "$ac_option" in - - -bindir | --bindir | --bindi | --bind | --bin | --bi) - ac_prev=bindir ;; - -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) - bindir="$ac_optarg" ;; - - -build | --build | --buil | --bui | --bu) - ac_prev=build ;; - -build=* | --build=* | --buil=* | --bui=* | --bu=*) - build="$ac_optarg" ;; - - -cache-file | --cache-file | --cache-fil | --cache-fi \ - | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) - ac_prev=cache_file ;; - -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ - | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) - cache_file="$ac_optarg" ;; - - -datadir | --datadir | --datadi | --datad | --data | --dat | --da) - ac_prev=datadir ;; - -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ - | --da=*) - datadir="$ac_optarg" ;; - - -disable-* | --disable-*) - ac_feature=`echo $ac_option|sed -e 's/-*disable-//'` - # Reject names that are not valid shell variable names. - if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then - { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } - fi - ac_feature=`echo $ac_feature| sed 's/-/_/g'` - eval "enable_${ac_feature}=no" ;; - - -enable-* | --enable-*) - ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'` - # Reject names that are not valid shell variable names. - if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then - { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } - fi - ac_feature=`echo $ac_feature| sed 's/-/_/g'` - case "$ac_option" in - *=*) ;; - *) ac_optarg=yes ;; - esac - eval "enable_${ac_feature}='$ac_optarg'" ;; - - -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ - | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ - | --exec | --exe | --ex) - ac_prev=exec_prefix ;; - -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ - | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ - | --exec=* | --exe=* | --ex=*) - exec_prefix="$ac_optarg" ;; - - -gas | --gas | --ga | --g) - # Obsolete; use --with-gas. - with_gas=yes ;; - - -help | --help | --hel | --he) - # Omit some internal or obsolete options to make the list less imposing. - # This message is too long to be a string in the A/UX 3.1 sh. - cat << EOF -Usage: configure [options] [host] -Options: [defaults in brackets after descriptions] -Configuration: - --cache-file=FILE cache test results in FILE - --help print this message - --no-create do not create output files - --quiet, --silent do not print \`checking...' messages - --version print the version of autoconf that created configure -Directory and file names: - --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] - --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [same as prefix] - --bindir=DIR user executables in DIR [EPREFIX/bin] - --sbindir=DIR system admin executables in DIR [EPREFIX/sbin] - --libexecdir=DIR program executables in DIR [EPREFIX/libexec] - --datadir=DIR read-only architecture-independent data in DIR - [PREFIX/share] - --sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data in DIR - [PREFIX/com] - --localstatedir=DIR modifiable single-machine data in DIR [PREFIX/var] - --libdir=DIR object code libraries in DIR [EPREFIX/lib] - --includedir=DIR C header files in DIR [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc in DIR [/usr/include] - --infodir=DIR info documentation in DIR [PREFIX/info] - --mandir=DIR man documentation in DIR [PREFIX/man] - --srcdir=DIR find the sources in DIR [configure dir or ..] - --program-prefix=PREFIX prepend PREFIX to installed program names - --program-suffix=SUFFIX append SUFFIX to installed program names - --program-transform-name=PROGRAM - run sed PROGRAM on installed program names -EOF - cat << EOF -Host type: - --build=BUILD configure for building on BUILD [BUILD=HOST] - --host=HOST configure for HOST [guessed] - --target=TARGET configure for TARGET [TARGET=HOST] -Features and packages: - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --x-includes=DIR X include files are in DIR - --x-libraries=DIR X library files are in DIR -EOF - if test -n "$ac_help"; then - echo "--enable and --with options recognized:$ac_help" - fi - exit 0 ;; - - -host | --host | --hos | --ho) - ac_prev=host ;; - -host=* | --host=* | --hos=* | --ho=*) - host="$ac_optarg" ;; - - -includedir | --includedir | --includedi | --included | --include \ - | --includ | --inclu | --incl | --inc) - ac_prev=includedir ;; - -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ - | --includ=* | --inclu=* | --incl=* | --inc=*) - includedir="$ac_optarg" ;; - - -infodir | --infodir | --infodi | --infod | --info | --inf) - ac_prev=infodir ;; - -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) - infodir="$ac_optarg" ;; - - -libdir | --libdir | --libdi | --libd) - ac_prev=libdir ;; - -libdir=* | --libdir=* | --libdi=* | --libd=*) - libdir="$ac_optarg" ;; - - -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ - | --libexe | --libex | --libe) - ac_prev=libexecdir ;; - -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ - | --libexe=* | --libex=* | --libe=*) - libexecdir="$ac_optarg" ;; - - -localstatedir | --localstatedir | --localstatedi | --localstated \ - | --localstate | --localstat | --localsta | --localst \ - | --locals | --local | --loca | --loc | --lo) - ac_prev=localstatedir ;; - -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ - | --localstate=* | --localstat=* | --localsta=* | --localst=* \ - | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) - localstatedir="$ac_optarg" ;; - - -mandir | --mandir | --mandi | --mand | --man | --ma | --m) - ac_prev=mandir ;; - -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) - mandir="$ac_optarg" ;; - - -nfp | --nfp | --nf) - # Obsolete; use --without-fp. - with_fp=no ;; - - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c) - no_create=yes ;; - - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) - no_recursion=yes ;; - - -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ - | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ - | --oldin | --oldi | --old | --ol | --o) - ac_prev=oldincludedir ;; - -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ - | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ - | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) - oldincludedir="$ac_optarg" ;; - - -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) - ac_prev=prefix ;; - -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) - prefix="$ac_optarg" ;; - - -program-prefix | --program-prefix | --program-prefi | --program-pref \ - | --program-pre | --program-pr | --program-p) - ac_prev=program_prefix ;; - -program-prefix=* | --program-prefix=* | --program-prefi=* \ - | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) - program_prefix="$ac_optarg" ;; - - -program-suffix | --program-suffix | --program-suffi | --program-suff \ - | --program-suf | --program-su | --program-s) - ac_prev=program_suffix ;; - -program-suffix=* | --program-suffix=* | --program-suffi=* \ - | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) - program_suffix="$ac_optarg" ;; - - -program-transform-name | --program-transform-name \ - | --program-transform-nam | --program-transform-na \ - | --program-transform-n | --program-transform- \ - | --program-transform | --program-transfor \ - | --program-transfo | --program-transf \ - | --program-trans | --program-tran \ - | --progr-tra | --program-tr | --program-t) - ac_prev=program_transform_name ;; - -program-transform-name=* | --program-transform-name=* \ - | --program-transform-nam=* | --program-transform-na=* \ - | --program-transform-n=* | --program-transform-=* \ - | --program-transform=* | --program-transfor=* \ - | --program-transfo=* | --program-transf=* \ - | --program-trans=* | --program-tran=* \ - | --progr-tra=* | --program-tr=* | --program-t=*) - program_transform_name="$ac_optarg" ;; - - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - silent=yes ;; - - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) - ac_prev=sbindir ;; - -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ - | --sbi=* | --sb=*) - sbindir="$ac_optarg" ;; - - -sharedstatedir | --sharedstatedir | --sharedstatedi \ - | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ - | --sharedst | --shareds | --shared | --share | --shar \ - | --sha | --sh) - ac_prev=sharedstatedir ;; - -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ - | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ - | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ - | --sha=* | --sh=*) - sharedstatedir="$ac_optarg" ;; - - -site | --site | --sit) - ac_prev=site ;; - -site=* | --site=* | --sit=*) - site="$ac_optarg" ;; - - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) - ac_prev=srcdir ;; - -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) - srcdir="$ac_optarg" ;; - - -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ - | --syscon | --sysco | --sysc | --sys | --sy) - ac_prev=sysconfdir ;; - -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ - | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) - sysconfdir="$ac_optarg" ;; - - -target | --target | --targe | --targ | --tar | --ta | --t) - ac_prev=target ;; - -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) - target="$ac_optarg" ;; - - -v | -verbose | --verbose | --verbos | --verbo | --verb) - verbose=yes ;; - - -version | --version | --versio | --versi | --vers) - echo "configure generated by autoconf version 2.12" - exit 0 ;; - - -with-* | --with-*) - ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'` - # Reject names that are not valid shell variable names. - if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then - { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } - fi - ac_package=`echo $ac_package| sed 's/-/_/g'` - case "$ac_option" in - *=*) ;; - *) ac_optarg=yes ;; - esac - eval "with_${ac_package}='$ac_optarg'" ;; - - -without-* | --without-*) - ac_package=`echo $ac_option|sed -e 's/-*without-//'` - # Reject names that are not valid shell variable names. - if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then - { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } - fi - ac_package=`echo $ac_package| sed 's/-/_/g'` - eval "with_${ac_package}=no" ;; - - --x) - # Obsolete; use --with-x. - with_x=yes ;; - - -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ - | --x-incl | --x-inc | --x-in | --x-i) - ac_prev=x_includes ;; - -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ - | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) - x_includes="$ac_optarg" ;; - - -x-libraries | --x-libraries | --x-librarie | --x-librari \ - | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) - ac_prev=x_libraries ;; - -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ - | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) - x_libraries="$ac_optarg" ;; - - -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; } - ;; - - *) - if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then - echo "configure: warning: $ac_option: invalid host type" 1>&2 - fi - if test "x$nonopt" != xNONE; then - { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } - fi - nonopt="$ac_option" - ;; - - esac -done - -if test -n "$ac_prev"; then - { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; } -fi - -trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 - -# File descriptor usage: -# 0 standard input -# 1 file creation -# 2 errors and warnings -# 3 some systems may open it to /dev/tty -# 4 used on the Kubota Titan -# 6 checking for... messages and results -# 5 compiler messages saved in config.log -if test "$silent" = yes; then - exec 6>/dev/null -else - exec 6>&1 -fi -exec 5>./config.log - -echo "\ -This file contains any messages produced by compilers while -running configure, to aid debugging if configure makes a mistake. -" 1>&5 - -# Strip out --no-create and --no-recursion so they do not pile up. -# Also quote any args containing shell metacharacters. -ac_configure_args= -for ac_arg -do - case "$ac_arg" in - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c) ;; - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;; - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*) - ac_configure_args="$ac_configure_args '$ac_arg'" ;; - *) ac_configure_args="$ac_configure_args $ac_arg" ;; - esac -done - -# NLS nuisances. -# Only set these to C if already set. These must not be set unconditionally -# because not all systems understand e.g. LANG=C (notably SCO). -# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! -# Non-C LC_CTYPE values break the ctype check. -if test "${LANG+set}" = set; then LANG=C; export LANG; fi -if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi -if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi -if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi - -# confdefs.h avoids OS command line length limits that DEFS can exceed. -rm -rf conftest* confdefs.h -# AIX cpp loses on an empty file, so make sure it contains at least a newline. -echo > confdefs.h - -# A filename unique to this package, relative to the directory that -# configure is in, which we can look for to find out if srcdir is correct. -ac_unique_file=make/stepmake.lsm.in - -# Find the source files, if location was not specified. -if test -z "$srcdir"; then - ac_srcdir_defaulted=yes - # Try the directory containing this script, then its parent. - ac_prog=$0 - ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'` - test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. - srcdir=$ac_confdir - if test ! -r $srcdir/$ac_unique_file; then - srcdir=.. - fi -else - ac_srcdir_defaulted=no -fi -if test ! -r $srcdir/$ac_unique_file; then - if test "$ac_srcdir_defaulted" = yes; then - { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; } - else - { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; } - fi -fi -srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` - -# Prefer explicitly selected file to automatically selected ones. -if test -z "$CONFIG_SITE"; then - if test "x$prefix" != xNONE; then - CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" - else - CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" - fi -fi -for ac_site_file in $CONFIG_SITE; do - if test -r "$ac_site_file"; then - echo "loading site script $ac_site_file" - . "$ac_site_file" - fi -done - -if test -r "$cache_file"; then - echo "loading cache $cache_file" - . $cache_file -else - echo "creating cache $cache_file" - > $cache_file -fi - -ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross - -if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then - # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. - if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then - ac_n= ac_c=' -' ac_t=' ' - else - ac_n=-n ac_c= ac_t= - fi -else - ac_n= ac_c='\c' ac_t= -fi - - - - -# Bootstrap StepMake configure - - - . $srcdir/VERSION - FULL_VERSION=$MAJOR_VERSION.$MINOR_VERSION.$PATCH_LEVEL - if test x$MY_PATCH_LEVEL != x; then - FULL_VERSION=$FULL_VERSION.$MY_PATCH_LEVEL - fi - - # urg: don't "fix" this: irix doesn't know about [:lower:] and [:upper:] - PACKAGE=`echo $PACKAGE_NAME | tr '[a-z]' '[A-Z]'` - package=`echo $PACKAGE_NAME | tr '[A-Z]' '[a-z]'` - - # No versioning on directory names of sub-packages - # urg, urg - stepmake=${datadir}/stepmake - presome=${prefix} - if test "$prefix" = "NONE"; then - presome=${ac_default_prefix} - fi - stepmake=`echo ${stepmake} | sed "s!\\\${prefix}!$presome!"` - - if test "x$PACKAGE" = "xSTEPMAKE"; then - echo Stepmake package! - (cd stepmake; rm -f stepmake; ln -s ../stepmake .) - (cd stepmake; rm -f bin; ln -s ../bin .) - ac_aux_dir= -for ac_dir in bin $srcdir/bin; do - if test -f $ac_dir/install-sh; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f $ac_dir/install.sh; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - fi -done -if test -z "$ac_aux_dir"; then - { echo "configure: error: can not find install-sh or install.sh in bin $srcdir/bin" 1>&2; exit 1; } -fi -ac_config_guess=$ac_aux_dir/config.guess -ac_config_sub=$ac_aux_dir/config.sub -ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. - - stepmake=stepmake - else - echo Package: $PACKAGE - # Check for installed stepmake - if test -d $stepmake; then - echo Using installed stepmake: $stepmake - else - stepmake='$(depth)'/stepmake - echo Using local stepmake: $datadir/stepmake not found - fi - ac_aux_dir= -for ac_dir in \ - $HOME/usr/local/share/stepmake/bin\ - $HOME/usr/local/lib/stepmake/bin\ - $HOME/usr/share/stepmake/bin\ - $HOME/usr/lib/stepmake/bin\ - /usr/local/share/stepmake/bin\ - /usr/local/lib/stepmake/bin\ - /usr/share/stepmake/bin\ - /usr/lib/stepmake/bin\ - stepmake/bin\ - $srcdir/\ - $HOME/usr/local/share/stepmake/bin\ - $HOME/usr/local/lib/stepmake/bin\ - $HOME/usr/share/stepmake/bin\ - $HOME/usr/lib/stepmake/bin\ - /usr/local/share/stepmake/bin\ - /usr/local/lib/stepmake/bin\ - /usr/share/stepmake/bin\ - /usr/lib/stepmake/bin\ - stepmake/bin\ - ; do - if test -f $ac_dir/install-sh; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f $ac_dir/install.sh; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - fi -done -if test -z "$ac_aux_dir"; then - { echo "configure: error: can not find install-sh or install.sh in \ - $HOME/usr/local/share/stepmake/bin\ - $HOME/usr/local/lib/stepmake/bin\ - $HOME/usr/share/stepmake/bin\ - $HOME/usr/lib/stepmake/bin\ - /usr/local/share/stepmake/bin\ - /usr/local/lib/stepmake/bin\ - /usr/share/stepmake/bin\ - /usr/lib/stepmake/bin\ - stepmake/bin\ - $srcdir/\ - $HOME/usr/local/share/stepmake/bin\ - $HOME/usr/local/lib/stepmake/bin\ - $HOME/usr/share/stepmake/bin\ - $HOME/usr/lib/stepmake/bin\ - /usr/local/share/stepmake/bin\ - /usr/local/lib/stepmake/bin\ - /usr/share/stepmake/bin\ - /usr/lib/stepmake/bin\ - stepmake/bin\ - " 1>&2; exit 1; } -fi -ac_config_guess=$ac_aux_dir/config.guess -ac_config_sub=$ac_aux_dir/config.sub -ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. - - fi - - - - - - cat >> confdefs.h <> confdefs.h </dev/null` - if test "x$STATE_VECTOR" != "x"; then - STATE_VECTOR="\$(depth)/$STATE_VECTOR" - fi - - - CONFIGSUFFIX= - # Check whether --enable-config or --disable-config was given. -if test "${enable_config+set}" = set; then - enableval="$enable_config" - CONFIGSUFFIX=$enableval -fi - - - if test "$CONFIGSUFFIX" != "" ; then - CONFIGFILE=config-$CONFIGSUFFIX - else - CONFIGFILE=config - fi - - - -# Make sure we can run config.sub. -if $ac_config_sub sun4 >/dev/null 2>&1; then : -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:749: checking host system type" >&5 - -host_alias=$host -case "$host_alias" in -NONE) - case $nonopt in - NONE) - if host_alias=`$ac_config_guess`; then : - else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; } - fi ;; - *) host_alias=$nonopt ;; - esac ;; -esac - -host=`$ac_config_sub $host_alias` -host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -echo "$ac_t""$host" 1>&6 - - for ac_prog in make -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:774: 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 - if test -n "$MAKE"; then - ac_cv_prog_MAKE="$MAKE" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_MAKE="$ac_prog" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -MAKE="$ac_cv_prog_MAKE" -if test -n "$MAKE"; then - echo "$ac_t""$MAKE" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -test -n "$MAKE" && break -done -test -n "$MAKE" || MAKE="error" - - for ac_prog in find -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:808: 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 - if test -n "$FIND"; then - ac_cv_prog_FIND="$FIND" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_FIND="$ac_prog" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -FIND="$ac_cv_prog_FIND" -if test -n "$FIND"; then - echo "$ac_t""$FIND" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -test -n "$FIND" && break -done -test -n "$FIND" || FIND="error" - - - - - for ac_prog in tar -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:845: 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 - if test -n "$TAR"; then - ac_cv_prog_TAR="$TAR" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_TAR="$ac_prog" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -TAR="$ac_cv_prog_TAR" -if test -n "$TAR"; then - echo "$ac_t""$TAR" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -test -n "$TAR" && break -done -test -n "$TAR" || TAR="error" - - for ac_prog in bash -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:879: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_BASH'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$BASH"; then - ac_cv_prog_BASH="$BASH" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_BASH="$ac_prog" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -BASH="$ac_cv_prog_BASH" -if test -n "$BASH"; then - echo "$ac_t""$BASH" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -test -n "$BASH" && break -done -test -n "$BASH" || BASH="/bin/sh" - - - # 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:912: 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 - case "$PYTHON" in - /*) - ac_cv_path_PYTHON="$PYTHON" # Let the user override the test with a path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_PYTHON="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_path_PYTHON" && ac_cv_path_PYTHON="-echo no python" - ;; -esac -fi -PYTHON="$ac_cv_path_PYTHON" -if test -n "$PYTHON"; then - echo "$ac_t""$PYTHON" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - - - - - - result="`echo \"$MAKE\" | grep echo`" - if test "x$MAKE" = "xerror" -o "x$result" != "x"; then - - echo "configure: warning: can\'t find GNU make. You should install GNU make" 1>&2 - warn_b=yes - - fi - - if test $MAKE != "error" ; then - $MAKE -v| grep GNU > /dev/null - if test "$?" = 1 - then - - echo "configure: warning: Please install *GNU* make" 1>&2 - warn_b=yes - - fi - fi - - - result="`echo \"$PYTHON\" | grep echo`" - if test "x$PYTHON" = "xerror" -o "x$result" != "x"; then - - echo "configure: warning: can\'t find python. You should install Python" 1>&2 - warn_b=yes - - fi - - - if test "x$OSTYPE" = "xcygwin32" || test "x$OSTYPE" = "xWindows_NT"; then - LN=cp # hard link does not work under cygnus-nt - LN_S=cp # symbolic link does not work for native nt - ZIP="zip -r -9" # - DOTEXE=.exe - DIRSEP='\\' - PATHSEP=';' - INSTALL="\$(SHELL) \$(stepdir)/../bin/install-dot-exe.sh -c" - else - DIRSEP='/' - PATHSEP=':' - LN=ln - LN_S='ln -s' - ZIP="zip -r -9" - INSTALL="\$(SHELL) \$(stepdir)/../bin/install-sh -c" - fi - - - - - - cat >> confdefs.h <> confdefs.h <> confdefs.h <&6 -echo "configure:1062: checking language" >&5 - case "$language" in - En* | en* | Am* | am* | US* | us*) - lang=English;; - NL | nl | Du* | du* | Ned* | ned*) - lang=Dutch;; - "") - lang=English;; - *) - lang=unknown;; - esac - echo "$ac_t""$lang" 1>&6 - - if test "$lang" = "unknown" ; then - - echo "configure: warning: $language not supported; available are: $ALL_LINGUAS" 1>&2 - warn_b=yes - - fi - - -# AC_STEPMAKE_GETTEXT -# AC_STEPMAKE_MAN -# AC_STEPMAKE_MSGFMT -# AC_STEPMAKE_TEXMF -# AC_STEPMAKE_TEXMF_DIRS - - if test "x$YODL" = "x"; then - for ac_prog in striproff -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:1095: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_STRIPROFF'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$STRIPROFF"; then - ac_cv_prog_STRIPROFF="$STRIPROFF" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_STRIPROFF="$ac_prog" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -STRIPROFF="$ac_cv_prog_STRIPROFF" -if test -n "$STRIPROFF"; then - echo "$ac_t""$STRIPROFF" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -test -n "$STRIPROFF" && break -done -test -n "$STRIPROFF" || STRIPROFF="-echo no striproff" - - for ac_prog in yodl -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:1129: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_YODL'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$YODL"; then - ac_cv_prog_YODL="$YODL" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_YODL="$ac_prog" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -YODL="$ac_cv_prog_YODL" -if test -n "$YODL"; then - echo "$ac_t""$YODL" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -test -n "$YODL" && break -done -test -n "$YODL" || YODL="-echo no yodl" - - for ac_prog in yodl2html -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:1163: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_YODL2HTML'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$YODL2HTML"; then - ac_cv_prog_YODL2HTML="$YODL2HTML" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_YODL2HTML="$ac_prog" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -YODL2HTML="$ac_cv_prog_YODL2HTML" -if test -n "$YODL2HTML"; then - echo "$ac_t""$YODL2HTML" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -test -n "$YODL2HTML" && break -done -test -n "$YODL2HTML" || YODL2HTML="-echo no yodl" - - for ac_prog in yodl2latex -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:1197: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_YODL2LATEX'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$YODL2LATEX"; then - ac_cv_prog_YODL2LATEX="$YODL2LATEX" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_YODL2LATEX="$ac_prog" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -YODL2LATEX="$ac_cv_prog_YODL2LATEX" -if test -n "$YODL2LATEX"; then - echo "$ac_t""$YODL2LATEX" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -test -n "$YODL2LATEX" && break -done - - for ac_prog in yodl2man -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:1230: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_YODL2MAN'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$YODL2MAN"; then - ac_cv_prog_YODL2MAN="$YODL2MAN" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_YODL2MAN="$ac_prog" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -YODL2MAN="$ac_cv_prog_YODL2MAN" -if test -n "$YODL2MAN"; then - echo "$ac_t""$YODL2MAN" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -test -n "$YODL2MAN" && break -done -test -n "$YODL2MAN" || YODL2MAN="-echo no yodl" - - for ac_prog in yodl2msless -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:1264: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_YODL2MSLESS'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$YODL2MSLESS"; then - ac_cv_prog_YODL2MSLESS="$YODL2MSLESS" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_YODL2MSLESS="$ac_prog" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -YODL2MSLESS="$ac_cv_prog_YODL2MSLESS" -if test -n "$YODL2MSLESS"; then - echo "$ac_t""$YODL2MSLESS" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -test -n "$YODL2MSLESS" && break -done -test -n "$YODL2MSLESS" || YODL2MSLESS="-echo no yodl" - - for ac_prog in yodl2texinfo -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:1298: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_YODL2TEXINFO'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$YODL2TEXINFO"; then - ac_cv_prog_YODL2TEXINFO="$YODL2TEXINFO" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_YODL2TEXINFO="$ac_prog" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -YODL2TEXINFO="$ac_cv_prog_YODL2TEXINFO" -if test -n "$YODL2TEXINFO"; then - echo "$ac_t""$YODL2TEXINFO" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -test -n "$YODL2TEXINFO" && break -done -test -n "$YODL2TEXINFO" || YODL2TEXINFO="-echo no yodl" - - for ac_prog in yodl2txt -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:1332: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_YODL2TXT'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - if test -n "$YODL2TXT"; then - ac_cv_prog_YODL2TXT="$YODL2TXT" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_YODL2TXT="$ac_prog" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -YODL2TXT="$ac_cv_prog_YODL2TXT" -if test -n "$YODL2TXT"; then - echo "$ac_t""$YODL2TXT" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -test -n "$YODL2TXT" && break -done -test -n "$YODL2TXT" || YODL2TXT="-echo no yodl" - - YODL2LESS_DIR='$(bindir)/' - else - - - - - - - - - - export STRIPROFF YODL YODL2HTML YODL2LATEX YODL2MAN YODL2MSLESS YODL2TEXINFO YODL2TXT - fi - if test "x$YODL" = "-echo no yodl"; then - - echo "configure: warning: Did not find YODL (Yodl is Yet Oneother Document Language, see http://www.cs.uu.nl/~hanwen/yodl)" 1>&2 - warn_b=yes - - fi - - -# AM_PATH_GTK(1.0.0,,AC_MSG_ERROR([please install proper version of gtk])) -# AM_PATH_GTK__(0.9.4,,AC_MSG_ERROR([please install proper version of gtk--])) - -for ac_prog in makeinfo -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:1390: 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 - if test -n "$MAKEINFO"; then - ac_cv_prog_MAKEINFO="$MAKEINFO" # Let the user override the test. -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_MAKEINFO="$ac_prog" - break - fi - done - IFS="$ac_save_ifs" -fi -fi -MAKEINFO="$ac_cv_prog_MAKEINFO" -if test -n "$MAKEINFO"; then - echo "$ac_t""$MAKEINFO" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - -test -n "$MAKEINFO" && break -done -test -n "$MAKEINFO" || MAKEINFO="error" - -# AC_CHECK_SEARCH_RESULT($YODL2TEXINFO, yodl, -# You should install Yodl 1.30.pre6 or better) - - - trap '' 1 2 15 -cat > confcache <<\EOF -# This file is a shell script that caches the results of configure -# tests run on this system so they can be shared between configure -# scripts and configure runs. It is not useful on other systems. -# If it contains results you don't want to keep, you may remove or edit it. -# -# By default, configure uses ./config.cache as the cache file, -# creating it if it does not exist already. You can give configure -# the --cache-file=FILE option to use a different cache file; that is -# what configure does when it calls configure scripts in -# subdirectories, so they share the cache. -# Giving --cache-file=/dev/null disables caching, for debugging configure. -# config.status only pays attention to the cache file if you give it the -# --recheck option to rerun configure. -# -EOF -# The following way of writing the cache mishandles newlines in values, -# but we know of no workaround that is simple, portable, and efficient. -# So, don't put newlines in cache variables' values. -# Ultrix sh set writes to stderr and can't be redirected directly, -# and sets the high bit in the cache file unless we assign to the vars. -(set) 2>&1 | - case `(ac_space=' '; set) 2>&1` in - *ac_space=\ *) - # `set' does not quote correctly, so add quotes (double-quote substitution - # turns \\\\ into \\, and sed turns \\ into \). - sed -n \ - -e "s/'/'\\\\''/g" \ - -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p" - ;; - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p' - ;; - esac >> confcache -if cmp -s $cache_file confcache; then - : -else - if test -w $cache_file; then - echo "updating cache $cache_file" - cat confcache > $cache_file - else - echo "not updating unwritable cache $cache_file" - fi -fi -rm -f confcache - -trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 - -test "x$prefix" = xNONE && prefix=$ac_default_prefix -# Let make expand exec_prefix. -test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' - -# Any assignment to VPATH causes Sun make to only execute -# the first set of double-colon rules, so remove it if not needed. -# If there is a colon in the path, we need to keep it. -if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=[^:]*$/d' -fi - -trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 - -DEFS=-DHAVE_CONFIG_H - -# Without the "./", some shells look in PATH for config.status. -: ${CONFIG_STATUS=./config.status} - -echo creating $CONFIG_STATUS -rm -f $CONFIG_STATUS -cat > $CONFIG_STATUS </dev/null | sed 1q`: -# -# $0 $ac_configure_args -# -# Compiler output produced by configure, useful for debugging -# configure, is in ./config.log if it exists. - -ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]" -for ac_option -do - case "\$ac_option" in - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" - exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; - -version | --version | --versio | --versi | --vers | --ver | --ve | --v) - echo "$CONFIG_STATUS generated by autoconf version 2.12" - exit 0 ;; - -help | --help | --hel | --he | --h) - echo "\$ac_cs_usage"; exit 0 ;; - *) echo "\$ac_cs_usage"; exit 1 ;; - esac -done - -ac_given_srcdir=$srcdir - -trap 'rm -fr `echo "$CONFIGFILE.make:config.make.in $CONFIGFILE.hh:config.hh.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 -EOF -cat >> $CONFIG_STATUS < conftest.subs <<\\CEOF -$ac_vpsub -$extrasub -s%@CFLAGS@%$CFLAGS%g -s%@CPPFLAGS@%$CPPFLAGS%g -s%@CXXFLAGS@%$CXXFLAGS%g -s%@DEFS@%$DEFS%g -s%@LDFLAGS@%$LDFLAGS%g -s%@LIBS@%$LIBS%g -s%@exec_prefix@%$exec_prefix%g -s%@prefix@%$prefix%g -s%@program_transform_name@%$program_transform_name%g -s%@bindir@%$bindir%g -s%@sbindir@%$sbindir%g -s%@libexecdir@%$libexecdir%g -s%@datadir@%$datadir%g -s%@sysconfdir@%$sysconfdir%g -s%@sharedstatedir@%$sharedstatedir%g -s%@localstatedir@%$localstatedir%g -s%@libdir@%$libdir%g -s%@includedir@%$includedir%g -s%@oldincludedir@%$oldincludedir%g -s%@infodir@%$infodir%g -s%@mandir@%$mandir%g -s%@stepmake@%$stepmake%g -s%@package@%$package%g -s%@PACKAGE@%$PACKAGE%g -s%@PACKAGE_NAME@%$PACKAGE_NAME%g -s%@package_depth@%$package_depth%g -s%@AUTOGENERATE@%$AUTOGENERATE%g -s%@absolute_builddir@%$absolute_builddir%g -s%@STATE_VECTOR@%$STATE_VECTOR%g -s%@CONFIGSUFFIX@%$CONFIGSUFFIX%g -s%@host@%$host%g -s%@host_alias@%$host_alias%g -s%@host_cpu@%$host_cpu%g -s%@host_vendor@%$host_vendor%g -s%@host_os@%$host_os%g -s%@MAKE@%$MAKE%g -s%@FIND@%$FIND%g -s%@TAR@%$TAR%g -s%@BASH@%$BASH%g -s%@PYTHON@%$PYTHON%g -s%@DOTEXE@%$DOTEXE%g -s%@ZIP@%$ZIP%g -s%@LN@%$LN%g -s%@LN_S@%$LN_S%g -s%@INSTALL@%$INSTALL%g -s%@PATHSEP@%$PATHSEP%g -s%@DIRSEP@%$DIRSEP%g -s%@DIR_DATADIR@%$DIR_DATADIR%g -s%@STRIPROFF@%$STRIPROFF%g -s%@YODL@%$YODL%g -s%@YODL2HTML@%$YODL2HTML%g -s%@YODL2LATEX@%$YODL2LATEX%g -s%@YODL2MAN@%$YODL2MAN%g -s%@YODL2MSLESS@%$YODL2MSLESS%g -s%@YODL2TEXINFO@%$YODL2TEXINFO%g -s%@YODL2TXT@%$YODL2TXT%g -s%@YODL2LESS_DIR@%$YODL2LESS_DIR%g -s%@MAKEINFO@%$MAKEINFO%g - -CEOF -EOF - -cat >> $CONFIG_STATUS <<\EOF - -# Split the substitutions into bite-sized pieces for seds with -# small command number limits, like on Digital OSF/1 and HP-UX. -ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script. -ac_file=1 # Number of current file. -ac_beg=1 # First line for current file. -ac_end=$ac_max_sed_cmds # Line after last line for current file. -ac_more_lines=: -ac_sed_cmds="" -while $ac_more_lines; do - if test $ac_beg -gt 1; then - sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file - else - sed "${ac_end}q" conftest.subs > conftest.s$ac_file - fi - if test ! -s conftest.s$ac_file; then - ac_more_lines=false - rm -f conftest.s$ac_file - else - if test -z "$ac_sed_cmds"; then - ac_sed_cmds="sed -f conftest.s$ac_file" - else - ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file" - fi - ac_file=`expr $ac_file + 1` - ac_beg=$ac_end - ac_end=`expr $ac_end + $ac_max_sed_cmds` - fi -done -if test -z "$ac_sed_cmds"; then - ac_sed_cmds=cat -fi -EOF - -cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF -for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case "$ac_file" in - *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` - ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; - *) ac_file_in="${ac_file}.in" ;; - esac - - # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories. - - # Remove last slash and all that follows it. Not all systems have dirname. - ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` - if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then - # The file is in a subdirectory. - test ! -d "$ac_dir" && mkdir "$ac_dir" - ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`" - # A "../" for each directory in $ac_dir_suffix. - ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'` - else - ac_dir_suffix= ac_dots= - fi - - case "$ac_given_srcdir" in - .) srcdir=. - if test -z "$ac_dots"; then top_srcdir=. - else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;; - /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; - *) # Relative path. - srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix" - top_srcdir="$ac_dots$ac_given_srcdir" ;; - esac - - - echo creating "$ac_file" - rm -f "$ac_file" - configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure." - case "$ac_file" in - *Makefile*) ac_comsub="1i\\ -# $configure_input" ;; - *) ac_comsub= ;; - esac - - ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` - sed -e "$ac_comsub -s%@configure_input@%$configure_input%g -s%@srcdir@%$srcdir%g -s%@top_srcdir@%$top_srcdir%g -" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file -fi; done -rm -f conftest.s* - -# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where -# NAME is the cpp macro being defined and VALUE is the value it is being given. -# -# ac_d sets the value in "#define NAME VALUE" lines. -ac_dA='s%^\([ ]*\)#\([ ]*define[ ][ ]*\)' -ac_dB='\([ ][ ]*\)[^ ]*%\1#\2' -ac_dC='\3' -ac_dD='%g' -# ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE". -ac_uA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' -ac_uB='\([ ]\)%\1#\2define\3' -ac_uC=' ' -ac_uD='\4%g' -# ac_e turns "#undef NAME" without trailing blanks into "#define NAME VALUE". -ac_eA='s%^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' -ac_eB='$%\1#\2define\3' -ac_eC=' ' -ac_eD='%g' - -if test "${CONFIG_HEADERS+set}" != set; then -EOF -cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF -fi -for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case "$ac_file" in - *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` - ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; - *) ac_file_in="${ac_file}.in" ;; - esac - - echo creating $ac_file - - rm -f conftest.frag conftest.in conftest.out - ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` - cat $ac_file_inputs > conftest.in - -EOF - -# Transform confdefs.h into a sed script conftest.vals that substitutes -# the proper values into config.h.in to produce config.h. And first: -# Protect against being on the right side of a sed subst in config.status. -# Protect against being in an unquoted here document in config.status. -rm -f conftest.vals -cat > conftest.hdr <<\EOF -s/[\\&%]/\\&/g -s%[\\$`]%\\&%g -s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp -s%ac_d%ac_u%gp -s%ac_u%ac_e%gp -EOF -sed -n -f conftest.hdr confdefs.h > conftest.vals -rm -f conftest.hdr - -# This sed command replaces #undef with comments. This is necessary, for -# example, in the case of _POSIX_SOURCE, which is predefined and required -# on some systems where configure will not decide to define it. -cat >> conftest.vals <<\EOF -s%^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*%/* & */% -EOF - -# Break up conftest.vals because some shells have a limit on -# the size of here documents, and old seds have small limits too. - -rm -f conftest.tail -while : -do - ac_lines=`grep -c . conftest.vals` - # grep -c gives empty output for an empty file on some AIX systems. - if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi - # Write a limited-size here document to conftest.frag. - echo ' cat > conftest.frag <> $CONFIG_STATUS - sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS - echo 'CEOF - sed -f conftest.frag conftest.in > conftest.out - rm -f conftest.in - mv conftest.out conftest.in -' >> $CONFIG_STATUS - sed 1,${ac_max_here_lines}d conftest.vals > conftest.tail - rm -f conftest.vals - mv conftest.tail conftest.vals -done -rm -f conftest.vals - -cat >> $CONFIG_STATUS <<\EOF - rm -f conftest.frag conftest.h - echo "/* $ac_file. Generated automatically by configure. */" > conftest.h - cat conftest.in >> conftest.h - rm -f conftest.in - if cmp -s $ac_file conftest.h 2>/dev/null; then - echo "$ac_file is unchanged" - rm -f conftest.h - else - # Remove last slash and all that follows it. Not all systems have dirname. - ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` - if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then - # The file is in a subdirectory. - test ! -d "$ac_dir" && mkdir "$ac_dir" - fi - rm -f $ac_file - mv conftest.h $ac_file - fi -fi; done - -EOF -cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF - -exit 0 -EOF -chmod +x $CONFIG_STATUS -rm -fr confdefs* $ac_clean_files -test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 - - - rm -f GNUmakefile - cp make/toplevel.make.in ./GNUmakefile - chmod 444 GNUmakefile - diff --git a/stepmake/stepmake/package.make b/stepmake/stepmake/package.make index 6db8e29491..4bf347e9aa 100644 --- a/stepmake/stepmake/package.make +++ b/stepmake/stepmake/package.make @@ -17,8 +17,11 @@ deb: dpkg-buildpackage -b; \ )' -# makeflags=$(patsubst %==, %, $(patsubst %----,%,$(MAKEFLAGS:%=--%))) -makeflags=$(patsubst %==, %, $(patsubst %----,%,$($(MAKEFLAGS:%=--%):--unix=))) +# urg urg +# this one works for unix (try 'make diff help==' or 'make diff release==') +makeflags=$(patsubst %==, %, $(patsubst %----,%,$(MAKEFLAGS:%=--%))) +# and this one for nt +# makeflags=$(patsubst %==, %, $(patsubst %----,%,$($(MAKEFLAGS:%=--%):--unix%=%))) diff: $(PYTHON) $(step-bindir)/package-diff.py --package=$(topdir) $(makeflags) diff --git a/tex/fetdefs.tex b/tex/fetdefs.tex index b86d308249..20b12df5e0 100644 --- a/tex/fetdefs.tex +++ b/tex/fetdefs.tex @@ -12,6 +12,7 @@ \font\bracefontsixteen = feta-braces16 \font\fingerfontsixteen = feta-nummer4 \font\markfontsixteen = feta-nummer10 + \font\fetanummerjsixteen = feta-nummer6 \def\currentsize{sixteen} } @@ -22,6 +23,7 @@ \font\bracefonttwenty = feta-braces20 \font\fingerfonttwenty = feta-nummer5 \font\markfonttwenty = feta-nummer12 + \font\fetanummerjtwenty = feta-nummer7 \def\currentsize{twenty} } @@ -65,6 +67,7 @@ \def\fetanummer{\csname fetanummer\currentsize\endcsname} \def\dynfont{\csname dynfont\currentsize\endcsname} \def\fingerfont{\csname fingerfont\currentsize\endcsname} +\def\fetanummerj{\csname fetanummerj\currentsize\endcsname} \def\markfont{\csname markfont\currentsize\endcsname} %\sixteenfonts diff --git a/tex/lily-ps-defs.tex b/tex/lily-ps-defs.tex index 7fb1fcfec7..92cf4e73b7 100644 --- a/tex/lily-ps-defs.tex +++ b/tex/lily-ps-defs.tex @@ -82,7 +82,7 @@ bracket_v /bracket_u exch def 50 /bracket_alpha exch def staffheight 4 div /interline exch def stafflinethickness 1.2 mul /tuplet_t exch def -stafflinethickness 1.2 mul /volta_t exch def +stafflinethickness 2.5 mul /volta_t exch def 1 setlinecap} } diff --git a/tex/lilyponddefs.tex b/tex/lilyponddefs.tex index 4eeffbc50d..6e977a8ad6 100644 --- a/tex/lilyponddefs.tex +++ b/tex/lilyponddefs.tex @@ -139,6 +139,7 @@ \def\setdynamic#1{\dynfont #1} \def\setfinger#1{\fingerfont #1} \def\setnumber#1{\fetanummer #1} +\def\setnumberj#1{\fetanummerj #1} \def\setmark#1{\markfont #1} % big fat marks, if errors are detected.