run convert-ly

diff --git a/ChangeLog b/ChangeLog
index 37e8c13e3e7f4ca09566516e499f238c13dccbb7..127209f6e847e0cd50d71e2b404c51c88ed1bf41 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-04-11  Han-Wen Nienhuys   <hanwen@xs4all.nl>
+
+       * ly/declarations-init.ly: run convert-ly
+
+       * lily/my-lily-parser.cc (LY_DEFINE): move parse-file function
+       from input-file-results. Remove input-file-results.* 
+
 2004-04-11  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * input/test/title-markup.ly: Add \noPagebreak test.
@@ -6,8 +13,16 @@
 
 2004-04-11  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
-       * lily/main.cc (main_with_guile): call lilypond-main
+       * lily/main.cc (main_with_guile): excise dependency options -M and
+       --dep-prefix
 
+       * lily/input-file-results.cc: excise Makefile dependency code
+
+       * Documentation/user/invoking.itexi (Invoking the lilypond
+       binary): remove dep doco
+       
+       * lily/main.cc (main_with_guile): call lilypond-main
+       
        * scm/lily.scm (lilypond-main): new function: handle multiple files.
 
        * lily/input-file-results.cc (LY_DEFINE): throw ly-file-failed

diff --git a/Documentation/user/invoking.itexi b/Documentation/user/invoking.itexi
index 4d1033e0a8d90b8d8c7d339a244a502f401bffe6..33acbece80c25710c1e412dcf0925913fabe06ad 100644 (file)
--- a/Documentation/user/invoking.itexi
+++ b/Documentation/user/invoking.itexi
@@ -34,8 +34,6 @@ To have @code{lilypond} read from stdin, use a dash @code{-} for
 @item -k,--keep
     Keep the temporary directory with all output
 files. The temporary directory is created in the current directory as @code{@code{lilypond}.dir}.
-@item -d,--dependencies
-    Write @code{Makefile} dependencies for every input file.
 @item -h,--help
     Print usage help.
 @item -I,--include=@var{dir}
@@ -289,21 +287,13 @@ Set init file to @var{file} (default: @file{init.ly}).
 @cindex MIDI
 Disable @TeX{} output. If you have a @code{\midi} definition MIDI output
 will be generated.
-@item -M,--dependencies
-Output rules to be included in Makefile.
 @item -o,--output=@var{FILE}
 Set the default output file to @var{FILE}.
 
-@ignore
 @item -s,--safe
 Disallow untrusted @code{\include} directives, in-line
 Scheme evaluation, backslashes in @TeX{}, code.
 
-@strong{WARNING}: the @code{--safe} option has not been reviewed for a
-long time. Do not rely on it for automatic invocation (e.g. over the
-web). Volunteers are welcome to do a new audit.
-@end ignore
-
 @item -v,--version
 Show version information.
 @item -V,--verbose

diff --git a/lily/include/main.hh b/lily/include/main.hh
index 5470fc583254c8c6151d86e75a299c3ad8a16405..1e96bc5fb2ba5a391aadb4aedd7fc912bfddb3bb 100644 (file)
--- a/lily/include/main.hh
+++ b/lily/include/main.hh
@@ -30,8 +30,6 @@ extern String init_name_global;
 void progress_indication (String);
 
 /* options */
-extern bool dependency_global_b;
-extern String dependency_prefix_global;
 extern Array<String> dump_header_fieldnames_global;
 extern bool no_paper_global_b;
 extern String output_format_global;

diff --git a/lily/lexer.ll b/lily/lexer.ll
index ef282d6b17124833a268efe8ae322f52a037cd07..787b324204e90d36503adcea1967c8537c8dc2f0 100644 (file)
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -750,7 +750,7 @@ strip_trailing_white (String&s)
 
 
 /* 2.1.2x something -> \property -> \set. */ 
-Lilypond_version oldest_version ("2.1.25");
+Lilypond_version oldest_version ("2.2.0");
 
 
 bool

diff --git a/ly/a3-init.ly b/ly/a3-init.ly
index 64240acd9ee2a360ed9aed0d5d8658527bf150fb..91808038f2d711e01d104ba3cd8534c93635b3fd 100644 (file)
--- a/ly/a3-init.ly
+++ b/ly/a3-init.ly
@@ -1,4 +1,4 @@
-\version "2.1.36"
+\version "2.2.0"
 % a3-init.ly
 
 hsize = 296.9 \mm

