From 2f1263e2ccdddcac2eb9f7d8ce2ed92867d3d160 Mon Sep 17 00:00:00 2001 From: Don Armstrong Date: Wed, 24 Apr 2013 21:51:51 -0700 Subject: [PATCH] Imported Upstream version 2.16.2 --- Documentation/web/news-front.itexi | 53 +++--- Documentation/web/news.itexi | 214 +++++++++++++++++++++++++ VERSION | 6 +- out/ChangeLog | 2 +- out/RELEASE-COMMIT | 164 +++++++++---------- po/lilypond.pot | 48 +++--- python/auxiliar/postprocess_html.py | 18 ++- python/lilylib.py | 9 +- scripts/build/bib2texi.py | 12 +- scripts/build/create-version-itexi.py | 8 +- scripts/build/create-weblinks-itexi.py | 44 +++-- scripts/build/lys-to-tely.py | 9 +- scripts/build/output-distance.py | 3 + scripts/build/website_post.py | 8 +- scripts/build/www_post.py | 9 +- 15 files changed, 443 insertions(+), 164 deletions(-) diff --git a/Documentation/web/news-front.itexi b/Documentation/web/news-front.itexi index 2d0a892fbe..0de5407942 100644 --- a/Documentation/web/news-front.itexi +++ b/Documentation/web/news-front.itexi @@ -9,17 +9,17 @@ @c used for news about the upcoming release; see CG 10.2 @newsItem -@subsubheading LilyPond 2.16.1 released! @emph{November 9, 2012} +@subsubheading LilyPond 2.16.2 released! @emph{January 4, 2013} -We are happy to announce the release of LilyPond 2.16.1. This has a number of -updates to the previous stable version, and should cause no problems. We -recommend that everybody upgrade to this version. +We are happy to announce the release of LilyPond 2.16.2. This release is mainly +to correct a problem with lilypond-book running on Windows. We recommend that +only people requiring this functionality upgrade to this version. @newsEnd @newsItem -@subsubheading LilyPond 2.17.6 released! @emph{November 3, 2012} +@subsubheading LilyPond 2.17.9 released! @emph{December 15, 2012} -We are happy to announce the release of LilyPond 2.17.6. This +We are happy to announce the release of LilyPond 2.17.9. 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 @@ -28,30 +28,41 @@ a stable version of Lilypond, we recommend using the 2.16 version. @newsEnd @newsItem -@subsubheading LilyPond 2.17.5 released! @emph{October 20, 2012} - -We are happy to announce the release of LilyPond 2.17.5. 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. - +@subsubheading The LilyPond Report #28. @emph{November 12, 2012} + +The @uref{http://news.lilynet.net/?The-LilyPond-Report-28, October +issue of the @emph{LilyPond Report}} focuses on the +@uref{http://news.lilynet.net/?LilyPond-meeting-in-Waltrop, +meeting of LilyPond developers and users} in Waltrop, Germany last +August. Of course, there are also some musings on LilyPond +triggered by the release of 2.16.0 and 2.17.0 occuring from that +venue. + +There are also two monthly financial reports from David Kastrup +whose work on LilyPond is +@uref{http://news.lilynet.net/?The-LilyPond-Report-24#an_urgent_request_for_funding, +solely paid for} by financial contributions from other developer +and users (thank you!), and a report about experiences from +@uref{http://scorio.com, a web-based music typesetting service} +using LilyPond internally. + +Come @uref{http://news.lilynet.net/?The-LilyPond-Report-28, read +LilyPond Report 28} now; comments and contributions are warmly +encouraged! @newsEnd @newsItem -@subsubheading LilyPond 2.17.4 released! @emph{October 6, 2012} - -We are happy to announce the release of LilyPond 2.17.4. This -release contains the usual number of bugfixes. It is strongly -recommended that normal users do @strong{not} use this release, -and instead use the stable 2.16 version. +@subsubheading LilyPond 2.16.1 released! @emph{November 9, 2012} +We are happy to announce the release of LilyPond 2.16.1. This has a number of +updates to the previous stable version, and should cause no problems. We +recommend that everybody upgrade to this version. @newsEnd @newsItem @subsubheading Lilypond 2.16.0 released! @emph{August 24, 2012} -We are proud to announce the release of GNU LilyPond 2.16.0. +We are proud to announce the release of GNU LilyPond 2.16.1. LilyPond is a music engraving program, devoted to producing the highest-quality sheet music possible. It brings the aesthetics of traditionally engraved music to computer printouts. diff --git a/Documentation/web/news.itexi b/Documentation/web/news.itexi index 0a21c0de22..1331adfcf2 100644 --- a/Documentation/web/news.itexi +++ b/Documentation/web/news.itexi @@ -27,6 +27,220 @@ NOTE: @end ignore +@newsItem +@subsubheading LilyPond 2.17.8 released! @emph{December 1, 2012} + +We are happy to announce the release of LilyPond 2.17.8. 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.7 released! @emph{November 17, 2012} + +We are happy to announce the release of LilyPond 2.17.7. 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.16.1 released! @emph{November 9, 2012} + +We are happy to announce the release of LilyPond 2.16.1. This has a number of +updates to the previous stable version, and should cause no problems. We +recommend that everybody upgrade to this version. +@newsEnd + +@newsItem +@subsubheading LilyPond 2.17.6 released! @emph{November 3, 2012} + +We are happy to announce the release of LilyPond 2.17.6. 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.5 released! @emph{October 20, 2012} + +We are happy to announce the release of LilyPond 2.17.5. 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.4 released! @emph{October 6, 2012} + +We are happy to announce the release of LilyPond 2.17.4. This +release contains the usual number of bugfixes. It is strongly +recommended that normal users do @strong{not} use this release, +and instead use the stable 2.16 version. + +@newsEnd + +@newsItem +@subsubheading LilyPond 2.17.3 released! @emph{September 23, 2012} + +We are happy to announce the release of LilyPond 2.17.3. This +release contains the usual number of bugfixes. It is strongly +recommended that normal users do @strong{not} use this release, +and instead use the stable 2.16 version. + +@newsEnd + +@newsItem +@subsubheading LilyPond 2.17.2 released! @emph{September 10, 2012} + +We are happy to announce the release of LilyPond 2.17.2. This +release contains the usual number of bugfixes. It is strongly +recommended that normal users do @strong{not} use this release, +and instead use the stable 2.16 version. + +@newsEnd + +@newsItem +@subsubheading LilyPond 2.17.1 released! @emph{August 28, 2012} + +We are happy to announce the release of LilyPond 2.17.1. This +release contains the usual number of bugfixes. It is strongly +recommended that normal users do @strong{not} use this release, +and instead use the stable 2.16 version. + +@newsEnd + + +@newsItem +@subsubheading LilyPond 2.17.0 released! @emph{August 26, 2012} + +We are happy to announce the release of LilyPond 2.17.0. This +release contains the usual number of bugfixes. It is strongly +recommended that normal users do @strong{not} use this release, +and instead use the stable 2.16 version. + +@newsEnd + +@newsItem +@subsubheading Lilypond 2.16.0 released! @emph{August 24, 2012} + +We are proud to announce the release of GNU LilyPond 2.16.0. +LilyPond is a music engraving program, devoted to producing the +highest-quality sheet music possible. It brings the aesthetics of +traditionally engraved music to computer printouts. + +Many improvements have been made in the past year since the previous +main stable version. A few major improvements are: + +@itemize +@item +Support for kievan square notation +@item +User and programming interfaces have greatly improved +@item +Music functions have become quite more versatile +@end itemize + +A full list of new features is given in: + +@example +@uref{http://lilypond.org/doc/v2.16/Documentation/changes/index.html} +@end example + +Happy music typesetting! LilyPond 2.16 was brought to you by... + +Main development team: + +Bertrand Bordage, Trevor Daniels, Colin Hall, Phil Holmes, Ian Hulin, +Reinhold Kainhofer, David Kastrup, Jonathan Kulp, Werner Lemberg, +John Mandereau, Patrick McCarty, Joe Neeman, Han-Wen Nienhuys, +Jan Nieuwenhuizen, Graham Percival, Mark Polesky, Neil Puttock, +Mike Solomon, Carl Sorensen, Francisco Vila, Valentin Villenave, +Jan Warchoł + +Programming contributors: + +Aleksandr Andreev, Sven Axelsson, Peter Chubb, Karin Hoethker, +Marc Hohl, David Nalesnik, Justin Ohmie, Benkő Pál, Julien Rioux, Patrick Schmidt, +Adam Spiers, Heikki Taurainen, Piers Titus van der Torren, +Jan-Peter Voigt, Janek Warchol + +Documentation contributors: + +James Lowe, Pavel Roskin, Alberto Simoes, Stefan Weil + +Bug squad: + +Colin Campbell, Eluze, Phil Holmes, Marek Klein, Ralph Palmer, +James Lowe + +Support: + +Colin Campbell, Christian Hitz, Phil Holmes + +Translation contributors: + +Jean-Charles Malahieude, Till Paala, Yoshiki Sawada + +@newsEnd + +@newsItem +@subsubheading Lilypond 2.15.95 released! @emph{August 11, 2012} + +We are excited to announce the release of LilyPond 2.15.95. +With this release, development on version 2.15 is frozen for the +upcoming 2.16 stable release and only open to bug fixes. + +All users are urged to try this version to ensure the best +quality of the upcoming stable release. If you discover any +problems, please send us @ref{Bug reports}. + +New features since 2.14.2 are listed in the @qq{Changes} manual +on the website section about @ref{Development}. + +@newsEnd + + +@newsItem +@subsubheading LilyPond 2.15.42 released! @emph{August 02, 2012} + +We are happy to announce the release of LilyPond 2.15.42. This +release contains the usual number of bugfixes. + +It is strongly recommended that normal users do @strong{not} use +this release, and instead use the stable 2.14 version. Please +note that due to a few Critical bugs, this is not the next release +candidate. + +@newsEnd + + +@newsItem +@subsubheading The LilyPond Report #27. @emph{August 2, 2012} + +The @emph{LilyPond Report} is back, with some interesting insights on +new Scheme-related features recently added by our community’s only paid +developer David Kastrup (thanks to your +@uref{http://lilypond.org/sponsoring.html, continuing donations}). Also +to be found in this issue are an overview of some lesser-known LilyPond +companion projects, and a handful of more shallow factoids. + +Come +@uref{http://news.lilynet.net/?The-LilyPond-Report-27, read +LilyPond Report 27} now; comments and contributions are +warmly encouraged! + +@newsEnd @newsItem @subsubheading Release candidate withdrawn @emph{July 11, 2012} diff --git a/VERSION b/VERSION index 111da92456..808c65e888 100644 --- a/VERSION +++ b/VERSION @@ -1,7 +1,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=2 MINOR_VERSION=16 -PATCH_LEVEL=1 +PATCH_LEVEL=2 MY_PATCH_LEVEL= -VERSION_STABLE=2.16.0 -VERSION_DEVEL=2.17.4 +VERSION_STABLE=2.16.1 +VERSION_DEVEL=2.17.9 diff --git a/out/ChangeLog b/out/ChangeLog index 4e13624782..c62e64887e 100644 --- a/out/ChangeLog +++ b/out/ChangeLog @@ -1 +1 @@ -See http://git.savannah.gnu.org/gitweb/?p=lilypond.git;a=log;h=refs/tags/release/2.16.1-1 +See http://git.savannah.gnu.org/gitweb/?p=lilypond.git;a=log;h=refs/tags/release/2.16.2-1 diff --git a/out/RELEASE-COMMIT b/out/RELEASE-COMMIT index 0ac5470063..a4e5ae7a0c 100644 --- a/out/RELEASE-COMMIT +++ b/out/RELEASE-COMMIT @@ -1,100 +1,100 @@ -commit 13c098630073b556a8a1f39afe4506c852234e7a +commit 11cdcc31caf00b9b4931bcda846e14fdfddcfd41 Author: Phil Holmes -Date: Fri Nov 9 14:22:11 2012 +0000 +Date: Fri Jan 4 13:32:22 2013 +0000 Release: update news. diff --git a/Documentation/web/news-front.itexi b/Documentation/web/news-front.itexi -index e37cf8c..2d0a892 100644 +index 2d0a892..0de5407 100644 --- a/Documentation/web/news-front.itexi +++ b/Documentation/web/news-front.itexi -@@ -9,6 +9,46 @@ +@@ -9,17 +9,17 @@ @c used for news about the upcoming release; see CG 10.2 @newsItem -+@subsubheading LilyPond 2.16.1 released! @emph{November 9, 2012} +-@subsubheading LilyPond 2.16.1 released! @emph{November 9, 2012} ++@subsubheading LilyPond 2.16.2 released! @emph{January 4, 2013} + +-We are happy to announce the release of LilyPond 2.16.1. This has a number of +-updates to the previous stable version, and should cause no problems. We +-recommend that everybody upgrade to this version. ++We are happy to announce the release of LilyPond 2.16.2. This release is mainly ++to correct a problem with lilypond-book running on Windows. We recommend that ++only people requiring this functionality upgrade to this version. + @newsEnd + + @newsItem +-@subsubheading LilyPond 2.17.6 released! @emph{November 3, 2012} ++@subsubheading LilyPond 2.17.9 released! @emph{December 15, 2012} + +-We are happy to announce the release of LilyPond 2.17.6. This ++We are happy to announce the release of LilyPond 2.17.9. 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 +@@ -28,30 +28,41 @@ a stable version of Lilypond, we recommend using the 2.16 version. + @newsEnd + + @newsItem +-@subsubheading LilyPond 2.17.5 released! @emph{October 20, 2012} ++@subsubheading The LilyPond Report #28. @emph{November 12, 2012} + +-We are happy to announce the release of LilyPond 2.17.5. 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. ++The @uref{http://news.lilynet.net/?The-LilyPond-Report-28, October ++issue of the @emph{LilyPond Report}} focuses on the ++@uref{http://news.lilynet.net/?LilyPond-meeting-in-Waltrop, ++meeting of LilyPond developers and users} in Waltrop, Germany last ++August. Of course, there are also some musings on LilyPond ++triggered by the release of 2.16.0 and 2.17.0 occuring from that ++venue. + ++There are also two monthly financial reports from David Kastrup ++whose work on LilyPond is ++@uref{http://news.lilynet.net/?The-LilyPond-Report-24#an_urgent_request_for_funding, ++solely paid for} by financial contributions from other developer ++and users (thank you!), and a report about experiences from ++@uref{http://scorio.com, a web-based music typesetting service} ++using LilyPond internally. + ++Come @uref{http://news.lilynet.net/?The-LilyPond-Report-28, read ++LilyPond Report 28} now; comments and contributions are warmly ++encouraged! + @newsEnd + + @newsItem +-@subsubheading LilyPond 2.17.4 released! @emph{October 6, 2012} +- +-We are happy to announce the release of LilyPond 2.17.4. This +-release contains the usual number of bugfixes. It is strongly +-recommended that normal users do @strong{not} use this release, +-and instead use the stable 2.16 version. ++@subsubheading LilyPond 2.16.1 released! @emph{November 9, 2012} + +We are happy to announce the release of LilyPond 2.16.1. This has a number of +updates to the previous stable version, and should cause no problems. We +recommend that everybody upgrade to this version. -+@newsEnd -+ -+@newsItem -+@subsubheading LilyPond 2.17.6 released! @emph{November 3, 2012} -+ -+We are happy to announce the release of LilyPond 2.17.6. 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.5 released! @emph{October 20, 2012} -+ -+We are happy to announce the release of LilyPond 2.17.5. 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.4 released! @emph{October 6, 2012} -+ -+We are happy to announce the release of LilyPond 2.17.4. This -+release contains the usual number of bugfixes. It is strongly -+recommended that normal users do @strong{not} use this release, -+and instead use the stable 2.16 version. -+ -+@newsEnd -+ -+@newsItem - @subsubheading Lilypond 2.16.0 released! @emph{August 24, 2012} - - We are proud to announce the release of GNU LilyPond 2.16.0. -@@ -72,50 +112,4 @@ Jean-Charles Malahieude, Till Paala, Yoshiki Sawada @newsEnd + @newsItem + @subsubheading Lilypond 2.16.0 released! @emph{August 24, 2012} --@newsItem --@subsubheading Lilypond 2.15.95 released! @emph{August 11, 2012} -- --We are excited to announce the release of LilyPond 2.15.95. --With this release, development on version 2.15 is frozen for the --upcoming 2.16 stable release and only open to bug fixes. -- --All users are urged to try this version to ensure the best --quality of the upcoming stable release. If you discover any --problems, please send us @ref{Bug reports}. -- --New features since 2.14.2 are listed in the @qq{Changes} manual --on the website section about @ref{Development}. -- --@newsEnd -- -- --@newsItem --@subsubheading LilyPond 2.15.42 released! @emph{August 02, 2012} -- --We are happy to announce the release of LilyPond 2.15.42. This --release contains the usual number of bugfixes. +-We are proud to announce the release of GNU LilyPond 2.16.0. ++We are proud to announce the release of GNU LilyPond 2.16.1. + LilyPond is a music engraving program, devoted to producing the + highest-quality sheet music possible. It brings the aesthetics of + traditionally engraved music to computer printouts. +diff --git a/Documentation/web/news.itexi b/Documentation/web/news.itexi +index 0a21c0d..1331adf 100644 +--- a/Documentation/web/news.itexi ++++ b/Documentation/web/news.itexi +@@ -28,6 +28,220 @@ NOTE: --It is strongly recommended that normal users do @strong{not} use --this release, and instead use the stable 2.14 version. Please --note that due to a few Critical bugs, this is not the next release --candidate. -- --@newsEnd -- -- --@newsItem --@subsubheading The LilyPond Report #27. @emph{August 2, 2012} -- --The @emph{LilyPond Report} is back, with some interesting insights on --new Scheme-related features recently added by our community’s only paid --developer David Kastrup (thanks to your --@uref{http://lilypond.org/sponsoring.html, continuing donations}). Also --to be found in this issue are an overview of some lesser-known LilyPond + + @newsItem ++@subsubheading LilyPond 2.17.8 released! @emph{December 1, 2012} ++ ++We are happy to announce the release of LilyPond 2.17.8. This diff --git a/po/lilypond.pot b/po/lilypond.pot index 5c7b2c126f..f8cd484df0 100644 --- a/po/lilypond.pot +++ b/po/lilypond.pot @@ -6,10 +6,10 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: lilypond 2.16.1\n" +"Project-Id-Version: lilypond 2.16.2\n" "Report-Msgid-Bugs-To: http://post.gmane.org/post.php?group=gmane.comp.gnu." "lilypond.bugs\n" -"POT-Creation-Date: 2012-11-09 14:19+0000\n" +"POT-Creation-Date: 2013-01-04 13:31+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1555,15 +1555,15 @@ msgstr "" msgid "Unable to find input file %s" msgstr "" -#: website_post.py:123 +#: website_post.py:125 msgid "English" msgstr "" -#: website_post.py:126 +#: website_post.py:128 msgid "Other languages" msgstr "" -#: website_post.py:127 +#: website_post.py:129 #, python-format msgid "About automatic language selection." msgstr "" @@ -3152,85 +3152,85 @@ msgstr "" msgid "not a markup" msgstr "" -#: lexer.ll:218 /home/phil/lilypond-git/lily/lexer.ll:209 +#: lexer.ll:218 /home/phil/lilypond-git/lily/lexer.ll:218 msgid "stray UTF-8 BOM encountered" msgstr "" -#: lexer.ll:221 /home/phil/lilypond-git/lily/lexer.ll:212 +#: lexer.ll:221 /home/phil/lilypond-git/lily/lexer.ll:221 msgid "Skipping UTF-8 BOM" msgstr "" -#: lexer.ll:279 /home/phil/lilypond-git/lily/lexer.ll:270 +#: lexer.ll:279 /home/phil/lilypond-git/lily/lexer.ll:279 #, c-format msgid "Renaming input to: `%s'" msgstr "" -#: lexer.ll:296 /home/phil/lilypond-git/lily/lexer.ll:287 +#: lexer.ll:296 /home/phil/lilypond-git/lily/lexer.ll:296 msgid "quoted string expected after \\version" msgstr "" -#: lexer.ll:300 /home/phil/lilypond-git/lily/lexer.ll:291 +#: lexer.ll:300 /home/phil/lilypond-git/lily/lexer.ll:300 msgid "quoted string expected after \\sourcefilename" msgstr "" -#: lexer.ll:304 /home/phil/lilypond-git/lily/lexer.ll:295 +#: lexer.ll:304 /home/phil/lilypond-git/lily/lexer.ll:304 msgid "integer expected after \\sourcefileline" msgstr "" -#: lexer.ll:327 /home/phil/lilypond-git/lily/lexer.ll:318 +#: lexer.ll:327 /home/phil/lilypond-git/lily/lexer.ll:327 msgid "\\maininput not allowed outside init files" msgstr "" -#: lexer.ll:351 /home/phil/lilypond-git/lily/lexer.ll:342 +#: lexer.ll:351 /home/phil/lilypond-git/lily/lexer.ll:351 #, c-format msgid "wrong or undefined identifier: `%s'" msgstr "" -#: lexer.ll:377 /home/phil/lilypond-git/lily/lexer.ll:368 +#: lexer.ll:377 /home/phil/lilypond-git/lily/lexer.ll:377 msgid "string expected after \\include" msgstr "" #. backup rule -#: lexer.ll:387 /home/phil/lilypond-git/lily/lexer.ll:378 +#: lexer.ll:387 /home/phil/lilypond-git/lily/lexer.ll:387 msgid "end quote missing" msgstr "" -#: lexer.ll:558 +#: lexer.ll:558 /home/phil/lilypond-git/lily/lexer.ll:558 msgid "Brace found at end of lyric. Did you forget a space?" msgstr "" -#: lexer.ll:672 +#: lexer.ll:672 /home/phil/lilypond-git/lily/lexer.ll:672 msgid "Brace found at end of markup. Did you forget a space?" msgstr "" -#: lexer.ll:684 /home/phil/lilypond-git/lily/lexer.ll:690 +#: lexer.ll:684 /home/phil/lilypond-git/lily/lexer.ll:684 msgid "EOF found inside a comment" msgstr "" -#: lexer.ll:782 /home/phil/lilypond-git/lily/lexer.ll:792 +#: lexer.ll:782 /home/phil/lilypond-git/lily/lexer.ll:782 #, c-format msgid "invalid character: `%s'" msgstr "" -#: lexer.ll:903 /home/phil/lilypond-git/lily/lexer.ll:916 +#: lexer.ll:903 /home/phil/lilypond-git/lily/lexer.ll:904 #, c-format msgid "unknown escaped string: `\\%s'" msgstr "" -#: lexer.ll:1186 /home/phil/lilypond-git/lily/lexer.ll:1199 +#: lexer.ll:1186 /home/phil/lilypond-git/lily/lexer.ll:1187 msgid "non-UTF-8 input" msgstr "" -#: lexer.ll:1230 /home/phil/lilypond-git/lily/lexer.ll:1243 +#: lexer.ll:1230 /home/phil/lilypond-git/lily/lexer.ll:1231 #, c-format msgid "file too old: %s (oldest supported: %s)" msgstr "" -#: lexer.ll:1231 /home/phil/lilypond-git/lily/lexer.ll:1244 +#: lexer.ll:1231 /home/phil/lilypond-git/lily/lexer.ll:1232 msgid "consider updating the input with the convert-ly script" msgstr "" -#: lexer.ll:1237 /home/phil/lilypond-git/lily/lexer.ll:1250 +#: lexer.ll:1237 /home/phil/lilypond-git/lily/lexer.ll:1238 #, c-format msgid "program too old: %s (file requires: %s)" msgstr "" diff --git a/python/auxiliar/postprocess_html.py b/python/auxiliar/postprocess_html.py index 70afde80dc..8453c147b2 100644 --- a/python/auxiliar/postprocess_html.py +++ b/python/auxiliar/postprocess_html.py @@ -6,6 +6,7 @@ add footer, tweak links, add language selection menu. """ import re import os +import sys import time import operator @@ -38,19 +39,21 @@ header = r""" footer = '''
+

