Merge remote branch 'origin/release/unstable' into HEAD

diff --git a/Documentation/web/news-front.itexi b/Documentation/web/news-front.itexi
index 0bf271ab80858f52f5442e45c1a75aaee39f64fc..51242ec65806a71ba4bd1d09f41a16d2470b6391 100644 (file)
--- a/Documentation/web/news-front.itexi
+++ b/Documentation/web/news-front.itexi
@@ -9,15 +9,18 @@
 @c used for news about the upcoming release; see CG 10.2
 
 @newsItem
-@subsubheading LilyPond 2.19.15 released  @emph{September 28, 2014}
+@subsubheading LilyPond 2.19.16 released  @emph{February 28, 2015}
 
-We are happy to announce the release of LilyPond 2.19.15.  This
-release includes a number of enhancements, and contains some work
-in progress.  You will have access to the very latest features, but
+At long last, we are very happy to announce the release of LilyPond
+2.19.16.  This release includes a number of enhancements, and contains some
+work in progress.  You will have access to the very latest features, but
 some may be incomplete, and you may encounter bugs and crashes.  If you
 require a stable version of Lilypond, we recommend using the 2.18
 version.
 
+We would like to acknowledge and thank Masamichi Hosoda for making this
+release possible with his work on updating GUB, the build tool.
+
 @newsEnd
 
 @newsItem

diff --git a/Documentation/web/news.itexi b/Documentation/web/news.itexi
index 24f121f9fd2f5e81aeb06b4f70732e3136707049..49cb8ce18eecd84a41ac44a2559fe929ed92ed9a 100644 (file)
--- a/Documentation/web/news.itexi
+++ b/Documentation/web/news.itexi
@@ -26,6 +26,18 @@ NOTE:
   * don't duplicate entries from news-front.itexi
 @end ignore
 
+@newsItem
+@subsubheading LilyPond 2.19.15 released  @emph{September 28, 2014}
+
+We are happy to announce the release of LilyPond 2.19.15.  This
+release includes a number of enhancements, and contains some work
+in progress.  You will have access to the very latest features, but
+some may be incomplete, and you may encounter bugs and crashes.  If you
+require a stable version of Lilypond, we recommend using the 2.18
+version.
+
+@newsEnd
+
 @newsItem
 @subsubheading LilyPond 2.19.14 released  @emph{September 14, 2014}
 

diff --git a/VERSION b/VERSION
index 4098926f6c31805706273453db7bd407073a34b8..64646d6b11d540158b8665f41e6fecd14046730e 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -4,4 +4,4 @@ MINOR_VERSION=19
 PATCH_LEVEL=16
 MY_PATCH_LEVEL=
 VERSION_STABLE=2.18.2
-VERSION_DEVEL=2.19.15
+VERSION_DEVEL=2.19.16

diff --git a/ly/Welcome-to-LilyPond-MacOS.ly b/ly/Welcome-to-LilyPond-MacOS.ly
index 972f1ea27b1ab3684a98a7c225cf568ce420c7fe..94f010509fbf221e949f1abd54628f55fabfb664 100644 (file)
--- a/ly/Welcome-to-LilyPond-MacOS.ly
+++ b/ly/Welcome-to-LilyPond-MacOS.ly
@@ -23,7 +23,7 @@ That's it.  For more information, visit http://lilypond.org .
 
 %}
 
-\version "2.19.15"  % necessary for upgrading to future LilyPond versions.
+\version "2.19.16"  % necessary for upgrading to future LilyPond versions.
 
 \header{
   title = "A scale in LilyPond"

diff --git a/ly/Welcome_to_LilyPond.ly b/ly/Welcome_to_LilyPond.ly
index d1ef2cec72722ed5e612789c837dc4839e9d7b8a..07d7114bd16af16995ad23721cda20e7b2d9de73 100644 (file)
--- a/ly/Welcome_to_LilyPond.ly
+++ b/ly/Welcome_to_LilyPond.ly
@@ -32,7 +32,7 @@ Good luck with LilyPond!  Happy engraving.
 
 %}
 
