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

diff --git a/Documentation/web/news-front.itexi b/Documentation/web/news-front.itexi
index 0bf271ab80858f52f5442e45c1a75aaee39f64fc..f151fa33394afd8a751c59c2a3c3dd42532e5ebd 100644 (file)
--- a/Documentation/web/news-front.itexi
+++ b/Documentation/web/news-front.itexi
@@ -9,9 +9,9 @@
 @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{October 12, 2014}
 
-We are happy to announce the release of LilyPond 2.19.15.  This
+We are 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

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..20de58109df20072e42719b38af316d920551904 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: 2014-10-12 15:00+0100\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"
@@ -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 ""
 
@@ -2153,7 +2153,7 @@ msgid ""
 "include-string instead."
 msgstr ""
 
-#: lily-parser.cc:108
+#: lily-parser.cc:106
 msgid "Parsing..."
 msgstr ""
 
@@ -2570,11 +2570,11 @@ msgstr ""
 msgid "Drawing systems..."
 msgstr ""
 
-#: output-def.cc:232
+#: output-def.cc:229
 msgid "margins do not fit with line-width, setting default values"
 msgstr ""
 
-#: output-def.cc:239
+#: output-def.cc:236
 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 ""
@@ -2864,15 +2864,15 @@ msgstr ""
 msgid "Aborting"
 msgstr ""
 
-#: score.cc:169
+#: score.cc:159
 msgid "already have music in score"
 msgstr ""
 
-#: score.cc:170
+#: score.cc:160
 msgid "this is the previous music"
 msgstr ""
 
-#: score.cc:175
+#: score.cc:165
 msgid "errors found, ignoring music expression"
 msgstr ""
 
@@ -2885,7 +2885,7 @@ msgstr ""
 msgid " scheme encoding: "
 msgstr ""
 
-#: skyline-pair.cc:152
+#: skyline-pair.cc:142
 msgid "direction must not be CENTER in ly:skyline-pair::skyline"
 msgstr ""
 
@@ -2978,7 +2978,7 @@ msgstr ""
 msgid "unterminated tie"
 msgstr ""
 
-#: tie-engraver.cc:353
+#: tie-engraver.cc:355
 msgid "lonely tie"
 msgstr ""
 
@@ -2987,7 +2987,7 @@ msgstr ""
 #.
 #. OTOH, Tristan Keuris writes 8/20 in his Intermezzi.
 #.
-#: time-signature-engraver.cc:75
+#: time-signature-engraver.cc:86
 #, c-format
 msgid "strange time signature found: %d/%d"
 msgstr ""
@@ -3014,12 +3014,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 ""
@@ -3371,17 +3371,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 ""
@@ -3420,17 +3420,17 @@ msgstr ""
 msgid "\\time in mid-measure at ~A"
 msgstr ""
 
-#: define-music-types.scm:791
+#: define-music-types.scm:796
 #, scheme-format
 msgid "symbol expected: ~S"
 msgstr ""
 
-#: define-music-types.scm:794
+#: define-music-types.scm:799
 #, scheme-format
 msgid "cannot find music object: ~S"
 msgstr ""
 
-#: define-music-types.scm:814
+#: define-music-types.scm:819
 #, scheme-format
 msgid "bad make-music argument: ~S"
 msgstr ""
@@ -3563,19 +3563,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 +3601,37 @@ msgstr ""
 msgid "cannot find: ~A"
 msgstr ""
 
-#: lily.scm:884
+#: lily.scm:885
 msgid "Success: compilation successfully completed"
 msgstr ""
 
-#: lily.scm:885
+#: lily.scm:886
 msgid "Compilation completed with warnings or errors"
 msgstr ""
 
-#: lily.scm:946
+#: lily.scm:947
 #, scheme-format
 msgid "job ~a terminated with signal: ~a"
 msgstr ""
 
-#: lily.scm:949
+#: lily.scm:950
 #, scheme-format
 msgid ""
 "logfile ~a (exit ~a):\n"
 "~a"
 msgstr ""
 
-#: lily.scm:971 lily.scm:1060
+#: lily.scm:972 lily.scm:1061
 #, scheme-format
 msgid "failed files: ~S"
 msgstr ""
 
-#: lily.scm:1051
+#: lily.scm:1052
 #, scheme-format
 msgid "Redirecting output to ~a..."
 msgstr ""
 
-#: lily.scm:1070 ps-to-png.scm:66
+#: lily.scm:1071 ps-to-png.scm:66
 #, scheme-format
 msgid "Invoking `~a'...\n"
 msgstr ""
@@ -3713,44 +3713,44 @@ msgstr ""
 msgid "Bad chord repetition"
 msgstr ""
 
-#: music-functions.scm:888
+#: music-functions.scm:891
 #, scheme-format
 msgid "music expected: ~S"
 msgstr ""
 
-#: music-functions.scm:1230
+#: music-functions.scm:1233
 #, scheme-format
 msgid "cannot find quoted music: `~S'"
 msgstr ""
 
-#: music-functions.scm:1370
+#: music-functions.scm:1373
 msgid "Add @var{octave-shift} to the octave of @var{pitch}."
 msgstr ""
 
-#: music-functions.scm:1433
+#: music-functions.scm:1436
 #, scheme-format
 msgid "Unknown octaveness type: ~S "
 msgstr ""
 
-#: music-functions.scm:1434
+#: music-functions.scm:1437
 msgid "Defaulting to 'any-octave."
 msgstr ""
 
-#: music-functions.scm:1826
+#: music-functions.scm:1829
 #, scheme-format
 msgid "unknown accidental style: ~S"
 msgstr ""
 
-#: music-functions.scm:2044
+#: music-functions.scm:2047
 msgid "Missing duration"
 msgstr ""
 
-#: music-functions.scm:2613
+#: music-functions.scm:2616
 #, scheme-format
 msgid "not a symbol list: ~a"
 msgstr ""
 
-#: music-functions.scm:2616
+#: music-functions.scm:2619
 #, scheme-format
 msgid "conflicting tag group ~a"
 msgstr ""
@@ -3779,23 +3779,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 ""