* lily/accidental.cc: special bboxes for natural.

* mf/feta-toevallig.mf: make stems heavier.

* mf/feta-klef.mf: revise.

* mf/feta-klef.mf: add rounded curve at top.
make thinnib a little heavier.

diff --git a/ChangeLog b/ChangeLog
index 93d2c8e85f31b787863f608bdcd4e90e159f9ab5..54bef833018a63064217244d5fa77af003fbbfaf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2005-03-10  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * lily/accidental.cc: special bboxes for natural. 
+
+       * mf/feta-toevallig.mf: make stems heavier.
+
        * lily/dynamic-text-spanner.cc (print): add bound padding for edge
        texts as well.
 

diff --git a/input/regression/accidental-placement.ly b/input/regression/accidental-placement.ly
index 91ea528421ca58c1d133017c8fd24cab6cc4618f..a8e8024bf4f751dfb446e68b9c43815f9ac2aa7b 100644 (file)
--- a/input/regression/accidental-placement.ly
+++ b/input/regression/accidental-placement.ly
@@ -14,6 +14,7 @@ flats in a sixth should be staggered.  "
 \score {
      \context Voice \relative c'
     {
+       <d e! bes'!>4
        cis4
        c4
        \transpose c c' {
@@ -30,6 +31,7 @@ flats in a sixth should be staggered.  "
        <c! es ges beses>
        <bes! c d f >    
        <bes,! c d f >
+
     }
     \layout {
        raggedright = ##t

diff --git a/lily/accidental.cc b/lily/accidental.cc
index a0f4136a4594a709c3f6e0f7e3183b9426364e78..54c68cb640b2de30292d6eedd5235b57b020a7f4 100644 (file)
--- a/lily/accidental.cc
+++ b/lily/accidental.cc
@@ -71,7 +71,9 @@ Accidental_interface::accurate_boxes (Grob *a, Grob**common)
       && !parens
       && scm_ilength (accs) == 1)
     {
-      if (scm_to_int (scm_car (accs)) == FLAT)
+      switch (scm_to_int (scm_car (accs))
+      {
+      case FLAT:
        {
          Box stem = b;
          Box bulb = b;
@@ -91,9 +93,28 @@ Accidental_interface::accurate_boxes (Grob *a, Grob**common)
          boxes.push (bulb);
          boxes.push (stem);
        }
-      
+       break;
+      case NATURAL:
+       {
+         Box lstem = b;
+         Box rstem = b;
+         Box belly = b;
+
+         lstem[Y_AXIS] *= 1.1;
+         rstem[Y_AXIS] *= 1.1;
+         
+         belly[Y_AXIS] *= 0.75;
+         lstem[X_AXIS][RIGHT] *= .5;
+         rstem[X_AXIS][LEFT] = lstem[X_AXIS][RIGHT];
+         lstem[Y_AXIS][DOWN] = belly[Y_AXIS][DOWN];
+         rstem[Y_AXIS][UP] = belly[Y_AXIS][UP];
+         boxes.push (belly);
+         boxes.push (lstem);
+         boxes.push (rstem);
+       }
+       break;
       /*
-       TODO: add support for natural, double flat.
+       TODO: add support for, double flat.
        */
     }
 

diff --git a/mf/feta-test-generic.mf b/mf/feta-test-generic.mf
index 30c951f38e57ebb3e7cb4e4c9be0ae6a9be1e194..96bb44e36a858cdae8d6edbb5a65cc5526a06db2 100644 (file)
--- a/mf/feta-test-generic.mf
+++ b/mf/feta-test-generic.mf
@@ -4,7 +4,7 @@
 %
 
 %input feta-eindelijk;
-%input feta-toevallig;
+input feta-toevallig;
 %input feta-puntje;
 %input feta-bolletjes; 
 %input feta-schrift;

diff --git a/mf/feta-toevallig.mf b/mf/feta-toevallig.mf
index 608b310990dfdec760fb8502fb1c002442c476ea..3964f38025dcc873fb715f5d0c2128b721351811 100644 (file)
--- a/mf/feta-toevallig.mf
+++ b/mf/feta-toevallig.mf
@@ -243,8 +243,8 @@ fet_beginchar ("Natural", "0");
        pair ne;
        path pat_top, pat_bottom;
 
-       top_stem_thick# = stafflinethickness# + .09 staff_space#;
-       stemwidth# = 0.08 staff_space# + .5 stafflinethickness#;
+       top_stem_thick# = stafflinethickness# + .10 staff_space#;
+       stemwidth# = 0.09 staff_space# + .5 stafflinethickness#;
        define_whole_blacker_pixels (top_stem_thick, stemwidth);
 
        set_char_box (0, 2/3 staff_space#,