X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Fdstream.cc;h=28f7a472aaf491ee7e0b38e00cf1b5a76ba7a6e9;hb=63c9cee8ce190aaae4a5db3d2e200d35a570838d;hp=f22365bf551f520c8a26a114b187bc35f3df1f46;hpb=4c5b1c14d1474af33002a4ba9e8584647c4ad8c0;p=lilypond.git diff --git a/flower/dstream.cc b/flower/dstream.cc index f22365bf55..28f7a472aa 100644 --- a/flower/dstream.cc +++ b/flower/dstream.cc @@ -58,7 +58,7 @@ Dstream::identify_as (String name) idx = cl; else { - (*silent_assoc_p_)[idx] = false; + (*silent_assoc_p_)[idx] = default_silence_b_; } local_silence_b_ = (*silent_assoc_p_)[idx]; if (current_classname_str_ != idx && !local_silence_b_) @@ -138,6 +138,7 @@ Dstream::Dstream (ostream *r, char const * cfg_nm) { os_l_ = r; silent_assoc_p_ = new Assoc; + default_silence_b_ = false; indent_level_i_ = 0; if (!os_l_) return; @@ -160,6 +161,8 @@ Dstream::Dstream (ostream *r, char const * cfg_nm) (*silent_assoc_p_)[r[0]] = (bool)(int)(Scalar (r[1])); } + if ((*silent_assoc_p_).elt_b ("Dstream_default_silence")) + default_silence_b_ = (*silent_assoc_p_)["Dstream_default_silence"]; }