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

diff --git a/Documentation/web/news-front.itexi b/Documentation/web/news-front.itexi
index 645364afe8790cffc79bb441fac5dc25d63d45b6..ab79612188cebb7bdbba4dc336d9c67f2cfdf0b2 100644 (file)
--- a/Documentation/web/news-front.itexi
+++ b/Documentation/web/news-front.itexi
@@ -9,10 +9,10 @@
 @c used for news about the upcoming release; see CG on Release Work
 
 @newsItem
-@subheading LilyPond 2.19.49 released  @emph{October 16, 2016}
+@subheading LilyPond 2.19.50 released  @emph{November 6, 2016}
 
 We are happy to announce the release of LilyPond
-2.19.49.  This release includes a number of enhancements, and contains some
+2.19.50.  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-headlines.itexi b/Documentation/web/news-headlines.itexi
index 469eda1c347e4c829983d64fcaa47976463d3dd4..b844a98718a2820b8b610a800950f902ff8fabba 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.49 released - @emph{October 16, 2016}}
+@ref{News, LilyPond 2.19.50 released - @emph{November 6, 2016}}
 
 @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_002e49-released-October-16_002c-2016,
-  LilyPond 2.19.49 released - @emph{October 16, 2016}}
+@uref{news.html#LilyPond-2_002e19_002e50-released-November-6_002c-2016,
+  LilyPond 2.19.50 released - @emph{November 6, 2016}}
 
 @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.itexi b/Documentation/web/news.itexi
index 655c04f9ca7bd71d7de0d7e12b3b7c2335e2e657..eef54f95e170638a32c18a0aa9698ebbe7994c4a 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
+@subheading LilyPond 2.19.49 released  @emph{October 16, 2016}
+
+We are happy to announce the release of LilyPond
+2.19.49.  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.48 released  @emph{September 13, 2016}
 

diff --git a/VERSION b/VERSION
index 684c94d71b50030150751f515ee0c1fc255a3a34..7792680d5768eb8af8e681372e3da6219fec7ed7 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -4,4 +4,4 @@ MINOR_VERSION=19
 PATCH_LEVEL=50
 MY_PATCH_LEVEL=
 VERSION_STABLE=2.18.2
-VERSION_DEVEL=2.19.49
+VERSION_DEVEL=2.19.50

diff --git a/ly/Welcome-to-LilyPond-MacOS.ly b/ly/Welcome-to-LilyPond-MacOS.ly
index 2b11d39d38b937a0c954a281db4e147d3083111a..6bdccfbebdbff62edd7baaf1fff89d0dc1c01235 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.49"  % necessary for upgrading to future LilyPond versions.
+\version "2.19.50"  % 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 176075cd5c4423f8239b9ae99d00c249a533e6ed..922e6384241a2055f7d4b3b9abac36e642570098 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.49"  % necessary for upgrading to future LilyPond versions.
+\version "2.19.50"  % necessary for upgrading to future LilyPond versions.
 
 \header{
   title = "A scale in LilyPond"

diff --git a/po/lilypond.pot b/po/lilypond.pot
index 33764d1f88d9ba0365249bdd1f4c729973ed70db..544e07ecbd3d0fae19cbea753bcfc7553df5b0b4 100644 (file)
--- a/po/lilypond.pot
+++ b/po/lilypond.pot
@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: lilypond 2.19.49\n"
+"Project-Id-Version: lilypond 2.19.50\n"
 "Report-Msgid-Bugs-To: http://post.gmane.org/post.php?group=gmane.comp.gnu."
 "lilypond.bugs\n"
-"POT-Creation-Date: 2016-10-16 11:55+0100\n"
+"POT-Creation-Date: 2016-11-06 11:23+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"
@@ -2629,12 +2629,12 @@ msgid "NoteEvent without pitch"
 msgstr ""
 
 #: open-type-font-scheme.cc:149 open-type-font-scheme.cc:195
-#: open-type-font-scheme.cc:241 pfb-scheme.cc:62 ttf.cc:512 ttf.cc:561
+#: open-type-font-scheme.cc:241 pfb-scheme.cc:60 ttf.cc:512 ttf.cc:561
 msgid "font index must be non-negative, using index 0"
 msgstr ""
 
 #: open-type-font-scheme.cc:163 open-type-font-scheme.cc:209
-#: open-type-font-scheme.cc:289 pfb-scheme.cc:77 ttf.cc:480 ttf.cc:528
+#: open-type-font-scheme.cc:289 pfb-scheme.cc:75 ttf.cc:480 ttf.cc:528
 #, c-format
 msgid "font index %d too large for font `%s', using index 0"
 msgstr ""
@@ -2923,6 +2923,18 @@ msgstr ""
 msgid "MIDI output to `%s'..."
 msgstr ""
 
+#: pfb.cc:45
+msgid "Segment header of the Type 1 (PFB) font is broken."
+msgstr ""
+
+#: pfb.cc:59
+msgid "Segment length of the Type 1 (PFB) font is too long."
+msgstr ""
+
+#: pfb.cc:86
+msgid "Segment type of the Type 1 (PFB) font is unknown."
+msgstr ""
+
 #: piano-pedal-engraver.cc:276
 #, c-format
 msgid "expect 3 strings for piano pedals, found: %ld"
@@ -3597,12 +3609,12 @@ msgstr ""
 msgid "defaulting to ~S pt"
 msgstr ""
 
-#: define-markup-commands.scm:3857
+#: define-markup-commands.scm:3858
 #, scheme-format
 msgid "not a valid duration string: ~a"
 msgstr ""
 
-#: define-markup-commands.scm:4070
+#: define-markup-commands.scm:4071
 #, scheme-format
 msgid "not a valid duration string: ~a - ignoring"
 msgstr ""
@@ -3651,27 +3663,27 @@ msgstr ""
 msgid "unknown Grob interface: ~S"
 msgstr ""
 
-#: documentation-lib.scm:62
+#: documentation-lib.scm:61
 #, scheme-format
 msgid "Processing ~S..."
 msgstr ""
 
-#: documentation-lib.scm:178
+#: documentation-lib.scm:177
 #, scheme-format
 msgid "Writing ~S..."
 msgstr ""
 
-#: documentation-lib.scm:190
+#: documentation-lib.scm:189
 #, scheme-format
 msgid "cannot find description for property `~S' (~S)"
 msgstr ""
 
-#: documentation-lib.scm:211
+#: documentation-lib.scm:210
 #, scheme-format
 msgid "cannot find description for property ~S (~S)"
 msgstr ""
 
-#: flag-styles.scm:155
+#: flag-styles.scm:154
 #, scheme-format
 msgid "flag stroke `~a' or `~a' not found"
 msgstr ""
@@ -3914,7 +3926,7 @@ msgstr ""
 msgid "negative replication count; ignoring"
 msgstr ""
 
-#: modal-transforms.scm:289
+#: modal-transforms.scm:287
 msgid "Dangling tie in \\retrograde"
 msgstr ""
 
@@ -3983,12 +3995,12 @@ msgstr ""
 msgid "Missing duration"
 msgstr ""
 
-#: music-functions.scm:2635
+#: music-functions.scm:2620
 #, scheme-format
 msgid "not a symbol list: ~a"
 msgstr ""
 
-#: music-functions.scm:2638
+#: music-functions.scm:2623
 #, scheme-format
 msgid "conflicting tag group ~a"
 msgstr ""