lilypond-1.3.99

diff --git a/input/bugs/grace-finger.ly b/input/bugs/grace-finger.ly
new file mode 100644 (file)
index 0000000..8b2bb44
--- /dev/null
+++ b/input/bugs/grace-finger.ly
@@ -0,0 +1,7 @@
+
+
+\score {
+\notes \context Voice = VA \relative c'' {
+       \grace {[b8^1 c^2]} d4^3
+}
+\paper {linewidth = -1. ; }}

diff --git a/input/test/fingering.ly b/input/test/fingering.ly
new file mode 100644 (file)
index 0000000..8b2bb44
--- /dev/null
+++ b/input/test/fingering.ly
@@ -0,0 +1,7 @@
+
+
+\score {
+\notes \context Voice = VA \relative c'' {
+       \grace {[b8^1 c^2]} d4^3
+}
+\paper {linewidth = -1. ; }}

diff --git a/input/test/scales-greek.ly b/input/test/scales-greek.ly
new file mode 100644 (file)
index 0000000..37f77a9
--- /dev/null
+++ b/input/test/scales-greek.ly
@@ -0,0 +1,42 @@
+\header {
+       crossRefNumber = "1";
+       tagline = "Lily was here 1.3.98 -- automatically converted from ABC";
+       title = "Scales";
+}
+voicedefault = \notes {
+\property Score.defaultBarType="empty"
+
+\key c \major;     c'8 -"major"   d'8    e'8    f'8    g'8    a'8    b'8    
+c''8    \key c \ionian;     c'8 -"ionian"   d'8    e'8    f'8    g'8    a'8    
+b'8    c''8    \key d \dorian;     c'8 -"dorian"   d'8    e'8    f'8    g'8    
+a'8    b'8    c''8    \key e \phrygian;     c'8 -"phrygian"   d'8    e'8    f'8 
+   g'8    a'8    b'8    c''8    \key f \lydian;     c'8 -"lydian"   d'8    e'8  
+  f'8    g'8    a'8    b'8    c''8    \key g \mixolydian;     c'8 -"mixolydian" 
+  d'8    e'8    f'8    g'8    a'8    b'8    c''8    \key a \minor;     c'8 
+-"minor"   d'8    e'8    f'8    g'8    a'8    b'8    c''8    \key a \aeolian;   
+  c'8 -"aeolian"   d'8    e'8    f'8    g'8    a'8    b'8    c''8    
+\key b \locrian;     c'8 -"locrian"   d'8    e'8    f'8    g'8    a'8    b'8    
+c''8    \key f \major;     c'8 -"major"   d'8    e'8    f'8    g'8    a'8    
+bes'8    c''8    \key f \ionian;     c'8 -"ionian"   d'8    e'8    f'8    g'8   
+ a'8    bes'8    c''8    \key g \dorian;     c'8 -"dorian"   d'8    e'8    f'8  
+  g'8    a'8    bes'8    c''8    \key a \phrygian;     c'8 -"phrygian"   d'8    
+e'8    f'8    g'8    a'8    bes'8    c''8    \key bes \lydian;     c'8 
+-"lydian"   d'8    e'8    f'8    g'8    a'8    bes'8    c''8    
+\key c \mixolydian;     c'8 -"mixolydian"   d'8    e'8    f'8    g'8    a'8    
+bes'8    c''8    \key d \aeolian;     c'8 -"aeolian"   d'8    e'8    f'8    g'8 
+   a'8    bes'8    c''8    \key d \minor;     c'8 -"minor"   d'8    e'8    f'8  
+  g'8    a'8    bes'8    c''8    \key e \locrian;     c'8 -"locrian"   d'8    
+e'8    f'8    g'8    a'8    bes'8    c''8    
+}\score{
+        \notes <
+
+       \context Staff="default"
+       {
+           \$voicedefault 
+       }
+
+    >
+       \paper {
+       }
+       \midi {}
+}

