]> git.donarmstrong.com Git - lilypond.git/commitdiff
lilypond-1.3.90
authorfred <fred>
Tue, 26 Mar 2002 23:56:02 +0000 (23:56 +0000)
committerfred <fred>
Tue, 26 Mar 2002 23:56:02 +0000 (23:56 +0000)
64 files changed:
DEDICATION
Documentation/user/GNUmakefile
Documentation/user/mudela-book.tely
Documentation/user/properties.itely
Documentation/user/refman.itely
NEWS
input/test/non-empty-text.ly
input/test/slur-positions.ly [new file with mode: 0644]
lily/beam.cc
lily/include/staff-symbol.hh
lily/multi-measure-rest.cc
lily/slur.cc
lily/stem.cc
ly/engraver.ly
mutopia/Coriolan/bassi-part.ly
mutopia/Coriolan/bassi.ly
mutopia/Coriolan/c-midi.ly [new file with mode: 0644]
mutopia/Coriolan/clarinetti-part.ly
mutopia/Coriolan/clarinetti.ly
mutopia/Coriolan/clarinetto-1.ly
mutopia/Coriolan/clarinetto-2.ly
mutopia/Coriolan/contrabasso.ly
mutopia/Coriolan/coriolan-paper.ly
mutopia/Coriolan/coriolan-part-combine-paper.ly
mutopia/Coriolan/coriolan-part-paper.ly
mutopia/Coriolan/coriolan.ly
mutopia/Coriolan/corni-part.ly
mutopia/Coriolan/corni.ly
mutopia/Coriolan/corno-1.ly
mutopia/Coriolan/corno-2.ly
mutopia/Coriolan/fagotti-part.ly
mutopia/Coriolan/fagotti.ly
mutopia/Coriolan/fagotto-1.ly
mutopia/Coriolan/fagotto-2.ly
mutopia/Coriolan/flauti-part.ly
mutopia/Coriolan/flauti.ly
mutopia/Coriolan/flauto-1.ly
mutopia/Coriolan/flauto-2.ly
mutopia/Coriolan/global.ly
mutopia/Coriolan/music.ly
mutopia/Coriolan/oboe-1.ly
mutopia/Coriolan/oboe-2.ly
mutopia/Coriolan/oboi-part.ly
mutopia/Coriolan/oboi.ly
mutopia/Coriolan/timpani-part.ly
mutopia/Coriolan/timpani.ly
mutopia/Coriolan/trombe-part.ly
mutopia/Coriolan/trombe.ly
mutopia/Coriolan/trombo-1.ly
mutopia/Coriolan/trombo-2.ly
mutopia/Coriolan/viola-1.ly
mutopia/Coriolan/viola-2.ly
mutopia/Coriolan/violi-part.ly
mutopia/Coriolan/violi.ly
mutopia/Coriolan/violino-1-part.ly
mutopia/Coriolan/violino-1.ly
mutopia/Coriolan/violino-2-part.ly
mutopia/Coriolan/violino-2.ly
mutopia/Coriolan/violoncello.ly
scm/basic-properties.scm
scm/lily.scm
scm/paper.scm
scm/slur.scm
scripts/ly2dvi.py

index 03d11e0b40b5849bc3d00b97a52fee29ce607db1..f6647fe0f1d23df1b2aa14c2782d5affefa540ae 100644 (file)
@@ -5,10 +5,9 @@
                         met through music. 
 
 
-       Those deserving special mentioning (in no particular order):
-Esther, Marijke, Heike, Inge, Judith, Hannah, Auke, Ilse, Evelyn,
-Maartje, Suzanne, Ilse (gee, again?) and last (but certainly not
-least) Janneke!
+       Those deserving special mentioning (in no particular order): Esther,
+Marijke, Heike, Inge, Judith, Hannah, Auke, Ilse, Evelyn, Maartje, Suzanne,
+Ilse (gee, again?), Irene and last (but certainly not least) Janneke!
 
        HWN
 
index a045e99d94fd7561b58886dda0e4951203e1b822..6b7186af4beebaf159f9423fd5a19721005a81c7 100644 (file)
@@ -6,7 +6,9 @@ depth=../..
 
 LATEX_FILES =$(wildcard *.latex)
 
-DVI_FILES = $(addprefix $(outdir)/,$(LATEX_FILES:.latex=.dvi)   $(TELY_FILES:.tely=.dvi))
+
+# todo: add latex.
+DVI_FILES = $(addprefix $(outdir)/, $(TELY_FILES:.tely=.dvi))
 
 EXTRA_DIST_FILES= $(LATEX_FILES)    $(wildcard *.itexi *.itely)
 
index cc16d7740373f3b15201896ec261e992ac2d9bde..b135ca2f9012a2cad3c099475f1ee5bba6281490 100644 (file)
@@ -125,7 +125,7 @@ These commands should be in the beginning of the document:
 @end itemize
 @code{@@pagesizes} are not supported.
 
-@subsection{Examples}
+@subsection Examples
 
 Two simple examples. First a complete block:
 
