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

diff --git a/Documentation/web/news-headlines.itexi b/Documentation/web/news-headlines.itexi
index 8dff7d4e837955039372af63c5ef4611d4db4021..3373c5a0e2422e75941f74b5c3dffb2d910e39d8 100644 (file)
--- a/Documentation/web/news-headlines.itexi
+++ b/Documentation/web/news-headlines.itexi
@@ -11,7 +11,7 @@
 @ifclear web_version
   @c no anchor links, just link to News page
 
-@ref{News, LilyPond 2.19.58 released - @emph{March 26, 2017}}
+@ref{News, LilyPond 2.19.59 released - @emph{April 09, 2017}}
 
 @ref{News, Two LilyPond projects in Google Summer of Code 2016 - @emph{April 23, 2016}}
 
@@ -23,8 +23,8 @@
 @ifset web_version
   @c anchor links, link to individual news items by their <a> tag
 
-@uref{news.html#LilyPond-2_002e19_002e58-released-March-26_002c-2017,
-  LilyPond 2.19.58 released - @emph{March 26, 2017}}
+@uref{news.html#LilyPond-2_002e19_002e59-released-April-09_002c-2017,
+  LilyPond 2.19.59 released - @emph{April 09, 2017}}
 
 @uref{news.html#Two-LilyPond-projects-in-Google-Summer-of-Code-2016-April-23_002c-2016,
   Two LilyPond projects in Google Summer of Code 2016 - @emph{April 23, 2016}}

diff --git a/Documentation/web/news-new.itexi b/Documentation/web/news-new.itexi
index c20370a91b3d59596ce8b4759ca572a4ea1d0d29..0fd7af19a8617690cbc70dfaeeb3cb6c53708fe4 100644 (file)
--- a/Documentation/web/news-new.itexi
+++ b/Documentation/web/news-new.itexi
@@ -9,10 +9,10 @@
 @c used for news about the upcoming release; see CG on Release Work
 
 @newsItem
-@subheading LilyPond 2.19.58 released  @emph{March 26, 2017}
+@subheading LilyPond 2.19.59 released  @emph{April 09, 2017}
 
 We are happy to announce the release of LilyPond
-2.19.58.  This release includes a number of enhancements, and contains some
+2.19.59.  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

diff --git a/Documentation/web/news-old.itexi b/Documentation/web/news-old.itexi
index 8219c23c879518c552c9a9f2aa569af653813581..e8116edb54cbdd99a0c0665bb33e2bf494e24838 100644 (file)
--- a/Documentation/web/news-old.itexi
+++ b/Documentation/web/news-old.itexi
@@ -26,6 +26,18 @@ NOTE:
   * don't duplicate entries from news-new.itexi
 @end ignore
 
+@newsItem
+@subheading LilyPond 2.19.58 released  @emph{March 26, 2017}
+
+We are happy to announce the release of LilyPond
+2.19.58.  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
 @subheading LilyPond 2.19.57 released  @emph{March 12, 2017}
 

diff --git a/VERSION b/VERSION
index d4b2aa989e9d81eb8c152a75f8d57b60ed156d56..e454fd600d4e9ee777e706aa0ddaa220d0008f2d 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -4,4 +4,4 @@ MINOR_VERSION=19
 PATCH_LEVEL=59
 MY_PATCH_LEVEL=
 VERSION_STABLE=2.18.2
-VERSION_DEVEL=2.19.58
+VERSION_DEVEL=2.19.59

diff --git a/ly/Welcome-to-LilyPond-MacOS.ly b/ly/Welcome-to-LilyPond-MacOS.ly
index 1cb10f1e666fe99cadea5bd67de1ac4cb29b199b..3d9dddac34d9abfad4e9377358fcfa6ba352ca24 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.58"  % necessary for upgrading to future LilyPond versions.
+\version "2.19.59"  % 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 5d18550614bbc44662e7d47dffba869d694806d0..1118dae394a25f4f6449a4e6652eeb1c4a6e616a 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.58"  % necessary for upgrading to future LilyPond versions.
+\version "2.19.59"  % necessary for upgrading to future LilyPond versions.
 
 \header{
   title = "A scale in LilyPond"

diff --git a/po/lilypond.pot b/po/lilypond.pot
index b00ea2765c2e1c239cb089bc6da73ebc5e1136fa..d2573e74dc4bb5803344bb34220ebc5167c7d350 100644 (file)
--- a/po/lilypond.pot
+++ b/po/lilypond.pot
@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: lilypond 2.19.58\n"
+"Project-Id-Version: lilypond 2.19.59\n"
 "Report-Msgid-Bugs-To: http://post.gmane.org/post.php?group=gmane.comp.gnu."
 "lilypond.bugs\n"
-"POT-Creation-Date: 2017-03-26 11:21+0100\n"
+"POT-Creation-Date: 2017-04-09 11: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"
@@ -2506,12 +2506,11 @@ msgstr ""
 msgid "exception caught: %s"
 msgstr ""
 
-#. FIXME: constant error message.
-#: mark-engraver.cc:150
+#: mark-engraver.cc:152
 msgid "rehearsalMark must have integer value"
 msgstr ""
 
-#: mark-engraver.cc:156
+#: mark-engraver.cc:158
 msgid "mark label must be a markup object"
 msgstr ""
 
@@ -3873,29 +3872,29 @@ msgstr ""
 msgid "Compilation completed with warnings or errors"
 msgstr ""
 
-#: lily.scm:1002
+#: lily.scm:1006
 #, scheme-format
 msgid "job ~a terminated with signal: ~a"
 msgstr ""
 
-#: lily.scm:1005
+#: lily.scm:1009
 #, scheme-format
 msgid ""
 "logfile ~a (exit ~a):\n"
 "~a"
 msgstr ""
 
-#: lily.scm:1027 lily.scm:1116
+#: lily.scm:1031 lily.scm:1120
 #, scheme-format
 msgid "failed files: ~S"
 msgstr ""
 
-#: lily.scm:1107
+#: lily.scm:1111
 #, scheme-format
 msgid "Redirecting output to ~a..."
 msgstr ""
 
-#: lily.scm:1126
+#: lily.scm:1130
 #, scheme-format
 msgid "Invoking `~a'...\n"
 msgstr ""