* scm/output-gnome.scm (placebox): Shield affine-relative.

* buildscripts/guile-gnome.sh: Update.  Do not use GUILE CVS,
cater for system's pango 1.5.1.

* input/regression/new-slur.ly: Add ugly slur from scsii-sarabande.

* scm/slur.scm: Tweak.

diff --git a/ChangeLog b/ChangeLog
index bb75786ef68c047d58e9acd0e3c36b6e60e6b813..fdf0a2ea7e71a97023daedbeaedc15ab1ec4b164 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2004-09-09  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * scm/output-gnome.scm (placebox): Shield affine-relative.
+
+       * buildscripts/guile-gnome.sh: Update.  Do not use GUILE CVS,
+       cater for system's pango 1.5.1.
+
+       * input/regression/new-slur.ly: Add ugly slur from scsii-sarabande.
+
+       * scm/slur.scm: Tweak.
+
 2004-09-08  Graham Percival  <gperlist@shaw.ca>
 
        * Documentation/user/{first couple of chapters}: more editing.

diff --git a/buildscripts/guile-gnome.sh b/buildscripts/guile-gnome.sh
index 67b436e8036de286164f9f89b45d2bf63be01812..9dcef6a38f09d95ea05a92b908e9b02ed1402ee0 100644 (file)
--- a/buildscripts/guile-gnome.sh
+++ b/buildscripts/guile-gnome.sh
@@ -22,6 +22,7 @@ export AUTOMAKE=automake-1.8
 export ACLOCAL=aclocal-1.8
 export AUTOCONF=$(which autoconf2.50)
 export AUTOHEADER=$(which autoheader2.50)
+export PKG_CONFIG_PATH
 
 if [ -z "$AUTOCONF" ]; then
     unset AUTOCONF
@@ -42,8 +43,10 @@ cd test
 
 ## 2.  get pango CVS
 
-if [ ! -d $HOME/usr/pkg/pango ] ; then
+if ! pkg-config --atleast-version=1.5.1 pango; then
 
+    if [ ! -d $HOME/usr/pkg/pango ]; then
+       
        mkdir -p gnome/CVS
        cd gnome
        echo ":pserver:anonymous@anoncvs.gnome.org:/cvs/gnome" > CVS/Root
@@ -54,14 +57,13 @@ if [ ! -d $HOME/usr/pkg/pango ] ; then
        ./autogen.sh --help
        ./configure --prefix=$OPT/pango --enable-maintainer-mode --enable-gtk-doc
        make XFT_LIBS="-L/usr/lib -lXft -L/usr/X11R6/lib -lfreetype -lz -lXrender -lX11 -lfontconfig" install
-
        cd ../..
-fi 
-
-export PKG_CONFIG_PATH=$OPT/pango/lib/pkgconfig:$PKG_CONFIG_PATH
+    fi 
+    PKG_CONFIG_PATH=$OPT/pango/lib/pkgconfig:$PKG_CONFIG_PATH
+fi
 
-# 3. Not for the faint of heart: GUILE CVS seems to be OK 
-## PATH=/usr/bin:$PATH
+# 3. Currently (2004-9-9) GUILE CVS cannot be used, use 1.6.4:
+PATH=/usr/bin:$PATH
 
 if [ -d $OPT/libffi/ ]; then
     export LDFLAGS=-L$OPT/libffi/lib

diff --git a/input/mutopia/E.Satie/petite-ouverture-a-danser.ly b/input/mutopia/E.Satie/petite-ouverture-a-danser.ly
index 440503a804926ca6641576302b67654422601f0d..bd446a7930171f9bc264a64ca43a8cfda99e41a3 100644 (file)
--- a/input/mutopia/E.Satie/petite-ouverture-a-danser.ly
+++ b/input/mutopia/E.Satie/petite-ouverture-a-danser.ly
@@ -126,32 +126,42 @@ lower = \context Staff  \relative c{
 
 }
 