diff --git a/input/test/scales.ly b/input/test/scales.ly
index f3f8df7c05a13e7a462547878edf5d17ee7fc77b..9399edf7b54614516c21ac2a78d6066744c8cb39 100644 (file)
--- a/input/test/scales.ly
+++ b/input/test/scales.ly
@@ -100,10 +100,8 @@
        es,, f ges as bes ces d es
        
        \key as\minor;
-       as, bes ces des es fes g as
-       
-       
-  }
+       as, bes ces des es fes g as}
+
   \paper { }  
   \midi { }
 }

diff --git a/input/trip.ly b/input/trip.ly
index f943744f35d2a91a8fd74398d159043b10126955..a8062f7e6211735907739ddf76e715a0b3c64eb5 100644 (file)
--- a/input/trip.ly
+++ b/input/trip.ly
@@ -100,22 +100,22 @@ fugaIIRight = \notes   \relative c''   {
        \context Voice=one {
        \shiftOff
        \stemUp
-         e4 
+         e4 -5
        }
        \context Voice=two {
          \shiftOn
          \stemUp
-         cis
+         cis-4
        }
        \context Voice=three {
          \shiftOnn
          \stemUp
-         ais
+         ais-3 
        }
        \context Voice=four {
          \shiftOnnn
          \stemUp
-         fis
+         fis-2
        }
   >
 

diff --git a/lily/GNUmakefile b/lily/GNUmakefile
index d81ea7813cdeaa1d58ea31c889d80a5a5e3009fd..7f88845376d5d8457cd0e3c419ad38b7190d05b1 100644 (file)
--- a/lily/GNUmakefile
+++ b/lily/GNUmakefile
@@ -22,5 +22,6 @@ default:
 $(outdir)/my-lily-parser.o: $(outdir)/parser.hh
 $(outdir)/my-lily-lexer.o: $(outdir)/parser.hh
 $(outdir)/lexer.o: $(outdir)/parser.hh
-$(outdir)/lily-version.o: $(outdir)/version.hh
 
+$(outdir)/lily-guile.o: $(outdir)/version.hh
+$(outdir)/lily-version.o: $(outdir)/version.hh

diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc
index 7b722ba5116f926b5b5d9be92ae945bb80d64942..87ad033329578da9aad0643d6a48bcbf6625e1aa 100644 (file)
--- a/lily/lily-guile.cc
+++ b/lily/lily-guile.cc
@@ -403,7 +403,7 @@ ly_version ()
   char const* vs =  "\'(" MAJOR_VERSION " " MINOR_VERSION " "  PATCH_LEVEL " " MY_PATCH_LEVEL ")" ;
 
   
-  return gh_eval_str (vs);
+  return gh_eval_str ((char*)vs);
 }
 
 static void

diff --git a/lily/text-item.cc b/lily/text-item.cc
index deada62d3073ad9644a56e89c6f0c12769501c4c..b6fa571c60b5c32043b3a48cf72eef31512f1b4f 100644 (file)
--- a/lily/text-item.cc
+++ b/lily/text-item.cc
@@ -19,27 +19,11 @@
 
 
 /*
-  text: string | (markup sentence)
-  markup: markup-symbol | (markup-symbol . parameter)
-  sentence: text | sentence text
-  
-
-  Properties:
-
-  * Font:
-  ---* Type:
-  ------* Series: medium, bold
-  ------* Shape: upright, italic, slanted
-  ------* Family: roman, music, orator, typewriter
-
-  ---* Size:
-  ------* size: ...,-2,-1,0,1,2,... (style-sheet -> cmrXX, fetaXX)
-  ------* points: 11,13,16,20,23,26 (for feta)
-  ------* magnification: UNSIGNED
-
-  * Typesetting:
-  ---* kern: INT (staff-space)
-  ---* align: horizontal/vertical / lines / rows
+    TEXT : STRING | (MARKUP SENTENCE)
+    MARKUP: PROPERTY | ABBREV
+    SENTENCE: TEXT | SENTENCE TEXT
+    PROPERTY: (key . value)
+    ABBREV: rows lines roman music bold italic named super sub text, or any font-style
  */
 Molecule
 Text_item::text2molecule (Score_element *me, SCM text, SCM properties) 
