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

diff --git a/Documentation/web/news-front.itexi b/Documentation/web/news-front.itexi
index 298cbb6cb524faa248e93e351a3602b8e5d9c63e..30343fc9ce7bbb155d58bc0be73cacc32d844fc3 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.17.26 released!  @emph{September 8, 2013}
+@subsubheading LilyPond 2.17.27 released!  @emph{September 26, 2013}
 
-We are happy to announce the release of LilyPond 2.17.26.  This
+We are happy to announce the release of LilyPond 2.17.27.  This
 release contains the usual number of bugfixes and 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
@@ -19,22 +19,11 @@ a stable version of Lilypond, we recommend using the 2.16 version.
 
 @newsEnd
 
-@newsItem
-@subsubheading LilyPond blog moved!  @emph{June 29, 2013}
-
-The LilyPond blog, which was previously hosted on
-@uref{http://lilypondblog.wordpress.com/, wordpress.com}, has moved
-to a new domain: you can now find it at
-@uref{http://lilypondblog.org/, lilypondblog.org}!
-
-@newsEnd
-
 @newsItem
 @subsubheading LilyPond blog.  @emph{June 2, 2013}
 
-Janek Warchoł has created a LilyPond blog.  It's currently hosted on
-Wordpress - follow @uref{http://lilypondblog.wordpress.com/, this link} to read
-it and to contribute.
+Janek Warchoł has created a LilyPond blog.  You can find it at
+@uref{http://lilypondblog.org/, lilypondblog.org}!
 
 @newsEnd
 

diff --git a/Documentation/web/news.itexi b/Documentation/web/news.itexi
index d29081cf01593a851dce42a448e1a325814fbf9c..2d79ef7c8b757c460276b71c63b7e9d8e67132b1 100644 (file)
--- a/Documentation/web/news.itexi
+++ b/Documentation/web/news.itexi
@@ -26,6 +26,17 @@ NOTE:
   * don't duplicate entries from news-front.itexi
 @end ignore
 
+@newsItem
+@subsubheading LilyPond 2.17.26 released!  @emph{September 8, 2013}
+
+We are happy to announce the release of LilyPond 2.17.26.  This
+release contains the usual number of bugfixes and 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.16 version.
+
+@newsEnd
+
 @newsItem
 @subsubheading LilyPond 2.17.25 released!  @emph{August 25, 2013}
 

diff --git a/VERSION b/VERSION
index 3aa1a38adfdcc7e974b990e26c4fe5e6f15cbbfd..5b0ebcf25c7fddc1f21bcf3dccc045ebe7b5926d 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -4,4 +4,4 @@ MINOR_VERSION=17
 PATCH_LEVEL=27
 MY_PATCH_LEVEL=
 VERSION_STABLE=2.16.2
-VERSION_DEVEL=2.17.26
+VERSION_DEVEL=2.17.27

diff --git a/po/lilypond.pot b/po/lilypond.pot
index 5ac534a79387aeff51de06c939de7e8361a0b810..768359293aafd73d24a6b473ed488efd18020e50 100644 (file)
--- a/po/lilypond.pot
+++ b/po/lilypond.pot
@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: lilypond 2.17.26\n"
+"Project-Id-Version: lilypond 2.17.27\n"
 "Report-Msgid-Bugs-To: http://post.gmane.org/post.php?group=gmane.comp.gnu."
 "lilypond.bugs\n"
-"POT-Creation-Date: 2013-09-08 15:34+0100\n"
+"POT-Creation-Date: 2013-09-26 11:41+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"
@@ -775,10 +775,16 @@ msgstr ""
 msgid "beamExceptions controls whole-measure beaming."
 msgstr ""
 
-#: convertrules.py:3584
+#: convertrules.py:3606
 msgid "Flag.transparent and Flag.color inherit from Stem"
 msgstr ""
 
+#: convertrules.py:3672
+msgid ""
+"Staff-padding now controls the distance to the baseline, not the nearest "
+"point."
+msgstr ""
+
 #: fontextract.py:25
 #, python-format
 msgid "Scanning %s"
@@ -1720,19 +1726,19 @@ msgstr ""
 msgid "already have a beam"
 msgstr ""
 
-#: beam-engraver.cc:231
+#: beam-engraver.cc:235
 msgid "unterminated beam"
 msgstr ""
 
-#: beam-engraver.cc:270 chord-tremolo-engraver.cc:149
+#: beam-engraver.cc:282 chord-tremolo-engraver.cc:149
 msgid "stem must have Rhythmic structure"
 msgstr ""
 
-#: beam-engraver.cc:281
+#: beam-engraver.cc:293
 msgid "stem does not fit in beam"
 msgstr ""
 
-#: beam-engraver.cc:282
+#: beam-engraver.cc:294
 msgid "beam was started here"
 msgstr ""
 
@@ -1820,6 +1826,11 @@ msgstr ""
 msgid "cannot find or create: `%s'"
 msgstr ""
 
+#: context.cc:439
+#, c-format
+msgid "cannot find or create new Bottom = \"%s\""
+msgstr ""
+
 #: custos.cc:87
 #, c-format
 msgid "custos `%s' not found"
@@ -3118,108 +3129,108 @@ msgstr ""
 msgid "Too much lookahead"
 msgstr ""
 
-#: parser.yy:458 parser.yy:756 parser.yy:823
+#: parser.yy:458 parser.yy:759 parser.yy:825
 msgid "bad expression type"
 msgstr ""
 
-#: parser.yy:652 parser.yy:1151
+#: parser.yy:657 parser.yy:1153
 msgid "not a context mod"
 msgstr ""
 
-#: parser.yy:858
+#: parser.yy:860
 msgid "score expected"
 msgstr ""
 
-#: parser.yy:874
+#: parser.yy:876
 msgid "\\paper cannot be used in \\score, use \\layout instead"
 msgstr ""
 
-#: parser.yy:898
+#: parser.yy:900
 msgid "need \\paper for paper block"
 msgstr ""
 
-#: parser.yy:1046 parser.yy:1068
+#: parser.yy:1040 parser.yy:1062
 msgid "unexpected post-event"
 msgstr ""
 
-#: parser.yy:1076
+#: parser.yy:1070
 msgid "Ignoring non-music expression"
 msgstr ""
 
-#: parser.yy:1087 parser.yy:2373
+#: parser.yy:1081 parser.yy:2380
 msgid "music expected"
 msgstr ""
 
-#: parser.yy:1355
+#: parser.yy:1362
 msgid "not a symbol"
 msgstr ""
 
-#: parser.yy:2044 parser.yy:2158 parser.yy:2171 parser.yy:2180
+#: parser.yy:2051 parser.yy:2165 parser.yy:2178 parser.yy:2187
 msgid "bad grob property path"
 msgstr ""
 
-#: parser.yy:2138
+#: parser.yy:2145
 msgid "only \\consists and \\remove take non-string argument."
 msgstr ""
 
-#: parser.yy:2199
+#: parser.yy:2206
 msgid "bad context property path"
 msgstr ""
 
-#: parser.yy:2300
+#: parser.yy:2307
 msgid "simple string expected"
 msgstr ""
 
-#: parser.yy:2318
+#: parser.yy:2325
 msgid "symbol expected"
 msgstr ""
 
-#: parser.yy:2482
+#: parser.yy:2489
 msgid "not a rhythmic event"
 msgstr ""
 
-#: parser.yy:2556
+#: parser.yy:2563
 msgid "post-event expected"
 msgstr ""
 
-#: parser.yy:2565 parser.yy:2570
+#: parser.yy:2572 parser.yy:2577
 msgid "have to be in Lyric mode for lyrics"
 msgstr ""
 
-#: parser.yy:2638
+#: parser.yy:2645
 msgid "expecting string as script definition"
 msgstr ""
 
-#: parser.yy:2733
+#: parser.yy:2740
 msgid "not an articulation"
 msgstr ""
 
-#: parser.yy:2805 parser.yy:2851
+#: parser.yy:2812 parser.yy:2858
 #, c-format
 msgid "not a duration: %d"
 msgstr ""
 
-#: parser.yy:2868
+#: parser.yy:2875
 msgid "bass number expected"
 msgstr ""
 
-#: parser.yy:2967
+#: parser.yy:2974
 msgid "have to be in Note mode for notes"
 msgstr ""
 
-#: parser.yy:3026
+#: parser.yy:3033
 msgid "have to be in Chord mode for chords"
 msgstr ""
 
-#: parser.yy:3041
+#: parser.yy:3048
 msgid "markup outside of text script or \\lyricmode"
 msgstr ""
 
-#: parser.yy:3046
+#: parser.yy:3053
 msgid "unrecognized string, not in text script or \\lyricmode"
 msgstr ""
 
-#: parser.yy:3254
+#: parser.yy:3261
 msgid "not a markup"
 msgstr ""
 
@@ -3277,35 +3288,35 @@ msgstr ""
 msgid "Unfinished main input"
 msgstr ""
 
-#: lexer.ll:804
+#: lexer.ll:805
 #, c-format
 msgid "invalid character: `%s'"
 msgstr ""
 
-#: lexer.ll:931
+#: lexer.ll:934
 #, c-format
 msgid "unknown escaped string: `\\%s'"
 msgstr ""
 
-#: lexer.ll:951
+#: lexer.ll:954
 #, c-format
 msgid "undefined character or shorthand: %s"
 msgstr ""
 
-#: lexer.ll:1247
+#: lexer.ll:1250
 msgid "non-UTF-8 input"
 msgstr ""
 
-#: lexer.ll:1291
+#: lexer.ll:1294
 #, c-format
 msgid "file too old: %s (oldest supported: %s)"
 msgstr ""
 
-#: lexer.ll:1292
+#: lexer.ll:1295
 msgid "consider updating the input with the convert-ly script"
 msgstr ""
 
-#: lexer.ll:1298
+#: lexer.ll:1301
 #, c-format
 msgid "program too old: %s (file requires: %s)"
 msgstr ""
@@ -3715,34 +3726,34 @@ msgstr ""
 msgid "bad grob property path ~a"
 msgstr ""
 
-#: music-functions.scm:755
+#: music-functions.scm:753
 msgid "Bad chord repetition"
 msgstr ""
 
-#: music-functions.scm:790
+#: music-functions.scm:788
 #, scheme-format
 msgid "music expected: ~S"
 msgstr ""
 
-#: music-functions.scm:1133
+#: music-functions.scm:1144
 #, scheme-format
 msgid "cannot find quoted music: `~S'"
 msgstr ""
 
-#: music-functions.scm:1271
+#: music-functions.scm:1282
 msgid "Add @var{octave-shift} to the octave of @var{pitch}."
 msgstr ""
 
-#: music-functions.scm:1331
+#: music-functions.scm:1342
 #, scheme-format
 msgid "Unknown octaveness type: ~S "
 msgstr ""
 
-#: music-functions.scm:1332
+#: music-functions.scm:1343
 msgid "Defaulting to 'any-octave."
 msgstr ""
 
-#: music-functions.scm:1677
+#: music-functions.scm:1688
 #, scheme-format
 msgid "unknown accidental style: ~S"
 msgstr ""