From d592fda35e240ccc2fb94c7a2440b95e269b12f7 Mon Sep 17 00:00:00 2001 From: fred Date: Wed, 27 Mar 2002 00:34:41 +0000 Subject: [PATCH] lilypond-1.3.117 --- Documentation/user/refman.itely | 18 +++++++++++++++--- lily/global-translator.cc | 4 ++-- lily/grace-engraver-group.cc | 4 ++-- lily/grace-performer-group.cc | 4 ++-- lily/include/global-translator.hh | 2 +- lily/include/grace-engraver-group.hh | 2 +- lily/include/grace-performer-group.hh | 2 +- lily/include/score-engraver.hh | 2 +- lily/include/score-performer.hh | 2 +- lily/score-engraver.cc | 2 +- lily/score-performer.cc | 5 +++-- 11 files changed, 30 insertions(+), 17 deletions(-) diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely index 90e9e53e42..381fb4f452 100644 --- a/Documentation/user/refman.itely +++ b/Documentation/user/refman.itely @@ -143,6 +143,8 @@ forbidden after top level assignments. +@unnumberedsubsec Comments + @cindex comment @indexcode{%} @@ -152,6 +154,8 @@ A one line comment is introduced by a `@code{%}' character. Block comments are started by `@code{%@{}' and ended by `@code{%@}}'. They cannot be nested. +@unnumberedsubsec Scheme + @indexcode{#} LilyPond contains a Scheme interpreter (the GUILE library) for @@ -173,6 +177,8 @@ the result is discarded. Example: [refer appendix/ online intro on Scheme] +@unnumberedsubsec Keywords + @cindex keyword Keywords start with a backslash, followed by a number of lower case @@ -191,12 +197,16 @@ script stylesheet skip textscript tempo translator transpose type @end example +@unnumberedsubsec Integers + @cindex integer Formed from an optional minus sign followed by digits. Arithmetic operations cannot be done with integers, and integers cannot be mixed with reals. +@unnumberedsubsec Reals + @cindex real @@ -216,10 +226,9 @@ centimeters, respectively. This converts the number to a real that is the internal representation of dimensions. - +@unnumberedsubsec @cindex string - Begins and ends with the `@code{"}' character. To include a `@code{"}' character in a string write `@code{\"}'. Various other backslash sequences have special interpretations as in the C language. A string @@ -228,7 +237,6 @@ that contains no spaces can be written without the quotes. See depending on the situation. Strings can be concatenated with the `@code{+}' operator. - The tokenizer accepts the following commands. They have no grammatical function, hence they can appear anywhere in the input. @@ -239,6 +247,8 @@ function, hence they can appear anywhere in the input. This command is used in init files to signal that the user file must be read. This command cannot be used in a user file. +@unnumberedsubsec file inclusion + @example \include@keyindex{include} @var{file} @end example @@ -247,6 +257,8 @@ Include @var{file}. The argument @var{file} may be a quoted string (an unquoted string will not work here!) or a string identifier. The full filename including the @file{.ly} extension must be given, +@unnumberedsubsec Version information + @example \version@keyindex{version} @var{string} ; @end example diff --git a/lily/global-translator.cc b/lily/global-translator.cc index eeb86e177e..61b724d40d 100644 --- a/lily/global-translator.cc +++ b/lily/global-translator.cc @@ -68,7 +68,7 @@ Global_translator::get_output_p() } void -Global_translator::process () +Global_translator::one_time_step () { } void @@ -97,6 +97,6 @@ Global_translator::run_iterator_on_me (Music_iterator * iter) prepare (w); iter->process (w); - process (); + one_time_step (); } } diff --git a/lily/grace-engraver-group.cc b/lily/grace-engraver-group.cc index 0f484ae35a..e02d09be25 100644 --- a/lily/grace-engraver-group.cc +++ b/lily/grace-engraver-group.cc @@ -66,10 +66,10 @@ Grace_engraver_group::Grace_engraver_group() } void -Grace_engraver_group::process () +Grace_engraver_group::one_time_step () { calling_self_b_ = true; - //process_music (); + process_music (); announces(); pre_move_processing(); check_removal(); diff --git a/lily/grace-performer-group.cc b/lily/grace-performer-group.cc index e1fc4503a8..f7d2929561 100644 --- a/lily/grace-performer-group.cc +++ b/lily/grace-performer-group.cc @@ -68,10 +68,10 @@ Grace_performer_group::Grace_performer_group() } void -Grace_performer_group::process () +Grace_performer_group::one_time_step () { calling_self_b_ = true; - //process_music (); + // process_music (); announces(); pre_move_processing(); check_removal(); diff --git a/lily/include/global-translator.hh b/lily/include/global-translator.hh index 34e9921142..1afb8483d1 100644 --- a/lily/include/global-translator.hh +++ b/lily/include/global-translator.hh @@ -31,7 +31,7 @@ public: virtual Music_output *get_output_p (); virtual void prepare (Moment); - virtual void process(); + virtual void one_time_step (); virtual void finish(); virtual void start(); diff --git a/lily/include/grace-engraver-group.hh b/lily/include/grace-engraver-group.hh index dfc0eb2ceb..2a47925d34 100644 --- a/lily/include/grace-engraver-group.hh +++ b/lily/include/grace-engraver-group.hh @@ -27,7 +27,7 @@ protected: virtual void announce_grob (Grob_info); virtual void start (); virtual void finish (); - virtual void process (); + virtual void one_time_step (); virtual void each (Method_pointer); virtual void finalize () ; virtual void typeset_grob (Grob*); diff --git a/lily/include/grace-performer-group.hh b/lily/include/grace-performer-group.hh index be96df4ce1..5d4b3400e1 100644 --- a/lily/include/grace-performer-group.hh +++ b/lily/include/grace-performer-group.hh @@ -25,7 +25,7 @@ protected: virtual void announce_element (Audio_element_info); virtual void start (); virtual void finish (); - virtual void process (); + virtual void one_time_step (); virtual void each (Method_pointer); virtual void finalize () ; virtual void play_element (Audio_element*); diff --git a/lily/include/score-engraver.hh b/lily/include/score-engraver.hh index 56618c7934..faeecc9127 100644 --- a/lily/include/score-engraver.hh +++ b/lily/include/score-engraver.hh @@ -40,7 +40,7 @@ public: protected: virtual void prepare (Moment); virtual void finish(); - virtual void process(); + virtual void one_time_step(); virtual int depth_i() const { return Global_translator::depth_i ();} protected: diff --git a/lily/include/score-performer.hh b/lily/include/score-performer.hh index 3abe6f1d99..b5999c53f6 100644 --- a/lily/include/score-performer.hh +++ b/lily/include/score-performer.hh @@ -27,7 +27,7 @@ public: protected: virtual void finish(); virtual void prepare (Moment mom); - virtual void process(); + virtual void one_time_step(); virtual void start(); virtual void initialize (); virtual void announce_element (Audio_element_info); diff --git a/lily/score-engraver.cc b/lily/score-engraver.cc index 9faf178ff6..71501fed7b 100644 --- a/lily/score-engraver.cc +++ b/lily/score-engraver.cc @@ -113,7 +113,7 @@ Score_engraver::finalize() } void -Score_engraver::process() +Score_engraver::one_time_step() { process_music(); announces(); diff --git a/lily/score-performer.cc b/lily/score-performer.cc index 317bc3ac9d..9c9d01e20e 100644 --- a/lily/score-performer.cc +++ b/lily/score-performer.cc @@ -65,9 +65,10 @@ Score_performer::prepare (Moment m) void -Score_performer::process() +Score_performer::one_time_step () { - //process_music(); + // fixme: put this back. + // process_music(); announces (); pre_move_processing(); check_removal(); -- 2.39.5