From 1e85d20ff7a774b67da50ab6f3bf2ef8c42f086e Mon Sep 17 00:00:00 2001 From: hanwen Date: Thu, 12 Feb 2004 17:30:25 +0000 Subject: [PATCH] release commit --- Documentation/user/refman.itely | 10 ++++------ Documentation/user/tutorial.itely | 10 +++++----- lily/include/context.hh | 0 lily/lily-guile.cc | 2 +- lily/translator-property.cc | 9 +++++---- 5 files changed, 15 insertions(+), 16 deletions(-) create mode 100644 lily/include/context.hh diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely index 5ddd7c93ea..169cccfce1 100644 --- a/Documentation/user/refman.itely +++ b/Documentation/user/refman.itely @@ -296,9 +296,6 @@ a quarter note is entered using a @code{4} (since it is a 1/4 note), while a half note is entered using a @code{2} (since it is a 1/2 note). For notes longer than a whole you must use variables: -@c FIXME: what is an identifier? I do not think it's been introduced yet. -@c and if it has, I obviously skipped that part. - Graham - @example c'\breve c'1 c'2 c'4 c'8 c'16 c'32 c'64 c'64 @@ -318,8 +315,8 @@ r1 r2 r4 r8 r16 r32 r64 r64 \translator { \StaffContext \remove "Clef_engraver" - \remove "Staff_symbol_engraver" - \remove "Time_signature_engraver" + StaffSymbol \set #'transparent = ##t + TimeSignature \set #'transparent = ##t \consists "Pitch_squash_engraver" } } @@ -728,7 +725,7 @@ by replacing the @internalsref{Note_heads_engraver} by the In the following examples, notes crossing the barline are split and tied. -@lilypond[noindent,verbatim] +@lilypond[noindent,verbatim,relative=1] \new Voice \with { \remove "Note_heads_engraver" \consists "Completion_heads_engraver" @@ -3623,6 +3620,7 @@ To apply, add the @internalsref{Ambitus_engraver} to the @end example This results in the following output: + @lilypond[raggedright] upper = \notes \relative c { \clef "treble" diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely index 181d0413a9..81cd61d2ac 100644 --- a/Documentation/user/tutorial.itely +++ b/Documentation/user/tutorial.itely @@ -1084,7 +1084,7 @@ aligned. In this case, there is only one melody, so we can leave it empty. The final result is -@lilypond[verbatim,linewidth=6.0\cm] +@lilypond[verbatim,fragment] \score { \notes << \relative c' \new Voice { @@ -1107,7 +1107,7 @@ line}. It is entered as two underscores, i.e. @example \lyrics @{ I want to break free __ @} @end example -@lilypond[] +@lilypond[raggedright] \score { \notes << \relative c' \new Voice { @@ -1773,8 +1773,8 @@ If you use HTML, La@TeX{}, or Texinfo, you can mix text and LilyPond code. A script called @code{lilypond-book} will extract the music fragments, run LilyPond on them, and put back the resulting notation. This program is fully described in @ref{lilypond-book manual}. Here -we show a small example; since the example contains also explanatory -text, we will not comment it further: +we show a small example. The example contains also explanatory text, +so we will not comment it further: @example \documentclass[a4paper]@{article@} @@ -1818,7 +1818,7 @@ $ mkdir -p out/ $ lilypond-book --output=out/ lilybook.tex lilypond-book (GNU LilyPond) 2.1.19 Reading `input/tutorial/lilybook.tex' -Reading `input/screech-boink6.ly' +Reading `input/screech-boink.ly' @var{lots of stuff deleted} Writing `out/lilybook.latex' $ cd out diff --git a/lily/include/context.hh b/lily/include/context.hh new file mode 100644 index 0000000000..e69de29bb2 diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc index 773f072aa3..5526aebf35 100644 --- a/lily/lily-guile.cc +++ b/lily/lily-guile.cc @@ -786,7 +786,7 @@ alist_to_hashq (SCM alist) return tab; } -#if 1 +#if 0 /* Debugging mem leaks: */ diff --git a/lily/translator-property.cc b/lily/translator-property.cc index 9e48ad9553..77414e7d8a 100644 --- a/lily/translator-property.cc +++ b/lily/translator-property.cc @@ -64,11 +64,12 @@ execute_pushpop_property (Translator_group * trg, if (gh_pair_p (prev_alist) || prev_alist == SCM_EOL) { bool ok = type_check_assignment (eltprop, val, ly_symbol2scm ("backend-type?")); - + + /* + tack onto alist: + */ if (ok) - { - gh_set_car_x (prev, scm_acons (eltprop, val, prev_alist)); - } + gh_set_car_x (prev, scm_acons (eltprop, val, prev_alist)); } else { -- 2.39.5