patch::: 0.1.17.jcn2: biems

pl 17.jcn2
	- egcs compile (no link yet)
	- nicer 4rest
	- beam font (je kunt wel tegen een grapje, eva?)
	- mf-to-table:
	  * "breapth" (x-depth) feature
	  * handle generic stuff such as beams

diff --git a/NEWS b/NEWS
index 3dbecdea577140314961e30fb81ea7f6617e86fe..de36da862a48d3e15c1172bf62fbda8e1b51a3e5 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+pl 17.jcn2
+       - egcs compile (no link yet)
+       - nicer 4rest
+       - beam font (je kunt wel tegen een grapje, eva?)
+       - mf-to-table: 
+         * "breapth" (x-depth) feature
+         * handle generic stuff such as beams
+
 pl 17.jcn1
        - all of the above
 

diff --git a/VERSION b/VERSION
index c7e2cb0a8413515f8202cebafab7900be07bff16..dc2827164c2b78363e9c60f053096fac39a94d52 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -3,4 +3,4 @@ TOPLEVEL_MINOR_VERSION = 1
 TOPLEVEL_PATCH_LEVEL = 17
 
 # use to send patches, always empty for released version:
-TOPLEVEL_MY_PATCH_LEVEL = .jcn1
+TOPLEVEL_MY_PATCH_LEVEL = .jcn2

diff --git a/bin/mf-to-table.in b/bin/mf-to-table.in
index dbca26c0041e8ca5e3c1b0d0decc8821964a38c0..c7e5a25b946fff81a9c6e04508ae4d6899f1a119 100644 (file)
--- a/bin/mf-to-table.in
+++ b/bin/mf-to-table.in
@@ -68,10 +68,18 @@ sub make_table
                my $w = $fields [3];
                my $h = $fields [4];
                my $d = $fields [5];