-%(footer_name_version)s +%%(footer_name_version)s

-%(footer_report_links)s +%%(footer_report_links)s

-''' +''' % sys.argv[0] web_footer = '''
+
-''' +''' % sys.argv[0] footer_name_version = _doc ('This page is for %(package_name)s-%(package_version)s (%(branch_str)s).') # ugh, must not have "_doc" in strings because it is naively replaced with "_" in hacked gettext process @@ -72,11 +75,12 @@ browser_language_url = "http://www.lilypond.org/website/misc/browser-language" LANGUAGES_TEMPLATE = '''

- %(language_available)s + + %%(language_available)s
- %(browser_language)s + %%(browser_language)s

-''' +''' % sys.argv[0] html_re = re.compile ('(.*?)(?:[.]([^/.]*))?[.]html$') diff --git a/python/lilylib.py b/python/lilylib.py index afebefb7a8..7e3eb410bd 100644 --- a/python/lilylib.py +++ b/python/lilylib.py @@ -330,8 +330,15 @@ class NonDentedHeadingFormatter (optparse.IndentedHelpFormatter): def format_description(self, description): return description +class NonEmptyOptionParser (optparse.OptionParser): + "A subclass of OptionParser that gobbles empty string arguments." + + def parse_args (self, args=None, values=None): + options, args = optparse.OptionParser.parse_args (self, args, values) + return options, filter (None, args) + def get_option_parser (*args, **kwargs): - p = optparse.OptionParser (*args, **kwargs) + p = NonEmptyOptionParser (*args, **kwargs) p.formatter = NonDentedHeadingFormatter () p.formatter.set_parser (p) return p diff --git a/scripts/build/bib2texi.py b/scripts/build/bib2texi.py index c71976dec1..b76a171a09 100644 --- a/scripts/build/bib2texi.py +++ b/scripts/build/bib2texi.py @@ -6,7 +6,7 @@ import tempfile # usage: def usage (): - print 'usage: %s [-s style] [-o ] [-q] BIBFILES...' + print 'usage: bib2texi.py [-s style] [-o ] [-q] BIBFILES...' print '-q suppresses most output' (options, files) = getopt.getopt (sys.argv[1:], 's:o:hq', []) @@ -32,6 +32,11 @@ if not files: usage () sys.exit (2) +marker = """@c This file was autogenerated +@c from: %s +@c by: %s + +""" % (", ".join(files), sys.argv[0]) def strip_extension (f, ext): (p, e) = os.path.splitext (f) @@ -84,7 +89,10 @@ if bbl.strip () == '': sys.stderr.write ("Bibtex generated an empty file!") sys.exit (1) -open (output, 'w').write (bbl) +fout = open (output, 'w') +fout.write (marker) +fout.write (bbl) +fout.close () def cleanup (tmpfile): for a in ['aux','bbl', 'blg']: diff --git a/scripts/build/create-version-itexi.py b/scripts/build/create-version-itexi.py index e40ff6e79b..f4dc066fcc 100644 --- a/scripts/build/create-version-itexi.py +++ b/scripts/build/create-version-itexi.py @@ -66,9 +66,15 @@ def make_macro(name, string): print "@end macro" print "" +print "@c This file was autogenerated" +print "@c from: VERSION" +print "@c by: %s" % sys.argv[0] +print "" print "@c ************************ Version numbers ************" +print "" + make_macro("version", VERSION) make_macro("versionStable", VERSION_STABLE) make_macro("versionDevel", VERSION_DEVEL) - +print "@c *****************************************************" diff --git a/scripts/build/create-weblinks-itexi.py b/scripts/build/create-weblinks-itexi.py index 62d5afbfbd..7d87e8b5d6 100644 --- a/scripts/build/create-weblinks-itexi.py +++ b/scripts/build/create-weblinks-itexi.py @@ -1,6 +1,6 @@ #!@PYTHON@ # -*- coding: utf-8 -*- -# create-version-itexi.py +# create-weblinks-itexi.py """ when being called on lilypond.org, pass it the location of the top source dir on the command-line. """ @@ -308,7 +308,9 @@ def make_download(name, osA, osB, version, revision, text): string += "}" make_macro(name, string) -def make_download_source(name, vstring, version, lang): +def make_download_source(name, version, lang): + assert "." in version + vstring = "v%s.%s" % tuple(version.split(".", 2)[0:2]) string = "@uref{http://download.linuxaudio.org/lilypond/sources/" string += vstring + "/" string += "lilypond-" + version + ".tar.gz" @@ -490,30 +492,40 @@ def make_doctarball_links(name, version, lang): make_ver_link(macroLang("doctarball"+name, lang), url, getTrans("Doc tarball for ", lang)+version) +print "@c This file was autogenerated" +print "@c from: VERSION" +print "@c by: %s" % sys.argv[0] +print "" print "@c ************************ Download binaries ************" +print "" + make_all_downloads("Stable", VERSION_STABLE) make_all_downloads("Devel", VERSION_DEVEL) print "@c ************************ Download source ************" -# FIXME: icky hard-coding! -gp +print "" + for lang in langs: - print "@c *********", lang, "***" - make_download_source("downloadStableSource","v2.14",VERSION_STABLE,lang) - make_download_source("downloadDevelSource","v2.15",VERSION_DEVEL,lang) + print "@c *********", lang or "en", "***" + make_download_source("downloadStableSource", VERSION_STABLE, lang) + make_download_source("downloadDevelSource", VERSION_DEVEL, lang) print "@c ************************ Manual links ************" +print "" + for lang in langs: - print "@c *********", lang, "***" - make_manual_links("Stable", VERSION_STABLE,lang) - make_manual_links("Devel", VERSION_DEVEL,lang) + print "@c *********", lang or "en", "***" + make_manual_links("Stable", VERSION_STABLE, lang) + make_manual_links("Devel", VERSION_DEVEL, lang) - make_doctarball_links("Stable", VERSION_STABLE,lang) - make_doctarball_links("Devel", VERSION_DEVEL,lang) + make_doctarball_links("Stable", VERSION_STABLE, lang) + make_doctarball_links("Devel", VERSION_DEVEL, lang) print "@c ************************ Regtest links ************" -for lang in langs: - print "@c *********", lang, "***" - make_regtest_links("Stable", VERSION_STABLE,lang) - make_regtest_links("Devel", VERSION_DEVEL,lang) - +print "" +for lang in langs: + print "@c *********", lang or "en", "***" + make_regtest_links("Stable", VERSION_STABLE, lang) + make_regtest_links("Devel", VERSION_DEVEL, lang) +print "@c ***************************************************" diff --git a/scripts/build/lys-to-tely.py b/scripts/build/lys-to-tely.py index 329b412a47..ad0f7a6aa9 100644 --- a/scripts/build/lys-to-tely.py +++ b/scripts/build/lys-to-tely.py @@ -53,6 +53,11 @@ author = "Han-Wen Nienhuys and Jan Nieuwenhuizen" input_filename = "" glob_input = "" template = '''\input texinfo + +@c This file was autogenerated +@c from: %s +@c by: %s + @setfilename %%(name)s.info @settitle %%(title)s @@ -83,7 +88,7 @@ template = '''\input texinfo %s @bye -''' % include_snippets +''' % (", ".join(files), sys.argv[0], include_snippets) for opt in options: o = opt[0] @@ -177,4 +182,4 @@ if files: else: # not Unix philosophy, but hey, at least we notice when # we don't distribute any .ly files. - sys.stderr.write ("No files specified. Doing nothing") + sys.stderr.write ("No files specified. Doing nothing. Use -h to display usage.") diff --git a/scripts/build/output-distance.py b/scripts/build/output-distance.py index 734b366f6b..569c892a8f 100755 --- a/scripts/build/output-distance.py +++ b/scripts/build/output-distance.py @@ -988,9 +988,12 @@ class ComparisonData: summary += '

%d unchanged

' % len (unchanged) + me = sys.argv[0] + html = ''' LilyPond regression test results +