release: 1.1.31

diff --git a/Documentation/man/convert-mudela.yo b/Documentation/man/convert-mudela.yo
index 39a913b3d57dc429129f18bbef9ddd366927095b..70b122276431638710ba446f473e32f95de5806d 100644 (file)
--- a/Documentation/man/convert-mudela.yo
+++ b/Documentation/man/convert-mudela.yo
@@ -29,7 +29,7 @@ manpagesynopsis()
 manpageoptions()
 description(
 dit(--output)
 manpageoptions()
 description(
 dit(--output)

-    The output file to write
+    The output file to write [FIXME, doesn't work]

 dit(--edit)
     Do an inline edit of the input file. override @samp{--output}
 dit(--show-rules)
 dit(--edit)
     Do an inline edit of the input file. override @samp{--output}
 dit(--show-rules)


@@ -39,7 +39,7 @@ dit(--from=FROM_PATCHLEVEL)
     guess this, on the basis of code(\version) strings in the file
 dit(--to=TO_PATCHLEVEL)
     Set the goal version of the conversion. It defaults to the latest
     guess this, on the basis of code(\version) strings in the file
 dit(--to=TO_PATCHLEVEL)
     Set the goal version of the conversion. It defaults to the latest

-    available version.  
+    available version.

 )
 
 manpagesection(BUGS)
 )
 
 manpagesection(BUGS)

diff --git a/Documentation/man/out/convert-mudela.1 b/Documentation/man/out/convert-mudela.1
index 98f6f5d2dcfc9be5c34148dd4e8bb4edf070d71a..a25b0aff250bc5f63e8f619fd3facc6daece50c6 100644 (file)
--- a/Documentation/man/out/convert-mudela.1
+++ b/Documentation/man/out/convert-mudela.1
@@ -18,7 +18,7 @@ convert-mudela [options] [files]
 .PP 
 .SH "OPTIONS" 
 .IP "--output" 
 .PP 
 .SH "OPTIONS" 
 .IP "--output" 

-The output file to write
+The output file to write [FIXME, doesn\'t work]

 .IP "--edit" 
 Do an inline edit of the input file\&. override @samp{--output}
 .IP "--show-rules" 
 .IP "--edit" 
 Do an inline edit of the input file\&. override @samp{--output}
 .IP "--show-rules" 


@@ -28,7 +28,7 @@ Set the level to convert from\&. If this is not set, convert-mudela will
 guess this, on the basis of \f(CW\eversion\fP strings in the file
 .IP "--to=TO_PATCHLEVEL" 
 Set the goal version of the conversion\&. It defaults to the latest
 guess this, on the basis of \f(CW\eversion\fP strings in the file
 .IP "--to=TO_PATCHLEVEL" 
 Set the goal version of the conversion\&. It defaults to the latest

-available version\&.  
+available version\&.

 .PP 
 .SH "BUGS" 
 .PP 
 .PP 
 .SH "BUGS" 
 .PP 

diff --git a/Documentation/tex/other-packages.bib b/Documentation/tex/other-packages.bib
index b3d06ff0764620f694f1e1aa09e319eec1f2898e..30c1dd71e4ed63dbef5dd5f24fd14d691dee0473 100644 (file)
--- a/Documentation/tex/other-packages.bib
+++ b/Documentation/tex/other-packages.bib
@@ -36,8 +36,8 @@ symphonic music), as well as for operas or ballets. "
 }
 
 @Misc{mosaic,
 }
 
 @Misc{mosaic,

-  title =       {Mosaic},
-  note={Macintosh DTP-notation program},
+  title = {Mosaic},
+  note = {Macintosh DTP-notation program},

   publisher={Mark of the Unicorn},
   html={http://www.markoftheunicorn.com/english/software/mosaic/mosaic.html}
 }
   publisher={Mark of the Unicorn},
   html={http://www.markoftheunicorn.com/english/software/mosaic/mosaic.html}
 }


@@ -48,29 +48,34 @@ symphonic music), as well as for operas or ballets. "
   html={http://www.sover.net/\~graphire/},
 }
 
   html={http://www.sover.net/\~graphire/},
 }
 

+
+

 @Misc{Allin,
 @Misc{Allin,

-  OPTkey =      {},
-  OPTauthor =   {Thomas Allin},
-  OPTtitle =    {ALL IN theScore},
-  OPThowpublished = {},
-  OPTyear =     {1998},
-  OPTmonth =    {},
-  OPTnote =     {beta version of a w32 score editor},
-  OPTannote =   {},
+  author =      {Thomas Allin},
+  title =       {ALL IN theScore},
+  year =        1998,
+  note =        {beta version of a w32 score editor},

   html={http://www.musiker.nu/thescore/},
 }
 
   html={http://www.musiker.nu/thescore/},
 }
 

+@Manual{manus_writer,
+  title = {Manuscript Writer},
+  html= {http://ban.joh.cam.ac.uk/~ssb22/mwrhome/},
+  note = {Notation editor with braille support.},
+  author={Silas S. Brown},
+}
+

 @Misc{igor,
 @Misc{igor,

-  title =       {Igor},
+  title = {Igor},

   author = {Technoligor AB},
   author = {Technoligor AB},

-  note =        {Commercial music notation with bigwig supporters.
+  note = {Commercial music notation with bigwig supporters.

 Still in beta},
   html={http://www.igortech.pi.se/},
 }
 
 
 @Misc{songw,
 Still in beta},
   html={http://www.igortech.pi.se/},
 }
 
 
 @Misc{songw,

-html={www.ars-nova.com},
+html={http://www.ars-nova.com},

 title={Songworks},
 publisher={Ars Nova},
 address={Box 637,Kirkland, Washington 98083},
 title={Songworks},
 publisher={Ars Nova},
 address={Box 637,Kirkland, Washington 98083},


@@ -405,3 +410,4 @@ not know about musical structure. Shareware. },
 title={Musicator},
 html={http://www.musicator.com/welcome.htm}
 }
 title={Musicator},
 html={http://www.musicator.com/welcome.htm}
 }

+

diff --git a/NEWS b/NEWS
index e9700f9f65fab81cc52d738ab46e28105ff3dedf..a1ec9abbfb99e1f043acfbb059711bd84f667692 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,14 +1,28 @@
---- ../lilypond-1.1.30/NEWS    Mon Feb 15 15:43:56 1999
-++ b/NEWS      Wed Feb 17 00:10:16 1999
-@@ -1,3 +1,7 @@
+
+pl 30.jcn1
+       - sm fixes, intl/ fixes
+

 pl 30.mb1
        - Added support for magnification of TeX fonts ==> 
          larger dynamics in 20pt scores. (Doesn't work in Postscript)
 
 pl 30.mb1
        - Added support for magnification of TeX fonts ==> 
          larger dynamics in 20pt scores. (Doesn't work in Postscript)
 

- pl 30 (feb 15)
- 
- pl 29.uu1pl 30.jcn1
-       - sm fixes, intl/ fixes
+pl 30.hwn1
+       - Debian patches (thanks, Anthony)
+       - Italian support (thanks, Maurizio)
+       - parser cleanup
+       - minor chord.cc cleanups.
+       - bf: \rc \rced 
+       - hara kiri doesn't do suicide with normal rests.
+       - Hara_kiri_vertical_group_spanner generalised
+       - extender engraver rewrite, now __ is like ~ [] |, ie. in between
+notes/lyrics.
+       - lyric engraver now engraves only single voices.  Use
+separate LyricVoices to get stacked lyrics.
+       - bf: bar(Non)Auto first barline  
+       - barAuto -> barNonAuto
+
+
+*******

 
 pl 30 (feb 15)
 
 
 pl 30 (feb 15)
 

diff --git a/TODO b/TODO
index f31959ee40a87f4217c8cb7ac45009813e36538a..92f7be13bface2e4b88de966f6c1a0f5a7a5c971 100644 (file)
--- a/TODO
+++ b/TODO
@@ -10,9 +10,53 @@ grep for TODO and ugh/ugr/urg
 
 .* BUGS
 . * .ly files
 
 .* BUGS
 . * .ly files

+.  * input/star-spangled-banner

 .  * mutopia/J.S.Bach/wtk1-fugue2.ly
 .  * input/test/grace
 .  * mutopia/J.S.Bach/wtk1-fugue2.ly
 .  * input/test/grace

-.  * fix: text on rests: rediculous dims
+.  * fix: text on rests: ridiculous dims
+. * m=\notes\relative c''{
+
+c1 | \break
+R1*5 |
+r2 r4 \bar "||"; \break r |
+c2 c |
+}
+
+\score{
+  \type StaffGroup <
+      \type Staff = staffi {\m}
+      \type Staff = staffii {\m}
+    >
+}
+. * m=\notes\relative c'''{
+  \time 2/4;
+
+  R2*4 | c2 | c2 | c2 | c2 | c2 | c2 | c2 | c2 | c2 | \break
+  <{R2*10}{s2 \mark "A"; }> | % Too narrow space for the first rest in
+1.1.29
+  r4 r8 [g16 \p ( a ] |
+[ ) g8-. fis16 ( g ][ ) fis8-. f16 ( g ] |
+[ ) f8-. e16 ( f ][ ) e8-. es16 ( f ] |
+[ ) es8 \f c16 ( d][es8 d16 c ] |
+) d4 r8 [g16 \p ( a ] |
+[ ) g8-. fis16 ( g ][ ) fis8-. f16 ( g ] | \break
+) c2 | c2 | c2 | c2 | c2 | c2 | c2 | c2 | c2 |
+}
+
+\score{
+  \m
+  \paper{
+    \translator{
+      \ScoreContext
+      SkipBars = 1;
+    }
+    \translator {
+      \OrchestralPartStaffContext
+    }
+  }
+}
+. * - Look at input/test/span-bars.ly. The staff lines extend too far
+  to the left on the note systems including the GrandStaff.

 . * fix midi output:
 .  * default duration?  d
      duration must be not entered explicitely on first note.
 . * fix midi output:
 .  * default duration?  d
      duration must be not entered explicitely on first note.


@@ -28,21 +72,7 @@ grep for TODO and ugh/ugr/urg
 . * fix dynamics decently, ie. use kerning & ligatures.  
 . * fix "I've been drinking too much"
 . * support_l_arr_ empty in staff-margin's G_staff_side_item
 . * fix dynamics decently, ie. use kerning & ligatures.  
 . * fix "I've been drinking too much"
 . * support_l_arr_ empty in staff-margin's G_staff_side_item

-. * remove old preformats in RPM

 . * minVerticalAlign for StaffGroups.
 . * minVerticalAlign for StaffGroups.

-. * I have tried the barAuto property to get barlines when
-typesetting rhythms. Lily prints all barlines except 
-between first and second bar. Where is my mistake??
-
-\score{
-  \type RhythmicStaff<
-    \property RhythmicStaff.barAuto=1
-    \notes{ 
-      \time 3/4;
-        c4 c c | c c c | c c c
-    }
-  > 
-}

 . * declaring \score   
 . * is \break broken? input/test/hara-kiri.ly
 . * fix OrchestralScore and Hara-kiri (i.e., fix Coriolan)
 . * declaring \score   
 . * is \break broken? input/test/hara-kiri.ly
 . * fix OrchestralScore and Hara-kiri (i.e., fix Coriolan)


@@ -55,19 +85,17 @@ specify the third.  Should there be?
 
 .* TODO before 1.2
 . * Check gcc 2.8.1 compatibility
 
 .* TODO before 1.2
 . * Check gcc 2.8.1 compatibility

+. * make "in-between" engraver (Tie, Extender)

 . * use Drul_array for Interval.
 . * ties to tie only notes of the same pitch, so that
 . * use Drul_array for Interval.
 . * ties to tie only notes of the same pitch, so that

->      < a~  a,>  a
-> works as you'd expect it to.
+       < a~  a,>  a
+works as you'd expect it to.

 . * 1. Can Lily be told where to start numbering?
 . * 1. Can Lily be told where to start numbering?

-. * The timpani part has rests the full first line. Is it possible
-   to force lilypond to print all parts on the first page of the score
-   but use the hara-kiri mechanism on the remaining pages?

 . * do scaled fonts.
 . * profile atom smobs
 . * Try to use Killing_cons iso. Pointer_list
 . * make dependencies () a virtual function.
 . * do scaled fonts.
 . * profile atom smobs
 . * Try to use Killing_cons iso. Pointer_list
 . * make dependencies () a virtual function.

-. * fix Repeated_music_iterator::ok() (constness.)
+. * fix Repeated_music design

 . * one big ly2dvi input that includes *all* tests.
 . * Don't use boolean properties (0,1), instead check existence
 of property.
 . * one big ly2dvi input that includes *all* tests.
 . * Don't use boolean properties (0,1), instead check existence
 of property.


@@ -100,30 +128,6 @@ about 2.5 whole notes?  Is there a mechanism for getting this kind of
 length?  
 
 
 length?  
 
 

-Why does my second extender request get junked in the following:
-
-\score{
-< \notes \relative c''{ 
-     a4()b()c()d c()d()b()a }
-   \type Lyrics \lyrics {
-     foo1 __  bar2. __ _4 }
-> }
-
-It seems that \cr and \decr don't work any more.  
-
-\score{
-  \notes{
-    a \cr b \rc c }
-  \paper{linewidth=-1.;}
-}
-
-Gives me 
-
-qq.ly:3:9: warning: can't find (de)crescendo to end:
-    a \cr
-          b \rc c }
-
-

 
 Use of semicolons is still rather confusing.  They are obligatory
 after some types of assignments and illegal after others.  
 
 Use of semicolons is still rather confusing.  They are obligatory
 after some types of assignments and illegal after others.  

diff --git a/VERSION b/VERSION
index ef473575fab27baaa418a717cf746c35b8d6ce87..54f1f0b60f07d75afa030db451a4c37b963f8223 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,8 +1,8 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=1
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=1

-PATCH_LEVEL=30
-MY_PATCH_LEVEL=mb1
+PATCH_LEVEL=31
+MY_PATCH_LEVEL=

 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/aclocal.m4 b/aclocal.m4
index 4e05d378af3ce416f1d1835a7b76b86f447b7b00..cf4a69b433876b95869057abf25f026f1e46f8e6 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -165,18 +165,13 @@ AC_DEFUN(AC_STEPMAKE_GUILE, [
     # to force new check iso reading from cache
 
     # gh_scm2doubles,gh_doubles2scm are new in 1.3
     # to force new check iso reading from cache
 
     # gh_scm2doubles,gh_doubles2scm are new in 1.3

-    AC_CHECK_LIB(guile, gh_scm2doubles, \
-      LIBS="-lguile $LIBS"; AC_DEFINE(HAVE_LIBGUILE), \
-      AC_CHECK_LIB(readline, readline) \
-      AC_CHECK_LIB(dl, dlopen) \
-      AC_CHECK_LIB(socket, socket)\
-      AC_CHECK_LIB(termcap,tgetent)\
-      AC_CHECK_LIB(m, fabs)\
-      AC_CHECK_LIB(guile, gh_doubles2scm)\
+    GUILE_FLAGS
+    AC_CHECK_LIB(guile, gh_scm2doubles,
+      LIBS="`echo $GUILE_LDFLAGS | sed -e 's/-L[[[/-_a-zA-Z0-9]]]\+ //g'` $LIBS";
+      AC_DEFINE(HAVE_LIBGUILE), , $GUILE_LDFLAGS dnl

     )
     )

-    if test "$ac_cv_lib_guile_gh_scm2doubles" != yes -a \
-      "$ac_cv_lib_guile_gh_doubles2scm" != yes ; then
-           AC_STEPMAKE_WARN(You should install guile 1.3 or newer)
+    if test "$ac_cv_lib_guile_gh_scm2doubles" != yes ; then
+       AC_STEPMAKE_WARN(You should install guile 1.3 or newer)

     fi
 ])
 
     fi
 ])
 


@@ -988,3 +983,36 @@ main ()
   AC_SUBST(GTK___LIBS)
 ])
 
   AC_SUBST(GTK___LIBS)
 ])
 

+dnl   GUILE_FLAGS --- set flags for compiling and linking with Guile
+dnl
+dnl   This macro runs the `guile-config' script, installed with Guile,
+dnl   to find out where Guile's header files and libraries are
+dnl   installed.  It sets two variables, marked for substitution, as
+dnl   by AC_SUBST.
+dnl   
+dnl     GUILE_CFLAGS --- flags to pass to a C or C++ compiler to build
+dnl             code that uses Guile header files.  This is almost
+dnl             always just a -I flag.
+dnl   
+dnl     GUILE_LDFLAGS --- flags to pass to the linker to link a
+dnl             program against Guile.  This includes `-lguile' for
+dnl             the Guile library itself, any libraries that Guile
+dnl             itself requires (like -lqthreads), and so on.  It may
+dnl             also include a -L flag to tell the compiler where to
+dnl             find the libraries.
+
+AC_DEFUN([GUILE_FLAGS],[
+## The GUILE_FLAGS macro.
+  ## First, let's just see if we can find Guile at all.
+  AC_MSG_CHECKING(for Guile)
+  guile-config link > /dev/null || {
+    echo "configure: cannot find guile-config; is Guile installed?" 1>&2
+    exit 1
+  }
+  GUILE_CFLAGS="`guile-config compile`"
+  GUILE_LDFLAGS="`guile-config link`"
+  AC_SUBST(GUILE_CFLAGS)
+  AC_SUBST(GUILE_LDFLAGS)
+  AC_MSG_RESULT(yes)
+])
+

diff --git a/configure b/configure
index 450066ecdea975f7cbfa79b39f5261c757660f14..e1b187d738a279f0b528c6e1bd28d5d54bf7303c 100755 (executable)
--- a/configure
+++ b/configure
@@ -54,6 +54,9 @@ fi
 
 
 
 
 
 

+
+
+

 # 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.
 # 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.


@@ -721,7 +724,12 @@ EOF
 EOF
 
 
 EOF
 
 

-    package_depth=`dirname $cache_file`
+    if test "$package_depth" = "" ; then
+       package_depth="."
+    else
+       package_depth="../$package_depth"
+    fi
+    export package_depth

     
 
     AUTOGENERATE="This file was automatically generated by configure"
     
 
     AUTOGENERATE="This file was automatically generated by configure"


@@ -757,7 +765,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6

-echo "configure:761: checking host system type" >&5
+echo "configure:769: checking host system type" >&5

 
 host_alias=$host
 case "$host_alias" in
 
 host_alias=$host
 case "$host_alias" in


@@ -782,7 +790,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
 # 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
+echo "configure:794: 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 eval "test \"`echo '$''{'ac_cv_prog_MAKE'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -816,7 +824,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 # 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
+echo "configure:828: 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 eval "test \"`echo '$''{'ac_cv_prog_FIND'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -852,7 +860,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
 # 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:856: checking for $ac_word" >&5
+echo "configure:864: 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 eval "test \"`echo '$''{'ac_cv_prog_TAR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -886,7 +894,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
 # 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:890: checking for $ac_word" >&5
+echo "configure:898: 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 eval "test \"`echo '$''{'ac_cv_prog_BASH'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -919,7 +927,7 @@ 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
     # 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:923: checking for $ac_word" >&5
+echo "configure:931: 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
 if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -1148,7 +1156,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
     # 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:1152: checking for $ac_word" >&5
+echo "configure:1160: 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 eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -1177,7 +1185,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
   # 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:1181: checking for $ac_word" >&5
+echo "configure:1189: 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 eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -1225,7 +1233,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6

-echo "configure:1229: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1237: 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_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.


@@ -1235,11 +1243,11 @@ ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS
 cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext <<EOF
 cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext <<EOF

-#line 1239 "configure"
+#line 1247 "configure"

 #include "confdefs.h"
 main(){return(0);}
 EOF
 #include "confdefs.h"
 main(){return(0);}
 EOF

-if { (eval echo configure:1243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1251: \"$ac_link\") 1>&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_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then


@@ -1259,12 +1267,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: 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:1263: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1271: 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 "$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:1268: checking whether we are using GNU C" >&5
+echo "configure:1276: 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
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -1273,7 +1281,7 @@ else
   yes;
 #endif
 EOF
   yes;
 #endif
 EOF

-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1277: \"$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:1285: \"$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
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no


@@ -1288,7 +1296,7 @@ if test $ac_cv_prog_gcc = yes; then
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
   ac_save_CFLAGS="$CFLAGS"
   CFLAGS=
   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6

-echo "configure:1292: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1300: 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
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -1347,7 +1355,7 @@ EOF
 fi
 
 echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
 fi
 
 echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6

-echo "configure:1351: checking how to run the C++ preprocessor" >&5
+echo "configure:1359: 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
 if test -z "$CXXCPP"; then
 if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6


@@ -1360,12 +1368,12 @@ ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $L
 cross_compiling=$ac_cv_prog_cxx_cross
   CXXCPP="${CXX-g++} -E"
   cat > conftest.$ac_ext <<EOF
 cross_compiling=$ac_cv_prog_cxx_cross
   CXXCPP="${CXX-g++} -E"
   cat > conftest.$ac_ext <<EOF

-#line 1364 "configure"
+#line 1372 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:1369: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1377: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   :
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   :


@@ -1396,7 +1404,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
 # 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:1400: checking for $ac_word" >&5
+echo "configure:1408: 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 eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -1427,7 +1435,7 @@ test -n "$CXX" || CXX="gcc"
 
 
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
 
 
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6

-echo "configure:1431: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:1439: 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_ext=C
 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.


@@ -1437,11 +1445,11 @@ ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $L
 cross_compiling=$ac_cv_prog_cxx_cross
 
 cat > conftest.$ac_ext <<EOF
 cross_compiling=$ac_cv_prog_cxx_cross
 
 cat > conftest.$ac_ext <<EOF

-#line 1441 "configure"
+#line 1449 "configure"

 #include "confdefs.h"
 main(){return(0);}
 EOF
 #include "confdefs.h"
 main(){return(0);}
 EOF

-if { (eval echo configure:1445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1453: \"$ac_link\") 1>&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_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then


@@ -1461,12 +1469,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: 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:1465: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1473: 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 "$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:1470: checking whether we are using GNU C++" >&5
+echo "configure:1478: 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
 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -1475,7 +1483,7 @@ else
   yes;
 #endif
 EOF
   yes;
 #endif
 EOF

-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1479: \"$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:1487: \"$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
   ac_cv_prog_gxx=yes
 else
   ac_cv_prog_gxx=no


@@ -1490,7 +1498,7 @@ if test $ac_cv_prog_gxx = yes; then
   ac_save_CXXFLAGS="$CXXFLAGS"
   CXXFLAGS=
   echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
   ac_save_CXXFLAGS="$CXXFLAGS"
   CXXFLAGS=
   echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6

-echo "configure:1494: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:1502: 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
 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -1520,17 +1528,17 @@ fi
 
     ac_safe=`echo "FlexLexer.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for FlexLexer.h""... $ac_c" 1>&6
 
     ac_safe=`echo "FlexLexer.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for FlexLexer.h""... $ac_c" 1>&6

-echo "configure:1524: checking for FlexLexer.h" >&5
+echo "configure:1532: 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
 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

-#line 1529 "configure"
+#line 1537 "configure"

 #include "confdefs.h"
 #include <FlexLexer.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <FlexLexer.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:1534: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1542: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*


@@ -1581,12 +1589,12 @@ fi
 
 
     echo $ac_n "checking whether explicit instantiation is needed""... $ac_c" 1>&6
 
 
     echo $ac_n "checking whether explicit instantiation is needed""... $ac_c" 1>&6

-echo "configure:1585: checking whether explicit instantiation is needed" >&5
+echo "configure:1593: 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 <<EOF
 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 <<EOF

-#line 1590 "configure"
+#line 1598 "configure"

 #include "confdefs.h"
 
     template <class T> struct foo { static int baz; };
 #include "confdefs.h"
 
     template <class T> struct foo { static int baz; };


@@ -1596,7 +1604,7 @@ int main() {
  return foo<int>::baz; 
 ; return 0; }
 EOF
  return foo<int>::baz; 
 ; return 0; }
 EOF

-if { (eval echo configure:1600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1608: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then

   rm -rf conftest*
   lily_cv_need_explicit_instantiation=no
 else
   rm -rf conftest*
   lily_cv_need_explicit_instantiation=no
 else


@@ -1623,7 +1631,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
 # 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:1627: checking for $ac_word" >&5
+echo "configure:1635: 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 eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -1665,7 +1673,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
 # 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:1669: checking for $ac_word" >&5
+echo "configure:1677: 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 eval "test \"`echo '$''{'ac_cv_prog_BISON'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -1699,7 +1707,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
 # 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:1703: checking for $ac_word" >&5
+echo "configure:1711: 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 eval "test \"`echo '$''{'ac_cv_prog_FLEX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -1766,7 +1774,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
 # 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:1770: checking for $ac_word" >&5
+echo "configure:1778: 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 eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -1798,7 +1806,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
     # 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:1802: checking for $ac_word" >&5
+echo "configure:1810: 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 eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -1853,7 +1861,7 @@ fi
 
 
     echo $ac_n "checking language""... $ac_c" 1>&6
 
 
     echo $ac_n "checking language""... $ac_c" 1>&6

-echo "configure:1857: checking language" >&5    
+echo "configure:1865: checking language" >&5    

     case "$language" in
       En* | en* | Am* | am* | US* | us*)
            lang=English;;
     case "$language" in
       En* | en* | Am* | am* | US* | us*)
            lang=English;;


@@ -1889,7 +1897,7 @@ EOF
 
 
     echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6
 
 
     echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6

-echo "configure:1893: checking for gettext in -lintl" >&5
+echo "configure:1901: 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
 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


@@ -1897,7 +1905,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lintl  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-lintl  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 1901 "configure"
+#line 1909 "configure"

 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus


@@ -1911,7 +1919,7 @@ int main() {
 gettext()
 ; return 0; }
 EOF
 gettext()
 ; return 0; }
 EOF

-if { (eval echo configure:1915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then

   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -1941,12 +1949,12 @@ fi
     for ac_func in gettext
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
     for ac_func in gettext
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6

-echo "configure:1945: checking for $ac_func" >&5
+echo "configure:1953: 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 <<EOF
 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 <<EOF

-#line 1950 "configure"
+#line 1958 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */


@@ -1972,7 +1980,7 @@ $ac_func();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:1976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:1984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then

   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else


@@ -2004,7 +2012,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
 # 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:2008: checking for $ac_word" >&5
+echo "configure:2016: 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 eval "test \"`echo '$''{'ac_cv_prog_MSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -2034,7 +2042,7 @@ done
 test -n "$MSGFMT" || MSGFMT="\$(SHELL) \$(step-bindir)/fake-msgfmt.sh "
 
     echo $ac_n "checking whether msgfmt accepts -o""... $ac_c" 1>&6
 test -n "$MSGFMT" || MSGFMT="\$(SHELL) \$(step-bindir)/fake-msgfmt.sh "
 
     echo $ac_n "checking whether msgfmt accepts -o""... $ac_c" 1>&6

-echo "configure:2038: checking whether msgfmt accepts -o" >&5
+echo "configure:2046: 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
     msgfmt_output="`msgfmt -o bla 2>&1 | grep usage`"
     if test "$msgfmt_output" = ""; then
        echo "$ac_t""yes" 1>&6


@@ -2061,7 +2069,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
 # 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:2065: checking for $ac_word" >&5
+echo "configure:2073: 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 eval "test \"`echo '$''{'ac_cv_prog_METAFONT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -2096,7 +2104,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
 # 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:2100: checking for $ac_word" >&5
+echo "configure:2108: 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 eval "test \"`echo '$''{'ac_cv_prog_MFONT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -2133,7 +2141,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
 # 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:2137: checking for $ac_word" >&5
+echo "configure:2145: 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 eval "test \"`echo '$''{'ac_cv_prog_METAPOST'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -2168,7 +2176,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
 # 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:2172: checking for $ac_word" >&5
+echo "configure:2180: 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 eval "test \"`echo '$''{'ac_cv_prog_MPOST'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -2211,7 +2219,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
 # 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:2215: checking for $ac_word" >&5
+echo "configure:2223: 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 eval "test \"`echo '$''{'ac_cv_prog_STRIPROFF'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -2245,7 +2253,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
 # 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:2249: checking for $ac_word" >&5
+echo "configure:2257: 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 eval "test \"`echo '$''{'ac_cv_prog_YODL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -2279,7 +2287,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
 # 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:2283: checking for $ac_word" >&5
+echo "configure:2291: 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 eval "test \"`echo '$''{'ac_cv_prog_YODL2HTML'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -2313,7 +2321,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
 # 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:2317: checking for $ac_word" >&5
+echo "configure:2325: 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 eval "test \"`echo '$''{'ac_cv_prog_YODL2LATEX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -2346,7 +2354,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
 # 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:2350: checking for $ac_word" >&5
+echo "configure:2358: 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 eval "test \"`echo '$''{'ac_cv_prog_YODL2MAN'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -2380,7 +2388,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
 # 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:2384: checking for $ac_word" >&5
+echo "configure:2392: 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 eval "test \"`echo '$''{'ac_cv_prog_YODL2MSLESS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -2414,7 +2422,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
 # 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:2418: checking for $ac_word" >&5
+echo "configure:2426: 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 eval "test \"`echo '$''{'ac_cv_prog_YODL2TEXINFO'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -2448,7 +2456,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
 # 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:2452: checking for $ac_word" >&5
+echo "configure:2460: 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 eval "test \"`echo '$''{'ac_cv_prog_YODL2TXT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -2504,16 +2512,31 @@ test -n "$YODL2TXT" || YODL2TXT="-echo no yodl"
     # to force new check iso reading from cache
 
     # gh_scm2doubles,gh_doubles2scm are new in 1.3
     # to force new check iso reading from cache
 
     # gh_scm2doubles,gh_doubles2scm are new in 1.3

+    
+## The GUILE_FLAGS macro.
+  ## First, let's just see if we can find Guile at all.
+  echo $ac_n "checking for Guile""... $ac_c" 1>&6
+echo "configure:2520: checking for Guile" >&5
+  guile-config link > /dev/null || {
+    echo "configure: cannot find guile-config; is Guile installed?" 1>&2
+    exit 1
+  }
+  GUILE_CFLAGS="`guile-config compile`"
+  GUILE_LDFLAGS="`guile-config link`"
+  
+  
+  echo "$ac_t""yes" 1>&6
+

     echo $ac_n "checking for gh_scm2doubles in -lguile""... $ac_c" 1>&6
     echo $ac_n "checking for gh_scm2doubles in -lguile""... $ac_c" 1>&6

-echo "configure:2509: checking for gh_scm2doubles in -lguile" >&5
+echo "configure:2532: checking for gh_scm2doubles in -lguile" >&5

 ac_lib_var=`echo guile'_'gh_scm2doubles | 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"
 ac_lib_var=`echo guile'_'gh_scm2doubles | 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"
+LIBS="-lguile $GUILE_LDFLAGS      $LIBS"

 cat > conftest.$ac_ext <<EOF
 cat > conftest.$ac_ext <<EOF

-#line 2517 "configure"
+#line 2540 "configure"

 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus


@@ -2527,7 +2550,7 @@ int main() {
 gh_scm2doubles()
 ; return 0; }
 EOF
 gh_scm2doubles()
 ; return 0; }
 EOF

-if { (eval echo configure:2531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then

   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -2542,320 +2565,17 @@ LIBS="$ac_save_LIBS"
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
 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
+  LIBS="`echo $GUILE_LDFLAGS | sed -e 's/-L[/-_a-zA-Z0-9]\+ //g'` $LIBS";
+      cat >> confdefs.h <<\EOF

 #define HAVE_LIBGUILE 1
 EOF
 
 else
   echo "$ac_t""no" 1>&6
 #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:2555: 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 <<EOF
-#line 2563 "configure"
-#include "confdefs.h"
-/* 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 readline();
-
-int main() {
-readline()
-; return 0; }
-EOF
-if { (eval echo configure:2577: \"$ac_link\") 1>&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 <<EOF
-#define $ac_tr_lib 1
-EOF
-
-  LIBS="-lreadline $LIBS"
-
-else
-  echo "$ac_t""no" 1>&6
-fi
- \
-      echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:2605: 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 <<EOF
-#line 2613 "configure"
-#include "confdefs.h"
-/* 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 dlopen();
-
-int main() {
-dlopen()
-; return 0; }
-EOF
-if { (eval echo configure:2627: \"$ac_link\") 1>&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 <<EOF
-#define $ac_tr_lib 1
-EOF
-
-  LIBS="-ldl $LIBS"
-
-else
-  echo "$ac_t""no" 1>&6
-fi
- \
-      echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:2655: 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 <<EOF
-#line 2663 "configure"
-#include "confdefs.h"
-/* 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 socket();
-
-int main() {
-socket()
-; return 0; }
-EOF
-if { (eval echo configure:2677: \"$ac_link\") 1>&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
 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 <<EOF
-#define $ac_tr_lib 1
-EOF
-
-  LIBS="-lsocket $LIBS"
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-\
-      echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
-echo "configure:2705: 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 <<EOF
-#line 2713 "configure"
-#include "confdefs.h"
-/* 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 tgetent();
-
-int main() {
-tgetent()
-; return 0; }
-EOF
-if { (eval echo configure:2727: \"$ac_link\") 1>&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 <<EOF
-#define $ac_tr_lib 1
-EOF
-
-  LIBS="-ltermcap $LIBS"
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-\
-      echo $ac_n "checking for fabs in -lm""... $ac_c" 1>&6
-echo "configure:2755: 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 <<EOF
-#line 2763 "configure"
-#include "confdefs.h"
-/* 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 fabs();
-
-int main() {
-fabs()
-; return 0; }
-EOF
-if { (eval echo configure:2777: \"$ac_link\") 1>&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 <<EOF
-#define $ac_tr_lib 1
-EOF
-
-  LIBS="-lm $LIBS"
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-\
-      echo $ac_n "checking for gh_doubles2scm in -lguile""... $ac_c" 1>&6
-echo "configure:2805: checking for gh_doubles2scm in -lguile" >&5
-ac_lib_var=`echo guile'_'gh_doubles2scm | 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 <<EOF
-#line 2813 "configure"
-#include "confdefs.h"
-/* 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 gh_doubles2scm();
-
-int main() {
-gh_doubles2scm()
-; return 0; }
-EOF
-if { (eval echo configure:2827: \"$ac_link\") 1>&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 <<EOF
-#define $ac_tr_lib 1
-EOF
-
-  LIBS="-lguile $LIBS"
-
-else
-  echo "$ac_t""no" 1>&6
-fi
-\
-    
-fi
-
-    if test "$ac_cv_lib_guile_gh_scm2doubles" != yes -a \
-      "$ac_cv_lib_guile_gh_doubles2scm" != yes ; then
-           
+    if test "$ac_cv_lib_guile_gh_scm2doubles" != yes ; then
+       

     echo "configure: warning: You should install guile 1.3 or newer" 1>&2
     warn_b=yes
 
     echo "configure: warning: You should install guile 1.3 or newer" 1>&2
     warn_b=yes
 


@@ -2864,7 +2584,7 @@ fi
 
 
 echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
 
 
 echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6

-echo "configure:2868: checking for 8-bit clean memcmp" >&5
+echo "configure:2588: 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 eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -2872,7 +2592,7 @@ else
   ac_cv_func_memcmp_clean=no
 else
   cat > conftest.$ac_ext <<EOF
   ac_cv_func_memcmp_clean=no
 else
   cat > conftest.$ac_ext <<EOF

-#line 2876 "configure"
+#line 2596 "configure"

 #include "confdefs.h"
 #ifdef __cplusplus
 extern "C" void exit(int);
 #include "confdefs.h"
 #ifdef __cplusplus
 extern "C" void exit(int);


@@ -2885,7 +2605,7 @@ main()
 }
 
 EOF
 }
 
 EOF

-if { (eval echo configure:2889: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2609: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null

 then
   ac_cv_func_memcmp_clean=yes
 else
 then
   ac_cv_func_memcmp_clean=yes
 else


@@ -2903,12 +2623,12 @@ 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
 test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.o"
 
 echo $ac_n "checking for vprintf""... $ac_c" 1>&6

-echo "configure:2907: checking for vprintf" >&5
+echo "configure:2627: 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 <<EOF
 if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF

-#line 2912 "configure"
+#line 2632 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char vprintf(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char vprintf(); below.  */


@@ -2934,7 +2654,7 @@ vprintf();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:2938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then

   rm -rf conftest*
   eval "ac_cv_func_vprintf=yes"
 else
   rm -rf conftest*
   eval "ac_cv_func_vprintf=yes"
 else


@@ -2958,12 +2678,12 @@ fi
 
 if test "$ac_cv_func_vprintf" != yes; then
 echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
 
 if test "$ac_cv_func_vprintf" != yes; then
 echo $ac_n "checking for _doprnt""... $ac_c" 1>&6

-echo "configure:2962: checking for _doprnt" >&5
+echo "configure:2682: 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 <<EOF
 if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF

-#line 2967 "configure"
+#line 2687 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char _doprnt(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char _doprnt(); below.  */


@@ -2989,7 +2709,7 @@ _doprnt();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:2993: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2713: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then

   rm -rf conftest*
   eval "ac_cv_func__doprnt=yes"
 else
   rm -rf conftest*
   eval "ac_cv_func__doprnt=yes"
 else


@@ -3016,12 +2736,12 @@ fi
 for ac_func in memmem snprintf vsnprintf gettext
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 for ac_func in memmem snprintf vsnprintf gettext
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6

-echo "configure:3020: checking for $ac_func" >&5
+echo "configure:2740: 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 <<EOF
 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 <<EOF

-#line 3025 "configure"
+#line 2745 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */


@@ -3047,7 +2767,7 @@ $ac_func();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:3051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:2771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then

   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else


@@ -3086,7 +2806,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
 # 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:3090: checking for $ac_word" >&5
+echo "configure:2810: 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 eval "test \"`echo '$''{'ac_cv_prog_MAKEINFO'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -3313,6 +3033,8 @@ s%@YODL2MSLESS@%$YODL2MSLESS%g
 s%@YODL2TEXINFO@%$YODL2TEXINFO%g
 s%@YODL2TXT@%$YODL2TXT%g
 s%@YODL2LESS_DIR@%$YODL2LESS_DIR%g
 s%@YODL2TEXINFO@%$YODL2TEXINFO%g
 s%@YODL2TXT@%$YODL2TXT%g
 s%@YODL2LESS_DIR@%$YODL2LESS_DIR%g

+s%@GUILE_CFLAGS@%$GUILE_CFLAGS%g
+s%@GUILE_LDFLAGS@%$GUILE_LDFLAGS%g

 s%@LIBOBJS@%$LIBOBJS%g
 s%@MAKEINFO@%$MAKEINFO%g
 
 s%@LIBOBJS@%$LIBOBJS%g
 s%@MAKEINFO@%$MAKEINFO%g
 

diff --git a/debian/GNUmakefile b/debian/GNUmakefile
index 6aac4c82213c16c0adbfe053c04d5258ca24464f..b49c00723418e0c52f35cb11c8e79f2b774c74bc 100644 (file)
--- a/debian/GNUmakefile
+++ b/debian/GNUmakefile
@@ -2,15 +2,16 @@
 
 depth = ..
 
 
 depth = ..
 

-NAME= debian
-BLURBS=BLURB
+NAME = debian
+BLURBS = BLURB

 AT_FILES = $(BLURBS) # 
 at-dir = $(outdir)/
 at-ext =
 
 EXTRA_DIST_FILES = README.Debian TODO $(CONF_FILES) $(OUT_DIST_FILES) control.foka
 AT_FILES = $(BLURBS) # 
 at-dir = $(outdir)/
 at-ext =
 
 EXTRA_DIST_FILES = README.Debian TODO $(CONF_FILES) $(OUT_DIST_FILES) control.foka

-CONF_FILES=changelog copyright postinst postrm rules watch 
-OUTCONF_FILES=$(addprefix $(outdir)/, $(basename $(CONF_FILES))) $(OUTIN_FILES)
+CONF_FILES = changelog copyright preinst postinst postrm rules watch 
+#OUTCONF_FILES = $(addprefix $(outdir)/, $(basename $(CONF_FILES))) $(OUTIN_FILES)
+OUTCONF_FILES = $(OUTIN_FILES)

 OUT_DIST_FILES = $(OUTIN_FILES)
 
 STEPMAKE_TEMPLATES = yolily-debian
 OUT_DIST_FILES = $(OUTIN_FILES)
 
 STEPMAKE_TEMPLATES = yolily-debian

diff --git a/debian/changelog b/debian/changelog
index 26392962b384b963dc70e65ad11d1d1697d9e81c..0cdc629af710678d88476011d99e9ffa483ad8e3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,88 @@
-lilypond (1.0.16-1) unstable; urgency=low
+lilypond (1.1.29-1) unstable; urgency=low

 
   * New upstream release.
 
   * New upstream release.

+  * [stepmake/aclocal.m4]: AC_STEPMAKE_GUILE now calls the GUILE_FLAGS
+      macro to set -lqthreads etc., otherwise Guile would not be detected
+      by the configure script.
+
+ -- Anthony Fok <foka@debian.org>  Sun, 14 Feb 1999 09:05:00 -0700
+
+lilypond (1.0.19.uu3-1) frozen unstable; urgency=low
+
+  * New upstream bug-fix release.
+
+ -- Anthony Fok <foka@debian.org>  Sat, 12 Dec 1998 04:23:15 -0700
+
+lilypond (1.0.19.uu1-2) frozen unstable; urgency=low
+
+  * [debian/rules]: Now builds the LilyPond documentation in dvi format.
+      Thanks to Roland Rosenfeld <roland@spinnaker.rhein.de>
+      for the bug report. (closes: Bug#30123).
+  * [debian/control]: Now also Recommends: tetex-extra (>= 0.9.981030-1)
+      because the .dvi documentation uses the EC fonts in that package.
+
+ -- Anthony Fok <foka@debian.org>  Thu, 10 Dec 1998 17:43:57 -0700
+
+lilypond (1.0.19.uu1-1) frozen unstable; urgency=low
+
+  * New upstream bug-fix release.
+
+ -- Anthony Fok <foka@debian.org>  Mon,  7 Dec 1998 13:12:02 -0700
+
+lilypond (1.0.18-2) frozen unstable; urgency=low
+
+  * [debian/rules]: Added symlink /usr/lib/texmf/fonts/afm/public/lilypond.
+      Thanks to Julian Gilbey <jdg@maths.qmw.ac.uk> for the bug report
+      (closes: Bug#29407).
+  * [scripts/ly2dvi.py]: Re-added a patch similar to the one in 1.0.17-1,
+      but teTeX's default search path is now placed *before* the ones that
+      ly2dvi adds.  Thanks to Roland Rosenfeld <roland@spinnaker.rhein.de>
+      for the bug report. (closes: Bug#29459).
+
+ -- Anthony Fok <foka@debian.org>  Mon, 23 Nov 1998 21:29:25 -0700
+
+lilypond (1.0.18-1) frozen unstable; urgency=low
+
+  * New upstream bug-fix release.
+  * [debian/control]:
+      - Upgraded to standards version 2.5.0.0 (no changes).
+      - Recommends: python-misc (>= 1.5.1) because ly2dvi needs the glob
+        module in the python-misc package (closes: Bug#29283).
+      - Updated dependencies on tetex* to the latest versions:
+          Depends: tetex-bin (>= 0.9.981031-2)
+          Recommends: tetex-base (>= 0.9.981030-1)
+        due to changes in tetex's directory structure.
+  * [debian/rules]:
+      - The symlink ../../../../../share/lilypond/mf is now named
+        /usr/lib/texmf/fonts/source/public/lilypond instead of
+        /usr/lib/texmf/fonts/source/public/mf (Bug#29284).
+      - In the latest tetex-base package, /usr/lib/texmf/doc is now a
+        symlink to /usr/doc/texmf.  Therefore, we now install lilypond's
+        documentation into /usr/doc/texmf/musixtex/lilypond.
+        (closes: Bug#28999, Bug#29326)
+  * [debian/preinst]:
+      - The script now removes the directories
+        /var/spool/texmf/pk/*/public/mf and /var/spool/texmf/tfm/public/mf
+        created inadvertently by Debian's buggy lilypond 1.0.17-1.  :-)
+        (Bug#29284)
+      - Since 1.0.17-1, /usr/lib/texmf/tex/lilypond has been changed to a
+        symbolic directory.  The script now removes the old real directory
+        to prevent problems during upgrade (closes: Bug#29284).
+  * [debian/postinst]: I copied a few lines from tetex-nonfree's postinst
+      to remove the old directory /usr/lib/texmf/doc if lilypond is the
+      last package to use that directory, and create a symlink to
+      /usr/doc/texmf.  :-)
+  * Rebuilt with yodl (1.31.7-1) installed to ensure the documentations
+    are compiled properly (closes: Bug#29285).
+  * Thanks to Fabien Ninoles <fab@tzone.org>, Roland Rosenfeld
+    <roland@spinnaker.rhein.de> and Julian Gilbey <jdg@maths.qmw.ac.uk>
+    for reporting the bugs listed above. :-)
+
+ -- Anthony Fok <foka@debian.org>  Thu, 12 Nov 1998 03:14:25 -0700
+
+lilypond (1.0.17-1) frozen unstable; urgency=low
+
+  * New upstream "stable" release.

   * [debian/{copyright,control}]: pcnov095.win.tue.nl -> ftp.cs.uu.nl
       (New upstream master FTP site).  Also updated JCN's web site URL.
   * [debian/rules]: 
   * [debian/{copyright,control}]: pcnov095.win.tue.nl -> ftp.cs.uu.nl
       (New upstream master FTP site).  Also updated JCN's web site URL.
   * [debian/rules]: 


@@ -11,9 +93,17 @@ lilypond (1.0.16-1) unstable; urgency=low
         run.  Thanks to Roman Hodek <Roman.Hodek@informatik.uni-erlangen.de>
         for reporting the problem!  (closes: Bug#27044)
       - Updated debian/rules according to the new debhelper rules example.
         run.  Thanks to Roman Hodek <Roman.Hodek@informatik.uni-erlangen.de>
         for reporting the problem!  (closes: Bug#27044)
       - Updated debian/rules according to the new debhelper rules example.

-  * [Documentation/topdocs/AUTHORS.yo]: Added a trailing "/" on URLs.
-
- -- Anthony Fok <foka@debian.org>  Thu, 15 Oct 1998 04:49:40 -0600
+      - Now configures with --disable-optimise instead of --enable-optimise,
+        otherwise it would not compile.
+      - Added symlinks to directories under /usr/lib/texmf because lilypond
+        now puts everything under /usr/share/lilypond.
+  * [Documentation/topdocs/AUTHORS.yo]: Added a trailing "/" on URLs. 
+  * [scripts/ly2dvi.py]: Added a hack to add an extra os.pathsep (":" on
+      Linux) to TEXINPUTS and MFINPUTS, otherwise ly2dvi and TeX would fail
+      to find the necessary files.
+  * Compiled with libstdc++2.9.  :-)
+
+ -- Anthony Fok <foka@debian.org>  Tue,  3 Nov 1998 14:31:18 -0700

 
 lilypond (1.0.2-1) unstable; urgency=low
 
 
 lilypond (1.0.2-1) unstable; urgency=low
 


@@ -73,8 +163,9 @@ lilypond (0.1.60-1) frozen unstable; urgency=medium
 
   * New upstream release with lots of bug fixes, including the MIDI
     generation bug in 0.1.48.  Please put this in Hamm.
 
   * New upstream release with lots of bug fixes, including the MIDI
     generation bug in 0.1.48.  Please put this in Hamm.

-  * debian/rules:
+  * debian/control:

      - Upgraded to standards version 2.4.1.0 (no changes).
      - Upgraded to standards version 2.4.1.0 (no changes).

+  * debian/rules:

      - lilypond now also depends on tetex-base (>= 0.9-5)
        and conflicts with tetex-base (<< 0.9).
   * Modified postinst and postrm to work with teTeX 0.9 / Web2C 7.2:
      - lilypond now also depends on tetex-base (>= 0.9-5)
        and conflicts with tetex-base (<< 0.9).
   * Modified postinst and postrm to work with teTeX 0.9 / Web2C 7.2:

diff --git a/debian/control b/debian/control
index 8e150650c8f7ef26875a753004a9d62caa2a1341..16f5a7d875b43aa540f9b95e0f0e539ece1c9d0c 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,12 @@ Source: lilypond
 Section: tex
 Priority: optional
 Maintainer: Anthony Fok <foka@debian.org>
 Section: tex
 Priority: optional
 Maintainer: Anthony Fok <foka@debian.org>

-Standards-Version: 2.4.1.0
+Standards-Version: 2.5.0.0

 
 Package: lilypond
 Architecture: any
 
 Package: lilypond
 Architecture: any

-Depends: ${shlibs:Depends}, tetex-base (>= 0.9-5)
-Recommends: python-base (>= 1.5.1)
+Depends: ${shlibs:Depends}, tetex-bin (>= 0.9.981031-2)
+Recommends: python-base (>= 1.5.1), python-misc (>= 1.5.1), tetex-base (>= 0.9.981030-1), tetex-extra (>= 0.9.981030-1)

 Conflicts: musixtex-fonts, tetex-base (<< 0.9)
 Description: The GNU Project music typesetter.
  LilyPond is the GNU Project music typesetter.  This program can print
 Conflicts: musixtex-fonts, tetex-base (<< 0.9)
 Description: The GNU Project music typesetter.
  LilyPond is the GNU Project music typesetter.  This program can print


@@ -20,5 +20,6 @@ Description: The GNU Project music typesetter.
   URLs: http://www.cs.uu.nl/~hanwen/lilypond/
         http://www.xs4all.nl/~jantien/lilypond/
         http://sca.uwaterloo.ca/~praetzel/lilypond/
   URLs: http://www.cs.uu.nl/~hanwen/lilypond/
         http://www.xs4all.nl/~jantien/lilypond/
         http://sca.uwaterloo.ca/~praetzel/lilypond/

+       http://www.lilypond.org/

   Authors: Han-Wen Nienhuys <hanwen@cs.uu.nl>
            Jan Nieuwenhuizen <janneke@gnu.org>
   Authors: Han-Wen Nienhuys <hanwen@cs.uu.nl>
            Jan Nieuwenhuizen <janneke@gnu.org>

diff --git a/debian/control.foka b/debian/control.foka
index 1054ef466ec56ce370858c47b72d8fce845f82c5..0dfe808530cebfa1246d9a2d2006e6ff2ec1deb6 100644 (file)
--- a/debian/control.foka
+++ b/debian/control.foka
@@ -2,31 +2,23 @@ Source: lilypond
 Section: tex
 Priority: optional
 Maintainer: Anthony Fok <foka@debian.org>
 Section: tex
 Priority: optional
 Maintainer: Anthony Fok <foka@debian.org>

-Standards-Version: 2.4.1.0
+Standards-Version: 2.5.0.0

 
 Package: lilypond
 Architecture: any
 
 Package: lilypond
 Architecture: any

-Depends: ${shlibs:Depends}, tetex-base (>= 0.9-5)
-Recommends: python-base (>= 1.5.1)
+Depends: ${shlibs:Depends}, tetex-bin (>= 0.9.981031-2)
+Recommends: python-base (>= 1.5.1), python-misc (>= 1.5.1), tetex-base (>= 0.9.981030-1), tetex-extra (>= 0.9.981030-1)

 Conflicts: musixtex-fonts, tetex-base (<< 0.9)
 Description: The GNU Project music typesetter.
  LilyPond is the GNU Project music typesetter.  This program can print
  beautiful sheet music from a music definition file.  It can also play
  mechanical performances to a MIDI file.  Features include multiple
 Conflicts: musixtex-fonts, tetex-base (<< 0.9)
 Description: The GNU Project music typesetter.
  LilyPond is the GNU Project music typesetter.  This program can print
  beautiful sheet music from a music definition file.  It can also play
  mechanical performances to a MIDI file.  Features include multiple

- staffs, meters, clefs, keys, lyrics, versatile input language,
- cadenzas, beams, slurs, triplets, formatting scores, part extraction.
- It includes a nice font of musical symbols.
- .
- LilyPond is de muziek typesetter van het GNU Project.
- Het programma genereert prachtige bladmuziek uit een muziek definitie
- bestand.  Ook kan het (mechanische) uitvoeringen afspelen naar MIDI
- bestanden.  Bijzondere mogelijkheden omvatten verscheidene notenbalken,
- maatsoorten, sleutels, toonsoorten, zangteksten, krachtige invoer taal,
- cadensa, balken, boogjes, triolen, partituren, en losse partijen.  Een
- fraai font met muzikeksymbolen wordt meegeleverd.
+ staffs, meters, clefs, keys, lyrics, versatile input language, cadenzas,
+ beams, slurs, triplets, formatting scores, part extraction.  It includes
+ a nice font of musical symbols.

  .
   URLs: http://www.cs.uu.nl/~hanwen/lilypond/
  .
   URLs: http://www.cs.uu.nl/~hanwen/lilypond/

-        http://www.digicash.com/~jan/lilypond/
-        http://sca.uwaterloo.ca/lilypond/
+        http://www.xs4all.nl/~jantien/lilypond/
+        http://sca.uwaterloo.ca/~praetzel/lilypond/

   Authors: Han-Wen Nienhuys <hanwen@cs.uu.nl>
            Jan Nieuwenhuizen <janneke@gnu.org>
   Authors: Han-Wen Nienhuys <hanwen@cs.uu.nl>
            Jan Nieuwenhuizen <janneke@gnu.org>

diff --git a/debian/control.in b/debian/control.in
index 6cde23db40af957a04393fb11fbada05c760945f..e864f159730a5045829e73783b3647cc48d9569d 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -2,17 +2,18 @@ Source: lilypond
 Section: tex
 Priority: optional
 Maintainer: Anthony Fok <foka@debian.org>
 Section: tex
 Priority: optional
 Maintainer: Anthony Fok <foka@debian.org>

-Standards-Version: 2.4.1.0
+Standards-Version: 2.5.0.0

 
 Package: lilypond
 Architecture: any
 
 Package: lilypond
 Architecture: any

-Depends: ${shlibs:Depends}, tetex-base (>= 0.9-5)
-Recommends: python-base (>= 1.5.1)
+Depends: ${shlibs:Depends}, tetex-bin (>= 0.9.981031-2)
+Recommends: python-base (>= 1.5.1), python-misc (>= 1.5.1), tetex-base (>= 0.9.981030-1), tetex-extra (>= 0.9.981030-1)

 Conflicts: musixtex-fonts, tetex-base (<< 0.9)
 Description: The GNU Project music typesetter.@BLURB@
  .
   URLs: http://www.cs.uu.nl/~hanwen/lilypond/
         http://www.xs4all.nl/~jantien/lilypond/
         http://sca.uwaterloo.ca/~praetzel/lilypond/
 Conflicts: musixtex-fonts, tetex-base (<< 0.9)
 Description: The GNU Project music typesetter.@BLURB@
  .
   URLs: http://www.cs.uu.nl/~hanwen/lilypond/
         http://www.xs4all.nl/~jantien/lilypond/
         http://sca.uwaterloo.ca/~praetzel/lilypond/

+       http://www.lilypond.org/

   Authors: Han-Wen Nienhuys <hanwen@cs.uu.nl>
            Jan Nieuwenhuizen <janneke@gnu.org>
   Authors: Han-Wen Nienhuys <hanwen@cs.uu.nl>
            Jan Nieuwenhuizen <janneke@gnu.org>

diff --git a/debian/copyright b/debian/copyright
index 551e4d52e1873b3942e0b536ed47727ebe134875..f27e69008b5f24f049be69f3874b9720dbd101f8 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,7 +2,7 @@ This package was debianized by Anthony Fok <foka@debian.org> on
 Wed,  6 Aug 1997 04:30:28 -0600
 
 It was downloaded from
 Wed,  6 Aug 1997 04:30:28 -0600
 
 It was downloaded from

-      ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/development/lilypond-1.0.16.tar.gz
+      ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/development/lilypond-1.1.29.tar.gz

 
 It is also available from:
 
 
 It is also available from:
 


@@ -11,6 +11,7 @@ It is also available from:
 For more information about GNU LilyPond, please visit:
       http://www.cs.uu.nl/~hanwen/lilypond/
   or  http://www.xs4all.nl/~jantien/
 For more information about GNU LilyPond, please visit:
       http://www.cs.uu.nl/~hanwen/lilypond/
   or  http://www.xs4all.nl/~jantien/

+  or  http://www.lilypond.org/

   or  http://sca.uwaterloo.ca/lilypond/
 
 Authors:
   or  http://sca.uwaterloo.ca/lilypond/
 
 Authors:

diff --git a/debian/out/control b/debian/out/control
index 8e150650c8f7ef26875a753004a9d62caa2a1341..16f5a7d875b43aa540f9b95e0f0e539ece1c9d0c 100644 (file)
--- a/debian/out/control
+++ b/debian/out/control
@@ -2,12 +2,12 @@ Source: lilypond
 Section: tex
 Priority: optional
 Maintainer: Anthony Fok <foka@debian.org>
 Section: tex
 Priority: optional
 Maintainer: Anthony Fok <foka@debian.org>

-Standards-Version: 2.4.1.0
+Standards-Version: 2.5.0.0

 
 Package: lilypond
 Architecture: any
 
 Package: lilypond
 Architecture: any

-Depends: ${shlibs:Depends}, tetex-base (>= 0.9-5)
-Recommends: python-base (>= 1.5.1)
+Depends: ${shlibs:Depends}, tetex-bin (>= 0.9.981031-2)
+Recommends: python-base (>= 1.5.1), python-misc (>= 1.5.1), tetex-base (>= 0.9.981030-1), tetex-extra (>= 0.9.981030-1)

 Conflicts: musixtex-fonts, tetex-base (<< 0.9)
 Description: The GNU Project music typesetter.
  LilyPond is the GNU Project music typesetter.  This program can print
 Conflicts: musixtex-fonts, tetex-base (<< 0.9)
 Description: The GNU Project music typesetter.
  LilyPond is the GNU Project music typesetter.  This program can print


@@ -20,5 +20,6 @@ Description: The GNU Project music typesetter.
   URLs: http://www.cs.uu.nl/~hanwen/lilypond/
         http://www.xs4all.nl/~jantien/lilypond/
         http://sca.uwaterloo.ca/~praetzel/lilypond/
   URLs: http://www.cs.uu.nl/~hanwen/lilypond/
         http://www.xs4all.nl/~jantien/lilypond/
         http://sca.uwaterloo.ca/~praetzel/lilypond/

+       http://www.lilypond.org/

   Authors: Han-Wen Nienhuys <hanwen@cs.uu.nl>
            Jan Nieuwenhuizen <janneke@gnu.org>
   Authors: Han-Wen Nienhuys <hanwen@cs.uu.nl>
            Jan Nieuwenhuizen <janneke@gnu.org>

diff --git a/debian/preinst b/debian/preinst
new file mode 100644 (file)
index 0000000..cf27f6b
--- /dev/null
+++ b/debian/preinst
@@ -0,0 +1,58 @@
+#!/bin/sh
+#
+# preinst script for the Debian GNU/Linux lilypond package
+#   by Anthony Fok <foka@debian.org>
+#   This is free software; see the GNU General Public Licence
+#   version 2 or later for copying conditions.  There is NO warranty.
+#   Last modified:  Tue, 10 Nov 1998 23:47:00 -0700
+
+set -e
+
+package=lilypond
+font_supplier=public
+font_typeface=lilypond
+std_TEXMFMAIN=/usr/lib/texmf
+std_VARTEXFONTS=/var/spool/texmf
+
+#DEBHELPER#
+
+TEXMFMAIN=`/usr/bin/kpsewhich -expand-var '$TEXMFMAIN'`
+: ${TEXMFMAIN:=$std_TEXMFMAIN}
+VARTEXFONTS=`/usr/bin/kpsewhich -expand-var '$VARTEXFONTS'`
+: ${VARTEXFONTS=$std_VARTEXFONTS}
+
+LILYTEXINPUTS=$TEXMFMAIN/tex/$package
+LILYMFINPUTS=$TEXMFMAIN/fonts/source/$font_supplier/$font_typeface
+
+case "$1" in
+    install|upgrade)
+       # Clear out the old TFM and PK files in case the fonts were
+       # left-over from previous installations
+       rm -rf $VARTEXFONTS/tfm/$font_supplier/$font_typeface
+       rm -rf $VARTEXFONTS/pk/*/$font_supplier/$font_typeface
+
+       # Fix a silly bug in Debian's lilypond 1.0.17-1.  :-)
+       if [ "$2" = "1.0.17-1" ]; then
+           rm -rf $VARTEXFONTS/tfm/$font_supplier/mf
+           rm -rf $VARTEXFONTS/pk/*/$font_supplier/mf
+       fi
+
+       # Since 1.0.17-1, /usr/lib/texmf/tex/lilypond has been changed
+        # to a symbolic directory.  Remove the old real directory to
+        # prevent problems during upgrade.
+       for i in $LILYTEXINPUTS $LILYMFINPUTS; do
+           if [ -d $i -a ! -L $i ]; then
+               rm -rf $i
+           fi
+       done
+    ;;
+
+    abort-upgrade)
+    ;;
+
+    *)
+       echo "$0 called with unknown argument \`$1'" >&2
+       exit 0
+    ;;
+
+esac

diff --git a/debian/rules b/debian/rules
index 3a78b27b076649df29eae835799d8c165e594b1f..adf3d4219c75d2681198394c03194efa7b8255b5 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -20,8 +20,9 @@ build: build-stamp
 build-stamp:
        dh_testdir
 
 build-stamp:
        dh_testdir
 

+       # CC=egcc LIBS=-lqthreads

        CC=egcc ./configure --disable-checking --disable-debugging \
        CC=egcc ./configure --disable-checking --disable-debugging \

-               --enable-printing --prefix=/usr --enable-optimise \
+               --enable-printing --prefix=/usr --disable-optimise \

                --enable-shared
        $(MAKE) all
        # $(MAKE) htmldoc
                --enable-shared
        $(MAKE) all
        # $(MAKE) htmldoc


@@ -36,9 +37,9 @@ clean:
 
        # Correct the owner of the out/dummy.dep files when built with sudo.
        if [ -n "$$SUDO_USER" -a -n "$$SUDO_GID" ]; then \
 
        # Correct the owner of the out/dummy.dep files when built with sudo.
        if [ -n "$$SUDO_USER" -a -n "$$SUDO_GID" ]; then \

-               find . -user root | xargs -r chown $$SUDO_USER.$$SUDO_GID; \
+               find . -user root | xargs -r chown --dereference $$SUDO_USER.$$SUDO_GID; \

        else \
        else \

-               find . -user root | xargs -r chown $$LOGNAME; \
+               find . -user root | xargs -r chown --dereference $$LOGNAME; \

        fi
 
        # Remove the following line once the *.make files are fixed
        fi
 
        # Remove the following line once the *.make files are fixed


@@ -73,7 +74,7 @@ binary-arch: build install
        dh_testdir
        dh_testroot
        cp -av mudela-mode.el $(r)/usr/lib/emacs/site-lisp
        dh_testdir
        dh_testroot
        cp -av mudela-mode.el $(r)/usr/lib/emacs/site-lisp

-       dh_installdocs ANNOUNCEMENT ANNOUNCE-0.1 NEWS* DEDICATION \
+       dh_installdocs ANNOUNCEMENT ANNOUNCE-0.1 NEWS-* DEDICATION \

                BUGS TODO *.txt \
                Documentation/pictures/*.xpm \
                Documentation/out/*.txt \
                BUGS TODO *.txt \
                Documentation/pictures/*.xpm \
                Documentation/out/*.txt \


@@ -89,12 +90,9 @@ binary-arch: build install
 #      dh_installcron
 #      dh_installmanpages
 #      dh_undocumented
 #      dh_installcron
 #      dh_installmanpages
 #      dh_undocumented

-       dh_installchangelogs
+       dh_installchangelogs -k NEWS

 #      dh_strip
        dh_compress
 #      dh_strip
        dh_compress

-       ( cd $(r)/$(d) && \
-               if [ -f NEWS ]; then gzip -9vf NEWS; fi )
-       ln -s NEWS.gz $(r)/$(d)/changelog.gz

        dh_fixperms
        dh_suidregister
        dh_installdeb
        dh_fixperms
        dh_suidregister
        dh_installdeb

diff --git a/debian/watch b/debian/watch
index 9b35470c7c3e24195316dde3f306bdf47203516d..2d48c588b081f5908e1788cec1b2f894483aba21 100644 (file)
--- a/debian/watch
+++ b/debian/watch
@@ -1,5 +1,5 @@
 # Example watch control file for uscan
 # Rename this file to "watch" and then you can run the "uscan" command
 # to check for upstream updates and more.
 # Example watch control file for uscan
 # Rename this file to "watch" and then you can run the "uscan" command
 # to check for upstream updates and more.

-# Site         Directory                       Pattern                 Version Script
-ftp.cs.uu.nl   /pub/GNU/LilyPond/development   lilypond-*.tar.gz       debian  uupdate
+# Site         Directory               Pattern                 Version Script
+ftp.cs.uu.nl   /pub/GNU/LilyPond/v1.1  lilypond-*.tar.gz       debian  uupdate

diff --git a/input/star-spangled-banner.ly b/input/star-spangled-banner.ly
index f5b05d1e3525efd6e602df580337f680451ced1a..299c10b610a0f5660ff3ede627746dd9739a65ed 100644 (file)
--- a/input/star-spangled-banner.ly
+++ b/input/star-spangled-banner.ly
@@ -3,14 +3,15 @@ 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
 %}
 http://www.Arkkra.com/doc/star.html
 http://www.Arkkra.com/doc/star.ps
 %}

+

 \header{
 \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";
+       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 {
 }
 
 $staff1_voice_1 = \notes {


@@ -56,14 +57,16 @@ $staff2_voice_2 = \notes {
   g8. g16 fis4.~a,8 d8 e8 fis2 b8 b8 a4. a8 a,4 d2 s4 
 }
 
   g8. g16 fis4.~a,8 d8 e8 fis2 b8 b8 a4. a8 a,4 d2 s4 
 }
 

-$text = \lyrics{
-  Oh4 __ \repeat 2 { }
+text = \lyrics
+\type LyricVoice { Oh4 __ \repeat 2 { }

   \alternative < 
   \alternative < 

-  { 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 }
-  { stripes4 and bright stars,2 through8. the16 per-4 il- ous fight,2
-  O'er8 the8 ram-4. parts8 we4 watched,2 were8. so16 gal-4 lant- ly }
+     { 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 }
+
+    \type LyricVoice = LVB
+    { stripes4 and bright stars,2 through8. the16 per-4 il- ous fight,2
+    O'er8 the8 ram-4. parts8 we4 watched,2 were8. so16 gal-4 lant- ly }

   >
   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.
   >
   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.


@@ -92,9 +95,7 @@ global = \notes {
                        \notes \transpose c'' {\voiceone \$staff1_voice_1 } 
                        \notes \transpose c'' {\voicetwo \$staff1_voice_2 } 
                >
                        \notes \transpose c'' {\voiceone \$staff1_voice_1 } 
                        \notes \transpose c'' {\voicetwo \$staff1_voice_2 } 
                >

-               \type Lyrics = one \lyrics <
-                       \$text
-               >
+               \type Lyrics = one \text

                \type Staff=staffB < 
                        \global
                        \clef bass;
                \type Staff=staffB < 
                        \global
                        \clef bass;

diff --git a/intl/libintl.inst b/intl/libintl.inst
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/lily/atom.cc b/lily/atom.cc
index 6ad4adca0418e19272cc0a44ba855aa7bb406426..7a336f524ee23c9628f721f555aa68f3279d1994 100644 (file)
--- a/lily/atom.cc
+++ b/lily/atom.cc
@@ -22,7 +22,7 @@ Atom::Atom(SCM s)
 }
 
 
 }
 
 

-#if 0
+#if ATOM_SMOB

 int
 Atom::smob_display (SCM smob, SCM port, scm_print_state*)
 {
 int
 Atom::smob_display (SCM smob, SCM port, scm_print_state*)
 {

diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc
index 2ce8813b6d229d8e2f08b374651244a5e87fc67f..9098cba68fd6c9f3c0aaa49a1b079322406e6df6 100644 (file)
--- a/lily/auto-beam-engraver.cc
+++ b/lily/auto-beam-engraver.cc
@@ -126,6 +126,9 @@ Auto_beam_engraver::consider_end_and_begin ()
        begin_mom = begin_mult.to_rat ();
     }
 
        begin_mom = begin_mult.to_rat ();
     }
 

+  /* UGH
+     Rational != Float
+  */

   Real f;
   if (end_mom)
     f = fmod (time->whole_in_measure_, end_mom);
   Real f;
   if (end_mom)
     f = fmod (time->whole_in_measure_, end_mom);

diff --git a/lily/bar-engraver.cc b/lily/bar-engraver.cc
index 5d3993f232aa4de588d5d9a9baa4e46d9e71d55a..e7bdb019ac596ecea219ee8252c3a6f646eb7c8b 100644 (file)
--- a/lily/bar-engraver.cc
+++ b/lily/bar-engraver.cc
@@ -93,8 +93,6 @@ Bar_engraver::do_creation_processing ()
 {
   create_bar ();
   bar_p_->type_str_ = "";
 {
   create_bar ();
   bar_p_->type_str_ = "";

-  Scalar prop = get_property ("barAuto", 0);
-  auto_create_bar_b_ = prop.to_bool ();

 }
 
 void
 }
 
 void


@@ -123,13 +121,12 @@ Bar_engraver::do_process_requests()
     }
   else 
     {
     }
   else 
     {

-      Scalar always = get_property ("barAlways", 0);
-      if ((time && !time->whole_in_measure_) || always.to_bool ())
+      Scalar nonauto = get_property ("barNonAuto", 0);
+      if (!nonauto.to_bool ())

        {
        {

-         if (auto_create_bar_b_)
+         Scalar always = get_property ("barAlways", 0);
+         if ((time && !time->whole_in_measure_) || always.to_bool ())

            create_bar ();
            create_bar ();

-         Scalar prop = get_property ("barAuto", 0);
-         auto_create_bar_b_ = prop.to_bool ();

        }
     }
   
        }
     }
   

diff --git a/lily/bar.cc b/lily/bar.cc
index 3e9556da75f48f171cfc7119c593bea084ef59db..60941be60a153ee17b1d745ca8f70d4e08503176 100644 (file)
--- a/lily/bar.cc
+++ b/lily/bar.cc
@@ -25,7 +25,7 @@ void
 Bar::do_print () const
 {
 #ifndef NPRINT
 Bar::do_print () const
 {
 #ifndef NPRINT

-  DOUT << type_str_;
+    //  DOUT << type_str_; "{[" confuse  indenter.

 #endif
 }
 
 #endif
 }
 

diff --git a/lily/chord.cc b/lily/chord.cc
index c85ea0610a58be729dc22cd449f2ecd74d8840bf..e08ce282e65f36f5a6a0996b824446ab52beadef 100644 (file)
--- a/lily/chord.cc
+++ b/lily/chord.cc
@@ -72,17 +72,12 @@ trap_i (Musical_pitch tonic, Musical_pitch p)
 static Array<Musical_pitch>
 missing_triads_pitch_arr (Array<Musical_pitch>const* pitch_arr_p)
 {
 static Array<Musical_pitch>
 missing_triads_pitch_arr (Array<Musical_pitch>const* pitch_arr_p)
 {

-  Musical_pitch third (2);
-  Musical_pitch mthird (2, -1);
-

   Array<Musical_pitch> triads;
   Array<Musical_pitch> triads;

-  triads.push (third);   // c e 
-  triads.push (mthird);  // d f 
-  triads.push (mthird);  // e g 
-  triads.push (third);   // f a 
-  triads.push (third);   // g b 
-  triads.push (mthird);  // a c 
-  triads.push (mthird);  // b d 
+
+  /* is the third c-e, d-f, etc. small or large? */
+  int minormajor_a[] = {0, -1, -1, 0,0,-1,-1};
+  for (int i=0; i < 7; i++)
+    triads.push (Musical_pitch( 2, minormajor_a[i]));

 
   Musical_pitch tonic = (*pitch_arr_p)[0];
   Musical_pitch last = tonic;
 
   Musical_pitch tonic = (*pitch_arr_p)[0];
   Musical_pitch last = tonic;


@@ -278,14 +273,11 @@ Chord::banter_str (Musical_pitch* inversion) const
   Array<Musical_pitch> sub_arr;
   find_additions_and_subtractions (&add_arr, &sub_arr);
                           
   Array<Musical_pitch> sub_arr;
   find_additions_and_subtractions (&add_arr, &sub_arr);
                           

+

   Array<Musical_pitch> scale;
   Array<Musical_pitch> scale;

-  scale.push (Musical_pitch (0)); // c
-  scale.push (Musical_pitch (1)); // d
-  scale.push (Musical_pitch (2)); // e
-  scale.push (Musical_pitch (3)); // f
-  scale.push (Musical_pitch (4)); // g
-  scale.push (Musical_pitch (5)); // a
-  scale.push (Musical_pitch (6)); // b
+  for (int i=0; i < 7; i++)
+    scale.push (Musical_pitch (i));
+

   // 7 always means 7-...
   //  scale.push (Musical_pitch (6, -1)); // b
 
   // 7 always means 7-...
   //  scale.push (Musical_pitch (6, -1)); // b
 

diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc
index 3c17df9f43c7d542fa6823f71dc1f64b4e905d67..45d73e7c3753a729621050b2753c5fc345352599 100644 (file)
--- a/lily/dynamic-engraver.cc
+++ b/lily/dynamic-engraver.cc
@@ -115,7 +115,8 @@ Dynamic_engraver::do_process_requests()
          announce_element (Score_element_info (text_p_, dreq_l));
          announce_element (Score_element_info (staff_side_p_, dreq_l));
        }
          announce_element (Score_element_info (text_p_, dreq_l));
          announce_element (Score_element_info (staff_side_p_, dreq_l));
        }

-      else if (Span_dynamic_req *span_l = dynamic_cast <Span_dynamic_req *> (dreq_l))
+      else if (Span_dynamic_req *span_l
+              = dynamic_cast <Span_dynamic_req *> (dreq_l))

        {
          if (span_l->spantype_ == STOP)
            {
        {
          if (span_l->spantype_ == STOP)
            {

diff --git a/lily/extender-engraver.cc b/lily/extender-engraver.cc
index 3cf5b3455c9c487e484a3c40e90b0332a2a14ac0..427faffcaab38d140ca70c5520cb1a51f7a490a7 100644 (file)
--- a/lily/extender-engraver.cc
+++ b/lily/extender-engraver.cc
@@ -17,41 +17,41 @@ ADD_THIS_TRANSLATOR (Extender_engraver);
 Extender_engraver::Extender_engraver ()
 {
   extender_spanner_p_ = 0;
 Extender_engraver::Extender_engraver ()
 {
   extender_spanner_p_ = 0;

-  span_reqs_drul_[RIGHT] = span_reqs_drul_[LEFT] = 0;
+  req_l_ = 0;

 }
 
 void
 Extender_engraver::acknowledge_element (Score_element_info i)
 {
 }
 
 void
 Extender_engraver::acknowledge_element (Score_element_info i)
 {

-  G_text_item* t = dynamic_cast<G_text_item*> (i.elem_l_);
-  if (!t)
-    return;
-  if (!extender_spanner_p_)
-    return;
-  if (!span_reqs_drul_[LEFT])
-    return;
-
-  if (!extender_spanner_p_->item_l_drul_[LEFT])
-    extender_spanner_p_->set_textitem (LEFT, t);
-  else
-    if (span_reqs_drul_[RIGHT] && !extender_spanner_p_->item_l_drul_[RIGHT]) 
-      extender_spanner_p_->set_textitem (RIGHT, t);
+  if (G_text_item* t = dynamic_cast<G_text_item*> (i.elem_l_))
+    {
+      Rhythmic_req * rh = dynamic_cast<Rhythmic_req*>  (i.req_l_);
+      if (!rh)
+       return;
+
+      now_lyrics_.push (Text_lyric_tuple (t, rh, now_mom () + rh->length_mom ()));
+      /*
+       UGH.  What do we do in case of multiple alternatives? 
+       */
+      if (extender_spanner_p_
+         && !extender_spanner_p_->spanned_drul_[RIGHT]
+           )
+         {
+           extender_spanner_p_->set_textitem (RIGHT, t);
+         }
+    }

 }
 
 }
 

+

 bool
 Extender_engraver::do_try_music (Music* req_l)
 {
   if (Extender_req* p = dynamic_cast <Extender_req *> (req_l))
     {
 bool
 Extender_engraver::do_try_music (Music* req_l)
 {
   if (Extender_req* p = dynamic_cast <Extender_req *> (req_l))
     {

-      if (bool (extender_spanner_p_) == bool (p->spantype_ == START))
+      if (req_l_)

        return false;
 
        return false;
 

-      Direction d = (!extender_spanner_p_) ? LEFT : RIGHT;
-      if (span_reqs_drul_[d] && !span_reqs_drul_[d]->equal_b (p))
-       return false;
-
-      span_reqs_drul_[d] = p;
-      span_mom_drul_[d] = get_staff_info ().musical_l ()->when ();
+      req_l_ = p;

       return true;
     }
   return false;
       return true;
     }
   return false;


@@ -62,7 +62,7 @@ Extender_engraver::do_removal_processing ()
 {
   if (extender_spanner_p_)
     {
 {
   if (extender_spanner_p_)
     {

-      span_reqs_drul_[LEFT]->warning (_ ("unterminated extender"));
+      req_l_->warning (_ ("unterminated extender"));

       extender_spanner_p_->set_bounds(RIGHT, get_staff_info ().command_l ());
     }
 }
       extender_spanner_p_->set_bounds(RIGHT, get_staff_info ().command_l ());
     }
 }


@@ -70,23 +70,73 @@ Extender_engraver::do_removal_processing ()
 void
 Extender_engraver::do_process_requests ()
 {
 void
 Extender_engraver::do_process_requests ()
 {

-  if (extender_spanner_p_ || !span_reqs_drul_[LEFT])
-    return;
+  Array<Text_lyric_tuple> stopped_texts;
+  Moment now = now_mom ();

 
 

-  extender_spanner_p_ = new Extender_spanner;
+  stopped_texts.clear ();
+  while (past_lyrics_pq_.size ()
+        && past_lyrics_pq_.front ().end_ == now)
+    stopped_texts.push (past_lyrics_pq_.get ());

 
 

-  announce_element (Score_element_info (extender_spanner_p_, span_reqs_drul_[LEFT]));
+  if (req_l_)
+    {
+      if (!stopped_texts.size ())
+       {
+         req_l_->warning ("Nothing to connect extender to on the left. Ignoring extender request");
+         return;
+       }
+      
+      extender_spanner_p_ = new Extender_spanner;
+      extender_spanner_p_->set_textitem  (LEFT, stopped_texts[0].text_l_);
+      announce_element (Score_element_info (extender_spanner_p_, req_l_));
+    }

 }
 
 }
 

+

 void
 Extender_engraver::do_pre_move_processing ()
 {
 void
 Extender_engraver::do_pre_move_processing ()
 {

-  if (!extender_spanner_p_ || !span_reqs_drul_[RIGHT]) 
-    return;
+  for (int i=0; i < now_lyrics_.size (); i++)
+    {
+      past_lyrics_pq_.insert (now_lyrics_[i]);
+    }
+  now_lyrics_.clear ();

 
 

-  typeset_element (extender_spanner_p_);
-  
-  extender_spanner_p_ = 0;
-  span_reqs_drul_[RIGHT] = span_reqs_drul_[LEFT] = 0;
+  if (extender_spanner_p_)
+    {
+      typeset_element (extender_spanner_p_);
+      extender_spanner_p_ = 0;
+    }
+}
+void
+Extender_engraver::do_post_move_processing ()
+{
+  Moment now = now_mom ();
+  while (past_lyrics_pq_.size () && past_lyrics_pq_.front ().end_ < now)
+    past_lyrics_pq_.delmin ();
+
+  req_l_ =0;
+}
+
+/**********************************************************************/
+Text_lyric_tuple::Text_lyric_tuple ()
+{
+  text_l_ =0;
+  req_l_ =0;
+  end_ = 0;

 }
 
 }
 

+Text_lyric_tuple::Text_lyric_tuple (G_text_item *h, Rhythmic_req*m, Moment mom)
+{
+  text_l_ = h;
+  req_l_ = m;
+  end_ = mom;
+}
+
+
+int
+Text_lyric_tuple::time_compare (Text_lyric_tuple const&h1,
+                            Text_lyric_tuple const &h2)
+{
+  return (h1.end_ - h2.end_ ).sign ();
+}

diff --git a/lily/extender-spanner.cc b/lily/extender-spanner.cc
index 9be7106bef5a886b697f1202271503f945fd7f62..4a06ed13f6d16b578d95241178372f4fb296fe65 100644 (file)
--- a/lily/extender-spanner.cc
+++ b/lily/extender-spanner.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c)  1998 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998, 1999 Jan Nieuwenhuizen <janneke@gnu.org>

 */
 
 
 */
 
 


@@ -14,7 +14,6 @@
 #include "p-col.hh"
 #include "paper-def.hh"
 #include "extender-spanner.hh"
 #include "p-col.hh"
 #include "paper-def.hh"
 #include "extender-spanner.hh"

-#include "text-def.hh"

 
 Extender_spanner::Extender_spanner ()
   : Directional_spanner ()
 
 Extender_spanner::Extender_spanner ()
   : Directional_spanner ()

diff --git a/lily/hara-kiri-line-group-engraver.cc b/lily/hara-kiri-line-group-engraver.cc
index fac0a81ecf299e90b731507feedb6cbc46947c79..5fc4ede7b31710185598cb92393b510d16e026e1 100644 (file)
--- a/lily/hara-kiri-line-group-engraver.cc
+++ b/lily/hara-kiri-line-group-engraver.cc
@@ -3,12 +3,10 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c)  1998 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998, 1999 Jan Nieuwenhuizen <janneke@gnu.org>

 */
 
 */
 

-#include "staff-sym.hh"
-#include "command-request.hh"
-#include "note-head.hh"
+#include "rhythmic-head.hh"

 #include "hara-kiri-vertical-group-spanner.hh"
 #include "hara-kiri-line-group-engraver.hh"
 
 #include "hara-kiri-vertical-group-spanner.hh"
 #include "hara-kiri-line-group-engraver.hh"
 


@@ -24,10 +22,10 @@ Hara_kiri_line_group_engraver::create_line_spanner ()
 void
 Hara_kiri_line_group_engraver::typeset_element(Score_element * e)
 {
 void
 Hara_kiri_line_group_engraver::typeset_element(Score_element * e)
 {

-  if (Note_head *h = dynamic_cast<Note_head *> (e))
+  if (Rhythmic_head *h = dynamic_cast<Rhythmic_head *> (e))

     {
       dynamic_cast<Hara_kiri_vertical_group_spanner*> (staffline_p_)
     {
       dynamic_cast<Hara_kiri_vertical_group_spanner*> (staffline_p_)

-       ->add_note  (h);
+       ->add_interesting_item (h);

     }
   Line_group_engraver_group::typeset_element (e);
 }
     }
   Line_group_engraver_group::typeset_element (e);
 }

diff --git a/lily/hara-kiri-vertical-group-spanner.cc b/lily/hara-kiri-vertical-group-spanner.cc
index c0628ad21ac4e8bb412f7601787400cb5fe0df2d..fa95b295cc0a6e291ad717a4d50511b6bde85688 100644 (file)
--- a/lily/hara-kiri-vertical-group-spanner.cc
+++ b/lily/hara-kiri-vertical-group-spanner.cc
@@ -4,31 +4,29 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c)  1998 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c)  1998,1999 Jan Nieuwenhuizen <janneke@gnu.org>
+  Han-Wen Nienhuys <hanwen@cs.uu.nl>

 */
 
 #include "hara-kiri-vertical-group-spanner.hh"
 #include "debug.hh"
 */
 
 #include "hara-kiri-vertical-group-spanner.hh"
 #include "debug.hh"

-#include "note-head.hh"
-#include "bar.hh"
-
-
+#include "item.hh"

 
 Hara_kiri_vertical_group_spanner::Hara_kiri_vertical_group_spanner()
 {
 }
 
 void 
 
 Hara_kiri_vertical_group_spanner::Hara_kiri_vertical_group_spanner()
 {
 }
 
 void 

-Hara_kiri_vertical_group_spanner::add_note (Note_head* n)
+Hara_kiri_vertical_group_spanner::add_interesting_item (Item* n)

 {
   add_dependency (n);
 {
   add_dependency (n);

-  head_l_arr_.push (n);
+  interesting_items_.push (n);

 }
 
 void 
 Hara_kiri_vertical_group_spanner::do_post_processing ()
 {
 }
 
 void 
 Hara_kiri_vertical_group_spanner::do_post_processing ()
 {

-  if (!head_l_arr_.empty ())
+  if (!interesting_items_.empty ())

     return;
 
   Link_array<Score_element> childs = get_children ();
     return;
 
   Link_array<Score_element> childs = get_children ();


@@ -43,9 +41,8 @@ Hara_kiri_vertical_group_spanner::do_post_processing ()
 void
 Hara_kiri_vertical_group_spanner::do_substitute_dependency (Score_element*o, Score_element*n)
 {
 void
 Hara_kiri_vertical_group_spanner::do_substitute_dependency (Score_element*o, Score_element*n)
 {

-  if (dynamic_cast<Note_head *> (o))
-    head_l_arr_.substitute (dynamic_cast<Note_head *> (o), 
-      (n)? dynamic_cast<Note_head *> (n) : 0);
+  if (Item *it = dynamic_cast<Item *> (o))
+    interesting_items_.substitute (it, dynamic_cast<Item *> (n));

 }
 
 
 }
 
 

diff --git a/lily/include/atom.hh b/lily/include/atom.hh
index b2e94f13599abc9d7eaad6d4e2572cdfce4978b9..52d17f88f215011a7d82453378f6e6328a212d5c 100644 (file)
--- a/lily/include/atom.hh
+++ b/lily/include/atom.hh
@@ -15,7 +15,8 @@
 #include "lily-proto.hh"
 #include "lily-guile.hh"
 
 #include "lily-proto.hh"
 #include "lily-guile.hh"
 

-#if 0
+#ifdef ATOM_SMOB
+

 /// a symbol which can be translated, and freely copied
 class Atom {
   static long smob_tag_;
 /// a symbol which can be translated, and freely copied
 class Atom {
   static long smob_tag_;


@@ -23,10 +24,10 @@ class Atom {
   static SCM smob_mark (SCM);
   static scm_sizet smob_free (SCM);
   static int smob_display (SCM, SCM, scm_print_state*);
   static SCM smob_mark (SCM);
   static scm_sizet smob_free (SCM);
   static int smob_display (SCM, SCM, scm_print_state*);

-  Atom (SCM s);

   SCM make_smob () const;
 public:
   Offset off_;
   SCM make_smob () const;
 public:
   Offset off_;

+  Atom (SCM s);

 
   static SCM make_atom (SCM outputfunc);
   SCM copy_self () const;
 
   static SCM make_atom (SCM outputfunc);
   SCM copy_self () const;

diff --git a/lily/include/bar-engraver.hh b/lily/include/bar-engraver.hh
index 143f5831cbe3be57062a1ae35906bb1bbc511435..647a47e05d252db17a6ee030e98aaa1b99fbff39 100644 (file)
--- a/lily/include/bar-engraver.hh
+++ b/lily/include/bar-engraver.hh
@@ -37,7 +37,6 @@ private:
 
   Bar_req * bar_req_l_;
   Bar * bar_p_;
 
   Bar_req * bar_req_l_;
   Bar * bar_p_;

-  bool auto_create_bar_b_;

 };
 
 #endif // BAR_ENGRAVER_HH
 };
 
 #endif // BAR_ENGRAVER_HH

diff --git a/lily/include/extender-engraver.hh b/lily/include/extender-engraver.hh
index c49043a8c2fa65003d99d1f4501feaa0f9da415a..1b6335bb5125d4329d901c860b1e71d2ef330ce8 100644 (file)
--- a/lily/include/extender-engraver.hh
+++ b/lily/include/extender-engraver.hh
@@ -12,13 +12,45 @@
 #include "engraver.hh"
 #include "drul-array.hh"
 #include "extender-spanner.hh"
 #include "engraver.hh"
 #include "drul-array.hh"
 #include "extender-spanner.hh"

+#include "pqueue.hh"
+
+struct Text_lyric_tuple {
+  Rhythmic_req *req_l_ ;
+  G_text_item *text_l_;
+  Moment end_;
+  
+  Text_lyric_tuple ();
+  Text_lyric_tuple (G_text_item*, Rhythmic_req*, Moment);
+  static int time_compare (Text_lyric_tuple const &, Text_lyric_tuple const &);
+};
+
+inline int compare (Text_lyric_tuple const &a, Text_lyric_tuple const &b)
+{
+  return Text_lyric_tuple::time_compare (a,b);
+}
+
+
+

 
 /**
 
 /**

-  Generate an extender.
-  Should make an Extender_spanner that typesets a nice extender line.
- */
+  Generate an extender.  Should make an Extender_spanner that typesets
+  a nice extender line.
+
+  We remember all G_text_items that come across, and store their
+  termination times. When we get a request, we create the spanner, and
+  attach the left point to the finished lyrics, and the right point to
+  any lyrics we receive by then.
+*/

 class Extender_engraver : public Engraver
 {
 class Extender_engraver : public Engraver
 {

+  PQueue<Text_lyric_tuple> past_lyrics_pq_;
+  Array<Text_lyric_tuple> now_lyrics_;
+  Array<Text_lyric_tuple> stopped_lyrics_;  
+  
+  Extender_req* req_l_;
+  Extender_spanner* extender_spanner_p_;
+
+  

 public:
   Extender_engraver ();
   VIRTUAL_COPY_CONS (Translator);
 public:
   Extender_engraver ();
   VIRTUAL_COPY_CONS (Translator);


@@ -29,11 +61,9 @@ protected:
   virtual void do_process_requests();
   virtual bool do_try_music (Music*);
   virtual void do_pre_move_processing();
   virtual void do_process_requests();
   virtual bool do_try_music (Music*);
   virtual void do_pre_move_processing();

-  
+  virtual void do_post_move_processing ();

 private:
 private:

-  Drul_array<Extender_req*> span_reqs_drul_;
-  Drul_array<Moment> span_mom_drul_;
-  Extender_spanner* extender_spanner_p_;
+

 };
 
 #endif // EXTENDER_ENGRAVER_HH
 };
 
 #endif // EXTENDER_ENGRAVER_HH

diff --git a/lily/include/extender-spanner.hh b/lily/include/extender-spanner.hh
index a69d10f3e8f4a76ac0febab7e12a3487299fce4c..ca061a2fc9be7449e9734a38ef7bfc590517eb24 100644 (file)
--- a/lily/include/extender-spanner.hh
+++ b/lily/include/extender-spanner.hh
@@ -1,7 +1,7 @@
 /*
   extender-spanner.hh -- part of GNU LilyPond
 
 /*
   extender-spanner.hh -- part of GNU LilyPond
 

-  (c)  1998 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998, 1999 Jan Nieuwenhuizen <janneke@gnu.org>

 */
 
 #ifndef EXTENDER_SPANNER_HH
 */
 
 #ifndef EXTENDER_SPANNER_HH


@@ -27,7 +27,6 @@
   extend beond, lasting the whole duration of the melissima
   (as in MUP, urg).
   */
   extend beond, lasting the whole duration of the melissima
   (as in MUP, urg).
   */

-

 class Extender_spanner : public Directional_spanner
 {
 public:
 class Extender_spanner : public Directional_spanner
 {
 public:

diff --git a/lily/include/hara-kiri-line-group-engraver.hh b/lily/include/hara-kiri-line-group-engraver.hh
index f894439e9d72da05d35b63ab7c19d0ebb1db0cee..43439cadcff69c487aa4b74bd825369dd42898fc 100644 (file)
--- a/lily/include/hara-kiri-line-group-engraver.hh
+++ b/lily/include/hara-kiri-line-group-engraver.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c)  1998 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998, 1999 Jan Nieuwenhuizen <janneke@gnu.org>

 */
 
 
 */
 
 


@@ -13,8 +13,15 @@
 #include "line-group-group-engraver.hh"
 
 /**
 #include "line-group-group-engraver.hh"
 
 /**

-  Just as Line_group_engraver, but won't disgrace Lily by typesetting 
-  an empty line (for orchestral scores).
+  Just as Line_group_engraver, Find interesting items for
+  Hara_kiri_line_group_engraver.
+
+
+
+  @see
+  Hara_kiri_vertical_group_spanner
+  
+

   */
 class Hara_kiri_line_group_engraver : public Line_group_engraver_group
 {
   */
 class Hara_kiri_line_group_engraver : public Line_group_engraver_group
 {

diff --git a/lily/include/hara-kiri-vertical-group-spanner.hh b/lily/include/hara-kiri-vertical-group-spanner.hh
index 15ad5d04052310f31c338babfe89e3e557a15f0c..33bf0a4f6f32cca39e6221601621bd36670fa96d 100644 (file)
--- a/lily/include/hara-kiri-vertical-group-spanner.hh
+++ b/lily/include/hara-kiri-vertical-group-spanner.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
 
   source file of the GNU LilyPond music typesetter
 

-  (c)  1998 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 1998, 1999 Jan Nieuwenhuizen <janneke@gnu.org>

 */
 
 
 */
 
 


@@ -13,24 +13,23 @@
 #include "vertical-group-spanner.hh"
 
 /** 
 #include "vertical-group-spanner.hh"
 
 /** 

-  As Vertical_group_spanner, but keeps dependencies to notes.
- */
+  As Vertical_group_spanner, but keep track of interesting items.  If
+  we don't contain any interesting items after linebreaking, then
+  gracefully commit suicide.  Objective: don't disgrace Lily by
+  typesetting empty lines in orchestral scores.  */

 class Hara_kiri_vertical_group_spanner : public Vertical_group_spanner
 {
 public:
 class Hara_kiri_vertical_group_spanner : public Vertical_group_spanner
 {
 public:

-  
-

   Hara_kiri_vertical_group_spanner ();
   virtual void do_post_processing ();
   Hara_kiri_vertical_group_spanner ();
   virtual void do_post_processing ();

-  void add_note (Note_head* n);
-
+  void add_interesting_item (Item* n);

 protected:
   VIRTUAL_COPY_CONS(Score_element);
 
   virtual void do_substitute_dependency (Score_element*, Score_element*);
   virtual void do_print ()const;
 
 protected:
   VIRTUAL_COPY_CONS(Score_element);
 
   virtual void do_substitute_dependency (Score_element*, Score_element*);
   virtual void do_print ()const;
 

-  Link_array<Note_head> head_l_arr_;
+  Link_array<Item> interesting_items_;

 };
 
 
 };
 
 

diff --git a/lily/include/lyric-engraver.hh b/lily/include/lyric-engraver.hh
index 5cae730ed94020f4c05f9b0738ff6af7b8f55448..1736d593ddb1d93a526d64680550f817f0d5492d 100644 (file)
--- a/lily/include/lyric-engraver.hh
+++ b/lily/include/lyric-engraver.hh
@@ -14,20 +14,24 @@
 #include "engraver.hh"
 #include "array.hh"
 
 #include "engraver.hh"
 #include "array.hh"
 

+/**
+   Generate texts for lyric syllables.  We only do one lyric at a time.  
+   Multiple copies of this engraver should be used to do multiple voices.
+ */

 class Lyric_engraver : public Engraver 
 {
 protected:
   virtual void do_pre_move_processing();
   virtual bool do_try_music (Music*);
   virtual void do_process_requests();
 class Lyric_engraver : public Engraver 
 {
 protected:
   virtual void do_pre_move_processing();
   virtual bool do_try_music (Music*);
   virtual void do_process_requests();

-
+  virtual void do_post_move_processing ();

 public:
   Lyric_engraver ();
   VIRTUAL_COPY_CONS (Translator);
 
 private:
 public:
   Lyric_engraver ();
   VIRTUAL_COPY_CONS (Translator);
 
 private:

-  Link_array<Lyric_req> lyric_req_l_arr_;
-  Link_array<Item> text_p_arr_;
+  Lyric_req * req_l_;
+  G_text_item* text_p_;

 };
 
 
 };
 
 

diff --git a/lily/include/molecule.hh b/lily/include/molecule.hh
index 461993e482d2f1921a4e3253325a8fb582c7bde7..0a4bae3c29e8be630b0aa7c796595a6d814844fe 100644 (file)
--- a/lily/include/molecule.hh
+++ b/lily/include/molecule.hh
@@ -19,8 +19,12 @@
 /** a group of individually translated symbols. You can add molecules
     to the top, to the right, etc.  */
 class Molecule {
 /** a group of individually translated symbols. You can add molecules
     to the top, to the right, etc.  */
 class Molecule {

+#ifdef ATOM_SMOB
+  SCM atom_list_;
+#else

   //  Protected_scm atom_list_;        // change to List<Atom>?
   Cons<Atom> *atom_list_;
   //  Protected_scm atom_list_;        // change to List<Atom>?
   Cons<Atom> *atom_list_;

+#endif

   friend class Paper_outputter;
 public:
   Box dim_;
   friend class Paper_outputter;
 public:
   Box dim_;

diff --git a/lily/include/musical-request.hh b/lily/include/musical-request.hh
index 9905362080bc5e8084c0cf3f08c4c5a57b172a4c..28d949b497cd56d9a739ba3423961986695af1da 100644 (file)
--- a/lily/include/musical-request.hh
+++ b/lily/include/musical-request.hh
@@ -156,7 +156,7 @@ public:
 };
 
 /// an extender line
 };
 
 /// an extender line

-class Extender_req : public Musical_span_req  {
+class Extender_req : public Request  {

 public:
   REQUESTMETHODS(Extender_req);
   Extender_req ();
 public:
   REQUESTMETHODS(Extender_req);
   Extender_req ();

diff --git a/lily/include/my-lily-parser.hh b/lily/include/my-lily-parser.hh
index ddac529ffbb86502fb7fe6f6e630c8573ec99682..520797808765d6275556132295b96046c0c22938 100644 (file)
--- a/lily/include/my-lily-parser.hh
+++ b/lily/include/my-lily-parser.hh
@@ -19,6 +19,11 @@
 #include "array.hh"
 #include "input.hh"
 
 #include "array.hh"
 #include "input.hh"
 

+/**
+   State for the parser.  Do not ever add any variables to parse
+   musical content here.  We still have to remove default_duration_.
+   
+ */

 class My_lily_parser 
 {
 public:
 class My_lily_parser 
 {
 public:


@@ -31,18 +36,17 @@ public:
 
 public:
   Duration default_duration_;
 
 public:
   Duration default_duration_;

-  Extender_req* extender_req;

   Scope *default_header_p_;
   Scope *default_header_p_;

-    

   bool first_b_;
   bool first_b_;

-
-  Link_array<Request> pre_reqs, post_reqs;

   int fatal_error_i_;
   Sources * source_l_;
   int error_level_i_;
   bool init_parse_b_;
   My_lily_lexer * lexer_p_;
   int fatal_error_i_;
   Sources * source_l_;
   int error_level_i_;
   bool init_parse_b_;
   My_lily_lexer * lexer_p_;

- 
+  bool ignore_version_b_;
+
+
+  

   Input here_input() const;
   void remember_spot();
   Input pop_spot();
   Input here_input() const;
   void remember_spot();
   Input pop_spot();


@@ -52,24 +56,17 @@ public:
   void do_yyparse();
   void parser_error (String);
 
   void do_yyparse();
   void parser_error (String);
 

-  Link_array<Request>* get_parens_request (int t);
-    

   void set_debug();
   void set_yydebug (bool);
   void set_debug();
   void set_yydebug (bool);

-  bool ignore_version_b_;
-

 private:
   char const* here_ch_C() const;
   Array<Input> define_spot_array_;
   String init_str_;
 
 private:
   char const* here_ch_C() const;
   Array<Input> define_spot_array_;
   String init_str_;
 

-  void add_requests (Simultaneous_music*v);
-

   Simultaneous_music * get_note_element (Note_req * ,Duration *);
   Simultaneous_music * get_chord (Musical_pitch, Array<Musical_pitch>*, Array<Musical_pitch>*, Musical_pitch*, Duration);
   Simultaneous_music* get_rest_element (String, Duration *);
   Simultaneous_music* get_word_element (String, Duration*);
   Simultaneous_music * get_note_element (Note_req * ,Duration *);
   Simultaneous_music * get_chord (Musical_pitch, Array<Musical_pitch>*, Array<Musical_pitch>*, Musical_pitch*, Duration);
   Simultaneous_music* get_rest_element (String, Duration *);
   Simultaneous_music* get_word_element (String, Duration*);

-  Melodic_req* get_melodic_req (Melodic_req* melodic, int quotes);

   String notename_str (Melodic_req* melodic);
   void set_last_duration (Duration const *);
   friend int yyparse (void*);
   String notename_str (Melodic_req* melodic);
   void set_last_duration (Duration const *);
   friend int yyparse (void*);

diff --git a/lily/item.cc b/lily/item.cc
index d5a9b7959d1977fef172a8603bd422c8530e50ca..fe15e3673ab6a981afc93280ed06e882cac13b98 100644 (file)
--- a/lily/item.cc
+++ b/lily/item.cc
@@ -143,9 +143,9 @@ Item*
 Item::find_prebroken_piece (Direction breakstatus) const
 {
   if (!breakstatus)
 Item::find_prebroken_piece (Direction breakstatus) const
 {
   if (!breakstatus)

-    return (Item *)(this);     // ugh
+    return (Item *) (this);    // ugh

   else
   else

-    return dynamic_cast<Item*>( broken_to_drul_[breakstatus]);
+    return dynamic_cast<Item*> (broken_to_drul_[breakstatus]);

 }
 
 void
 }
 
 void

diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc
index c0cc8a25fb8da8aa2042215228fcbee9a36abee6..fa5c1035d1dfa8b8e57024d592ba00b95a9a46de 100644 (file)
--- a/lily/lyric-engraver.cc
+++ b/lily/lyric-engraver.cc
@@ -18,6 +18,8 @@ ADD_THIS_TRANSLATOR (Lyric_engraver);
 
 Lyric_engraver::Lyric_engraver()
 {
 
 Lyric_engraver::Lyric_engraver()
 {

+  text_p_ =0;
+  req_l_ =0;

 }
 
 bool
 }
 
 bool


@@ -25,7 +27,9 @@ Lyric_engraver::do_try_music (Music*r)
 {
   if (Lyric_req* l = dynamic_cast <Lyric_req *> (r))
     {
 {
   if (Lyric_req* l = dynamic_cast <Lyric_req *> (r))
     {

-      lyric_req_l_arr_.push (l);
+      if (req_l_)
+       return false;
+      req_l_ =l;

       return true;
     }
   return false;
       return true;
     }
   return false;


@@ -34,39 +38,32 @@ Lyric_engraver::do_try_music (Music*r)
 void
 Lyric_engraver::do_process_requests()
 {
 void
 Lyric_engraver::do_process_requests()
 {

-  if (text_p_arr_.size ())
-    return;
-
-  for (int i=0; i < lyric_req_l_arr_.size (); i++)
+  if (req_l_)

     {
     {

-      Lyric_req* request_l = lyric_req_l_arr_[i];
-      G_text_item* item_p =  new G_text_item;
-      item_p->text_str_ = request_l->text_str_;
+      text_p_=  new G_text_item;
+      text_p_->text_str_ = req_l_->text_str_;

 
       Scalar style = get_property ("textstyle", 0);
       if (style.length_i ())
 
       Scalar style = get_property ("textstyle", 0);
       if (style.length_i ())

-       item_p->style_str_ = style;
-      if (i)
-       {
-         Real dy = paper ()->lookup_l (0)-> text
-           (item_p->style_str_, String ("Cg")).dim_. y ().length ();
-         dy *= 1.1;
-         item_p->translate_axis (-i * dy, Y_AXIS);
-       }
+       text_p_->style_str_ = style;

       
       

-      text_p_arr_.push (item_p);
-      announce_element (Score_element_info (item_p, request_l));
+      announce_element (Score_element_info (text_p_, req_l_));

     }
 }
 
 void
 Lyric_engraver::do_pre_move_processing()
 {
     }
 }
 
 void
 Lyric_engraver::do_pre_move_processing()
 {

-  for (int i=0; i < text_p_arr_.size (); i++)
+  if (text_p_)

     {
     {

-      typeset_element (text_p_arr_[i]);
+      typeset_element (text_p_);
+      text_p_ =0;

     }
     }

-  text_p_arr_.clear ();
-  lyric_req_l_arr_.clear ();
+}
+
+void
+Lyric_engraver::do_post_move_processing ()
+{
+  req_l_ =0;

 }
 
 }
 

diff --git a/lily/multi-measure-rest-engraver.cc b/lily/multi-measure-rest-engraver.cc
index f3a39170c9dadcb9fe1981e6a40caa39a96e1cbe..132f7f2b9b1566c59927d5f4f9d8ee0b7c770237 100644 (file)
--- a/lily/multi-measure-rest-engraver.cc
+++ b/lily/multi-measure-rest-engraver.cc
@@ -11,11 +11,6 @@
 #include "multi-measure-rest-engraver.hh"
 #include "score-column.hh"
 #include "time-description.hh"
 #include "multi-measure-rest-engraver.hh"
 #include "score-column.hh"
 #include "time-description.hh"

-//#include "paper-score.hh"
-//#include "p-score.hh"
-//#include "paper-def.hh"
-//#include "main.hh"
-//#include "global-translator.hh"

 #include "bar.hh"
 
 
 #include "bar.hh"
 
 

diff --git a/lily/my-lily-parser.cc b/lily/my-lily-parser.cc
index 6b43a89e370a916a16d313dc06a4926b1b94dff2..207b755b47ec8091d37c9d53db251f8d838daa81 100644 (file)
--- a/lily/my-lily-parser.cc
+++ b/lily/my-lily-parser.cc
@@ -29,7 +29,7 @@ My_lily_parser::My_lily_parser (Sources * source_l)
   lexer_p_ = 0;
   default_duration_.durlog_i_ = 2;
   error_level_i_ = 0;
   lexer_p_ = 0;
   default_duration_.durlog_i_ = 2;
   error_level_i_ = 0;

-  extender_req = 0;
+

   fatal_error_i_ = 0;
   default_header_p_ =0;
 }
   fatal_error_i_ = 0;
   default_header_p_ =0;
 }


@@ -101,7 +101,7 @@ My_lily_parser::set_last_duration (Duration const *d)
   default_duration_ = *d;
 }
 
   default_duration_ = *d;
 }
 

-
+// junk me

 Simultaneous_music*
 My_lily_parser::get_word_element (String s, Duration * duration_p)
 {
 Simultaneous_music*
 My_lily_parser::get_word_element (String s, Duration * duration_p)
 {


@@ -118,7 +118,7 @@ My_lily_parser::get_word_element (String s, Duration * duration_p)
   return velt_p;
 }
 
   return velt_p;
 }
 

-
+// junk me

 Simultaneous_music *
 My_lily_parser::get_rest_element (String s,  Duration * duration_p)
 {
 Simultaneous_music *
 My_lily_parser::get_rest_element (String s,  Duration * duration_p)
 {


@@ -146,6 +146,7 @@ My_lily_parser::get_rest_element (String s,  Duration * duration_p)
   return velt_p;
 }
 
   return velt_p;
 }
 

+// junk me

 Simultaneous_music *
 My_lily_parser::get_chord (Musical_pitch tonic, Array<Musical_pitch>* add_arr_p, Array<Musical_pitch>* sub_arr_p, Musical_pitch* inversion_p, Duration d)
 {
 Simultaneous_music *
 My_lily_parser::get_chord (Musical_pitch tonic, Array<Musical_pitch>* add_arr_p, Array<Musical_pitch>* sub_arr_p, Musical_pitch* inversion_p, Duration d)
 {


@@ -170,6 +171,7 @@ My_lily_parser::get_chord (Musical_pitch tonic, Array<Musical_pitch>* add_arr_p,
   return v;
 }
 
   return v;
 }
 

+// junk me

 Simultaneous_music *
 My_lily_parser::get_note_element (Note_req *rq, Duration * duration_p)
 {
 Simultaneous_music *
 My_lily_parser::get_note_element (Note_req *rq, Duration * duration_p)
 {


@@ -185,90 +187,6 @@ My_lily_parser::get_note_element (Note_req *rq, Duration * duration_p)
 }
 
 
 }
 
 

-/*
-  UGH.
- */
-Link_array<Request>*
-My_lily_parser::get_parens_request (int t)
-{
-  Link_array<Request>& reqs = *new Link_array<Request>;
-  switch (t)
-    {
-    case '~':
-      reqs.push (new Tie_req);
-      break;
-
-    case '[':
-    case ']':
-      {
-       reqs.push (new Beam_req);
-      }
-      break;
-
-    case '>':
-    case '!':
-    case '<':
-      reqs.push (new Span_dynamic_req);
-      break;
-
-    case ')':
-    case '(':
-      {
-       reqs.push (new Slur_req);
-      }
-      break;
-    default:
-      assert (false);
-      break;
-    }
-
-  switch (t)
-    {
-    case '<':
-    case '>':
-    case '(':
-    case '[':
-      dynamic_cast<Span_req*> (reqs[0])->spantype_ = START;
-      break;
-      
-    case '!':
-    case ')':
-    case ']':
-      dynamic_cast<Span_req*> (reqs[0])->spantype_ = STOP;
-      break;
-
-    default:
-      break;
-    }
-
-  for (int i = 0; i < reqs.size (); i++)
-    if (dynamic_cast<Span_dynamic_req*> (reqs[i]))
-      {
-       Span_dynamic_req* s_l= dynamic_cast<Span_dynamic_req*> (reqs[i]);
-       s_l->dynamic_dir_ = (t == '<') ? UP:DOWN;
-      }
-
-  // ugh? don't we do this in the parser too?
-  reqs[0]->set_spot (here_input());
-  return &reqs;
-}
-
-void
-My_lily_parser::add_requests (Simultaneous_music*v)
-{
-  for (int i = 0; i < pre_reqs.size(); i++)
-    {
-      v->add_music (pre_reqs[i]);
-    }
-  pre_reqs.clear();
-  for (int i = 0; i <post_reqs.size(); i++)
-    {
-      v->add_music (post_reqs[i]);
-    }
-
-  post_reqs.clear();
-}
-

 Input
 My_lily_parser::pop_spot()
 {
 Input
 My_lily_parser::pop_spot()
 {

diff --git a/lily/parser.yy b/lily/parser.yy
index 59193862adc9db5f08b52f787b3734ab2f1298c5..685cbe1ed8bc92f7d2725e57518d9e0af3a9e1e1 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -91,6 +91,7 @@ Paper_def* current_paper = 0;
 %union {
     Array<Interval>* intarr;
     Array<Musical_pitch> *pitch_arr;
 %union {
     Array<Interval>* intarr;
     Array<Musical_pitch> *pitch_arr;

+    Link_array<Request> *reqvec;

     Array<String> * strvec;
     Array<int> *intvec;
     Notename_table *chordmodifiertab;
     Array<String> * strvec;
     Array<int> *intvec;
     Notename_table *chordmodifiertab;


@@ -222,7 +223,7 @@ yylex (YYSTYPE *s,  void * v_l)
 
 %type <outputdef> output_def
 %type <scope>  mudela_header mudela_header_body
 
 %type <outputdef> output_def
 %type <scope>  mudela_header mudela_header_body

-%type <i>      open_request_parens close_request_parens
+%type <request>        open_request_parens close_request_parens open_request close_request

 %type <i>      sub_quotes sup_quotes
 %type <music>  simple_element  request_chord command_element Simple_music  Composite_music 
 %type <music>  Alternative_music Repeated_music
 %type <i>      sub_quotes sup_quotes
 %type <music>  simple_element  request_chord command_element Simple_music  Composite_music 
 %type <music>  Alternative_music Repeated_music


@@ -234,6 +235,7 @@ yylex (YYSTYPE *s,  void * v_l)
 %type <duration> steno_duration notemode_duration
 %type <duration> entered_notemode_duration explicit_duration
 %type <intvec> intastint_list int_list
 %type <duration> steno_duration notemode_duration
 %type <duration> entered_notemode_duration explicit_duration
 %type <intvec> intastint_list int_list

+%type <reqvec>  pre_requests post_requests

 
 %type <pitch>   explicit_musical_pitch steno_musical_pitch musical_pitch absolute_musical_pitch
 %type <pitch>   steno_tonic_pitch
 
 %type <pitch>   explicit_musical_pitch steno_musical_pitch musical_pitch absolute_musical_pitch
 %type <pitch>   steno_tonic_pitch


@@ -866,8 +868,13 @@ scalar:
 
 request_chord:
        pre_requests simple_element post_requests       {
 
 request_chord:
        pre_requests simple_element post_requests       {

-               THIS->add_requests ((Simultaneous_music*)$2);//ugh
+               Music_sequence *l = dynamic_cast<Music_sequence*>($2);
+               for (int i=0; i < $1->size(); i++)
+                       l->add_music ($1->elem(i));
+               for (int i=0; i < $3->size(); i++)
+                       l->add_music ($3->elem(i));

                $$ = $2;
                $$ = $2;

+               

        }
        | command_element
        ;
        }
        | command_element
        ;


@@ -887,7 +894,10 @@ command_req:
        ;
 
 abbrev_command_req:
        ;
 
 abbrev_command_req:

-       '|'                             {
+       extender_req {
+               $$ = $1;
+       }
+       | '|'                           {

                $$ = new Barcheck_req;
        }
        | COMMAND_IDENTIFIER    {
                $$ = new Barcheck_req;
        }
        | COMMAND_IDENTIFIER    {


@@ -975,23 +985,14 @@ verbose_command_req:
 
 post_requests:
        {
 
 post_requests:
        {

-               /* something silly happened.  Junk this stuff*/
-               if (!THIS->post_reqs.empty ())
-               {
-                       warning ("Junking post-requests");
-                       THIS->post_reqs.clear ();
-               }
+               $$ = new Link_array<Request>;

        }
        | post_requests structured_post_request {
                $2->set_spot (THIS->here_input ());
        }
        | post_requests structured_post_request {
                $2->set_spot (THIS->here_input ());

-               THIS->post_reqs.push ($2);
+               $$->push ($2);

        }
        }

-       | post_requests close_request_parens    {
-               Link_array<Request> *r = THIS->get_parens_request ($2);
-               for (int i = 0; i < r->size (); i++ )
-                       r->elem (i)->set_spot (THIS->here_input ());
-               THIS->post_reqs.concat (*r);
-               delete r;
+       | post_requests close_request   {
+               $$->push ($2);

        }
        ;
 
        }
        ;
 


@@ -1012,9 +1013,7 @@ post_request:
                a->type_i_ = $1;
                $$ = a;
        }
                a->type_i_ = $1;
                $$ = a;
        }

-       | extender_req {
-               $$ = $1;
-       }
+

        ;
 
 optional_modality:
        ;
 
 optional_modality:


@@ -1034,6 +1033,7 @@ sup_quotes:
                $$ ++;
        }
        ;
                $$ ++;
        }
        ;

+

 sub_quotes:
        ',' {
                $$ = 1;
 sub_quotes:
        ',' {
                $$ = 1;


@@ -1122,11 +1122,9 @@ extender_req:
        EXTENDER {
                if (!THIS->lexer_p_->lyric_state_b ())
                        THIS->parser_error (_ ("have to be in Lyric mode for lyrics"));
        EXTENDER {
                if (!THIS->lexer_p_->lyric_state_b ())
                        THIS->parser_error (_ ("have to be in Lyric mode for lyrics"));

-               Extender_req * e_p = new Extender_req;
-               e_p->spantype_ = START;
-               $$ = e_p;
-               THIS->extender_req = e_p;
-       };
+               $$ = new Extender_req;
+       }
+       ;

 
 dynamic_req:
        ABSDYNAMIC '{' STRING '}'       {
 
 dynamic_req:
        ABSDYNAMIC '{' STRING '}'       {


@@ -1137,34 +1135,52 @@ dynamic_req:
        }
        | SPANDYNAMIC '{' int int '}' {
                Span_dynamic_req * sp_p = new Span_dynamic_req;
        }
        | SPANDYNAMIC '{' int int '}' {
                Span_dynamic_req * sp_p = new Span_dynamic_req;

-               sp_p->spantype_ = (Direction)$4;
-               sp_p-> dynamic_dir_  = (Direction)$3;
+               sp_p-> dynamic_dir_  = Direction($3);
+               sp_p->spantype_ = Direction($4);

                $$ = sp_p;
        }
        ;
 
 
                $$ = sp_p;
        }
        ;
 
 

-
+close_request:
+       close_request_parens {
+               $$ = $1;
+               dynamic_cast<Span_req*> ($$)->spantype_ = START;
+       }
+       

 close_request_parens:
        '('     {
 close_request_parens:
        '('     {

-               $$='(';
+               $$= new Slur_req;

        }
        | E_SMALLER {
        }
        | E_SMALLER {

-               $$ = '<';
+               Span_dynamic_req*s =new Span_dynamic_req;
+               $$ = s;
+               s->dynamic_dir_ = SMALLER;

        }
        | E_BIGGER {
        }
        | E_BIGGER {

-               $$ = '>';
+               Span_dynamic_req*s =new Span_dynamic_req;
+               $$ = s;
+               s->dynamic_dir_ = BIGGER;

        }
        ;
 
 
        }
        ;
 
 

+open_request:
+       open_request_parens {
+               $$ = $1;
+               dynamic_cast<Span_req*> ($$)->spantype_ = STOP;
+       }
+       ;

 
 open_request_parens:
        E_EXCLAMATION   {
 
 open_request_parens:
        E_EXCLAMATION   {

-               $$ = '!';
+               Span_dynamic_req *s =  new Span_dynamic_req;
+               s->dynamic_dir_ = SMALLER;
+               $$ = s;
+               

        }
        | ')'   {
        }
        | ')'   {

-               $$=')';
+               $$= new Slur_req

        }
        ;
 
        }
        ;
 


@@ -1258,21 +1274,10 @@ script_dir:
 
 pre_requests:
        {
 
 pre_requests:
        {

-               if (THIS->extender_req)
-                 {
-                   Extender_req * e_p = new Extender_req;
-                   e_p->spantype_ = STOP;
-                   THIS->pre_reqs.push (e_p);
-                   THIS->extender_req = 0;
-                 }
-                       
+               $$ = new Link_array<Request>;

        }
        }

-       | pre_requests open_request_parens {
-               Link_array<Request>* r = THIS->get_parens_request ($2);
-               for (int i = 0; i < r->size (); i++ )
-                       r->elem (i)->set_spot (THIS->here_input ());
-               THIS->pre_reqs.concat (*r);
-               delete r;
+       | pre_requests open_request {
+               $$->push ($2);

        }
        ;
 
        }
        ;
 

diff --git a/lily/separating-group-spanner.cc b/lily/separating-group-spanner.cc
index 41c2c515e6304eb9b9210b6fd8228fd708839f12..723c24621cef03329d107da9b7d4cb8ca528a157 100644 (file)
--- a/lily/separating-group-spanner.cc
+++ b/lily/separating-group-spanner.cc
@@ -56,8 +56,6 @@ Separating_group_spanner::add_spacing_unit (Single_malt_grouping_item*i)
   add_dependency (i);
 }
 
   add_dependency (i);
 }
 

-
-

 void
 Separating_group_spanner::do_substitute_dependency (Score_element*o, Score_element*n)
 {
 void
 Separating_group_spanner::do_substitute_dependency (Score_element*o, Score_element*n)
 {

diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc
index 26275ce12ba26fac5017de4b83b0570b54e80014..1b544269a252d24f258d4f4961e26cf416a10ec7 100644 (file)
--- a/lily/tie-engraver.cc
+++ b/lily/tie-engraver.cc
@@ -36,6 +36,8 @@ Tie_engraver::acknowledge_element (Score_element_info i)
   if (Note_head *nh = dynamic_cast<Note_head *> (i.elem_l_))
     {
       Note_req * m = dynamic_cast<Note_req* > (i.req_l_);
   if (Note_head *nh = dynamic_cast<Note_head *> (i.elem_l_))
     {
       Note_req * m = dynamic_cast<Note_req* > (i.req_l_);

+      if (!m)
+       return;

       now_heads_.push (CHead_melodic_tuple (nh, m, now_mom()+ m->length_mom ()));
     }
 }
       now_heads_.push (CHead_melodic_tuple (nh, m, now_mom()+ m->length_mom ()));
     }
 }


@@ -52,7 +54,6 @@ Tie_engraver::do_process_requests ()
       while (past_notes_pq_.size ()
             && past_notes_pq_.front ().end_ == now)
        stopped_heads_.push (past_notes_pq_.get ());
       while (past_notes_pq_.size ()
             && past_notes_pq_.front ().end_ == now)
        stopped_heads_.push (past_notes_pq_.get ());

-

     }
 }
 
     }
 }
 

diff --git a/lily/translator-group.cc b/lily/translator-group.cc
index a42db078f84aee25c304d28542b777369c4cf78f..2e6c6ee3167738f3166e73c8fb138937c3ba13ad 100644 (file)
--- a/lily/translator-group.cc
+++ b/lily/translator-group.cc
@@ -401,7 +401,8 @@ Translator_group::do_add_processing ()
 }
 
 Scalar
 }
 
 Scalar

-Translator_group::get_property (String id, Translator_group  **where_l) const
+Translator_group::get_property (String id,
+                               Translator_group **where_l) const

 {
   if (properties_dict_.elem_b (id))
     {
 {
   if (properties_dict_.elem_b (id))
     {

diff --git a/ly/declarations.ly b/ly/declarations.ly
index a76c0abcbbff6019e24ade0c77a16bc9d7545c9d..bb2f3d39d0264da0fcade9d5b8eb93daf4567c46 100644 (file)
--- a/ly/declarations.ly
+++ b/ly/declarations.ly
@@ -3,7 +3,6 @@
 breve = \duration { -1 0 }
 longa = \duration { -2 0 }
 
 breve = \duration { -1 0 }
 longa = \duration { -2 0 }
 

-\include "dynamic.ly"

 \include "nederlands.ly"               % dutch
 \include "chord-modifiers.ly"
 \include "script.ly"
 \include "nederlands.ly"               % dutch
 \include "chord-modifiers.ly"
 \include "script.ly"


@@ -28,8 +27,11 @@ left = -1
 right = 1
 up = 1
 down = -1
 right = 1
 up = 1
 down = -1

+start = -1
+stop = 1
+smaller = -1
+bigger = 1

 
 

-% zillie spellink?

 center=0
 
 break = { \penalty = 10000; }
 center=0
 
 break = { \penalty = 10000; }


@@ -37,6 +39,7 @@ nobreak = { \penalty = -10000; }
 
 major = 0
 minor = 3
 
 major = 0
 minor = 3

+\include "dynamic.ly"

 
 \include "property.ly"
 
 
 \include "property.ly"
 

diff --git a/ly/dynamic.ly b/ly/dynamic.ly
index 2602a61787de833f6c5c5e3914601cc0d206f934..0fae8e2a10817483b11bb4e1c86e23cd44882750 100644 (file)
--- a/ly/dynamic.ly
+++ b/ly/dynamic.ly
@@ -2,8 +2,7 @@
 % declare the standard dynamic identifiers.
 %
 
 % declare the standard dynamic identifiers.
 %
 

-pppppp = \absdynamic { "pppppp" }      % Yeah yeah, \absdynamic "foo"; would/should also work. 
-
+pppppp = \absdynamic { "pppppp" }      

 ppppp = \absdynamic { "ppppp" }
 pppp = \absdynamic { "pppp" }
 ppp = \absdynamic { "ppp" }
 ppppp = \absdynamic { "ppppp" }
 pppp = \absdynamic { "pppp" }
 ppp = \absdynamic { "ppp" }


@@ -11,13 +10,12 @@ pp = \absdynamic { "pp" }
 p = \absdynamic { "p" }
 mp = \absdynamic { "mp" }
 mf = \absdynamic { "mf" }
 p = \absdynamic { "p" }
 mp = \absdynamic { "mp" }
 mf = \absdynamic { "mf" }

-f = \absdynamic { "f" }
+f = \absdynamic { "e" }                        % see feta-din layout

 ff = \absdynamic { "ff" }
 fff = \absdynamic { "fff" }
 ffff = \absdynamic { "ffff" }
 fffff = \absdynamic { "fffff" }
 ffffff = \absdynamic { "ffffff" }
 ff = \absdynamic { "ff" }
 fff = \absdynamic { "fff" }
 ffff = \absdynamic { "ffff" }
 fffff = \absdynamic { "fffff" }
 ffffff = \absdynamic { "ffffff" }

-

 fp = \absdynamic { "fp" }
 sf = \absdynamic { "sf" }
 sff = \absdynamic { "sff" }
 fp = \absdynamic { "fp" }
 sf = \absdynamic { "sf" }
 sff = \absdynamic { "sff" }


@@ -26,7 +24,8 @@ sp = \absdynamic { "sp" }
 spp = \absdynamic { "spp" }
 rfz = \absdynamic { "rfz" }
 
 spp = \absdynamic { "spp" }
 rfz = \absdynamic { "rfz" }
 

-cr = \spandynamic { 1 1 } 
-decr = \spandynamic { -1 1 }
-rc = \spandynamic { 1 2 } % stop a crescendo
-rced = \spandynamic { 1 2 } % stop a decrescendo
+% 1st arg dynamic (louder/softer). 2nd arg spantype
+cr = \spandynamic { \bigger \start } 
+decr = \spandynamic { \smaller  \start }
+rc = \spandynamic { \bigger  \stop }
+rced = \spandynamic { \smaller \stop }

diff --git a/make/out/lelievijver.lsm b/make/out/lelievijver.lsm
index cebb5eb414c85cd9ddbfb0e1d3fa4d4dfe7abc3e..b5a9896591e740b5af852f8e6060f2cfb516b31b 100644 (file)
--- a/make/out/lelievijver.lsm
+++ b/make/out/lelievijver.lsm
@@ -1,15 +1,15 @@
 Begin3
 Titel: LilyPond
 Begin3
 Titel: LilyPond

-Versie: 1.1.30
-Inschrijf datum: 15FEB99
+Versie: 1.1.31
+Inschrijf datum: 17FEB99

 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
 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.30.tar.gz 
+       770k lilypond-1.1.31.tar.gz 

 Oorspronkelijke plek: ftp.cs.uu.nl /pub/GNU/LilyPond/development/
 Oorspronkelijke plek: ftp.cs.uu.nl /pub/GNU/LilyPond/development/

-       770k lilypond-1.1.30.tar.gz 
+       770k lilypond-1.1.31.tar.gz 

 Copi-eer voorwaarden: GPL
 End
 Copi-eer voorwaarden: GPL
 End

diff --git a/make/out/lilypond.lsm b/make/out/lilypond.lsm
index b1a52cdca6e32989831415c33f1a11aad62bd77b..bca0e98d99e43e5a45be66908939b14704146296 100644 (file)
--- a/make/out/lilypond.lsm
+++ b/make/out/lilypond.lsm
@@ -1,7 +1,7 @@
 Begin3
 Title: LilyPond
 Begin3
 Title: LilyPond

-Version: 1.1.30
-Entered-date: 15FEB99
+Version: 1.1.31
+Entered-date: 17FEB99

 Description: 
 LilyPond is the GNU Project music typesetter.  This program can print
 beautiful sheet music from a music definition file.  It can also play
 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
        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.30.tar.gz 
+       770k lilypond-1.1.31.tar.gz 

 Original-site: ftp.cs.uu.nl /pub/GNU/LilyPond/development/
 Original-site: ftp.cs.uu.nl /pub/GNU/LilyPond/development/

-       770k lilypond-1.1.30.tar.gz 
+       770k lilypond-1.1.31.tar.gz 

 Copying-policy: GPL
 End
 Copying-policy: GPL
 End

diff --git a/make/out/lilypond.spec b/make/out/lilypond.spec
index 5cd36c15df179b2f14d47afbe0ff6f27e5561094..18bf675d1fb0790041bf05c5fdcd216c54d9f8b5 100644 (file)
--- a/make/out/lilypond.spec
+++ b/make/out/lilypond.spec
@@ -1,9 +1,9 @@
 Name: lilypond
 Name: lilypond

-Version: 1.1.30
+Version: 1.1.31

 Release: 1
 Copyright: GPL
 Group: Applications/Publishing
 Release: 1
 Copyright: GPL
 Group: Applications/Publishing

-Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.1.30.tar.gz
+Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.1.31.tar.gz

 Summary: A program for printing sheet music.
 URL: http://www.cs.uu.nl/~hanwen/lilypond
 Packager: Han-Wen Nienhuys <hanwen@cs.uu.nl>
 Summary: A program for printing sheet music.
 URL: http://www.cs.uu.nl/~hanwen/lilypond
 Packager: Han-Wen Nienhuys <hanwen@cs.uu.nl>

diff --git a/mutopia/E.Satie/GNUmakefile b/mutopia/E.Satie/GNUmakefile
index ff57490f110317b02c83bc431a54f828c76d87a4..dd90aa789f7cb9d9777274d77607a63bb166e280 100644 (file)
--- a/mutopia/E.Satie/GNUmakefile
+++ b/mutopia/E.Satie/GNUmakefile
@@ -2,7 +2,7 @@
 
 depth = ../..
 
 
 depth = ../..
 

-examples=gnossienne-4 petite-ouverture-a-danser
+examples=petite-ouverture-a-danser

 LOCALSTEPMAKE_TEMPLATES=mutopia
 
 include $(depth)/make/stepmake.make
 LOCALSTEPMAKE_TEMPLATES=mutopia
 
 include $(depth)/make/stepmake.make

diff --git a/po/it.po b/po/it.po
index 679596d920ddd6368e3609c20af6455edf622013..b4bc4cfee4da57ad15d5680e4fc34778e76b32c0 100644 (file)
--- a/po/it.po
+++ b/po/it.po
@@ -1,6 +1,7 @@
 # it.po -- GNU LilyPond's italian language file
 # Copyright (C) 1998 Free Software Foundation, Inc.
 # Tineke de Munnik <jantien@xs4all.nl>, 1998.
 # it.po -- GNU LilyPond's italian language file
 # Copyright (C) 1998 Free Software Foundation, Inc.
 # Tineke de Munnik <jantien@xs4all.nl>, 1998.

+# Modified by Maurizio Umberto Puxeddu <umbpux@tin.it>, Feb1999

 #
 #, fuzzy
 msgid ""
 #
 #, fuzzy
 msgid ""


@@ -17,30 +18,30 @@ msgstr "EOF in una corda"
 
 #: data-file.cc:121 input.cc:86 midi-parser.cc:100 warn.cc:21
 msgid "warning: "
 
 #: data-file.cc:121 input.cc:86 midi-parser.cc:100 warn.cc:21
 msgid "warning: "

-msgstr "attentione: "
+msgstr "attenzione: "

 
 #: dstream.cc:159
 msgid "Not enough fields in Dstream init."
 
 #: dstream.cc:159
 msgid "Not enough fields in Dstream init."

-msgstr ""
+msgstr "Non ci sono sufficienti campi in Dstream init."

 
 #: flower-debug.cc:17
 msgid "Debug output disabled.  Compiled with NPRINT."
 
 #: flower-debug.cc:17
 msgid "Debug output disabled.  Compiled with NPRINT."

-msgstr ""
+msgstr "L'output di debug è disabilitato. Compilato con NPRINT."

 
 #: getopt-long.cc:103
 #, c-format
 msgid "option `%s' requires an argument"
 
 #: getopt-long.cc:103
 #, c-format
 msgid "option `%s' requires an argument"

-msgstr "opzione `%s' chiede un argumento"
+msgstr "l'opzione `%s' richiede un argomento"

 
 #: getopt-long.cc:107
 #, c-format
 msgid "option `%s' doesn't allow an argument"
 
 #: getopt-long.cc:107
 #, c-format
 msgid "option `%s' doesn't allow an argument"

-msgstr "opzione `%s' non permette un argumento"
+msgstr "opzione `%s' non accetta argomenti"

 
 #: getopt-long.cc:111
 #, c-format
 msgid "unrecognized option: `%s'"
 
 #: getopt-long.cc:111
 #, c-format
 msgid "unrecognized option: `%s'"

-msgstr "opzione non riconosciuto `%s'"
+msgstr "opzione non riconosciuta: `%s'"

 
 #: getopt-long.cc:113
 #, c-format
 
 #: getopt-long.cc:113
 #, c-format


@@ -50,7 +51,7 @@ msgstr ""
 #: getopt-long.cc:117
 #, c-format
 msgid "invalid argument `%s' to option `%s'"
 #: getopt-long.cc:117
 #, c-format
 msgid "invalid argument `%s' to option `%s'"

-msgstr "argumento non valide `%s' all'opzione `%s'"
+msgstr "argomento `%s' non valido per l'opzione `%s'"

 
 #: text-stream.cc:8
 msgid "<stdin>"
 
 #: text-stream.cc:8
 msgid "<stdin>"


@@ -61,7 +62,7 @@ msgstr ""
 #: simple-file-storage.cc:44 text-stream.cc:21
 #, c-format
 msgid "can't open file: `%s'"
 #: simple-file-storage.cc:44 text-stream.cc:21
 #, c-format
 msgid "can't open file: `%s'"

-msgstr "non posso aprire il documento: `%s'"
+msgstr "non posso aprire il file: `%s'"

 
 #: input.cc:91 warn.cc:7 warn.cc:15
 msgid "error: "
 
 #: input.cc:91 warn.cc:7 warn.cc:15
 msgid "error: "


@@ -73,7 +74,7 @@ msgstr "Errore non fatale: "
 
 #: input.cc:105 source-file.cc:62 source-file.cc:155
 msgid "position unknown"
 
 #: input.cc:105 source-file.cc:62 source-file.cc:155
 msgid "position unknown"

-msgstr "posizione sconosciuto"
+msgstr "posizione sconosciuta"

 
 #: mapped-file-storage.cc:65
 msgid "map_fd: "
 
 #: mapped-file-storage.cc:65
 msgid "map_fd: "


@@ -90,42 +91,42 @@ msgstr ""
 #: simple-file-storage.cc:56
 #, c-format
 msgid "Huh? got %d, expected %d characters"
 #: simple-file-storage.cc:56
 #, c-format
 msgid "Huh? got %d, expected %d characters"

-msgstr "Come? ce ne ho %d, ho aspettato %d carattere"
+msgstr "Come? Ho trovato %d caratteri al posto di %d"

 
 #: abbreviation-beam-engraver.cc:72 beam-engraver.cc:86
 msgid "unterminated beam"
 
 #: abbreviation-beam-engraver.cc:72 beam-engraver.cc:86
 msgid "unterminated beam"

-msgstr ""
+msgstr "beam non terminato"

 
 #: afm.cc:114
 #, c-format
 msgid "can't find character called `%s'"
 
 #: afm.cc:114
 #, c-format
 msgid "can't find character called `%s'"

-msgstr ""
+msgstr "non riesco a trovare il carattere `%s'"

 
 #: atom.cc:30
 #, c-format
 msgid "ridiculous dimension: %s, %s"
 
 #: atom.cc:30
 #, c-format
 msgid "ridiculous dimension: %s, %s"

-msgstr "dimensione da ridere: %s, %s"
+msgstr "dimensione ridicola: %s, %s"

 
 #: beam-engraver.cc:102 cbeam-engraver.cc:122
 msgid "Stem must have Rhythmic structure."
 
 #: beam-engraver.cc:102 cbeam-engraver.cc:122
 msgid "Stem must have Rhythmic structure."

-msgstr ""
+msgstr "I gambi devono avere una struttura ritmica."

 
 #: beam-engraver.cc:109 cbeam-engraver.cc:134
 msgid "stem doesn't fit in beam"
 
 #: beam-engraver.cc:109 cbeam-engraver.cc:134
 msgid "stem doesn't fit in beam"

-msgstr ""
+msgstr "il gambo non rientra nel beam"

 
 #: beam-engraver.cc:120 cbeam-engraver.cc:145
 msgid "please fix me"
 
 #: beam-engraver.cc:120 cbeam-engraver.cc:145
 msgid "please fix me"

-msgstr "aggiustami per favore"
+msgstr "correggimi, per favore"

 
 #: beam-engraver.cc:121 cbeam-engraver.cc:146
 #, c-format
 msgid "stem at %s doesn't fit in beam"
 
 #: beam-engraver.cc:121 cbeam-engraver.cc:146
 #, c-format
 msgid "stem at %s doesn't fit in beam"

-msgstr ""
+msgstr "il gambo a $s non rientra nel beam"

 
 #: beam.cc:117
 msgid "beam with less than two stems"
 
 #: beam.cc:117
 msgid "beam with less than two stems"

-msgstr ""
+msgstr "beam con meno di due gambi"

 
 #: beam.cc:563
 msgid "weird beam shift, check your knees"
 
 #: beam.cc:563
 msgid "weird beam shift, check your knees"


@@ -147,7 +148,7 @@ msgstr "%d linee (con una media di %.f colonne)"
 
 #: break.cc:159
 msgid "score does not have any columns"
 
 #: break.cc:159
 msgid "score does not have any columns"

-msgstr ""
+msgstr "lo spartito non contiene nessuna colonna"

 
 #: break.cc:183
 #, c-format
 
 #: break.cc:183
 #, c-format


@@ -166,28 +167,28 @@ msgstr "durata: %.2f secondi"
 
 #: cbeam-engraver.cc:45
 msgid "No beam to stop"
 
 #: cbeam-engraver.cc:45
 msgid "No beam to stop"

-msgstr ""
+msgstr "Nessun beam da terminare"

 
 #: change-iterator.cc:21
 #, c-format
 msgid "can't change `%s' to `%s'"
 
 #: change-iterator.cc:21
 #, c-format
 msgid "can't change `%s' to `%s'"

-msgstr ""
+msgstr "non posso cambiare `%s' in `%s'"

 
 #: clef-engraver.cc:124
 msgid "unknown clef type "
 
 #: clef-engraver.cc:124
 msgid "unknown clef type "

-msgstr ""
+msgstr "tipo di chiave sconosciuto"

 
 #: collision.cc:63
 msgid "No stem direction set. Ignoring column in clash."
 
 #: collision.cc:63
 msgid "No stem direction set. Ignoring column in clash."

-msgstr ""
+msgstr "Nessuna direzione del gambo è selezionata. Ignoro la colonna."

 
 #: collision.cc:76
 msgid "Too many clashing notecolumns. Ignoring them."
 
 #: collision.cc:76
 msgid "Too many clashing notecolumns. Ignoring them."

-msgstr ""
+msgstr "Troppe collisioni tra colonne di note. Le ignoro."

 
 #: command-request.cc:220
 msgid "don't know how handle empty keys"
 
 #: command-request.cc:220
 msgid "don't know how handle empty keys"

-msgstr ""
+msgstr "non so manipolare tasti vuoti"

 
 #: compressed-music-iterator.cc:25
 msgid "No one to print a tuplet start bracket"
 
 #: compressed-music-iterator.cc:25
 msgid "No one to print a tuplet start bracket"


@@ -199,15 +200,15 @@ msgstr ""
 
 #: crescendo.cc:47 lookup.cc:501
 msgid "too small"
 
 #: crescendo.cc:47 lookup.cc:501
 msgid "too small"

-msgstr ""
+msgstr "troppo piccolo"

 
 #: debug.cc:56
 msgid "Floating point exception"
 
 #: debug.cc:56
 msgid "Floating point exception"

-msgstr ""
+msgstr "Eccezione di virgola mobile"

 
 #: debug.cc:139
 msgid "can't set mem-checking"
 
 #: debug.cc:139
 msgid "can't set mem-checking"

-msgstr ""
+msgstr "non posso settare mem-checking"

 
 #: dimensions.cc:13
 msgid "NaN"
 
 #: dimensions.cc:13
 msgid "NaN"


@@ -215,37 +216,37 @@ msgstr ""
 
 #: dynamic-engraver.cc:60
 msgid "Got a dynamic already.  Continuing dazed and confused"
 
 #: dynamic-engraver.cc:60
 msgid "Got a dynamic already.  Continuing dazed and confused"

-msgstr ""
+msgstr "E' già presente una dinamica. Continuo, ma sono confusa"

 
 #: dynamic-engraver.cc:82
 msgid "can't find (de)crescendo to end"
 
 #: dynamic-engraver.cc:82
 msgid "can't find (de)crescendo to end"

-msgstr ""
+msgstr "non trovo un (de)crescendo fino alla fine"

 
 #: dynamic-engraver.cc:106
 msgid "Too many crescendi here"
 
 #: dynamic-engraver.cc:106
 msgid "Too many crescendi here"

-msgstr ""
+msgstr "Troppi crescendi"

 
 #: dynamic-engraver.cc:165
 msgid "unended crescendo"
 
 #: dynamic-engraver.cc:165
 msgid "unended crescendo"

-msgstr ""
+msgstr "crescendo non terminato"

 
 #: extender-engraver.cc:65
 msgid "unterminated extender"
 
 #: extender-engraver.cc:65
 msgid "unterminated extender"

-msgstr ""
+msgstr "extender non terminato"

 
 #: identifier.cc:48
 msgid "Wrong identifier type: "
 
 #: identifier.cc:48
 msgid "Wrong identifier type: "

-msgstr ""
+msgstr "Tipo di identificatore sbagliato: "

 
 #: identifier.cc:49
 #, c-format
 msgid "%s expected"
 
 #: identifier.cc:49
 #, c-format
 msgid "%s expected"

-msgstr "%s aspettato"
+msgstr "aspettavo %s"

 
 #: includable-lexer.cc:45 midi-score-parser.cc:24 scores.cc:110 scores.cc:115
 #, c-format
 msgid "can't find file: `%s'"
 
 #: includable-lexer.cc:45 midi-score-parser.cc:24 scores.cc:110 scores.cc:115
 #, c-format
 msgid "can't find file: `%s'"

-msgstr ""
+msgstr "non trovo il file: `%s'"

 
 #: ineq-constrained-qp.cc:167
 #, c-format
 
 #: ineq-constrained-qp.cc:167
 #, c-format


@@ -254,51 +255,51 @@ msgstr ""
 
 #: ineq-constrained-qp.cc:222
 msgid "didn't converge!"
 
 #: ineq-constrained-qp.cc:222
 msgid "didn't converge!"

-msgstr ""
+msgstr "non converge!"

 
 #: ineq-constrained-qp.cc:224
 msgid "Too much degeneracy. "
 
 #: ineq-constrained-qp.cc:224
 msgid "Too much degeneracy. "

-msgstr ""
+msgstr "Troppa degenerazione. "

 
 #: key-engraver.cc:133
 msgid "No key name: assuming `C'"
 
 #: key-engraver.cc:133
 msgid "No key name: assuming `C'"

-msgstr ""
+msgstr "Nessuna armatura di chiave: assumo Do'"

 
 #: lily-guile.cc:63
 #, c-format
 msgid "Can not find file `%s'"
 
 #: lily-guile.cc:63
 #, c-format
 msgid "Can not find file `%s'"

-msgstr ""
+msgstr "Non trovo il file `%s'"

 
 #: lily-guile.cc:65
 #, c-format
 msgid "(Load path is `%s'"
 
 #: lily-guile.cc:65
 #, c-format
 msgid "(Load path is `%s'"

-msgstr ""
+msgstr "(Il path di caricamento è `%s'"

 
 #: local-key-engraver.cc:39
 msgid "out of tune"
 
 #: local-key-engraver.cc:39
 msgid "out of tune"

-msgstr ""
+msgstr "stonato"

 
 #: local-key-engraver.cc:39 time-signature-engraver.cc:28
 msgid "can't find"
 
 #: local-key-engraver.cc:39 time-signature-engraver.cc:28
 msgid "can't find"

-msgstr ""
+msgstr "non trovo"

 
 #: lookup.cc:375
 #, c-format
 msgid "guessing dimensions for font style: `%s'"
 
 #: lookup.cc:375
 #, c-format
 msgid "guessing dimensions for font style: `%s'"

-msgstr ""
+msgstr "indovino le dimensioni per il font style: `%s'"

 
 #: lookup.cc:500
 msgid "bracket"
 
 #: lookup.cc:500
 msgid "bracket"

-msgstr ""
+msgstr "parentsei"

 
 #: main.cc:81
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]..."
 
 #: main.cc:81
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]..."

-msgstr "Uso: %s [OPZIONE]... [DOCUMENTO]..."
+msgstr "Uso: %s [OPZIONE]... [FILE]..."

 
 #: main.cc:82
 msgid "Typeset music and or play MIDI from FILE or <stdin>"
 
 #: main.cc:82
 msgid "Typeset music and or play MIDI from FILE or <stdin>"

-msgstr "Stampa partitura oppure suona MIDI dal FILE o <stdin>"
+msgstr "Stampa partitura oppure suona una song MIDI da FILE o <stdin>"

 
 #: main.cc:48 main.cc:85
 msgid "Options:"
 
 #: main.cc:48 main.cc:85
 msgid "Options:"


@@ -310,28 +311,29 @@ msgstr "  -a, --about            cos'
 
 #: main.cc:54 main.cc:91
 msgid "  -D, --debug            enable debugging output\n"
 
 #: main.cc:54 main.cc:91
 msgid "  -D, --debug            enable debugging output\n"

-msgstr ""
+msgstr "  -D, --debug            abilita l'output di debugging\n"

 
 #: main.cc:94
 msgid ""
 "  -d, --dependencies     write Makefile dependencies for every input file\n"
 msgstr ""
 
 #: main.cc:94
 msgid ""
 "  -d, --dependencies     write Makefile dependencies for every input file\n"
 msgstr ""

+"  -d, --dependencies     scrive le dependenze del Makefile per ogni file di input\n"

 
 #: main.cc:57 main.cc:97
 msgid "  -h, --help             this help\n"
 
 #: main.cc:57 main.cc:97
 msgid "  -h, --help             this help\n"

-msgstr "  -h, --help             questo sostegno\n"
+msgstr "  -h, --help             questo help\n"

 
 #: main.cc:100
 msgid "  -f, --output-format=X  use output format X\n"
 
 #: main.cc:100
 msgid "  -f, --output-format=X  use output format X\n"

-msgstr ""
+msgstr "  -f, --output-format=X  usa il formato dell'ouput X\n"

 
 #: main.cc:60 main.cc:103
 msgid "  -I, --include=DIR      add DIR to search path\n"
 
 #: main.cc:60 main.cc:103
 msgid "  -I, --include=DIR      add DIR to search path\n"

-msgstr "  -I, --include=DIR      add DIR to search path\n"
+msgstr "  -I, --include=DIR      aggiunge DIR ai path di ricerca\n"

 
 #: main.cc:106
 msgid "  -i, --init=FILE        use FILE as init file\n"
 
 #: main.cc:106
 msgid "  -i, --init=FILE        use FILE as init file\n"

-msgstr "  -i, --init=DOC         usa DOC come documento iniziale\n"
+msgstr "  -i, --init=NOMEFILE    usa NOMEFILE come file iniziale\n"

 
 #: main.cc:109
 msgid "  -M, --no-paper         produce midi output only\n"
 
 #: main.cc:109
 msgid "  -M, --no-paper         produce midi output only\n"


@@ -339,46 +341,47 @@ msgstr "  -M, --no-paper         produce solo output midi\n"
 
 #: main.cc:112
 msgid "  -o, --output=FILE      set FILE as default output base\n"
 
 #: main.cc:112
 msgid "  -o, --output=FILE      set FILE as default output base\n"

-msgstr ""
+msgstr "  -o, --output=FILE      indica FILE come base di default per l'output\n"

 
 #: main.cc:115
 msgid "  -Q, --find-old-relative show all changes in relative syntax\n"
 
 #: main.cc:115
 msgid "  -Q, --find-old-relative show all changes in relative syntax\n"

-msgstr ""
+msgstr "  -Q, --find-old-relative mostra tutti i cambiamenti nella sintassi relativa\n"

 
 #: main.cc:118
 msgid ""
 "  -s, --safe             inhibit file output naming and exporting TeX  "
 "macros\n"
 msgstr ""
 
 #: main.cc:118
 msgid ""
 "  -s, --safe             inhibit file output naming and exporting TeX  "
 "macros\n"
 msgstr ""

+"  -s, --safe             inibisce la rinomina dei file di output e l'esportazione di macro di TeX\n"

 
 #: main.cc:120
 msgid "  -t, --test             switch on experimental features\n"
 
 #: main.cc:120
 msgid "  -t, --test             switch on experimental features\n"

-msgstr "  -t, --test             usa truchi sperimentali\n"
+msgstr "  -t, --test             usa le caratteristiche sperimentali\n"

 
 #: main.cc:78 main.cc:123
 msgid "  -T, --no-timestamps    don't timestamp the output\n"
 
 #: main.cc:78 main.cc:123
 msgid "  -T, --no-timestamps    don't timestamp the output\n"

-msgstr ""
+msgstr "  -T, --no-timestamps    non inserisce marcatori temporali nell'output\n"

 
 #: main.cc:126
 msgid "  -V, --ignore-version   ignore mudela version\n"
 
 #: main.cc:126
 msgid "  -V, --ignore-version   ignore mudela version\n"

-msgstr ""
+msgstr "  -V, --ignore-version   ignora la versione di mudela\n"

 
 #: main.cc:87 main.cc:129
 msgid "  -w, --warranty         show warranty and copyright\n"
 
 #: main.cc:87 main.cc:129
 msgid "  -w, --warranty         show warranty and copyright\n"

-msgstr ""
+msgstr "  -w, --warranty         mostra la garanzia e il copyright\n"

 
 #: main.cc:132
 msgid "GNU LilyPond was compiled with the following settings:"
 
 #: main.cc:132
 msgid "GNU LilyPond was compiled with the following settings:"

-msgstr ""
+msgstr "GNU LilyPond è stata compilata con le seguenti impostazioni:"

 
 #: main.cc:160
 msgid "GNU LilyPond is Free software, see --warranty"
 
 #: main.cc:160
 msgid "GNU LilyPond is Free software, see --warranty"

-msgstr ""
+msgstr "GNU LilyPond è Free software, vedi --warranty"

 
 #: main.cc:107 main.cc:163 main.cc:176
 #, c-format
 msgid "Copyright (c) %s by"
 
 #: main.cc:107 main.cc:163 main.cc:176
 #, c-format
 msgid "Copyright (c) %s by"

-msgstr ""
+msgstr "Copyright (c) %s di"

 
 #: main.cc:109 main.cc:165 main.cc:178
 msgid "Han-Wen Nienhuys <hanwen@cs.uu.nl>"
 
 #: main.cc:109 main.cc:165 main.cc:178
 msgid "Han-Wen Nienhuys <hanwen@cs.uu.nl>"


@@ -408,130 +411,142 @@ msgid ""
 "the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139,\n"
 "USA.\n"
 msgstr ""
 "the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139,\n"
 "USA.\n"
 msgstr ""

+"    Questo programma è free software; puoi ridistribuirlo e/o\n"
+"modificarlo sotto le condizioni della GNU General Public License, versione 2,\n"
+"come pubblicata dalla Free Software Foundation.\n"
+"    Questo programma è distribuito nella speranza che possa essere utile,\n"
+"ma SENZA ALCUNA GARANZIA; è privo anche di garanzia implicita di\n"
+"COMMERCIABILITA' o della POSSIBILITA' D'USO A SCOPI PARTICOLARI. Si veda la GNU\n"
+"General Public License per ulteriori dettagli.\n"
+"\n"
+"    Con questo programma dovresti aver ricevuto una copia della\n"
+"GNU General Public License (ci riferiamo al file COPYING); se ciò non è"
+"avvenuto, scrivi a: Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02136\n"
+"USA.\n" 

 
 #: midi-item.cc:364
 #, c-format
 msgid "unconventional key: flats: %d, sharps: %d"
 
 #: midi-item.cc:364
 #, c-format
 msgid "unconventional key: flats: %d, sharps: %d"

-msgstr ""
+msgstr "armatura non convenzionale: %d bemolli e %d diesis"

 
 #: midi-item.cc:411
 msgid "silly duration"
 
 #: midi-item.cc:411
 msgid "silly duration"

-msgstr ""
+msgstr "indicazione durata priva di senso"

 
 #: midi-item.cc:424
 msgid "silly pitch"
 
 #: midi-item.cc:424
 msgid "silly pitch"

-msgstr ""
+msgstr "indicazione altezza priva di senso"

 
 #: midi-stream.cc:29 paper-stream.cc:36
 msgid "error syncing file (disk full?)"
 
 #: midi-stream.cc:29 paper-stream.cc:36
 msgid "error syncing file (disk full?)"

-msgstr ""
+msgstr "errore nel sincronizzare il file (disco pieno?)"

 
 #: music-list.cc:92
 msgid "\\relative mode changed here, old value: "
 
 #: music-list.cc:92
 msgid "\\relative mode changed here, old value: "

-msgstr ""
+msgstr "\\il modo relativo è cambiato in questo punto, valore vecchio: "

 
 #: music-output-def.cc:78
 msgid "Can't find Score context"
 
 #: music-output-def.cc:78
 msgid "Can't find Score context"

-msgstr ""
+msgstr "Non trovo il contesto dello Score"

 
 #: musical-request.cc:97
 #, c-format
 msgid "transposition by %s makes accidental larger than two"
 
 #: musical-request.cc:97
 #, c-format
 msgid "transposition by %s makes accidental larger than two"

-msgstr ""
+msgstr "la trasposizine di %s rende le alterazioni più che doppie"

 
 #: musical-request.cc:401
 #, c-format
 msgid "never heard of dynamic scale `\\%s', assuming %s"
 
 #: musical-request.cc:401
 #, c-format
 msgid "never heard of dynamic scale `\\%s', assuming %s"

-msgstr ""
+msgstr "la scala dinamica `\\%s' l'ho mai sentita, assumo la %s"

 
 #: my-lily-lexer.cc:132
 #, c-format
 msgid "redeclaration of `\\%s'"
 
 #: my-lily-lexer.cc:132
 #, c-format
 msgid "redeclaration of `\\%s'"

-msgstr ""
+msgstr "doppia dichiarazione di `\\%s'"

 
 #: my-lily-lexer.cc:138
 #, c-format
 msgid "Identifier name is a keyword (`%s')"
 
 #: my-lily-lexer.cc:138
 #, c-format
 msgid "Identifier name is a keyword (`%s')"

-msgstr ""
+msgstr "Il nome dell'identificatore è una parola chiave (`%s')"

 
 #: my-lily-lexer.cc:166
 #, c-format
 msgid "error at EOF: %s"
 
 #: my-lily-lexer.cc:166
 #, c-format
 msgid "error at EOF: %s"

-msgstr ""
+msgstr "errore alla fine del file: %s"

 
 #: my-lily-parser.cc:57
 msgid "Parsing..."
 
 #: my-lily-parser.cc:57
 msgid "Parsing..."

-msgstr "Analizzare..."
+msgstr "Analisi..."

 
 #: my-lily-parser.cc:66
 msgid "braces don't match"
 
 #: my-lily-parser.cc:66
 msgid "braces don't match"

-msgstr ""
+msgstr "le bretelle no si accoppiano"

 
 #: my-lily-parser.cc:273
 msgid "invalid inversion pitch (not part of chord)"
 
 #: my-lily-parser.cc:273
 msgid "invalid inversion pitch (not part of chord)"

-msgstr ""
+msgstr "altezza dell'inversione errata (non fa parte di un accordo)"

 
 #: p-score.cc:172
 msgid "Can't solve this casting problem exactly; revert to Word_wrap"
 
 #: p-score.cc:172
 msgid "Can't solve this casting problem exactly; revert to Word_wrap"

-msgstr ""
+msgstr "Non posso risolvere esattamente questo problema di conversione; ritorno al Word_wrap"

 
 #: p-score.cc:193
 msgid "Preprocessing elements..."
 
 #: p-score.cc:193
 msgid "Preprocessing elements..."

-msgstr "Preprocessare elementi..."
+msgstr "Pre-elaborazione..."

 
 #: p-score.cc:197
 msgid "Calculating column positions..."
 
 #: p-score.cc:197
 msgid "Calculating column positions..."

-msgstr "Calcolare posizioni di colonne..."
+msgstr "Calcolo delle posizioni della colonne..."

 
 #: paper-def.cc:59
 #, c-format
 msgid "unknown paper variable: `%s'"
 
 #: paper-def.cc:59
 #, c-format
 msgid "unknown paper variable: `%s'"

-msgstr ""
+msgstr "variabile paper sconosciuta: `%s'"

 
 #: paper-def.cc:63
 msgid "not a real variable"
 
 #: paper-def.cc:63
 msgid "not a real variable"

-msgstr ""
+msgstr "non è una vera variabile"

 
 #. for now; breaks -fscm output
 #: paper-def.cc:228
 msgid "outputting Score, defined at: "
 
 #. for now; breaks -fscm output
 #: paper-def.cc:228
 msgid "outputting Score, defined at: "

-msgstr ""
+msgstr "emetto lo Score, definito a: "

 
 #: paper-def.cc:260
 #, c-format
 msgid "Paper output to %s..."
 
 #: paper-def.cc:260
 #, c-format
 msgid "Paper output to %s..."

-msgstr "Prodotto stampato verso %s..."
+msgstr "L'output stampato è inviato a %s..."

 
 #: mudela-stream.cc:85 paper-outputter.cc:61 performance.cc:68
 msgid ", at "
 
 #: mudela-stream.cc:85 paper-outputter.cc:61 performance.cc:68
 msgid ", at "

-msgstr ""
+msgstr ", a "

 
 #. perhaps multiple text events?
 #: performance.cc:54
 msgid "Creator: "
 
 #. perhaps multiple text events?
 #: performance.cc:54
 msgid "Creator: "

-msgstr ""
+msgstr "Autore: "

 
 #: performance.cc:63
 msgid "Automatically generated"
 
 #: performance.cc:63
 msgid "Automatically generated"

-msgstr ""
+msgstr "Generato automaticamente"

 
 #: performance.cc:76
 #, c-format
 msgid "from musical definition: %s"
 
 #: performance.cc:76
 #, c-format
 msgid "from musical definition: %s"

-msgstr ""
+msgstr "della definizione musicale: %s"

 
 #: performance.cc:141
 #, c-format
 msgid "MIDI output to %s..."
 
 #: performance.cc:141
 #, c-format
 msgid "MIDI output to %s..."

-msgstr "Prodotto di MIDI verso %s..."
+msgstr "L'output MIDI è inviato a %s..."

 
 #: plet-engraver.cc:86
 msgid "unterminated plet"
 
 #: plet-engraver.cc:86
 msgid "unterminated plet"

-msgstr ""
+msgstr "gruppetto non terminato"

 
 #: qlpsolve.cc:88 qlpsolve.cc:139
 msgid "degenerate constraints"
 
 #: qlpsolve.cc:88 qlpsolve.cc:139
 msgid "degenerate constraints"

-msgstr ""
+msgstr "vincoli degenerati"

 
 #: repeated-music-iterator.cc:58
 msgid "No one to print a volta bracket"
 
 #: repeated-music-iterator.cc:58
 msgid "No one to print a volta bracket"


@@ -545,56 +560,56 @@ msgstr ""
 #: request-iterator.cc:75
 #, c-format
 msgid "Huh? Not a Request: `%s'"
 #: request-iterator.cc:75
 #, c-format
 msgid "Huh? Not a Request: `%s'"

-msgstr ""
+msgstr "Cosa? Non è una richiesta: `%s'"

 
 #: score-column.cc:55
 #, c-format
 msgid "ignoring zero duration added to column at %s"
 
 #: score-column.cc:55
 #, c-format
 msgid "ignoring zero duration added to column at %s"

-msgstr ""
+msgstr "ingnoro le durate nulle aggiunte alla colonna a %s"

 
 #: score-engraver.cc:143
 #, c-format
 msgid "Unbound spanner `%s'"
 
 #: score-engraver.cc:143
 #, c-format
 msgid "Unbound spanner `%s'"

-msgstr ""
+msgstr "Spanner non legato `%s'"

 
 #: score.cc:57
 msgid "no toplevel translator"
 
 #: score.cc:57
 msgid "no toplevel translator"

-msgstr ""
+msgstr "non c'è un traduttore di livello massimo"

 
 #: score.cc:60
 msgid "Interpreting music..."
 
 #: score.cc:60
 msgid "Interpreting music..."

-msgstr "Interpretare musica..."
+msgstr "Interpretazione della musica..."

 
 #: score.cc:71
 msgid "need music in a score"
 
 #: score.cc:71
 msgid "need music in a score"

-msgstr ""
+msgstr "ho bisogno di musica nello spartito"

 
 #. should we? hampers debugging.
 #: score.cc:107
 msgid "errors found, /*not processing score*/"
 
 #. should we? hampers debugging.
 #: score.cc:107
 msgid "errors found, /*not processing score*/"

-msgstr ""
+msgstr "ho trovato un errore, /*non sto elaborando lo spartito*/"

 
 #: scores.cc:34
 #, c-format
 msgid "writing dependency file: `%s'..."
 
 #: scores.cc:34
 #, c-format
 msgid "writing dependency file: `%s'..."

-msgstr ""
+msgstr "scrivo il file delle dipendenze: `%s'..."

 
 #: scores.cc:78
 msgid "score contains errors; will not process it"
 
 #: scores.cc:78
 msgid "score contains errors; will not process it"

-msgstr ""
+msgstr "lo spartito contiene errori; non lo elaborerò"

 
 #: script.cc:61
 msgid "script needs stem direction"
 
 #: script.cc:61
 msgid "script needs stem direction"

-msgstr ""
+msgstr "lo script ha bisogno di una direzione per il gambo"

 
 #: slur-engraver.cc:50
 msgid "unterminated slur"
 
 #: slur-engraver.cc:50
 msgid "unterminated slur"

-msgstr ""
+msgstr "slur non terminato"

 
 #: slur-engraver.cc:66
 #, c-format
 msgid "can't find both ends of %s"
 
 #: slur-engraver.cc:66
 #, c-format
 msgid "can't find both ends of %s"

-msgstr ""
+msgstr "non trovo le estremità di %s"

 
 #: slur-engraver.cc:66
 msgid "slur"
 
 #: slur-engraver.cc:66
 msgid "slur"


@@ -602,65 +617,68 @@ msgstr ""
 
 #: slur.cc:42
 msgid "Putting slur over rest."
 
 #: slur.cc:42
 msgid "Putting slur over rest."

-msgstr ""
+msgstr "Metto uno slur sulla pausa."

 
 #: spanner.cc:44
 
 #: spanner.cc:44

-msgid "left spanpoint is right spanpoint\n"
-msgstr ""
+msgid "left spanpoint is right spanpoint"
+msgstr "i punti di span sinistro e destro coincidono"

 
 #: spanner.cc:101
 #, c-format
 msgid "Spanner `%s' with equal left and right spanpoints"
 
 #: spanner.cc:101
 #, c-format
 msgid "Spanner `%s' with equal left and right spanpoints"

-msgstr ""
+msgstr "I punti di span sinistro e destro dello spanner `%s' coincidono" 

 
 #: spring-spacer.cc:83
 #, c-format
 msgid "unconnected column: %d"
 
 #: spring-spacer.cc:83
 #, c-format
 msgid "unconnected column: %d"

-msgstr ""
+msgstr "colonna sconnessa: %d"

 
 #: spring-spacer.cc:187
 msgid "I'm too fat; call Oprah"
 
 #: spring-spacer.cc:187
 msgid "I'm too fat; call Oprah"

-msgstr ""
+msgstr "Son troppo grassa; chiama Oprah"

 
 #: spring-spacer.cc:345
 msgid "solution doesn't satisfy constraints"
 
 #: spring-spacer.cc:345
 msgid "solution doesn't satisfy constraints"

-msgstr ""
+msgstr "la soluzione non soddisfa i vincoli"

 
 #: spring-spacer.cc:625
 #, c-format
 msgid "can't find a ruling note at %s"
 
 #: spring-spacer.cc:625
 #, c-format
 msgid "can't find a ruling note at %s"

-msgstr ""
+msgstr "non risco a trovare una ruling note a %s"

 
 #: spring-spacer.cc:631
 #, c-format
 msgid "no minimum in measure at %s"
 
 #: spring-spacer.cc:631
 #, c-format
 msgid "no minimum in measure at %s"

-msgstr ""
+msgstr "non c'è minimo nella misura a %s"

 
 #: staff-side.cc:61
 msgid ""
 "Staff_side::get_position_f(): somebody forgot to set my direction, returning "
 "-20"
 
 #: staff-side.cc:61
 msgid ""
 "Staff_side::get_position_f(): somebody forgot to set my direction, returning "
 "-20"

-msgstr ""
+msgstr "taff_side::get_position_f(): qualcuno ha dimenticato di impostare la"
+"mia direzione, quindi restituisco -20"

 
 #: stem.cc:101
 msgid "weird stem size; check for narrow beams"
 
 #: stem.cc:101
 msgid "weird stem size; check for narrow beams"

-msgstr ""
+msgstr "dimensione del gambo poco ortodossa; check for narrow beams"

 
 #: symtable.cc:50
 #, c-format
 msgid "Symtable `%s': unknown symbol: `%s'"
 
 #: symtable.cc:50
 #, c-format
 msgid "Symtable `%s': unknown symbol: `%s'"

-msgstr ""
+msgstr "Symtable `%s': simbolo sconosciuto: `%s'"

 
 #: symtable.cc:61
 #, c-format
 msgid "Symtable `%s' unknown"
 
 #: symtable.cc:61
 #, c-format
 msgid "Symtable `%s' unknown"

-msgstr ""
+msgstr "La symtable `%s' è sconosciuta"

 
 #: text-item.cc:49
 msgid ""
 "Text_item::get_position_f(): somebody forgot to set my vertical direction, "
 "returning -20"
 msgstr ""
 
 #: text-item.cc:49
 msgid ""
 "Text_item::get_position_f(): somebody forgot to set my vertical direction, "
 "returning -20"
 msgstr ""

+"Text_item::get_position_f(): qualcuno ha dimenticato di impostare la mia"
+"direzione verticale, quindi restituisco -20"

 
 #: tie.cc:50
 msgid "lonely tie"
 
 #: tie.cc:50
 msgid "lonely tie"


@@ -668,7 +686,7 @@ msgstr ""
 
 #: ties-engraver.cc:78
 msgid "Can't find a note head at the right to attach Tie"
 
 #: ties-engraver.cc:78
 msgid "Can't find a note head at the right to attach Tie"

-msgstr ""
+msgstr "Non trovo una testa di nota sulla destra per attaccare il Tie"

 
 #: time-description.cc:17
 msgid "cadenza"
 
 #: time-description.cc:17
 msgid "cadenza"


@@ -676,56 +694,56 @@ msgstr ""
 
 #: time-description.cc:106
 msgid "partial measure must be non-negative"
 
 #: time-description.cc:106
 msgid "partial measure must be non-negative"

-msgstr ""
+msgstr "la misura parziale deve essere non-negativa"

 
 #: time-description.cc:108
 msgid "partial measure too large"
 
 #: time-description.cc:108
 msgid "partial measure too large"

-msgstr ""
+msgstr "misura parziale troppo grande"

 
 #: time-signature-engraver.cc:28
 msgid "lost in time"
 
 #: time-signature-engraver.cc:28
 msgid "lost in time"

-msgstr ""
+msgstr "mi sono persa nel tempo"

 
 #: timing-translator.cc:31
 msgid "conflicting timing request"
 
 #: timing-translator.cc:31
 msgid "conflicting timing request"

-msgstr ""
+msgstr "richieste di timing in conflitto"

 
 #: timing-translator.cc:67
 msgid "time signature change not allowed here"
 
 #: timing-translator.cc:67
 msgid "time signature change not allowed here"

-msgstr ""
+msgstr "un cambio di tempo non è ammesso in questo punto"

 
 #: timing-translator.cc:90
 #, c-format
 msgid "barcheck failed by: %s"
 
 #: timing-translator.cc:90
 #, c-format
 msgid "barcheck failed by: %s"

-msgstr ""
+msgstr "controllo del battute fallito: %s"

 
 #: translator-ctors.cc:40
 #, c-format
 msgid "unknown translator `%s'"
 
 #: translator-ctors.cc:40
 #, c-format
 msgid "unknown translator `%s'"

-msgstr ""
+msgstr "traduttore sconosciuto `%s'"

 
 #: translator-group.cc:182
 #, c-format
 msgid "can't find or create `%s' called `%s'"
 
 #: translator-group.cc:182
 #, c-format
 msgid "can't find or create `%s' called `%s'"

-msgstr ""
+msgstr "non trovo e non posso creare '%s' chiamato '%s'"

 
 #: translator-group.cc:300
 #, c-format
 msgid "can't find or create `%s'"
 
 #: translator-group.cc:300
 #, c-format
 msgid "can't find or create `%s'"

-msgstr ""
+msgstr "non trovo e non posso creare `%s'"

 
 #: translator-group.cc:390
 #, c-format
 msgid "can't find `%s'"
 
 #: translator-group.cc:390
 #, c-format
 msgid "can't find `%s'"

-msgstr ""
+msgstr "non trovo `%s'"

 
 #: transposed-music.cc:33
 msgid "Will ignore \relative for transposed music"
 
 #: transposed-music.cc:33
 msgid "Will ignore \relative for transposed music"

-msgstr ""
+msgstr "Ignorerò \relative per la musica trasposta "

 
 #: word-wrap.cc:68
 msgid "ugh, this measure is too long"
 
 #: word-wrap.cc:68
 msgid "ugh, this measure is too long"

-msgstr ""
+msgstr "ops, questa misura è troppo lunga"

 
 #: word-wrap.cc:69
 #, c-format
 
 #: word-wrap.cc:69
 #, c-format


@@ -738,78 +756,78 @@ msgstr ""
 
 #: word-wrap.cc:88
 msgid "I don't fit; put me on Montignac"
 
 #: word-wrap.cc:88
 msgid "I don't fit; put me on Montignac"

-msgstr ""
+msgstr "Non ci sto; mettimi su Montignac"

 
 #: parser.yy:340 parser.yy:343
 #, c-format
 msgid "incorrect mudela version: %s (%s, %s)"
 
 #: parser.yy:340 parser.yy:343
 #, c-format
 msgid "incorrect mudela version: %s (%s, %s)"

-msgstr ""
+msgstr "versione di mudela errata: %s (%s, %s)"

 
 #: parser.yy:480
 msgid "Need a translator group for a context"
 
 #: parser.yy:480
 msgid "Need a translator group for a context"

-msgstr ""
+msgstr "Ho bisogno di un gruppo di traduzione per un contesto"

 
 #: parser.yy:498
 msgid "Wrong type for property value"
 
 #: parser.yy:498
 msgid "Wrong type for property value"

-msgstr ""
+msgstr "Tipo sbagliato per il valore di una proprietà"

 
 #: parser.yy:547
 msgid "More than one music block"
 
 #: parser.yy:547
 msgid "More than one music block"

-msgstr ""
+msgstr "Più di un blocco di musica"

 
 #: parser.yy:1136 parser.yy:1389
 msgid "have to be in Lyric mode for lyrics"
 
 #: parser.yy:1136 parser.yy:1389
 msgid "have to be in Lyric mode for lyrics"

-msgstr ""
+msgstr "bisogna essere in Lyric mode per i testi"

 
 #: parser.yy:1337 parser.yy:1357
 #, c-format
 msgid "not a duration: %d"
 
 #: parser.yy:1337 parser.yy:1357
 #, c-format
 msgid "not a duration: %d"

-msgstr ""
+msgstr "non è una durata: %d"

 
 #: parser.yy:1359
 msgid "can't abbreviate"
 
 #: parser.yy:1359
 msgid "can't abbreviate"

-msgstr ""
+msgstr "non posso abbreviare"

 
 #: parser.yy:1369
 msgid "have to be in Note mode for notes"
 
 #: parser.yy:1369
 msgid "have to be in Note mode for notes"

-msgstr ""
+msgstr "bisogna essere in Note mode per le note"

 
 #: parser.yy:1395
 msgid "have to be in Chord mode for chords"
 
 #: parser.yy:1395
 msgid "have to be in Chord mode for chords"

-msgstr ""
+msgstr "bisogna essere in Chord mode per gli accordi"

 
 #: parser.yy:1400
 msgid "have to be in Note mode for @chords"
 
 #: parser.yy:1400
 msgid "have to be in Note mode for @chords"

-msgstr ""
+msgstr "bisogna essere in Note mode per i @chords"

 
 #: lexer.ll:131
 msgid "EOF found inside a comment"
 
 #: lexer.ll:131
 msgid "EOF found inside a comment"

-msgstr ""
+msgstr "ho trovato un EOF in un commento"

 
 #: lexer.ll:175
 #, c-format
 msgid "undefined identifier: `%s'"
 
 #: lexer.ll:175
 #, c-format
 msgid "undefined identifier: `%s'"

-msgstr ""
+msgstr "indentificatore non definito: `%s'"

 
 #. backup rule
 #: lexer.ll:180
 msgid "missing end quote"
 
 #. backup rule
 #: lexer.ll:180
 msgid "missing end quote"

-msgstr ""
+msgstr "apice finale mancante"

 
 #. backup rule
 #: lexer.ll:203 lexer.ll:207
 msgid "white expected"
 
 #. backup rule
 #: lexer.ll:203 lexer.ll:207
 msgid "white expected"

-msgstr ""
+msgstr "aspettavo uno spazio bianco"

 
 #: lexer.ll:362
 #, c-format
 msgid "illegal character: `%c'"
 
 #: lexer.ll:362
 #, c-format
 msgid "illegal character: `%c'"

-msgstr ""
+msgstr "carattere illegale: `%c'"

 
 #: lexer.ll:418
 #, c-format
 msgid "unknown escaped string: `\\%s'"
 
 #: lexer.ll:418
 #, c-format
 msgid "unknown escaped string: `\\%s'"

-msgstr ""
+msgstr "stringa di escape sconosciuta: `\\%s'"

 
 #: out/BLURB.hh:2
 msgid ""
 
 #: out/BLURB.hh:2
 msgid ""


@@ -827,8 +845,8 @@ msgstr ""
 "MIDI. Le caratteristiche del programma includono un versatile\n"
 "linguaggio di descrizione musicale, pentagrammi multipli, segni di\n"
 "divisione, chiavi, tasti, parole, cadenze, legature, acciaccature,\n"
 "MIDI. Le caratteristiche del programma includono un versatile\n"
 "linguaggio di descrizione musicale, pentagrammi multipli, segni di\n"
 "divisione, chiavi, tasti, parole, cadenze, legature, acciaccature,\n"

-"terzine, segni di formattazione ed estrazione delle parte. Nella\n"
-"distribuzione è compreso anche un fort di simboli musicali.\n"
+"terzine, segni di formattazione ed estrazione automatica delle parti. Nella\n"
+"distribuzione è compreso anche un font di simboli musicali.\n"

 
 #: out/COPERTINA.hh:2
 msgid ""
 
 #: out/COPERTINA.hh:2
 msgid ""


@@ -839,8 +857,8 @@ msgid ""
 "MIDI. Le caratteristiche del programma includono un versatile\n"
 "linguaggio di descrizione musicale, pentagrammi multipli, segni di\n"
 "divisione, chiavi, tasti, parole, cadenze, legature, acciaccature,\n"
 "MIDI. Le caratteristiche del programma includono un versatile\n"
 "linguaggio di descrizione musicale, pentagrammi multipli, segni di\n"
 "divisione, chiavi, tasti, parole, cadenze, legature, acciaccature,\n"

-"terzine, segni di formattazione ed estrazione delle parte. Nella\n"
-"distribuzione è compreso anche un fort di simboli musicali.\n"
+"terzine, segni di formattazione ed estrazione automatica delle parti. Nella\n"
+"distribuzione è compreso anche un font di simboli musicali.\n"

 "\n"
 msgstr ""
 
 "\n"
 msgstr ""
 


@@ -858,86 +876,88 @@ msgstr ""
 #: main.cc:43
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]"
 #: main.cc:43
 #, c-format
 msgid "Usage: %s [OPTION]... [FILE]"

-msgstr ""
+msgstr "Uso: %s [OPZIONE... [FILE]"

 
 #: main.cc:45
 msgid "Translate midi-file to mudela"
 
 #: main.cc:45
 msgid "Translate midi-file to mudela"

-msgstr ""
+msgstr "Traduce un file midi in mudela"

 
 #: main.cc:51
 msgid "  -b, --no-quantify      write exact durations, e.g.: a4*385/384\n"
 
 #: main.cc:51
 msgid "  -b, --no-quantify      write exact durations, e.g.: a4*385/384\n"

-msgstr ""
+msgstr "  -b, --no-quantify      scrive durate esatte,  p.es.: a4*385/384\n"

 
 #: main.cc:63
 msgid "  -k, --key=ACC[:MINOR]  set key: ACC +sharps/-flats; :1 minor\n"
 
 #: main.cc:63
 msgid "  -k, --key=ACC[:MINOR]  set key: ACC +sharps/-flats; :1 minor\n"

-msgstr ""
+msgstr " -k, --key=ACC[:MINOR]  imposta l'armatura: ACC +diesis/-bemolli; :1 minore\n"

 
 #: main.cc:66
 msgid ""
 "  -n, --no-silly         assume no plets or double dots, smallest is 32\n"
 msgstr ""
 
 #: main.cc:66
 msgid ""
 "  -n, --no-silly         assume no plets or double dots, smallest is 32\n"
 msgstr ""

+"  -n, --no-silly         assume che non ci siano gruppetti o doppi punti, la figura più piccola è 32\n"

 
 #: main.cc:69
 msgid "  -o, --output=FILE      set FILE as default output\n"
 
 #: main.cc:69
 msgid "  -o, --output=FILE      set FILE as default output\n"

-msgstr ""
+msgstr "  -o, --output=FILE      set FILE come output di default\n"

 
 #: main.cc:72
 msgid "  -p, --no-plets         assume no plets\n"
 
 #: main.cc:72
 msgid "  -p, --no-plets         assume no plets\n"

-msgstr ""
+msgstr "  -p, --no-plets         assume che non ci siano gruppetti\n"

 
 #: main.cc:75
 msgid "  -q, --quiet            be quiet\n"
 
 #: main.cc:75
 msgid "  -q, --quiet            be quiet\n"

-msgstr ""
+msgstr "  -q, --quiet            sii silenzioso\n"

 
 #: main.cc:81
 msgid ""
 "  -s, --smallest=N       assume no shorter (reciprocal) durations than N\n"
 msgstr ""
 
 #: main.cc:81
 msgid ""
 "  -s, --smallest=N       assume no shorter (reciprocal) durations than N\n"
 msgstr ""

+"  -s, --smallest=N       assume che non ci siano durate (reciproche) inferiori a N\n"

 
 #: main.cc:84
 msgid "  -v, --verbose          be verbose\n"
 
 #: main.cc:84
 msgid "  -v, --verbose          be verbose\n"

-msgstr ""
+msgstr "  -v, --verbose          sii loquace\n"

 
 #: main.cc:90
 msgid "  -x, --no-double-dots   assume no double dotted notes\n"
 
 #: main.cc:90
 msgid "  -x, --no-double-dots   assume no double dotted notes\n"

-msgstr ""
+msgstr " -x, --no-double-dots   assume che non ci siano note con doppio punto\n"

 
 #: main.cc:105
 msgid "Mi2mu, translate midi to mudela"
 
 #: main.cc:105
 msgid "Mi2mu, translate midi to mudela"

-msgstr ""
+msgstr "Mi2mu, tradice midi in mudela"

 
 #: midi-parser.cc:64
 msgid "zero length string encountered"
 
 #: midi-parser.cc:64
 msgid "zero length string encountered"

-msgstr ""
+msgstr "ho incostrato una striga di lunghezza nulla"

 
 #: midi-score-parser.cc:45
 msgid "MIDI header expected"
 
 #: midi-score-parser.cc:45
 msgid "MIDI header expected"

-msgstr ""
+msgstr "mi aspettavo un header MIDI"

 
 #: midi-score-parser.cc:50
 msgid "Invalid header length"
 
 #: midi-score-parser.cc:50
 msgid "Invalid header length"

-msgstr ""
+msgstr "Lunghezza dell'header non valida"

 
 #: midi-score-parser.cc:53
 msgid "Invalid midi format"
 
 #: midi-score-parser.cc:53
 msgid "Invalid midi format"

-msgstr ""
+msgstr "Formato midi non valido"

 
 #: midi-score-parser.cc:56
 msgid "Invalid number of tracks"
 
 #: midi-score-parser.cc:56
 msgid "Invalid number of tracks"

-msgstr ""
+msgstr "Numero di tracce non valido"

 
 #: midi-score-parser.cc:59
 #, c-format
 msgid "can't handle %s"
 
 #: midi-score-parser.cc:59
 #, c-format
 msgid "can't handle %s"

-msgstr ""
+msgstr "non posso maneggiare %s"

 
 #: midi-score-parser.cc:59
 msgid "non-metrical time"
 
 #: midi-score-parser.cc:59
 msgid "non-metrical time"

-msgstr ""
+msgstr "tempo non metrico"

 
 #: midi-score-parser.cc:95
 msgid "Parsing...\n"
 
 #: midi-score-parser.cc:95
 msgid "Parsing...\n"

-msgstr ""
+msgstr "Interpreto...\n"

 
 #: midi-track-parser.cc:70
 #, c-format
 
 #: midi-track-parser.cc:70
 #, c-format


@@ -946,63 +966,63 @@ msgstr ""
 
 #: midi-track-parser.cc:125
 msgid "invalid running status"
 
 #: midi-track-parser.cc:125
 msgid "invalid running status"

-msgstr ""
+msgstr "stato di eseguzione non valido"

 
 #: midi-track-parser.cc:326
 msgid "unimplemented MIDI meta-event"
 
 #: midi-track-parser.cc:326
 msgid "unimplemented MIDI meta-event"

-msgstr ""
+msgstr "meta-evento MIDI non implementato"

 
 #: midi-track-parser.cc:331
 msgid "invalid MIDI event"
 
 #: midi-track-parser.cc:331
 msgid "invalid MIDI event"

-msgstr ""
+msgstr "evento MIDI non valido"

 
 #: midi-track-parser.cc:346
 msgid "MIDI track expected"
 
 #: midi-track-parser.cc:346
 msgid "MIDI track expected"

-msgstr ""
+msgstr "mi spettavo una traccia MIDI"

 
 #: midi-track-parser.cc:351
 msgid "invalid track length"
 
 #: midi-track-parser.cc:351
 msgid "invalid track length"

-msgstr ""
+msgstr "lunghezza della traccia non valida"

 
 #: mudela-item.cc:107
 #, c-format
 msgid "#32 in quarter: %d"
 
 #: mudela-item.cc:107
 #, c-format
 msgid "#32 in quarter: %d"

-msgstr ""
+msgstr "#32 in un quarto: %d"

 
 #: mudela-score.cc:117
 #, c-format
 msgid "Lily output to %s..."
 
 #: mudela-score.cc:117
 #, c-format
 msgid "Lily output to %s..."

-msgstr ""
+msgstr "Output di Lily in %s..."

 
 #: mudela-score.cc:127 mudela-score.cc:175
 msgid "track "
 
 #: mudela-score.cc:127 mudela-score.cc:175
 msgid "track "

-msgstr ""
+msgstr "traccia "

 
 #: mudela-score.cc:160
 msgid "Processing..."
 
 #: mudela-score.cc:160
 msgid "Processing..."

-msgstr ""
+msgstr "Elaboro..."

 
 #: mudela-score.cc:171
 msgid "Creating voices..."
 
 #: mudela-score.cc:171
 msgid "Creating voices..."

-msgstr ""
+msgstr "Genero le voci..."

 
 #: mudela-score.cc:184
 msgid "NOT Filtering tempo..."
 
 #: mudela-score.cc:184
 msgid "NOT Filtering tempo..."

-msgstr ""
+msgstr "NON filtro il tempo..."

 
 #: mudela-score.cc:193
 msgid "NOT Quantifying columns..."
 
 #: mudela-score.cc:193
 msgid "NOT Quantifying columns..."

-msgstr ""
+msgstr "NON quantifico le colonne..."

 
 #: mudela-score.cc:197
 msgid "Quantifying columns..."
 
 #: mudela-score.cc:197
 msgid "Quantifying columns..."

-msgstr ""
+msgstr "Quantifico le colonne..."

 
 #.    LOGOUT(NORMAL_ver) << '\n' << "NOT Settling columns..." << endl;
 #.    return;
 #: mudela-score.cc:232
 msgid "Settling columns..."
 
 #.    LOGOUT(NORMAL_ver) << '\n' << "NOT Settling columns..." << endl;
 #.    return;
 #: mudela-score.cc:232
 msgid "Settling columns..."

-msgstr ""
+msgstr "Sistemo le colonne..."

 
 #: mudela-staff.cc:107
 #, c-format
 
 #: mudela-staff.cc:107
 #, c-format


@@ -1012,26 +1032,26 @@ msgstr ""
 #: mudela-staff.cc:108
 #, c-format
 msgid "% instrument:"
 #: mudela-staff.cc:108
 #, c-format
 msgid "% instrument:"

-msgstr ""
+msgstr "% strumento:"

 
 #: mudela-stream.cc:37
 #, c-format
 msgid "lily indent level: %d"
 
 #: mudela-stream.cc:37
 #, c-format
 msgid "lily indent level: %d"

-msgstr ""
+msgstr "livello di indentazione di lili: %d"

 
 #: mudela-stream.cc:75
 msgid "% Creator: "
 
 #: mudela-stream.cc:75
 msgid "% Creator: "

-msgstr ""
+msgstr "% Autore: "

 
 #: mudela-stream.cc:80
 msgid "% Automatically generated"
 
 #: mudela-stream.cc:80
 msgid "% Automatically generated"

-msgstr ""
+msgstr "% Generato automaticamente"

 
 #: mudela-stream.cc:89
 #, c-format
 msgid "% from input file: "
 
 #: mudela-stream.cc:89
 #, c-format
 msgid "% from input file: "

-msgstr ""
+msgstr "% dal file di input: "

 
 #: version.cc:11
 msgid "of"
 
 #: version.cc:11
 msgid "of"

-msgstr ""
+msgstr "di"

diff --git a/scm/lily.scm b/scm/lily.scm
index 378fa22ebb985ecaf139ca9b6313a233d7171190..4cea79ddbfa5e2a63ce6ef57d62a2b6794ce1903 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -180,8 +180,10 @@
     (define minht (* 2 mudelapaperstaffheight))
     (define maxht (* 7 minht))
     (string-append
     (define minht (* 2 mudelapaperstaffheight))
     (define maxht (* 7 minht))
     (string-append

-     "{\\bracefont " (char  (/  (- (min y (- maxht step)) minht)   step)) "}"))
-  
+     "{\\bracefont " (char (max
+                           0
+                           (/  (- (min y (- maxht step)) minht) step))) "}"))
+

 
 
   (define (rulesym h w) 
 
 
   (define (rulesym h w) 

diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index 08b38e37dbe1d6962f3cb8f800865e928d878454..6dceec035c5704e51ce4dd0b53c78d802b3a34c3 100644 (file)
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -163,18 +163,13 @@ AC_DEFUN(AC_STEPMAKE_GUILE, [
     # to force new check iso reading from cache
 
     # gh_scm2doubles,gh_doubles2scm are new in 1.3
     # to force new check iso reading from cache
 
     # gh_scm2doubles,gh_doubles2scm are new in 1.3

-    AC_CHECK_LIB(guile, gh_scm2doubles, \
-      LIBS="-lguile $LIBS"; AC_DEFINE(HAVE_LIBGUILE), \
-      AC_CHECK_LIB(readline, readline) \
-      AC_CHECK_LIB(dl, dlopen) \
-      AC_CHECK_LIB(socket, socket)\
-      AC_CHECK_LIB(termcap,tgetent)\
-      AC_CHECK_LIB(m, fabs)\
-      AC_CHECK_LIB(guile, gh_doubles2scm)\
+    GUILE_FLAGS
+    AC_CHECK_LIB(guile, gh_scm2doubles,
+      LIBS="`echo $GUILE_LDFLAGS | sed -e 's/-L[[[/-_a-zA-Z0-9]]]\+ //g'` $LIBS";
+      AC_DEFINE(HAVE_LIBGUILE), , $GUILE_LDFLAGS dnl

     )
     )

-    if test "$ac_cv_lib_guile_gh_scm2doubles" != yes -a \
-      "$ac_cv_lib_guile_gh_doubles2scm" != yes ; then
-           AC_STEPMAKE_WARN(You should install guile 1.3 or newer)
+    if test "$ac_cv_lib_guile_gh_scm2doubles" != yes ; then
+       AC_STEPMAKE_WARN(You should install guile 1.3 or newer)

     fi
 ])
 
     fi
 ])
 


@@ -986,3 +981,36 @@ main ()
   AC_SUBST(GTK___LIBS)
 ])
 
   AC_SUBST(GTK___LIBS)
 ])
 

+dnl   GUILE_FLAGS --- set flags for compiling and linking with Guile
+dnl
+dnl   This macro runs the `guile-config' script, installed with Guile,
+dnl   to find out where Guile's header files and libraries are
+dnl   installed.  It sets two variables, marked for substitution, as
+dnl   by AC_SUBST.
+dnl   
+dnl     GUILE_CFLAGS --- flags to pass to a C or C++ compiler to build
+dnl             code that uses Guile header files.  This is almost
+dnl             always just a -I flag.
+dnl   
+dnl     GUILE_LDFLAGS --- flags to pass to the linker to link a
+dnl             program against Guile.  This includes `-lguile' for
+dnl             the Guile library itself, any libraries that Guile
+dnl             itself requires (like -lqthreads), and so on.  It may
+dnl             also include a -L flag to tell the compiler where to
+dnl             find the libraries.
+
+AC_DEFUN([GUILE_FLAGS],[
+## The GUILE_FLAGS macro.
+  ## First, let's just see if we can find Guile at all.
+  AC_MSG_CHECKING(for Guile)
+  guile-config link > /dev/null || {
+    echo "configure: cannot find guile-config; is Guile installed?" 1>&2
+    exit 1
+  }
+  GUILE_CFLAGS="`guile-config compile`"
+  GUILE_LDFLAGS="`guile-config link`"
+  AC_SUBST(GUILE_CFLAGS)
+  AC_SUBST(GUILE_LDFLAGS)
+  AC_MSG_RESULT(yes)
+])
+

diff --git a/stepmake/configure b/stepmake/configure
index 628df5924759625259f755d7f07da7cbd3801d1d..b8de13c037a2248222917d1262148c7609e98b7a 100755 (executable)
--- a/stepmake/configure
+++ b/stepmake/configure
@@ -54,6 +54,9 @@ fi
 
 
 
 
 
 

+
+
+

 # 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.
 # 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.


@@ -709,7 +712,12 @@ EOF
 EOF
 
 
 EOF
 
 

-    package_depth=`dirname $cache_file`
+    if test "$package_depth" = "" ; then
+       package_depth="."
+    else
+       package_depth="../$package_depth"
+    fi
+    export package_depth

     
 
     AUTOGENERATE="This file was automatically generated by configure"
     
 
     AUTOGENERATE="This file was automatically generated by configure"


@@ -745,7 +753,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6

-echo "configure:749: checking host system type" >&5
+echo "configure:757: checking host system type" >&5

 
 host_alias=$host
 case "$host_alias" in
 
 host_alias=$host
 case "$host_alias" in


@@ -770,7 +778,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
 # 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
+echo "configure:782: 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 eval "test \"`echo '$''{'ac_cv_prog_MAKE'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -804,7 +812,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
 # 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
+echo "configure:816: 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 eval "test \"`echo '$''{'ac_cv_prog_FIND'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -840,7 +848,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
 # 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:844: checking for $ac_word" >&5
+echo "configure:852: 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 eval "test \"`echo '$''{'ac_cv_prog_TAR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -874,7 +882,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
 # 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:878: checking for $ac_word" >&5
+echo "configure:886: 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 eval "test \"`echo '$''{'ac_cv_prog_BASH'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -907,7 +915,7 @@ 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
     # 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:911: checking for $ac_word" >&5
+echo "configure:919: 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
 if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -1070,7 +1078,7 @@ fi
 
 
     echo $ac_n "checking language""... $ac_c" 1>&6
 
 
     echo $ac_n "checking language""... $ac_c" 1>&6

-echo "configure:1074: checking language" >&5    
+echo "configure:1082: checking language" >&5    

     case "$language" in
       En* | en* | Am* | am* | US* | us*)
            lang=English;;
     case "$language" in
       En* | en* | Am* | am* | US* | us*)
            lang=English;;


@@ -1103,7 +1111,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
 # 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:1107: checking for $ac_word" >&5
+echo "configure:1115: 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 eval "test \"`echo '$''{'ac_cv_prog_STRIPROFF'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -1137,7 +1145,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
 # 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:1141: checking for $ac_word" >&5
+echo "configure:1149: 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 eval "test \"`echo '$''{'ac_cv_prog_YODL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -1171,7 +1179,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
 # 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:1175: checking for $ac_word" >&5
+echo "configure:1183: 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 eval "test \"`echo '$''{'ac_cv_prog_YODL2HTML'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -1205,7 +1213,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
 # 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:1209: checking for $ac_word" >&5
+echo "configure:1217: 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 eval "test \"`echo '$''{'ac_cv_prog_YODL2LATEX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -1238,7 +1246,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
 # 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:1242: checking for $ac_word" >&5
+echo "configure:1250: 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 eval "test \"`echo '$''{'ac_cv_prog_YODL2MAN'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -1272,7 +1280,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
 # 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:1276: checking for $ac_word" >&5
+echo "configure:1284: 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 eval "test \"`echo '$''{'ac_cv_prog_YODL2MSLESS'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -1306,7 +1314,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
 # 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:1310: checking for $ac_word" >&5
+echo "configure:1318: 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 eval "test \"`echo '$''{'ac_cv_prog_YODL2TEXINFO'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -1340,7 +1348,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
 # 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:1344: checking for $ac_word" >&5
+echo "configure:1352: 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 eval "test \"`echo '$''{'ac_cv_prog_YODL2TXT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -1398,7 +1406,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
 # 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:1402: checking for $ac_word" >&5
+echo "configure:1410: 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 eval "test \"`echo '$''{'ac_cv_prog_MAKEINFO'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else

diff --git a/stepmake/make/out/stepmake.lsm b/stepmake/make/out/stepmake.lsm
index d235e433c92406b5f2a080eb54dd87ff5cbb6588..6bd9290009aeee20614e0580c8389d4d6efc6649 100644 (file)
--- a/stepmake/make/out/stepmake.lsm
+++ b/stepmake/make/out/stepmake.lsm
@@ -1,15 +1,15 @@
 Begin3
 Title: StepMake
 Begin3
 Title: StepMake

-Version: 0.1.67
-Entered-date: 18JAN99
+Version: 0.1.69
+Entered-date: 17FEB99

 Description: 
 Keywords: music notation typesetting midi fonts engraving
 Author: janneke@gnu.org (Jan Nieuwenhuizen)
        hanwen@cs.ruu.nl (Han-Wen Nienhuys)
 Maintained-by: janneke@gnu.org (Jan Nieuwenhuizen)
 Primary-site: sunsite.unc.edu /pub/Linux/apps/sound/convert
 Description: 
 Keywords: music notation typesetting midi fonts engraving
 Author: janneke@gnu.org (Jan Nieuwenhuizen)
        hanwen@cs.ruu.nl (Han-Wen Nienhuys)
 Maintained-by: janneke@gnu.org (Jan Nieuwenhuizen)
 Primary-site: sunsite.unc.edu /pub/Linux/apps/sound/convert

-       40k stepmake-0.1.67.tar.gz 
+       40k stepmake-0.1.69.tar.gz 

 Original-site: pcnov095.win.tue.nl /pub/lilypond/development/
 Original-site: pcnov095.win.tue.nl /pub/lilypond/development/

-       40k stepmake-0.1.67.tar.gz 
+       40k stepmake-0.1.69.tar.gz 

 Copying-policy: GPL
 End
 Copying-policy: GPL
 End

diff --git a/stepmake/make/out/stepmake.spec b/stepmake/make/out/stepmake.spec
index c20a3007d1ace13dd39f452079764a97589aeec6..a3fdf0e28c5fd14849a17a502b92d9ac2789815e 100644 (file)
--- a/stepmake/make/out/stepmake.spec
+++ b/stepmake/make/out/stepmake.spec
@@ -1,9 +1,9 @@
 Name: stepmake
 Name: stepmake

-Version: 0.1.67
+Version: 0.1.69

 Release: 1
 Copyright: GPL
 Group: Development
 Release: 1
 Copyright: GPL
 Group: Development

-Source0: pcnov095.win.tue.nl:/pub/lilypond/development/stepmake-0.1.67.tar.gz
+Source0: pcnov095.win.tue.nl:/pub/lilypond/development/stepmake-0.1.69.tar.gz

 Summary: generic make package
 Packager: janneke@gnu.org (Jan Nieuwenhuizen)
 Buildroot: /tmp/stepmake-install
 Summary: generic make package
 Packager: janneke@gnu.org (Jan Nieuwenhuizen)
 Buildroot: /tmp/stepmake-install