patch::: 0.1.19.jcn1: tik

pl 19.jcn1
	- small changes to sharp, fermata
	- small changes to lilypond.lsm+doc, lelievijver.lsm
	- mi2mu updeet + bf

diff --git a/Documentation/index.pod b/Documentation/index.pod
index c9c213623a37771c503bce31d75464147be84877..710f29cc5b116ebb56df1245bb5c21f36fd1427b 100644 (file)
--- a/Documentation/index.pod
+++ b/Documentation/index.pod
@@ -4,9 +4,10 @@ The Homepage of LilyPond -- the GNU Project music typesetter
 
 =head1 DESCRIPTION
 
-GNU LilyPond is a program which converts music definition files into
-visual or auditive output: it can typeset formatted sheet music to a
-TeX file and and (mechanical) performances to MIDI files.
+LilyPond is the GNU Project music typesetter.  The program generates
+visual or auditive output from a music definition file: it can typeset 
+formatted sheet music to a TeX file and play (mechanical) performances 
+to a MIDI file.
 
 This is not a Fanmail/Hype page. These pages were entirely created from
 the LilyPond package-sources. 

diff --git a/Documentation/lilypond.pod b/Documentation/lilypond.pod
index 1b59db999720ead43a0e12eb80facdce09b4a905..6d4a62744651f5cbc45dec6fd6d8a13367d96522 100644 (file)
--- a/Documentation/lilypond.pod
+++ b/Documentation/lilypond.pod
@@ -8,9 +8,10 @@ lilypond - the GNU music typesetter
 
 =head1 DESCRIPTION
 
-GNU LilyPond is a program which converts music definition files into
-visual or auditive output: it can typeset formatted sheet music to a
-TeX file and play (mechanical) performances to MIDI files.
+LilyPond is the GNU Project music typesetter.  The program generates
+visual or auditive output from a music definition file: it can typeset 
+formatted sheet music to a TeX file and play (mechanical) performances 
+to a MIDI file.
 
 =head1 OPTIONS
 

diff --git a/NEWS b/NEWS
index 5ef9bb5ef5d5b8dd45894af26ad7db5d32099c06..9000396c58a440bd7e5a328c147911627beeb3d8 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+pl 19.jcn1
+       - small changes to sharp, fermata
+       - small changes to lilypond.lsm+doc, lelievijver.lsm
+       - mi2mu updeet + bf
+
 pl 19
        - bf: keyword.cc rm'd struct defs
        - dots: support for feta dots.

diff --git a/VERSION b/VERSION
index 75990d3940b20c578bfccd3c1b73daf00c1b7998..38132745e7b63717f004cffe62b9e3c96f118804 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
 TOPLEVEL_MAJOR_VERSION = 0
 TOPLEVEL_MINOR_VERSION = 1
-TOPLEVEL_PATCH_LEVEL = 19
+TOPLEVEL_PATCH_LEVEL = 19.jcn1
 TOPLEVEL_MY_PATCH_LEVEL = 
 
 # use the above to send patches, always empty for released version:

diff --git a/init/font-en-tja16.ly b/init/font-en-tja16.ly
index a86335e4cd21210a79d58db22d1003f5671d40f0..4d99069a89671a112551181785691123cba912fb 100644 (file)
--- a/init/font-en-tja16.ly
+++ b/init/font-en-tja16.ly
@@ -1,4 +1,5 @@
-% generated automatically by  mf-to-table.py version 0.3
+% generated automatically by mf-to-table.py version 0.3
+% on Mon Oct  6 20:23:06 1997
 % Do not edit
 
 % input from out/font-en-tja16.log
