From 3cd9f51c1faddb92fa36706601be496398cc2886 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Fri, 27 Feb 2004 01:07:14 +0000 Subject: [PATCH] * make/lilypond.redhat.spec.in (Group): add/delete music-glossary too. * ly/engraver-init.ly: move \grobdescriptions to Global. This fixes problems with system defaults being reverted with \override on Score level. * lily/global-context.cc (Global_context): apply property-ops to Global_context too. --- ChangeLog | 11 ++++++++ Documentation/user/refman.itely | 2 +- Documentation/user/tutorial.itely | 45 +++++++++++++------------------ lily/global-context.cc | 4 +-- ly/engraver-init.ly | 7 ++--- make/lilypond.redhat.spec.in | 4 ++- 6 files changed, 40 insertions(+), 33 deletions(-) diff --git a/ChangeLog b/ChangeLog index 80e2795582..d5922f7d99 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2004-02-27 Han-Wen Nienhuys + + * make/lilypond.redhat.spec.in (Group): add/delete music-glossary too. + + * ly/engraver-init.ly: move \grobdescriptions to Global. This + fixes problems with system defaults being reverted with \override + on Score level. + + * lily/global-context.cc (Global_context): apply property-ops to + Global_context too. + 2004-02-27 Jan Nieuwenhuizen * scm/output-ps.scm (stencil->string): Rewrite. diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely index f1c7160a5c..1e9cfc7f9f 100644 --- a/Documentation/user/refman.itely +++ b/Documentation/user/refman.itely @@ -4529,7 +4529,7 @@ those will be ignored. In orchestral scores, staff lines that only have rests are usually removed. This saves some space. This style is called `French Score'. -For @internalsref{Lyrics}, @internalsref{Lyrics}, +For @internalsref{Lyrics}, @internalsref{ChordNames} and @internalsref{FiguredBass}, this is switched on by default. When these line of these contexts turn out empty after the line-breaking process, they are removed. diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely index 691ef6e583..7bcc00e54c 100644 --- a/Documentation/user/tutorial.itely +++ b/Documentation/user/tutorial.itely @@ -205,20 +205,9 @@ to @rglos{lyrics}) follows: f4 e d c2 r4 @} @end example -Now the piece of music is almost ready to be printed. The final step is to -combine the music with a printing command. - -The printing command is the so-called @code{\paper} block: - -@example -\paper @{ @} -@end example - -The @code{\paper} block is used to customize printing specifics. The -customization commands go between @code{@{} and @code{@}}, but for -now, we will accept the defaults. The music and the @code{\paper} block -are combined by enclosing them in @code{\score @{ ... @}}, so the -following is a complete and valid input file: +Now the piece of music is almost ready to be printed. Enclosing the +music in a @code{\score} processes them to printed output, +so the following is a complete and valid input file: @example \score @{ @@ -228,7 +217,6 @@ following is a complete and valid input file: c2 e4 g2. f4 e d c2 r4 @} - \paper @{ @} @} @end example @@ -246,9 +234,9 @@ following is a complete and valid input file: } @end lilypond -In the rest of the tutorial we will often leave out @code{\score} -and @code{\paper} for clarity. However, both must be present when -feeding the file to LilyPond. +In many examples in this manual, @code{\score} is left out for +clarity. However, it must be present when feeding the file to +LilyPond. For more elaborate information on @@ -487,7 +475,6 @@ This example shows the key signature, accidentals and ties in action: fis4 fis8 fis8 eis4 a8 gis~ gis2 r2 @} - \paper @{ @} @} @end example @@ -761,7 +748,6 @@ We can now typeset a melody with two staves: f4 e d c2. } >> - \paper {} } @end lilypond @end quotation @@ -1094,7 +1080,6 @@ The final result is } \lyricsto "" \new Lyrics \lyrics { I want to break free } >> - \paper{ } } @end lilypond @@ -1116,7 +1101,6 @@ line}. It is entered as two underscores, i.e. \times 2/3 { f g g } \times 2/3 { g4( a2) } } \lyricsto "" \new Lyrics \lyrics { I want to break free __ } >> - \paper{ } } @end lilypond @@ -1190,7 +1174,6 @@ a lead sheet, for example, \notes @emph{the melody} \lyricsto "" \new Lyrics \lyrics @{ @emph{the text} @} >> - \paper @{ @} @} @end example @lilypond[] @@ -1225,13 +1208,11 @@ It is great for checking the music: octaves that are off or accidentals that were mistyped stand out very much when listening to the musical transcription. -@code{\midi} can be used in similarly to @code{\paper @{ @}}, for -example, +The @code{\midi} block is added to @code{\score}, for example, @example \score @{ @var{..music..} \midi @{ \tempo 4=72 @} - \paper @{ @} @} @end example @@ -1240,7 +1221,19 @@ case the tempo of quarter notes is set to 72 beats per minute. More information on auditory output is in the @ref{Sound} section in the notation manual. +If there is a @code{\midi} command in a @code{\score}, then only MIDI +will be produced. If notation is needed too, then a @code{\paper} +block must be added too: + +@example +\score @{ + @var{..music..} + \midi @{ \tempo 4=72 @} + \paper @{ @} +@} +@end example +@cindex paper block @node Titling @section Titling diff --git a/lily/global-context.cc b/lily/global-context.cc index 154aca011d..3ecf6110e3 100644 --- a/lily/global-context.cc +++ b/lily/global-context.cc @@ -20,9 +20,9 @@ Global_context::Global_context (Music_output_def*o) { output_def_ = o; - accepts_list_ = scm_list_n (ly_symbol2scm ("Score"), - SCM_UNDEFINED); definition_ = o->find_context_def (ly_symbol2scm ("Global")); + unsmob_context_def (definition_)->apply_default_property_operations (this); + } Music_output_def* diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly index 8f6de86a97..8fe1b2a63a 100644 --- a/ly/engraver-init.ly +++ b/ly/engraver-init.ly @@ -4,8 +4,10 @@ \name Global \accepts Score -\description "Hard coded entry point for LilyPond. Cannot be tuned." - } + \description "Hard coded entry point for LilyPond. Cannot be tuned." + \grobdescriptions #all-grob-descriptions + +} % % setup for Request->Element conversion. Guru-only @@ -559,7 +561,6 @@ AncientRemoveEmptyStaffContext = \translator { (Voice Slur direction -1) ) - \grobdescriptions #all-grob-descriptions } OrchestralScoreContext = \translator { diff --git a/make/lilypond.redhat.spec.in b/make/lilypond.redhat.spec.in index 88421d3fd1..f9ec0d9d7e 100644 --- a/make/lilypond.redhat.spec.in +++ b/make/lilypond.redhat.spec.in @@ -54,7 +54,7 @@ make -C Documentation # make html make web -make -C Documentation/user omf +make -C Documentation/user local_package_docdir=%{docdir} omf %install @@ -89,6 +89,7 @@ rm `find /var/lib/texmf -name 'feta*pk' -or -name 'feta*tfm' -or -name 'parmesan %if %{info} /sbin/install-info %{_infodir}/lilypond.info.gz %{_infodir}/dir +/sbin/install-info %{_infodir}/music-glossary.info.gz %{_infodir}/dir %endif # chkfontpath --add=%{_datadir}/lilypond/@TOPLEVEL_VERSION@/fonts/type1/ @@ -101,6 +102,7 @@ echo 'Please logout first before using LilyPond.' %if %{info} if [ $1 = 0 ]; then /sbin/install-info --delete %{_infodir}/lilypond.info.gz %{_infodir}/dir + /sbin/install-info --delete %{_infodir}/music-glossary.info.gz %{_infodir}/dir fi %endif -- 2.39.5