-\version "2.19.15"  % necessary for upgrading to future LilyPond versions.
+\version "2.19.16"  % necessary for upgrading to future LilyPond versions.
 
 \header{
   title = "A scale in LilyPond"

diff --git a/po/lilypond.pot b/po/lilypond.pot
index 170adca2d5b6c21a04bd696008223982fcb2622d..bf9cf6c87be655c1437883b4c69d94f53a1c8a67 100644 (file)
--- a/po/lilypond.pot
+++ b/po/lilypond.pot
@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: lilypond 2.19.15\n"
+"Project-Id-Version: lilypond 2.19.16\n"
 "Report-Msgid-Bugs-To: http://post.gmane.org/post.php?group=gmane.comp.gnu."
 "lilypond.bugs\n"
-"POT-Creation-Date: 2014-09-28 14:54+0100\n"
+"POT-Creation-Date: 2015-02-28 14:31+0000\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"
@@ -902,12 +902,12 @@ msgid ""
 msgstr ""
 
 #: abc2ly.py:1395 convert-ly.py:92 etf2ly.py:1208 lilypond-book.py:231
-#: midi2ly.py:1095 musicxml2ly.py:2590 main.cc:182
+#: midi2ly.py:1095 musicxml2ly.py:2590 main.cc:183
 msgid "show version number and exit"
 msgstr ""
 
 #: abc2ly.py:1398 convert-ly.py:96 etf2ly.py:1204 lilypond-book.py:140
-#: midi2ly.py:1062 musicxml2ly.py:2572 main.cc:161
+#: midi2ly.py:1062 musicxml2ly.py:2572 main.cc:162
 msgid "show this help and exit"
 msgstr ""
 
@@ -932,7 +932,7 @@ msgstr ""
 #. or if there is a LilyPond users list or forum in your language
 #. "Report bugs in English via %s or in YOUR_LANG via URI"
 #: abc2ly.py:1413 convert-ly.py:157 etf2ly.py:1218 lilypond-book.py:258
-#: midi2ly.py:1107 musicxml2ly.py:2674 main.cc:316
+#: midi2ly.py:1107 musicxml2ly.py:2674 main.cc:317
 #, c-format, python-format
 msgid "Report bugs via %s"
 msgstr ""
@@ -983,7 +983,7 @@ msgid ""
 msgstr ""
 
 #: convert-ly.py:111 lilypond-book.py:163 lilypond-book.py:181
-#: musicxml2ly.py:2629 main.cc:175
+#: musicxml2ly.py:2629 main.cc:176
 msgid "LOGLEVEL"
 msgstr ""
 
@@ -1015,7 +1015,7 @@ msgid "make a numbered backup [default: filename.ext~]"
 msgstr ""
 
 #: convert-ly.py:152 etf2ly.py:1212 lilypond-book.py:234 midi2ly.py:1096
-#: main.cc:184
+#: main.cc:185
 msgid "show warranty and copyright"
 msgstr ""
 
@@ -1074,7 +1074,7 @@ msgid ""
 msgstr ""
 
 #: etf2ly.py:1210 midi2ly.py:1067 midi2ly.py:1072 musicxml2ly.py:2659
-#: main.cc:167 main.cc:179
+#: main.cc:168 main.cc:180
 msgid "FILE"
 msgstr ""
 
@@ -1114,7 +1114,7 @@ msgid "add DIR to include path"
 msgstr ""
 
 #: lilypond-book.py:143 lilypond-book.py:150 lilypond-book.py:169
-#: lilypond-book.py:187 lilypond-book.py:208 lilypond-book.py:214 main.cc:166
+#: lilypond-book.py:187 lilypond-book.py:208 lilypond-book.py:214 main.cc:167
 msgid "DIR"
 msgstr ""
 
@@ -1815,22 +1815,22 @@ msgstr ""
 msgid "need symbol arguments for \\override and \\revert"
 msgstr ""
 
-#: context.cc:148
+#: context.cc:143
 #, c-format
 msgid "cannot find or create new `%s'"
 msgstr ""
 
-#: context.cc:227
+#: context.cc:222
 #, c-format
 msgid "cannot find or create `%s' called `%s'"
 msgstr ""
 
-#: context.cc:424
+#: context.cc:419
 #, c-format
 msgid "cannot find or create: `%s'"
 msgstr ""
 
-#: context.cc:438
+#: context.cc:433
 #, c-format
 msgid "cannot find or create new Bottom = \"%s\""
 msgstr ""
@@ -1840,20 +1840,20 @@ msgstr ""
 msgid "custos `%s' not found"
 msgstr ""
 
-#: dispatcher.cc:85
+#: dispatcher.cc:83
 msgid "Event class should be a list"
 msgstr ""
 
-#: dispatcher.cc:168
+#: dispatcher.cc:166
 #, c-format
 msgid "Junking event: %s"
 msgstr ""
 
-#: dispatcher.cc:273
+#: dispatcher.cc:271
 msgid "Attempting to remove nonexisting listener."
 msgstr ""
 
-#: dispatcher.cc:299
+#: dispatcher.cc:297
 msgid "Already listening to dispatcher, ignoring request"
 msgstr ""
 
@@ -1939,12 +1939,12 @@ msgstr ""
 msgid "Must be footnote-event."
 msgstr ""
 
-#: general-scheme.cc:395
+#: general-scheme.cc:403
 #, c-format
 msgid "failed redirecting stderr to `%s'"
 msgstr ""
 
-#: general-scheme.cc:474 output-ps.scm:48
+#: general-scheme.cc:482 output-ps.scm:48
 msgid "Found infinity or nan in output.  Substituting 0.0"
 msgstr ""
 
@@ -2000,7 +2000,7 @@ msgstr ""
 msgid "%d: %s"
 msgstr ""
 
-#: grob.cc:480
+#: grob.cc:481
 #, c-format
 msgid "ignored infinite %s-offset"
 msgstr ""
@@ -2153,7 +2153,7 @@ msgid ""
 "include-string instead."
 msgstr ""
 
-#: lily-parser.cc:108
+#: lily-parser.cc:107
 msgid "Parsing..."
 msgstr ""
 
@@ -2238,58 +2238,62 @@ msgstr ""
 msgid "generate PostScript"
 msgstr ""
 
-#: main.cc:163
+#: main.cc:161
+msgid "generate big PDF files"
+msgstr ""
+
+#: main.cc:164
 msgid "FIELD"
 msgstr ""
 
-#: main.cc:163
+#: main.cc:164
 msgid ""
 "dump header field FIELD to file\n"
 "named BASENAME.FIELD"
 msgstr ""
 
-#: main.cc:166
+#: main.cc:167
 msgid "add DIR to search path"
 msgstr ""
 
-#: main.cc:167
+#: main.cc:168
 msgid "use FILE as init file"
 msgstr ""
 
-#: main.cc:170
+#: main.cc:171
 msgid "USER, GROUP, JAIL, DIR"
 msgstr ""
 
-#: main.cc:170
+#: main.cc:171
 msgid ""
 "chroot to JAIL, become USER:GROUP\n"
 "and cd into DIR"
 msgstr ""
 
-#: main.cc:175
+#: main.cc:176
 msgid ""
 "print log messages according to LOGLEVEL.  Possible values are:\n"
 "NONE, ERROR, WARNING, BASIC, PROGRESS, INFO (default) and DEBUG."
 msgstr ""
 
-#: main.cc:179
+#: main.cc:180
 msgid "write output to FILE (suffix will be added)"
 msgstr ""
 
-#: main.cc:180
+#: main.cc:181
 msgid "relocate using directory of lilypond program"
 msgstr ""
 
-#: main.cc:181
+#: main.cc:182
 msgid "no progress, only error messages (equivalent to loglevel=ERROR)"
 msgstr ""
 
-#: main.cc:183
+#: main.cc:184
 msgid "be verbose (equivalent to loglevel=DEBUG)"
 msgstr ""
 
 #. Do not update the copyright years here, run `make grand-replace'
-#: main.cc:262
+#: main.cc:263
 #, c-format
 msgid ""
 "Copyright (c) %s by\n"
@@ -2297,74 +2301,74 @@ msgid ""
 msgstr ""
 
 #. No version number or newline here.  It confuses help2man.
-#: main.cc:300
+#: main.cc:301
 #, c-format
 msgid "Usage: %s [OPTION]... FILE..."
 msgstr ""
 
-#: main.cc:302
+#: main.cc:303
 msgid "Typeset music and/or produce MIDI from FILE."
 msgstr ""
 
-#: main.cc:304
+#: main.cc:305
 msgid "LilyPond produces beautiful music notation."
 msgstr ""
 
-#: main.cc:306
+#: main.cc:307
 #, c-format
 msgid "For more information, see %s"
 msgstr ""
 
-#: main.cc:308
+#: main.cc:309
 msgid "Options:"
 msgstr ""
 
-#: main.cc:375
+#: main.cc:376
 #, c-format
 msgid "expected %d arguments with jail, found: %u"
 msgstr ""
 
-#: main.cc:389
+#: main.cc:390
 #, c-format
 msgid "no such user: %s"
 msgstr ""
 
-#: main.cc:391
+#: main.cc:392
 #, c-format
 msgid "cannot get user id from user name: %s: %s"
 msgstr ""
 
-#: main.cc:406
+#: main.cc:407
 #, c-format
 msgid "no such group: %s"
 msgstr ""
 
-#: main.cc:408
+#: main.cc:409
 #, c-format
 msgid "cannot get group id from group name: %s: %s"
 msgstr ""
 
-#: main.cc:416
+#: main.cc:417
 #, c-format
 msgid "cannot chroot to: %s: %s"
 msgstr ""
 
-#: main.cc:423
+#: main.cc:424
 #, c-format
 msgid "cannot change group id to: %d: %s"
 msgstr ""
 
-#: main.cc:429
+#: main.cc:430
 #, c-format
 msgid "cannot change user id to: %d: %s"
 msgstr ""
 
-#: main.cc:435
+#: main.cc:436
 #, c-format
 msgid "cannot change working directory to: %s: %s"
 msgstr ""
 
-#: main.cc:820
+#: main.cc:825
 #, c-format
 msgid "exception caught: %s"
 msgstr ""
@@ -2444,7 +2448,7 @@ msgstr ""
 msgid "cannot write to file: `%s'"
 msgstr ""
 
-#: minimal-page-breaking.cc:40 paper-score.cc:122
+#: minimal-page-breaking.cc:40 paper-score.cc:116
 msgid "Calculating line breaks..."
 msgstr ""
 
@@ -2452,15 +2456,11 @@ msgstr ""
 msgid "Calculating page breaks..."
 msgstr ""
 
-#: multi-measure-rest.cc:154
+#: multi-measure-rest.cc:152
 msgid ""
 "usable-duration-logs must be a non-empty list.  Falling back to whole rests."
 msgstr ""
 
-#: multi-measure-rest.cc:364
-msgid "Using naive multi measure rest spacing."
-msgstr ""
-
 #: music.cc:149
 #, c-format
 msgid "octave check failed; expected \"%s\", found: \"%s\""
@@ -2478,8 +2478,8 @@ msgstr ""
 msgid "placing below"
 msgstr ""
 
-#: note-collision.cc:511
-msgid "ignoring too many clashing note columns"
+#: note-collision.cc:510
+msgid "this Voice needs a \\voiceXx or \\shiftXx setting"
 msgstr ""
 
 #: note-column.cc:150
@@ -2566,15 +2566,15 @@ msgid "best score for this sys-count: %f"
 msgstr ""
 
 #: optimal-page-breaking.cc:216 page-turn-page-breaking.cc:248
-#: paper-score.cc:162
+#: paper-score.cc:156
 msgid "Drawing systems..."
 msgstr ""
 
-#: output-def.cc:232
+#: output-def.cc:230
 msgid "margins do not fit with line-width, setting default values"
 msgstr ""
 
-#: output-def.cc:239
+#: output-def.cc:237
 msgid ""
 "systems run off the page due to improper paper settings, setting default "
 "values"
@@ -2677,12 +2677,12 @@ msgstr ""
 msgid "FreeType face has no PostScript font name"
 msgstr ""
 
-#: paper-book.cc:211
+#: paper-book.cc:201
 #, c-format
 msgid "program option -dprint-pages not supported by backend `%s'"
 msgstr ""
 
-#: paper-book.cc:230
+#: paper-book.cc:220
 #, c-format
 msgid "program option -dpreview not supported by backend `%s'"
 msgstr ""
@@ -2698,12 +2698,12 @@ msgstr ""
 msgid "Layout output to `%s'..."
 msgstr ""
 
-#: paper-score.cc:134
+#: paper-score.cc:128
 #, c-format
 msgid "Element count %d (spanners %d) "
 msgstr ""
 
-#: paper-score.cc:138
+#: paper-score.cc:132
 msgid "Preprocessing graphical objects..."
 msgstr ""
 
@@ -2841,7 +2841,7 @@ msgstr ""
 msgid "too many colliding rests"
 msgstr ""
 
-#: rest.cc:240
+#: rest.cc:239
 #, c-format
 msgid "rest `%s' not found"
 msgstr ""
@@ -2864,15 +2864,15 @@ msgstr ""
 msgid "Aborting"
 msgstr ""
 
-#: score.cc:169
+#: score.cc:160
 msgid "already have music in score"
 msgstr ""
 
-#: score.cc:170
+#: score.cc:161
 msgid "this is the previous music"
 msgstr ""
 
-#: score.cc:175
+#: score.cc:166
 msgid "errors found, ignoring music expression"
 msgstr ""
 
@@ -2885,7 +2885,7 @@ msgstr ""
 msgid " scheme encoding: "
 msgstr ""
 
-#: skyline-pair.cc:152
+#: skyline-pair.cc:135
 msgid "direction must not be CENTER in ly:skyline-pair::skyline"
 msgstr ""
 
@@ -2974,11 +2974,11 @@ msgstr ""
 msgid "unterminated text spanner"
 msgstr ""
 
-#: tie-engraver.cc:119
+#: tie-engraver.cc:121
 msgid "unterminated tie"
 msgstr ""
 
-#: tie-engraver.cc:353
+#: tie-engraver.cc:373
 msgid "lonely tie"
 msgstr ""
 
@@ -2987,18 +2987,11 @@ msgstr ""
 #.
 #. OTOH, Tristan Keuris writes 8/20 in his Intermezzi.
 #.
-#: time-signature-engraver.cc:75
+#: time-signature-engraver.cc:95
 #, c-format
 msgid "strange time signature found: %d/%d"
 msgstr ""
 
-#. If there is no such symbol, we default to the numbered style.
-#. (Here really with a warning!)
-#: time-signature.cc:89
-#, c-format
-msgid "time signature symbol `%s' not found; reverting to numbered style"
-msgstr ""
-
 #: translator-ctors.cc:65
 #, c-format
 msgid "unknown translator: `%s'"
@@ -3014,12 +3007,12 @@ msgstr ""
 msgid "cannot find: `%s'"
 msgstr ""
 
-#: translator.cc:322
+#: translator.cc:320
 #, c-format
 msgid "Two simultaneous %s events, junking this one"
 msgstr ""
 
-#: translator.cc:323
+#: translator.cc:321
 #, c-format
 msgid "Previous %s event here"
 msgstr ""
@@ -3308,24 +3301,24 @@ msgstr ""
 msgid "`~a' failed (~a)\n"
 msgstr ""
 
-#: backend-library.scm:93
+#: backend-library.scm:94
 #, scheme-format
 msgid "Converting to `~a'...\n"
 msgstr ""
 
 #. Do not try to guess the name of the png file,
 #. GS produces PNG files like BASE-page%d.png.
-#: backend-library.scm:102
+#: backend-library.scm:103
 #, scheme-format
 msgid "Converting to ~a..."
 msgstr ""
 
-#: backend-library.scm:140
+#: backend-library.scm:141
 #, scheme-format
 msgid "Writing header field `~a' to `~a'..."
 msgstr ""
 
-#: backend-library.scm:189
+#: backend-library.scm:190
 #, scheme-format
 msgid "missing stencil expression `~S'"
 msgstr ""
@@ -3371,17 +3364,17 @@ msgstr ""
 msgid "symbol ~S redefined"
 msgstr ""
 
-#: define-event-classes.scm:73
+#: define-event-classes.scm:74
 #, scheme-format
 msgid "unknown parent class `~a'"
 msgstr ""
 
-#: define-event-classes.scm:107
+#: define-event-classes.scm:108
 #, scheme-format
 msgid "Cannot redefine event class `~S'"
 msgstr ""
 
-#: define-event-classes.scm:109
+#: define-event-classes.scm:110
 #, scheme-format
 msgid "Undefined parent event class `~S'"
 msgstr ""
@@ -3390,47 +3383,42 @@ msgstr ""
 msgid "no systems found in \\score markup, does it have a \\layout block?"
 msgstr ""
 
-#: define-markup-commands.scm:2861
+#: define-markup-commands.scm:2886
 #, scheme-format
 msgid "Cannot find glyph ~a"
 msgstr ""
 
-#: define-markup-commands.scm:3337
+#: define-markup-commands.scm:3362
 #, scheme-format
 msgid "no brace found for point size ~S "
 msgstr ""
 
-#: define-markup-commands.scm:3338
+#: define-markup-commands.scm:3363
 #, scheme-format
 msgid "defaulting to ~S pt"
 msgstr ""
 
-#: define-markup-commands.scm:3590
+#: define-markup-commands.scm:3615
 #, scheme-format
 msgid "not a valid duration string: ~a"
 msgstr ""
 
-#: define-markup-commands.scm:3801
+#: define-markup-commands.scm:3826
 #, scheme-format
 msgid "not a valid duration string: ~a - ignoring"
 msgstr ""
 
-#: define-music-callbacks.scm:114
-#, scheme-format
-msgid "\\time in mid-measure at ~A"
-msgstr ""
-
-#: define-music-types.scm:791
+#: define-music-types.scm:797
 #, scheme-format
 msgid "symbol expected: ~S"
 msgstr ""
 
-#: define-music-types.scm:794
+#: define-music-types.scm:800
 #, scheme-format
 msgid "cannot find music object: ~S"
 msgstr ""
 
-#: define-music-types.scm:814
+#: define-music-types.scm:820
 #, scheme-format
 msgid "bad make-music argument: ~S"
 msgstr ""
@@ -3494,27 +3482,27 @@ msgstr ""
 msgid "Writing ~a..."
 msgstr ""
 
-#: framework-ps.scm:251
+#: framework-ps.scm:281
 #, scheme-format
 msgid "cannot embed ~S=~S"
 msgstr ""
 
-#: framework-ps.scm:294
+#: framework-ps.scm:324
 #, scheme-format
 msgid "cannot extract file matching ~a from ~a"
 msgstr ""
 
-#: framework-ps.scm:312
+#: framework-ps.scm:342
 #, scheme-format
 msgid "do not know how to embed ~S=~S"
 msgstr ""
 
-#: framework-ps.scm:337
+#: framework-ps.scm:367
 #, scheme-format
 msgid "do not know how to embed font ~s ~s ~s"
 msgstr ""
 
-#: framework-ps.scm:688
+#: framework-ps.scm:729
 msgid ""
 "\n"
 "The PostScript backend does not support the\n"
@@ -3563,19 +3551,19 @@ msgstr ""
 msgid "Music unsuitable for output-def"
 msgstr ""
 
-#: lily-library.scm:901
+#: lily-library.scm:921
 msgid ""
 "Find the index between @var{start} and @var{end} (an integer)\n"
 "which produces the closest match to @var{target-val} if\n"
 "applied to function @var{getter}."
 msgstr ""
 
-#: lily-library.scm:995
+#: lily-library.scm:1015
 #, scheme-format
 msgid "unknown unit: ~S"
 msgstr ""
 
-#: lily-library.scm:1020
+#: lily-library.scm:1040
 #, scheme-format
 msgid "no \\version statement found, please add~afor future compatibility"
 msgstr ""
@@ -3601,37 +3589,37 @@ msgstr ""
 msgid "cannot find: ~A"
 msgstr ""
 
-#: lily.scm:884
+#: lily.scm:886
 msgid "Success: compilation successfully completed"
 msgstr ""
 
-#: lily.scm:885
+#: lily.scm:887
 msgid "Compilation completed with warnings or errors"
 msgstr ""
 
-#: lily.scm:946
+#: lily.scm:948
 #, scheme-format
 msgid "job ~a terminated with signal: ~a"
 msgstr ""
 
-#: lily.scm:949
+#: lily.scm:951
 #, scheme-format
 msgid ""
 "logfile ~a (exit ~a):\n"
 "~a"
 msgstr ""
 
-#: lily.scm:971 lily.scm:1060
+#: lily.scm:973 lily.scm:1062
 #, scheme-format
 msgid "failed files: ~S"
 msgstr ""
 
-#: lily.scm:1051
+#: lily.scm:1053
 #, scheme-format
 msgid "Redirecting output to ~a..."
 msgstr ""
 
-#: lily.scm:1070 ps-to-png.scm:66
+#: lily.scm:1072 ps-to-png.scm:66
 #, scheme-format
 msgid "Invoking `~a'...\n"
 msgstr ""
@@ -3704,63 +3692,63 @@ msgstr ""
 msgid "More alternatives than repeats.  Junking excess alternatives"
 msgstr ""
 
-#: music-functions.scm:491
+#: music-functions.scm:480
 #, scheme-format
 msgid "bad grob property path ~a"
 msgstr ""
 
-#: music-functions.scm:786
+#: music-functions.scm:779
 msgid "Bad chord repetition"
 msgstr ""
 
-#: music-functions.scm:888
+#: music-functions.scm:884
 #, scheme-format
 msgid "music expected: ~S"
 msgstr ""
 
-#: music-functions.scm:1230
+#: music-functions.scm:1226
 #, scheme-format
 msgid "cannot find quoted music: `~S'"
 msgstr ""
 
-#: music-functions.scm:1370
+#: music-functions.scm:1366
 msgid "Add @var{octave-shift} to the octave of @var{pitch}."
 msgstr ""
 
-#: music-functions.scm:1433
+#: music-functions.scm:1429
 #, scheme-format
 msgid "Unknown octaveness type: ~S "
 msgstr ""
 
-#: music-functions.scm:1434
+#: music-functions.scm:1430
 msgid "Defaulting to 'any-octave."
 msgstr ""
 
-#: music-functions.scm:1826
+#: music-functions.scm:1822
 #, scheme-format
 msgid "unknown accidental style: ~S"
 msgstr ""
 
-#: music-functions.scm:2044
+#: music-functions.scm:2040
 msgid "Missing duration"
 msgstr ""
 
-#: music-functions.scm:2613
+#: music-functions.scm:2549
 #, scheme-format
 msgid "not a symbol list: ~a"
 msgstr ""
 
-#: music-functions.scm:2616
+#: music-functions.scm:2552
 #, scheme-format
 msgid "conflicting tag group ~a"
 msgstr ""
 
-#: output-ps.scm:278 output-svg.scm:539
+#: output-ps.scm:290 output-svg.scm:539
 #, scheme-format
 msgid "unknown line-cap-style: ~S"
 msgstr ""
 
-#: output-ps.scm:283 output-svg.scm:545
+#: output-ps.scm:295 output-svg.scm:545
 #, scheme-format
 msgid "unknown line-join-style: ~S"
 msgstr ""
@@ -3779,23 +3767,23 @@ msgstr ""
 msgid "cannot find SVG font ~S"
 msgstr ""
 
-#: paper.scm:121
+#: paper.scm:122
 msgid "set-global-staff-size: not in toplevel scope"
 msgstr ""
 
-#: paper.scm:321
+#: paper.scm:322
 #, scheme-format
 msgid "This is not a \\layout {} object, ~S"
 msgstr ""
 
-#: paper.scm:329
+#: paper.scm:330
 #, scheme-format
 msgid "Unknown paper size: ~a"
 msgstr ""
 
 #. TODO: should raise (generic) exception with throw, and catch
 #. that in parse-scm.cc
-#: paper.scm:348
+#: paper.scm:349
 msgid "Must use #(set-paper-size .. ) within \\paper { ... }"
 msgstr ""
 
@@ -3813,7 +3801,7 @@ msgstr ""
 msgid "error in #{ ... #}"
 msgstr ""
 
-#: part-combiner.scm:608
+#: part-combiner.scm:748
 #, scheme-format
 msgid "quoted music `~a' is empty"
 msgstr ""