lilypond-0.1.22

diff --git a/NEWS b/NEWS
index 3f196faa5e00354e02dc8e085a65bc8837493aa3..abf20884ef75cc409b52b19007a6db8e139b2667 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,16 @@
+pl 22
+       - bf: lyric 's- Zondags
+       - bf: colliding accidentals: renamed translate(Real,Axis) to translate_axis()
+       - renaming of scripts
+       - strings with escaped characters.
+       - bf "string_with_\"_embedded"
+       - bf: mf/Makefile
+       - feta changes (trill, organ pedals)
+       - updated mf-to-table for new feta conventions
+       - changed header format to something sensible.
+       - moved staff to centerline == 0;
+
+********
 pl 21
        - shrinking uses more energy  than stretching
        - check IO error on writing (disk full?)

diff --git a/TODO b/TODO
index f3b65e6c36d98fc2be9f90cc8d91dde4fda19b73..e8416d10030bc0fdcc44618e03368f9062107660 100644 (file)
--- a/TODO
+++ b/TODO
@@ -6,15 +6,15 @@ done, or is an idea that I want to think about
 Most of the items are marked in the code as well, with full explanation. 
 grep for TODO and ugh/ugr
 
-       * accidental placement
+       * todo key-sig placement.
+       
+       * put errorlevel in Input
 
        * AFM for font input?
 
        * Make general "spanning"-elements and "placer"-elements
 
-       * Unicode support?
-
-       - naming Mozarella, Madeira, Muella, Fontaigna, Feta?
+       - naming Mozarella, Madeira, Muella, Feta?
        - bf: abbrevs over whole note
        - scoping for properties
 
@@ -53,20 +53,20 @@ grep for TODO and ugh/ugr
 
        * Fix profiling. gprof bugreport?
 
-       * read from mmap directly: bugreport to flex developers->
-       yy_scan_buffer in C++..
-
-       * (where are the) gcc compile warnings on linux
-
 PROJECTS
 
+       * Unicode support?
+       - 16 bit Strings
+       - -u switch
+       - detect of 16/8 bit files
+       - examples to go with it.
+
        * Spring_spacer:
        - write a faster Spring_spacer ( without matrices if possible )
        - relate energybound to linelen unitspace fontsize etc.
        - used fixed point fp
 
        * \header
-       - revise lexer mode
        - write perl script for handling it into databases
        - write TeX macros to generate titles
 
@@ -102,16 +102,13 @@ languages:
        - derive lily_stream, Dstream, texstream from ostream?
        - indentable stream as baseclass for TeX stream, lily stream, Dstream.
        - use dstream feature in mi2mu
+       - integrate IO checking into stream class
 
        * input converters
        - NIFF?
        - ABC? 
        - SMDL?
 
-       * robustification
-       - check write errors
-       - check read errors
-       
        * placement of bar-numbers
 
 ******************

diff --git a/input/font.ly b/input/font.ly
index ff68d5bce764bd3eabbfdef9a54fb34ae443248d..3822fcfa4cb41365bc2bd33bb221f23bdda04c79 100644 (file)
--- a/input/font.ly
+++ b/input/font.ly
@@ -1,25 +1,25 @@
 \header{
-enteredby      jcn
-copyright      PD
-TestedFeatures  This file tests the Feta music-font
-       (Feta definitively is not an abbreviation of Font-En-TjA)
+enteredby =     "jcn";
+copyright =     "PD";
+TestedFeatures =        "This file tests the Feta music-font"
+        "(Feta definitively is not an abbreviation of Font-En-TjA)";
 }
 
