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

diff --git a/Documentation/web/news-headlines.itexi b/Documentation/web/news-headlines.itexi
index d40479e22163eedba4911c29ffb884292b74ea98..16750611446790922cc46699092a3d4ef4434369 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.62 released - @emph{June 10, 2017}}
+@ref{News, LilyPond 2.19.63 released - @emph{June 28, 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_002e62-released-June-10_002c-2017,
-  LilyPond 2.19.62 released - @emph{June 10, 2017}}
+@uref{news.html#LilyPond-2_002e19_002e63-released-June-28_002c-2017,
+  LilyPond 2.19.63 released - @emph{June 28, 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 bc7cdea2fe6d85c7db2ee5717ba042db009cc936..e4342d534f4f5789a2819a48dc5a6416e8a50baf 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.62 released  @emph{June 10, 2017}
+@subheading LilyPond 2.19.63 released  @emph{June 28, 2017}
 
 We are happy to announce the release of LilyPond
-2.19.62.  This release includes a number of enhancements, and contains some
+2.19.63.  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 436b1f553637ec68708b529703c024035ccd855b..8ed9bcabb3ae81dc9ee7e50b6cd20c6321544503 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.62 released  @emph{June 10, 2017}
+
+We are happy to announce the release of LilyPond
+2.19.62.  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.61 released  @emph{May 21, 2017}
 

diff --git a/VERSION b/VERSION
index 2f424f76a7fcdc917a089387957735ab8b0a6283..d16c4b7c6179336390f173384f5e6fe29e16924f 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -4,4 +4,4 @@ MINOR_VERSION=19
 PATCH_LEVEL=63
 MY_PATCH_LEVEL=
 VERSION_STABLE=2.18.2
-VERSION_DEVEL=2.19.62
+VERSION_DEVEL=2.19.63

diff --git a/ly/Welcome-to-LilyPond-MacOS.ly b/ly/Welcome-to-LilyPond-MacOS.ly
index 2a8f0e7594dcf271997b614772c795c076d89064..4eba11a1fdb2162c05d13467d48f4f194717d870 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.62"  % necessary for upgrading to future LilyPond versions.
+\version "2.19.63"  % 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 b3cbf95e7191653bbc460883a800389ea6325a75..edeed959da762b7ee304ee558032288280b5e1e6 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.62"  % necessary for upgrading to future LilyPond versions.
+\version "2.19.63"  % necessary for upgrading to future LilyPond versions.
 
 \header{
   title = "A scale in LilyPond"

diff --git a/po/lilypond.pot b/po/lilypond.pot
index 13c72abe5ba8e54085058383bd46136667a7e02a..10df1fca3071b45be8e2e6f811ff49184b7eef8c 100644 (file)
--- a/po/lilypond.pot
+++ b/po/lilypond.pot
@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: lilypond 2.19.62\n"
+"Project-Id-Version: lilypond 2.19.63\n"
 "Report-Msgid-Bugs-To: http://post.gmane.org/post.php?group=gmane.comp.gnu."
 "lilypond.bugs\n"
-"POT-Creation-Date: 2017-06-10 12:21+0100\n"
+"POT-Creation-Date: 2017-06-25 11:39+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"
@@ -2867,6 +2867,13 @@ msgstr ""
 msgid "FreeType face has no PostScript font name"
 msgstr ""
 
+#: pango-font.cc:410
+#, c-format
+msgid ""
+"OpenType font feature `%s' cannot be used since this binary is configured "
+"without feature support."
+msgstr ""
+
 #: paper-book.cc:200
 #, c-format
 msgid "program option -dprint-pages not supported by backend `%s'"
@@ -3159,7 +3166,7 @@ msgid "Grob count %d"
 msgstr ""
 
 #. TODO: Also print the arguments of the markup!
-#: text-interface.cc:140
+#: text-interface.cc:176
 #, c-format
 msgid "Markup depth exceeds maximal value of %d; Markup: %s"
 msgstr ""
@@ -3439,52 +3446,52 @@ msgstr ""
 msgid "end quote missing"
 msgstr ""
 
-#: lexer.ll:714
+#: lexer.ll:718
 msgid "EOF found inside a comment"
 msgstr ""
 
-#: lexer.ll:719
+#: lexer.ll:723
 msgid "EOF found inside string"
 msgstr ""
 
-#: lexer.ll:734
+#: lexer.ll:738
 msgid "Unfinished main input"
 msgstr ""
 
-#: lexer.ll:805
+#: lexer.ll:809
 #, c-format
 msgid "invalid character: `%s'"
 msgstr ""
 
-#: lexer.ll:925
+#: lexer.ll:946
 #, c-format
 msgid "unknown escaped string: `\\%s'"
 msgstr ""
 
-#: lexer.ll:945
+#: lexer.ll:966
 #, c-format
 msgid "undefined character or shorthand: %s"
 msgstr ""
 
-#: lexer.ll:1247
+#: lexer.ll:1268
 msgid "non-UTF-8 input"
 msgstr ""
 
-#: lexer.ll:1291
+#: lexer.ll:1312
 #, c-format
 msgid "Invalid version string \"%s\""
 msgstr ""
 
-#: lexer.ll:1296
+#: lexer.ll:1317
 #, c-format
 msgid "file too old: %s (oldest supported: %s)"
 msgstr ""
 
-#: lexer.ll:1297
+#: lexer.ll:1318
 msgid "consider updating the input with the convert-ly script"
 msgstr ""
 
-#: lexer.ll:1303
+#: lexer.ll:1324
 #, c-format
 msgid "program too old: %s (file requires: %s)"
 msgstr ""
@@ -3595,27 +3602,27 @@ msgstr ""
 msgid "no systems found in \\score markup, does it have a \\layout block?"
 msgstr ""
 
-#: define-markup-commands.scm:3127
+#: define-markup-commands.scm:3122
 #, scheme-format
 msgid "Cannot find glyph ~a"
 msgstr ""
 
-#: define-markup-commands.scm:3603
+#: define-markup-commands.scm:3598
 #, scheme-format
 msgid "no brace found for point size ~S "
 msgstr ""
 
-#: define-markup-commands.scm:3604
+#: define-markup-commands.scm:3599
 #, scheme-format
 msgid "defaulting to ~S pt"
 msgstr ""
 
-#: define-markup-commands.scm:3867
+#: define-markup-commands.scm:3862
 #, scheme-format
 msgid "not a valid duration string: ~a"
 msgstr ""
 
-#: define-markup-commands.scm:4080
+#: define-markup-commands.scm:4075
 #, scheme-format
 msgid "not a valid duration string: ~a - ignoring"
 msgstr ""