@@ -33,8 +34,8 @@
         "-2" "\longaball" -0.00\pt 8.00\pt -2.00\pt 2.00\pt 
         }
     "foobars"  = \table {
-        "ufermata" "\ufermata" -6.20\pt 6.20\pt -0.00\pt 6.80\pt 
-        "dfermata" "\dfermata" -6.20\pt 6.20\pt -6.80\pt 0.00\pt 
+        "ufermata" "\ufermata" -6.30\pt 6.30\pt -0.00\pt 6.80\pt 
+        "dfermata" "\dfermata" -6.30\pt 6.30\pt -6.80\pt 0.00\pt 
         "accent" "\accent" -3.60\pt 3.60\pt -2.00\pt 2.00\pt 
         "staccato" "\staccato" -0.50\pt 0.50\pt -0.50\pt 0.50\pt 
         "ustaccatissimo" "\ustaccatissimo" -0.80\pt 0.80\pt -0.20\pt 4.00\pt 

diff --git a/init/font-en-tja20.ly b/init/font-en-tja20.ly
index 1261eaa3759b0354c5d2efcf72fc377a1bf0377d..2c2230c08d82b9e6a829516a697c34ebd766b4df 100644 (file)
--- a/init/font-en-tja20.ly
+++ b/init/font-en-tja20.ly
@@ -1,4 +1,5 @@
-% generated automatically by  mf-to-table.py version 0.3
+% generated automatically by mf-to-table.py version 0.3
+% on Mon Oct  6 20:23:19 1997
 % Do not edit
 
 % input from out/font-en-tja20.log
@@ -33,8 +34,8 @@
         "-2" "\longaball" -0.00\pt 10.00\pt -2.50\pt 2.50\pt 
         }
     "foobars"  = \table {
-        "ufermata" "\ufermata" -7.75\pt 7.75\pt -0.00\pt 8.50\pt 
-        "dfermata" "\dfermata" -7.75\pt 7.75\pt -8.50\pt 0.00\pt 
+        "ufermata" "\ufermata" -7.88\pt 7.88\pt -0.00\pt 8.50\pt 
+        "dfermata" "\dfermata" -7.88\pt 7.88\pt -8.50\pt 0.00\pt 
         "accent" "\accent" -4.50\pt 4.50\pt -2.50\pt 2.50\pt 
         "staccato" "\staccato" -0.63\pt 0.63\pt -0.63\pt 0.63\pt 
         "ustaccatissimo" "\ustaccatissimo" -1.00\pt 1.00\pt -0.20\pt 5.00\pt 

diff --git a/make/Makefile b/make/Makefile
index 2f4197f2086653d4fd107356841b5d87538d5d7a..fc4fa61d5e289c0625a4663c4a6609c9989f4220 100644 (file)
--- a/make/Makefile
+++ b/make/Makefile
@@ -22,9 +22,8 @@ SUBDIRS = debian
 
 # two outdir files are distributed, since they make sense to have without running 
 # configure and make.
-EXTRA_DISTFILES = Configure_variables.make.in lilypond.spec.in Toplevel.make.in \
-       lilypond.lsm.in $(outdir)/lilypond.spec $(outdir)/lilypond.lsm
-
+IN_FILES = $(wildcard *.in)
+EXTRA_DISTFILES = $(IN_FILES) $(outdir)/lilypond.spec $(outdir)/lilypond.lsm $(outdir)/lelievijver.lsm
 #
 
 # generic variables:
@@ -57,5 +56,6 @@ sed-docs=sed 's!@TEXT_DOCS@!${rpmdocs}!g'
 $(outdir)/lilypond.spec: lilypond.spec.in $(depth)/VERSION
        cat $< | $(sed-version) | $(sed-docs) | $(sed-examples) > $@
 
-$(outdir)/lilypond.lsm: lilypond.lsm.in $(depth)/VERSION
+$(outdir)/%.lsm: %.lsm.in $(depth)/VERSION
        cat $< | $(sed-version) | $(sed-date) > $@
+

diff --git a/make/lelievijver.lsm b/make/lelievijver.lsm
new file mode 100644 (file)
index 0000000..a28792b
--- /dev/null
+++ b/make/lelievijver.lsm
@@ -0,0 +1,23 @@
+Begin3
+Titel: LilyPond
+Versie: 0.1.19.jcn1
+Inschrijf datum: 06OCT97
+Beschrijving: LilyPond is de muziek typesetter van het GNU Project.  
+               Het programma genereert muziek in zichtbare of 
+               hoorbare vorm uit uit een muzikale definitie file: 
+               voor bladmuziek wordt typeset informatie naar een 
+               TeX file geschreven, voor een (mechanische) uitvoering 
+               wordt een MIDI file geschreven.  Enkele kunstjes zijn 
+               verscheidene notenbalken, maatsoorten, sleutels, 
+               toonsoorten, teksten, krachtige invoer taal, cadensen, 
+               balken, boogjes, triolen.
+Trefwoorden: muziek typezetten midi notatie
+Auteur: hanwen@stack.nl (Han-Wen Nienhuys)
+       jan@digicash.com (Jan Nieuwenhuizen)
+Onderhouden door: hanwen@stack.nl (Han-Wen Nienhuys)
+Voornaamste plek: sunsite.unc.edu /pub/Linux/apps
+       395k lilypond-0.1.19.jcn1.tar.gz 
+Oorspronkelijke plek: pcnov095.win.tue.nl /pub/lilypond/
+       395k lilypond-0.1.19.jcn1.tar.gz 
+Copi"eer politie: GPL
+End

diff --git a/make/lelievijver.lsm.in b/make/lelievijver.lsm.in
new file mode 100644 (file)
index 0000000..3046743
--- /dev/null
+++ b/make/lelievijver.lsm.in
@@ -0,0 +1,23 @@
+Begin3
+Titel: LilyPond
+Versie: @TOPLEVEL_VERSION@
+Inschrijf datum: @DATE@
+Beschrijving: LilyPond is de muziek typesetter van het GNU Project.  
+               Het programma genereert muziek in zichtbare of 
+               hoorbare vorm uit uit een muzikale definitie file: 
+               voor bladmuziek wordt typeset informatie naar een 
+               TeX file geschreven, voor een (mechanische) uitvoering 
+               wordt een MIDI file geschreven.  Enkele kunstjes zijn 
+               verscheidene notenbalken, maatsoorten, sleutels, 
+               toonsoorten, teksten, krachtige invoer taal, cadensen, 
+               balken, boogjes, triolen.
+Trefwoorden: muziek typezetten midi notatie
+Auteur: hanwen@stack.nl (Han-Wen Nienhuys)
+       jan@digicash.com (Jan Nieuwenhuizen)
+Onderhouden door: hanwen@stack.nl (Han-Wen Nienhuys)
+Voornaamste plek: sunsite.unc.edu /pub/Linux/apps
+       395k lilypond-@TOPLEVEL_VERSION@.tar.gz 
+Oorspronkelijke plek: pcnov095.win.tue.nl /pub/lilypond/
+       395k lilypond-@TOPLEVEL_VERSION@.tar.gz 
+Copi"eer politie: GPL
+End

diff --git a/make/lilypond.lsm.in b/make/lilypond.lsm.in
index db93b2c2fa554df5c8a0cec2ade6e2a2036908a0..0b0c6355e41dc0e0c8ac81adc62f6f1435f3a389 100644 (file)
--- a/make/lilypond.lsm.in
+++ b/make/lilypond.lsm.in
@@ -2,13 +2,13 @@ Begin3
 Title: LilyPond
 Version: @TOPLEVEL_VERSION@
 Entered-date: @DATE@
-Description:   LilyPond is the GNU Project music typesetter. This
-               program converts music definition files into
-               visual or auditive output: it can typeset formatted
-               sheet music to a TeX file and and (mechanical)
-               performances to MIDI files. Features include multiple
-               staffs, meters, clefs, keys, lyrics, versatile
-               input-language, cadenzas beams, slurs, triplets.
+Description: LilyPond is the GNU Project music typesetter.  The program
+               generates visual or auditive output from a music 
+               definition file: it can typeset formatted sheet music 
+               to a TeX file and play (mechanical) performances to a 
+               MIDI file.  Features include multiple staffs, meters, 
+               clefs, keys, lyrics, versatile input-language, 
+               cadenzas, beams, slurs, triplets.
 Keywords: music typesetting midi notation
 Author: hanwen@stack.nl (Han-Wen Nienhuys)
        jan@digicash.com (Jan Nieuwenhuizen)

diff --git a/mf/klef.mf b/mf/klef.mf
index 129c792e61d9d6caa56536e7a8932bba1ca2d919..47980e1a3305ea01b828e61544f4fca97bad4002 100644 (file)
--- a/mf/klef.mf
+++ b/mf/klef.mf
@@ -3,10 +3,11 @@
 fet_begingroup("foobars")
 
 
-fet_beginchar(incr code, "F clef", "bassclef", "bassclef");
-       
+fet_beginchar("F clef", "bassclef", "bassclef");
+       set_char_box(0,0,0,0);
 fet_endchar;
-fet_beginchar(incr code, "G clef", "evolinclef", "evolinclef");
+
+fet_beginchar("G clef", "evolinclef", "evolinclef");
        save tilt;
        tilt = 15;
 
@@ -39,7 +40,7 @@ fet_beginchar(incr code, "G clef", "evolinclef", "evolinclef");
        penpos15(downstroke_thinness, tilt-90);
        set_char_box(0,0,0,0);
 
-%      penstroke z1e{dir 135} .. z3e ..  {left}z5e .. z7e ..  tension 1.2 .. z9e;% & z9e..  z12e .. z13e .. z15e;
-%      penlabels(1,3,5,7, 9,12,13,15);
+       penstroke z1e{dir 135} .. z3e ..  {left}z5e .. z7e ..  tension 1.2 .. z9e;% & z9e..  z12e .. z13e .. z15e;
+       penlabels(1,3,5,7, 9,12,13,15);
 fet_endchar;
 fet_endgroup("foobars");

diff --git a/mf/schrift.mf b/mf/schrift.mf
index 2f55c401ae417e72dbc3963294ebae67e5aed637..d53b016780b266c22b6979a4ae1fb937c3a7a1bc 100644 (file)
--- a/mf/schrift.mf
+++ b/mf/schrift.mf
@@ -2,10 +2,10 @@ fet_begingroup("foobars")
 
 
 def draw_fermata =
-       save radius, crook_thinness, crook_fatness, dot_diam;
+       save alpha, radius, crook_thinness, crook_fatness, dot_diam;
        
        radius# = 1.5 interline#;
-       crook_thinness# = stafflinethickness#;
+       crook_thinness# = 1.5stafflinethickness#;
        crook_fatness# = 4 stafflinethickness#;
 
        radius# + crook_fatness#/2 = h#;
@@ -23,8 +23,15 @@ def draw_fermata =
        z2 = (0, radius);
        z3 = (radius,0);
        
-       fill z1l{down} .. {up}z1r .. z2r .. z3r{down} .. {up}z3l
-               .. z2l .. cycle;
+%      fill z1l{down} .. {up}z1r .. z2r .. z3r{down} .. {up}z3l
+%              .. z2l .. cycle;
+       % wanske, baerenreiter suggest ca 80 degrees iso half-circle
+       % ugh?
+       alpha := 10;
+%      penstroke z1e{dir (90-alpha)}..z2e..{dir (alpha-90)}z3e;
+       % isn't this ugly to get rounded edges?
+       fill z1l{dir (-alpha-90)}..{dir (90-alpha)}z1r..z2r..
+               z3r{dir (alpha-90)}..{dir (90+alpha)}z3l..z2l..cycle;
 
        pickup pencircle scaled dot_diam;
        x4 =0;
@@ -46,6 +53,7 @@ fet_beginchar("fermata down", "dfermata", "dfermata")
 
 
 % FIXME: rounded endings
+%        and thickness at point of join==thickness at end, like ">"
 %
 fet_beginchar("> accent", "accent", "accent")
        set_char_box(.9 interline#, .9 interline#, .5 interline#, .5 interline#);

diff --git a/mf/toevallig.mf b/mf/toevallig.mf
index 69cb6e1e074dfecf5477dbb0dec6396820b94cd2..60aff66f0311bb3d1aff71bdc1bedf559d34a3a7 100644 (file)
--- a/mf/toevallig.mf
+++ b/mf/toevallig.mf
@@ -34,7 +34,9 @@ fet_beginchar("Sharp" , "1", "sharp");
        2 horizontal_protrusion  + interstem * beamwidth + stemwidth
                = beamwidth;
        
-       z2 - z1 = (beamwidth - roundness, beamheight/2);
+% wanske: whole beamheight; or ca 18 degrees
+%      z2 - z1 = (beamwidth - roundness, beamheight/2);
+       z2 - z1 = (beamwidth - roundness, beamheight);
        z1 + z2 = 2*center;
        beamslope = (y2-y1)/(x2-x1);
 

diff --git a/mi2mu/include/midi-track-parser.hh b/mi2mu/include/midi-track-parser.hh
index 021197c7375a1ddb83503256931670c6cad30d39..f973209655076fab5b88f18cb2db25c4510d425c 100644 (file)
--- a/mi2mu/include/midi-track-parser.hh
+++ b/mi2mu/include/midi-track-parser.hh
@@ -20,7 +20,7 @@ class Midi_track_parser : public Midi_parser
 {
 public:
 
-  Midi_track_parser (Midi_parser_info* info_l);
+  Midi_track_parser (Midi_parser_info* info_l, int i);
   ~Midi_track_parser ();
 
   Moment at_mom ();

diff --git a/mi2mu/midi-score-parser.cc b/mi2mu/midi-score-parser.cc
index ab5169da1210f33e11b8c530c0beeb1617f25ef1..a12c135cb04bd9e4b041d945fe9cea38ea1c43c9 100644 (file)
--- a/mi2mu/midi-score-parser.cc
+++ b/mi2mu/midi-score-parser.cc
@@ -90,7 +90,7 @@ Midi_score_parser::parse_score ()
 
   Link_array<Midi_track_parser> tracks;
   for (int i = 0; i < info_l_->tracks_i_; i++)
-    tracks.push (new Midi_track_parser (info_l_));
+    tracks.push (new Midi_track_parser (info_l_, i));
 
   LOGOUT (NORMAL_ver) << "Parsing...\n";
   while (tracks.size ())

diff --git a/mi2mu/midi-track-parser.cc b/mi2mu/midi-track-parser.cc
index b7472aab85005b0992b9f8e6ab913baae86dd76f..dd62e91e5fdf5e72c79b23084fbae7460c8b7909 100644 (file)
--- a/mi2mu/midi-track-parser.cc
+++ b/mi2mu/midi-track-parser.cc
@@ -15,12 +15,12 @@
 #include "mudela-score.hh"
 #include "mudela-staff.hh"
 
-Midi_track_parser::Midi_track_parser (Midi_parser_info* info_l)
+Midi_track_parser::Midi_track_parser (Midi_parser_info* info_l, int i)
 {
   info_l_ = info_l;
   at_mom_ = 0;
   track_info_p_ = 0;
-  mudela_staff_p_ = new Mudela_staff (0, "", "", "");
+  mudela_staff_p_ = new Mudela_staff (i, "", "", "");
   parse_header ();
   parse_delta_time ();
 }

diff --git a/mi2mu/mudela-score.cc b/mi2mu/mudela-score.cc
index 5b951dac39e8478efceec89703c960b7f8f7c7a3..d0138d757e5a2cc8b01e1a96bcb10c5023920703 100644 (file)
--- a/mi2mu/mudela-score.cc
+++ b/mi2mu/mudela-score.cc
@@ -119,15 +119,15 @@ Mudela_score::output (String filename_str)
 
   mudela_stream << "\\score{\n";
   if  (mudela_staff_p_list_.size() > 1)
-    mudela_stream << "<\n\\multi 3;\n";
+    mudela_stream << "\\multi 3 < \\type Staff\n";
   for  (PCursor<Mudela_staff*> i (mudela_staff_p_list_); i.ok(); i++) 
     {
       if  ( (mudela_staff_p_list_.size() != 1) 
            &&  (i == mudela_staff_p_list_.top()))
        continue;
-      mudela_stream << "\\melodic{ ";
+      mudela_stream << "< \\melodic{ ";
       mudela_stream << "\\$" << i->id_str();
-      mudela_stream << " }\n";
+      mudela_stream << " } >\n";
     }
   if  (mudela_staff_p_list_.size() > 1)
     mudela_stream << ">\n";

diff --git a/mi2mu/mudela-stream.cc b/mi2mu/mudela-stream.cc
index 447daf98e1716f2180e78fe82025a906f9cc3695..fb8da88d6031f2293a38c199ca02d2d706bcfa66 100644 (file)
--- a/mi2mu/mudela-stream.cc
+++ b/mi2mu/mudela-stream.cc
@@ -81,7 +81,7 @@ Mudela_stream::header()
   *os_p_ << filename_str_g;
   *os_p_ << "\n\n";    
   // ugh
-  *os_p_ << "\\version \"0.1.2\";\n";
+  *os_p_ << "\\version \"0.1.6\";\n";
 }
 
 void

diff --git a/tex/font-en-tja16.tex b/tex/font-en-tja16.tex
index f857d77a583dc8228624f37b840bbf139ecacaec..14e723b48594fa41885965b1aba070f5f3ed9cb3 100644 (file)
--- a/tex/font-en-tja16.tex
+++ b/tex/font-en-tja16.tex
@@ -1,4 +1,5 @@
-% generated automatically by  mf-to-table.py version 0.3
+% generated automatically by mf-to-table.py version 0.3
+% on Mon Oct  6 20:23:06 1997
 % Do not edit
 
 % input from out/font-en-tja16.log

diff --git a/tex/font-en-tja20.tex b/tex/font-en-tja20.tex
index ac5e3e9cb5e869f057cd1b79dca722761c400bc8..5a06c9deeb0bfab2251fdd2e10f3611fe53b663a 100644 (file)
--- a/tex/font-en-tja20.tex
+++ b/tex/font-en-tja20.tex
@@ -1,4 +1,5 @@
-% generated automatically by  mf-to-table.py version 0.3
+% generated automatically by mf-to-table.py version 0.3
+% on Mon Oct  6 20:23:19 1997
 % Do not edit
 
 % input from out/font-en-tja20.log