-\version "0.1.6";
+\version "0.1.7";
 
 \score{
        \melodic{ 
                \octave c';
                \meter 4/4;
-               \multi 2  < { \stemup g''\longa a''\breve | }
+               \multi 2  < { \stemup e'\longa a\breve | }
                { \stemdown
                c1 g c' a'
-               c2 g } >
+               c2 g c' a'
+               } >
                \stemboth
-               c' a'
                c4 g c' a' |
                a\ppp-\upbow a\pp-\downbow a\p^\turn a\mp^\fermata |
-               a\mf_\fermata a\f-\stopped a\ff-\open a\fff|
+               a\mf_\fermata a\f-\stopped a\ff-\open a\fff^\trill|
                a\fp a4.\sf a4.\sfz | % a\fz a\rf
                [c8 c] [a' a']
                [c a'] [a' c] |
@@ -30,8 +30,8 @@ TestedFeatures  This file tests the Feta music-font
                \multi 2 < { \stemup c1 } {\stemdown r1}>               
                \stemboth
                
-               c8_. c''8-> c4^^ c4_^ 
-               c4 _| c4^|
+               c8_. c''8-> c16^^ c16_^ 
+               c32 _| c32^| g''32-\ltoe g''32-\lheel
                }
        \paper{ 
            gourlay_maxmeasures =5.;

diff --git a/input/twinkle.ly b/input/twinkle.ly
index 2ec9b40ee0f2b3d69cb87af620cdb82d2c08236a..6d5c243fd1cf6e4ddb3ce1e532d91698c6402f18 100644 (file)
--- a/input/twinkle.ly
+++ b/input/twinkle.ly
@@ -1,20 +1,20 @@
 \header{
-filename        twinkle.ly
-title  twinkle twinkle little star
-description    traditional song in various languages.
-        "Ah, vous dirais-je, maman" 
-        "Altijd is Kortjakje ziek"
-        "Twinkle twinkle little star"
-
-composers      Traditional
-enteredby      HWN & JCN
-copyright      public domain
+filename =      "twinkle.ly";
+title =         "twinkle twinkle little star";
+description =   "traditional song in various languages."
+  "Ah, vous dirais-je, maman" 
+  "Altijd is Kortjakje ziek"
+  "Twinkle twinkle little star";
+
+composers =     "Traditional";
+enteredby =     "HWN & JCN";
+copyright =     "public domain";
 }
 %{
 Tested Features: lyrics
 
 %}
-\version "0.1.6";
+\version "0.1.7";
 
 melody = \melodic{
        \clef violin;
@@ -54,11 +54,11 @@ global = \melodic {
 
 tekst = \lyric{ 
        Al-4 tijd is Kort- jak- je ziek,2
-       midden4 in_de week maar s'_zon- dags niet.2
-       s'_Zon-4 dags gaat ze naar de kerk,2
+       midden4 in_de week maar 's_zon- dags niet.2
+       's_Zon-4 dags gaat ze naar de kerk,2
        met4 een boek vol zil- ver werk.2
        Al-4 tijd is Kort- jak- je ziek,2
-       midden4 in_de week maar s'_zon- dags niet.2
+       midden4 in_de week maar 's_zon- dags niet.2
 }
 
 %{
@@ -70,7 +70,7 @@ tekst. Mogen wij ook af en toe ergens op afgeven?
 hegedraagjetekst = \lyric{ 
        Al-4 tijd zuigt Bill Gates mijn piek,2
        "\TeX"4 is slecht- ser dan mu- ziek.2
-       s'_Zon-4 dags gaat het door een raam,2
+       's_Zon-4 dags gaat het door een raam,2
        Weet4 dat ik me er- voor schaam.2
        Al-4 tijd zuigt Bill Gates mijn piek,2
        "\TeX"4 is slecht- ser dan mu- ziek.2

diff --git a/lily/key-item.cc b/lily/key-item.cc
index 4dd094b667ffd6df76709401d9af6f27167c9dae..bf44f42cb51ffa40835a05449b47032c15801794 100644 (file)
--- a/lily/key-item.cc
+++ b/lily/key-item.cc
@@ -44,8 +44,10 @@ Key_item::read (Key_engraver const & key_grav_r)
 void 
 Key_item::set_c_position (int c0)
 {
-  int octaves =(abs (c0) / 7) +1 ;
-  c_position=(c0 + 7*octaves)%7;
+  int from_bottom_pos = c0 + 4;        // ugh
+  int octaves =(abs (from_bottom_pos) / 7) +1 ;
+  from_bottom_pos =(from_bottom_pos + 7*octaves)%7;
+  c_position  = from_bottom_pos - 4;
 }
 
 
@@ -71,7 +73,7 @@ Key_item::brew_molecule_p() const
   for (int i =0; i < pitch.size(); i++) 
     {
       Atom a =paper()->lookup_l ()->accidental (acc[i]);
-      a.translate ((c_position + pitch[i]) * inter, Y_AXIS);
+      a.translate_axis ((c_position + pitch[i]) * inter, Y_AXIS);
       Molecule m (a);
       output->add_at_edge (X_AXIS, RIGHT, m);  
     }

diff --git a/lily/my-lily-parser.cc b/lily/my-lily-parser.cc
index bfa78512da7370199f6d8b9bfe8b4cdbce171402..e2dd943b3afe35423e98d37bfa340fc79beba2b5 100644 (file)
--- a/lily/my-lily-parser.cc
+++ b/lily/my-lily-parser.cc
@@ -129,6 +129,7 @@ My_lily_parser::parser_error (String s)
   if (fatal_error_i_)
     exit (fatal_error_i_);
   error_level_i_ = 1;
+  exit_status_i_ = 1;
 }
 
 void