From: Han-Wen Nienhuys Date: Sun, 11 Apr 2004 15:54:45 +0000 (+0000) Subject: run convert-ly X-Git-Tag: release/2.3.0~11 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=99720923effaa38725040c546cc4cbb9eb034a31;p=lilypond.git run convert-ly --- diff --git a/ChangeLog b/ChangeLog index 37e8c13e3e..127209f6e8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2004-04-11 Han-Wen Nienhuys + + * 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 * input/test/title-markup.ly: Add \noPagebreak test. @@ -6,8 +13,16 @@ 2004-04-11 Han-Wen Nienhuys - * 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 4d1033e0a8..33acbece80 100644 --- 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 5470fc5832..1e96bc5fb2 100644 --- 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 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 ef282d6b17..787b324204 100644 --- 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 64240acd9e..91808038f2 100644 --- 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 12b7d2bf24..ca343e448f 100644 --- 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 6cf9d04d7e..2ee0a90d2b 100644 --- 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 c4ae2ee4a0..cbb5a6c54b 100644 --- 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 a6ad8d66b8..eddc835d7d 100644 --- 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 699d0638c6..8c750ef92c 100644 --- 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 3e528ae1b6..3f9beefa72 100644 --- 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 6107ef347e..fb97f53a81 100644 --- 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 38fcfaa75e..0d8918ef46 100644 --- 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 c9339e1c1e..58672f9a6a 100644 --- 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 82b864ba0d..535c565e08 100644 --- 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 f0535243d6..2219f03f75 100644 --- 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 7b0d7b99b0..5d23a0f808 100644 --- 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 93ff125771..ae8ce9447f 100644 --- 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 813b21cc34..b748657b22 100644 --- 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 2a6696268d..8f77e80cee 100644 --- 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 0528f47422..cdd041dca5 100644 --- 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 f135e18f2b..3a4372d3fe 100644 --- 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 08334138ff..9d8b15f8e9 100644 --- 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 2b99fba152..23d3d05878 100644 --- 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 dd0459242c..6ab5ebe4d6 100644 --- 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 b51d384a74..03eb7a3af8 100644 --- 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 dd5b3c2c53..2dfad3904e 100644 --- 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 68ce73ab64..816c3040fb 100644 --- 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 d21bf06b13..dc51587374 100644 --- 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 6761ce6f3a..76d9c2b5da 100644 --- 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 c42ce24716..1f66c5e274 100644 --- 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 06a01c1ed5..bad1bd4155 100644 --- 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 9adcb2bc9b..d5289bd14f 100644 --- 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 4fd21b5371..c6a0f65a77 100644 --- 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 5cf5f99d82..6d6bb9aab0 100644 --- 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 d022ab1c1d..9c4e53db80 100644 --- 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 7bb331e6d4..ba828d3bcd 100644 --- 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 c0dae064c3..2c96ac2b4b 100644 --- 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 36bcd5f589..672376b01c 100644 --- 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