release commit

diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely
index 5ddd7c93ea96e673700e6455ec99e405cbde09cd..169cccfce1afccb1ba87c48268b05cbd4dde7d0e 100644 (file)
--- 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 181d0413a90f9e200ca5b22423457ed7445b5546..81cd61d2acac9f9b1328028c4b08d77cb85fd412 100644 (file)
--- 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 (file)
index 0000000..e69de29

diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc
index 773f072aa350ea52d1e24f651d17fdff1b5359f8..5526aebf35e465a071d91b29915da0509ec43376 100644 (file)
--- 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 9e48ad955397f2917fb281bcb5d21fbec9e5da83..77414e7d8a0765f560096a319771ff91d4786b85 100644 (file)
--- 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
            {