lilypond-1.3.102

diff --git a/input/les-nereides.ly b/input/les-nereides.ly
index 585c3e424d66975418b6737c2970439a7697680b..524e109a84d92182f16a1cd1510d20f25fe08ae5 100644 (file)
--- a/input/les-nereides.ly
+++ b/input/les-nereides.ly
@@ -10,7 +10,7 @@ cpp -P -traditional -o l-fake.ly  -DFAKE_GRACE les-nereides.ly
     enteredby =  "JCN";
     %piece =      "Allegretto scherzando";
     copyright =  "public domain";
-    description = "Natiest piece of competition at http://www.orphee.com/comparison/study.html, see http://www.orphee.com/comparison/gray.pdf";
+    description = "Nastiest piece of competition at http://www.orphee.com/comparison/study.html, see http://www.orphee.com/comparison/gray.pdf";
     comment =     "LilyPond (1.3.93) can't really do this yet, I guess";
 }
 
@@ -87,9 +87,13 @@ treble = \context Voice=treble \notes\relative c''{
     \property Voice.TextSpanner \push #'edge-height = #'(0 . 1.5)
     \property Voice.TextSpanner \push #'edge-text = #'("8 " . "")
     % Huh, urg?  Implicit \context Staff lifts us up to Staff context???
+
+       % no, see seq-mus-iter --hwn
     \property Staff."c0-position" = #-13
+
+
     % Get back
-    \context Voice 
+    %\context Voice 
     \outputproperty #(make-text-checker "m.g.")
            #'extra-offset = #'(-3 . -2)
     % currently, this can't be (small) italic, because in the paperblock

diff --git a/input/test/ottava.ly b/input/test/ottava.ly
index e51a4c3b1c6b2f2fc54c4b9149cdbca7b6142d2f..916943f7429ccaa1a9c51653614079c00f61da77 100644 (file)
--- a/input/test/ottava.ly
+++ b/input/test/ottava.ly
@@ -4,14 +4,14 @@
         \property Voice.TextSpanner \push #'type = #"dotted-line"
         \property Voice.TextSpanner \push #'edge-height = #'(0 . 1.5)
         \property Voice.TextSpanner \push #'edge-text = #'("8va " . "")
-        \property Staff."c0-position" = #-13
+        \property Staff.centralCPosition = #-13
 
         a\spanrequest \start "text" b c a \spanrequest \stop "text"
 
-        \property Staff."c0-position" = #-6
+        \property Staff.centralCPosition = #-6
        a b c a
 
-        \property Staff."c0-position" = #1
+        \property Staff.centralCPosition = #1
         \property Voice.TextSpanner \push #'edge-text = #'("8bass " . "")
         \property Voice.TextSpanner \push #'direction = #-1
         a\spanrequest \start "text" b c a \spanrequest \stop "text"

diff --git a/lily/clef-engraver.cc b/lily/clef-engraver.cc
index c867a0a4efda77abbb41cc238383417190b2da7c..53d9bd62d4cc964e0f4bf8e82c98b2dd24fc99fa 100644 (file)
--- a/lily/clef-engraver.cc
+++ b/lily/clef-engraver.cc
@@ -96,12 +96,12 @@ Clef_engraver::set_type (String s)
        return false;
 
       int c0_position = gh_scm2int (pos) + gh_scm2int (gh_cdr (found));
-      daddy_trans_l_->set_property ("clefCentralCPosition", gh_int2scm (c0_position));
+      daddy_trans_l_->set_property ("centralCPosition", gh_int2scm (c0_position));
     }
 
-  int c0_position = gh_scm2int (get_property ("clefCentralCPosition"));
+  int c0_position = gh_scm2int (get_property ("centralCPosition"));
   c0_position -= (int)octave_dir_ * 7;
-  daddy_trans_l_->set_property ("clefCentralCPosition", gh_int2scm (c0_position));
+  daddy_trans_l_->set_property ("centralCPosition", gh_int2scm (c0_position));
 
 
   SCM basic = ly_symbol2scm ("Clef");
@@ -135,7 +135,7 @@ Clef_engraver::acknowledge_element (Score_element_info info)
          )
        {
          int p = int (Staff_symbol_referencer::position_f (item))
-           + gh_scm2int (get_property ("clefCentralCPosition"));
+           + gh_scm2int (get_property ("centralCPosition"));
          Staff_symbol_referencer::set_position (item, p);
        }
       else if (Key_item::has_interface (item))
@@ -146,7 +146,7 @@ Clef_engraver::acknowledge_element (Score_element_info info)
            to know c0-pos for this.  (?)
          */
 
-         item->set_elt_property ("c0-position", get_property ("clefCentralCPosition"));
+         item->set_elt_property ("c0-position", get_property ("centralCPosition"));
        }
     } 
 }
@@ -156,7 +156,7 @@ Clef_engraver::do_creation_processing ()
 {
   daddy_trans_l_->set_property ("clefPosition", gh_int2scm (0));
   daddy_trans_l_->set_property ("clefGlyph", SCM_EOL);
-  daddy_trans_l_->set_property ("clefCentralCPosition", gh_int2scm (0));
+  daddy_trans_l_->set_property ("centralCPosition", gh_int2scm (0));
 
   SCM def = get_property ("defaultClef");
   if (gh_string_p (def))

diff --git a/scripts/abc2ly.py b/scripts/abc2ly.py
index dc08ba9395177ddd6eb721bf428d7ecff70a129e..84bb51668ffb038585848693bfd5254eb45edad4 100644 (file)
--- a/scripts/abc2ly.py
+++ b/scripts/abc2ly.py
@@ -44,9 +44,8 @@
 
 
 #TODO:
-# UNDEF -> None
- 
-  
+# - UNDEF -> None
+# - rewrite this to be like etf2ly.py
   
 program_name = 'abc2ly'
 version = '@TOPLEVEL_VERSION@'
@@ -1071,8 +1070,6 @@ http://www.gre.ac.uk/~c.walshaw/abc2mtex/abc.txt) To LilyPond input.
 def print_version ():
        print r"""abc2ly (GNU lilypond) %s""" % version
 
-
-
 (options, files) = getopt.getopt (sys.argv[1:], 'vo:h', ['help','version', 'output='])
 out_filename = ''