From: Mats Bengtsson Date: Mon, 5 Apr 1999 21:11:24 +0000 (+0200) Subject: patch::: 1.1.37.mb2: Re: LilyPond 1.1.37 X-Git-Tag: release/1.1.38~1 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=862cb234ae538fec06672800f2bd776afc50e6a8;p=lilypond.git patch::: 1.1.37.mb2: Re: LilyPond 1.1.37 pl 37.mb2 - Added property clefStyle: "" / "transparent" / "fullSizeChanges" - New example: input/test/incipit.ly - Documented clefStyle and restStyle in refman.tex - Partial bug fix: octaviated clefs. Still broken!!! --- Generated by (address unknown) using package-diff 0.62, >From = lilypond-1.1.37.mb1, To = lilypond-1.1.37.mb2 usage cd lilypond-source-dir; patch -E -p1 < lilypond-1.1.37.mb2.diff Patches do not contain automatically generated files or (urg) empty directories, i.e., you should rerun autoconf, configure and possibly make outdirs. --state 1.1.37.mb1 1.1.37.mb2 ++state --- diff --git a/Documentation/tex/refman.yo b/Documentation/tex/refman.yo index 251d65d461..2eba7062cd 100644 --- a/Documentation/tex/refman.yo +++ b/Documentation/tex/refman.yo @@ -1080,7 +1080,8 @@ mudela(center)( \clef baritone; c'4_"\kern -10mm baritone" \clef varbaritone; c'4^"\kern -10mm varbaritone" \clef tenor; c'4_"\kern -10mm tenor" - \clef "G_8"; c'4^"\kern -6mm G\_8" } +% \clef "G_8"; c'4^"\kern -6mm G\_8" %%% BROKEN! + } \paper{ linewidth= 4.5 \in; } } ) @@ -1573,13 +1574,18 @@ mudela(fragment,center)( } ) -COMMENT(Broken!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!) +dit(code(restStyle)) Change the layout of rests shorter than quarter notes. +Currently, the standard layout code(restStyle="") and mensural notation +code(restStyle="mensural") are available. +dit(code(clefStyle)) Determines how clefs are typeset. When set to +code(transparent), the clefs are not printed at all, when set to +code(fullSizeChanges), clef changes in the middle of a line are +typeset with a full size clef. By default, clef changes are typeset in +smaller size. ) - - subsubsubsect(GrandStaff properties) description( diff --git a/NEWS b/NEWS index c22ee296aa..c3ac0d70c3 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,15 @@ ---- ../lilypond-1.1.37/NEWS Wed Mar 31 21:50:35 1999 +--- ../lilypond-1.1.37.mb1/NEWS Wed Mar 31 22:12:22 1999 +++ b/NEWS Mon Apr 5 22:54:57 1999 +@@ -1,3 +1,9 @@ +pl 37.mb2 + - Added property clefStyle: "" / "transparent" / "fullSizeChanges" + - New example: input/test/incipit.ly + - Documented clefStyle and restStyle in refman.tex + - Partial bug fix: octaviated clefs. Still broken!!! + + pl 37.mb1 + - Added property restStyle. + - mensural 4th, 8th and 16th rests.--- ../lilypond-1.1.37/NEWS Wed Mar 31 21:50:35 1999 ++ b/NEWS Sun Apr 4 00:42:55 1999 @@ -1,4 +1,13 @@ pl 37.script1 diff --git a/VERSION b/VERSION index a412d44357..83b317ad9b 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=1 PATCH_LEVEL=37 -MY_PATCH_LEVEL=script1 +MY_PATCH_LEVEL=mb2 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/input/test/incipit.ly b/input/test/incipit.ly new file mode 100644 index 0000000000..150367dbbb --- /dev/null +++ b/input/test/incipit.ly @@ -0,0 +1,36 @@ +%{ + Test of how to make an ``incipit'' to indicate scordatora + tuning of a violin part, using the clefStyle property. + The two first bars of Biber's Rosary sonata III. + + /Mats B +%} + +\version "1.0.14"; + +incipit = \notes\relative c'{ + +} + +violin = \notes\relative c''{ + \specialkey \keysignature f' fis'' g' gis''; + \time 2/2; + + a4. b8 c4 fis | + gis~ gis8 fis16^\trill ()e b8 c \type Staff<{\voiceone a d}{\voicetwo es,4}>| +} + +\score{ + \notes{ + \property Staff.clefStyle = "transparent" + \incipit + \property Staff.clefStyle = "fullSizeChanges" \clef "treble"; \bar ""; + \violin + } + \paper{ + \translator{\StaffContext + timeSignatureStyle = "C"; + } + } +} + diff --git a/lily/clef-engraver.cc b/lily/clef-engraver.cc index da300420b1..0e0c79cc84 100644 --- a/lily/clef-engraver.cc +++ b/lily/clef-engraver.cc @@ -190,6 +190,11 @@ Clef_engraver::create_clef() { Clef_item *c= new Clef_item; c->set_elt_property (break_priority_scm_sym, gh_int2scm (-2)); // ugh + String clefstyle = get_property ("clefStyle", 0); + if (clefstyle.length_i ()) + c->set_elt_property (style_scm_sym, + gh_str02scm (clefstyle.ch_C())); + announce_element (Score_element_info (c, clef_req_l_)); clef_p_ = c; } diff --git a/lily/clef-item.cc b/lily/clef-item.cc index 282bd535ec..2e65640039 100644 --- a/lily/clef-item.cc +++ b/lily/clef-item.cc @@ -19,10 +19,15 @@ void Clef_item::do_pre_processing() { dim_cache_[Y_AXIS].translate (y_position_i_ * staff_line_leading_f () / 2.0); - if (break_status_dir() != RIGHT) - { - symbol_ += "_change"; - } + SCM style_sym =get_elt_property (style_scm_sym); + String style; + if (style_sym != SCM_BOOL_F) + style = ly_scm2string (SCM_CDR(style_sym)); + + if (break_status_dir() != RIGHT && style != "fullSizeChanges") + symbol_ += "_change"; + if (style == "transparent") + set_elt_property (transparent_scm_sym, SCM_BOOL_T); } /* @@ -46,7 +51,7 @@ Clef_item::do_add_processing () SCM octave_dir = remove_elt_property (octave_dir_scm_sym); if (octave_dir != SCM_BOOL_F) { - Direction d = Direction (gh_int2scm (SCM_CDR(octave_dir))); + Direction d = Direction (gh_scm2int (SCM_CDR(octave_dir))); g = new G_text_item; pscore_l_->typeset_element (g);