From: Phil Holmes Date: Tue, 9 May 2017 10:07:39 +0000 (+0100) Subject: Merge remote-tracking branch 'origin/release/unstable' into HEAD X-Git-Url: https://git.donarmstrong.com/?p=lilypond.git;a=commitdiff_plain;h=024c0e02b523df0f1de0203cae949c3ad864d26c;hp=f93965bd56355b8fb01dbfdea8ec2001bfc9d2c2 Merge remote-tracking branch 'origin/release/unstable' into HEAD --- diff --git a/Documentation/web/news-headlines.itexi b/Documentation/web/news-headlines.itexi index 3373c5a0e2..ec6bbc8b6a 100644 --- 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.59 released - @emph{April 09, 2017}} +@ref{News, LilyPond 2.19.60 released - @emph{May 08, 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 tag -@uref{news.html#LilyPond-2_002e19_002e59-released-April-09_002c-2017, - LilyPond 2.19.59 released - @emph{April 09, 2017}} +@uref{news.html#LilyPond-2_002e19_002e60-released-May-08_002c-2017, + LilyPond 2.19.60 released - @emph{May 08, 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 0fd7af19a8..65383474ac 100644 --- 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.59 released @emph{April 09, 2017} +@subheading LilyPond 2.19.60 released @emph{May 08, 2017} We are happy to announce the release of LilyPond -2.19.59. This release includes a number of enhancements, and contains some +2.19.60. 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 e8116edb54..17b31caf53 100644 --- 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.59 released @emph{April 09, 2017} + +We are happy to announce the release of LilyPond +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 +version. + +@newsEnd + @newsItem @subheading LilyPond 2.19.58 released @emph{March 26, 2017} diff --git a/VERSION b/VERSION index f1f40c7d2b..9043b60ff1 100644 --- a/VERSION +++ b/VERSION @@ -4,4 +4,4 @@ MINOR_VERSION=19 PATCH_LEVEL=60 MY_PATCH_LEVEL= VERSION_STABLE=2.18.2 -VERSION_DEVEL=2.19.59 +VERSION_DEVEL=2.19.60 diff --git a/ly/Welcome-to-LilyPond-MacOS.ly b/ly/Welcome-to-LilyPond-MacOS.ly index 3d9dddac34..28f7a8443e 100644 --- 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.59" % necessary for upgrading to future LilyPond versions. +\version "2.19.60" % 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 1118dae394..cee729e18e 100644 --- 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.59" % necessary for upgrading to future LilyPond versions. +\version "2.19.60" % necessary for upgrading to future LilyPond versions. \header{ title = "A scale in LilyPond" diff --git a/po/lilypond.pot b/po/lilypond.pot index d2573e74dc..8d8c78a691 100644 --- a/po/lilypond.pot +++ b/po/lilypond.pot @@ -6,10 +6,10 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: lilypond 2.19.59\n" +"Project-Id-Version: lilypond 2.19.60\n" "Report-Msgid-Bugs-To: http://post.gmane.org/post.php?group=gmane.comp.gnu." "lilypond.bugs\n" -"POT-Creation-Date: 2017-04-09 11:00+0100\n" +"POT-Creation-Date: 2017-05-07 11:40+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1870,20 +1870,15 @@ msgstr "" msgid "cannot find context to switch to" msgstr "" -#. No enclosing context was found because the iterator's immediate -#. context is the kind that was sought. -#. We could change the current translator's id, but that would make -#. errors hard to catch. -#. -#. last->translator_id_string () = get_change -#. ()->change_to_id_string (); -#: change-iterator.cc:78 +#. No enclosing context of the right kind was found +#. and the iterator's immediate context is the kind that was sought. +#: change-iterator.cc:74 #, c-format msgid "not changing to same context type: %s" msgstr "" #. FIXME: incomprehensible message -#: change-iterator.cc:82 +#: change-iterator.cc:78 msgid "none of these in my family" msgstr "" @@ -3281,120 +3276,124 @@ msgstr "" msgid "giving up" msgstr "" -#: parser.yy:482 parser.yy:649 parser.yy:988 parser.yy:1069 parser.yy:1305 +#: parser.yy:485 parser.yy:652 parser.yy:992 parser.yy:1073 parser.yy:1309 msgid "bad expression type" msgstr "" -#: parser.yy:901 parser.yy:1508 parser.yy:1570 +#: parser.yy:905 parser.yy:1512 parser.yy:1574 msgid "not a context mod" msgstr "" -#: parser.yy:982 parser.yy:1061 parser.yy:1213 +#: parser.yy:986 parser.yy:1065 parser.yy:1217 msgid "need \\paper for paper block" msgstr "" -#: parser.yy:1095 +#: parser.yy:1099 msgid "Missing music in \\score" msgstr "" -#: parser.yy:1132 +#: parser.yy:1136 msgid "\\paper cannot be used in \\score, use \\layout instead" msgstr "" -#: parser.yy:1183 +#: parser.yy:1187 msgid "Spurious expression in \\score" msgstr "" -#: parser.yy:1387 +#: parser.yy:1391 msgid "music expected" msgstr "" -#: parser.yy:1397 parser.yy:1431 +#: parser.yy:1401 parser.yy:1435 msgid "unexpected post-event" msgstr "" -#: parser.yy:1439 +#: parser.yy:1443 msgid "Ignoring non-music expression" msgstr "" -#: parser.yy:1749 parser.yy:1768 +#: parser.yy:1754 parser.yy:1775 msgid "not a key" msgstr "" -#: parser.yy:2628 parser.yy:2746 parser.yy:2759 parser.yy:2768 +#: parser.yy:2685 parser.yy:2806 parser.yy:2819 parser.yy:2828 msgid "bad grob property path" msgstr "" -#: parser.yy:2726 +#: parser.yy:2786 msgid "only \\consists and \\remove take non-string argument." msgstr "" -#: parser.yy:2787 +#: parser.yy:2847 msgid "bad context property path" msgstr "" -#: parser.yy:2872 +#: parser.yy:2934 msgid "markup expected" msgstr "" -#: parser.yy:2884 +#: parser.yy:2947 msgid "simple string expected" msgstr "" -#: parser.yy:2901 +#: parser.yy:2960 parser.yy:2970 msgid "symbol expected" msgstr "" -#: parser.yy:3041 +#: parser.yy:3110 msgid "not a rhythmic event" msgstr "" -#: parser.yy:3091 +#: parser.yy:3160 msgid "post-event expected" msgstr "" -#: parser.yy:3100 parser.yy:3105 +#: parser.yy:3169 parser.yy:3174 msgid "have to be in Lyric mode for lyrics" msgstr "" -#: parser.yy:3181 +#: parser.yy:3250 msgid "expecting string or post-event as script definition" msgstr "" -#: parser.yy:3285 +#: parser.yy:3361 msgid "not an articulation" msgstr "" -#: parser.yy:3351 parser.yy:3403 +#: parser.yy:3427 parser.yy:3479 msgid "not a duration" msgstr "" -#: parser.yy:3424 +#: parser.yy:3501 msgid "bass number expected" msgstr "" -#: parser.yy:3516 +#: parser.yy:3593 msgid "have to be in Note mode for notes" msgstr "" -#: parser.yy:3555 +#: parser.yy:3632 msgid "have to be in Chord mode for chords" msgstr "" -#: parser.yy:3598 +#: parser.yy:3675 msgid "markup outside of text script or \\lyricmode" msgstr "" -#: parser.yy:3603 +#: parser.yy:3680 #, c-format msgid "not a note name: %s" msgstr "" -#: parser.yy:3755 parser.yy:3764 +#: parser.yy:3685 +msgid "string outside of text script or \\lyricmode" +msgstr "" + +#: parser.yy:3837 parser.yy:3846 msgid "not an unsigned integer" msgstr "" -#: parser.yy:3851 +#: parser.yy:3933 msgid "not a markup" msgstr "" @@ -3467,25 +3466,25 @@ msgstr "" msgid "undefined character or shorthand: %s" msgstr "" -#: lexer.ll:1236 +#: lexer.ll:1247 msgid "non-UTF-8 input" msgstr "" -#: lexer.ll:1280 +#: lexer.ll:1291 #, c-format msgid "Invalid version string \"%s\"" msgstr "" -#: lexer.ll:1285 +#: lexer.ll:1296 #, c-format msgid "file too old: %s (oldest supported: %s)" msgstr "" -#: lexer.ll:1286 +#: lexer.ll:1297 msgid "consider updating the input with the convert-ly script" msgstr "" -#: lexer.ll:1292 +#: lexer.ll:1303 #, c-format msgid "program too old: %s (file requires: %s)" msgstr "" @@ -3504,34 +3503,34 @@ msgstr "" msgid "`~a' failed (~a)\n" msgstr "" -#: backend-library.scm:108 +#: backend-library.scm:109 #, 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:118 +#: backend-library.scm:119 #, scheme-format msgid "Converting to ~a..." msgstr "" -#: backend-library.scm:134 +#: backend-library.scm:135 #, scheme-format msgid "Copying to `~a'...\n" msgstr "" -#: backend-library.scm:200 +#: backend-library.scm:201 #, scheme-format msgid "Deleting `~a'...\n" msgstr "" -#: backend-library.scm:219 +#: backend-library.scm:220 #, scheme-format msgid "Writing header field `~a' to `~a'..." msgstr "" -#: backend-library.scm:268 +#: backend-library.scm:269 #, scheme-format msgid "missing stencil expression `~S'" msgstr "" @@ -3611,12 +3610,12 @@ msgstr "" msgid "defaulting to ~S pt" msgstr "" -#: define-markup-commands.scm:3863 +#: define-markup-commands.scm:3867 #, scheme-format msgid "not a valid duration string: ~a" msgstr "" -#: define-markup-commands.scm:4076 +#: define-markup-commands.scm:4080 #, scheme-format msgid "not a valid duration string: ~a - ignoring" msgstr "" @@ -3777,7 +3776,7 @@ msgstr "" msgid "Font export directory `~a' already exists." msgstr "" -#: framework-ps.scm:901 +#: framework-ps.scm:907 msgid "" "\n" "The PostScript backend does not support the\n" @@ -3985,44 +3984,53 @@ msgstr "" msgid "Bad chord repetition" msgstr "" -#: music-functions.scm:966 +#: music-functions.scm:968 +#, scheme-format +msgid "Bad voice id: ~a" +msgstr "" + +#: music-functions.scm:979 +msgid "\\voices needs more ids" +msgstr "" + +#: music-functions.scm:998 #, scheme-format msgid "music expected: ~S" msgstr "" -#: music-functions.scm:1316 +#: music-functions.scm:1348 #, scheme-format msgid "cannot find quoted music: `~S'" msgstr "" -#: music-functions.scm:1453 +#: music-functions.scm:1485 msgid "Add @var{octave-shift} to the octave of @var{pitch}." msgstr "" -#: music-functions.scm:1516 +#: music-functions.scm:1548 #, scheme-format msgid "Unknown octaveness type: ~S " msgstr "" -#: music-functions.scm:1517 +#: music-functions.scm:1549 msgid "Defaulting to 'any-octave." msgstr "" -#: music-functions.scm:1916 +#: music-functions.scm:1948 #, scheme-format msgid "unknown accidental style: ~S" msgstr "" -#: music-functions.scm:2141 +#: music-functions.scm:2173 msgid "Missing duration" msgstr "" -#: music-functions.scm:2662 +#: music-functions.scm:2694 #, scheme-format msgid "not a symbol list: ~a" msgstr "" -#: music-functions.scm:2665 +#: music-functions.scm:2697 #, scheme-format msgid "conflicting tag group ~a" msgstr ""