diff --git a/ly/a4-init.ly b/ly/a4-init.ly
index 12b7d2bf2401ba256c805b2e506442ebb958fc18..ca343e448fc79309c34d452b5240386ff039ee5a 100644 (file)
--- a/ly/a4-init.ly
+++ b/ly/a4-init.ly
@@ -1,4 +1,4 @@
-\version "2.1.36"
+\version "2.2.0"
 % a4.ly
 
 hsize = 210.0 \mm

diff --git a/ly/accordion-defs-init.ly b/ly/accordion-defs-init.ly
index 6cf9d04d7e6165633aa96add22d6dfa5ed20fa9c..2ee0a90d2b6a5be9ff72c947d6af6152c890e827 100644 (file)
--- a/ly/accordion-defs-init.ly
+++ b/ly/accordion-defs-init.ly
@@ -1,4 +1,4 @@
-\version "2.1.36"
+\version "2.2.0"
 % Symbols needed to print accordion music
 % 
 %  2' = T

diff --git a/ly/book-init-init.ly b/ly/book-init-init.ly
index c4ae2ee4a0129451a2b72157923d546aee7dc4e2..cbb5a6c54bbfc6c01e9794e3f5b8950dbb813172 100644 (file)
--- a/ly/book-init-init.ly
+++ b/ly/book-init-init.ly
@@ -1,6 +1,6 @@
 % Toplevel initialisation file. 
        
-\version "2.1.36"
+\version "2.2.0"
 
 
 \include "declarations-init.ly"

diff --git a/ly/catalan.ly b/ly/catalan.ly
index a6ad8d66b825f0d1d6d6fb2c4f6d17e101aa9853..eddc835d7d355a44bf2b8f5c08bee218156ac8e7 100644 (file)
--- a/ly/catalan.ly
+++ b/ly/catalan.ly
@@ -73,4 +73,4 @@ pitchnamesCatalan = #`(
 
 pitchnames = \pitchnamesCatalan
 
-\version "2.1.36"
+\version "2.2.0"

diff --git a/ly/center-init.ly b/ly/center-init.ly
index 699d0638c66bd8d74745ade9eae2b6ca1b302805..8c750ef92c9bc8008c3bc0eb368aba21c5c115f0 100644 (file)
--- a/ly/center-init.ly
+++ b/ly/center-init.ly
@@ -1,6 +1,6 @@
 % Toplevel initialisation file. 
        
-\version "2.1.36"
+\version "2.2.0"
 
 
 \include "declarations-init.ly"

diff --git a/ly/chord-modifiers-init.ly b/ly/chord-modifiers-init.ly
index 3e528ae1b6a8deeae9931f3ff1db5d2b96a164f9..3f9beefa72f45f2ec97852f08ae297fde3542b16 100644 (file)
--- a/ly/chord-modifiers-init.ly
+++ b/ly/chord-modifiers-init.ly
@@ -1,4 +1,4 @@
-\version "2.1.36"
+\version "2.2.0"
 
 chordmodifiers = #default-chord-modifier-list
 

diff --git a/ly/declarations-init.ly b/ly/declarations-init.ly
index 6107ef347e2bf0d657de1b98a8eed02b2bae359a..fb97f53a81ce9534f7dcf55c3580a91713faad23 100644 (file)
--- a/ly/declarations-init.ly
+++ b/ly/declarations-init.ly
@@ -1,6 +1,6 @@
 #(ly:set-option 'old-relative)
 
-\version "2.1.36"
+\version "2.2.0"
 breve = #(ly:make-duration -1 0)
 longa = #(ly:make-duration -2 0 )
 maxima = #(ly:make-duration -3 0)

diff --git a/ly/deutsch.ly b/ly/deutsch.ly
index 38fcfaa75e9a6689b62d8710ac429643a2131db1..0d8918ef4665f3a4cd5c403c47e11e7d7460d4cd 100644 (file)
--- a/ly/deutsch.ly
+++ b/ly/deutsch.ly
@@ -49,4 +49,4 @@ pitchnamesDeutsch = #`(
 
 pitchnames = \pitchnamesDeutsch
 
