From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Sun, 12 Sep 2004 00:36:50 +0000 (+0000)
Subject: This fixes: morgenlied.ly and input/regression/beam-concave.ly
X-Git-Tag: release/2.3.17~57
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=2395e0337e24fe9a861d8b383b0e7729b71fe2b7;p=lilypond.git

This fixes: morgenlied.ly and input/regression/beam-concave.ly
---

diff --git a/input/regression/beam-concave.ly b/input/regression/beam-concave.ly
index ed1db5b553..b862b67979 100644
--- a/input/regression/beam-concave.ly
+++ b/input/regression/beam-concave.ly
@@ -57,9 +57,6 @@ rossBeams = \relative c'' {
    \new Voice {
      \override Beam #'position-callbacks = #(check-slope-callbacks =)
      \rossBeams
-     \override Beam #'position-callbacks = #(check-slope-callbacks <>)
-  \resetMeasure
-     \nonHorizBeams
      
    }
   \paper{
diff --git a/po/lilypond.pot b/po/lilypond.pot
index e90ab1f4be..da89ef84d6 100644
--- 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-09-07 16:24+0200\n"
+"POT-Creation-Date: 2004-09-12 02:23+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"
@@ -21,7 +21,7 @@ msgid "lilylib module"
 msgstr ""
 
 #: lilylib.py:65 lilypond-book.py:91 lilypond-latex.py:109 midi2ly.py:100
-#: mup2ly.py:75 ps2png.py:40 main.cc:131
+#: mup2ly.py:75 ps2png.py:40 main.cc:131 lily/main.cc:131
 msgid "print this help"
 msgstr ""
 
@@ -58,12 +58,12 @@ msgstr ""
 msgid "Usage: %s [OPTIONS]... FILE"
 msgstr ""
 
-#: lilylib.py:196 midi2ly.py:227 mup2ly.py:223 main.cc:200
+#: lilylib.py:196 midi2ly.py:227 mup2ly.py:223 main.cc:200 lily/main.cc:200
 #, c-format
 msgid "Options:"
 msgstr ""
 
-#: lilylib.py:200 midi2ly.py:231 mup2ly.py:227 main.cc:204
+#: lilylib.py:200 midi2ly.py:231 mup2ly.py:227 main.cc:204 lily/main.cc:204
 #, c-format, python-format
 msgid "Report bugs to %s."
 msgstr ""
@@ -128,7 +128,9 @@ msgstr ""
 
 #. Bug in option parser: --output=foe is taken as an abbreviation
 #. for --output-format.
-#: lilypond-book.py:89 main.cc:130
+#. Bug in option parser: --output=foe is taken as an abbreviation
+#. for --output-format.
+#: lilypond-book.py:89 main.cc:130 lily/main.cc:130
 msgid "EXT"
 msgstr ""
 
@@ -145,6 +147,7 @@ msgid "pipe snippets through FILTER [convert-ly -n -]"
 msgstr ""
 
 #: lilypond-book.py:92 lilypond-book.py:94 lilypond-latex.py:114 main.cc:133
+#: lily/main.cc:133
 msgid "DIR"
 msgstr ""
 
@@ -165,7 +168,7 @@ msgid "write output to DIR"
 msgstr ""
 
 #: lilypond-book.py:95 lilypond-latex.py:133 midi2ly.py:105 mup2ly.py:78
-#: ps2png.py:41 main.cc:145
+#: ps2png.py:41 main.cc:145 lily/main.cc:145
 msgid "be verbose"
 msgstr ""
 
@@ -174,7 +177,7 @@ msgid "print version information"
 msgstr ""
 
 #: lilypond-book.py:97 lilypond-latex.py:135 midi2ly.py:107 mup2ly.py:80
-#: main.cc:146
+#: main.cc:146 lily/main.cc:146
 msgid "show warranty and copyright"
 msgstr ""
 
@@ -264,7 +267,7 @@ msgid "print even more output"
 msgstr ""
 
 #: lilypond-latex.py:112 lilypond-latex.py:123 midi2ly.py:102 main.cc:134
-#: main.cc:136
+#: main.cc:136 lily/main.cc:134 lily/main.cc:136
 msgid "FILE"
 msgstr ""
 
@@ -287,11 +290,12 @@ msgid "don't run LilyPond"
 msgstr ""
 
 #. junkme?
-#: lilypond-latex.py:121 main.cc:135
+#: lilypond-latex.py:121 main.cc:135 lily/main.cc:135
 msgid "produce MIDI output only"
 msgstr ""
 
 #: lilypond-latex.py:123 midi2ly.py:102 mup2ly.py:76 main.cc:136
+#: lily/main.cc:136
 msgid "write output to FILE"
 msgstr ""
 
@@ -336,6 +340,7 @@ msgid "change global setting KEY to VAL"
 msgstr ""
 
 #: lilypond-latex.py:134 midi2ly.py:106 mup2ly.py:79 main.cc:144
+#: lily/main.cc:144
 msgid "print version number"
 msgstr ""
 
@@ -424,7 +429,8 @@ msgid "%s output to <stdout>..."
 msgstr ""
 
 #: lilypond-latex.py:820 includable-lexer.cc:57 kpath.cc:134 lily-guile.cc:89
-#: lily-parser.cc:275
+#: lily-parser.cc:275 lily/includable-lexer.cc:57 lily/kpath.cc:134
+#: lily/lily-guile.cc:89 lily/lily-parser.cc:275
 #, c-format, python-format
 msgid "can't find file: `%s'"
 msgstr ""
@@ -486,12 +492,12 @@ msgstr ""
 msgid "treat every text as a lyric"
 msgstr ""
 
-#: midi2ly.py:149 mup2ly.py:143 input.cc:88
+#: midi2ly.py:149 mup2ly.py:143 input.cc:88 lily/input.cc:88
 msgid "warning: "
 msgstr ""
 
 #: midi2ly.py:164 midi2ly.py:1017 midi2ly.py:1082 mup2ly.py:146 mup2ly.py:160
-#: input.cc:93
+#: input.cc:93 lily/input.cc:93
 msgid "error: "
 msgstr ""
 
@@ -588,135 +594,141 @@ msgstr ""
 msgid "Continuing; crossing fingers"
 msgstr ""
 
-#: accidental-engraver.cc:194
+#: accidental-engraver.cc:194 lily/accidental-engraver.cc:201
 #, c-format
 msgid "Accidental typesetting list must begin with context-name: %s"
 msgstr ""
 
-#: accidental-engraver.cc:222
+#: accidental-engraver.cc:222 lily/accidental-engraver.cc:229
 #, c-format
 msgid "ignoring unknown accidental: %s"
 msgstr ""
 
-#: accidental-engraver.cc:239
+#: accidental-engraver.cc:239 lily/accidental-engraver.cc:246
 #, c-format
 msgid "Accidental rule must be pair or context-name; Found %s"
 msgstr ""
 
-#: accidental.cc:221 key-signature-interface.cc:137
+#: accidental.cc:221 key-signature-interface.cc:137 lily/accidental.cc:221
+#: lily/key-signature-interface.cc:137
 #, c-format
 msgid "accidental `%s' not found"
 msgstr ""
 
-#: afm.cc:143
+#: afm.cc:143 lily/afm.cc:143
 #, c-format
 msgid "Error parsing AFM file: `%s'"
 msgstr ""
 
 #. FIXME: broken sentence
-#: all-font-metrics.cc:95
+#. FIXME: broken sentence
+#: all-font-metrics.cc:95 lily/all-font-metrics.cc:95
 #, c-format
 msgid "checksum mismatch for font file: `%s'"
 msgstr ""
 
-#: all-font-metrics.cc:97
+#: all-font-metrics.cc:97 lily/all-font-metrics.cc:97
 #, c-format
 msgid "does not match: `%s'"
 msgstr ""
 
-#: all-font-metrics.cc:103
+#: all-font-metrics.cc:103 lily/all-font-metrics.cc:103
 msgid "Rebuild all .afm files, and remove all .pk and .tfm files."
 msgstr ""
 
-#: all-font-metrics.cc:105
+#: all-font-metrics.cc:105 lily/all-font-metrics.cc:105
 msgid "Rerun with -V to show font paths."
 msgstr ""
 
-#: all-font-metrics.cc:107
+#: all-font-metrics.cc:107 lily/all-font-metrics.cc:107
 msgid "A script for removing font-files is delivered with the source-code:"
 msgstr ""
 
-#: all-font-metrics.cc:184
+#: all-font-metrics.cc:184 lily/all-font-metrics.cc:184
 #, c-format
 msgid "can't find font: `%s'"
 msgstr ""
 
-#: all-font-metrics.cc:185
+#: all-font-metrics.cc:185 lily/all-font-metrics.cc:185
 msgid "Loading default font"
 msgstr ""
 
-#: all-font-metrics.cc:200
+#: all-font-metrics.cc:200 lily/all-font-metrics.cc:200
 #, c-format
 msgid "can't find default font: `%s'"
 msgstr ""
 
 #: all-font-metrics.cc:201 includable-lexer.cc:59 lily-parser.cc:268
+#: lily/all-font-metrics.cc:201 lily/includable-lexer.cc:59
+#: lily/lily-parser.cc:268
 #, c-format
 msgid "(search path: `%s')"
 msgstr ""
 
-#: all-font-metrics.cc:202
+#: all-font-metrics.cc:202 lily/all-font-metrics.cc:202
 msgid "Giving up"
 msgstr ""
 
-#: apply-context-iterator.cc:35
+#: apply-context-iterator.cc:35 lily/apply-context-iterator.cc:35
 msgid "\\applycontext argument is not a procedure"
 msgstr ""
 
 #: auto-change-iterator.cc:67 change-iterator.cc:61
+#: lily/auto-change-iterator.cc:67 lily/change-iterator.cc:61
 msgid "Can't switch translators, I'm there already"
 msgstr ""
 
-#: axis-group-engraver.cc:117
+#: axis-group-engraver.cc:117 lily/axis-group-engraver.cc:117
 msgid ""
 "Axis_group_engraver: vertical group already has a parent.\n"
 "Do you have two Axis_group_engravers?\n"
 "Killing this vertical group."
 msgstr ""
 
-#: bar-check-iterator.cc:68
+#: bar-check-iterator.cc:68 lily/bar-check-iterator.cc:68
 #, c-format
 msgid "barcheck failed at: %s"
 msgstr ""
 
-#: beam-engraver.cc:139
+#: beam-engraver.cc:139 lily/beam-engraver.cc:139
 msgid "already have a beam"
 msgstr ""
 
-#: beam-engraver.cc:211
+#: beam-engraver.cc:211 lily/beam-engraver.cc:211
 msgid "unterminated beam"
 msgstr ""
 
 #: beam-engraver.cc:244 chord-tremolo-engraver.cc:174
+#: lily/beam-engraver.cc:244 lily/chord-tremolo-engraver.cc:174
 msgid "stem must have Rhythmic structure"
 msgstr ""
 
-#: beam-engraver.cc:258
+#: beam-engraver.cc:258 lily/beam-engraver.cc:258
 msgid "stem doesn't fit in beam"
 msgstr ""
 
-#: beam-engraver.cc:259
+#: beam-engraver.cc:259 lily/beam-engraver.cc:259
 msgid "beam was started here"
 msgstr ""
 
-#: beam.cc:149
+#: beam.cc:149 lily/beam.cc:149
 msgid "beam has less than two visible stems"
 msgstr ""
 
-#: beam.cc:154
+#: beam.cc:154 lily/beam.cc:154
 msgid "removing beam with less than two stems"
 msgstr ""
 
-#: beam.cc:1038
+#: beam.cc:1038 lily/beam.cc:1038
 msgid "no viable initial configuration found: may not find good beam slope"
 msgstr ""
 
-#: break-align-interface.cc:214
+#: break-align-interface.cc:214 lily/break-align-interface.cc:214
 #, c-format
 msgid "No spacing entry from %s to `%s'"
 msgstr ""
 
-#: change-iterator.cc:22
+#: change-iterator.cc:22 lily/change-iterator.cc:22
 #, c-format
 msgid "can't change `%s' to `%s'"
 msgstr ""
@@ -727,292 +739,303 @@ msgstr ""
 #.
 #. last->translator_id_string ()  = get_change ()->change_to_id_string ();
 #.
-#: change-iterator.cc:93
+#.
+#. We could change the current translator's id, but that would make
+#. errors hard to catch
+#.
+#. last->translator_id_string ()  = get_change ()->change_to_id_string ();
+#.
+#: change-iterator.cc:93 lily/change-iterator.cc:93
 msgid "I'm one myself"
 msgstr ""
 
-#: change-iterator.cc:96
+#: change-iterator.cc:96 lily/change-iterator.cc:96
 msgid "none of these in my family"
 msgstr ""
 
-#: chord-tremolo-engraver.cc:100
+#: chord-tremolo-engraver.cc:100 lily/chord-tremolo-engraver.cc:100
 #, c-format
 msgid "Chord tremolo with %d elements. Must have two elements."
 msgstr ""
 
-#: chord-tremolo-engraver.cc:140
+#: chord-tremolo-engraver.cc:140 lily/chord-tremolo-engraver.cc:140
 msgid "unterminated chord tremolo"
 msgstr ""
 
-#: chord-tremolo-iterator.cc:64
+#: chord-tremolo-iterator.cc:64 lily/chord-tremolo-iterator.cc:64
 msgid "no one to print a tremolos"
 msgstr ""
 
-#: clef.cc:64
+#: clef.cc:64 lily/clef.cc:64
 #, c-format
 msgid "clef `%s' not found"
 msgstr ""
 
-#: cluster.cc:123
+#: cluster.cc:123 lily/cluster.cc:123
 #, c-format
 msgid "unknown cluster style `%s'"
 msgstr ""
 
-#: coherent-ligature-engraver.cc:84
+#: coherent-ligature-engraver.cc:84 lily/coherent-ligature-engraver.cc:84
 #, c-format
 msgid "gotcha: ptr=%ul"
 msgstr ""
 
-#: coherent-ligature-engraver.cc:96
+#: coherent-ligature-engraver.cc:96 lily/coherent-ligature-engraver.cc:96
 #, c-format
 msgid "distance=%f"
 msgstr ""
 
-#: coherent-ligature-engraver.cc:139
+#: coherent-ligature-engraver.cc:139 lily/coherent-ligature-engraver.cc:139
 #, c-format
 msgid "Coherent_ligature_engraver: setting `spacing-increment = 0.01': ptr=%ul"
 msgstr ""
 
-#: context-def.cc:111
+#: context-def.cc:111 lily/context-def.cc:111
 #, c-format
 msgid "Program has no such type: `%s'"
 msgstr ""
 
-#: context-def.cc:285
+#: context-def.cc:285 lily/context-def.cc:286
 #, c-format
 msgid "can't find: `%s'"
 msgstr ""
 
-#: context.cc:164
+#: context.cc:164 lily/context.cc:164
 #, c-format
 msgid "Cannot find or create `%s' called `%s'"
 msgstr ""
 
-#: context.cc:201
+#: context.cc:201 lily/context.cc:201
 #, c-format
 msgid "can't find or create: `%s'"
 msgstr ""
 
-#: custos.cc:85
+#: custos.cc:85 lily/custos.cc:85
 #, c-format
 msgid "custos `%s' not found"
 msgstr ""
 
-#: dimensions.cc:13
+#: dimensions.cc:13 lily/dimensions.cc:13
 msgid "NaN"
 msgstr ""
 
 #: dynamic-engraver.cc:186 span-dynamic-performer.cc:86
+#: lily/dynamic-engraver.cc:186 lily/span-dynamic-performer.cc:86
 msgid "can't find start of (de)crescendo"
 msgstr ""
 
-#: dynamic-engraver.cc:196
+#: dynamic-engraver.cc:196 lily/dynamic-engraver.cc:196
 msgid "already have a decrescendo"
 msgstr ""
 
-#: dynamic-engraver.cc:198
+#: dynamic-engraver.cc:198 lily/dynamic-engraver.cc:198
 msgid "already have a crescendo"
 msgstr ""
 
-#: dynamic-engraver.cc:201
+#: dynamic-engraver.cc:201 lily/dynamic-engraver.cc:201
 msgid "Cresc started here"
 msgstr ""
 
-#: dynamic-engraver.cc:307
+#: dynamic-engraver.cc:307 lily/dynamic-engraver.cc:317
 msgid "unterminated (de)crescendo"
 msgstr ""
 
 #: event-chord-iterator.cc:56 output-property-music-iterator.cc:29
+#: lily/event-chord-iterator.cc:56 lily/output-property-music-iterator.cc:29
 #, c-format
 msgid "Junking event: `%s'"
 msgstr ""
 
-#: event.cc:49
+#: event.cc:49 lily/event.cc:49
 #, c-format
 msgid "Transposition by %s makes alteration larger than two"
 msgstr ""
 
-#: event.cc:72
+#: event.cc:72 lily/event.cc:72
 #, c-format
 msgid "octave check failed; expected %s, found: %s"
 msgstr ""
 
 #: extender-engraver.cc:141 extender-engraver.cc:150
+#: lily/extender-engraver.cc:141 lily/extender-engraver.cc:150
 msgid "unterminated extender"
 msgstr ""
 
-#: folded-repeat-iterator.cc:65
+#: folded-repeat-iterator.cc:65 lily/folded-repeat-iterator.cc:65
 msgid "no one to print a repeat brace"
 msgstr ""
 
-#: glissando-engraver.cc:100
+#: glissando-engraver.cc:100 lily/glissando-engraver.cc:100
 msgid "Unterminated glissando."
 msgstr ""
 
-#: global-context.cc:150
+#: global-context.cc:150 lily/global-context.cc:150
 #, c-format
 msgid "can't find `%s' context"
 msgstr ""
 
-#: gourlay-breaking.cc:199
+#: gourlay-breaking.cc:199 lily/gourlay-breaking.cc:199
 #, c-format
 msgid "Optimal demerits: %f"
 msgstr ""
 
-#: gourlay-breaking.cc:204
+#: gourlay-breaking.cc:204 lily/gourlay-breaking.cc:204
 msgid "No feasible line breaking found"
 msgstr ""
 
-#: gregorian-ligature-engraver.cc:59
+#: gregorian-ligature-engraver.cc:59 lily/gregorian-ligature-engraver.cc:59
 #, c-format
 msgid "\\%s ignored"
 msgstr ""
 
-#: gregorian-ligature-engraver.cc:64
+#: gregorian-ligature-engraver.cc:64 lily/gregorian-ligature-engraver.cc:64
 #, c-format
 msgid "implied \\%s added"
 msgstr ""
 
-#: grob-interface.cc:73
+#: grob-interface.cc:73 lily/grob-interface.cc:73
 #, c-format
 msgid "Unknown interface `%s'"
 msgstr ""
 
-#: grob-interface.cc:84
+#: grob-interface.cc:84 lily/grob-interface.cc:84
 #, c-format
 msgid "Grob `%s' has no interface for property `%s'"
 msgstr ""
 
-#: hairpin.cc:92
+#: hairpin.cc:92 lily/hairpin.cc:107
 msgid "decrescendo too small"
 msgstr ""
 
-#: hairpin.cc:93
+#: hairpin.cc:93 lily/hairpin.cc:108
 msgid "crescendo too small"
 msgstr ""
 
-#: horizontal-bracket-engraver.cc:57
+#: horizontal-bracket-engraver.cc:57 lily/horizontal-bracket-engraver.cc:57
 msgid "Don't have that many brackets."
 msgstr ""
 
-#: horizontal-bracket-engraver.cc:66
+#: horizontal-bracket-engraver.cc:66 lily/horizontal-bracket-engraver.cc:66
 msgid "Conflicting note group events."
 msgstr ""
 
-#: hyphen-engraver.cc:96
+#: hyphen-engraver.cc:96 lily/hyphen-engraver.cc:96
 msgid "removing unterminated hyphen"
 msgstr ""
 
-#: hyphen-engraver.cc:109
+#: hyphen-engraver.cc:109 lily/hyphen-engraver.cc:109
 msgid "unterminated hyphen; removing"
 msgstr ""
 
-#: includable-lexer.cc:50
+#: includable-lexer.cc:50 lily/includable-lexer.cc:50
 msgid "include files are not allowed"
 msgstr ""
 
-#: input.cc:99
+#: input.cc:99 lily/input.cc:99
 msgid "non fatal error: "
 msgstr ""
 
-#: input.cc:107 source-file.cc:135 source-file.cc:228
+#: input.cc:107 source-file.cc:135 source-file.cc:228 lily/input.cc:107
+#: lily/source-file.cc:135 lily/source-file.cc:228
 msgid "position unknown"
 msgstr ""
 
-#: key-performer.cc:90
+#: key-performer.cc:90 lily/key-performer.cc:90
 msgid "FIXME: key change merge"
 msgstr ""
 
-#: kpath.cc:83
+#: kpath.cc:83 lily/kpath.cc:83
 #, c-format
 msgid "kpathsea can not find TFM file: `%s'"
 msgstr ""
 
-#: kpath.cc:129
+#: kpath.cc:129 lily/kpath.cc:129
 #, c-format
 msgid "kpathsea can not find file: `%s'"
 msgstr ""
 
-#: ligature-engraver.cc:152
+#: ligature-engraver.cc:152 lily/ligature-engraver.cc:152
 msgid "can't find start of ligature"
 msgstr ""
 
-#: ligature-engraver.cc:158
+#: ligature-engraver.cc:158 lily/ligature-engraver.cc:158
 msgid "no right bound"
 msgstr ""
 
-#: ligature-engraver.cc:184
+#: ligature-engraver.cc:184 lily/ligature-engraver.cc:184
 msgid "already have a ligature"
 msgstr ""
 
-#: ligature-engraver.cc:200
+#: ligature-engraver.cc:200 lily/ligature-engraver.cc:200
 msgid "no left bound"
 msgstr ""
 
-#: ligature-engraver.cc:256
+#: ligature-engraver.cc:256 lily/ligature-engraver.cc:256
 msgid "unterminated ligature"
 msgstr ""
 
-#: ligature-engraver.cc:280
+#: ligature-engraver.cc:280 lily/ligature-engraver.cc:280
 msgid "ignoring rest: ligature may not contain rest"
 msgstr ""
 
-#: ligature-engraver.cc:281
+#: ligature-engraver.cc:281 lily/ligature-engraver.cc:281
 msgid "ligature was started here"
 msgstr ""
 
-#: lily-guile.cc:91
+#: lily-guile.cc:91 lily/lily-guile.cc:91
 #, c-format
 msgid "(load path: `%s')"
 msgstr ""
 
-#: lily-guile.cc:559
+#: lily-guile.cc:559 lily/lily-guile.cc:559
 #, c-format
 msgid "Can't find property type-check for `%s' (%s)."
 msgstr ""
 
-#: lily-guile.cc:562
+#: lily-guile.cc:562 lily/lily-guile.cc:562
 msgid "Perhaps you made a typing error?"
 msgstr ""
 
-#: lily-guile.cc:568
+#: lily-guile.cc:568 lily/lily-guile.cc:568
 msgid "Doing assignment anyway."
 msgstr ""
 
-#: lily-guile.cc:582
+#: lily-guile.cc:582 lily/lily-guile.cc:582
 #, c-format
 msgid "Type check for `%s' failed; value `%s' must be of type `%s'"
 msgstr ""
 
-#: lily-lexer.cc:220
+#: lily-lexer.cc:220 lily/lily-lexer.cc:220
 #, c-format
 msgid "Identifier name is a keyword: `%s'"
 msgstr ""
 
-#: lily-lexer.cc:237
+#: lily-lexer.cc:237 lily/lily-lexer.cc:237
 #, c-format
 msgid "error at EOF: %s"
 msgstr ""
 
-#: lily-parser.cc:97
+#: lily-parser.cc:97 lily/lily-parser.cc:97
 msgid "Parsing..."
 msgstr ""
 
-#: lily-parser.cc:110 lily-parser.cc:143
+#: lily-parser.cc:110 lily-parser.cc:143 lily/lily-parser.cc:110
+#: lily/lily-parser.cc:143
 msgid "Braces don't match"
 msgstr ""
 
-#: lily-parser.cc:267
+#: lily-parser.cc:267 lily/lily-parser.cc:267
 #, c-format
 msgid "can't find init file: `%s'"
 msgstr ""
 
-#: lily-parser.cc:284
+#: lily-parser.cc:284 lily/lily-parser.cc:284
 #, c-format
 msgid "Now processing `%s'"
 msgstr ""
 
-#: main.cc:91
+#: main.cc:91 lily/main.cc:91
 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"
@@ -1020,7 +1043,7 @@ msgid ""
 "information.\n"
 msgstr ""
 
-#: main.cc:97
+#: main.cc:97 lily/main.cc:97
 msgid ""
 "    This program is free software; you can redistribute it and/or\n"
 "modify it under the terms of the GNU General Public License version 2\n"
@@ -1037,63 +1060,63 @@ msgid ""
 "Boston, MA 02111-1307, USA.\n"
 msgstr ""
 
-#: main.cc:126
+#: main.cc:126 lily/main.cc:126
 msgid "EXPR"
 msgstr ""
 
-#: main.cc:127
+#: main.cc:127 lily/main.cc:127
 msgid "set options, use -e '(ly:option-usage)' for help"
 msgstr ""
 
-#: main.cc:130
+#: main.cc:130 lily/main.cc:130
 msgid "select back-end to use"
 msgstr ""
 
-#: main.cc:132
+#: main.cc:132 lily/main.cc:132
 msgid "FIELD"
 msgstr ""
 
-#: main.cc:132
+#: main.cc:132 lily/main.cc:132
 msgid "write header field to BASENAME.FIELD"
 msgstr ""
 
-#: main.cc:133
+#: main.cc:133 lily/main.cc:133
 msgid "add DIR to search path"
 msgstr ""
 
-#: main.cc:134
+#: main.cc:134 lily/main.cc:134
 msgid "use FILE as init file"
 msgstr ""
 
-#: main.cc:137
+#: main.cc:137 lily/main.cc:137
 msgid "generate a preview"
 msgstr ""
 
-#: main.cc:138
+#: main.cc:138 lily/main.cc:138
 msgid "generate PNG"
 msgstr ""
 
-#: main.cc:139
+#: main.cc:139 lily/main.cc:139
 msgid "generate PostScript"
 msgstr ""
 
-#: main.cc:140
+#: main.cc:140 lily/main.cc:140
 msgid "generate DVI"
 msgstr ""
 
-#: main.cc:141
+#: main.cc:141 lily/main.cc:141
 msgid "generate PDF (default)"
 msgstr ""
 
-#: main.cc:142
+#: main.cc:142 lily/main.cc:142
 msgid "generate TeX"
 msgstr ""
 
-#: main.cc:143
+#: main.cc:143 lily/main.cc:143
 msgid "run in safe mode"
 msgstr ""
 
-#: main.cc:166
+#: main.cc:166 lily/main.cc:166
 #, c-format
 msgid ""
 "Copyright (c) %s by\n"
@@ -1101,79 +1124,82 @@ msgid ""
 msgstr ""
 
 #. No version number or newline here.  It confuses help2man.
-#: main.cc:192
+#. No version number or newline here.  It confuses help2man.
+#: main.cc:192 lily/main.cc:192
 #, c-format
 msgid "Usage: %s [OPTIONS]... FILE..."
 msgstr ""
 
-#: main.cc:194
+#: main.cc:194 lily/main.cc:194
 #, c-format
 msgid "Typeset music and/or produce MIDI from FILE."
 msgstr ""
 
-#: main.cc:196
+#: main.cc:196 lily/main.cc:196
 #, c-format
 msgid "LilyPond produces beautiful music notation."
 msgstr ""
 
-#: main.cc:198
+#: main.cc:198 lily/main.cc:198
 #, c-format
 msgid "For more information, see %s"
 msgstr ""
 
-#: main.cc:410
+#: main.cc:410 lily/main.cc:410
 #, c-format
 msgid "This option is for developers only."
 msgstr ""
 
-#: main.cc:411
+#: main.cc:411 lily/main.cc:411
 #, c-format
 msgid "Read the sources for more information."
 msgstr ""
 
 #: mensural-ligature-engraver.cc:248 mensural-ligature-engraver.cc:383
+#: lily/mensural-ligature-engraver.cc:248
+#: lily/mensural-ligature-engraver.cc:383
 msgid "unexpected case fall-through"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:259
+#: mensural-ligature-engraver.cc:259 lily/mensural-ligature-engraver.cc:259
 msgid "ligature with less than 2 heads -> skipping"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:279
+#: mensural-ligature-engraver.cc:279 lily/mensural-ligature-engraver.cc:279
 msgid "can not determine pitch of ligature primitive -> skipping"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:302
+#: mensural-ligature-engraver.cc:302 lily/mensural-ligature-engraver.cc:302
 msgid "prime interval within ligature -> skipping"
 msgstr ""
 
-#: mensural-ligature-engraver.cc:312
+#: mensural-ligature-engraver.cc:312 lily/mensural-ligature-engraver.cc:312
 msgid "mensural ligature: duration none of L, B, S -> skipping"
 msgstr ""
 
-#: mensural-ligature.cc:161
+#: mensural-ligature.cc:161 lily/mensural-ligature.cc:161
 msgid "Mensural_ligature:unexpected case fall-through"
 msgstr ""
 
-#: mensural-ligature.cc:171
+#: mensural-ligature.cc:171 lily/mensural-ligature.cc:171
 msgid "Mensural_ligature: (join_left == 0)"
 msgstr ""
 
-#: midi-item.cc:153
+#: midi-item.cc:153 lily/midi-item.cc:153
 #, c-format
 msgid "no such MIDI instrument: `%s'"
 msgstr ""
 
-#: midi-item.cc:257
+#: midi-item.cc:257 lily/midi-item.cc:257
 msgid "silly pitch"
 msgstr ""
 
-#: midi-item.cc:273
+#: midi-item.cc:273 lily/midi-item.cc:273
 #, c-format
 msgid "Experimental: temporarily fine tuning (of %d cents) a channel."
 msgstr ""
 
-#: midi-stream.cc:40
+#: midi-stream.cc:40 lily/midi-stream.cc:40
 #, c-format
 msgid "could not write file: `%s'"
 msgstr ""
@@ -1181,311 +1207,326 @@ msgstr ""
 #.
 #. music for the softenon children?
 #.
-#: new-fingering-engraver.cc:155
+#.
+#. music for the softenon children?
+#.
+#: new-fingering-engraver.cc:155 lily/new-fingering-engraver.cc:155
 msgid "music for the martians."
 msgstr ""
 
-#: new-fingering-engraver.cc:235
+#: new-fingering-engraver.cc:235 lily/new-fingering-engraver.cc:235
 msgid "Fingerings are also not down?! Putting them down anyway."
 msgstr ""
 
 #: new-lyric-combine-music-iterator.cc:245
+#: lily/new-lyric-combine-music-iterator.cc:245
 #, c-format
 msgid "cannot find Voice `%s'"
 msgstr ""
 
-#: note-collision.cc:413
+#: note-collision.cc:413 lily/note-collision.cc:413
 msgid "Too many clashing notecolumns.  Ignoring them."
 msgstr ""
 
-#: note-head.cc:45
+#: note-head.cc:45 lily/note-head.cc:45
 #, c-format
 msgid "note head `%s' not found"
 msgstr ""
 
-#: paper-outputter.cc:116
+#: paper-outputter.cc:116 lily/paper-outputter.cc:116
 #, c-format
 msgid "Paper output to `%s'..."
 msgstr ""
 
-#: paper-score.cc:68
+#: paper-score.cc:68 lily/paper-score.cc:68
 #, c-format
 msgid "Element count %d (spanners %d) "
 msgstr ""
 
-#: paper-score.cc:72
+#: paper-score.cc:72 lily/paper-score.cc:72
 msgid "Preprocessing graphical objects..."
 msgstr ""
 
-#: parse-scm.cc:77
+#: parse-scm.cc:77 lily/parse-scm.cc:77
 msgid "GUILE signaled an error for the expression beginning here"
 msgstr ""
 
-#: percent-repeat-engraver.cc:110
+#: percent-repeat-engraver.cc:110 lily/percent-repeat-engraver.cc:110
 msgid "Don't know how to handle a percent repeat of this length."
 msgstr ""
 
-#: percent-repeat-engraver.cc:170
+#: percent-repeat-engraver.cc:170 lily/percent-repeat-engraver.cc:170
 msgid "unterminated percent repeat"
 msgstr ""
 
-#: percent-repeat-iterator.cc:53
+#: percent-repeat-iterator.cc:53 lily/percent-repeat-iterator.cc:53
 msgid "no one to print a percent"
 msgstr ""
 
-#: performance.cc:50
+#: performance.cc:50 lily/performance.cc:50
 msgid "Track ... "
 msgstr ""
 
-#: performance.cc:93
+#: performance.cc:93 lily/performance.cc:93
 msgid "Creator: "
 msgstr ""
 
-#: performance.cc:113
+#: performance.cc:113 lily/performance.cc:113
 msgid "at "
 msgstr ""
 
-#: performance.cc:167
+#: performance.cc:167 lily/performance.cc:167
 #, c-format
 msgid "MIDI output to `%s'..."
 msgstr ""
 
 #: phrasing-slur-engraver.cc:99 slur-engraver.cc:114
+#: lily/phrasing-slur-engraver.cc:99 lily/slur-engraver.cc:114
 msgid "unterminated slur"
 msgstr ""
 
-#: piano-pedal-engraver.cc:237
+#: piano-pedal-engraver.cc:237 lily/piano-pedal-engraver.cc:237
 msgid "Need 3 strings for piano pedals. No pedal made. "
 msgstr ""
 
 #: piano-pedal-engraver.cc:252 piano-pedal-engraver.cc:267
-#: piano-pedal-performer.cc:82
+#: piano-pedal-performer.cc:82 lily/piano-pedal-engraver.cc:252
+#: lily/piano-pedal-engraver.cc:267 lily/piano-pedal-performer.cc:82
 #, c-format
 msgid "can't find start of piano pedal: `%s'"
 msgstr ""
 
-#: piano-pedal-engraver.cc:318
+#: piano-pedal-engraver.cc:318 lily/piano-pedal-engraver.cc:318
 #, c-format
 msgid "can't find start of piano pedal bracket: `%s'"
 msgstr ""
 
-#: property-iterator.cc:94
+#: property-iterator.cc:94 lily/property-iterator.cc:94
 #, c-format
 msgid "Not a grob name, `%s'."
 msgstr ""
 
-#: quote-iterator.cc:108
+#: quote-iterator.cc:108 lily/quote-iterator.cc:124
 msgid "No events found for \\quote"
 msgstr ""
 
-#: quote-iterator.cc:183
+#: quote-iterator.cc:183 lily/quote-iterator.cc:199
 #, c-format
 msgid "In quotation: junking event %s"
 msgstr ""
 
-#: relative-octave-check.cc:25
+#: relative-octave-check.cc:25 lily/relative-octave-check.cc:25
 msgid "Failed octave check, got: "
 msgstr ""
 
-#: rest-collision.cc:132
+#: rest-collision.cc:132 lily/rest-collision.cc:132
 msgid "rest direction not set.  Cannot resolve collision."
 msgstr ""
 
-#: rest-collision.cc:144 rest-collision.cc:187
+#: rest-collision.cc:144 rest-collision.cc:187 lily/rest-collision.cc:144
+#: lily/rest-collision.cc:187
 msgid "too many colliding rests"
 msgstr ""
 
-#: rest.cc:136
+#: rest.cc:136 lily/rest.cc:136
 #, c-format
 msgid "rest `%s' not found"
 msgstr ""
 
-#: scm-option.cc:56
+#: scm-option.cc:56 lily/scm-option.cc:56
 #, c-format
 msgid "lilypond -e EXPR means:"
 msgstr ""
 
-#: scm-option.cc:58
+#: scm-option.cc:58 lily/scm-option.cc:58
 #, c-format
 msgid "  Evalute the Scheme EXPR before parsing any .ly files."
 msgstr ""
 
-#: scm-option.cc:60
+#: scm-option.cc:60 lily/scm-option.cc:60
 #, c-format
 msgid ""
 "  Multiple -e options may be given, they will be evaluated sequentially."
 msgstr ""
 
-#: scm-option.cc:62
+#: scm-option.cc:62 lily/scm-option.cc:62
 #, c-format
 msgid ""
 "  The function ly:set-option allows for access to some internal variables."
 msgstr ""
 
-#: scm-option.cc:64
+#: scm-option.cc:64 lily/scm-option.cc:64
 #, c-format
 msgid "Usage: lilypond -e \"(ly:set-option SYMBOL VAL)\""
 msgstr ""
 
-#: scm-option.cc:66
+#: scm-option.cc:66 lily/scm-option.cc:66
 #, c-format
 msgid "Use help as  SYMBOL to get online help."
 msgstr ""
 
-#: scm-option.cc:132 scm-option.cc:160
+#: scm-option.cc:132 scm-option.cc:160 lily/scm-option.cc:132
+#: lily/scm-option.cc:160
 #, c-format
 msgid "No such internal option: %s"
 msgstr ""
 
-#: score-engraver.cc:103 score-engraver.cc:108
+#: score-engraver.cc:103 score-engraver.cc:108 lily/score-engraver.cc:103
+#: lily/score-engraver.cc:108
 #, c-format
 msgid "can't find `%s'"
 msgstr ""
 
-#: score-engraver.cc:104
+#: score-engraver.cc:104 lily/score-engraver.cc:104
 msgid "Music font has not been installed properly.  Aborting"
 msgstr ""
 
-#: score-engraver.cc:109
+#: score-engraver.cc:109 lily/score-engraver.cc:109
 #, c-format
 msgid "Install the ec-mftraced package from %s. Aborting"
 msgstr ""
 
-#: score.cc:100 score.cc:126
+#: score.cc:100 score.cc:126 lily/score.cc:100 lily/score.cc:126
 msgid "Need music in a score"
 msgstr ""
 
-#: score.cc:116
+#: score.cc:116 lily/score.cc:116
 msgid "Interpreting music... "
 msgstr ""
 
-#: score.cc:137
+#: score.cc:137 lily/score.cc:137
 #, c-format
 msgid "elapsed time: %.2f seconds"
 msgstr ""
 
-#: score.cc:312
+#: score.cc:312 lily/score.cc:312
 msgid "Already have music in score"
 msgstr ""
 
-#: score.cc:313
+#: score.cc:313 lily/score.cc:313
 msgid "This is the previous music"
 msgstr ""
 
 #. FIXME:
-#: script-engraver.cc:102
+#. FIXME:
+#: script-engraver.cc:102 lily/script-engraver.cc:102
 msgid "Do not know how to interpret articulation: "
 msgstr ""
 
-#: script-engraver.cc:103
+#: script-engraver.cc:103 lily/script-engraver.cc:103
 msgid "Scheme encoding: "
 msgstr ""
 
 #. this shouldn't happen, but let's continue anyway.
-#: separation-item.cc:53 separation-item.cc:97
+#. this shouldn't happen, but let's continue anyway.
+#: separation-item.cc:53 separation-item.cc:97 lily/separation-item.cc:53
+#: lily/separation-item.cc:97
 msgid "Separation_item:  I've been drinking too much"
 msgstr ""
 
-#: simple-spacer.cc:489
+#: simple-spacer.cc:489 lily/simple-spacer.cc:489
 #, c-format
 msgid "No spring between column %d and next one"
 msgstr ""
 
-#: slur-engraver.cc:124
+#: slur-engraver.cc:124 lily/slur-engraver.cc:124
 msgid "No slur to end"
 msgstr ""
 
-#: source-file.cc:50
+#: source-file.cc:50 lily/source-file.cc:50
 #, c-format
 msgid "can't open file: `%s'"
 msgstr ""
 
-#: source-file.cc:63
+#: source-file.cc:63 lily/source-file.cc:63
 #, c-format
 msgid "Huh?  Got %d, expected %d characters"
 msgstr ""
 
-#: spacing-spanner.cc:388
+#: spacing-spanner.cc:388 lily/spacing-spanner.cc:388
 #, c-format
 msgid "Global shortest duration is %s"
 msgstr ""
 
-#: stem-engraver.cc:88
+#: stem-engraver.cc:88 lily/stem-engraver.cc:88
 msgid "tremolo duration is too long"
 msgstr ""
 
 #. FIXME:
-#: stem-engraver.cc:125
+#. FIXME:
+#: stem-engraver.cc:125 lily/stem-engraver.cc:125
 #, c-format
 msgid "Adding note head to incompatible stem (type = %d)"
 msgstr ""
 
-#: stem-engraver.cc:127
+#: stem-engraver.cc:127 lily/stem-engraver.cc:127
 msgid "Don't you want polyphonic voices instead?"
 msgstr ""
 
-#: stem.cc:126
+#: stem.cc:126 lily/stem.cc:126
 msgid "Weird stem size; check for narrow beams"
 msgstr ""
 
-#: stem.cc:575
+#: stem.cc:575 lily/stem.cc:575
 #, c-format
 msgid "flag `%s' not found"
 msgstr ""
 
-#: stem.cc:586
+#: stem.cc:586 lily/stem.cc:586
 #, c-format
 msgid "flag stroke `%s' not found"
 msgstr ""
 
-#: system.cc:134
+#: system.cc:134 lily/system.cc:134
 #, c-format
 msgid "Element count %d."
 msgstr ""
 
-#: system.cc:272
+#: system.cc:272 lily/system.cc:272
 #, c-format
 msgid "Grob count %d"
 msgstr ""
 
-#: system.cc:286
+#: system.cc:286 lily/system.cc:286
 msgid "Calculating line breaks..."
 msgstr ""
 
-#: text-spanner-engraver.cc:63
+#: text-spanner-engraver.cc:63 lily/text-spanner-engraver.cc:63
 msgid "can't find start of text spanner"
 msgstr ""
 
-#: text-spanner-engraver.cc:77
+#: text-spanner-engraver.cc:77 lily/text-spanner-engraver.cc:77
 msgid "already have a text spanner"
 msgstr ""
 
-#: text-spanner-engraver.cc:139
+#: text-spanner-engraver.cc:139 lily/text-spanner-engraver.cc:139
 msgid "unterminated text spanner"
 msgstr ""
 
 #. Not using ngettext's plural feature here, as this message is
 #. more of a programming error.
-#: tfm-reader.cc:108
+#. Not using ngettext's plural feature here, as this message is
+#. more of a programming error.
+#: tfm-reader.cc:108 lily/tfm-reader.cc:108
 #, c-format
 msgid "TFM header of `%s' has only %u word (s)"
 msgstr ""
 
-#: tfm-reader.cc:142
+#: tfm-reader.cc:142 lily/tfm-reader.cc:142
 #, c-format
 msgid "%s: TFM file has %u parameters, which is more than the %u I can handle"
 msgstr ""
 
-#: tfm.cc:73
+#: tfm.cc:73 lily/tfm.cc:73
 #, c-format
 msgid "can't find ascii character: %d"
 msgstr ""
 
-#: tie-engraver.cc:165
+#: tie-engraver.cc:165 lily/tie-engraver.cc:173
 msgid "lonely tie"
 msgstr ""
 
-#: time-scaled-music-iterator.cc:24
+#: time-scaled-music-iterator.cc:24 lily/time-scaled-music-iterator.cc:24
 msgid "no one to print a tuplet start bracket"
 msgstr ""
 
@@ -1494,68 +1535,75 @@ msgstr ""
 #.
 #. OTOH, Tristan Keuris writes 8/20 in his Intermezzi.
 #.
-#: time-signature-engraver.cc:57
+#.
+#. Todo: should make typecheck?
+#.
+#. OTOH, Tristan Keuris writes 8/20 in his Intermezzi.
+#.
+#: time-signature-engraver.cc:57 lily/time-signature-engraver.cc:57
 #, c-format
 msgid "Found strange time signature %d/%d."
 msgstr ""
 
 #. If there is no such symbol, we default to the numbered style.
 #. (Here really with a warning!)
-#: time-signature.cc:91
+#. If there is no such symbol, we default to the numbered style.
+#. (Here really with a warning!)
+#: time-signature.cc:91 lily/time-signature.cc:91
 #, c-format
 msgid "time signature symbol `%s' not found; reverting to numbered style"
 msgstr ""
 
-#: translator-ctors.cc:53
+#: translator-ctors.cc:53 lily/translator-ctors.cc:53
 #, c-format
 msgid "unknown translator: `%s'"
 msgstr ""
 
-#: trill-spanner-engraver.cc:71
+#: trill-spanner-engraver.cc:71 lily/trill-spanner-engraver.cc:71
 msgid "can't find start of trill spanner"
 msgstr ""
 
-#: trill-spanner-engraver.cc:85
+#: trill-spanner-engraver.cc:85 lily/trill-spanner-engraver.cc:85
 msgid "already have a trill spanner"
 msgstr ""
 
-#: trill-spanner-engraver.cc:145
+#: trill-spanner-engraver.cc:145 lily/trill-spanner-engraver.cc:145
 msgid "unterminated trill spanner"
 msgstr ""
 
-#: tuplet-bracket.cc:448
+#: tuplet-bracket.cc:448 lily/tuplet-bracket.cc:447
 msgid "Killing tuplet bracket across linebreak."
 msgstr ""
 
-#: vaticana-ligature-engraver.cc:342
+#: vaticana-ligature-engraver.cc:342 lily/vaticana-ligature-engraver.cc:342
 #, c-format
 msgid ""
 "ignored prefix (es) `%s' of this head according to restrictions of the "
 "selected ligature style"
 msgstr ""
 
-#: vaticana-ligature-engraver.cc:572
+#: vaticana-ligature-engraver.cc:572 lily/vaticana-ligature-engraver.cc:572
 #, c-format
 msgid "Vaticana_ligature_engraver: setting `spacing-increment = %f': ptr=%ul"
 msgstr ""
 
-#: vaticana-ligature.cc:92
+#: vaticana-ligature.cc:92 lily/vaticana-ligature.cc:92
 msgid "ascending vaticana style flexa"
 msgstr ""
 
-#: vaticana-ligature.cc:181
+#: vaticana-ligature.cc:181 lily/vaticana-ligature.cc:181
 msgid "Vaticana_ligature: zero join (delta_pitch == 0)"
 msgstr ""
 
-#: volta-engraver.cc:141
+#: volta-engraver.cc:141 lily/volta-engraver.cc:141
 msgid "No volta spanner to end"
 msgstr ""
 
-#: volta-engraver.cc:152
+#: volta-engraver.cc:152 lily/volta-engraver.cc:152
 msgid "Already have a volta spanner.  Stopping that one prematurely."
 msgstr ""
 
-#: volta-engraver.cc:156
+#: volta-engraver.cc:156 lily/volta-engraver.cc:156
 msgid "Also have a stopped spanner.  Giving up."
 msgstr ""