+%% FIXME: this triggers:
+%%
+%%input/mutopia/E.Satie/petite-ouverture-a-danser.ly:148:9: fout: syntax error, unexpected PAPER:
+%%    \pape
+%%         r { }
+%%\new Score \with {
+%%    \override SpacingSpanner #'spacing-increment = #3
+%%} {
+
+
 \score {
-    \context GrandStaff <<
-      \context Staff = treble << 
-        \global 
-        \clef violin
-       \i
-       \ii
-      >>
-      \context Staff = bass <<
-        \global
-       \clef bass
-        \lower
-      >>
-           \override Slur #'attachment = #'(stem . stem)
-           #(override-auto-beam-setting '(end 1 8 * *)  1 4)
-           #(override-auto-beam-setting '(end 1 16 * *)  1 4)
+    \context PianoStaff <<
+       \context Staff = treble << 
+           \global 
+           \clef violin
+           \i
+           \ii
+       >>
+       \context Staff = bass <<
+           \global
+           \clef bass
+           \lower
+       >>
+       \override Slur #'attachment = #'(stem . stem)
+       #(override-auto-beam-setting '(end 1 8 * *)  1 4)
+       #(override-auto-beam-setting '(end 1 16 * *)  1 4)
     >>
-
-  \paper {
-    \context{
-           \Voice
+    \paper {
+       \context {
+           \Score
+           \override SpacingSpanner #'spacing-increment = #3
+       }
+    }
+    \midi {
+       \tempo 4 = 60
     }
-  }
-  \midi {
-    \tempo 4 = 60
-  }
 }
 
 

diff --git a/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly b/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly
index 0e42c30e38354d4ccab92a83759a943ce195c957..cfac4809d3bfd7f50b2dfbd7f938e28feccd5b08 100644 (file)
--- a/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly
+++ b/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly
@@ -53,7 +53,9 @@ sarabandeA =  \context Voice  \relative c {
   << { d8. e16 e4.\trill d16 e } \\
     { d4 a2 } >>
   <d, a' f'>4.  e'8[ d c] |
-  bes[ g'] f[ e16(f] g[ a bes d,)] |
+  bes[ g'] f[
+     \once \override Slur #'excentricity = #2.5
+     e16(f] g[ a bes d,)] |
   cis4.\trill b8[ a g] |
 
   %% check spacing without accs: 

diff --git a/input/regression/new-slur.ly b/input/regression/new-slur.ly
index bf12cc026308f6b79dd2d02df6264a358edaa18a..0b3d93cf42d74e62b281a58c12936888bc2e16c8 100644 (file)
--- a/input/regression/new-slur.ly
+++ b/input/regression/new-slur.ly
@@ -47,10 +47,12 @@
     e=''4.( c8) s4
     | << { b='8[( c]) } \\
         { b='8[( c]) }>>
+
     
     s2.|
     e4( dis4)
-    e4( dis4)
+    e4( dis4) 
     g='16( b d fis)
+    \clef bass a=8[ e16(f] g[ a bes d,)] |
 }
 

diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc
index 5fac3f2cd9d883591978b3a59b58fad4f317dc3e..3acadd7f0c0f57b2ef02737e503b731d6f4cc411 100644 (file)
--- a/lily/paper-outputter.cc
+++ b/lily/paper-outputter.cc
@@ -113,7 +113,7 @@ Paper_outputter::output_stencil (Stencil stil)
 Paper_outputter *
 get_paper_outputter (String outname, String f) 
 {
-  progress_indication (_f ("paper output to `%s'...",
+  progress_indication (_f ("Paper output to `%s'...",
                           outname == "-" ? String ("<stdout>") : outname));
   return new Paper_outputter (outname, f);
 }

diff --git a/po/lilypond.pot b/po/lilypond.pot
index 2dd0db6427e243b87aa02eb21c015d38fc849191..e90ab1f4bee8660a6a2d54955bc98c73b49472bd 100644 (file)
--- a/po/lilypond.pot
+++ b/po/lilypond.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-18 15:20+0200\n"
+"POT-Creation-Date: 2004-09-07 16:24+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -78,12 +78,12 @@ msgstr ""
 msgid "Opening pipe `%s'"
 msgstr ""
 
-#: lilylib.py:269 lilypond-book.py:805
+#: lilylib.py:269 lilypond-book.py:812
 #, python-format
 msgid "`%s' failed (%d)"
 msgstr ""
 
-#: lilylib.py:274 lilylib.py:333 lilypond-book.py:806 lilypond-latex.py:465
+#: lilylib.py:274 lilylib.py:333 lilypond-book.py:813 lilypond-latex.py:466
 msgid "The error log is as follows:"
 msgstr ""
 
@@ -198,52 +198,52 @@ msgstr ""
 msgid "file not found: %s"
 msgstr ""
 
-#: lilypond-book.py:788
+#: lilypond-book.py:795
 #, python-format
 msgid "Opening filter `%s'"
 msgstr ""
 
-#: lilypond-book.py:904
+#: lilypond-book.py:913
 #, python-format
 msgid "cannot determine format for: %s"
 msgstr ""
 
-#: lilypond-book.py:945
+#: lilypond-book.py:954
 msgid "Output would overwrite input file; use --output."
 msgstr ""
 
-#: lilypond-book.py:952
+#: lilypond-book.py:961
 #, python-format
 msgid "Reading %s..."
 msgstr ""
 
-#: lilypond-book.py:966
+#: lilypond-book.py:975
 msgid "Dissecting..."
 msgstr ""
 
-#: lilypond-book.py:994
+#: lilypond-book.py:1006
 msgid "Writing snippets..."
 msgstr ""
 
-#: lilypond-book.py:999
+#: lilypond-book.py:1011
 msgid "Processing..."
 msgstr ""
 
-#: lilypond-book.py:1002
+#: lilypond-book.py:1014
 msgid "All snippets are up to date..."
 msgstr ""
 
-#: lilypond-book.py:1005
+#: lilypond-book.py:1017
 #, python-format
 msgid "Compiling %s..."
 msgstr ""
 
-#: lilypond-book.py:1013
+#: lilypond-book.py:1025
 #, python-format
 msgid "Processing include: %s"
 msgstr ""
 
-#: lilypond-book.py:1029 lilypond-latex.py:575 midi2ly.py:1017 ps2png.py:51
+#: lilypond-book.py:1041 lilypond-latex.py:576 midi2ly.py:1017 ps2png.py:51
 #, python-format
 msgid "getopt says: `%s'"
 msgstr ""
@@ -339,102 +339,102 @@ msgstr ""
 msgid "print version number"
 msgstr ""
 
-#: lilypond-latex.py:202
+#: lilypond-latex.py:203
 #, python-format
 msgid "no such setting: `%s'"
 msgstr ""
 
-#: lilypond-latex.py:246
+#: lilypond-latex.py:247
 #, python-format
 msgid "LilyPond crashed (signal %d)."
 msgstr ""
 
-#: lilypond-latex.py:247
+#: lilypond-latex.py:248
 msgid "Please submit a bug report to bug-lilypond@gnu.org"
 msgstr ""
 
-#: lilypond-latex.py:254
+#: lilypond-latex.py:255
 #, python-format
 msgid "LilyPond failed on input file %s (exit status %d)"
 msgstr ""
 
-#: lilypond-latex.py:258
+#: lilypond-latex.py:259
 #, python-format
 msgid "LilyPond failed on an input file (exit status %d)"
 msgstr ""
 
-#: lilypond-latex.py:259
+#: lilypond-latex.py:260
 msgid "Continuing..."
 msgstr ""
 
-#: lilypond-latex.py:269
+#: lilypond-latex.py:270
 #, python-format
 msgid "Analyzing %s..."
 msgstr ""
 
-#: lilypond-latex.py:323
+#: lilypond-latex.py:324
 #, python-format
 msgid "no LilyPond output found for `%s'"
 msgstr ""
 
-#: lilypond-latex.py:464
+#: lilypond-latex.py:465
 msgid "LaTeX failed on the output file."
 msgstr ""
 
-#: lilypond-latex.py:512
+#: lilypond-latex.py:513
 msgid ""
 "Trying create PDF, but no PFA fonts found.\n"
 "Using bitmap fonts instead. This will look bad."
 msgstr ""
 
 #. no ps header?
-#: lilypond-latex.py:555
+#: lilypond-latex.py:556
 #, python-format
 msgid "not a PostScript file: `%s'"
 msgstr ""
 
-#: lilypond-latex.py:665
+#: lilypond-latex.py:666
 msgid "pseudo filter"
 msgstr ""
 
-#: lilypond-latex.py:668
+#: lilypond-latex.py:669
 msgid "pseudo filter only for single input file"
 msgstr ""
 
-#: lilypond-latex.py:673
+#: lilypond-latex.py:674
 msgid "no files specified on command line"
 msgstr ""
 
-#: lilypond-latex.py:705
+#: lilypond-latex.py:706
 #, python-format
 msgid "filename should not contain spaces: `%s'"
 msgstr ""
 
-#: lilypond-latex.py:743
+#: lilypond-latex.py:744
 msgid "Running LilyPond failed. Rerun with --verbose for a trace."
 msgstr ""
 
-#: lilypond-latex.py:785
+#: lilypond-latex.py:786
 msgid "Failed to make PS file. Rerun with --verbose for a trace."
 msgstr ""
 
-#: lilypond-latex.py:814
+#: lilypond-latex.py:815
 #, python-format
 msgid "%s output to <stdout>..."
 msgstr ""
 
-#: lilypond-latex.py:819 includable-lexer.cc:57 kpath.cc:134 lily-guile.cc:85
-#: lily-parser.cc:297
+#: lilypond-latex.py:820 includable-lexer.cc:57 kpath.cc:134 lily-guile.cc:89
+#: lily-parser.cc:275
 #, c-format, python-format
 msgid "can't find file: `%s'"
 msgstr ""
 
-#: lilypond-latex.py:842
+#: lilypond-latex.py:843
 #, python-format
 msgid "%s output to %s..."
 msgstr ""
 
-#: lilypond-latex.py:845
+#: lilypond-latex.py:846
 #, python-format
 msgid "can't find file: `%s.%s'"
 msgstr ""
@@ -603,7 +603,7 @@ msgstr ""
 msgid "Accidental rule must be pair or context-name; Found %s"
 msgstr ""
 
-#: accidental.cc:217 key-signature-interface.cc:137
+#: accidental.cc:221 key-signature-interface.cc:137
 #, c-format
 msgid "accidental `%s' not found"
 msgstr ""
@@ -650,7 +650,7 @@ msgstr ""
 msgid "can't find default font: `%s'"
 msgstr ""
 
-#: all-font-metrics.cc:201 includable-lexer.cc:59 lily-parser.cc:290
+#: all-font-metrics.cc:201 includable-lexer.cc:59 lily-parser.cc:268
 #, c-format
 msgid "(search path: `%s')"
 msgstr ""
@@ -663,7 +663,7 @@ msgstr ""
 msgid "\\applycontext argument is not a procedure"
 msgstr ""
 
-#: auto-change-iterator.cc:62 change-iterator.cc:61
+#: auto-change-iterator.cc:67 change-iterator.cc:61
 msgid "Can't switch translators, I'm there already"
 msgstr ""
 
@@ -854,12 +854,12 @@ msgstr ""
 msgid "can't find `%s' context"
 msgstr ""
 
-#: gourlay-breaking.cc:195
+#: gourlay-breaking.cc:199
 #, c-format
 msgid "Optimal demerits: %f"
 msgstr ""
 
-#: gourlay-breaking.cc:200
+#: gourlay-breaking.cc:204
 msgid "No feasible line breaking found"
 msgstr ""
 
@@ -961,35 +961,35 @@ msgstr ""
 msgid "ligature was started here"
 msgstr ""
 
-#: lily-guile.cc:87
+#: lily-guile.cc:91
 #, c-format
 msgid "(load path: `%s')"
 msgstr ""
 
-#: lily-guile.cc:562
+#: lily-guile.cc:559
 #, c-format
 msgid "Can't find property type-check for `%s' (%s)."
 msgstr ""
 
-#: lily-guile.cc:565
+#: lily-guile.cc:562
 msgid "Perhaps you made a typing error?"
 msgstr ""
 
-#: lily-guile.cc:571
+#: lily-guile.cc:568
 msgid "Doing assignment anyway."
 msgstr ""
 
-#: lily-guile.cc:585
+#: lily-guile.cc:582
 #, c-format
 msgid "Type check for `%s' failed; value `%s' must be of type `%s'"
 msgstr ""
 
-#: lily-lexer.cc:219
+#: lily-lexer.cc:220
 #, c-format
 msgid "Identifier name is a keyword: `%s'"
 msgstr ""
 
-#: lily-lexer.cc:236
+#: lily-lexer.cc:237
 #, c-format
 msgid "error at EOF: %s"
 msgstr ""
@@ -998,16 +998,16 @@ msgstr ""
 msgid "Parsing..."
 msgstr ""
 
-#: lily-parser.cc:110 lily-parser.cc:147
+#: lily-parser.cc:110 lily-parser.cc:143
 msgid "Braces don't match"
 msgstr ""
 
-#: lily-parser.cc:289
+#: lily-parser.cc:267
 #, c-format
 msgid "can't find init file: `%s'"
 msgstr ""
 
-#: lily-parser.cc:306
+#: lily-parser.cc:284
 #, c-format
 msgid "Now processing `%s'"
 msgstr ""
@@ -1016,7 +1016,7 @@ msgstr ""
 msgid ""
 "This program is free software.  It is covered by the GNU General Public\n"
 "License and you are welcome to change it and/or distribute copies of it\n"
-"under certain conditions.  Invoke as `lilypond-bin --warranty' for more\n"
+"under certain conditions.  Invoke as `lilypond --warranty' for more\n"
 "information.\n"
 msgstr ""
 
@@ -1189,9 +1189,9 @@ msgstr ""
 msgid "Fingerings are also not down?! Putting them down anyway."
 msgstr ""
 
-#: new-lyric-combine-music-iterator.cc:246
+#: new-lyric-combine-music-iterator.cc:245
 #, c-format
-msgid "cannot find Voice `%s'."
+msgid "cannot find Voice `%s'"
 msgstr ""
 
 #: note-collision.cc:413
@@ -1203,9 +1203,9 @@ msgstr ""
 msgid "note head `%s' not found"
 msgstr ""
 
-#: paper-outputter.cc:113
+#: paper-outputter.cc:116
 #, c-format
-msgid "paper output to `%s'..."
+msgid "Paper output to `%s'..."
 msgstr ""
 
 #: paper-score.cc:68
@@ -1250,12 +1250,8 @@ msgstr ""
 msgid "MIDI output to `%s'..."
 msgstr ""
 
-#: phrasing-slur-engraver.cc:105
-msgid "unterminated phrasing slur"
-msgstr ""
-
-#: phrasing-slur-engraver.cc:123
-msgid "can't find start of phrasing slur"
+#: phrasing-slur-engraver.cc:99 slur-engraver.cc:114
+msgid "unterminated slur"
 msgstr ""
 
 #: piano-pedal-engraver.cc:237
@@ -1278,7 +1274,11 @@ msgstr ""
 msgid "Not a grob name, `%s'."
 msgstr ""
 
-#: quote-iterator.cc:181
+#: quote-iterator.cc:108
+msgid "No events found for \\quote"
+msgstr ""
+
+#: quote-iterator.cc:183
 #, c-format
 msgid "In quotation: junking event %s"
 msgstr ""
@@ -1324,7 +1324,7 @@ msgstr ""
 
 #: scm-option.cc:64
 #, c-format
-msgid "Usage: lilypond-bin -e \"(ly:set-option SYMBOL VAL)\""
+msgid "Usage: lilypond -e \"(ly:set-option SYMBOL VAL)\""
 msgstr ""
 
 #: scm-option.cc:66
@@ -1351,25 +1351,33 @@ msgstr ""
 msgid "Install the ec-mftraced package from %s. Aborting"
 msgstr ""
 
-#: score.cc:112
-msgid "Interpreting music... "
+#: score.cc:100 score.cc:126
+msgid "Need music in a score"
 msgstr ""
 
-#: score.cc:122
-msgid "Need music in a score"
+#: score.cc:116
+msgid "Interpreting music... "
 msgstr ""
 
-#: score.cc:133
+#: score.cc:137
 #, c-format
 msgid "elapsed time: %.2f seconds"
 msgstr ""
 
+#: score.cc:312
+msgid "Already have music in score"
+msgstr ""
+
+#: score.cc:313
+msgid "This is the previous music"
+msgstr ""
+
 #. FIXME:
-#: script-engraver.cc:100
+#: script-engraver.cc:102
 msgid "Do not know how to interpret articulation: "
 msgstr ""
 
-#: script-engraver.cc:101
+#: script-engraver.cc:103
 msgid "Scheme encoding: "
 msgstr ""
 
@@ -1378,19 +1386,13 @@ msgstr ""
 msgid "Separation_item:  I've been drinking too much"
 msgstr ""
 
-#: simple-spacer.cc:248
+#: simple-spacer.cc:489
 #, c-format
 msgid "No spring between column %d and next one"
 msgstr ""
 
-#: slur-engraver.cc:128
-msgid "unterminated slur"
-msgstr ""
-
-#. How to shut up this warning, when Voice_devnull_engraver has
-#. eaten start event?
-#: slur-engraver.cc:146
-msgid "can't find start of slur"
+#: slur-engraver.cc:124
+msgid "No slur to end"
 msgstr ""
 
 #: source-file.cc:50
@@ -1408,17 +1410,17 @@ msgstr ""
 msgid "Global shortest duration is %s"
 msgstr ""
 
-#: stem-engraver.cc:84
+#: stem-engraver.cc:88
 msgid "tremolo duration is too long"
 msgstr ""
 
 #. FIXME:
-#: stem-engraver.cc:121
+#: stem-engraver.cc:125
 #, c-format
 msgid "Adding note head to incompatible stem (type = %d)"
 msgstr ""
 
-#: stem-engraver.cc:123
+#: stem-engraver.cc:127
 msgid "Don't you want polyphonic voices instead?"
 msgstr ""
 
@@ -1426,27 +1428,27 @@ msgstr ""
 msgid "Weird stem size; check for narrow beams"
 msgstr ""
 
-#: stem.cc:599
+#: stem.cc:575
 #, c-format
 msgid "flag `%s' not found"
 msgstr ""
 
-#: stem.cc:610
+#: stem.cc:586
 #, c-format
 msgid "flag stroke `%s' not found"
 msgstr ""
 
-#: system.cc:133
+#: system.cc:134
 #, c-format
 msgid "Element count %d."
 msgstr ""
 
-#: system.cc:271
+#: system.cc:272
 #, c-format
 msgid "Grob count %d"
 msgstr ""
 
-#: system.cc:285
+#: system.cc:286
 msgid "Calculating line breaks..."
 msgstr ""
 
@@ -1565,69 +1567,57 @@ msgstr ""
 msgid "Identifier should have alphabetic characters only"
 msgstr ""
 
-#: parser.yy:699
-msgid "Already have music in score"
-msgstr ""
-
-#: parser.yy:700
-msgid "This is the previous music"
-msgstr ""
-
-#: parser.yy:726
+#: parser.yy:707
 msgid "Need \\bookpaper for bookpaper block."
 msgstr ""
 
-#: parser.yy:863
+#: parser.yy:844
 msgid "More alternatives than repeats.  Junking excess alternatives."
 msgstr ""
 
-#: parser.yy:1035
+#: parser.yy:1016
 #, c-format
 msgid "Argument %d failed typecheck"
 msgstr ""
 
-#: parser.yy:1051
+#: parser.yy:1032
 msgid "Music head function should return Music object."
 msgstr ""
 
-#: parser.yy:1297
+#: parser.yy:1278
 msgid "Grob name should be alphanumeric"
 msgstr ""
 
-#: parser.yy:1551
-msgid "Can't find music"
-msgstr ""
-
-#: parser.yy:1671
+#: parser.yy:1639
 msgid "Second argument must be pitch list."
 msgstr ""
 
-#: parser.yy:1708 parser.yy:1713 parser.yy:2242
+#: parser.yy:1676 parser.yy:1681 parser.yy:2210
 msgid "Have to be in Lyric mode for lyrics"
 msgstr ""
 
-#: parser.yy:1798
+#: parser.yy:1766
 msgid "Expecting string as script definition"
 msgstr ""
 
-#: parser.yy:2007 parser.yy:2057
+#: parser.yy:1975 parser.yy:2025
 #, c-format
 msgid "not a duration: %d"
 msgstr ""
 
-#: parser.yy:2152
+#: parser.yy:2120
 msgid "Have to be in Note mode for notes"
 msgstr ""
 
-#: parser.yy:2257
+#: parser.yy:2225
 msgid "Have to be in Chord mode for chords"
 msgstr ""
 
-#: parser.yy:2407
+#: parser.yy:2377
 msgid "need integer number arg"
 msgstr ""
 
-#: parser.yy:2550
+#: parser.yy:2520
 msgid "Suspect duration found following this beam"
 msgstr ""
 
@@ -1693,16 +1683,16 @@ msgstr ""
 msgid "Consider updating the input with the convert-ly script"
 msgstr ""
 
-#: lily.scm:566
+#: lily.scm:574
 #, lisp-format
-msgid "Converting to ~s..."
+msgid "Converting to `~a'..."
 msgstr ""
 
-#: lily.scm:587
+#: lily.scm:596
 #, lisp-format
-msgid "Invoking `~s'..."
+msgid "Invoking `~a'..."
 msgstr ""
 
-#: lily.scm:605
+#: lily.scm:614
 msgid "error: failed files: "
 msgstr ""

diff --git a/po/nl.po b/po/nl.po
index afbceb79817ee18b4028ba51c63717459c9d8b1a..ef951484462be23d2ae61c55853b2fedc54e64ee 100644 (file)
--- a/po/nl.po
+++ b/po/nl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: lilypond 2.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-18 15:20+0200\n"
+"POT-Creation-Date: 2004-09-07 16:24+0200\n"
 "PO-Revision-Date: 2004-04-11 11:01+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <janneke@gnu.org>\n"
 "Language-Team: Dutch <vertaling@nl.linux.org>\n"
@@ -88,12 +88,12 @@ msgstr "Binair programma %s heeft versie %s, zocht naar versie %s"
 msgid "Opening pipe `%s'"
 msgstr "Openen van pijp `%s'..."
 
-#: lilylib.py:269 lilypond-book.py:805
+#: lilylib.py:269 lilypond-book.py:812
 #, python-format
 msgid "`%s' failed (%d)"
 msgstr "`%s' gefaald (%d)"
 
-#: lilylib.py:274 lilylib.py:333 lilypond-book.py:806 lilypond-latex.py:465
+#: lilylib.py:274 lilylib.py:333 lilypond-book.py:813 lilypond-latex.py:466
 msgid "The error log is as follows:"
 msgstr "De foutlog is als volgend:"
 
@@ -214,52 +214,52 @@ msgstr "negeren van onbekende ly optie: %s"
 msgid "file not found: %s"
 msgstr "bestand niet gevonden: %s"
 
-#: lilypond-book.py:788
+#: lilypond-book.py:795
 #, python-format
 msgid "Opening filter `%s'"
 msgstr "Open filter `%s'"
 
-#: lilypond-book.py:904
+#: lilypond-book.py:913
 #, python-format
 msgid "cannot determine format for: %s"
 msgstr "kan formaat niet bepalen voor: %s"
 
-#: lilypond-book.py:945
+#: lilypond-book.py:954
 msgid "Output would overwrite input file; use --output."
 msgstr "Uitvoer zou invoerbestand overschrijven; gebruik --output."
 
-#: lilypond-book.py:952
+#: lilypond-book.py:961
 #, python-format
 msgid "Reading %s..."
 msgstr "Lezen %s..."
 
-#: lilypond-book.py:966
+#: lilypond-book.py:975
 msgid "Dissecting..."
 msgstr "Ontleden..."
 
-#: lilypond-book.py:994
+#: lilypond-book.py:1006
 msgid "Writing snippets..."
 msgstr "Schrijven van snippers..."
 
-#: lilypond-book.py:999
+#: lilypond-book.py:1011
 msgid "Processing..."
 msgstr "Verwerken..."
 
-#: lilypond-book.py:1002
+#: lilypond-book.py:1014
 msgid "All snippets are up to date..."
 msgstr "Alle snippers zijn actueel..."
 
-#: lilypond-book.py:1005
+#: lilypond-book.py:1017
 #, python-format
 msgid "Compiling %s..."
 msgstr "Samenstellen %s..."
 
-#: lilypond-book.py:1013
+#: lilypond-book.py:1025
 #, python-format
 msgid "Processing include: %s"
 msgstr "Verwerken van invoegsel: %s"
 
-#: lilypond-book.py:1029 lilypond-latex.py:575 midi2ly.py:1017 ps2png.py:51
+#: lilypond-book.py:1041 lilypond-latex.py:576 midi2ly.py:1017 ps2png.py:51
 #, python-format
 msgid "getopt says: `%s'"
 msgstr "getopt zegt: `%s'"
@@ -355,49 +355,49 @@ msgstr "verander globale instelling SLEUTEL in WAARDE"
 msgid "print version number"
 msgstr "druk versienummer af"
 
-#: lilypond-latex.py:202
+#: lilypond-latex.py:203
 #, python-format
 msgid "no such setting: `%s'"
 msgstr "onbekende instelling: %s"
 
-#: lilypond-latex.py:246
+#: lilypond-latex.py:247
 #, python-format
 msgid "LilyPond crashed (signal %d)."
 msgstr "LilyPond is neergestort (signaal %d)."
 
-#: lilypond-latex.py:247
+#: lilypond-latex.py:248
 msgid "Please submit a bug report to bug-lilypond@gnu.org"
 msgstr "Stuur alstublieft een foutrapportage naar bug-lilypond@gnu.org"
 
-#: lilypond-latex.py:254
+#: lilypond-latex.py:255
 #, python-format
 msgid "LilyPond failed on input file %s (exit status %d)"
 msgstr "LilyPond heeft gefaald op invoerbestand %s (afsluitstatus %d)"
 
-#: lilypond-latex.py:258
+#: lilypond-latex.py:259
 #, python-format
 msgid "LilyPond failed on an input file (exit status %d)"
 msgstr "LilyPond heeft gefaald op een invoerbestand (afsluitstatus %d)"
 
-#: lilypond-latex.py:259
+#: lilypond-latex.py:260
 msgid "Continuing..."
 msgstr "Doorgaan..."
 
-#: lilypond-latex.py:269
+#: lilypond-latex.py:270
 #, python-format
 msgid "Analyzing %s..."
 msgstr "Analyseren van %s..."
 
-#: lilypond-latex.py:323
+#: lilypond-latex.py:324
 #, python-format
 msgid "no LilyPond output found for `%s'"
 msgstr "geen LilyPond uitvoer gevonden voor `%s'"
 
-#: lilypond-latex.py:464
+#: lilypond-latex.py:465
 msgid "LaTeX failed on the output file."
 msgstr "LaTeX heeft gefaald op het uitvoerbestand."
 
-#: lilypond-latex.py:512
+#: lilypond-latex.py:513
 msgid ""
 "Trying create PDF, but no PFA fonts found.\n"
 "Using bitmap fonts instead. This will look bad."
@@ -406,56 +406,56 @@ msgstr ""
 "Gebruik dan maar bitmap fonts.  Dit gaat er niet uitzien."
 
 #. no ps header?
-#: lilypond-latex.py:555
+#: lilypond-latex.py:556
 #, python-format
 msgid "not a PostScript file: `%s'"
 msgstr "geen PostScript bestand: `%s'"
 
-#: lilypond-latex.py:665
+#: lilypond-latex.py:666
 msgid "pseudo filter"
 msgstr "pseudo filter"
 
-#: lilypond-latex.py:668
+#: lilypond-latex.py:669
 msgid "pseudo filter only for single input file"
 msgstr "pseudo filter alleen voor enkel invoerbestand"
 
-#: lilypond-latex.py:673
+#: lilypond-latex.py:674
 msgid "no files specified on command line"
 msgstr "geen bestanden gespecificeerd op de opdrachtregel"
 
-#: lilypond-latex.py:705
+#: lilypond-latex.py:706
 #, python-format
 msgid "filename should not contain spaces: `%s'"
 msgstr "bestandsnaam mag geen spaties bevatten: `%s'"
 
-#: lilypond-latex.py:743
+#: lilypond-latex.py:744
 msgid "Running LilyPond failed. Rerun with --verbose for a trace."
 msgstr ""
 "Draaien van LilyPond gefaald. Draai opnieuw met --verbose voor een foutpad."
 
-#: lilypond-latex.py:785
+#: lilypond-latex.py:786
 msgid "Failed to make PS file. Rerun with --verbose for a trace."
 msgstr ""
 "Gefaald in het maken van een PS bestand.  Draai opnieuw met --verbose voor "
 "een foutpad."
 
-#: lilypond-latex.py:814
+#: lilypond-latex.py:815
 #, python-format
 msgid "%s output to <stdout>..."
 msgstr "%s uitvoer naar <stdout>..."
 
-#: lilypond-latex.py:819 includable-lexer.cc:57 kpath.cc:134 lily-guile.cc:85
-#: lily-parser.cc:297
+#: lilypond-latex.py:820 includable-lexer.cc:57 kpath.cc:134 lily-guile.cc:89
+#: lily-parser.cc:275
 #, c-format, python-format
 msgid "can't find file: `%s'"
 msgstr "kan bestand niet vinden: `%s'"
 
-#: lilypond-latex.py:842
+#: lilypond-latex.py:843
 #, python-format
 msgid "%s output to %s..."
 msgstr "%s uitvoer naar %s..."
 
-#: lilypond-latex.py:845
+#: lilypond-latex.py:846
 #, python-format
 msgid "can't find file: `%s.%s'"
 msgstr "kan bestand niet vinden: `%s.%s'"
@@ -624,7 +624,7 @@ msgstr "negeren van onbekend voorteken: %s"
 msgid "Accidental rule must be pair or context-name; Found %s"
 msgstr "Voortekenregel moet paar of context-naam zijn; Gevonden %s"
 
-#: accidental.cc:217 key-signature-interface.cc:137
+#: accidental.cc:221 key-signature-interface.cc:137
 #, c-format
 msgid "accidental `%s' not found"
 msgstr "voorteken `%s' niet gevonden"
@@ -673,7 +673,7 @@ msgstr "Laden van standaardfont"
 msgid "can't find default font: `%s'"
 msgstr "kan standaardfont niet vinden: `%s'"
 
-#: all-font-metrics.cc:201 includable-lexer.cc:59 lily-parser.cc:290
+#: all-font-metrics.cc:201 includable-lexer.cc:59 lily-parser.cc:268
 #, c-format
 msgid "(search path: `%s')"
 msgstr "(zoekpad: `%s')"
@@ -686,7 +686,7 @@ msgstr "Geef op"
 msgid "\\applycontext argument is not a procedure"
 msgstr "\\applycontext argument is geen procedure"
 
-#: auto-change-iterator.cc:62 change-iterator.cc:61
+#: auto-change-iterator.cc:67 change-iterator.cc:61
 msgid "Can't switch translators, I'm there already"
 msgstr "Kan niet wisselen van vertaler, ben al hier"
 
@@ -879,12 +879,12 @@ msgstr "Onbe
 msgid "can't find `%s' context"
 msgstr "kan `%s' context niet vinden"
 
-#: gourlay-breaking.cc:195
+#: gourlay-breaking.cc:199
 #, c-format
 msgid "Optimal demerits: %f"
 msgstr "Optimale foutscore: %f"
 
-#: gourlay-breaking.cc:200
+#: gourlay-breaking.cc:204
 msgid "No feasible line breaking found"
 msgstr "Geen doenbare regelafbreuk gevonden"
 
@@ -986,35 +986,35 @@ msgstr "negeer rust: ligatuur mag geen rust bevatten"
 msgid "ligature was started here"
 msgstr "ligatuur werd hier gestart"
 
-#: lily-guile.cc:87
+#: lily-guile.cc:91
 #, c-format
 msgid "(load path: `%s')"
 msgstr "(zoekpad: `%s')"
 
-#: lily-guile.cc:562
+#: lily-guile.cc:559
 #, c-format
 msgid "Can't find property type-check for `%s' (%s)."
 msgstr "Kan geen type-controle vinden voor property `%s' (%s)."
 
-#: lily-guile.cc:565
+#: lily-guile.cc:562
 msgid "Perhaps you made a typing error?"
 msgstr "Misschien een typefout?"
 
-#: lily-guile.cc:571
+#: lily-guile.cc:568
 msgid "Doing assignment anyway."
 msgstr "Voer toewijzing toch door."
 
-#: lily-guile.cc:585
+#: lily-guile.cc:582
 #, c-format
 msgid "Type check for `%s' failed; value `%s' must be of type `%s'"
 msgstr "Type contole gefaald voor `%s'; waarde `%s' moet type hebben: `%s'"
 
-#: lily-lexer.cc:219
+#: lily-lexer.cc:220
 #, c-format
 msgid "Identifier name is a keyword: `%s'"
 msgstr "Identifier naam is een sleutelwoord: `%s'"
 
-#: lily-lexer.cc:236
+#: lily-lexer.cc:237
 #, c-format
 msgid "error at EOF: %s"
 msgstr "fout bij EOF: %s"
@@ -1023,16 +1023,16 @@ msgstr "fout bij EOF: %s"
 msgid "Parsing..."
 msgstr "Ontleden..."
 
-#: lily-parser.cc:110 lily-parser.cc:147
+#: lily-parser.cc:110 lily-parser.cc:143
 msgid "Braces don't match"
 msgstr "Haakjes paren niet"
 
-#: lily-parser.cc:289
+#: lily-parser.cc:267
 #, c-format
 msgid "can't find init file: `%s'"
 msgstr "kan init bestand niet vinden: `%s'"
 
-#: lily-parser.cc:306
+#: lily-parser.cc:284
 #, c-format
 msgid "Now processing `%s'"
 msgstr "Nu wordt verwerkt `%s'"
@@ -1234,7 +1234,7 @@ msgstr "muziek voor de marsmannetjes."
 msgid "Fingerings are also not down?! Putting them down anyway."
 msgstr "Vingerzettingen zijn ook niet onder?! Zet ze toch onder."
 
-#: new-lyric-combine-music-iterator.cc:246
+#: new-lyric-combine-music-iterator.cc:245
 #, c-format
 msgid "cannot find Voice `%s'"
 msgstr "kan Voice niet vinden: `%s'"
@@ -1248,10 +1248,9 @@ msgstr "Te veel botsende nootkolommen.  Negeer ze."
 msgid "note head `%s' not found"
 msgstr "nootbolletje `%s' niet gevonden"
 
-#: paper-outputter.cc:113
-#, c-format
-msgid "paper output to `%s'..."
-msgstr "papier uitvoer naar %s..."
+#: paper-outputter.cc:116
+msgid "Paper output to `%s'..."
+msgstr "Papier uitvoer naar %s..."
 
 #: paper-score.cc:68
 #, c-format
@@ -1295,13 +1294,9 @@ msgstr "dd "
 msgid "MIDI output to `%s'..."
 msgstr "MIDI uitvoer naar %s..."
 
-#: phrasing-slur-engraver.cc:105
-msgid "unterminated phrasing slur"
-msgstr "onbeëindigde fraseringsboog"
-
-#: phrasing-slur-engraver.cc:123
-msgid "can't find start of phrasing slur"
-msgstr "kan start van fraseringsboog niet vinden"
+#: phrasing-slur-engraver.cc:99 slur-engraver.cc:114
+msgid "unterminated slur"
+msgstr "onbeëindigde bindingsboog"
 
 #: piano-pedal-engraver.cc:237
 msgid "Need 3 strings for piano pedals. No pedal made. "
@@ -1323,7 +1318,11 @@ msgstr "kan start van piano pedaal haak niet vinden: `%s'"
 msgid "Not a grob name, `%s'."
 msgstr "Geen grobnaam, `%s'."
 
-#: quote-iterator.cc:181
+#: quote-iterator.cc:108
+msgid "No events found for \\quote"
+msgstr ""
+
+#: quote-iterator.cc:183
 #, c-format
 msgid "In quotation: junking event %s"
 msgstr "In aanhaling: verschroten van gebeurtenis %s"
@@ -1399,25 +1398,33 @@ msgstr "Fonts zijn niet juist ge
 msgid "Install the ec-mftraced package from %s. Aborting"
 msgstr ""
 
-#: score.cc:112
-msgid "Interpreting music... "
-msgstr "Vertolken van muziek..."
-
-#: score.cc:122
+#: score.cc:100 score.cc:126
 msgid "Need music in a score"
 msgstr "Heb muziek nodig in een partituur"
 
-#: score.cc:133
+#: score.cc:116
+msgid "Interpreting music... "
+msgstr "Vertolken van muziek..."
+
+#: score.cc:137
 #, c-format
 msgid "elapsed time: %.2f seconds"
 msgstr "duur: %.2f seconden"
 
+#: score.cc:312
+msgid "Already have music in score"
+msgstr "Heb al muziek nodig in score"
+
+#: score.cc:313
+msgid "This is the previous music"
+msgstr ""
+
 #. FIXME:
-#: script-engraver.cc:100
+#: script-engraver.cc:102
 msgid "Do not know how to interpret articulation: "
 msgstr "Weet niet hoe articulatie te vertolken: "
 
-#: script-engraver.cc:101
+#: script-engraver.cc:103
 msgid "Scheme encoding: "
 msgstr "Scheme codering:"
 
@@ -1426,20 +1433,15 @@ msgstr "Scheme codering:"
 msgid "Separation_item:  I've been drinking too much"
 msgstr "Separation_item:  Ik heb te veel gedronken"
 
-#: simple-spacer.cc:248
+#: simple-spacer.cc:489
 #, c-format
 msgid "No spring between column %d and next one"
 msgstr "Geen veer tussen kolom %d en de volgende"
 
-#: slur-engraver.cc:128
-msgid "unterminated slur"
-msgstr "onbeëindigde bindingsboog"
-
-#. How to shut up this warning, when Voice_devnull_engraver has
-#. eaten start event?
-#: slur-engraver.cc:146
-msgid "can't find start of slur"
-msgstr "kan start van bindingsboog niet vinden"
+#: slur-engraver.cc:124
+#, fuzzy
+msgid "No slur to end"
+msgstr "Geen volta spanner te beëindigen"
 
 #: source-file.cc:50
 #, c-format
@@ -1456,17 +1458,17 @@ msgstr "Huh?  Kreeg %d, verwachtte %d tekens"
 msgid "Global shortest duration is %s"
 msgstr "Globaal kortste lengte is %s"
 
-#: stem-engraver.cc:84
+#: stem-engraver.cc:88
 msgid "tremolo duration is too long"
 msgstr "tremololengte is te lang"
 
 #. FIXME:
-#: stem-engraver.cc:121
+#: stem-engraver.cc:125
 #, c-format
 msgid "Adding note head to incompatible stem (type = %d)"
 msgstr "Voeg noot bolletje toe aan onverenigbare stok (type = %d)"
 
-#: stem-engraver.cc:123
+#: stem-engraver.cc:127
 msgid "Don't you want polyphonic voices instead?"
 msgstr "Wil je anders echt geen polyfone stemmen?"
 
@@ -1474,27 +1476,27 @@ msgstr "Wil je anders echt geen polyfone stemmen?"
 msgid "Weird stem size; check for narrow beams"
 msgstr "Vreemde stoklengte; controleer op krappe waardestrepen"
 
-#: stem.cc:599
+#: stem.cc:575
 #, c-format
 msgid "flag `%s' not found"
 msgstr "vlag `%s' niet gevonden"
 
-#: stem.cc:610
+#: stem.cc:586
 #, c-format
 msgid "flag stroke `%s' not found"
 msgstr "vlag streep `%s' niet gevonden"
 
-#: system.cc:133
+#: system.cc:134
 #, c-format
 msgid "Element count %d."
 msgstr "Aantal elementen: %d."
 
-#: system.cc:271
+#: system.cc:272
 #, c-format
 msgid "Grob count %d"
 msgstr "Aantal grobs %d"
 
-#: system.cc:285
+#: system.cc:286
 msgid "Calculating line breaks..."
 msgstr "Berekenen van regelafbreuken..."
 
@@ -1618,70 +1620,58 @@ msgstr "Merk moet symbool of lijst van symbolen zijn."
 msgid "Identifier should have alphabetic characters only"
 msgstr "Identifier mag uitsluitend alfabetische tekens hebben"
 
-#: parser.yy:699
-msgid "Already have music in score"
-msgstr "Heb al muziek nodig in score"
-
-#: parser.yy:700
-msgid "This is the previous music"
-msgstr ""
-
-#: parser.yy:726
+#: parser.yy:707
 msgid "Need \\bookpaper for bookpaper block."
 msgstr ""
 
-#: parser.yy:863
+#: parser.yy:844
 msgid "More alternatives than repeats.  Junking excess alternatives."
 msgstr ""
 "Meer alternatieven dan herhalingen.  Schroot overvloedige alternatieven."
 
-#: parser.yy:1035
+#: parser.yy:1016
 #, c-format
 msgid "Argument %d failed typecheck"
 msgstr ""
 
-#: parser.yy:1051
+#: parser.yy:1032
 msgid "Music head function should return Music object."
 msgstr ""
 
-#: parser.yy:1297
+#: parser.yy:1278
 msgid "Grob name should be alphanumeric"
 msgstr ""
 
-#: parser.yy:1551
-msgid "Can't find music"
-msgstr "Kan geen muziek vinden"
-
-#: parser.yy:1671
+#: parser.yy:1639
 msgid "Second argument must be pitch list."
 msgstr "Tweede argument moet een toonhoogtelijst zijn."
 
-#: parser.yy:1708 parser.yy:1713 parser.yy:2242
+#: parser.yy:1676 parser.yy:1681 parser.yy:2210
 msgid "Have to be in Lyric mode for lyrics"
 msgstr "Moet in Lyric modus zijn voor liedteksten"
 
-#: parser.yy:1798
+#: parser.yy:1766
 msgid "Expecting string as script definition"
 msgstr "Verwacht string voor script definitie"
 
-#: parser.yy:2007 parser.yy:2057
+#: parser.yy:1975 parser.yy:2025
 #, c-format
 msgid "not a duration: %d"
 msgstr "geen duur: %d"
 
-#: parser.yy:2152
+#: parser.yy:2120
 msgid "Have to be in Note mode for notes"
 msgstr "Moet in Note modus zijn voor noten"
 
-#: parser.yy:2257
+#: parser.yy:2225
 msgid "Have to be in Chord mode for chords"
 msgstr "Moet in Chord modus zijn voor accoorden"
 
-#: parser.yy:2407
+#: parser.yy:2377
 msgid "need integer number arg"
 msgstr "heb integer getal arg nogig"
 
-#: parser.yy:2550
+#: parser.yy:2520
 msgid "Suspect duration found following this beam"
 msgstr "Verdachte lengte gevonden volgend op deze waardestreep"
 
@@ -1747,20 +1737,32 @@ msgstr "Verkeerde lilypond versie: %s (%s, %s)"
 msgid "Consider updating the input with the convert-ly script"
 msgstr "Overweeg het actualiseren van de invoer met het convert-ly script"
 
-#: lily.scm:566
-#, lisp-format
-msgid "Converting to ~s..."
+#: lily.scm:574
+#, fuzzy, lisp-format
+msgid "Converting to `~a'..."
 msgstr "Converteren naar ~s..."
 
-#: lily.scm:587
-#, lisp-format
-msgid "Invoking `~s'..."
+#: lily.scm:596
+#, fuzzy, lisp-format
+msgid "Invoking `~a'..."
 msgstr "Inroepen van `%s'"
 
-#: lily.scm:605
+#: lily.scm:614
 msgid "error: failed files: "
 msgstr "fout: bestanden gefaald: "
 
+#~ msgid "unterminated phrasing slur"
+#~ msgstr "onbeëindigde fraseringsboog"
+
+#~ msgid "can't find start of phrasing slur"
+#~ msgstr "kan start van fraseringsboog niet vinden"
+
+#~ msgid "can't find start of slur"
+#~ msgstr "kan start van bindingsboog niet vinden"
+
+#~ msgid "Can't find music"
+#~ msgstr "Kan geen muziek vinden"
+
 #~ msgid "too many colliding rests."
 #~ msgstr "te veel botsende rusten"
 

diff --git a/scm/output-gnome.scm b/scm/output-gnome.scm
index 714d7372ea65e71637c84f183da880361a44ab2f..f059b5f78a703b3b6966308f374c106e6cc3ab75 100644 (file)
--- a/scm/output-gnome.scm
+++ b/scm/output-gnome.scm
@@ -159,7 +159,9 @@ lilypond-bin -fgnome input/simple-song.ly
          (move item
                (* output-scale (+ (car system-origin) x))
                (* output-scale (- (car system-origin) y)))
-         (affine-relative item output-scale 0 0 output-scale 0 0)
+         ;; UGH latest guile-gnome is broken
+         (if (defined? 'affine-relative)
+             (affine-relative item output-scale 0 0 output-scale 0 0))
          item)
        #f)))
 

diff --git a/scm/slur.scm b/scm/slur.scm
index a0ba65c3648b6c844c60ac8a7c89ccf18780e061..d7ec5fef84318872996c1171f2bb96522749cafc 100644 (file)
--- a/scm/slur.scm
+++ b/scm/slur.scm
@@ -21,5 +21,5 @@
     (free-head-distance . 0.3)
     (extra-object-collision . 50)
     (accidental-collision . 3)
-    (extra-encompass-free-distance . 0.5)
+    (extra-encompass-free-distance . 0.3)
     ))