-\version "2.1.36"
+\version "2.2.0"

diff --git a/ly/drumpitch-init.ly b/ly/drumpitch-init.ly
index c9339e1c1e4059ebe7e904af9e0e951d8c59006b..58672f9a6ab81b99f363f471ee16180ffa3c85fe 100644 (file)
--- a/ly/drumpitch-init.ly
+++ b/ly/drumpitch-init.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.36"
+\version "2.2.0"
 
 drumPitchNames =
 #'((acousticbassdrum . acousticbassdrum)

diff --git a/ly/dynamic-scripts-init.ly b/ly/dynamic-scripts-init.ly
index 82b864ba0de2abe8c7ce45c39190def60ca9524d..535c565e08bbbe800a71f00b0cb7eae8be1365a0 100644 (file)
--- a/ly/dynamic-scripts-init.ly
+++ b/ly/dynamic-scripts-init.ly
@@ -1,4 +1,4 @@
-\version "2.1.36"
+\version "2.2.0"
 
 %
 % declare the standard dynamic identifiers.

diff --git a/ly/english.ly b/ly/english.ly
index f0535243d65b762dc074888906ca4ab0195453ce..2219f03f7503f3d0a3624f5e07216aa11366a24b 100644 (file)
--- a/ly/english.ly
+++ b/ly/english.ly
@@ -87,5 +87,5 @@ pitchnamesEnglish = #`(
 
 pitchnames = \pitchnamesEnglish
 