-               my $id = $fields [6];
-               my $texstr = $fields [7];
-               print OUTLY sprintf( "\"%s\"\t\"\\%s\"\t%.2f\\pt\t%.2f\\pt\t%.2f\\pt\t%.2f\\pt\n", $id, $texstr, 0, $w, $h, $d );
-               print OUTTEX sprintf( "\\fetdef\\%s{%d}\n", $texstr, $c);
+               my $b = $fields [6];
+               my $id = $fields [7];
+               my $texstr = $fields [8];
+               print OUTLY sprintf( "\"%s\"\t\"\\%s\"\t%.2f\\pt\t%.2f\\pt\t%.2f\\pt\t%.2f\\pt\n", $id, $texstr, -$b, $w, $h, -$d );
+               # remove % from generic chars, and save start charcode
+               my $defstr = "\\fetdef";
+               if ($texstr =~ /{%/) {
+                       $texstr =~ s/{%.*//;
+                       $texstr .= "start";
+                       $defstr = "\\def"
+               }
+               print OUTTEX sprintf( "%s\\%s{%d}\n", $defstr, $texstr, $c);
            } else {
                print STDERR "mf-to-table: $lineno: unknown label: \`$label\'\n";
            }

diff --git a/init/dyn10.ly b/init/dyn10.ly
index b0697a1e61f8365f0cecc18c3aab21568973e69b..80a224c5c00e92fe6d201784f34f12a536a3460c 100644 (file)
--- a/init/dyn10.ly
+++ b/init/dyn10.ly
@@ -1,4 +1,4 @@
-% generated at Thu Sep 25 01:22:50 1997 from out/dyn10.log
+% generated at Fri Sep 26 09:25:28 1997 from out/dyn10.log
 % changes will be lost
 
 % dyn=\symboltables {

diff --git a/init/font-en-tja16.ly b/init/font-en-tja16.ly
index 905ba2cf9a00c3b8794de3218c395f03a8b4cab9..f060334fd9cfddfdb634ae2361ae75788ad4160c 100644 (file)
--- a/init/font-en-tja16.ly
+++ b/init/font-en-tja16.ly
@@ -1,20 +1,25 @@
-% generated at Thu Sep 25 01:22:51 1997 from out/font-en-tja16.log
+% generated at Fri Sep 26 09:25:30 1997 from out/font-en-tja16.log
 % changes will be lost
 
 % font-en-tja=\symboltables {
        "balls" = \table {
-               "0"     "\wholeball"    0.00\pt 8.64\pt 4.80\pt 0.00\pt
-               "1"     "\halfball"     0.00\pt 6.01\pt 4.80\pt 0.00\pt
-               "2"     "\quartball"    0.00\pt 5.76\pt 4.80\pt 0.00\pt
-               "-1"    "\breveball"    0.00\pt 8.00\pt 4.00\pt 0.00\pt
-               "-2"    "\longaball"    0.00\pt 8.00\pt 4.00\pt 0.00\pt
+               "0"     "\wholeball"    -0.00\pt        8.28\pt 4.60\pt -0.00\pt
+               "1"     "\halfball"     -0.00\pt        5.76\pt 4.60\pt -0.00\pt
+               "2"     "\quartball"    -0.00\pt        5.52\pt 4.60\pt -0.00\pt
+               "-1"    "\breveball"    -0.00\pt        8.00\pt 4.00\pt -0.00\pt
+               "-2"    "\longaball"    -0.00\pt        8.00\pt 4.00\pt -0.00\pt
                }
        "almostrests" = \table {
-               "4"     "\quartrest"    0.00\pt 4.00\pt 16.00\pt        0.00\pt
-               "-2"    "\eighthrest"   0.00\pt 5.33\pt 7.47\pt 0.00\pt
-               "-2"    "\sixteenthrest"        0.00\pt 5.33\pt 11.47\pt        0.00\pt
-               "-2"    "\thirtysecondrest"     0.00\pt 5.33\pt 15.47\pt        0.00\pt
-               "-2"    "\sixtyfourthrest"      0.00\pt 5.33\pt 19.47\pt        0.00\pt
-               "-2"    "\hundredtwentyeighthrest"      0.00\pt 5.33\pt 23.47\pt        0.00\pt
+               "4"     "\quartrest"    -0.00\pt        4.00\pt 16.00\pt        -0.00\pt
+               "-2"    "\eighthrest"   -0.00\pt        5.33\pt 7.47\pt -0.00\pt
+               "-2"    "\sixteenthrest"        -0.00\pt        5.33\pt 11.47\pt        -0.00\pt
+               "-2"    "\thirtysecondrest"     -0.00\pt        5.33\pt 15.47\pt        -0.00\pt
+               "-2"    "\sixtyfourthrest"      -0.00\pt        5.33\pt 19.47\pt        -0.00\pt
+               "-2"    "\hundredtwentyeighthrest"      -0.00\pt        5.33\pt 23.47\pt        -0.00\pt
+               }
+       "beamslopes" = \table {
+               "uslope"        "\beamuslope{%}{%}"     2.00\pt 32.00\pt        0.00\pt -0.00\pt
+               "dslope"        "\beamdslope{%}{%}"     2.00\pt 32.00\pt        0.00\pt -0.00\pt
+               "horizontal"    "\rulesym{%}{%}"        -0.00\pt        0.00\pt 0.00\pt -0.00\pt
                }
        %  } % font-en-tja

diff --git a/init/font-en-tja20.ly b/init/font-en-tja20.ly
index cabba87281004c7ebe171997932e389e6972646b..b9a1c2f3142a9d039a5a4ecf4d1ec4cd04b2dbb0 100644 (file)
--- a/init/font-en-tja20.ly
+++ b/init/font-en-tja20.ly
@@ -1,20 +1,25 @@
-% generated at Thu Sep 25 01:22:52 1997 from out/font-en-tja20.log
+% generated at Fri Sep 26 09:25:32 1997 from out/font-en-tja20.log
 % changes will be lost
 
 % font-en-tja=\symboltables {
        "balls" = \table {
-               "0"     "\wholeball"    0.00\pt 10.44\pt        5.80\pt 0.00\pt
-               "1"     "\halfball"     0.00\pt 7.26\pt 5.80\pt 0.00\pt
-               "2"     "\quartball"    0.00\pt 6.97\pt 5.80\pt 0.00\pt
-               "-1"    "\breveball"    0.00\pt 10.00\pt        5.00\pt 0.00\pt
-               "-2"    "\longaball"    0.00\pt 10.00\pt        5.00\pt 0.00\pt
+               "0"     "\wholeball"    -0.00\pt        10.08\pt        5.60\pt -0.00\pt
+               "1"     "\halfball"     -0.00\pt        7.01\pt 5.60\pt -0.00\pt
+               "2"     "\quartball"    -0.00\pt        6.73\pt 5.60\pt -0.00\pt
+               "-1"    "\breveball"    -0.00\pt        10.00\pt        5.00\pt -0.00\pt
+               "-2"    "\longaball"    -0.00\pt        10.00\pt        5.00\pt -0.00\pt
                }
        "almostrests" = \table {
-               "4"     "\quartrest"    0.00\pt 5.00\pt 20.00\pt        0.00\pt
-               "-2"    "\eighthrest"   0.00\pt 6.67\pt 9.13\pt 0.00\pt
-               "-2"    "\sixteenthrest"        0.00\pt 6.67\pt 14.13\pt        0.00\pt
-               "-2"    "\thirtysecondrest"     0.00\pt 6.67\pt 19.13\pt        0.00\pt
-               "-2"    "\sixtyfourthrest"      0.00\pt 6.67\pt 24.13\pt        0.00\pt
-               "-2"    "\hundredtwentyeighthrest"      0.00\pt 6.67\pt 29.13\pt        0.00\pt
+               "4"     "\quartrest"    -0.00\pt        5.00\pt 20.00\pt        -0.00\pt
+               "-2"    "\eighthrest"   -0.00\pt        6.67\pt 9.13\pt -0.00\pt
+               "-2"    "\sixteenthrest"        -0.00\pt        6.67\pt 14.13\pt        -0.00\pt
+               "-2"    "\thirtysecondrest"     -0.00\pt        6.67\pt 19.13\pt        -0.00\pt
+               "-2"    "\sixtyfourthrest"      -0.00\pt        6.67\pt 24.13\pt        -0.00\pt
+               "-2"    "\hundredtwentyeighthrest"      -0.00\pt        6.67\pt 29.13\pt        -0.00\pt
+               }
+       "beamslopes" = \table {
+               "uslope"        "\beamuslope{%}{%}"     2.00\pt 32.00\pt        0.00\pt -0.00\pt
+               "dslope"        "\beamdslope{%}{%}"     2.00\pt 32.00\pt        0.00\pt -0.00\pt
+               "horizontal"    "\rulesym{%}{%}"        -0.00\pt        0.00\pt 0.00\pt -0.00\pt
                }
        %  } % font-en-tja

diff --git a/init/table16.ly b/init/table16.ly
index 99a3a295a26472e8748e569f3914dd230a6b8244..46ff184838e32ec38576b0ff5452c378128f9214 100644 (file)
--- a/init/table16.ly
+++ b/init/table16.ly
@@ -165,7 +165,7 @@ table_sixteen=
        "d7"    "\dhundredtwentyeighthflag"     0.0\pt  4.0\pt  0.0\pt  0.0\pt
      }
 
-     "beamslopes" = \table {
+     "oldbeamslopes" = \table {
        "uslope"        "\beamuslope{%}{%}"  2.0\pt 64.0\pt 0.0\pt 0.0\pt
        "dslope"        "\beamdslope{%}{%}"  2.0\pt 64.0\pt 0.0\pt 0.0\pt
        "horizontal"    "\rulesym{%}{%}"        

diff --git a/init/table20.ly b/init/table20.ly
index c2a8f02bca504f87f98c344ff49dbc7470f70a38..2d276a6af4c0509e300910bcbba5dd838aee98d9 100644 (file)
--- a/init/table20.ly
+++ b/init/table20.ly
@@ -165,7 +165,7 @@ table_twenty =
        "d7"    "\dhundredtwentyeighthflag"     0.0\pt  5.0\pt  0.0\pt  0.0\pt
      }
 
-    "beamslopes" = \table {
+    "oldbeamslopes" = \table {
        "uslope"        "\beamuslope{%}{%}"  2.0\pt 64.0\pt 0.0\pt 0.0\pt
        "dslope"        "\beamdslope{%}{%}"  2.0\pt 64.0\pt 0.0\pt 0.0\pt
        "horizontal"    "\rulesym{%}{%}"        

diff --git a/input/font.ly b/input/font.ly
index 1a1cd0b9bc8972c8f7e476fac381566dc63ac0c6..738871d15fec106ff4f49291843b19757e72619a 100644 (file)
--- a/input/font.ly
+++ b/input/font.ly
@@ -16,7 +16,10 @@ TestedFeatures       font-en-tja
                c2 g c' a'
                c4 g c' a'
                a\ppp a\pp a\p a\mp a\mf a\f a\ff a\fff
-               a\fp a\sf a\sfz % a\fz a\rf
+               a\fp a\sf a\sfz a % a\fz a\rf
+               [c8 c] [a' a']
+%              [c a'] [a' c]
+               [c d e f] [a' g' f' e']
                r1 r2 r4 r8 r16 r32 r64 r128
        }
        \paper{ 

diff --git a/lily/clef-grav.cc b/lily/clef-grav.cc
index 670e5d9cd0520bb130d57907cfeb408d10bcf1cc..fc70af6a0edc79d0f3bcc1c99590a02c67fcdae2 100644 (file)
--- a/lily/clef-grav.cc
+++ b/lily/clef-grav.cc
@@ -75,7 +75,7 @@ void
 Clef_engraver::do_creation_processing()
 {
   Scalar def = get_property ("defaultclef");
-  if (def)
+  if (def.operator bool ()) // egcs: Scalar to bool is ambiguous
     set_type (def);
   if (clef_type_str_.length_i ())
     create_clef();

diff --git a/lily/include/translator-group.hh b/lily/include/translator-group.hh
index dc2e8365eb98a3e7712b6d594b8c589862cb26c1..1cc3a0b3c3343eb29d650361f2da9d60dd09742d 100644 (file)
--- a/lily/include/translator-group.hh
+++ b/lily/include/translator-group.hh
@@ -17,7 +17,9 @@
 #include "plist.hh"
 #include "parray.hh"
 
+// egcs
 typedef void (Translator::*Method_pointer)(void);
+typedef void (Translator::*Const_method_pointer)(void) const; 
 
 /** Make some kind of #Element#s from Requests. Elements are made by
   hierarchically grouped #Translator#s
@@ -68,7 +70,8 @@ protected:
   virtual void do_post_move_processing();   
   virtual void do_creation_processing();
   virtual void do_removal_processing();
-  void each (Method_pointer) const;
+  void each (Method_pointer);
+  void each (Const_method_pointer) const;
 };
 
 #endif // TRANSLATOR_GROUP_HH

diff --git a/lily/performer.cc b/lily/performer.cc
index 5775f157eb4133230dbe0a73a96cb34e97ccaf48..ed171b5a7066419bb3436f1c6d8e4101ffd43355 100644 (file)
--- a/lily/performer.cc
+++ b/lily/performer.cc
@@ -14,10 +14,6 @@
 
 IMPLEMENT_IS_TYPE_B1(Performer, Translator);
 
-Performer::Performer()
-{
-}
-
 void 
 Performer::play (Audio_element* p) 
 { 

diff --git a/lily/rhythmic-column-grav.cc b/lily/rhythmic-column-grav.cc
index af3238c0f9510ec508d13e19ba66398c3ff51b09..7cba706c24fbe699744ba514477b430d5b45850c 100644 (file)
--- a/lily/rhythmic-column-grav.cc
+++ b/lily/rhythmic-column-grav.cc
@@ -76,7 +76,8 @@ Rhythmic_column_engraver::do_pre_move_processing()
   if (ncol_p_) 
     {
       if (! ncol_p_->h_shift_b_)
-       ncol_p_->h_shift_b_  = (bool) get_property ("hshift");
+       // egcs
+       ncol_p_->h_shift_b_  = get_property ("hshift").operator bool ();
       if (! ncol_p_->dir_)
        ncol_p_->dir_ =(Direction) int(get_property ("ydirection"));
 

diff --git a/lily/translator-group.cc b/lily/translator-group.cc
index 1521ede70d64ae93bb96ff250711c36acdafd8d8..5725a028c3458d48fcc3959d0f196e67a5637c48 100644 (file)
--- a/lily/translator-group.cc
+++ b/lily/translator-group.cc
@@ -267,7 +267,14 @@ Translator_group::get_default_interpreter()
 }
 
 void
-Translator_group::each (Method_pointer method) const
+Translator_group::each (Method_pointer method)
+{
+  for (PCursor<Translator*> i (trans_p_list_.top ()); i.ok (); i++)
+    (i.ptr()->*method) ();     
+}
+
+void
+Translator_group::each (Const_method_pointer method) const
 {
   for (PCursor<Translator*> i (trans_p_list_.top ()); i.ok (); i++)
     (i.ptr()->*method) ();     

diff --git a/make/Toplevel.make.in b/make/Toplevel.make.in
index e472fde4112eb27999b55a8f9acfa4ac6b802def..5de434c16186931b906f3e3307f8d8107b3c2187 100644 (file)
--- a/make/Toplevel.make.in
+++ b/make/Toplevel.make.in
@@ -27,8 +27,8 @@ include ./$(depth)/make/Variables.make
 
 # descent order into subdirectories:
 #
-SUBDIRS = flower lib lily mf mi2mu \
-       Documentation bin init input tex make
+SUBDIRS = bin flower lib lily mf mi2mu \
+       Documentation init input tex make
 #
 
 # list of distribution files:

diff --git a/mf/Makefile b/mf/Makefile
index 42acbad8f97d2d5fb2d9ec9298a24ab4d3e626aa..6e6446bcfeb75ba45a564e4ede37f68027a19880 100644 (file)
--- a/mf/Makefile
+++ b/mf/Makefile
@@ -46,12 +46,12 @@ localuninstall:
 # dependencies:
 #
 $(lyout)/dyn10.ly: autometric.mf ital-f.mf ital-m.mf ital-p.mf ital-r.mf ital-s.mf ital-z.mf dyn10.mf
-$(lyout)/font-en-tja16.ly: autometric.mf bolletjes.mf eindelijk.mf font-en-tja16.mf
-$(lyout)/font-en-tja20.ly: autometric.mf bolletjes.mf eindelijk.mf font-en-tja20.mf
+$(lyout)/font-en-tja16.ly: autometric.mf bolletjes.mf eindelijk.mf font-en-tja16.mf wat-zie-ik.mf
+$(lyout)/font-en-tja20.ly: autometric.mf bolletjes.mf eindelijk.mf font-en-tja20.mf wat-zie-ik.mf
 #
 $(texout)/dyn10.tex: autometric.mf ital-f.mf ital-m.mf ital-p.mf ital-r.mf ital-s.mf ital-z.mf dyn10.mf
-$(texout)/font-en-tja16.tex: autometric.mf bolletjes.mf eindelijk.mf font-en-tja16.mf
-$(texout)/font-en-tja20.tex: autometric.mf bolletjes.mf eindelijk.mf font-en-tja20.mf
+$(texout)/font-en-tja16.tex: autometric.mf bolletjes.mf eindelijk.mf font-en-tja16.mf wat-zie-ik.mf
+$(texout)/font-en-tja20.tex: autometric.mf bolletjes.mf eindelijk.mf font-en-tja20.mf wat-zie-ik.mf
 #
 
 

diff --git a/mf/autometric.mf b/mf/autometric.mf
index 6d87094155659cda2b5b1d26d8671b60641f126f..e178978ddd1f754ff45c0a09bf87d313468ede20 100644 (file)
--- a/mf/autometric.mf
+++ b/mf/autometric.mf
@@ -1,5 +1,9 @@
 % autometric.mf
 % part of LilyPond's pretty-but-neat music font
+% 
+% these macros help create ascii logging output
+% to automate generation of lily tables and tex backend
+% parsed by the mf-to-table script
 
 % font or database?
 def fet_beginfont(expr name,size) =
@@ -25,8 +29,15 @@ def fet_endgroup(expr name) =
        message "";
        enddef;
        
-def fet_beginchar(expr code,w,h,d,name,id,texstr) =
-       message "@@char:"&name&":"&decimal code&":"&decimal w&":"&decimal h&":"&decimal d&":"&id&":"&texstr&"@@";
+% starts just as plain mf's beginchar:
+%     charcode, width, height, depth
+% and then adds:
+%     charname see below
+%     breapth  x-depth
+%     id       index in lily's table
+%     texstr   name of tex macro in lily's table and tex backend
+def fet_beginchar(expr code,w,h,d,b,name,id,texstr) =
+       message "@@char:"&name&":"&decimal code&":"&decimal w&":"&decimal h&":"&decimal d&":"&decimal b&":"&id&":"&texstr&"@@";
        beginchar(code,w,h,d) name;
        enddef;
 

diff --git a/mf/bolletjes.mf b/mf/bolletjes.mf
index fadb1683cd2e9dbee836b432e3f2dacc5c994cdc..bbc31feed255811984e76affc479973e80349111 100644 (file)
--- a/mf/bolletjes.mf
+++ b/mf/bolletjes.mf
@@ -7,7 +7,7 @@
 interline#:=staffsize#/(stafflines-1);
 %noteheight#:=interline#;
 % even more pronounced (almost overdone), just like the original
-noteheight#:=interline#+2stafflinethickness#;
+noteheight#:=interline#+1.5stafflinethickness#;
 
 def test_grid =
 if test>1:
@@ -46,7 +46,7 @@ def end_notehead(expr code,height,name,id,texstr) =
        define_pixels(a,b);
        define_pixels(w,h);
        define_pixels(ai,bi);
-       fet_beginchar(code,w#,h#,0,name,id,texstr);
+       fet_beginchar(code,w#,h#,0,0,name,id,texstr);
                path black,white;
                black=distorted_ellipse(a,b,a*err_y_a,0,super);
                white=distorted_ellipse(ai,bi,ai*err_y_ai,bi*err_x_bi,superi);
@@ -156,7 +156,7 @@ nhh#:=interline#;
 nhw#:=6/5interline#;
 define_pixels(nhh,nhw);
 
-fet_beginchar(incr code,2interline#,interline#,0,"Brevis notehead","-1","breveball");
+fet_beginchar(incr code,2interline#,interline#,0,0,"Brevis notehead","-1","breveball");
        fill_square (5/4nhw, .25nhh, (0,.25nhh));
        add_mirror (origin, right);
        x1=x2=0; x3=x4=5/4nhw; y1=-y2=y3=-y4=.7nhh;
@@ -165,7 +165,7 @@ fet_beginchar(incr code,2interline#,interline#,0,"Brevis notehead","-1","breveba
        savepic;
        endchar;
 
-fet_beginchar(incr code,2interline#,interline#,0,"Longa notehead","-2","longaball");
+fet_beginchar(incr code,2interline#,interline#,0,0,"Longa notehead","-2","longaball");
        callpic;
        pickup line_pen;
        draw (5/4nhw,-.7nhh)--(5/4nhw,-1.7nhh);

diff --git a/mf/dimen.tex b/mf/dimen.tex
index dd1df884d6529f3103e73e725e06f1ce7974681c..acba4b1d5b9d005a3f9868cba2d44ce3d769ac6b 100644 (file)
--- a/mf/dimen.tex
+++ b/mf/dimen.tex
@@ -4,9 +4,14 @@
 
 \font\musicfont=musix16
 \font\slurfont=xslu16
-\font\specfont=musixspx
-\def\thefont{\musicfont}
+\font\specfont=musixspx % tildes? beams, circles, (de)-crescendos, pianobraces
+\font\eglerfont=opus16 % notes, clefs, beams
+\font\eglerspec=opussps % tabulars, circles, glissandi, pianobraces
+\font\tjafont=font-en-tja16
+%\def\thefont{\musicfont}
 %\def\thefont{\specfont}
+%\def\thefont{\eglerfont}
+\def\thefont{\tjafont}
 
 \def\mb#1{{\thefont\char#1}}
 

diff --git a/mf/eindelijk.mf b/mf/eindelijk.mf
index ff2dc89d73c06c15c4511f40e6d634d072c0ff6e..56541e11c315cd04c6698ae68f6e2e9e448ae2c3 100644 (file)
--- a/mf/eindelijk.mf
+++ b/mf/eindelijk.mf
@@ -4,11 +4,9 @@
 define_pixels(interline);
 define_pixels(stafflinethickness);
 % MO*TeX stuff
-nhh#:=interline#;
-nhw#:=6/5*interline#;
-define_pixels(nhh,nhw);
-
-
+% nhh#:=interline#;
+% nhw#:=6/5*interline#;
+% define_pixels(interline,nhw);
 
 med#:=1/33designsize;
 thick#:=1/16designsize;
@@ -32,22 +30,25 @@ stem#:=1/5interline#;
 flare#:=2/3interline#;
 define_pixels(stem,flare);
 
-fet_beginchar(incr code,interline#,4interline#,0,"Quarter rest","4","quartrest");
+fet_beginchar(incr code,interline#,4interline#,0,0,"Quarter rest","4","quartrest");
        alpha:=-50;
        penpos1(rthin,alpha+90);
        penpos2(5/4rthick,alpha);
        penpos4(5/4rthick,alpha);
        penpos3(3/4rthick,alpha);
        penpos6(rthin,alpha-20);
-       penpos7(4/3thick,alpha);
+%      penpos6(rthick,alpha-20);
+%      penpos7(4/3thick,alpha);
+       penpos7(5/8rthick,alpha);
        penpos8(rthin,-10);
-       y1l=7/2nhh; x1l=1/3nhh;
-       z2r=z1+(nhh*right) rotated alpha;
+       y1l=7/2interline; x1l=1/3interline;
+       z2r=z1+(interline*right) rotated alpha;
        z3=1/2[z2,z4];
-       x4=3/8nhh; y4=2nhh;
-       z6=z4l+(5/4nhh*right) rotated alpha;
-       x7l=x4l; y7r=y6l;
-       x8=1/3nhw; y8= nhh-1/4nhh;
+       x4=3/8interline; y4=2interline;
+       z6=z4l+(5/4interline*right) rotated alpha;
+%      x7l=x4l; y7r=y6l;
+       x7l=x4l; y7l=y4r;
+       x8=2/5interline; y8= interline-1/4interline;
        z5=z6r shifted (sqrt(2)*rthin/4,sqrt(2)*rthin/4);
 
        pickup penrazor scaled rthin rotated 45;
@@ -92,7 +93,7 @@ def brush(expr a,w,b,v) =
        endgroup;
        enddef;
 
-fet_beginchar(incr code,4/3interline#,5/3interline#+2stafflinethickness#,0,"8th rest","-2","eighthrest");
+fet_beginchar(incr code,4/3interline#,5/3interline#+2stafflinethickness#,0,0,"8th rest","-2","eighthrest");
        save x,y;
        x1=w-stem/6; y1=h-flare/4;
        crook (z1,w-stem/6);
@@ -104,7 +105,7 @@ fet_beginchar(incr code,4/3interline#,5/3interline#+2stafflinethickness#,0,"8th
 %      currentpicture:=currentpicture shifted (0,interline+2stafflinethickness);
        endchar;
 
-fet_beginchar(incr code,4/3interline#,5/3interline#+interline#+2stafflinethickness#,0,"16th rest","-2","sixteenthrest");
+fet_beginchar(incr code,4/3interline#,5/3interline#+interline#+2stafflinethickness#,0,0,"16th rest","-2","sixteenthrest");
        save x,y;
        x1=w-stem/6; y1=h-flare/4;
        z2-z1=whatever*dir74;
@@ -117,7 +118,7 @@ fet_beginchar(incr code,4/3interline#,5/3interline#+interline#+2stafflinethickne
 %      currentpicture:=currentpicture shifted (0,2stafflinethickness);
        endchar;
 
-fet_beginchar(incr code,4/3interline#,5/3interline#+2interline#+2stafflinethickness#,0,"32th rest","-2","thirtysecondrest");
+fet_beginchar(incr code,4/3interline#,5/3interline#+2interline#+2stafflinethickness#,0,0,"32th rest","-2","thirtysecondrest");
        save x,y;
        x1=w-stem/6; y1=h-flare/4;
        z2-z1=whatever*dir76;
@@ -133,7 +134,7 @@ fet_beginchar(incr code,4/3interline#,5/3interline#+2interline#+2stafflinethickn
 %      currentpicture:=currentpicture shifted (0,2stafflinethickness);
        endchar;
 
-fet_beginchar(incr code,4/3interline#,5/3interline#+3interline#+2stafflinethickness#,0,"64th rest","-2","sixtyfourthrest");
+fet_beginchar(incr code,4/3interline#,5/3interline#+3interline#+2stafflinethickness#,0,0,"64th rest","-2","sixtyfourthrest");
        save x,y;
        x1=w-stem/6; y1=h-flare/4;
        z2-z1=whatever*dir78;
@@ -152,7 +153,7 @@ fet_beginchar(incr code,4/3interline#,5/3interline#+3interline#+2stafflinethickn
 %      currentpicture:=currentpicture shifted (0,2stafflinethickness);
        endchar;
 
-fet_beginchar(incr code,4/3interline#,5/3interline#+4interline#+2stafflinethickness#,0,"128th rest","-2","hundredtwentyeighthrest");
+fet_beginchar(incr code,4/3interline#,5/3interline#+4interline#+2stafflinethickness#,0,0,"128th rest","-2","hundredtwentyeighthrest");
        save x,y;
        x1=w-stem/6; y1=h-flare/4;
        z2-z1=whatever*dir80;

diff --git a/mf/font-en-tja16.mf b/mf/font-en-tja16.mf
index c4bec4c8b996bd2ad373af3c38963b54792ad372..f82dc30dbb4b275156d58adbf689acf9c10fc48b 100644 (file)
--- a/mf/font-en-tja16.mf
+++ b/mf/font-en-tja16.mf
@@ -18,6 +18,7 @@ code:=-1;
 
 input bolletjes;
 input eindelijk;
+input wat-zie-ik;
 
 fet_endfont("font-en-tja");
 

diff --git a/mf/font-en-tja20.mf b/mf/font-en-tja20.mf
index f58aedfb62a1367455b03f0ef52dc64346b33a2f..0015e173cf86790b830d16c14bbce05e65ebb08a 100644 (file)
--- a/mf/font-en-tja20.mf
+++ b/mf/font-en-tja20.mf
@@ -16,6 +16,7 @@ code:=-1;
 
 input bolletjes;
 input eindelijk;
+input wat-zie-ik;
 
 fet_endfont("font-en-tja");
 

diff --git a/mf/wat-zie-ik.mf b/mf/wat-zie-ik.mf
new file mode 100644 (file)
index 0000000..0f835ae
--- /dev/null
+++ b/mf/wat-zie-ik.mf
@@ -0,0 +1,58 @@
+% wat-zie-ik.mf
+% part of LilyPond's pretty-but-neat music font
+% beams: plat en steil
+
+fet_begingroup("beamslopes");
+
+beamheight#:=0.48interline#;
+define_pixels(beamheight);
+
+pen beam_pen;
+beam_pen:=penrazor scaled beamheight rotated 90;
+
+% mimic taupin-SLOPES for now -- because lily knows them
+ELEM_TAN:=0.05;
+SLOPES:=10;
+LENGTHS:=5;
+ELEM_LEN:=2;
+
+% fake char for tables; will be overwritten by mf
+% misuse breapth for minimum length (mf-to-table negates breapth again)
+fet_beginchar(code+1,ELEM_LEN**LENGTHS,0,0,-ELEM_LEN,"Beamslopes up","uslope","beamuslope{%}{%}");
+       endchar;
+
+% Beamslopes up
+for i:=1 upto SLOPES:
+       width:=ELEM_LEN;
+       for j:=1 upto LENGTHS:
+               beginchar(incr code,width,0,0);
+                       pickup beam_pen;
+                       draw origin--(lft w,w*i*ELEM_TAN);
+                       endchar;
+               width:=2*width;
+               endfor;
+       endfor;
+
+% fake char for tables; will be overwritten by mf
+% misuse breapth for minimum length (mf-to-table negates breapth again)
+fet_beginchar(code+1,ELEM_LEN**LENGTHS,0,0,-ELEM_LEN,"Beamslopes down","dslope","beamdslope{%}{%}");
+       endchar;
+
+% Beamslopes down
+for i:=1 upto SLOPES:
+       width:=ELEM_LEN;
+       for j:=1 upto LENGTHS:
+               beginchar(incr code,width,0,0);
+                       pickup beam_pen;
+                       draw origin--(lft w,-w*i*ELEM_TAN);
+                       endchar;
+               width:=2*width;
+               endfor;
+       endfor;
+
+% fake char for tables
+fet_beginchar(code+1*SLOPES*LENGTHS,0,0,0,0,"Horizontal beams","horizontal","rulesym{%}{%}");
+       endchar;
+       
+fet_endgroup("beamslopes");
+

diff --git a/tex/dyn10.tex b/tex/dyn10.tex
index b63ddfb36e1b3d3b983a42d985ec66c247f345de..3d9a26df808d3928d5b1ef7773c6a9c9f2085caf 100644 (file)
--- a/tex/dyn10.tex
+++ b/tex/dyn10.tex
@@ -1,4 +1,4 @@
-% generated at Thu Sep 25 01:22:50 1997 from out/dyn10.log
+% generated at Fri Sep 26 09:25:28 1997 from out/dyn10.log
 % changes will be lost
 
 % dyn

diff --git a/tex/fetdefs.tex b/tex/fetdefs.tex
index 049a3a59e7dc07a6da501999ffd5f5416f487ea7..39c7e3641821f2c44157cddea246e0a11982b440 100644 (file)
--- a/tex/fetdefs.tex
+++ b/tex/fetdefs.tex
@@ -1,3 +1,5 @@
+% fetdefs.tex
+% encapsulating tex backend for auto-generated font-en-tja definitions
 
 \def\fetsixteendefs{
         \font\fontentja=font-en-tja16
@@ -8,6 +10,19 @@
 
 % \def\fetdef#1#2{\def#1{\fetchar{#2}}}
 % ugh, linewidth, ugh, tablexx.ly balldims not used!
-\def\fetdef#1#2{\def#1{\lower.5\staffrulethickness\hbox{\fetchar{#2}}}}
+\def\fetdef#1#2{\def#1{\lower.3884\staffrulethickness\hbox{\fetchar{#2}}}}
 \def\fetchar#1{\fontentja\char#1}
+
 \input font-en-tja20
+
+\def\beamuslope#1#2{{\count0=#2\advance\count0 by#1
+        \advance\count0 by \beamuslopestart
+       % huh?? -- think i followed taupin beam convention
+       % is lily confused?
+       \advance\count0 by -8
+        \fetchar\count0}}
+\def\beamdslope#1#2{{\count0=#2\advance\count0 by#1
+        \advance\count0 by \beamdslopestart
+       % huh??
+       \advance\count0 by -8
+        \fetchar\count0}}

diff --git a/tex/font-en-tja16.tex b/tex/font-en-tja16.tex
index 3e3f4476807afbfa09b080ea8a9c73cc315786ab..3419d253d67359b654a31eb8e7c7b91175f33b02 100644 (file)
--- a/tex/font-en-tja16.tex
+++ b/tex/font-en-tja16.tex
@@ -1,4 +1,4 @@
-% generated at Thu Sep 25 01:22:51 1997 from out/font-en-tja16.log
+% generated at Fri Sep 26 09:25:30 1997 from out/font-en-tja16.log
 % changes will be lost
 
 % font-en-tja
@@ -17,3 +17,8 @@
 \fetdef\sixtyfourthrest{9}
 \fetdef\hundredtwentyeighthrest{10}
 
+% beamslopes
+\def\beamuslopestart{11}
+\def\beamdslopestart{61}
+\def\rulesymstart{160}
+

diff --git a/tex/font-en-tja20.tex b/tex/font-en-tja20.tex
index 42b2b50b75e09a42e835673029aca537ff230533..2dd7bb4ad9e771c471ac372f588f7dbc6b025a8c 100644 (file)
--- a/tex/font-en-tja20.tex
+++ b/tex/font-en-tja20.tex
@@ -1,4 +1,4 @@
-% generated at Thu Sep 25 01:22:52 1997 from out/font-en-tja20.log
+% generated at Fri Sep 26 09:25:32 1997 from out/font-en-tja20.log
 % changes will be lost
 
 % font-en-tja
@@ -17,3 +17,8 @@
 \fetdef\sixtyfourthrest{9}
 \fetdef\hundredtwentyeighthrest{10}
 
+% beamslopes
+\def\beamuslopestart{11}
+\def\beamdslopestart{61}
+\def\rulesymstart{160}
+

diff --git a/tex/taupindefs.tex b/tex/taupindefs.tex
index 77ffb3bcec4d40cda12d8e721208c0248797e80c..4a47f9dcc8fa925df13a113015969cbd97b457e3 100644 (file)
--- a/tex/taupindefs.tex
+++ b/tex/taupindefs.tex
@@ -128,10 +128,10 @@
 
 \def\tr{{\it tr}}
 
-\def\beamuslope#1#2{{\count0=#2\advance\count0 by#1
-        \advance\count0 by 122
-        \musicfnt\char\count0}}
-\def\beamdslope#1#2{{\count0=#2\advance\count0 by#1
-        \advance\count0 by 186
-        \musicfnt\char\count0}}
+% \def\beamuslope#1#2{{\count0=#2\advance\count0 by#1
+%         \advance\count0 by 122
+%         \musicfnt\char\count0}}
+% \def\beamdslope#1#2{{\count0=#2\advance\count0 by#1
+%         \advance\count0 by 186
+%         \musicfnt\char\count0}}