From: fred Date: Wed, 27 Mar 2002 00:49:12 +0000 (+0000) Subject: lilypond-1.3.131 X-Git-Tag: release/1.5.59~923 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=63f306eddedb25c9770660bdd84fe7205398c6e1;p=lilypond.git lilypond-1.3.131 --- diff --git a/CHANGES b/CHANGES index 3f03f10d14..29b2aa7ecd 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,65 @@ +1.3.130.hwn2 +============ + +* Documentation: notation contexts. + +* 2001 (c) search-replace patch. + +* Center rehearsal marks by default. + +* Fixing collapsed dynamics with part-combine + +* \property tupletNumberFormatFunction selects formatting function for +tuplet brackets. + +1.3.130.jcn5 +============ + +* Added some handy targets to example makefile: make/ly.make. + +* Bugfix: file-path.cc; absolute directories start with directory separator. + +* Makefile template using dependencies: make/ly.make. Needs some +simple examples. + +* Depencies fixes for lilypond, ly2dvi (still kludged) and lilypond-book. + +* nl.po update. + +* Bugfixes and cleanups of mainly main.cc. + +* Enabled changing default tex output extension to ".lytex". + +* Bugfix: use init file extension .ly for extensionless input. + +* Ignore outname = ; settings in output blocks. + +* Revised input and output naming, now it's possible to include a +directory in the output name. This should fix some input/init name +related bugs. + +* Fixed dependencies for outdir in lilypond-book and ly2dvi. + +* Uniformised tags to read: Generated automatically by: . + +* Install make/* and stepmake/stepmake/* to enable making use of +stepmake templates. + +* Added example mutopia makefile: make/ly.make. + +* Lilypond-book now writes lily-.ly files. + +* Bugfix: don't display repeat colons for zero height bar lines; fixes +repeat barlines in lyrics. + +* Fixed markup definition and implementation, added baseline-skip +property; this makes multi-line markup text a lot easier. + +* Bugfix: chordChanges works with other rhythm of accompaniment, and +silly chord name typo fixes. + +1.3.130 +======= 1.3.129.jcn2 ============ diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely index 6161f908d4..4a8652b6f5 100644 --- a/Documentation/user/refman.itely +++ b/Documentation/user/refman.itely @@ -14,8 +14,6 @@ Rhythm staff (clef, x-notehead) - markup text - postscript, scheme output? (links to?) using/existance of ly2dvi, lilypond-book @@ -602,7 +600,9 @@ major key, e.g., @code{\minor} is defined as 3. The standard mode names @code{\ionian}, @code{\locrian}, @code{\aeolian}, @code{\mixolydian}, @code{\lydian}, @code{\phrygian}, and @code{\dorian} are also defined. -This command sets @code{Staff.keySignature}. +This command sets @code{Staff.keySignature}. + + @cindex @code{keySignature} @@ -1175,14 +1175,15 @@ name of the corresponding symbol appearing underneath. @subsubsection Text scripts @cindex Text scripts -FIXME: markup - -In addition, it is possible to place arbitrary strings of text or -@TeX{} above or below notes by using a string instead of an -identifier: @code{c^"text"}. Fingerings -can be placed by simply using digits. All of these note ornaments -appear in the printed output but have no effect on the MIDI rendering of -the music. +In addition, it is possible to place arbitrary strings of text or markup +text (see @ref{Text markup}) above or below notes by using a string +instead of an identifier: @code{c^"text"}. It is possible to use @TeX{} +commands, but this should be avoided because this makes it impossible +for LilyPond to compute the exact length of the string, which may lead +to collisions. Also, @TeX{} commands won't work with direct postscript +output. Fingerings can be placed by simply using digits. All of these +note ornaments appear in the printed output but have no effect on the +MIDI rendering of the music. @c . {Fingerings} @unnumberedsubsubsec Fingerings @@ -2802,25 +2803,159 @@ relative within transposed music, you must place an additional @section Engravers @cindex engravers @menu -* Selecting contexts:: -* Context definitions:: * Notation Contexts:: +* Creating contexts:: +* Default contexts:: +* Context properties:: +* Context definitions:: @end menu @c . {Music expressions} -@node Selecting contexts -@subsection Selecting contexts + + + +@c . {Notation Contexts} +@node Notation Contexts +@subsection Notation Contexts + +@cindex notation contexts + +Notation contexts are objects that only exist during a run of LilyPond. +During the interpretation phase of LilyPond (when lily prints +"interpreting music"), music a @code{\score} block is interpreted in +time order, i.e. in much the same order that humans read, play, and +write music. + +During this reading, the notation context is holds the state +for the current point within the music. It contains information like + +@itemize @bullet + @item What notes are playing at this point? + @item What symbols will be printed at this point? + @item What is the current key signature, time signature, point within + the measure, etc.? +@end itemize + +Contexts are grouped hierarchically: A @code{Voice} context is +contained in a @code{Staff} context (because a staff can contain +multiple voices at any point), a @code{Staff} context is contained in +a @code{Score}, @code{StaffGroup}, or @code{ChoirStaff} context (because +these can all contain multiple staffs). + + +Contexts associated with sheet music output are called @emph{notation +contexts}, those for sound output are called performance contexts. + + +@node Creating contexts +@subsection Creating contexts @cindex @code{\context} @cindex context selection +Contexts for a music expression can be selected manually, using the +following music expression. + @example \context @var{contexttype} [= @var{contextname}] @var{musicexpr} @end example -Interpret @var{musicexpr} within a context of type @var{contexttype}. -If the context does not exist, it will be created. The new context -can optionally be given a name. +This instructs lilypond to interpret @var{musicexpr} within the context + of type @var{contexttype} and with name @var{contextname}. If this +context does not exist, it will be created. + +@quotation + +@lilypond[verbatim] +\score { + \notes \relative c'' { + c4 f + } +} + +@end lilypond +@end quotation + +In this example, the @code{c} and @code{d} are printed on the +default staff. For the @code{e}, a context Staff called +@code{another} is specified; since that does not exist, a new +context is created. Within @code{another}, a (default) Voice context +is created for the @code{e4}. When all music referring to a +context is finished, the context is ended as well. So after the +third quarter, @code{another} is removed. + + + +@node Default contexts +@subsection Default contexts + +Most music expressions don't need @code{\context}: they inherit the +notation context from their parent. Each note is a music expression, and +as you can see in the following example, only the sequential music +enclosing the three notes has an explicit context. + +@lilypond[verbatim] +\score { \notes \context Voice = goUp { c'4 d' e' } } +@end lilypond + +There are some quirks that you must keep in mind when dealing with +defaults: + +Every top-level music is interpreted by the Score context, in other +words, you may think of @code{\score} working like +@example + \score @{ + \context Score @var{music} + @} +@end example + +Sequential music follows the contexts of its "children". Take this example +@lilypond +\score { \context Score \notes { c'4 ( d' )e' } } +@end lilypond + +The sequential music is interpreted by the Score context initially +(notice that the @code{\context} specification is redundant), but when a +note is encountered, contexts are setup to accept that note. In this +case, a Thread, Voice and Staff are created. The rest of the sequential +music is also interpreted with the same Thread, Voice and Staff context, +putting the notes on the same staff, in the same voice. + +This is a convenient mechanism, but do not expect opening chords to work +without @code{\context}. For every note, a separate staff +@lilypond +\score { \notes } +@end lilypond + +Of course, if the chord is preceded by a normal note in sequential +music, the chord will be interpreted by the Thread of the preceding +note: +@lilypond +\score { \notes { c'4 } } +@end lilypond + + + +@node Context properties +@subsection Context properties + +Notation contexts can be modified from within the @file{.ly} file. The +following music expression does that job: + +@cindex @code{\property} +@example + \property @var{contextname}.@var{propname} = @var{value} +@end example + +Sets the @var{propname} property of the context @var{contextname} to the +specified Scheme expression @var{value}. All @var{propname} and +@var{contextname} are strings, which are typically unquoted. + +Properties that are set in one context are inherited by all of the +contained contexts. This means that a property valid for the +@code{Voice} context can be set in the @code{Score} context (for +example) and thus take effect in all @code{Voice} contexts. + @@ -2830,8 +2965,8 @@ can optionally be given a name. @cindex context definition @cindex translator definition -@cindex engraver hacking +[todo: ] A notation contexts is defined by the following information @@ -2998,143 +3133,7 @@ translator: -@c . {Notation Contexts} -@node Notation Contexts -@subsection Notation Contexts - -@cindex notation contexts - -Notation contexts are objects that only exist during a run of -LilyPond. During the interpretation phase of LilyPond, the Music -expression contained in a @code{\score} block is interpreted in time -order. This is the order in which humans read, play, and write -music. - -A context is an object that holds the reading state of the -expression; it contains information like - -@itemize @bullet - @item What notes are playing at this point? - @item What symbols will be printed at this point? - @item In what style will they printed? - @item What is the current key signature, time signature, point within - the measure, etc.? -@end itemize - -Contexts are grouped hierarchically: A @code{Voice} context is -contained in a @code{Staff} context (because a staff can contain -multiple voices at any point), a @code{Staff} context is contained in -a @code{Score}, @code{StaffGroup}, or @code{ChoirStaff} context (because -these can all contain multiple staffs). - -Contexts associated with sheet music output are called @emph{notation -contexts}, those for sound output are called performance contexts. - -Contexts are created either manually or automatically. Initially, the -top level music expression is interpreted by the top level context (the -@code{Score} context). When a atomic music expression (i.e. a note, a -rest, etc.), a nested set of contexts is created that can process these -atomic expressions, as in this example: - -@example -\score @{ \notes @{ c4 @} @} -@end example - -The sequential music, `@code{@{ c4 @}}' is interpreted by @code{Score} -context. When the note @code{c4} itself is interpreted, a set of -contexts is needed that will accept notes. The default for this is a -@code{Voice} context, contained in a @code{Staff} context. Creation of -these contexts results in the staff being printed. - -@cindex context - -You can also create contexts manually, and you probably have to do so -if you want to typeset complicated multiple part material. If a -`@code{\context} @var{name} @var{musicexpr}' expression is encountered -during the interpretation phase, the @var{musicexpr} argument will be -interpreted with a context of type @var{name}. If you specify a name, -the specific context with that name is searched. - -[type vs id] - -If a context of the specified type and name can not be found, a new -one is created. For example, - -@quotation - -@lilypond[verbatim] -\score { - \notes \relative c'' { - c4 f - } -} - -@end lilypond -@end quotation - -In this example, the @code{c} and @code{d} are printed on the -default staff. For the @code{e}, a context Staff called -@code{another} is specified; since that does not exist, a new -context is created. Within @code{another}, a (default) Voice context -is created for the @code{e4}. When all music referring to a -context is finished, the context is ended as well. So after the -third quarter, @code{another} is removed. - -Almost all music expressions inherit their interpretation context -from their parent. In other words, suppose that the syntax for a -music expression is - -@example - - \keyword @var{musicexpr1} @var{musicexpr2} @dots{} -@end example - -When the interpretation of this music expression starts, the context -for @var{musicexpr1}, @var{musicexpr2}, etc. is that of the total -expression. - -Lastly, you may wonder, why this: - -@quotation - -@example -\score @{ - \notes \relative c'' @{ - c4 d4 e4 - @} -@} -@end example - -@end quotation - -doesn't result in this: - -@lilypond[] - - \score { - \notes \relative c'' { - - } - } - -@end lilypond - -For the @code{c4}, a default @code{Staff} (with a contained -@code{Voice}) context is created. After the @code{c4} ends, no -music refers to this default staff, so it would be ended, with the -result shown. To prevent this inconvenient behavior, the context to -which the sequential music refers is adjusted during the -interpretation. So after the @code{c4} ends, the context of the -sequential music is also the default @code{Voice} context. -The @code{d4} gets interpreted in the same context -as @code{c4}. - -Properties that are set in one context are inherited by all of the -contained contexts. This means that a property valid for the -@code{Voice} context can be set in the @code{Score} context (for -example) and thus take effect in all @code{Voice} contexts. - -Properties can be preset within the @code{\translator} block + Properties can be preset within the @code{\translator} block corresponding to the appropriate context. In this case, the syntax is @@ -3153,6 +3152,7 @@ called @emph{performers}. + @c . {Syntactic details} @node Syntactic details @section Syntactic details @@ -3725,18 +3725,9 @@ Translation? @cindex properties @unnumberedsubsec Translation property -[todo: add \set/\override/\revert] - -@cindex @code{\property} -@example - \property @var{contextname}.@var{propname} = @var{value} -@end example +[todo: add \set/\override/\revert] -Sets the @var{propname} property of the context @var{contextname} to -the specified @var{value}. All three arguments are strings. -Depending on the context, it may be necessary to quote the strings or -to leave space on both sides of the dot. @cindex output properties @@ -3788,6 +3779,8 @@ Don't move the finger 2, only text "m.d." ... @node Text markup @subsection Text markup +@cindex text markup +@cindex markup text LilyPond has an internal mechanism to typeset texts: you can form text markup expressions by composing scheme expressions @@ -3806,16 +3799,112 @@ in the following way: Formally, Scheme markup text is defined as follows: @example -text: string | (markup sentence) -sentence: text | sentence text -markup: property | abbrev | style +text: string | (head? text+) +head: markup | (markup+) +markup-item: property | abbrev | @var{fontstyle} property: (@var{key} . @var{value}) abbrev: @code{rows lines roman music bold italic named super sub text} -style: @var{fontstyle} @end example -The @var{key}-@var{value} pair is a grob property. [Why is this -useful?] The following abbreviations are currently defined: +The markup is broken down and converted into a list of grob properties, +which are prepended to the grop's property list. The +@var{key}-@var{value} pair is a grob property. +@ignore +[Why is this useful?] + +?Snapnie: markup text is eerste item dat voldoet aan mijn gewelfdige, +ideale idee van direct-en-eenmalig-per-item te zetten properties, ipv +gehaspel via \property en hopen dat je property (enkel) in juiste item +terecht gaat komen. Heb je deze wel bewust meegemaakt: + +Sender: jan@appel.lilypond.org +To: Han-Wen +Subject: (elt) properties +Organization: Jan at Appel +From: janneke@gnu.org +Date: 01 Nov 2000 10:39:10 +0100 +Message-ID: +User-Agent: Gnus/5.0807 (Gnus v5.8.7) Emacs/20.7 +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +Lines: 77 +Xref: appel.lilypond.org vers:1991 + +Hi, + +Wat ik vooral mis, is een koele manier om een propertie eenmalig aan +een element te hangen. Hoop dat je zinvol over wilt meedenken; zie +het monster van les-nereides. Misschien dat we 't niet moeten doen +voor 1.4 maar wachten tot properties nog wat verder +uitgekristalliseerd zijn? + +Nu moet je + + \property Voice.Stem \push #'length = #'6 + a + \property Voice.Stem \pop #'length + b + +waarmee je in feite zeg tegen de stem-engraver: vanaf nu aan moet je +alle stems 6 lang maken (maakt stem); onee, doe maar weer default +lengte. + +Maar dat is eigenlijk niet wat je bedoelt, wat je zou willen is net +zo'n directe interface als wat we nu hebben voor markup text, bv. iets +van: + + a+#'(Stem::length . 6) b + +Bij markup text kun je direct en eenmalig een reeks properties aan een +enkel item toevoegen; iets wat je volgens mij vaak nodig hebt. + +Ik zat eerst te denken aan ``request properties'': properties +toevoegen aan request, die dan worden doorgegeven aan alle items die +door dat request worden gemaakt. + +Maar misschien zuigt dat wel te vreselijk en moeten we iets van +``volatile'' properties maken. + +Btw, + + \property Voice.Slur \push #'dash = #1 + \property Voice.Slur \pop #'dash + a()b + \property Voice.Slur \push #'direction = #-1 + \property Voice.Slur \pop #'direction + ()c + +of de kluts waar ik brr van word, eigenlijk ook alleen doenbaar is +voor wat veelgebruikte properties: + + slurDotted = \property Voice.Slur \push #'dash = #1 + slurNoDots = \property Voice.Slur \pop #'dash + slurUp = \property Voice.Slur \push #'direction = #1 + slurDown = \property Voice.Slur \push #'direction = #-1 + slurBoth = \property Voice.Slur \pop #'direction + + [..] + + \slurDotted\slurDown + a()b + ()c + \slurNoDots\slurBoth + +zou toch graag meer iets in trant van, als je begrijpt wat ik bedoel + + Slur+#'((dash . 1) (direction . 1)) + b () c + Slur-#'(dash direction) + +ofwel + + a(+#'((dash . 1) (direction . 1)) + )b(+#'((dash . 1) (direction . 1)) + )c +@end ignore + +The following abbreviations are currently +defined: @table @code @item rows @@ -3844,10 +3933,10 @@ horizontal mode: set all text on one line (default) @var{fontstyle} may be any of @code{finger volta timesig mmrest mark script large Large dynamic} - +@ignore [kern, raise ??] - -[I still think that the semantics are weird, but well] +Wat is daarmee, zijn toch gewoon grob properties van text-interface? +@end ignore @c .{Local emacs vars} @c Local variables: diff --git a/VERSION b/VERSION index 2946fc3906..530cea21ba 100644 --- a/VERSION +++ b/VERSION @@ -1,7 +1,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=3 -PATCH_LEVEL=130 +PATCH_LEVEL=131 MY_PATCH_LEVEL= # use the above to send patches: MY_PATCH_LEVEL is always empty for a diff --git a/aclocal.m4 b/aclocal.m4 index 1a095357e6..377a145e20 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,3 +1,5 @@ +dnl WARNING WARNING WARNING WARNING +dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4 dnl aclocal.m4 -*-shell-script-*- dnl StepMake subroutines for configure.in @@ -373,6 +375,7 @@ dnl fi ZIP="zip -r -9" # program_suffix=.exe # urg + # ROOTSEP=':' # DIRSEP='\\' # PATHSEP=';' # @@ -395,10 +398,12 @@ dnl fi # this way, you may have buildscripts/out/lilypond-profile # 'automatically' sourced from /usr/etc/profile.d/ too. # + ROOTSEP=':' DIRSEP='/' PATHSEP=':' INSTALL="\$(SHELL) \$(stepdir)/../bin/install-dot-exe.sh -c" else + ROOTSEP='/' DIRSEP='/' PATHSEP=':' LN=ln diff --git a/configure b/configure index 6096179843..143b7e2aba 100755 --- a/configure +++ b/configure @@ -1123,6 +1123,7 @@ fi ZIP="zip -r -9" # program_suffix=.exe # urg + # ROOTSEP=':' # DIRSEP='\\' # PATHSEP=';' # @@ -1145,10 +1146,12 @@ fi # this way, you may have buildscripts/out/lilypond-profile # 'automatically' sourced from /usr/etc/profile.d/ too. # + ROOTSEP=':' DIRSEP='/' PATHSEP=':' INSTALL="\$(SHELL) \$(stepdir)/../bin/install-dot-exe.sh -c" else + ROOTSEP='/' DIRSEP='/' PATHSEP=':' LN=ln @@ -1286,7 +1289,7 @@ EOF # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1290: checking for $ac_word" >&5 +echo "configure:1293: 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 @@ -1316,7 +1319,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1320: checking for $ac_word" >&5 +echo "configure:1323: 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 @@ -1367,7 +1370,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1371: checking for $ac_word" >&5 +echo "configure:1374: 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 @@ -1399,7 +1402,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1403: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1406: 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. @@ -1410,12 +1413,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1414 "configure" +#line 1417 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1441,12 +1444,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1445: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1448: 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:1450: checking whether we are using GNU C" >&5 +echo "configure:1453: 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 @@ -1455,7 +1458,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1459: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1462: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1474,7 +1477,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1478: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1481: 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 @@ -1521,7 +1524,7 @@ fi # AC_HAVE_HEADERS(limits.h malloc.h string.h unistd.h values.h) echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1525: checking how to run the C preprocessor" >&5 +echo "configure:1528: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1536,13 +1539,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1546: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1549: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1553,13 +1556,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1563: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1566: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1570,13 +1573,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1580: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1583: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1604,17 +1607,17 @@ for ac_hdr in assert.h sys/stat.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1608: checking for $ac_hdr" >&5 +echo "configure:1611: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1618: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1621: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1641,12 +1644,12 @@ fi done echo $ac_n "checking whether stat file-mode macros are broken""... $ac_c" 1>&6 -echo "configure:1645: checking whether stat file-mode macros are broken" >&5 +echo "configure:1648: checking whether stat file-mode macros are broken" >&5 if eval "test \"`echo '$''{'ac_cv_header_stat_broken'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1707,7 +1710,7 @@ fi echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:1711: checking how to run the C++ preprocessor" >&5 +echo "configure:1714: checking how to run the C++ preprocessor" >&5 if test -z "$CXXCPP"; then if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1720,12 +1723,12 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross CXXCPP="${CXX-g++} -E" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1729: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1732: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1762,7 +1765,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1766: checking for $ac_word" >&5 +echo "configure:1769: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1794,7 +1797,7 @@ test -n "$CXX" || CXX="gcc" echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1798: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:1801: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1805,12 +1808,12 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext << EOF -#line 1809 "configure" +#line 1812 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:1814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1817: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1836,12 +1839,12 @@ if test $ac_cv_prog_cxx_works = no; then { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1840: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1843: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:1845: checking whether we are using GNU C++" >&5 +echo "configure:1848: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1850,7 +1853,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1854: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1857: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -1869,7 +1872,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}" ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:1873: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:1876: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1903,17 +1906,17 @@ fi ac_safe=`echo "FlexLexer.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for FlexLexer.h""... $ac_c" 1>&6 -echo "configure:1907: checking for FlexLexer.h" >&5 +echo "configure:1910: checking for FlexLexer.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1917: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1920: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1964,12 +1967,12 @@ fi echo $ac_n "checking whether explicit instantiation is needed""... $ac_c" 1>&6 -echo "configure:1968: checking whether explicit instantiation is needed" >&5 +echo "configure:1971: checking whether explicit instantiation is needed" >&5 if eval "test \"`echo '$''{'lily_cv_need_explicit_instantiation'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < struct foo { static int baz; }; @@ -1979,7 +1982,7 @@ int main() { return foo::baz; ; return 0; } EOF -if { (eval echo configure:1983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lily_cv_need_explicit_instantiation=no else @@ -2006,7 +2009,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2010: checking for $ac_word" >&5 +echo "configure:2013: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2049,7 +2052,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2053: checking for $ac_word" >&5 +echo "configure:2056: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_BISON'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2084,7 +2087,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2088: checking for $ac_word" >&5 +echo "configure:2091: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_FLEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2152,7 +2155,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2156: checking for $ac_word" >&5 +echo "configure:2159: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2185,7 +2188,7 @@ test -n "$AR" || AR="error" # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2189: checking for $ac_word" >&5 +echo "configure:2192: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2241,7 +2244,7 @@ fi echo $ac_n "checking language""... $ac_c" 1>&6 -echo "configure:2245: checking language" >&5 +echo "configure:2248: checking language" >&5 case "$language" in En* | en* | Am* | am* | US* | us*) lang=English;; @@ -2277,7 +2280,7 @@ EOF echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6 -echo "configure:2281: checking for gettext in -lintl" >&5 +echo "configure:2284: checking for gettext in -lintl" >&5 ac_lib_var=`echo intl'_'gettext | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2285,7 +2288,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2329,12 +2332,12 @@ fi for ac_func in gettext do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2333: checking for $ac_func" >&5 +echo "configure:2336: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2367: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2392,7 +2395,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2396: checking for $ac_word" >&5 +echo "configure:2399: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2423,7 +2426,7 @@ done test -n "$MSGFMT" || MSGFMT="\$(SHELL) \$(step-bindir)/fake-msgfmt.sh " echo $ac_n "checking whether msgfmt accepts -o""... $ac_c" 1>&6 -echo "configure:2427: checking whether msgfmt accepts -o" >&5 +echo "configure:2430: checking whether msgfmt accepts -o" >&5 msgfmt_output="`msgfmt -o bla 2>&1 | grep usage`" if test "$msgfmt_output" = ""; then echo "$ac_t""yes" 1>&6 @@ -2451,7 +2454,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2455: checking for $ac_word" >&5 +echo "configure:2458: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_METAFONT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2487,7 +2490,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2491: checking for $ac_word" >&5 +echo "configure:2494: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MFONT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2525,7 +2528,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2529: checking for $ac_word" >&5 +echo "configure:2532: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_METAPOST'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2561,7 +2564,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2565: checking for $ac_word" >&5 +echo "configure:2568: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MPOST'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2600,7 +2603,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2604: checking for $ac_word" >&5 +echo "configure:2607: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_INIMETAFONT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2636,7 +2639,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2640: checking for $ac_word" >&5 +echo "configure:2643: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_INIMFONT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2674,7 +2677,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2678: checking for $ac_word" >&5 +echo "configure:2681: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_INIMETAPOST'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2710,7 +2713,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2714: checking for $ac_word" >&5 +echo "configure:2717: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_INIMPOST'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2744,7 +2747,7 @@ test -n "$INIMPOST" || INIMPOST="-echo no inimp or inimpost" fi echo $ac_n "checking for working metafont mode""... $ac_c" 1>&6 -echo "configure:2748: checking for working metafont mode" >&5 +echo "configure:2751: checking for working metafont mode" >&5 modelist='ljfour lj4 lj3 lj2 ljet laserjet' for MFMODE in $modelist; do $METAFONT "\mode:=$MFMODE; mode_setup; end." > /dev/null 2>&1 @@ -2755,7 +2758,7 @@ echo "configure:2748: checking for working metafont mode" >&5 echo "$ac_t""$MFMODE" 1>&6 echo $ac_n "checking for mfplain.mp""... $ac_c" 1>&6 -echo "configure:2759: checking for mfplain.mp" >&5 +echo "configure:2762: checking for mfplain.mp" >&5 # # For now let people define these in their environments # @@ -2763,7 +2766,7 @@ echo "configure:2759: checking for mfplain.mp" >&5 echo "$ac_t""$MFPLAIN_MP" 1>&6 echo $ac_n "checking for inimetapost flags""... $ac_c" 1>&6 -echo "configure:2767: checking for inimetapost flags" >&5 +echo "configure:2770: checking for inimetapost flags" >&5 if test ${INIMETAPOST} = "inimp" ; then : ${INIMETAPOST_FLAGS=''} else @@ -2796,7 +2799,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2800: checking for $ac_word" >&5 +echo "configure:2803: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_KPSEWHICH'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2827,7 +2830,7 @@ done test -n "$KPSEWHICH" || KPSEWHICH="no" echo $ac_n "checking for tfm path""... $ac_c" 1>&6 -echo "configure:2831: checking for tfm path" >&5 +echo "configure:2834: checking for tfm path" >&5 TFM_FONTS="cmr msam" @@ -2855,13 +2858,13 @@ echo "configure:2831: checking for tfm path" >&5 ## First, let's just see if we can find Guile at all. echo $ac_n "checking "for guile-config"""... $ac_c" 1>&6 -echo "configure:2859: checking "for guile-config"" >&5 +echo "configure:2862: checking "for guile-config"" >&5 for guile_config in guile-config $target-guile-config $build-guile-config; do echo "$ac_t"""$guile_config"" 1>&6 if ! $guile_config --version > /dev/null 2>&1 ; then echo "configure: warning: "cannot execute $guile_config"" 1>&2 echo $ac_n "checking "if we are cross compiling"""... $ac_c" 1>&6 -echo "configure:2865: checking "if we are cross compiling"" >&5 +echo "configure:2868: checking "if we are cross compiling"" >&5 guile_config=error else break @@ -2872,7 +2875,7 @@ echo "configure:2865: checking "if we are cross compiling"" >&5 exit 1 fi echo $ac_n "checking "Guile version"""... $ac_c" 1>&6 -echo "configure:2876: checking "Guile version"" >&5 +echo "configure:2879: checking "Guile version"" >&5 need_guile_version="1.3.4" need_guile_version_numeric=100304 guile_version=`$guile_config --version 2>&1 | awk '{print $NF}'` @@ -2891,7 +2894,7 @@ else {last =0}} ## The GUILE_FLAGS macro. echo $ac_n "checking for Guile""... $ac_c" 1>&6 -echo "configure:2895: checking for Guile" >&5 +echo "configure:2898: checking for Guile" >&5 if ! $guile_config link > /dev/null ; then echo "$ac_t"""cannot execute $guile_config"" 1>&6 { echo "configure: error: "cannot find guile-config; is Guile installed?"" 1>&2; exit 1; } @@ -2906,7 +2909,7 @@ echo "configure:2895: checking for Guile" >&5 # Extract the first word of "guile", so it can be a program name with args. set dummy guile; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2910: checking for $ac_word" >&5 +echo "configure:2913: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GUILE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2956,17 +2959,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2960: checking for $ac_hdr" >&5 +echo "configure:2963: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2970: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2973: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2993,7 +2996,7 @@ fi done echo $ac_n "checking for kpse_find_file in -lkpathsea""... $ac_c" 1>&6 -echo "configure:2997: checking for kpse_find_file in -lkpathsea" >&5 +echo "configure:3000: checking for kpse_find_file in -lkpathsea" >&5 ac_lib_var=`echo kpathsea'_'kpse_find_file | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3001,7 +3004,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lkpathsea $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3048,12 +3051,12 @@ fi for ac_func in kpse_find_file do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3052: checking for $ac_func" >&5 +echo "configure:3055: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3108,7 +3111,7 @@ done fi echo $ac_n "checking whether to use kpathsea""... $ac_c" 1>&6 -echo "configure:3112: checking whether to use kpathsea" >&5 +echo "configure:3115: checking whether to use kpathsea" >&5 if test $kpathsea_b = yes; then echo "$ac_t""yes" 1>&6 KPATHSEA=1 @@ -3129,7 +3132,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3133: checking for $ac_word" >&5 +echo "configure:3136: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_BIBTEX2HTML'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3170,7 +3173,7 @@ test -n "$BIBTEX2HTML" || BIBTEX2HTML="error" echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -echo "configure:3174: checking for 8-bit clean memcmp" >&5 +echo "configure:3177: checking for 8-bit clean memcmp" >&5 if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3178,7 +3181,7 @@ else ac_cv_func_memcmp_clean=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_memcmp_clean=yes else @@ -3209,12 +3212,12 @@ echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6 test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}" echo $ac_n "checking for vprintf""... $ac_c" 1>&6 -echo "configure:3213: checking for vprintf" >&5 +echo "configure:3216: checking for vprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3247: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vprintf=yes" else @@ -3264,12 +3267,12 @@ fi if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 -echo "configure:3268: checking for _doprnt" >&5 +echo "configure:3271: checking for _doprnt" >&5 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func__doprnt=yes" else @@ -3322,12 +3325,12 @@ fi for ac_func in memmem snprintf vsnprintf gettext isinf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3326: checking for $ac_func" >&5 +echo "configure:3329: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3392,7 +3395,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3396: checking for $ac_word" >&5 +echo "configure:3399: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MAKEINFO'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3425,7 +3428,7 @@ test -n "$MAKEINFO" || MAKEINFO="error" # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3429: checking for $ac_word" >&5 +echo "configure:3432: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else diff --git a/scm/grob-description.scm b/scm/grob-description.scm index b1ecfc0a2a..7e814f0439 100644 --- a/scm/grob-description.scm +++ b/scm/grob-description.scm @@ -2,7 +2,7 @@ ;;;; ;;;; source file of the GNU LilyPond music typesetter ;;;; -;;;; (c) 1998--2000 Han-Wen Nienhuys +;;;; (c) 1998--2001 Han-Wen Nienhuys ;;;; Jan Nieuwenhuizen ; distances are given in stafflinethickness (thicknesses) and @@ -236,6 +236,7 @@ (molecule-callback . ,Text_item::brew_molecule) (break-align-symbol . Instrument_name) (visibility-lambda . ,begin-of-line-visible) + (baseline-skip . 2) (font-family . roman) (meta . ,(grob-description "InstrumentName" font-interface text-interface break-aligned-interface)) )) @@ -283,6 +284,9 @@ (RehearsalMark . ( (molecule-callback . ,Text_item::brew_molecule) + (X-offset-callbacks . (,Side_position::aligned_on_self)) + (self-alignment-X . 0) + (direction . 1) (breakable . #t) (font-family . number) @@ -588,6 +592,7 @@ (molecule-callback . ,Text_item::brew_molecule) (no-spacing-rods . #t) (padding . 0.5) + (baseline-skip . 2) (font-family . roman) (font-shape . italic) (meta . ,(grob-description "TextScript" text-script-interface text-interface side-position-interface font-interface )) @@ -634,8 +639,8 @@ (number-gap . 2.0) (delta-y . 0) (thick . 1.0) - (after-line-breaking-callback . ,Tuplet_spanner::after_line_breaking) - (molecule-callback . ,Tuplet_spanner::brew_molecule) + (after-line-breaking-callback . ,Tuplet_bracket::after_line_breaking) + (molecule-callback . ,Tuplet_bracket::brew_molecule) (font-family . roman) (font-shape . italic) (font-relative-size . -1) diff --git a/stepmake/configure b/stepmake/configure index d8d6046c95..0655a4f84e 100755 --- a/stepmake/configure +++ b/stepmake/configure @@ -1109,6 +1109,7 @@ fi ZIP="zip -r -9" # program_suffix=.exe # urg + # ROOTSEP=':' # DIRSEP='\\' # PATHSEP=';' # @@ -1131,10 +1132,12 @@ fi # this way, you may have buildscripts/out/lilypond-profile # 'automatically' sourced from /usr/etc/profile.d/ too. # + ROOTSEP=':' DIRSEP='/' PATHSEP=':' INSTALL="\$(SHELL) \$(stepdir)/../bin/install-dot-exe.sh -c" else + ROOTSEP='/' DIRSEP='/' PATHSEP=':' LN=ln @@ -1214,7 +1217,7 @@ fi echo $ac_n "checking language""... $ac_c" 1>&6 -echo "configure:1218: checking language" >&5 +echo "configure:1221: checking language" >&5 case "$language" in En* | en* | Am* | am* | US* | us*) lang=English;; @@ -1249,7 +1252,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1253: checking for $ac_word" >&5 +echo "configure:1256: 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