-\version "2.1.36"
+\version "2.2.0"
 

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index 7b0d7b99b039c4149b0386ede2fb053be8d9d9bf..5d23a0f8086a9bee69505ce8dff7c3087bfe88e3 100644 (file)
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -1,4 +1,4 @@
-\version "2.1.36"
+\version "2.2.0"
 
 \context {
     \name Global

diff --git a/ly/espanol.ly b/ly/espanol.ly
index 93ff1257718513982652e2e7353654c9e5221edb..ae8ce9447faff8a37f077c443918e723332f46bd 100644 (file)
--- a/ly/espanol.ly
+++ b/ly/espanol.ly
@@ -58,4 +58,4 @@ pitchnamesEspanol = #`(
 
 pitchnames = \pitchnamesEspanol
 
-\version "2.1.36"
+\version "2.2.0"

diff --git a/ly/generate-documentation.ly b/ly/generate-documentation.ly
index 813b21cc3408025c52a63bf396508b362e1542aa..b748657b22b6ca1e3f10ed9442f033d071463b23 100644 (file)
--- a/ly/generate-documentation.ly
+++ b/ly/generate-documentation.ly
@@ -1,4 +1,4 @@
-\version "2.1.36"
+\version "2.2.0"
 
 %
 % Running LilyPond on this file generates the documentation

diff --git a/ly/generate-interface-doc-init.ly b/ly/generate-interface-doc-init.ly
index 2a6696268db8e0d93744c710ab7e57b12e6132a2..8f77e80ceebc103e9759b22f9a0d1cf1021d8c2d 100644 (file)
--- a/ly/generate-interface-doc-init.ly
+++ b/ly/generate-interface-doc-init.ly
@@ -1,4 +1,4 @@
-\version "2.1.36"
+\version "2.2.0"
 
 %
 % Running LilyPond on this file generates the short interface doc

diff --git a/ly/grace-init.ly b/ly/grace-init.ly
index 0528f47422868f3013250f4ffc9b409cffc4ad54..cdd041dca5d9971076e11cbf21578b1edc9ef78d 100644 (file)
--- a/ly/grace-init.ly
+++ b/ly/grace-init.ly
@@ -1,4 +1,4 @@
-\version "2.1.36"
+\version "2.2.0"
 
 
 startGraceMusic = \notes {

diff --git a/ly/gregorian-init.ly b/ly/gregorian-init.ly
index f135e18f2b94a7ee1fc7d12b25c73d897df9ab4f..3a4372d3feaab6c31be6773ccdcc576238ab68a8 100644 (file)
--- a/ly/gregorian-init.ly
+++ b/ly/gregorian-init.ly
@@ -1,4 +1,4 @@
-\version "2.1.36"
+\version "2.2.0"
 
 %%%%%%%%
 %%%%%%%% shortcuts common for all styles of gregorian chant notation

diff --git a/ly/init.ly b/ly/init.ly
index 08334138ff194d40f01c7fab9eef72f3cc4eddc4..9d8b15f8e954eb42bb7cf84e6f37d8be120a9fd9 100644 (file)
--- a/ly/init.ly
+++ b/ly/init.ly
@@ -4,7 +4,7 @@
 #(define-public midi-debug #f)
 
 
-\version "2.1.36"
+\version "2.2.0"
 
 \include "declarations-init.ly"
 

diff --git a/ly/italiano.ly b/ly/italiano.ly
index 2b99fba152919cd4f008ecc2a4c546931e22a562..23d3d05878e4771b47a7e0d66810e0c8d0640d16 100644 (file)
--- a/ly/italiano.ly
+++ b/ly/italiano.ly
@@ -86,4 +86,4 @@ pitchnamesItaliano = #`(
 
 pitchnames = \pitchnamesItaliano
 
-\version "2.1.36"
+\version "2.2.0"

diff --git a/ly/legal-init.ly b/ly/legal-init.ly
index dd0459242c1380a10b3a534327a5d46bbaa53310..6ab5ebe4d6d70e7845657bb4def314f7c2ca8e68 100644 (file)
--- a/ly/legal-init.ly
+++ b/ly/legal-init.ly
@@ -1,4 +1,4 @@
-\version "2.1.36"
+\version "2.2.0"
 % legal-init.ly
 
 hsize = 8.5 \in

diff --git a/ly/letter-init.ly b/ly/letter-init.ly
index b51d384a74d35c52ce71d7dfbb1b302612043c3e..03eb7a3af893af18ab4bbcd8a4aa63a4c9e71bc7 100644 (file)
--- a/ly/letter-init.ly
+++ b/ly/letter-init.ly
@@ -1,4 +1,4 @@
-\version "2.1.36"
+\version "2.2.0"
 % letter-init.ly
 
 hsize = 8.5 \in

diff --git a/ly/midi-init.ly b/ly/midi-init.ly
index dd5b3c2c5344b5d8b7a1b16b1c57478b30a52039..2dfad3904ea32cfc7ef9b44513bf4b76a1aa6851 100644 (file)
--- a/ly/midi-init.ly
+++ b/ly/midi-init.ly
@@ -1,4 +1,4 @@
-\version "2.1.36"
+\version "2.2.0"
 \midi {
         \tempo 4=60
        \include "performer-init.ly"

diff --git a/ly/nederlands.ly b/ly/nederlands.ly
index 68ce73ab649868961854617f3b307246c4c90a3e..816c3040fb2da68eccca8666a198add82f7a8c44 100644 (file)
--- a/ly/nederlands.ly
+++ b/ly/nederlands.ly
@@ -1,4 +1,4 @@
-\version "2.1.36"
+\version "2.2.0"
 %{
  common dutch names for notes. es means flat, is means sharp
 

diff --git a/ly/norsk.ly b/ly/norsk.ly
index d21bf06b13307691904f8cb3d9702f328668bb98..dc51587374a3cf3ba4377c909bb9a85648e4aa78 100644 (file)
--- a/ly/norsk.ly
+++ b/ly/norsk.ly
@@ -105,4 +105,4 @@ pitchnamesNorsk = #`(
 
 pitchnames =\pitchnamesNorsk
 
-\version "2.1.36"
+\version "2.2.0"

diff --git a/ly/params-init.ly b/ly/params-init.ly
index 6761ce6f3aa66235b0cc815ff6b49922510cc427..76d9c2b5da38712288bc0cef867e39fbd10a030c 100644 (file)
--- a/ly/params-init.ly
+++ b/ly/params-init.ly
@@ -1,2 +1,2 @@
-\version "2.1.36"
+\version "2.2.0"
 

diff --git a/ly/part-paper-init.ly b/ly/part-paper-init.ly
index c42ce24716584c5d09397d4dffbf62430d7cb624..1f66c5e274b154baa2edf24508a5dab1845f46d2 100644 (file)
--- a/ly/part-paper-init.ly
+++ b/ly/part-paper-init.ly
@@ -1,4 +1,4 @@
-\version "2.1.36"
+\version "2.2.0"
 
 % JUNKME
 %part-paper-init.ly

diff --git a/ly/performer-init.ly b/ly/performer-init.ly
index 06a01c1ed57bd9d9d202cf10f4eb392d34f06135..bad1bd4155f72d2cdb6eff5503f934fb1163f911 100644 (file)
--- a/ly/performer-init.ly
+++ b/ly/performer-init.ly
@@ -1,4 +1,4 @@
-\version "2.1.36"
+\version "2.2.0"
 
                                %
                                % setup for Request->Element conversion. Guru-only

diff --git a/ly/property-init.ly b/ly/property-init.ly
index 9adcb2bc9b3034059d92adb839bd48a14666ade0..d5289bd14fa947ea07b997bec0e17de87091d199 100644 (file)
--- a/ly/property-init.ly
+++ b/ly/property-init.ly
@@ -1,6 +1,6 @@
 % property-init.ly
 
-\version "2.1.36"
+\version "2.2.0"
 
 stemUp = \override Stem  #'direction = #1
 stemDown = \override Stem  #'direction = #-1 

diff --git a/ly/scale-definitions-init.ly b/ly/scale-definitions-init.ly
index 4fd21b53711d8a1ab091143d371610a648323dd1..c6a0f65a77938a9fa5f3fb8247ee301abd06cce2 100644 (file)
--- a/ly/scale-definitions-init.ly
+++ b/ly/scale-definitions-init.ly
@@ -1,4 +1,4 @@
-\version "2.1.36"
+\version "2.2.0"
 
 
 major = #`(

diff --git a/ly/script-init.ly b/ly/script-init.ly
index 5cf5f99d8227e7882875b081c4d67a1a3cc004e5..6d6bb9aab0004c05c613b15af34fa096857cc8ec 100644 (file)
--- a/ly/script-init.ly
+++ b/ly/script-init.ly
@@ -1,4 +1,4 @@
-\version "2.1.36"
+\version "2.2.0"
 
 
 dashHat= "marcato"

diff --git a/ly/spanners-init.ly b/ly/spanners-init.ly
index d022ab1c1d11cb0e1692b1de417d112c745bd900..9c4e53db80f9e65e32b6ee8134ee2f8b9b68ce93 100644 (file)
--- a/ly/spanners-init.ly
+++ b/ly/spanners-init.ly
@@ -1,4 +1,4 @@
-\version "2.1.36"
+\version "2.2.0"
 
 startGroup = #(make-span-event 'NoteGroupingEvent START)
 stopGroup = #(make-span-event 'NoteGroupingEvent STOP)

diff --git a/ly/suomi.ly b/ly/suomi.ly
index 7bb331e6d4c5570a57150bbe2b12710a20b41dc5..ba828d3bcdf43120d28c703258461ca6343dc2d2 100644 (file)
--- a/ly/suomi.ly
+++ b/ly/suomi.ly
@@ -48,4 +48,4 @@ pitchnamesSuomi = #`(
 
 pitchnames = \pitchnamesSuomi
 
-\version "2.1.36"
+\version "2.2.0"

diff --git a/ly/svenska.ly b/ly/svenska.ly
index c0dae064c3b96a7ac068a1d0792429206bea74ae..2c96ac2b4baf2356fa7c4305844861655ec4ca81 100644 (file)
--- a/ly/svenska.ly
+++ b/ly/svenska.ly
@@ -42,4 +42,4 @@ pitchnamesSvenska = #`(
 )
 
 pitchnames = \pitchnamesSvenska
-\version "2.1.36"
+\version "2.2.0"

diff --git a/ly/tabloid-init.ly b/ly/tabloid-init.ly
index 36bcd5f589196ee57888e5bd2839b5d50ef41dd3..672376b01cf3fa3c48bc3212524ad470e55f0d3f 100644 (file)
--- a/ly/tabloid-init.ly
+++ b/ly/tabloid-init.ly
@@ -1,4 +1,4 @@
-\version "2.1.36"
+\version "2.2.0"
 
 % tabloid-init.ly