@@ -74,22 +58,21 @@ Text_item::string2molecule (Score_element *me, SCM text, SCM properties)
   if (paper == SCM_EOL)
     paper = scm_string_to_symbol (me->paper_l ()->get_scmvar ("style_sheet"));
 
-  SCM font_name;
+  // should move fallback to scm
+  SCM font_name = ly_str02scm ("cmr10");
   if (gh_pair_p (style))
     {
       SCM f = get_elt_property (me, "style-to-font-name");
-      font_name = gh_call2 (f, paper, gh_cdr (style));
+      if (gh_procedure_p (f))
+       font_name = gh_call2 (f, paper, gh_cdr (style));
     }
   else
     {
       SCM f = get_elt_property (me, "properties-to-font-name");
-      font_name = gh_call2 (f, paper, properties);
+      if (gh_procedure_p (f))
+       font_name = gh_call2 (f, paper, properties);
     }
    
-  // should move fallback to scm
-  if (!gh_string_p (font_name))
-    font_name = ly_str02scm ("cmr10");
-    
   SCM lookup = scm_assoc (ly_symbol2scm ("lookup"), properties);
 
   Molecule mol;

diff --git a/ly/italiano.ly b/ly/italiano.ly
index 28bbc0599567ef5da0e9128519af0666b6e02a08..4df74b22ccdbdebca16b13705ccc147482699ea7 100644 (file)
--- a/ly/italiano.ly
+++ b/ly/italiano.ly
@@ -10,7 +10,7 @@
 
 % contributed by Paolo Zuliani <zuliap@easynet.it>
 
-\notenames #'
+\notenames #'(
        (dobb . ( -1 0 -2 ))
        (dob . ( -1 0 -1 ))
        (do . ( -1 0 0 ))

diff --git a/ly/scale-definitions.ly b/ly/scale-definitions.ly
index 873f58313b425c7674a635834fe092cf890e8dc1..0b48ce633a3bbcf675e961b7ee7512f09479e63c 100644 (file)
--- a/ly/scale-definitions.ly
+++ b/ly/scale-definitions.ly
@@ -8,8 +8,8 @@ major = #'(
     (4 . 0)
     (5 . 0)
     (6 . 0)
-  
   )
+
 minor = #'(
     (0 . 0)
     (1 . 0)
@@ -19,14 +19,81 @@ minor = #'(
     (5 . -1)
     (6 . -1)
     )
-  
-
-%{ OUTDATED: someone please fix these
-ionian = 0
-locrian = 1
-aeolian = 3
-mixolydian = 5
-lydian = 7
-phrygian = 8
-dorian = 10
-%}
+
+
+ionian = #'(
+    (0 . 0)
+    (1 . 0)
+    (2 . 0)
+    (3 . 0)
+    (4 . 0)
+    (5 . 0)
+    (6 . 0)
+  )  
+
+
+locrian = #'(
+    (0 . 0)
+    (1 . -1)
+    (2 . -1)
+    (3 . 0)
+    (4 . -1)
+    (5 . -1)
+    (6 . -1)
+  )  
+
+
+aeolian = #'(
+    (0 . 0)
+    (1 . 0)
+    (2 . -1)
+    (3 . 0)
+    (4 . 0)
+    (5 . -1)
+    (6 . -1)
+    )
+
+
+mixolydian = #'(
+    (0 . 0)
+    (1 . 0)
+    (2 . 0)
+    (3 . 0)
+    (4 . 0)
+    (5 . 0)
+    (6 . -1)
+  )  
+
+
+lydian = #'(
+    (0 . 0)
+    (1 . 0)
+    (2 . 0)
+    (3 . 1)
+    (4 . 0)
+    (5 . 0)
+    (6 . 0)
+  )  
+
+
+phrygian = #'(
+    (0 . 0)
+    (1 . -1)
+    (2 . -1)
+    (3 . 0)
+    (4 . 0)
+    (5 . -1)
+    (6 . -1)
+)  
+
+
+dorian = #'(
+    (0 . 0)
+    (1 . 0)
+    (2 . -1)
+    (3 . 0)
+    (4 . 0)
+    (5 . 0)
+    (6 . -1)
+  )
+