@@ -150,7 +150,7 @@ and its music:
 @mudela[11pt]{<c' e' g'>}
 
 
-@subsection{@@example and @@code}
+@subsection @@example and @@code
 
 I'm not sure if this will go into the final documentation, this is
 here mostly to remember me on why things are the way they are.
@@ -221,7 +221,7 @@ to whatever he wants.
 @strong{[UGH: THIS DOES NOT HAPPEN WHEN
 YOU USE THE SHORT FORM, \MUDELA@{ ... @}, CHECK OUT WHY]}
 
-@subsection{@code{landscape} package}
+@subsection @code{landscape} package 
 There is some simple support for landscape paper format, and this
 can be combined with the @code{\twocolumn} command. Only a4 and
 letter paper is supported, more to come...
@@ -241,7 +241,7 @@ BLA BLA BLA
 \end@{document@}
 @end example
 
-@subsection{Examples}
+@subsection Examples 
 
 @example
 \begin[26pt]@{mudela@}
@@ -265,7 +265,7 @@ and its music:
 @mudela[11pt]{<c' e' g'>}
 
 
-@subsection{\begin@{verbatim@} and \verb|\verb|}
+@subsection \begin@{verbatim@} and \verb|\verb| 
 
 There work just as expected. Look at @file{mb-latex.tex} for details.
 
@@ -395,7 +395,7 @@ The La@TeX{} \includeonly@{...@} command is ignored.
 
 Ignores almost all La@TeX{} commands that changes margins and linewidths.
 
-La@TeX{} comments can confuse command{mudela-book}:
+La@TeX{} comments can confuse @command{mudela-book}:
 @example
 % this music will be displayed: \mudela@{c d e@}
 @end example
index 63b40860eb377d330ed4cf355f1cccd7f4a73820..6bb4426d224cc779b239a94251a5c3687ab29b35 100644 (file)
@@ -300,7 +300,7 @@ r\longa r\breve r1 r2 r4 r8 r16 r32 r64 r128 r128
 @end mudela            
 
 @item @code{stemLength}@indexcode{stemLength}  
-    Set length of stems.  Unit is `@code{interline}/2', so
+    Set length of stems.  Unit is `@code{staffspace}/2', so
     @code{stemLength} defaults to 7.
 @mudela[verbatim]
 g''4 \property Voice.stemLength = #14  g4 \property Voice.stemLength = #3 g4  g,,4  
index cd3031405803f42b54634b432664f1dce6994376..47df65e699180709dbf978643370140cbd526b17 100644 (file)
@@ -696,7 +696,7 @@ r1 r2 r4 r8 r16 r32 r64 r64
     r1 r2 r4 r8 r16 r32 r64 r64 
   }
   \paper {
-    loose_column_distance = 2.5 * \interline;
+    loose_column_distance = 2.5 * \staffspace;
     linewidth = -1.0;
     \translator {
        \StaffContext
@@ -2471,7 +2471,7 @@ Nevertheless, here are some variables you may want to use or change:
   @item @code{indent}@indexcode{indent}  
     The indentation of the first line of music.
 
-  @item @code{interline}@indexcode{interline}  
+  @item @code{staffspace}@indexcode{staffspace}
     The distance between two staff lines, calculated from the center
     of the lines.  You should use either this or @code{rulethickness}
     as a unit for distances you modify.
diff --git a/NEWS b/NEWS
index f2da758e4516e273c10cb6c9adb8c80380da20a0..277bd59a82db862a2c43843d03446503cc7a91ef 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,8 @@
 
 * Point and click functionality using emacs and Xdvi.
 
+* Automatic part combining for orchestral scores.
+
 * Improved design and implementation: Complete rewrite of the
 internals: LilyPond is smaller, cleaner, more flexible, etc.
 
@@ -10,6 +12,9 @@ internals: LilyPond is smaller, cleaner, more flexible, etc.
  - Improved speed (undone for now, by .73 + .74), 
    with comparable memory footprint
 
+ - More tweakability using less memory with new property push
+  mechanism.
+
  - Improved robustness: Lily almost never crashes.
 
 * Piano pedal support
index 7054d872f6b7f4167eebaa9809e16f15cac2067b..03030e0b151d7d1fa22fce07a3917fd50b0a6241 100644 (file)
@@ -4,7 +4,10 @@
 %
 \score{
        \notes\relative c''{
-               \property Staff.textNonEmpty=##t
+%%%            \property Staff.textNonEmpty=##t
+%%% burp?
+               \context Staff \property basicTextScriptProperties \pop #'no-spacing-rods
+               \context Staff \property Staff.basicTextScriptProperties \push #'no-spacing-rods = ##f
                c4_"longlonglonglonglonglong" c4_"text" 
                }
          \paper{
diff --git a/input/test/slur-positions.ly b/input/test/slur-positions.ly
new file mode 100644 (file)
index 0000000..f78dd10
--- /dev/null
@@ -0,0 +1,17 @@
+\score{
+       \notes\relative c''{
+               \slurup
+               a2 () a\break
+               \slurdown
+               a2 () a\break
+               \slurup
+               c2 () c\break
+               \slurdown
+               c2 () c\break
+
+       }
+       \paper{
+               linewidth=-1.\mm;
+       }
+}
+
index 124dc7f9c06f70fa03f4f8d58492e2e480def09b..10bf8d82e8f3e3878f0eeb3822a54c4b45ff9421 100644 (file)
@@ -94,9 +94,6 @@ Beam::before_line_breaking (SCM smob)
   return SCM_EOL;
 }
 
-/*
- FIXME
- */
 Direction
 Beam::get_default_dir (Score_element*me) 
 {
@@ -124,14 +121,13 @@ Beam::get_default_dir (Score_element*me)
 
     } while (flip(&d) != DOWN);
   
+  SCM func = me->get_elt_property ("dir-function");
+  SCM s = gh_call2 (func,
+                   gh_cons (gh_int2scm (count[UP]),
+                            gh_int2scm (count[DOWN])),
+                   gh_cons (gh_int2scm (total[UP]),
+                            gh_int2scm (total[DOWN])));
 
-  SCM s = scm_eval2 (gh_list (ly_symbol2scm ("beam-dir-algorithm"),
-                            ly_quote_scm (gh_cons (gh_int2scm (count[UP]),
-                                                   gh_int2scm (count[DOWN]))),
-                            ly_quote_scm (gh_cons (gh_int2scm (total[UP]),
-                                                   gh_int2scm (total[DOWN]))),
-                            SCM_UNDEFINED),
-                    SCM_EOL);
   if (gh_number_p (s) && gh_scm2int (s))
     return to_dir (s);
   
@@ -244,9 +240,7 @@ Beam::set_stem_shorten (Score_element*m)
 
   int multiplicity = get_multiplicity (me);
 
-  // grace stems?
-  SCM shorten = scm_eval2 (ly_symbol2scm ("beamed-stem-shorten"), SCM_EOL);
-
+  SCM shorten = me->get_elt_property ("beamed-stem-shorten");
   if (shorten == SCM_EOL)
     return;
 
@@ -452,10 +446,10 @@ Beam::calc_stem_y_f (Score_element*me,Item* s, Real y, Real dy)
 
   Real staffspace = me->paper_l ()->get_var ("staffspace");
   
-  SCM space_proc = me->get_elt_property ("beam-space-function");
+  SCM space_proc = me->get_elt_property ("space-function");
   SCM space = gh_call1 (space_proc, gh_int2scm (beam_multiplicity));
 
-  Real thick = gh_scm2double (me->get_elt_property ("beam-thickness")) *staffspace;
+  Real thick = gh_scm2double (me->get_elt_property ("thickness")) *staffspace;
   Real interbeam_f = gh_scm2double (space) * staffspace;
 
   // ugh -> use commonx
@@ -556,8 +550,14 @@ Real
 Beam::quantise_dy_f (Score_element*me,Real dy) 
 {
   Array<Real> a;
-  for (SCM s = scm_eval2 (ly_symbol2scm ("beam-height-quants"), SCM_EOL);
-       s !=SCM_EOL; s = gh_cdr (s))
+
+  SCM proc = me->get_elt_property ("height-quants");
+  SCM quants = gh_call2 (proc, me->self_scm (),
+                        gh_double2scm (me->paper_l ()->get_var ("stafflinethickness")
+                                       / me->paper_l ()->get_var ("staffspace")));
+  
+  
+  for (SCM s = quants; gh_pair_p (s); s = gh_cdr (s))
     a.push (gh_scm2double (gh_car (s)));
   
   if (a.size () <= 1)
@@ -587,15 +587,20 @@ Beam::quantise_y_f (Score_element*me,Real y, Real dy, int quant_dir)
   int multiplicity = get_multiplicity (me);
 
   Real staff_space = Staff_symbol_referencer::staff_space (me);
-  SCM quants = scm_eval2 (gh_list (ly_symbol2scm ("beam-vertical-position-quants"),
-                                 gh_int2scm (multiplicity),
-                                 gh_double2scm (dy/staff_space),
-                                 SCM_UNDEFINED),
-                         SCM_EOL);
+  Real thick = me->paper_l ()->get_var ("stafflinethickness");
+
 
+  SCM proc = me->get_elt_property ("vertical-position-quant-function");
+  SCM quants = scm_apply (proc,
+                         me->self_scm (),
+                         gh_list (gh_int2scm (multiplicity),
+                                  gh_double2scm (dy/staff_space),
+                                  gh_double2scm (thick/staff_space),
+                                  SCM_EOL, SCM_UNDEFINED));
+  
   Array<Real> a;
 
-  for (; quants != SCM_EOL; quants = gh_cdr (quants))
+  for (; gh_pair_p (quants); quants = gh_cdr (quants))
     a.push (gh_scm2double (gh_car (quants)));
 
   if (a.size () <= 1)
@@ -635,8 +640,7 @@ Beam::set_beaming (Score_element*me,Beaming_info_list *beaming)
 /*
   beams to go with one stem.
 
-  BURP
-  clean  me up.
+  FIXME: clean me up.
   */
 Molecule
 Beam::stem_beams (Score_element*me,Item *here, Item *next, Item *prev) 
@@ -650,10 +654,10 @@ Beam::stem_beams (Score_element*me,Item *here, Item *next, Item *prev)
   int multiplicity = get_multiplicity (me);
   Real staffspace =me->paper_l ()->get_var ("staffspace");
 
-  SCM space_proc = me->get_elt_property ("beam-space-function");
+  SCM space_proc = me->get_elt_property ("space-function");
   SCM space = gh_call1 (space_proc, gh_int2scm (multiplicity));
 
-  Real thick = gh_scm2double (me->get_elt_property ("beam-thickness")) *staffspace;
+  Real thick = gh_scm2double (me->get_elt_property ("thickness")) *staffspace;
   Real interbeam_f = gh_scm2double (space) * staffspace;
     
   Real bdy = interbeam_f;
@@ -669,16 +673,13 @@ Beam::stem_beams (Score_element*me,Item *here, Item *next, Item *prev)
   Molecule leftbeams;
   Molecule rightbeams;
 
-  /*
-    UGH: make a property of this.
-  */
   Real nw_f;
   if (!Stem::first_head (here))
     nw_f = 0;
   else {
     int t = Stem::type_i (here); 
 
-    SCM proc = me->get_elt_property ("beam-flag-width-function");
+    SCM proc = me->get_elt_property ("flag-width-function");
     SCM result = gh_call1 (proc, gh_int2scm (t));
     nw_f = gh_scm2double (result) * staffspace;
   }
@@ -720,7 +721,7 @@ Beam::stem_beams (Score_element*me,Item *here, Item *next, Item *prev)
       int j = 0;
       Real gap_f = 0;
 
-      SCM gap = me->get_elt_property ("beam-gap");
+      SCM gap = me->get_elt_property ("gap");
       if (gh_number_p (gap))
        {
          int gap_i = gh_scm2int ( (gap));
index f78c4542bc2737fff8c5a3f35cb3c949ae3c63f3..b854b76dfd5f58739f585f43d32f23fac3db617f 100644 (file)
@@ -15,6 +15,8 @@
 /**
   This spanner draws the lines of a pstaff.
   The bottom line is position 0.
+
+  TODO: add stafflinethickness as parameter.
   */
 class Staff_symbol 
 {
index 7655ed74a87174b9dfc0911310df7c0a11a7fe46..37538e28bee2fc63ffdd61158cf2414a172dd124 100644 (file)
@@ -41,8 +41,7 @@ Multi_measure_rest::brew_molecule (SCM smob)
 {
   Score_element *me = unsmob_element (smob);
   Spanner * sp = dynamic_cast<Spanner*> (me);
-  Real staff_space
-    = Staff_symbol_referencer::staff_space (me);
+  Real staff_space = Staff_symbol_referencer::staff_space (me);
 
   Interval sp_iv;
   Direction d = LEFT;
@@ -174,6 +173,7 @@ Multi_measure_rest::set_spacing_rods (SCM smob)
   Item * rb = r->find_prebroken_piece (LEFT);      
   
   Item* combinations[4][2]={{l,r}, {lb,r}, {l,rb},{lb,rb}};
+  Real staff_space = Staff_symbol_referencer::staff_space (me);
   for (int i=0; i < 4; i++)
     {
       Item * l =  combinations[i][0];
@@ -190,7 +190,7 @@ Multi_measure_rest::set_spacing_rods (SCM smob)
          should do something more advanced.
         */
       rod.distance_f_ = l->extent (X_AXIS)[BIGGER] - r->extent (X_AXIS)[SMALLER]
-       + gh_scm2double (me->get_elt_property ("minimum-width"));
+       + gh_scm2double (me->get_elt_property ("minimum-width")) * staff_space;
   
       rod.add_to_cols ();
     }
index 0ef9b482993d750a14c5e65bae3655798b41d10a..a55a77812fe7869426af5efbfb09cb0d22d6adfa 100644 (file)
@@ -133,12 +133,7 @@ Slur::set_extremities (Score_element*me)
     {
       if (!gh_symbol_p (index_cell (me->get_elt_property ("attachment"), dir)))
        {
-         
-         // for (SCM s = get_elt_property ("slur-extremity-rules"); s != SCM_EOL; s = gh_cdr (s))
-
-         // FIXME: global GUILE scope used!
-         for (SCM s = scm_eval2 (ly_symbol2scm ("slur-extremity-rules"),
-                                 SCM_EOL);
+         for (SCM s = me->get_elt_property ("extremity-rules");
               s != SCM_EOL; s = gh_cdr (s))
            {
              SCM r = gh_call2 (gh_caar (s), me->self_scm (),
@@ -233,7 +228,7 @@ Slur::get_attachment (Score_element*me,Direction dir,
   if (Note_column::has_interface (sp->get_bound (dir)))
     {
       Score_element * n =sp->get_bound (dir);
-      if (Score_element *stem = Note_column::stem_l (n))
+      if ((stem = Note_column::stem_l (n)))
        {
 
          if (str == "head")
@@ -289,15 +284,15 @@ Slur::get_attachment (Score_element*me,Direction dir,
        
     }
 
-
-  // FIXME
+  SCM alist = me->get_elt_property ("extremity-offset-alist");
+int stemdir = stem ? Stem::get_direction (stem) : 1;
+  int slurdir = gh_scm2int (me->get_elt_property ("direction"));
   SCM l = scm_assoc
-    (scm_listify (a,
-                 gh_int2scm (stem ? Stem::get_direction (stem) : 1 * dir),
-                 gh_int2scm (Directional_element_interface::get (me) * dir),
-                 SCM_UNDEFINED),
-     scm_eval2 (ly_symbol2scm ("slur-extremity-offset-alist"), SCM_EOL));
-  
+      (scm_listify (a,
+                gh_int2scm (stemdir * dir),
+                gh_int2scm (slurdir * dir),
+                  SCM_UNDEFINED), alist);
+
   if (l != SCM_BOOL_F)
     {
       o += ly_scm2offset (gh_cdr (l)) * ss * dir;
index 68c93dad18b1b2bb2c18ff6c4bb19eea17108a20..56c896838c886411d8cdd8324f1e0e7184e57f21 100644 (file)
@@ -260,8 +260,7 @@ Stem::get_default_stem_end_position (Score_element*me)
     }
   else
     {
-      s = scm_eval2 (ly_symbol2scm ((type_str + "stem-length").ch_C()),
-                    SCM_EOL);
+      s = me->get_elt_property("lengths");
       for (SCM q = s; q != SCM_EOL; q = gh_cdr (q))
        a.push (gh_scm2double (gh_car (q)));
                
@@ -271,9 +270,8 @@ Stem::get_default_stem_end_position (Score_element*me)
 
 
   a.clear ();
-  s = scm_eval2 (ly_symbol2scm ((type_str + "stem-shorten").ch_C()),
-                SCM_EOL);
-  for (SCM q = s; q != SCM_EOL; q = gh_cdr (q))
+  s = me->get_elt_property ("stem-shorten");
+  for (SCM q = s; gh_pair_p (q); q = gh_cdr (q))
     a.push (gh_scm2double (gh_car (q)));
 
 
@@ -535,11 +533,11 @@ Stem::calc_stem_info (Score_element*me)
   int multiplicity = Beam::get_multiplicity (beam);
 
 
-  SCM space_proc = beam->get_elt_property ("beam-space-function");
+  SCM space_proc = beam->get_elt_property ("space-function");
   SCM space = gh_call1 (space_proc, gh_int2scm (multiplicity));
   Real interbeam_f = gh_scm2double (space) * staff_space;
 
-  Real thick = gh_scm2double (beam->get_elt_property ("beam-thickness"));
+  Real thick = gh_scm2double (beam->get_elt_property ("thickness"));
   Stem_info info; 
   info.idealy_f_ = chord_start_f (me);
 
@@ -551,17 +549,15 @@ Stem::calc_stem_info (Score_element*me)
   
   Array<Real> a;
   SCM s;
-  String type_str = grace_b ? "grace-" : "";
   
-  s = scm_eval2 (ly_symbol2scm ((type_str + "beamed-stem-minimum-length").ch_C()), SCM_EOL);
+  s = me->get_elt_property("beamed-minimum-lengths");
   a.clear ();
   for (SCM q = s; q != SCM_EOL; q = gh_cdr (q))
     a.push (gh_scm2double (gh_car (q)));
 
 
   Real minimum_length = a[multiplicity <? (a.size () - 1)] * staff_space;
-  s = scm_eval2 (ly_symbol2scm ((type_str + "beamed-stem-length").ch_C()),
-                SCM_EOL);
+  s = me->get_elt_property ("beamed-lengths");
 
   a.clear();
   for (SCM q = s; q != SCM_EOL; q = gh_cdr (q))
index f41e94da6f6025d34973bff6ff57ad58fb289462..d6811d888450c70b427855c23677e0a4d2197ee1 100644 (file)
@@ -10,6 +10,7 @@ StaffContext=\translator {
        \consists "Property_engraver";
        
        \consists "Multi_measure_rest_engraver";
+
        \consists "Bar_engraver";
  % Bar_engraver must be first so default bars aren't overwritten
 % with empty ones.
@@ -163,13 +164,20 @@ GraceContext=\translator {
 
        basicNoteHeadProperties \push #'font-size = #-1
        basicStemProperties \push #'font-size = #-1
+       basicStemProperties \push #'stem-shorten = #'(0)
        basicBeamProperties \push #'font-size = #-1
        basicTextScriptProperties \push #'font-size = #-1
        basicSlurProperties \push #'font-size = #-1
        basicLocalKeyProperties \push #'font-size = #-1
        basicBeamProperties \push #'beam-thickness = #0.3
        basicBeamProperties \push #'beam-space-function = #(lambda (x) 0.5)
-       
+
+       basicStemProperties \push #'lengths = #(map (lambda (x) (* 0.8 x)) '(3.5 3.5 3.5 4.5 5.0))
+       basicStemProperties \push #'beamed-lengths =
+               #'(0.0 2.5 2.0 1.5)
+       basicStemProperties \push #'minimum-beamed-lengths
+                = #(map (lambda (x) (* 0.8 x)) '(0.0 2.5 2.0 1.5))
+
        weAreGraceContext = ##t   
        graceAccidentalSpace= 1.5 ; % in staff space
 }
@@ -213,11 +221,6 @@ StaffGroupContext= \translator {
        \consists "Output_property_engraver";   
        \consists "System_start_delimiter_engraver";
        systemStartDelimiterGlyph = #'bracket
-       
-
-
-
-
        \name StaffGroup;
        \accepts "Staff";
        \accepts "RhythmicStaff";
@@ -608,13 +611,13 @@ ScoreContext = \translator {
          (name . "rehearsal mark")
        )
        basicMultiMeasureRestProperties = #`(
-               (spacing-procedure . ,Multi_measure_rest::set_spacing_rods)             
+               (interfaces . (multi-measure-rest-interface))
+               (spacing-procedure . ,Multi_measure_rest::set_spacing_rods)
                (molecule-callback . ,Multi_measure_rest::brew_molecule)
                (staff-position . 0)
                (expand-limit . 10)
                (padding . 2.0) ; staffspace
                (minimum-width . 12.5) ; staffspace
-
                (name . "multi-measure rest")
        )
        basicNoteColumnProperties = #`(
@@ -644,7 +647,10 @@ ScoreContext = \translator {
                (axes 0)
                (rank . -1)
        )
+
+       %% These text props are only used by line-number-engraver...
        basicTextProperties = #`( )
+
        basicRestProperties = #`(
                (interfaces . (rest-interface rhythmic-head-interface))
                (after-line-breaking-callback . ,Rest::after_line_breaking)
@@ -667,19 +673,7 @@ ScoreContext = \translator {
                (before-line-breaking-callback . ,Script_column::before_line_breaking)
                (name . "script column")
        )
-       basicSlurProperties = #`(
-               (interfaces . (slur-interface))
-               (molecule-callback . ,Slur::brew_molecule)
-               (thickness . 1.2)               
-               (spacing-procedure . ,Slur::set_spacing_rods)           
-               (minimum-length . 1.5)
-               (after-line-breaking-callback . ,Slur::after_line_breaking)
-
-               (de-uglify-parameters . ( 1.5  0.8  -2.0))
-               (details . ((height-limit . 2.0) (ratio . 0.333) (force-blowfit . 0.5) (beautiful . 0.5)))
-               (y-free . 0.75)
-               (name . "slur")
-       )
+       basicSlurProperties = #default-basic-slur-properties
        basicSpacingSpannerProperties =#`(
                (spacing-procedure . ,Spacing_spanner::set_springs)
 
@@ -793,7 +787,15 @@ ScoreContext = \translator {
                (before-line-breaking-callback . ,Stem::before_line_breaking)
                (molecule-callback . ,Stem::brew_molecule)
                (thickness . 0.8)
+               (beamed-lengths . (0.0 2.5 2.0 1.5))
+               (beamed-minimum-lengths . (0.0 1.5 1.25 1.0))
+               
+;;  Stems in unnatural (forced) direction should be shortened,
+;;  according to [Roush & Gourlay].  Their suggestion to knock off
+;;  a whole staffspace seems a bit drastical: we'll do half.
 
+               (lengths . (3.5 3.5 3.5 4.5 5.0))
+               (stem-shorten . (0.5))
                ; if stem is on middle line, choose this direction.
                (default-neutral-direction . 1)
                (name . "stem")
index 00184d02d0d949c47352aa0757b393a68244987b..af20caefed38ef9ef5698f9f40862245354d7ef1 100644 (file)
@@ -7,7 +7,7 @@ enteredby =      "JCN";
 copyright =     "public domain";
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 \include "bassi.ly"
 
index 785c8405ddc46f0241302c57a1cae9d5aafde75f..cd6756fd96996adf6fb8ae80596c159d610a0737 100644 (file)
@@ -7,7 +7,7 @@ enteredby =      "JCN";
 copyright =     "public domain";
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 \include "global.ly"
 \include "violoncello.ly"
diff --git a/mutopia/Coriolan/c-midi.ly b/mutopia/Coriolan/c-midi.ly
new file mode 100644 (file)
index 0000000..a7f76b8
--- /dev/null
@@ -0,0 +1,103 @@
+\header{
+filename =      "c-midi.ly";
+title =         "Ouverture"; 
+subtitle = "Coriolan";
+opus = "Op. 62";
+composer =      "Ludwig van Beethoven (1770-1827)";
+enteredby =     "JCN";
+copyright =     "public domain";
+}
+
+
+%%
+%% Hopefully, this can be junked when part-combiner+midi+dynamics work ok.
+%%
+
+\version "1.3.88";
+
+\include "global.ly"
+
+\include "flauto-1.ly"
+\include "flauto-2.ly"
+\include "oboe-1.ly"
+\include "oboe-2.ly"
+\include "clarinetto-1.ly"
+\include "clarinetto-2.ly"
+\include "fagotto-1.ly"
+\include "fagotto-2.ly"
+\include "corno-1.ly"
+\include "corno-2.ly"
+\include "trombo-1.ly"
+\include "trombo-2.ly"
+\include "timpani.ly"
+\include "violino-1.ly"
+\include "violino-2.ly"
+\include "viola-1.ly"
+\include "viola-2.ly"
+\include "violoncello.ly"
+\include "contrabasso.ly"
+
+
+
+\score{
+       <
+       \global;
+       \context Staff=flauti <
+               \property VoiceCombineStaff.midiInstrument = #"flute"
+               \flautoI
+               \flautoII
+       >
+       \context Staff=oboi <
+               \property VoiceCombineStaff.midiInstrument = #"oboe"
+               \oboeI
+               \oboeII
+       >
+       \context Staff=clarinetti <
+               \property VoiceCombineStaff.midiInstrument = #"clarinet"
+               \property VoiceCombineStaff.transposing = #-2
+               \clarinettoI
+               \clarinettoII
+       >
+       \context Staff=fagotti <
+               \property VoiceCombineStaff.midiInstrument = #"bassoon"
+               \fagottoI
+               \fagottoII
+       >
+       \context Staff=corni <
+               \property VoiceCombineStaff.midiInstrument = #"french horn"
+               \property VoiceCombineStaff.transposing = #3
+               \cornoI
+               \cornoII
+       >
+       \context Staff=trombe <
+               \property VoiceCombineStaff.midiInstrument = #"trumpet"
+               \tromboI
+               \tromboII
+       >
+       \context Staff=timpani <
+               \property Staff.midiInstrument = #"timpani"
+               \timpani
+       >
+       \context Staff=violini <
+               \property Staff.midiInstrument = #"violin"
+               \violinoI
+               \violinoII
+       >
+       \context Staff=violi <
+               \property VoiceCombineStaff.midiInstrument = #"viola"
+               \violaI
+               \violaII
+       >
+       \context Staff=violoncello <
+               \property StaffCombineStaff.midiInstrument = #"cello"
+               \violoncello
+       >
+       \context Staff=contrabasso <
+               \property StaffCombineStaff.midiInstrument = #"contrabass"
+               \property StaffCombineStaff.transposing = #-12
+               \contrabasso
+       >
+       >
+       \include "coriolan-midi.ly"
+}
+
index 118aa53631ec15ed064ce173426508043bdb0bbb..c538c7fe4b0b9c27b8b2f1d36a76c56e145962a0 100644 (file)
@@ -7,7 +7,7 @@ enteredby =      "JCN";
 copyright =     "public domain";
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 \include "global.ly"
 \include "clarinetti.ly"
index 735770136d7110166e71d98e69e7b631b440d878..2931222184e2e61df353a7cafef41b8249adc6a0 100644 (file)
@@ -5,27 +5,25 @@ description =  "";
 composer =      "Ludwig van Beethoven (1770-1827)";
 enteredby =     "JCN";
 copyright =     "public domain";
-
-
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 \include "clarinetto-1.ly"
 \include "clarinetto-2.ly"
 
-clarinettiStaff = \context Staff = clarinetti <
-       \property Staff.midiInstrument = #"clarinet"
-       \property Staff.instrument = #"2 Clarinetti\n(B\\textflat)"
-       \property Staff.instr = #"Cl.\n(B\\textflat)"
+clarinettiStaff = \context VoiceCombineStaff = clarinetti <
+       \property VoiceCombineStaff.midiInstrument = #"clarinet"
+       \property VoiceCombineStaff.instrument = #"2 Clarinetti\n(B\\textflat)"
+       \property VoiceCombineStaff.instr = #"Cl.\n(B\\textflat)"
        % urg: can't; only My_midi_lexer:<non-static> () parses pitch?
-       %\property Staff.transposing = "bes"
-       \property Staff.transposing = #-2
+       %\property VoiceCombineStaff.transposing = "bes"
+       \property VoiceCombineStaff.transposing = #-2
        \time 4/4;
        \notes \key f \major;
        \skip 1*314; \bar "|.";
-       \context Voice=one \partcombine Voice
-               \context Thread=one \clarinettoI
-               \context Thread=two  \clarinettoII
+       \context VoiceCombineVoice=one \partcombine VoiceCombineVoice
+               \context VoiceCombineThread=one \clarinettoI
+               \context VoiceCombineThread=two  \clarinettoII
 >
 
index 8ffb31b876957808b73e8e64adc351929e22e063..dd1a90b1c16568334f74af846fc9a3afa8d89790 100644 (file)
@@ -5,11 +5,9 @@ description =   "";
 composer =      "Ludwig van Beethoven (1770-1827)";
 enteredby =     "JCN";
 copyright =     "public domain";
-
-
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 clarinettoI = \notes \relative c {
        R1 *2 |
@@ -18,12 +16,12 @@ clarinettoI = \notes \relative c {
        e4-. r r2 |
        R1 *3 |
        f4-. r r2 |
-       r1 |
+       R1 |
        f4-. r r2 |
        e4-. r r2 |
        R1 *4 |
-       \property Voice.crescendoText = "cresc."
-       \property Voice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        bes2\p\< ( a |
        )gis2. \!a4-.\f |
        R1*13 |
@@ -45,8 +43,8 @@ clarinettoI = \notes \relative c {
        c2. c4\sf|
        c4 r r2|
        R1*5|
-       \property Voice.crescendoText = "cresc."
-       \property Voice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        a'2.\p\< ( bes4|
        a g e)c|
        c'2.( d4|
@@ -59,8 +57,8 @@ clarinettoI = \notes \relative c {
        d~|
        d~|
        d|
-       \property Voice.crescendoText = "cresc."
-       \property Voice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        bes2.\<( c4|
        bes a fis)d|
        \!d'2\ff f|
@@ -142,8 +140,8 @@ clarinettoI = \notes \relative c {
        )e2. f4\sf(|
        )e4 r r2|
        R1*9|
-       \property Voice.crescendoText = "cresc."
-       \property Voice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        fis2.\p\<(g4|
        fis e cis)a|
        \!a2\ff c|
@@ -162,8 +160,8 @@ clarinettoI = \notes \relative c {
        r2 r4 d(|
        )cis r r2|
        r r4 r8 cis|
-       \property Voice.crescendoText = "cresc."
-       \property Voice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        d4\< r r2|
        r r4 r8 d|
        e4 r r r8 e|
@@ -196,8 +194,8 @@ clarinettoI = \notes \relative c {
        d4 r8 g f4 r8 c|
        bes4 r r2|
        R1*11|
-       \property Voice.crescendoText = "cresc."
-       \property Voice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        f'2.\p\<(g4|
        f e cis)a|
        a1|
@@ -206,8 +204,8 @@ clarinettoI = \notes \relative c {
        c\f~|
        c\p|
        d\f~|
-       \property Voice.crescendoText = "cresc."
-       \property Voice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        d\p\<~|
        d~|
        d~|
@@ -237,8 +235,8 @@ clarinettoI = \notes \relative c {
        R1|
        d4-. d-. r2|
        d4-. d-. r2|
-       \property Voice.decrescendoText = "dim."
-       \property Voice.decrescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.decrescendoText = "dim."
+       \property VoiceCombineVoice.decrescendoSpanner = "dashed-line"
        d4\> r e r|
        R1|
        \!a,4\p r r2|
index 1f68736ad7b37955c0c819a7a8617d01b35056d4..f6c936a7129606238d62f5ac5d4622b945b9ed38 100644 (file)
@@ -5,11 +5,9 @@ description =   "";
 composer =      "Ludwig van Beethoven (1770-1827)";
 enteredby =     "JCN";
 copyright =     "public domain";
-
-
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 clarinettoII = \notes \relative c { 
        R1*2 bes''4-.\ff r r2 |
@@ -17,7 +15,7 @@ clarinettoII = \notes \relative c {
        cis4-. r r2 |
        R1 *3 |
        d4-. r r2 |
-       r1 |
+       R1 |
        d4-. r r2 |
        cis4-. r r2 |
        R1 *5 |
@@ -51,8 +49,8 @@ clarinettoII = \notes \relative c {
        d~|
        d|
        %a deux|
-       \property Voice.crescendoText = "cresc."
-       \property Voice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        bes'2.\<(c4|
        bes a fis)d|
        \!d'2\ff f,|
@@ -123,8 +121,8 @@ clarinettoII = \notes \relative c {
        )e2. f4\sf(|
        )e4 r r2|
        R1*9|
-       \property Voice.crescendoText = "cresc."
-       \property Voice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        fis2.\p\<( g4|
        fis e cis)a|
        %a deux; urg|
@@ -171,8 +169,8 @@ clarinettoII = \notes \relative c {
        c1\f~|
        c\p|
        a1\f|
-       \property Voice.crescendoText = "cresc."
-       \property Voice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        d,\p\<~|
        d~|
        d~|
@@ -204,8 +202,8 @@ clarinettoII = \notes \relative c {
        R1|
        a4-. c-. r2|
        bes4-. c-. r2|
-       \property Voice.decrescendoText = "dim."
-       \property Voice.decrescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.decrescendoText = "dim."
+       \property VoiceCombineVoice.decrescendoSpanner = "dashed-line"
        bes4\> r a r|
        R1|
        \!a4\p r r2|
index 77544490e52407db1dafe7534cfa8f87087483e1..f7336aa49769c1e9c21252fe8cbff1ea040854f7 100644 (file)
@@ -7,28 +7,28 @@ enteredby =    "JCN";
 copyright =     "public domain";
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 contrabasso = \notes \relative c {
        % copied 21 from cello
        c1\ff ~ |
        c |
        f,4-. r r2 |
-       r1 |
+       R1 |
        c'1\ff ~ |
        c |
        f,4-. r r2 |
-       r1 |
+       R1 |
        c'1\ff ~ |
        c |
        fis,4-. r r2 |
-       r1 |
+       R1 |
        g4-. r r2 |
        g4-. r r2 |
        c4\p r4 r2 |
        c4 r4 r2 |
        c4 r4 r2 |
-       r1 |
+       R1 |
        \property StaffCombineVoice.crescendoText = "cresc."
        \property StaffCombineVoice.crescendoSpanner = "dashed-line"
        c'4.\< c8 bes4. bes8 |
index e8d1a3358c3473b30f0270dc9fb9101311a1b3ca..05808d950ca406d51a50edb1e4179efffaec1eac 100644 (file)
@@ -1,8 +1,10 @@
 \paper{
        \paper_sixteen
 
-       textheight = 295.0\mm;
-       linewidth = 180.0\mm;
+       %textheight = 290.0\mm;
+       %linewidth = 195.0\mm;
+       textheight = 285.0\mm;
+       linewidth = 190.0\mm;
 
        \translator{ \HaraKiriStaffContext }
        %
@@ -49,7 +51,9 @@
                soloADue = ##t
                soloText = #""
                soloIIText = #""
-               aDueText = #""
+               % This is non-conventional, but currently it is
+               % the only way to tell the difference.
+               aDueText = #"\\`a2"
                splitInterval = #'(1 . 0)
                changeMoment = #`(,(make-moment 1 1) . ,(make-moment 1 1))
        }
@@ -75,8 +79,6 @@
                %% URG: this changes dynamics too
                %%textStyle = #"italic"
                timeSignatureStyle = #"C"
-               instrumentScriptPadding = #60  %% urg, this is in pt
-               instrScriptPadding = #40 %% urg, this is in pt
                marginScriptHorizontalAlignment = #1
                maximumRestCount = #1
        }
index 844bf454e3ebe602bef00871b4363437a48bf0d0..32f8d1ea1958774a84b0c0e8bf3a2629afb01067 100644 (file)
@@ -48,7 +48,9 @@
                soloADue = ##t
                soloText = #""
                soloIIText = #""
-               aDueText = #""
+               % This is non-conventional, but currently it is
+               % the only way to tell the difference.
+               aDueText = #"\\`a2"
                splitInterval = #'(1 . 0)
                changeMoment = #`(,(make-moment 1 1) . ,(make-moment 1 1))
        }
@@ -74,8 +76,6 @@
                %% URG: this changes dynamics too
                %%textStyle = #"italic"
                timeSignatureStyle = #"C"
-               instrumentScriptPadding = #60  %% urg, this is in pt
-               instrScriptPadding = #40 %% urg, this is in pt
                marginScriptHorizontalAlignment = #1
                maximumRestCount = #1
        }
index f9f5401a5c40cf0665d0ea95ca78e31a01c8637e..31fa654e0325d2aecbb99a1b7640b0a30c2702d7 100644 (file)
@@ -16,8 +16,6 @@
                %% URG: this changes dynamics too
                %%textStyle = #"italic"
                timeSignatureStyle = #"C"
-               instrumentScriptPadding = #60  %% urg, this is in pt
-               instrScriptPadding = #40 %% urg, this is in pt
                marginScriptHorizontalAlignment = #1
                maximumRestCount = #1
        }
index 0c9a454a814d4a5c374ebdfa23bb08102302fef8..229b8844556fd37f8032c48ed63036821ecbca18 100644 (file)
@@ -1,3 +1,6 @@
+%% run this through ly2dvi (afterwards -- urg ly2dvi should tee lily output)
+%% on my printer, I use dvips -O 5mm,0mm -o x.ps coriolan
+
 \header{
 filename =      "coriolan.ly";
 title =         "Ouverture"; 
@@ -8,7 +11,7 @@ enteredby =     "JCN";
 copyright =     "public domain";
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 \include "global.ly"
 \include "paper16.ly"
@@ -72,6 +75,6 @@ archiGroup = \context StaffGroup = archi_group <
                copyright = "public domain";
        }
        \include "coriolan-paper.ly"
-       \include "coriolan-midi.ly"
+%      \include "coriolan-midi.ly"
 }
 
index 49b80354bda9469c6972b66982a70472b4a50e21..419a3f3a3829afbb762e03f29d44da77cc498178 100644 (file)
@@ -7,7 +7,7 @@ enteredby =      "JCN";
 copyright =     "public domain";
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 \include "global.ly"
 \include "corni.ly"
index 6e241a7ab3fd3b20c7e3b8fe8ce390d4767b0a48..00804fd0c0d92414bddf5d13b27ed7a2d2eb58ad 100644 (file)
@@ -5,26 +5,24 @@ description =  "";
 composer =      "Ludwig van Beethoven (1770-1827)";
 enteredby =     "JCN";
 copyright =     "public domain";
-
-
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 \include "corno-1.ly"
 \include "corno-2.ly"
 
-corniStaff = \context Staff = corni <
-       \property Staff.midiInstrument = #"french horn"
-       \property Staff.instrument = #"2 Corni\n(E\\textflat)"
-       \property Staff.instr = #"Cor.\n(E\\textflat)"
+corniStaff = \context VoiceCombineStaff = corni <
+       \property VoiceCombineStaff.midiInstrument = #"french horn"
+       \property VoiceCombineStaff.instrument = #"2 Corni\n(E\\textflat)"
+       \property VoiceCombineStaff.instr = #"Cor.\n(E\\textflat)"
        % urg: can't; only My_midi_lexer:<non-static> () parses pitch?
-       %\property Staff.transposing = "es"
-       \property Staff.transposing = #3
+       %\property VoiceCombineStaff.transposing = "es"
+       \property VoiceCombineStaff.transposing = #3
        \time 4/4;
        \skip 1*314; \bar "|.";
-       \context Voice=one \partcombine Voice
-               \context Thread=one \cornoI
-               \context Thread=two \cornoII
+       \context VoiceCombineVoice=one \partcombine VoiceCombineVoice
+               \context VoiceCombineThread=one \cornoI
+               \context VoiceCombineThread=two \cornoII
 >
 
index ff2ca983b56c733094cbbdd3c02211caaa67b46b..c355bbf558fb9b6a501e1049bb2b9478fde9e265 100644 (file)
@@ -7,7 +7,7 @@ enteredby =      "JCN";
 copyright =     "public domain";
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 cornoI = \notes \relative c {
        R1*2 |
@@ -16,7 +16,7 @@ cornoI = \notes \relative c {
        f4-. r r2 |
        R1*3 |
        c4-. r r2 |
-       r1 |
+       R1 |
        e4-. r r2 |
        e4-. r r2 |
        R1*5 |
@@ -25,8 +25,8 @@ cornoI = \notes \relative c {
        r4 g-.\f r2 |
        R1*2 |
        % `a 2
-       \property Voice.crescendoText = "cresc."
-       \property Voice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        r8 f\p\< f2 e4 |
        r8 f f2 e4 |
        f4. e8 f4. e8 |
@@ -77,7 +77,7 @@ cornoI = \notes \relative c {
        r2 e4 r ||
 |
        R1*4    |
-       e4\f r4 r2 r1|
+       e4\f r4 r2 R1|
        e4\f r4 r2|
        R1*3|
        e4\f r8 e e4 r8 e ||
@@ -109,7 +109,7 @@ cornoI = \notes \relative c {
        e r e r|
        d r r2 ||
 |
-       r1|
+       R1|
        d4-.\ff r4 r2|
        R1*3|
        f2\sf r2 f2 \sf r2|
@@ -172,8 +172,8 @@ cornoI = \notes \relative c {
        e~|
        e~|
        e~|
-       \property Voice.crescendoText = "cresc."
-       \property Voice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        e\<~|
        e~|
        e|
index 030c795d77c25c508f2f43cbef378bf09c01ef98..54df42524dad0148e6dfd7cb3f554d468c5c8a68 100644 (file)
@@ -7,7 +7,7 @@ enteredby =      "JCN";
 copyright =     "public domain";
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 cornoII = \notes \relative c {
        R1*2 |
@@ -16,7 +16,7 @@ cornoII = \notes \relative c {
        d4-. r r2 |
        R1*3 |
        c4-. r r2 |
-       r1 |
+       R1 |
        e,4-. r r2 |
        e4-. r r2 |
        R1*5 |
@@ -26,8 +26,8 @@ cornoII = \notes \relative c {
        R1*2 |
        % `a 2
        % urg, yes this is a-deux, but lily doesn't know about I. / a2 yet.
-       \property Voice.crescendoText = "cresc."
-       \property Voice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        r8 f'\p\< f2 e4 |
        r8 f f2 e4 |
        f4. e8 f4. e8 |
@@ -129,8 +129,8 @@ cornoII = \notes \relative c {
        e~|
        e~|
        e~|
-       \property Voice.crescendoText = "cresc."
-       \property Voice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        e\<~|
        e~|
        e~|
@@ -142,8 +142,8 @@ cornoII = \notes \relative c {
        %a deux|
        r4 r8 e,\p e4. e8|
        r4 r8 e e4. e8|
-       \property Voice.crescendoText = "cresc."
-       \property Voice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        r4 r8 e\< e4. e8|
        r4 r8 e e4. e8|
        r4 r8 e e4. e8|
@@ -189,8 +189,8 @@ cornoII = \notes \relative c {
        e~|
        e~|
        e~|
-       \property Voice.crescendoText = "cresc."
-       \property Voice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        e\<~|
        e~|
        e|
index 2408f7e8e78487326334ce4a9da3dd7a28560dee..7656907998ad9413ac835ce927cc8b659beac64f 100644 (file)
@@ -7,7 +7,7 @@ enteredby =      "JCN";
 copyright =     "public domain";
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 \include "global.ly"
 \include "fagotti.ly"
index c829f89afa2f5d9fa0a791382d9b95e9081e0d6d..ff12fd44f74077272b612c2bd7fceadfee401d59 100644 (file)
@@ -7,19 +7,19 @@ enteredby =    "JCN";
 copyright =     "public domain";
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 \include "fagotto-1.ly"
 \include "fagotto-2.ly"
 
-fagottiStaff = \context Staff = fagotti <
-       \property Staff.midiInstrument = #"bassoon"
-       \property Staff.instrument = #"2 Fagotti"
-       \property Staff.instr = #"Fg."
+fagottiStaff = \context VoiceCombineStaff = fagotti <
+       \property VoiceCombineStaff.midiInstrument = #"bassoon"
+       \property VoiceCombineStaff.instrument = #"2 Fagotti"
+       \property VoiceCombineStaff.instr = #"Fg."
        \clef "bass";
        \global
-       \context Voice=one \partcombine Voice
-               \context Thread=one \fagottoI
-               \context Thread=two \fagottoII
+       \context VoiceCombineVoice=one \partcombine VoiceCombineVoice
+               \context VoiceCombineThread=one \fagottoI
+               \context VoiceCombineThread=two \fagottoII
 >
 
index 9926d3b6775edfde3bf3c027d47f44fd32d91907..b3f185cb282fa9e2639a11758e8c14cae26453a6 100644 (file)
@@ -7,7 +7,7 @@ enteredby =      "JCN";
 copyright =     "public domain";
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 fagottoI = \notes \relative c {
        R1*2 |
@@ -16,20 +16,20 @@ fagottoI = \notes \relative c {
        as4-. r r2 |
        R1*3 |
        a4-. r r2 |
-       r1 |
+       R1 |
        c4-. r r2 |
        b4-. r r2 |
        R1*5 |
        r2 r4 g4-.\f |
        R1*5 |
-       \property Voice.crescendoText = "cresc."
-       \property Voice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        ges'2\p\< f2 ~ |
        f4 \!e-.\f r2 |
        R1 |
        f2\p()es |
-       \property Voice.crescendoText = "cresc."
-       \property Voice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        d1\< |
        d |
        d2 d |
@@ -52,8 +52,8 @@ fagottoI = \notes \relative c {
        )d4 r r2|
        R1*9|
        \clef "tenor";
-       \property Voice.crescendoText = "cresc."
-       \property Voice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        g'2.(as4 \p\<|
        g f d)bes
        \clef "bass";
@@ -64,8 +64,8 @@ fagottoI = \notes \relative c {
        c~|
        c~|
        c~|
-       \property Voice.crescendoText = "cresc."
-       \property Voice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        c\<~|
        c|
        \!c2\ff bes|
@@ -78,8 +78,8 @@ fagottoI = \notes \relative c {
        bes(a bes)g|
        fis r8 a\pp a4. a8|
        r4 r8 a a4. a8|
-       \property Voice.crescendoText = "cresc."
-       \property Voice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        r4 r8 bes\< bes4. bes8|
        r4 r8 bes bes4. bes8|
        r4 r8 c8 c4. c8|
@@ -127,8 +127,8 @@ fagottoI = \notes \relative c {
        e4 r r2|
        R1*3|
        r4 r8 f' es4 r8 bes|
-       \property Voice.crescendoText = "cresc."
-       \property Voice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        c4\< r4 r2|
        R1*2|
        r4 r8 ges' f4 r8 c|
@@ -147,8 +147,8 @@ fagottoI = \notes \relative c {
        [g,: bes: c: des:][f,: bes: c: des:]||
        [e,: g: bes: des:][c: e: g: c:]||
 
-       \property Voice.crescendoText = "cresc."
-       \property Voice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        c1\p\< ~|
        c1~|
        c1~|
@@ -215,8 +215,8 @@ fagottoI = \notes \relative c {
        es(d es)c|
        b r8 d\p d4. d8|
        r4 r8 d d4. d8|
-       \property Voice.crescendoText = "cresc."
-       \property Voice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        r4 r8 es\< es4. es8|
        r4 r8 es es4. es8|
        r4 r8 %
@@ -257,8 +257,8 @@ fagottoI = \notes \relative c {
        es d b)g|
        g'2.(as4|
        g2)f|
-       \property Voice.crescendoText = "cresc."
-       \property Voice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        es2.\<( f4|
        es d b)g|
        R1|
@@ -267,8 +267,8 @@ fagottoI = \notes \relative c {
        d\f|
        es\p|
        e\f|
-       \property Voice.crescendoText = "cresc."
-       \property Voice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        as,4.\p\< as8 g4. g8|
        f4. f8 es4. es8|
        as4. as8 g4. g8|
@@ -304,8 +304,8 @@ fagottoI = \notes \relative c {
        R1|
        g,4-. g-. r2|
        as4-. bes-. r2|
-       \property Voice.decrescendoText = "dim."
-       \property Voice.decrescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.decrescendoText = "dim."
+       \property VoiceCombineVoice.decrescendoSpanner = "dashed-line"
        c4\> r d r|
        R1|
        \!c,4\p r r2|
@@ -313,8 +313,10 @@ fagottoI = \notes \relative c {
        g4 r r2|
        R1|
        c4\pp r r2|
-       \property Voice.decrescendoText = "sempre pi\\`u piano"
-       \property Voice.decrescendoSpanner = ""
+       \property VoiceCombineVoice.decrescendoText = "sempre pi\\`u piano"
+       % urg, "" is assumed to be hairpin...
+       %\property VoiceCombineVoice.decrescendoSpanner = ""
+       \property VoiceCombineVoice.decrescendoSpanner = "dashed-line"
        r r4 g\p\>~|
        g1~|
        g~|
index 2ab53247db479f5b515505951d8964828f00baf4..c7c5f77070fe8af5f7368092a01eef8436339706 100644 (file)
@@ -7,7 +7,7 @@ enteredby =      "JCN";
 copyright =     "public domain";
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 fagottoII = \notes \relative c {
        R1*2 |
@@ -16,7 +16,7 @@ fagottoII = \notes \relative c {
        f4-. r r2 |
        R1*3 |
        fis4-. r r2 |
-       r1 |
+       R1 |
        g4-. r r2 |
        g4-. r r2 |
        R1*5 |
@@ -43,8 +43,8 @@ fagottoII = \notes \relative c {
        )d4 r r2|
        R1*9|
        \clef "tenor";
-       \property Voice.crescendoText = "cresc."
-       \property Voice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        g''2.(as4 \p\<||
        g f d)bes||
        \clef "bass";
@@ -55,14 +55,14 @@ fagottoII = \notes \relative c {
        c~|
        c~|
        c~|
-       \property Voice.crescendoText = "cresc."
-       \property Voice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        c\<~|
        c|
        \!c2\ff g'|
        fis d|
-       \property Voice.crescendoText = "cresc."
-       \property Voice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        g,4 \p\< r r r8 g(|
        )c4 r r r8 c(|
        \!)b1\sf\>|
@@ -70,8 +70,8 @@ fagottoII = \notes \relative c {
        R1*2|
        r4 r8 fis\pp fis4. fis8|
        r4 r8 fis fis4. fis8|
-       \property Voice.crescendoText = "cresc."
-       \property Voice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        r4 r8 g\< g4. g8|
        r4 r8 g g4. g8|
        r4 r8 a a4. a8|
@@ -130,8 +130,8 @@ fagottoII = \notes \relative c {
        e|
        f|
        g|
-       \property Voice.crescendoText = "cresc."
-       \property Voice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        as\<|
        g|
        as|
@@ -191,8 +191,8 @@ fagottoII = \notes \relative c {
        g~|
        g~|
        g~|
-       \property Voice.crescendoText = "cresc."
-       \property Voice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        g\<~|
        g~|
        g~|
@@ -205,8 +205,8 @@ fagottoII = \notes \relative c {
        a~|
        a~|
        a~|
-       \property Voice.crescendoText = "cresc."
-       \property Voice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        a\<~|
        a|
        \!f'2\ff e|
@@ -219,8 +219,8 @@ fagottoII = \notes \relative c {
        R1*3|
        r4 r8 b'' b4. b8|
        r4 r8 b b4. b8|
-       \property Voice.crescendoText = "cresc."
-       \property Voice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        r4 r8 c\< c4. c8|
        r4 r8 c c4. c8|
        \clef "tenor";
@@ -269,8 +269,8 @@ fagottoII = \notes \relative c {
        g\p|
        bes\f|
        %a deux|
-       \property Voice.crescendoText = "cresc."
-       \property Voice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        as4.\p\< as8 g4. g8|
        f4. f8 es4. es8|
        as4. as8 g4. g8|
@@ -307,8 +307,8 @@ fagottoII = \notes \relative c {
        R1|
        es,4-. e-. r2|
        f4-. g-. r2|
-       \property Voice.decrescendoText = "dim."
-       \property Voice.decrescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.decrescendoText = "dim."
+       \property VoiceCombineVoice.decrescendoSpanner = "dashed-line"
        as4\> r b r|
        R1|
        %a deux|
index 088d93c799a1f7c4b18ec59cb90d760d2bd038a9..979e7514d3ce420f180fe2a9e3965ba2cbf1b34b 100644 (file)
@@ -7,7 +7,7 @@ enteredby =      "JCN";
 copyright =     "public domain";
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 \include "global.ly"
 \include "flauti.ly"
index d1f7ed8e562c133201e3c78ceed040050805c01d..894ccf822b0d39e371fafe7ec2a406e308325c22 100644 (file)
@@ -7,18 +7,18 @@ enteredby =    "JCN";
 copyright =     "public domain";
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 \include "flauto-1.ly"
 \include "flauto-2.ly"
 
-flautiStaff = \notes \context Staff = flauti <
-       \property Staff.midiInstrument = #"flute"
-       \property Staff.instrument = #"2 Flauti"
-       \property Staff.instr = #"Fl."
+flautiStaff = \notes \context VoiceCombineStaff = flauti <
+       \property VoiceCombineStaff.midiInstrument = #"flute"
+       \property VoiceCombineStaff.instrument = #"2 Flauti"
+       \property VoiceCombineStaff.instr = #"Fl."
        \global
-       \context Voice=one \partcombine Voice
-               \context Thread=one \flautoI
-               \context Thread=two \flautoII
+       \context VoiceCombineVoice=one \partcombine VoiceCombineVoice
+               \context VoiceCombineThread=one \flautoI
+               \context VoiceCombineThread=two \flautoII
 >
 
index 4b81af8df71fcb22253db0e11815c7e887d054d2..421655303e0a1cd8082810ac19010c588cb3985f 100644 (file)
@@ -7,7 +7,7 @@ enteredby =      "JCN";
 copyright =     "public domain";
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 flautoI = \notes \relative c {
        R1 *2 |
@@ -16,23 +16,23 @@ flautoI = \notes \relative c {
        d4-. r r2 |
        R1 *3 |
        es4-. r r2 |
-       r1 |
+       R1 |
        g4-. r r2 |
        b,4-. r r2 |
        R1 *4 |
-       \property Voice.crescendoText = "cresc."
-       \property Voice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        r2 g'\p\< ( |
        )fis2. \!g4-.\f |
        R1*5 |
-       \property Voice.crescendoText = "cresc."
-       \property Voice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        r2 f\p\< ~ |
        f4 \!e-.\f r2 |
        R1 |
        f2\p()es |
-       \property Voice.crescendoText = "cresc."
-       \property Voice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        d1\<  |
        d1 |
        d2 d2 |
@@ -55,8 +55,8 @@ flautoI = \notes \relative c {
        )f2. ges4\sf|
        f4 r r2 |
        R1*9|
-       \property Voice.crescendoText = "cresc."
-       \property Voice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        g2.\p\<(f4|
        as g d)bes
        \!bes2\ff des|
@@ -65,14 +65,14 @@ flautoI = \notes \relative c {
        c~|
        c~|
        c~|
-       \property Voice.crescendoText = "cresc."
-       \property Voice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        c\<~|
        c~|
        \!c2\ff es|
        d1~|
-       \property Voice.crescendoText = "cresc."
-       \property Voice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        d\p\<~|
        d~| 
        d2.()f4|
@@ -82,8 +82,8 @@ flautoI = \notes \relative c {
        \!fis\pp r r2|
        r2 r4 r8 a|
        bes4 r r2|
-       \property Voice.crescendoText = "cresc."
-       \property Voice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        r r4 r8 bes\<|
        c4 r r r8 c |
        d4 r r r8 d|
@@ -129,8 +129,8 @@ flautoI = \notes \relative c {
        r4 r8 f' es4 r8 bes|
        c4 r r2|
        R1*2|
-       \property Voice.crescendoText = "cresc."
-       \property Voice.crescendoSpanner = ""
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        r4 r8 ges'\< f4 r8 c|
        des4 r r2|
        R1*5|
@@ -164,15 +164,15 @@ flautoI = \notes \relative c {
        )d2. es4\sf(|
        )d r r2|
        R1*9|
-       \property Voice.crescendoText = "cresc."
-       \property Voice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        e2.\p\<(f4|
        e d b )g|
        \!g2\ff bes|
        a1~a4\p r r2|
        R1*3|
-       \property Voice.crescendoText = "cresc."
-       \property Voice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        a1\<~|
        a|
        \!a2\ff c|
@@ -215,8 +215,8 @@ flautoI = \notes \relative c {
        c r8 f8 es4 r8 bes|
        as4-. des4-. r2|
        R1*11|
-       \property Voice.crescendoText = "cresc."
-       \property Voice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        es2.\p\<(f4|
        es d b)g|
        g1|
@@ -255,8 +255,8 @@ flautoI = \notes \relative c {
        R1|
        c4-. c4-. r2|
        c4-. c4-. r2|
-       \property Voice.decrescendoText = "dim."
-       \property Voice.decrescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.decrescendoText = "dim."
+       \property VoiceCombineVoice.decrescendoSpanner = "dashed-line"
        c4\> r d r|
        R1|
        \!es4\p r r2|
index 4d79122b6bfbb88cf1aab59bf6b9bd865511a6bf..5f4712ff7e9379a2b30335592f46cb86e0606543 100644 (file)
@@ -7,7 +7,7 @@ enteredby =      "JCN";
 copyright =     "public domain";
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 flautoII = \notes \relative c {
        R1 *2 |
@@ -16,7 +16,7 @@ flautoII = \notes \relative c {
        b4-. r r2 |
        R1 *3 |
        c4-. r r2 |
-       r1 |
+       R1 |
        es4-. r r2 |
        d,4-. r r2 |
        R1 *4 |
@@ -131,8 +131,8 @@ flautoII = \notes \relative c {
        bes\f~|
        bes\p|
        c1\f~|
-       \property Voice.crescendoText = "cresc."
-       \property Voice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        c\p\<~|
        c~|
        c~|
@@ -166,8 +166,8 @@ flautoII = \notes \relative c {
        R1|
        c4-. g'-. r2|
        as4-. e-. r2|
-       \property Voice.decrescendoText = "dim."
-       \property Voice.decrescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.decrescendoText = "dim."
+       \property VoiceCombineVoice.decrescendoSpanner = "dashed-line"
        f4\> r f r|
        R1|
        \!es4\p r r2|
index 6cc38edca08a65da2d94ed88efb65d29caa1f46b..6e196c493729433de36a10eb5d75fa1eb5d27d1c 100644 (file)
@@ -5,11 +5,9 @@ description =   "";
 composer =      "Ludwig van Beethoven (1770-1827)";
 enteredby =     "JCN";
 copyright =     "public domain";
-
-
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 global = \notes {
        \time 4/4;
index 240986b5c8e5b1845a668ea3c03a4a3ed7dc9ab6..5960da4dbbcad86c4f7fd646eed759fa99044d04 100644 (file)
@@ -13,6 +13,7 @@ trombo-2.ly
 timpani.ly
 violino-1.ly
 violino-2.ly
-viola.ly
+viola-1.ly
+viola-2.ly
 violoncello.ly
 contrabasso.ly
index 7abc8b5c0a89952cb89f09a3a8981cd88b71b026..5f51bb7a8f344c3aaeb41c94532aa2845bc995d3 100644 (file)
@@ -7,7 +7,7 @@ enteredby =      "JCN";
 copyright =     "public domain";
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 oboeI = \notes \relative c'' {
        R1*2 |
@@ -16,23 +16,23 @@ oboeI = \notes \relative c'' {
        as4-. r r2 |
        R1*3 |
        a4-. r r2 |
-       r1 |
+       R1 |
        g4-. r r2 |
        g4-. r r2 |
        R1 *4 |
-       \property Voice.crescendoText = "cresc."
-       \property Voice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        as2\p\< ( g |
        )fis2. \!g4-.\f |
        R1*5 |
-       \property Voice.crescendoText = "cresc."
-       \property Voice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        ges2\p\<  f ~ |
        f4 \!e\f r2 |
        R1 |
        f2\p()es |
-       \property Voice.crescendoText = "cresc."
-       \property Voice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        d1\< |
        d |
        d2 d |
@@ -55,22 +55,22 @@ oboeI = \notes \relative c'' {
        )f2. ges4(|
        )f4 r r2|
        R1*9|
-       \property Voice.crescendoText = "cresc."
-       \property Voice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        g2.\p\<( as4|
        g f d)bes|
        \!bes'2\ff des|
        c bes|
        as4\p r r2|
        R1*3|
-       \property Voice.crescendoText = "cresc."
-       \property Voice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        as2.\p\<( bes4|
        as g e)c|
        \!c'2\ff es,|
        d1~|
-       \property Voice.crescendoText = "cresc."
-       \property Voice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        d\p\< ~|
        d~|
        \!d2.\sf\>()f4|
@@ -80,8 +80,8 @@ oboeI = \notes \relative c'' {
        fis\pp r r2|
        r r4 r8 fis' |
        g4 r r2|
-       \property Voice.crescendoText = "cresc."
-       \property Voice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        r r4 r8 g\<|
        a4 r r r8 a|
        bes4 r r r8 bes|
@@ -127,8 +127,8 @@ oboeI = \notes \relative c'' {
        des4 r r r8 c|
        bes4 r8 es f4 r8 f|
        g4 r8 g e4 r 8 e|
-       \property Voice.crescendoText = "cresc."
-       \property Voice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        c'1\p\< ~|
        c~|
        c~|
@@ -158,8 +158,8 @@ oboeI = \notes \relative c'' {
        )g2. fis4\sf(|
        )g4 r r2|
        R1*5|
-       \property Voice.crescendoText = "cresc."
-       \property Voice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        e2.\p\< (f4|
        e d b)g|
        g'2.(a4 g2)f|
@@ -171,8 +171,8 @@ oboeI = \notes \relative c'' {
        a~|
        a~|
        a|
-       \property Voice.crescendoText = "cresc."
-       \property Voice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        f2.\<( g4|
        f e cis)a|
        \!a'2\ff c|
@@ -187,8 +187,8 @@ oboeI = \notes \relative c'' {
        es(d es)c|
        b r r2|
        r r4 r8 d|
-       \property Voice.crescendoText = "cresc."
-       \property Voice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        es4\< r r2|
        r r4 r8 es|
        f4 r r r8 f|
@@ -224,8 +224,8 @@ oboeI = \notes \relative c'' {
        es d b)g|
        g'2.(as4|
        g2)f|
-       \property Voice.crescendoText = "cresc."
-       \property Voice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        es2.\<( f4|
        es d b)g|
        c1|
@@ -234,8 +234,8 @@ oboeI = \notes \relative c'' {
        f\f|
        g\p|
        g\f|
-       \property Voice.crescendoText = "cresc."
-       \property Voice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        c\p\<~|
        c~|
        c~|
index aea27fb3b49a8419463601d4d44f5b8a5dc6caac..92fed5760b6afa7066f904cdf9ffaafd6f1f5845 100644 (file)
@@ -7,7 +7,7 @@ enteredby =      "JCN";
 copyright =     "public domain";
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 oboeII = \notes \relative c{
        R1*2|
@@ -16,7 +16,7 @@ oboeII = \notes \relative c{
        f4-. r r2 |
        R1*3 |
        es4-. r r2 |
-       r1 |
+       R1 |
        es4-. r r2 |
        b4-. r r2 |
        R1*5 |
@@ -74,8 +74,8 @@ oboeII = \notes \relative c{
        bes4 r8 bes bes4 r8 bes|
        bes4\p r r2|
        R1*15|
-       \property Voice.crescendoText = "cresc."
-       \property Voice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        r4 r8 as'\< ges4 r8 des|
        es4 r8 bes' as4 r8 es|
        f4 r r2|
@@ -85,8 +85,8 @@ oboeII = \notes \relative c{
        des4 r r r8 c|
        bes4 r8 bes bes4 r8 bes|
        bes4 r8 bes bes4 r8 bes|
-       \property Voice.crescendoText = "cresc."
-       \property Voice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        c1\p\< ~||
        c~|
        c~|
@@ -150,8 +150,8 @@ oboeII = \notes \relative c{
        d\f|
        es\p|
        e\f|
-       \property Voice.crescendoText = "cresc."
-       \property Voice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        c\p\< ~|
        c~|
        c~|
@@ -183,8 +183,8 @@ oboeII = \notes \relative c{
        R1|
        c4-. c-. r2|
        c4-. c-. r2|
-       \property Voice.decrescendoText = "dim."
-       \property Voice.decrescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.decrescendoText = "dim."
+       \property VoiceCombineVoice.decrescendoSpanner = "dashed-line"
        c4\> r d r|
        R1|
        \!c4\p r r2|
index a90ea3a419ed228a766d1c5d8954d822183f0e7a..07e0b59a56f790e5534bda5490a3b997a6928e88 100644 (file)
@@ -7,7 +7,7 @@ enteredby =      "JCN";
 copyright =     "public domain";
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 \include "global.ly"
 \include "oboi.ly"
index 73d216c8698850597e6381b88848554d6b27d58e..1c660bec86d013936aae4cd782d8a878c14d148a 100644 (file)
@@ -5,21 +5,19 @@ description =  "";
 composer =      "Ludwig van Beethoven (1770-1827)";
 enteredby =     "JCN";
 copyright =     "public domain";
-
-
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 \include "oboe-1.ly"
 \include "oboe-2.ly"
 
-oboiStaff = \context Staff = oboi <
-       \property Staff.midiInstrument = #"oboe"
-       \property Staff.instrument = #"2 Oboi"
-       \property Staff.instr = #"Ob."
+oboiStaff = \context VoiceCombineStaff = oboi <
+       \property VoiceCombineStaff.midiInstrument = #"oboe"
+       \property VoiceCombineStaff.instrument = #"2 Oboi"
+       \property VoiceCombineStaff.instr = #"Ob."
        \global
-       \context Voice=one \partcombine Voice
-               \context Thread=one \oboeI
-               \context Thread=two \oboeII
+       \context VoiceCombineVoice=one \partcombine VoiceCombineVoice
+               \context VoiceCombineThread=one \oboeI
+               \context VoiceCombineThread=two \oboeII
 >
index 322d29b5bcf89dade8dd7aaedfaa5c13ba48d83d..0522f75a57872c9be21abae856cb514e92994a36 100644 (file)
@@ -7,7 +7,7 @@ enteredby =      "JCN";
 copyright =     "public domain";
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 \include "global.ly"
 \include "timpani.ly"
index 0593edc4c7c8ef6d3b2d20f470b03203b39a4a6c..230fa26fb72559dbbd83b8e1a7d8efaa0ce3c2d7 100644 (file)
@@ -5,11 +5,9 @@ description =   "";
 composer =      "Ludwig van Beethoven (1770-1827)";
 enteredby =     "JCN";
 copyright =     "public domain";
-
-
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 timpani = \notes \relative c {
        R1*2 |
@@ -18,7 +16,7 @@ timpani = \notes \relative c {
        c4-. r r2 |
        R1*3 |
        c4-. r r2 |
-       r1 |
+       R1 |
        g4-. r r2 |
        g4-. r r2 |
        R1*5 |
index b2070a0903ec2e6eaa0e3f5f6119575fab8d39b6..c60d58e7eba98014a42200b40e5f94c19a548821 100644 (file)
@@ -7,7 +7,7 @@ enteredby =      "JCN";
 copyright =     "public domain";
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 \include "global.ly"
 \include "trombe.ly"
index 5a778108a910733c439191248220eb394093599b..c71b550a1ced07fc80228bd299c82dcbb5da8af8 100644 (file)
@@ -7,18 +7,21 @@ enteredby =    "JCN";
 copyright =     "public domain";
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 \include "trombo-1.ly"
 \include "trombo-2.ly"
 
-trombeStaff = \context Staff = trombe <
-       \property Staff.midiInstrument = #"trumpet"
-       \property Staff.instrument = #"2 Trombe\n(C)"
-       \property Staff.instr = #"Tbe.\n(C)"
-       \time 4/4;
-       \context Voice=one \partcombine Voice
-               \context Thread=one \tromboI
-               \context Thread=two \tromboII
+trombeStaff = \context VoiceCombineStaff = trombe <
+       \context VoiceCombineStaff=trombe {
+               \property VoiceCombineStaff.midiInstrument = #"trumpet"
+               \property VoiceCombineStaff.instrument = #"2 Trombe\n(C)"
+               \property VoiceCombineStaff.instr = #"Tbe.\n(C)"
+               \skip 1*314; 
+               \bar "|."; 
+       }
+       \context VoiceCombineVoice=one \partcombine VoiceCombineVoice
+               \context VoiceCombineThread=one \tromboI
+               \context VoiceCombineThread=two \tromboII
 >
 
index eccad506292de01c66c2b2d732c011b352913238..1c5252ec6ed51c71e16055d11699c0550f747e40 100644 (file)
@@ -7,7 +7,7 @@ enteredby =      "JCN";
 copyright =     "public domain";
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 tromboI = \notes \relative c {
        R1*2 |
@@ -16,7 +16,7 @@ tromboI = \notes \relative c {
        c4-. r r2 |
        R1*3 |
        c4-. r r2 |
-       r1 |
+       R1 |
        g4-. r r2 |
        g4-. r r2 |
        R1*5 |
@@ -24,8 +24,8 @@ tromboI = \notes \relative c {
        R1*6 |
        r4 c-.\f r2 |
        R1*2 |
-       \property Voice.crescendoText = "cresc."
-       \property Voice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        r2 c4\p\< r |
        r2 c4 r |
        r2 c4 r |
@@ -116,8 +116,8 @@ tromboI = \notes \relative c {
        c4 r r2|
        R1*18|
        e1\f(|
-       \property Voice.crescendoText = "cresc."
-       \property Voice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        )c\p\< ~|
        c~|
        c~|
@@ -149,8 +149,8 @@ tromboI = \notes \relative c {
        R1|
        c4-. c-. r2|
        c4-. c-. r2|
-       \property Voice.decrescendoText = "dim."
-       \property Voice.decrescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.decrescendoText = "dim."
+       \property VoiceCombineVoice.decrescendoSpanner = "dashed-line"
        c4\> r g r|
        R1|
        \!g4\p r r2|
index 057d8fa85c567b0eb8c252561e8a43e2037674c6..925a560162b65dfffd5a4b8e92f67a557eadd58d 100644 (file)
@@ -7,7 +7,7 @@ enteredby =      "JCN";
 copyright =     "public domain";
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 tromboII = \notes \relative c {
        R1*2 |
@@ -16,7 +16,7 @@ tromboII = \notes \relative c {
        c4-. r r2 |
        R1*3 |
        c4-. r r2 |
-       r1 |
+       R1 |
        g4-. r r2 |
        g4-. r r2 |
        R1*5 |
@@ -24,8 +24,8 @@ tromboII = \notes \relative c {
        R1*6 |
        r4 c-.\f r2 |
        R1*2 |
-       \property Voice.crescendoText = "cresc."
-       \property Voice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        r2 c4\p\< r |
        r2 c4 r |
        r2 c4 r |
@@ -116,8 +116,8 @@ tromboII = \notes \relative c {
        c4 r r2|
        R1*18|
        c1\f~|
-       \property Voice.crescendoText = "cresc."
-       \property Voice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        c\p\< ~|
        c~|
        c~|
@@ -149,8 +149,8 @@ tromboII = \notes \relative c {
        R1|
        c,4-. c-. r2|
        c4-. c-. r2|
-       \property Voice.decrescendoText = "dim."
-       \property Voice.decrescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.decrescendoText = "dim."
+       \property VoiceCombineVoice.decrescendoSpanner = "dashed-line"
        c4\> r g r|
        R1|
        \!g4\p r r2|
index 03ffeb7e1bb07b57e1cf076d973c4bb7eb802604..32c87b6cf278efed92e4a366ccaef096a481caeb 100644 (file)
@@ -7,23 +7,23 @@ enteredby =    "JCN";
 copyright =     "public domain";
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 violaI = \notes \relative c {
        c'1\ff ~ |
        c |
        f,4-. r r2 |
-       r1 |
+       R1 |
        % copied 3 bars from three back...
        %5
        c'1 ~ |
        c |
        f,4-. r r2 |
-       r1 |
+       R1 |
        c'1 ~ |
        c |
        fis,4-. r r2 |
-       r1 |
+       R1 |
        g'4-. r r2 |
        g4-. r r2 |
        % copied from violino-1...
@@ -32,8 +32,8 @@ violaI = \notes \relative c {
        [c,8-. es-.] [es()d] [d-. g-.] g4-"ten." |
        [c,8-. es-.] [es()d] [d-. as'-.] [as()g] |
        [g8-. c-.] [c()b] [b-. f'-.] [f()es] |
-       \property StaffCombineVoice.crescendoText = "cresc."
-       \property StaffCombineVoice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        es4.\< es8 d4. d8 |
        %20
        c4. c8 \!b4\f r4 |
@@ -43,15 +43,15 @@ violaI = \notes \relative c {
        r4 [des8\p()c][c-. ges'-.][ges()f] |
        %25
        [f-. bes-.][bes()a][a-. es'-.][es()des] |
-       \property StaffCombineVoice.crescendoText = "cresc."
-       \property StaffCombineVoice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        des4.\< des8 c4. c8 |
        bes4 \!bes4-.\f r2 |
        R1
        % same rhythm as violins...
        r8 c-.\p c4. c8-. c4~ |
-       \property StaffCombineVoice.crescendoText = "cresc."
-       \property StaffCombineVoice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        [c8\< c-.]c2.~ |
        %30
        [c8 c-.]c2.~ |
@@ -84,8 +84,8 @@ violaI = \notes \relative c {
        )g4 r r r8 g(|
        %55
        )d4 r r r8 d(|
-       \property StaffCombineVoice.crescendoText = "cresc."
-       \property StaffCombineVoice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        )es4 r\< r  r8 es(|
        )as4 r r r8 as(|
        )g4 r r r8 g(|
@@ -100,15 +100,15 @@ violaI = \notes \relative c {
        )bes4 r r r8 bes(|
        )as4 r r r8 as(|
        )e4 r r r8 e(|
-       \property StaffCombineVoice.crescendoText = "cresc."
-       \property StaffCombineVoice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        )f4\< r r r8 f(|
        )bes4 r r r8 bes |
        %70
        \!c2:\ff bes: |
        a: fis: |
-       \property StaffCombineVoice.crescendoText = "cresc."
-       \property StaffCombineVoice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        g4\p\< r r r8 g(|
        )c,4 r r r8 c |
        [\!f8\sf(\>as f as][f g d)\!g] |
@@ -119,8 +119,8 @@ violaI = \notes \relative c {
        [d,-.\pp d'-.] es4. es8-. d4 ~ |
        [d8 d-.] es4. es8-. d4 ~ |
        %80
-       \property StaffCombineVoice.crescendoText = "cresc."
-       \property StaffCombineVoice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        [d8\< d-.] es4. es8-. d4 ~ |
        [d8 d-.] es4. es8-. d4 ~ |
        [d8 d-.] es4. es8-. d4 ~ |
@@ -187,8 +187,8 @@ violaI = \notes \relative c {
        [e g b c][des c g e]|
        [f as c des][c des as f]|
        [g bes d es][d es bes g]|
-       \property StaffCombineVoice.crescendoText = "cresc."
-       \property StaffCombineVoice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        [as\< c d es][f es c as]|
        %131
        [g bes d es][f es bes g]|
@@ -211,8 +211,8 @@ violaI = \notes \relative c {
        [g,: bes: c: des:][f,: bes: c: des:]|
        [e,: g: bes: des:][c,: e: g: c:]|
        %shared with cello from here on
-       \property StaffCombineVoice.crescendoText = "cresc."
-       \property StaffCombineVoice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        [f,8\p\< as c des][es, g b c]|
        [des, f a bes][c, es g as]|
        % uhuh, still 'same as cello';
@@ -268,8 +268,8 @@ violaI = \notes \relative c {
        %180
        )e4 r r r8 e8(|
        )b'4 r r r8 b8(|
-       \property StaffCombineVoice.crescendoText = "cresc."
-       \property StaffCombineVoice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        )c4 r\< r r8 c,8(|
        % copied
        )f4 r r r8 f8(|
@@ -284,8 +284,8 @@ violaI = \notes \relative c {
        d,4\p r r r8 d8(|
        )g4 r r r8 g8(|
        )f4 r r r8 f8(|
-       \property StaffCombineVoice.crescendoText = "cresc."
-       \property StaffCombineVoice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        )cis4\< r r r8 cis8(|
        )d4 r r r8 d8(|
        %195
@@ -306,8 +306,8 @@ violaI = \notes \relative c {
        r[c\p(as)c]r[c(a)c] |
        [b-. g'-.] as4. as8-. g4 ~ |
        [g8 g-.] as4. as8-. g4 ~ |
-       \property StaffCombineVoice.crescendoText = "cresc."
-       \property StaffCombineVoice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        [g8 g-.\<] as4. as8-. g4 ~ |
        [g8 g-.] as4. as8-. g4 ~ |
        %210
@@ -350,8 +350,8 @@ violaI = \notes \relative c {
        %240
        f,4 r r2 |
        R1*11 |
-       \property StaffCombineVoice.crescendoText = "cresc."
-       \property StaffCombineVoice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        c'4\p\< r r r8 c8(|
        )f4 r r r8 f,8(|
        )es1 |
@@ -364,8 +364,8 @@ violaI = \notes \relative c {
        e'2:16\f e: |
        
        %260
-       \property StaffCombineVoice.crescendoText = "cresc."
-       \property StaffCombineVoice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        [as,8\p\< f']f4. es8 es4 ~ |
        [es8 as]as4. g8 g4 ~ |
        [g8 f]f4. es8 es4 ~ |
@@ -400,8 +400,8 @@ violaI = \notes \relative c {
        es4-. e-. r2 |
        f4-. g-. r2 |
        %290
-       \property StaffCombineVoice.decrescendoText = "dim."
-       \property StaffCombineVoice.decrescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.decrescendoText = "dim."
+       \property VoiceCombineVoice.decrescendoSpanner = "dashed-line"
        as4\> r g r |
        R1 |
        \!c4\p r r2 |
index b7f3effbd6fb05109b0ee0160cc89ba0a10bd178..5a66c8c0ed8b9ca6ef5cf344e519ccf5ca458502 100644 (file)
@@ -7,23 +7,23 @@ enteredby =    "JCN";
 copyright =     "public domain";
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 violaII = \notes \relative c {
        c1\ff ~ |
        c |
        f4-. r r2 |
-       r1 |
+       R1 |
        % copied 3 bars from three back...
        %5
        c1 ~ |
        c |
        f4-. r r2 |
-       r1 |
+       R1 |
        c1 ~ |
        c |
        fis4-. r r2 |
-       r1 |
+       R1 |
        g4-. r r2 |
        g4-. r r2 |
        % copied from violino-1...
@@ -32,8 +32,8 @@ violaII = \notes \relative c {
        [c,8-. es-.] [es()d] [d-. g-.] g4-"ten." |
        [c,8-. es-.] [es()d] [d-. as'-.] [as()g] |
        [g8-. c-.] [c()b] [b-. f'-.] [f()es] |
-       \property StaffCombineVoice.crescendoText = "cresc."
-       \property StaffCombineVoice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        es4.\< es8 d4. d8 |
        %20
        c4. c8 \!b4\f r4 |
@@ -43,15 +43,15 @@ violaII = \notes \relative c {
        r4 [des8\p()c][c-. ges'-.][ges()f] |
        %25
        [f-. bes-.][bes()a][a-. es'-.][es()des] |
-       \property StaffCombineVoice.crescendoText = "cresc."
-       \property StaffCombineVoice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        des4.\< des8 c4. c8 |
        bes4 \!bes4-.\f r2 |
        R1
        % same rhythm as violins...
        r8 c,-.\p c4. c8-. c4~ |
-       \property StaffCombineVoice.crescendoText = "cresc."
-       \property StaffCombineVoice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        [c8\< c-.]c2.~ |
        %30
        [c8 c-.]c2.~ |
@@ -84,8 +84,8 @@ violaII = \notes \relative c {
        )g4 r r r8 g(|
        %55
        )d4 r r r8 d(|
-       \property StaffCombineVoice.crescendoText = "cresc."
-       \property StaffCombineVoice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        )es4 r\< r  r8 es(|
        )as4 r r r8 as(|
        )g4 r r r8 g(|
@@ -100,15 +100,15 @@ violaII = \notes \relative c {
        )bes4 r r r8 bes(|
        )as4 r r r8 as(|
        )e4 r r r8 e(|
-       \property StaffCombineVoice.crescendoText = "cresc."
-       \property StaffCombineVoice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        )f4\< r r r8 f(|
        )bes4 r r r8 bes |
        %70
        \!as2:\ff g: |
        fis: d: |
-       \property StaffCombineVoice.crescendoText = "cresc."
-       \property StaffCombineVoice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        g4\p\< r r r8 g(|
        )c,4 r r r8 c |
        [\!f8\sf(\>as f as][f g d)\!g] |
@@ -119,8 +119,8 @@ violaII = \notes \relative c {
        [d-.\pp d'-.] es4. es8-. d4 ~ |
        [d8 d-.] es4. es8-. d4 ~ |
        %80
-       \property StaffCombineVoice.crescendoText = "cresc."
-       \property StaffCombineVoice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        [d8\< d-.] es4. es8-. d4 ~ |
        [d8 d-.] es4. es8-. d4 ~ |
        [d8 d-.] es4. es8-. d4 ~ |
@@ -187,8 +187,8 @@ violaII = \notes \relative c {
        [e g b c][des c g e]|
        [f as c des][c des as f]|
        [g bes d es][d es bes g]|
-       \property StaffCombineVoice.crescendoText = "cresc."
-       \property StaffCombineVoice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        [as\< c d es][f es c as]|
        %131
        [g bes d es][f es bes g]|
@@ -211,8 +211,8 @@ violaII = \notes \relative c {
        [g,: bes: c: des:][f,: bes: c: des:]|
        [e,: g: bes: des:][c,: e: g: c:]|
        %shared with cello from here on
-       \property StaffCombineVoice.crescendoText = "cresc."
-       \property StaffCombineVoice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        [f,8\p\< as c des][es, g b c]|
        [des, f a bes][c, es g as]|
        % uhuh, still 'same as cello';
@@ -268,8 +268,8 @@ violaII = \notes \relative c {
        %180
        )e4 r r r8 e8(|
        )b'4 r r r8 b8(|
-       \property StaffCombineVoice.crescendoText = "cresc."
-       \property StaffCombineVoice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        )c4 r\< r r8 c,8(|
        % copied
        )f4 r r r8 f8(|
@@ -284,8 +284,8 @@ violaII = \notes \relative c {
        d,4\p r r r8 d8(|
        )g4 r r r8 g8(|
        )f4 r r r8 f8(|
-       \property StaffCombineVoice.crescendoText = "cresc."
-       \property StaffCombineVoice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        )cis4\< r r r8 cis8(|
        )d4 r r r8 d8(|
        %195
@@ -306,8 +306,8 @@ violaII = \notes \relative c {
        r[as\p(d,)as']r[a(es)a] |
        [g-. g'-.] as4. as8-. g4 ~ |
        [g8 g-.] as4. as8-. g4 ~ |
-       \property StaffCombineVoice.crescendoText = "cresc."
-       \property StaffCombineVoice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        [g8 g-.\<] as4. as8-. g4 ~ |
        [g8 g-.] as4. as8-. g4 ~ |
        %210
@@ -350,8 +350,8 @@ violaII = \notes \relative c {
        %240
        f,4 r r2 |
        R1*11 |
-       \property StaffCombineVoice.crescendoText = "cresc."
-       \property StaffCombineVoice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        c'4\p\< r r r8 c8(|
        )f4 r r r8 f,8(|
        )es1|
@@ -364,8 +364,8 @@ violaII = \notes \relative c {
        bes2:16\f bes: |
        
        %260
-       \property StaffCombineVoice.crescendoText = "cresc."
-       \property StaffCombineVoice.crescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.crescendoText = "cresc."
+       \property VoiceCombineVoice.crescendoSpanner = "dashed-line"
        [as8\p\< f']f4. es8 es4 ~ |
        [es8 as]as4. g8 g4 ~ |
        [g8 f]f4. es8 es4 ~ |
@@ -400,8 +400,8 @@ violaII = \notes \relative c {
        es4-. e-. r2 |
        f4-. g-. r2 |
        %290
-       \property StaffCombineVoice.decrescendoText = "dim."
-       \property StaffCombineVoice.decrescendoSpanner = "dashed-line"
+       \property VoiceCombineVoice.decrescendoText = "dim."
+       \property VoiceCombineVoice.decrescendoSpanner = "dashed-line"
        as4\> r g r |
        R1 |
        \!c4\p r r2 |
index 0116a65afbfb4109d9d6b178e50c32c99a1c6dd0..71d6c4816739c5b1f1225520c67b814c9a1cf206 100644 (file)
@@ -7,7 +7,7 @@ enteredby =      "JCN";
 copyright =     "public domain";
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 \include "violi.ly"
 
index ac753a8485f73d3bfdd61a078df7a4cafb7832d4..465c167c2baeeb60d226d29a29b6cc127c887249 100644 (file)
@@ -7,12 +7,13 @@ enteredby =    "JCN";
 copyright =     "public domain";
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 \include "global.ly"
 \include "viola-1.ly"
 \include "viola-2.ly"
 
+%{
 violiGroup = \context PianoStaff = violi_group \notes <
        \context StaffCombineStaff=oneVioli {
                \property StaffCombineStaff.midiInstrument = #"viola"
@@ -37,3 +38,20 @@ violiGroup = \context PianoStaff = violi_group \notes <
                \context StaffCombineVoice=one \violaI
                \context StaffCombineVoice=two \violaII
 >
+%}
+
+violiGroup = \notes \context VoiceCombineStaff = violi <
+       \context VoiceCombineStaff=violi {
+               \property VoiceCombineStaff.midiInstrument = #"viola"
+               \property VoiceStaffCombineStaff.instrument = #"Viola"
+               \property VoiceStaffCombineStaff.instr = #"Vla."
+               \clef "alto"; 
+               \key es \major;
+               \skip 1*314; 
+               \bar "|."; 
+       }
+       \context VoiceCombineVoice=one \partcombine VoiceCombineVoice
+               \context VoiceCombineThread=one \violaI
+               \context VoiceCombineThread=two \violaII
+>
+
index a43139f21746b42ed03681259506ec9af7b52c91..8ce0a1f83d2a28734eeaa27d8179a81e44b38fec 100644 (file)
@@ -7,7 +7,7 @@ enteredby =      "JCN";
 copyright =     "public domain";
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 \include "global.ly"
 \include "violino-1.ly"
index 43ee469fb6569bd31e9851d792c0a61ca37ed6da..fca5ff48e644b1c2518a19d65874cd14ceddc506 100644 (file)
@@ -7,7 +7,7 @@ enteredby =      "JCN";
 copyright =     "public domain";
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 violinoI = \notes \relative c {
        c'1\ff ~ |
@@ -424,7 +424,9 @@ violinoI = \notes \relative c {
        R1 |
        
        \property Voice.decrescendoText = "sempre pi\\`u piano"
-       \property Voice.decrescendoSpanner = ""
+       % urg, "" is assumed to be hairpin...
+       %\property Voice.decrescendoSpanner = ""
+       \property Voice.decrescendoSpanner = "dashed-line"
        c1^"arco"\> ~ |
        c2 b2 |
        c1 ~ |
index 9431b99d1fa471e7e7cc4acf42cacf768578835c..ee899f6cf742698bae158e7a9d95f5ee2cae9a45 100644 (file)
@@ -7,7 +7,7 @@ enteredby =      "JCN";
 copyright =     "public domain";
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 \include "global.ly"
 \include "violino-2.ly"
index 2db6348856de6498ac7bcf239fd9c024d98a491f..87f75ae7f1368b7deb7dd07073bbaa751ac072fd 100644 (file)
@@ -7,7 +7,7 @@ enteredby =      "JCN";
 copyright =     "public domain";
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 violinoII = \notes \relative c {
        c'1\ff ~ |
index 7877ef4c1f9f11d10be737d24e233271f8ecb2ac..c17fa996b0b3484e12732a0ecdf71eae3e8a623a 100644 (file)
@@ -7,28 +7,27 @@ enteredby =    "JCN";
 copyright =     "public domain";
 }
 
-\version "1.3.59";
+\version "1.3.88";
 
 violoncello = \notes \relative c {
        c1\ff ~ |
        c |
        f,4-. r r2 |
-       r1 |
+       R1 |
        c'1\ff ~ |
        c |
        f,4-. r r2 |
-       \property StaffCombineStaff.instr = #"Vc.\nCb."
-       r1 |
+       R1 |
        c'1\ff ~ |
        c |
        fis,4-. r r2 |
-       r1 |
+       R1 |
        g4-. r r2 |
        g4-. r r2 |
        c4\p r4 r2 |
        c4 r4 r2 |
        c4 r4 r2 |
-       r1 |
+       R1 |
        \property StaffCombineVoice.crescendoText = "cresc."
        \property StaffCombineVoice.crescendoSpanner = "dashed-line"
        c'4.\< c8 bes4. bes8 |
@@ -458,7 +457,9 @@ violoncello = \notes \relative c {
        [c8-.-"arco" es-.][es()d][d-. as'-.][as()g] |
        R1
        \property StaffCombineVoice.decrescendoText = "sempre pi\\`u piano"
-       \property StaffCombineVoice.decrescendoSpanner = ""
+       % urg, "" is assumed to be hairpin...
+       %\property StaffCombineVoice.decrescendoSpanner = ""
+       \property StaffCombineVoice.decrescendoSpanner = "dashed-line"
        \times 2/3 {  c,4\> ( es c ~ } \times 2/3 {  c as' )g } |
 
        %300
index 469cc1e3fea762aa7a3c828f15bc9f389731fd58..3dadb920c01d054832691d0f6eef98c325962dbc 100644 (file)
 
 (define mark-visibility end-of-line-invisible)
 
-; ugh: should calculate from beam-thickness.
-; result in staff-space
 
-;beam_thickness = 0.52 * (\staffspace - \stafflinethickness);
-;interbeam = (2.0 * \staffspace + \stafflinethickness - \beam_thickness) / 2.0;
-;interbeam4 = (3.0 * \staffspace - \beam_thickness) / 3.0;
 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;                  BEAMS
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 (define (default-beam-space-function multiplicity)
   (if (<= multiplicity 3) 0.816 0.844)
    ))
 
 
+; This is a mess : global namespace pollution. We should wait
+;  till guile has proper toplevel environment support.
+
+
+;; Beams should be prevented to conflict with the stafflines, 
+;; especially at small slopes
+;;    ----------------------------------------------------------
+;;                                                   ########
+;;                                        ########
+;;                             ########
+;;    --------------########------------------------------------
+;;       ########
+;;
+;;       hang       straddle   sit        inter      hang
+
+;; inter seems to be a modern quirk, we don't use that
+
+  
+;; Note: quanting period is take as quants.top () - quants[0], 
+;; which should be 1 (== 1 interline)
+(define (mean a b) (* 0.5 (+ a  b)))
+(define (default-beam-dy-quants beam stafflinethick)
+  (let ((thick (ly-get-elt-property beam 'thickness))
+       )
+    
+    (list 0 (mean thick stafflinethick) (+ thick stafflinethick) 1)
+    ))
+
+;; two popular veritcal beam quantings
+;; see params.ly: #'beam-vertical-quants
+
+; (todo: merge these 2 funcs ? )
+
+(define (default-beam-y-quants beam multiplicity dy staff-line)
+  (let* ((beam-straddle 0)
+        (thick (ly-get-elt-property beam 'thickness))
+        (beam-sit (/ (+ thick staff-line) 2))
+        (beam-hang (- 1 (/ (- thick staff-line) 2)))
+        (quants (list beam-hang))
+        )
+    
+    (if (or (<= multiplicity 1) (>= (abs dy) (/ staff-line 2)))
+       (set! quants (cons beam-sit quants)))
+    (if (or (<= multiplicity 2) (>= (abs dy) (/ staff-line 2)))
+       (set! quants (cons beam-straddle quants)))
+    ;; period: 1 (interline)
+    (append quants (list (+ 1 (car quants))))))
+
+(define (beam-traditional-y-quants beam multiplicity dy staff-line)
+  (let* ((beam-straddle 0)
+       (thick (ly-get-elt-property beam 'thickness))
+       (beam-sit (/ (+ thick staff-line) 2))
+       (beam-hang (- 1 (/ (- thick staff-line) 2)))
+       (quants '())
+       )
+    (if (>= dy (/ staff-line -2))
+       (set! quants (cons beam-hang quants)))
+    (if (and (<= multiplicity 1) (<= dy (/ staff-line 2)))
+       (set! quants (cons beam-sit quants)))
+    (if (or (<= multiplicity 2) (>= (abs dy) (/ staff-line 2)))
+       (set! quants (cons beam-straddle quants)))
+    ;; period: 1 (interline)
+    (append quants (list (+ 1 (car quants))))))
+
+
+;; There are several ways to calculate the direction of a beam
+;;
+;; * majority: number count of up or down notes
+;; * mean    : mean centre distance of all notes
+;; * median  : mean centre distance weighted per note
+
+(define (dir-compare up down)
+  (sign (- up down)))
+
+;; arguments are in the form (up . down)
+(define (beam-dir-majority count total)
+  (dir-compare (car count) (cdr count)))
+
+(define (beam-dir-mean count total)
+  (dir-compare (car total) (cdr total)))
+
+(define (beam-dir-median count total)
+  (if (and (> (car count) 0)
+          (> (cdr count) 0))
+      (dir-compare (/ (car total) (car count)) (/ (cdr total) (cdr count)))
+      (dir-compare (car count) (cdr count))))
+           
+
+
+;; [Ross] states that the majority of the notes dictates the
+;; direction (and not the mean of "center distance")
+;;
+;; But is that because it really looks better, or because he wants
+;; to provide some real simple hands-on rules?
+;;     
+;; We have our doubts, so we simply provide all sensible alternatives.
+
+
+
+
+
+;; array index multiplicity, last if index>size
+;; beamed stems
+
+
+;; TODO
+;;  - take #forced stems into account (now done in C++)?
+;;  - take y-position of chord or beam into account
+
+;;;;;;;;;;;;;;;;;;;;;;;
+
+
+;
+; todo: clean this up a bit: the list is getting rather long.
+; 
 (define basic-beam-properties
   `(
     (interfaces . (beam-interface))
     (molecule-callback . ,Beam::brew_molecule)
-    (beam-thickness . 0.42) ; staff-space, should use stafflinethick?
+    (thickness . 0.42) ; in staff-space, should use stafflinethick?
     (before-line-breaking-callback . ,Beam::before_line_breaking)
     (after-line-breaking-callback . ,Beam::after_line_breaking)
     (default-neutral-direction . 1)
+    (dir-function . ,beam-dir-majority)
+    (height-quants .  ,default-beam-dy-quants)
+    (vertical-position-quant-function . ,default-beam-y-quants)
+    (beamed-stem-shorten . (0.5))
     (outer-stem-length-limit . 0.2)
     (slope-limit . 0.2)
-    (beam-flag-width-function . ,default-beam-flag-width-function)
-    (beam-space-function . ,default-beam-space-function)
+    (flag-width-function . ,default-beam-flag-width-function)
+    (space-function . ,default-beam-space-function)
     (damping . 1)
-    (name . "beam")            
+    (name . "beam")
     )
   )
index e4385c0eef5a451b22bfa76bf875eaf3dc3743fd..81afc034bf89a101fcc7caa6cd73b470f59ac749 100644 (file)
 (define (sign x)
   (if (= x 0)
       1
-      (inexact->exact (/ x (abs x)))))
+      (if (< x 0) -1 1)))
 
 ;;;; AsciiScript as
 (define (as-scm action-name)
index 9e8146da48a73b1fac413f19173dd68620da5ad0..5712e0a15a82631066e1dbd26586f613eeaa0c06 100644 (file)
@@ -7,125 +7,3 @@
 ;;; All dimensions are measured in staff-spaces
 
 
-; This is a mess : global namespace pollution. We should wait
-;  till guile has proper toplevel environment support.
-
-
-;; Beams should be prevented to conflict with the stafflines, 
-;; especially at small slopes
-;;    ----------------------------------------------------------
-;;                                                   ########
-;;                                        ########
-;;                             ########
-;;    --------------########------------------------------------
-;;       ########
-;;
-;;       hang       straddle   sit        inter      hang
-
-;; inter seems to be a modern quirk, we don't use that
-
-(define staff-line 0.10)
-(define beam-thickness (* 0.52 (- 1 staff-line)))
-(define beam-straddle 0)
-(define beam-sit (/ (+ beam-thickness staff-line) 2))
-(define beam-hang (- 1 (/ (- beam-thickness staff-line) 2)))
-
-;; Note: quanting period is take as quants.top () - quants[0], 
-;; which should be 1 (== 1 interline)
-
-(define beam-normal-dy-quants
-  (list 0 (/ (+ beam-thickness staff-line) 2) (+ beam-thickness staff-line) 1))
-
-;; two popular veritcal beam quantings
-;; see params.ly: #'beam-vertical-quants
-(define (beam-normal-y-quants multiplicity dy)
-  (let ((quants (list beam-hang)))
-    (if (or (<= multiplicity 1) (>= (abs dy) (/ staff-line 2)))
-       (set! quants (cons beam-sit quants)))
-    (if (or (<= multiplicity 2) (>= (abs dy) (/ staff-line 2)))
-       (set! quants (cons beam-straddle quants)))
-    ;; period: 1 (interline)
-    (append quants (list (+ 1 (car quants))))))
-
-(define (beam-traditional-y-quants multiplicity dy)
-  (let ((quants '()))
-    (if (>= dy (/ staff-line -2))
-       (set! quants (cons beam-hang quants)))
-    (if (and (<= multiplicity 1) (<= dy (/ staff-line 2)))
-       (set! quants (cons beam-sit quants)))
-    (if (or (<= multiplicity 2) (>= (abs dy) (/ staff-line 2)))
-       (set! quants (cons beam-straddle quants)))
-    ;; period: 1 (interline)
-    (append quants (list (+ 1 (car quants))))))
-
-
-;; There are several ways to calculate the direction of a beam
-;;
-;; * majority: number count of up or down notes
-;; * mean    : mean centre distance of all notes
-;; * median  : mean centre distance weighted per note
-
-(define (dir-compare up down)
-  (if (= up down)
-      0
-      (if (> up down)
-         1
-         -1)))
-
-;; (up . down)
-(define (beam-dir-majority count total)
-  (dir-compare (car count) (cdr count)))
-
-(define (beam-dir-mean count total)
-  (dir-compare (car total) (cdr total)))
-
-(define (beam-dir-median count total)
-  (if (and (> (car count) 0)
-          (> (cdr count) 0))
-      (dir-compare (/ (car total) (car count)) (/ (cdr total) (cdr count)))
-      (dir-compare (car count) (cdr count))))
-           
-
-;;; Default variables and settings
-
-(define beam-height-quants beam-normal-dy-quants)
-(define beam-vertical-position-quants beam-normal-y-quants)
-
-
-;; [Ross] states that the majority of the notes dictates the
-;; direction (and not the mean of "center distance")
-;;
-;; But is that because it really looks better, or because he wants
-;; to provide some real simple hands-on rules?
-;;     
-;; We have our doubts, so we simply provide all sensible alternatives.
-(define beam-dir-algorithm beam-dir-majority)
-
-
-;; array index flag-2 (what a name!!), last if index>size
-;; unbeamed stems
-(define stem-length '(3.5 3.5 3.5 4.5 5.0))
-(define grace-length-factor 0.8)
-(define grace-stem-length
-  (map (lambda (x) (* grace-length-factor x)) stem-length))
-
-;; array index multiplicity, last if index>size
-;; beamed stems
-(define beamed-stem-shorten '(0.5))
-(define beamed-stem-length '(0.0 2.5 2.0 1.5))
-(define grace-beamed-stem-length '(0.0 2.5 2.0 1.5))
-(define beamed-stem-minimum-length '(0.0 1.5 1.25 1.0))
-(define grace-beamed-stem-minimum-length
-  (map (lambda (x) (* grace-length-factor x)) beamed-stem-minimum-length))
-
-;;  Stems in unnatural (forced) direction should be shortened,
-;;  according to [Roush & Gourlay].  Their suggestion to knock off
-;;  a whole staffspace seems a bit drastical: we'll do half.
-
-;; TODO
-;;  - take #forced stems into account (now done in C++)?
-;;  - take y-position of chord or beam into account
-
-(define stem-shorten '(0.5))
-(define grace-stem-shorten '(0.0))
-
index 2574afd6191d1ee4da003b288ac245193c6a64d6..f3f010acb3230b91e54381cc74a32ee4e6d3b112 100644 (file)
@@ -23,7 +23,7 @@
 ;;    'head 'along-side-stem 'stem 'loose-end
 ;;
 
-(define slur-extremity-rules
+(define default-slur-extremity-rules
   (list
 
    ;; (cons (lambda (slur dir) (begin (display "before sanity check") (newline))#f) #f)
 
 ;; This list defines the offsets for each type of attachment.
 ;; The format of each element is
-;; (attachment stem-dir * attachment-dir slur-dir)
+;; (stem-dir * dir . slur-dir * dir)
 ;; Different attachments have different default points:
 ;;
 ;; head: Default position is centered in X, on outer side of head Y
 ;; along-side-stem: Default position is on stem X, on outer side of head Y
 ;; stem: Default position is on stem X, at stem end Y
-(define slur-extremity-offset-alist
+(define default-slur-extremity-offset-alist
   '(
-    ((head 1 1) . (-0.25 . 0.2))
+    ((head 1 1) . (-0.25 . 0.25))
     ((head 1 -1) . (-0.25 . -0.25))
     ((head -1 1) . (-0.25 . 0.25))
-    ((head -1 -1) . (-0.85 . -0.2))
+    ((head -1 -1) . (-0.85 . -0.25))
 
     ((stem 1 1) . (0 . 0.5))
     ((stem -1 -1) . (0 . -0.5))
 
-    ((loose-end -1 1) . (-4 . 0))
-    ((loose-end -1 -1) . (-4 . 0))
     ((loose-end 1 1) . (-0.4 . 0))
     ((loose-end 1 -1) . (-0.4 . 0))
+    ((loose-end -1 -1) . (-4 . 0))
+    ((loose-end -1 1) . (-4 . 0))
     ))
+
+
+(define default-basic-slur-properties
+  `(
+   (interfaces . (slur-interface))
+   (molecule-callback . ,Slur::brew_molecule)
+   (thickness . 1.2)           
+   (spacing-procedure . ,Slur::set_spacing_rods)               
+   (minimum-length . 1.5)
+   (after-line-breaking-callback . ,Slur::after_line_breaking)
+   (extremity-rules . ,default-slur-extremity-rules)
+   (extremity-offset-alist . ,default-slur-extremity-offset-alist)
+   (de-uglify-parameters . ( 1.5  0.8  -2.0))
+   (details . ((height-limit . 2.0) (ratio . 0.333) (force-blowfit . 0.5) (beautiful . 0.5)))
+   (y-free . 0.75)
+   (name . "slur")
+   )
+  )
index 54e93d7e921786662648331a6b237909f1ea9739..a6b4af0972fb4e37e96a56c2986aebc698ca00bb 100644 (file)
@@ -397,7 +397,7 @@ class Properties:
         # Requester     Description
         # ---------     -----------
         # init          Initial default values
-        # file          The values found in the lilypond generated TeX files
+        # file          The values found in the LilyPond generated TeX files
         # environment   Envrionment variables LILYINCLUDE, LILYPONDPREFIX
         # rcfile        $LILYPONDPREFIX/.lilyrc
         # rcfile        $HOME/.lilyrc
@@ -880,7 +880,7 @@ class Properties:
     #
     def setRoot(this,path, requester): 
         """
-        Set lilypond root directory
+        Set LilyPond root directory
         """
 
         os.environ['LILYPONDPREFIX'] = path
@@ -960,7 +960,7 @@ def unc2dos(path):
     
 
 def program_id ():
-    return 'ly2dvi (GNU lilypond) ' + version;
+    return 'ly2dvi (GNU LilyPond) ' + version;
 
 
 def mailaddress():
@@ -980,20 +980,20 @@ def help ():
     sys.stdout.write (
 """Usage: %s [OPTION]... [FILE]...
 
-Generate dvi file from mudela or lilypond output
+Generate dvi file from LilyPond source/output
 
 Options:
   -D,--debug           increase verbosity
   -F,--headers=        name of additional LaTeX headers file
   -H,--Height=         set paper height (points) (see manual page)
   -I,--include=DIR     add DIR to LilyPond\'s search path
-  -K,--keeplilypond    keep lilypond output files
+  -K,--keeplilypond    keep LilyPond output files
   -L,--landscape       set landscape orientation
   -N,--nonumber        switch off page numbering
-  -O,--orientation=    set orientation (obsolete - use -L instead)
-  -P,--postscript      generate postscript file
+  -O,--orientation=    set orientation (obsolete -- use -L instead)
+  -P,--postscript      generate PostScript file
   -W,--Width=          set paper width (points) (see manual page)
-  -M,--dependencies    tell lilypond make a dependencies file
+  -M,--dependencies    tell LilyPond to make a dependencies file
   -h,--help            this help text
   -k,--keeply2dvi      keep ly2dvi output files
   -l,--language=       give LaTeX language (babel)
@@ -1001,7 +1001,7 @@ Options:
   -p,--papersize=      give LaTeX papersize (eg. a4)
   -s,--separate        run all files separately through LaTeX
 
-files may be (a mix of) input to or output from lilypond(1)
+files may be (a mix of) input to or output from LilyPond(1)
 """ % name)
 
 \f
@@ -1011,7 +1011,7 @@ files may be (a mix of) input to or output from lilypond(1)
 #
 
 def main():
-    """Generate dvi files from lilypond source/output"""
+    """Generate dvi files from LilyPond source/output"""
 
     infile = Input()
     outfile = TeXOutput()
@@ -1026,6 +1026,7 @@ def main():
                                        'help', 'keeply2dvi', 'language=',
                                        'output=', 'version', 'papersize=', 'separate',
                                        'postscript'])
+
     for opt in options:
         o = opt[0]
         a = opt[1]
@@ -1065,6 +1066,9 @@ def main():
        elif o == '--version':
            print_version ()
            return 0
+       else:
+           print o
+           raise getopt.error
            
     identify()
     Props.read_titledefs ()
@@ -1144,8 +1148,8 @@ ExitTable = {
     'ExitBadWidth'         : ['Invalid Width specification', 6 ],
     'ExitBadOrient'        : ['Invalid Orientation specification', 7 ],
     'ExitNoWrite'          : ['Permission denied', 8 ],
-    'ExitNoTeXName'        : ['hmm, I could not find an output file name', 9 ],
-    'ExitBadLily'          : ['Lilypond failed', 10 ],
+    'ExitNoTeXName'        : ['Hmm, I could not find an output file name', 9 ],
+    'ExitBadLily'          : ['LilyPond failed', 10 ],
     'ExitBadLatex'         : ['Latex failed', 11 ],
     'ExitBadPostscript'    : ['Postscript failed', 12 ],
     'ExitUnknown'          : ['Unknown Exit Code', 20 ],