lilypond-0.1.62

diff --git a/input/test/clefs.ly b/input/test/clefs.ly
index 7722d99d1b14131e82d30b5e1a6b28532850e2ac..3c14564347d60d111c36b00f2605e349957bf25c 100644 (file)
--- a/input/test/clefs.ly
+++ b/input/test/clefs.ly
@@ -8,6 +8,8 @@
          \clef "tenor";c1^"{tenor}" \bar "||";
          \clef "baritone";c1^"{baritone}" \bar "||";
          \clef "varbaritone";c1^"{varbaritone}" \bar "||";
+         \clef "G_8";c1^"{sub 8?}" \bar "||";
+         \clef "G^8";c1^"{sup 8?}" \bar "|.";
          \clef "bass";c1^"{bass}" \bar "||";
          \clef "subbass";c1^"{subbass}" \bar "|.";
          }

diff --git a/lily/include/clef-grav.hh b/lily/include/clef-grav.hh
index 61318648edad7f5900de05aeb1d8e2241f73dfef..ec4702cac896b8fdf3232b13a03a564e8df737cc 100644 (file)
--- a/lily/include/clef-grav.hh
+++ b/lily/include/clef-grav.hh
@@ -13,6 +13,7 @@
 #include "scalar.hh"
 #include "varray.hh"
 #include "engraver.hh"
+#include "direction.hh"
 
 /// where is c-0 in the staff?
 class Clef_engraver : public  Engraver {
@@ -33,6 +34,7 @@ protected:
 public:
   TRANSLATOR_CLONE(Clef_engraver);
   int c0_position_i_;
+  Direction octave_dir_;
   String clef_type_str_;
 
   /* ************** */

diff --git a/lily/include/clef-item.hh b/lily/include/clef-item.hh
index c6e00a992e04427c578b8c8d61f7daebaf6933c5..3b82f9d426e77d994707d7cb8bca3033e752d883 100644 (file)
--- a/lily/include/clef-item.hh
+++ b/lily/include/clef-item.hh
@@ -7,6 +7,8 @@
 #ifndef CLEFITEM_HH
 #define CLEFITEM_HH
 #include "item.hh"
+#include "text-def.hh"
+#include "direction.hh"
 
 /**
   Set a clef in a staff.
@@ -26,6 +28,12 @@ public:
     /// set because of existence of a bar
     bool default_b_;
 
+    /// should we print an octave symbol (8), and where? (up=1, down=1)?
+    Direction octave_dir_;
+
+    /// text def to put above/below clef (ugh: should be const)
+    Text_def * octave_marker_td_p_;
+  
     /* *************** */
     DECLARE_MY_RUNTIME_TYPEINFO;
     SCORE_ELEM_CLONE(Clef_item);

diff --git a/lily/mudela-version.cc b/lily/mudela-version.cc
new file mode 100644 (file)
index 0000000..dbcc1b5
--- /dev/null
+++ b/lily/mudela-version.cc
@@ -0,0 +1,42 @@
+/*
+  mudela-version.cc -- implement Mudela_version
+
+  source file of the GNU LilyPond music typesetter
+
+  (c) 1998 Jan Nieuwenhuizen <jan@digicash.com>
+
+*/
+
+#include "mudela-version.hh"
+#include "string-convert.hh"
+#include "varray.hh"
+
+Mudela_version::Mudela_version (int major, int minor, int patch)
+{
+  major_i_ = major;
+  minor_i_ = minor;
+  patch_i_ = patch;
+}
+
+Mudela_version::Mudela_version (String str)
+{
+  Array<String> version;
+  version = String_convert::split_arr (str, '.');
+  assert (version.size () == 3);
+  major_i_ = version[0].value_i ();
+  minor_i_ = version[1].value_i ();
+  patch_i_ = version[2].value_i ();
+}
+
+String
+Mudela_version::str () const
+{
+  return String (major_i_) + "." + String (minor_i_) + "." + String (patch_i_);
+}
+
+Mudela_version::operator int () const
+{
+    // ugh
+  return 100000 * major_i_ + 1000 * minor_i_ + patch_i_;
+}
+

diff --git a/mutopia/Coriolan/part-paper.ly b/mutopia/Coriolan/part-paper.ly
new file mode 100644 (file)
index 0000000..2c312d8
--- /dev/null
+++ b/mutopia/Coriolan/part-paper.ly
@@ -0,0 +1,32 @@
+% paper20.ly
+
+\include "table20.ly"
+\include "paper20.ly"
+default_paper = \paper {
+       \paper_twenty
+       Score = \translator {
+       \type Score_engraver;
+
+       \consists "Timing_engraver";
+       % uncomment to bar numbers on a whole system.
+%{
+       \consists "Bar_column_engraver";
+       \consists "Bar_number_engraver";
+%}
+       \consists "Span_score_bar_engraver";
+       \consists "Score_priority_engraver";
+       \consists "Priority_horizontal_align_engraver";
+       \consists "Vertical_align_engraver";
+
+
+       \accepts "Staff_group";
+       \accepts "Staff";
+       \accepts "Rhythmic_staff";      
+       \accepts "Lyrics";
+       \accepts "Grand_staff";
+       SkipBars = "1";
+}
+
+
+}
+