release: 0.1.32

diff --git a/AUTHORS.text b/AUTHORS.text
index cf19f67dd53d29948fff418eca3bb1c1933cbb59..0e156d133abdea853b7aca9c0d962d406e9ce655 100644 (file)
--- a/AUTHORS.text
+++ b/AUTHORS.text
@@ -61,6 +61,6 @@ C\bC\bC\bCO\bO\bO\bON\bN\bN\bNT\bT\bT\bTR\bR\bR\bRI\bI\bI\bIB\bB\bB\bBU\bU\bU\bUT\bT\bT\bTO\bO\bO\bOR\bR\bR\bRS\bS
 
 
 
-27/Oct/97                LilyPond 0.1.31                        1
+27/Oct/97                LilyPond 0.1.32                        1
 
 

diff --git a/DEDICATION b/DEDICATION
index 36414b54e8bdb862c496445ca28d248ed71d230c..e6b3bf73bd7b70db4afe0dd3fa930bd5c1c99a31 100644 (file)
--- a/DEDICATION
+++ b/DEDICATION
@@ -7,8 +7,8 @@
 
        Those deserving special mention (in no particular order):
 Esther, Marijke, Heike, Inge, Judith, Hannah, Auke, Ilse, Evelyn,
-Maartje, Suzanne, Ilse (gee, again?) and last (but certainly not least)
-Janneke!
+Maartje, Suzanne, Ilse (gee, again?), Bonne and last (but certainly
+not least) Janneke!
 
        HWN
 

diff --git a/Documentation/faq.pod b/Documentation/faq.pod
index b98fa6865cbb25949af2dd939db584173d942424..45a3cceb2e9ea5084961db136a417ebba76d0c93 100644 (file)
--- a/Documentation/faq.pod
+++ b/Documentation/faq.pod
@@ -202,7 +202,8 @@ Q: I want to implement XXXX!  Should I do this?
 
 A: There might be better ways of doing XXXX, so it's a good thing to
 ask about this before you start hacking.  If you want to keep in touch
-current developments, you should subscribe to the mailing list.
+with current developments, you should subscribe to the mailing list
+(see the "links" section of the documentation).
 
 
 Q: I want to implement XXXX!  How should I do this?

diff --git a/INSTALL.text b/INSTALL.text
index c8455c2dc8099aebce6a4625a25aee7c22cf05f5..beefad90596cb234c43327b302514d7068a4aaf3 100644 (file)
--- a/INSTALL.text
+++ b/INSTALL.text
@@ -61,7 +61,7 @@ R\bR\bR\bRU\bU\bU\bUN\bN\bN\bNN\bN\bN\bNI\bI\bI\bIN\bN\bN\bNG\bG\bG\bG
 
 
 
-20/Oct/97                LilyPond 0.1.31                        1
+20/Oct/97                LilyPond 0.1.32                        1
 
 
 
@@ -127,7 +127,7 @@ C\bC\bC\bCO\bO\bO\bON\bN\bN\bNF\bF\bF\bFI\bI\bI\bIG\bG\bG\bGU\bU\bU\bUR\bR\bR\bRI\bI\bI\bIN\bN\bN\bNG\bG\bG\bG a\b
 
 
 
-20/Oct/97                LilyPond 0.1.31                        2
+20/Oct/97                LilyPond 0.1.32                        2
 
 
 
@@ -193,7 +193,7 @@ INSTALL(1)            LilyPond documentation           INSTALL(1)
 
 
 
-20/Oct/97                LilyPond 0.1.31                        3
+20/Oct/97                LilyPond 0.1.32                        3
 
 
 
@@ -259,7 +259,7 @@ I\bI\bI\bIN\bN\bN\bNS\bS\bS\bST\bT\bT\bTA\bA\bA\bAL\bL\bL\bLL\bL\bL\bLI\bI\bI\bIN\bN\bN\bNG\bG\bG\bG
 
 
 
-20/Oct/97                LilyPond 0.1.31                        4
+20/Oct/97                LilyPond 0.1.32                        4
 
 
 
@@ -325,7 +325,7 @@ R\bR\bR\bRE\bE\bE\bED\bD\bD\bDH\bH\bH\bHA\bA\bA\bAT\bT\bT\bT L\bL\bL\bLI\bI\bI\bIN\bN\bN\bNU\bU\bU\bUX\bX\bX\bX
 
 
 
-20/Oct/97                LilyPond 0.1.31                        5
+20/Oct/97                LilyPond 0.1.32                        5
 
 
 
@@ -391,6 +391,6 @@ A\bA\bA\bAU\bU\bU\bUT\bT\bT\bTH\bH\bH\bHO\bO\bO\bOR\bR\bR\bRS\bS\bS\bS
 
 
 
-20/Oct/97                LilyPond 0.1.31                        6
+20/Oct/97                LilyPond 0.1.32                        6
 
 

diff --git a/NEWS b/NEWS
index b125b3d40f00893afa9dce0f2e770f9e28303115..035407973c59b3229379aa1eb966c19cbcd05ac1 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,20 @@
+pl 32
+       - change type checks (ughugh) to derivation checks (ugh)
+       - this fixes clef bug.
+       - bf: order of breakables: meter comes after bar.
+       - bf: do error iso coredump on unknown symbol-table
+       - bf: release.py, copy patch too. 
+       - bf: add makefile dep for disting MF logs.
+       - bf: don't read font-en-tja*.ly, but feta*.ly
+
 pl 31.jcn2
        - first version of (non-ugh) c-klef
+       - bf: mi2mu: notes of zero duration as comments
+       - feta: ugh c clef
+
+
+********
+nov 17
 
 pl 31
        - bf: replaced Score_column assert by a warning (thanks Scott)
@@ -13,9 +28,6 @@ pl 31
 
 ********
 nov 11
-pl 30.jcn1
-       - bf: mi2mu: notes of zero duration as comments
-       - feta: ugh c clef
 
 pl 30
        - feta: G clef. 
@@ -24,6 +36,7 @@ pl 30
        - bf: bass clef
 
 ********
+nov 6
 pl 29
        - feta: bass clef, bf: dynamics, bf: 64th flag
        

diff --git a/TODO b/TODO
index 3f63c612a6d41b722fcf40a2a43dd2336bb9e75f..b38448220b9a332b20937e0db6ad5160eae9665a 100644 (file)
--- a/TODO
+++ b/TODO
@@ -9,6 +9,8 @@ grep for TODO and ugh/ugr
 0.2:
        * add a screenshot to the website.
 
+       * fix stdin input
+
        * LILYSOURCEDIR
        
        * documentation

diff --git a/VERSION b/VERSION
index e06bb4090a2748000e694736978c84378711f586..959fb4e60b5446dbe92636a54519a91f91348289 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,7 +1,7 @@
 TOPLEVEL_MAJOR_VERSION = 0
 TOPLEVEL_MINOR_VERSION = 1
-TOPLEVEL_PATCH_LEVEL = 31
-TOPLEVEL_MY_PATCH_LEVEL = jcn2
+TOPLEVEL_PATCH_LEVEL = 32
+TOPLEVEL_MY_PATCH_LEVEL = 
 
 # use the above to send patches, always empty for released version:
 # please don't move these comments up; the patch should fail if 

diff --git a/bin/lilypython.py b/bin/lilypython.py
index ab88f004f229bb87ddfb77bf4cb21db0b8f2b8cc..fb6f1a51f5695111a2756a541b59b96447271751 100644 (file)
--- a/bin/lilypython.py
+++ b/bin/lilypython.py
@@ -65,6 +65,7 @@ def tarball(v):
 def released_tarball(v):
     return lilydirs.release_dir + tarball(v)
 
+
 def tuple_to_list(tup):
     l=[]
     for x in tup:

diff --git a/bin/make-patch.py b/bin/make-patch.py
index 32ae99ae3ba573523898a7514ec3d464a3f23310..30e870f16cd6a42302a51ad76d14f59b4c7b8796 100644 (file)
--- a/bin/make-patch.py
+++ b/bin/make-patch.py
@@ -33,7 +33,7 @@ def untar(fn):
 #   os.system ('tar xzf ' + fn)
 #   sys.stderr.write('\n')
 # ugh, even this does not work, but one error message less :-)
-    os.system ('gzip -dc ' + fn + '| tar xf - ')
+    os.system ('gzip --quiet -dc ' + fn + '| tar xf - ')
 # so print soothing message:
     sys.stderr.write('make-patch:ugh: Please ignore error: gzip: stdout: Broken pipe\n');
     sys.stderr.flush()

diff --git a/bin/release.py b/bin/release.py
index f18ff01ef73a483b5e27c9125e90dfd1b64c1787..604e1779f0dccbe3d306a09ebba463eb1902300c 100644 (file)
--- a/bin/release.py
+++ b/bin/release.py
@@ -13,9 +13,20 @@ os.system('rm ../test/*gz')
 os.link(released_tarball(cur_ver), tarball(cur_ver))
 
 
-# not a module, but a script:
+# not a module, but a script (JCN)
 # makepatch.main()
+
+# Module wherefore aren't thou Script
+# A Rose by any other name would be as blonde. --HWN
+
 os.system('python ' + lilydirs.topdir + '/bin/make-patch.py');
 
-os.system('gzip -9 patch*')
+pn = 'patch-%s' % version_tuple_to_str(cur_ver)
+os.system('gzip -9 ' + pn)
+pn = pn + '.gz'
+rel_pn = lilydirs.release_dir + '../patches/' + pn;
+
+os.rename(pn, rel_pn);
+os.link(rel_pn, pn);
+
 os.system('tar cf updeet *gz')

diff --git a/init/feta16.ly b/init/feta16.ly
index 204198068f7bff5a73c1d313d3720de30d31f291..b599375c0bcde6f36dfdef2bb7ece70e721dc0aa 100644 (file)
--- a/init/feta16.ly
+++ b/init/feta16.ly
@@ -1,5 +1,5 @@
 % generated automatically by mf-to-table.py version 0.4
-% on Tue Nov 18 23:42:04 1997
+% on Wed Nov 19 11:44:45 1997
 % Do not edit
 % input from out/feta16.log
 % name=\symboltables {
@@ -67,12 +67,12 @@
         "d5"   "\\dthirtysecondflag"   -0.20\pt        4.54\pt -0.20\pt        15.66\pt        
         "d6"   "\\dsixtyfourthflag"    -0.20\pt        4.54\pt -0.20\pt        17.66\pt        
         }
-    "klef"      = \table {
+    "clefs"     = \table {
         "alto" "\\altoclef"    -0.00\pt        10.00\pt        -8.00\pt        8.00\pt 
         "alto_change"  "\\caltoclef"   -0.00\pt        8.00\pt -6.40\pt        6.40\pt 
         "bass" "\\bassclef"    1.20\pt 12.80\pt        -10.00\pt       4.00\pt 
         "bass_change"  "\\cbassclef"   0.96\pt 10.24\pt        -8.00\pt        3.20\pt 
-        "violin"       "\\violinclef"  0.11\pt 10.55\pt        -12.00\pt       20.00\pt        
-        "violin_change"        "\\cviolinclef" 0.17\pt 8.52\pt -9.60\pt        16.00\pt        
+        "violin"       "\\violinclef"  -0.11\pt        10.95\pt        -12.00\pt       20.00\pt        
+        "violin_change"        "\\cviolinclef" -0.33\pt        8.52\pt -9.60\pt        16.00\pt        
         }
     %  } % $name

diff --git a/init/feta20.ly b/init/feta20.ly
index edab1bd89559153c374df44cd4691ab53cb635e3..5ae1e0742d41e9d9162cc690a1fec9f94a428305 100644 (file)
--- a/init/feta20.ly
+++ b/init/feta20.ly
@@ -1,5 +1,5 @@
 % generated automatically by mf-to-table.py version 0.4
-% on Tue Nov 18 23:42:28 1997
+% on Wed Nov 19 11:44:54 1997
 % Do not edit
 % input from out/feta20.log
 % name=\symboltables {
@@ -67,12 +67,12 @@
         "d5"   "\\dthirtysecondflag"   -0.25\pt        5.68\pt -0.25\pt        19.58\pt        
         "d6"   "\\dsixtyfourthflag"    -0.25\pt        5.68\pt -0.25\pt        22.08\pt        
         }
-    "klef"      = \table {
+    "clefs"     = \table {
         "alto" "\\altoclef"    -0.00\pt        12.50\pt        -10.00\pt       10.00\pt        
         "alto_change"  "\\caltoclef"   -0.00\pt        10.00\pt        -8.00\pt        8.00\pt 
         "bass" "\\bassclef"    1.50\pt 16.00\pt        -12.50\pt       5.00\pt 
         "bass_change"  "\\cbassclef"   1.20\pt 12.80\pt        -10.00\pt       4.00\pt 
-        "violin"       "\\violinclef"  0.14\pt 13.19\pt        -15.00\pt       25.00\pt        
-        "violin_change"        "\\cviolinclef" 0.21\pt 10.65\pt        -12.00\pt       20.00\pt        
+        "violin"       "\\violinclef"  -0.14\pt        13.69\pt        -15.00\pt       25.00\pt        
+        "violin_change"        "\\cviolinclef" -0.41\pt        10.65\pt        -12.00\pt       20.00\pt        
         }
     %  } % $name

diff --git a/init/font-en-tja16.ly b/init/font-en-tja16.ly
deleted file mode 100644 (file)
index f22e289..0000000
--- a/init/font-en-tja16.ly
+++ /dev/null
@@ -1,69 +0,0 @@
-% generated automatically by mf-to-table.py version 0.4
-% on Tue Oct 28 20:43:44 1997
-% Do not edit
-% input from out/font-en-tja16.log
-% name=\symboltables {
-    "rests"     = \table {
-        "0"    "\\wholerest"   -0.00\pt        6.00\pt -2.50\pt        0.00\pt 
-        "1"    "\\halfrest"    -0.00\pt        6.00\pt -0.00\pt        2.50\pt 
-        "0o"   "\\outsidewholerest"    -2.50\pt        8.50\pt -2.50\pt        0.40\pt 
-        "1o"   "\\outsidehalfrest"     -2.50\pt        8.50\pt -0.40\pt        2.50\pt 
-        "2"    "\\quartrest"   -0.00\pt        4.32\pt 3.00\pt 14.40\pt        
-        "3"    "\\eighthrest"  -0.00\pt        5.33\pt 4.00\pt 11.47\pt        
-        "4"    "\\sixteenthrest"       -0.00\pt        6.23\pt -0.00\pt        11.47\pt        
-        "5"    "\\thirtysecondrest"    -0.00\pt        7.03\pt -0.00\pt        15.47\pt        
-        "6"    "\\sixtyfourthrest"     -0.00\pt        7.53\pt -0.00\pt        19.47\pt        
-        "7"    "\\hundredtwentyeighthrest"     -0.00\pt        8.38\pt -0.00\pt        23.47\pt        
-        }
-    "accidentals"       = \table {
-        "1"    "\\sharp"       -0.00\pt        4.40\pt -6.00\pt        6.00\pt 
-        "0"    "\\natural"     -0.00\pt        2.67\pt -6.00\pt        6.00\pt 
-        "-1"   "\\flat"        -0.48\pt        3.20\pt -2.00\pt        8.00\pt 
-        "-2"   "\\flatflat"    -0.48\pt        5.80\pt -2.00\pt        8.00\pt 
-        "2"    "\\sharpsharp"  -0.00\pt        4.00\pt -2.00\pt        2.00\pt 
-        }
-    "dots"      = \table {
-        "dot"  "\\dot" -0.00\pt        1.80\pt -0.90\pt        0.90\pt 
-        }
-    "balls"     = \table {
-        "-1"   "\\brevisball"  -0.00\pt        8.00\pt -2.20\pt        2.20\pt 
-        "-1l"  "\\brevisledger"        -2.00\pt        10.00\pt        -0.40\pt        0.40\pt 
-        "-2"   "\\longaball"   -0.00\pt        8.00\pt -2.20\pt        2.20\pt 
-        "-2l"  "\\longaledger" -2.00\pt        10.00\pt        -0.40\pt        0.40\pt 
-        "0"    "\\wholeball"   -0.00\pt        7.92\pt -2.20\pt        2.20\pt 
-        "0l"   "\\wholeledger" -1.98\pt        9.90\pt -0.40\pt        0.40\pt 
-        "1"    "\\halfball"    -0.00\pt        5.51\pt -2.20\pt        2.20\pt 
-        "1l"   "\\halfledger"  -1.38\pt        6.89\pt -0.40\pt        0.40\pt 
-        "2"    "\\quartball"   -0.00\pt        5.28\pt -2.20\pt        2.20\pt 
-        "2l"   "\\quartledger" -1.32\pt        6.61\pt -0.40\pt        0.40\pt 
-        }
-    "scripts"   = \table {
-        "ufermata"     "\\ufermata"    -5.30\pt        5.30\pt -0.30\pt        5.80\pt 
-        "dfermata"     "\\dfermata"    -5.30\pt        5.30\pt -5.80\pt        0.30\pt 
-        "sforzato"     "\\sforzatoaccent"      -3.60\pt        3.60\pt -2.00\pt        2.00\pt 
-        "staccato"     "\\staccato"    -0.60\pt        0.60\pt -0.60\pt        0.60\pt 
-        "ustaccatissimo"       "\\ustaccatissimo"      -0.80\pt        0.80\pt -0.20\pt        4.00\pt 
-        "dstaccatissimo"       "\\dstaccatissimo"      -0.80\pt        0.80\pt -4.00\pt        0.20\pt 
-        "tenuto"       "\\tenuto"      -3.60\pt        3.60\pt -0.24\pt        0.24\pt 
-        "umarcato"     "\\umarcato"    -2.00\pt        2.00\pt -0.00\pt        4.40\pt 
-        "dmarcato"     "\\dmarcato"    -2.00\pt        2.00\pt -4.40\pt        0.00\pt 
-        "open" "\\ouvert"      -1.60\pt        1.60\pt -2.00\pt        2.00\pt 
-        "stopped"      "\\plusstop"    -2.20\pt        2.20\pt -2.20\pt        2.20\pt 
-        "upbow"        "\\upbow"       -2.60\pt        2.60\pt -0.00\pt        8.32\pt 
-        "downbow"      "\\downbow"     -3.00\pt        3.00\pt -0.00\pt        5.33\pt 
-        "turn" "\\turn"        -4.38\pt        4.38\pt -2.12\pt        2.12\pt 
-        "trill"        "\\trill"       -0.00\pt        8.00\pt -0.00\pt        9.00\pt 
-        "pedalheel"    "\\pedalheel"   -2.00\pt        2.00\pt -2.00\pt        2.67\pt 
-        "pedaltoe"     "\\pedaltoe"    -2.00\pt        2.00\pt -0.00\pt        6.00\pt 
-        }
-    "flags"     = \table {
-        "u3"   "\\eighthflag"  -0.20\pt        4.10\pt -12.26\pt       0.20\pt 
-        "u4"   "\\sixteenthflag"       -0.20\pt        4.10\pt -14.26\pt       0.20\pt 
-        "u5"   "\\thirtysecondflag"    -0.20\pt        4.10\pt -17.26\pt       0.20\pt 
-        "u6"   "\\sixtyfourthflag"     -0.20\pt        4.10\pt -21.26\pt       0.20\pt 
-        "d3"   "\\deighthflag" -0.20\pt        4.54\pt -0.20\pt        11.66\pt        
-        "d4"   "\\dsixteenthflag"      -0.20\pt        4.54\pt -0.20\pt        12.26\pt        
-        "d5"   "\\dthirtysecondflag"   -0.20\pt        4.54\pt -0.20\pt        15.66\pt        
-        "d6"   "\\dsixtyfourthflag"    -0.20\pt        4.54\pt -0.20\pt        17.66\pt        
-        }
-    %  } % $name

diff --git a/init/font-en-tja20.ly b/init/font-en-tja20.ly
deleted file mode 100644 (file)
index cab8847..0000000
--- a/init/font-en-tja20.ly
+++ /dev/null
@@ -1,69 +0,0 @@
-% generated automatically by mf-to-table.py version 0.4
-% on Tue Oct 28 20:44:01 1997
-% Do not edit
-% input from out/font-en-tja20.log
-% name=\symboltables {
-    "rests"     = \table {
-        "0"    "\\wholerest"   -0.00\pt        7.50\pt -3.13\pt        0.00\pt 
-        "1"    "\\halfrest"    -0.00\pt        7.50\pt -0.00\pt        3.13\pt 
-        "0o"   "\\outsidewholerest"    -3.13\pt        10.62\pt        -3.13\pt        0.50\pt 
-        "1o"   "\\outsidehalfrest"     -3.13\pt        10.62\pt        -0.50\pt        3.13\pt 
-        "2"    "\\quartrest"   -0.00\pt        5.40\pt 3.75\pt 18.00\pt        
-        "3"    "\\eighthrest"  -0.00\pt        6.67\pt 5.00\pt 14.33\pt        
-        "4"    "\\sixteenthrest"       -0.00\pt        7.79\pt -0.00\pt        14.33\pt        
-        "5"    "\\thirtysecondrest"    -0.00\pt        8.78\pt -0.00\pt        19.33\pt        
-        "6"    "\\sixtyfourthrest"     -0.00\pt        9.41\pt -0.00\pt        24.33\pt        
-        "7"    "\\hundredtwentyeighthrest"     -0.00\pt        10.47\pt        -0.00\pt        29.33\pt        
-        }
-    "accidentals"       = \table {
-        "1"    "\\sharp"       -0.00\pt        5.50\pt -7.50\pt        7.50\pt 
-        "0"    "\\natural"     -0.00\pt        3.33\pt -7.50\pt        7.50\pt 
-        "-1"   "\\flat"        -0.60\pt        4.00\pt -2.50\pt        10.00\pt        
-        "-2"   "\\flatflat"    -0.60\pt        7.25\pt -2.50\pt        10.00\pt        
-        "2"    "\\sharpsharp"  -0.00\pt        5.00\pt -2.50\pt        2.50\pt 
-        }
-    "dots"      = \table {
-        "dot"  "\\dot" -0.00\pt        2.25\pt -1.13\pt        1.13\pt 
-        }
-    "balls"     = \table {
-        "-1"   "\\brevisball"  -0.00\pt        10.00\pt        -2.75\pt        2.75\pt 
-        "-1l"  "\\brevisledger"        -2.50\pt        12.50\pt        -0.50\pt        0.50\pt 
-        "-2"   "\\longaball"   -0.00\pt        10.00\pt        -2.75\pt        2.75\pt 
-        "-2l"  "\\longaledger" -2.50\pt        12.50\pt        -0.50\pt        0.50\pt 
-        "0"    "\\wholeball"   -0.00\pt        9.90\pt -2.75\pt        2.75\pt 
-        "0l"   "\\wholeledger" -2.48\pt        12.38\pt        -0.50\pt        0.50\pt 
-        "1"    "\\halfball"    -0.00\pt        6.89\pt -2.75\pt        2.75\pt 
-        "1l"   "\\halfledger"  -1.72\pt        8.61\pt -0.50\pt        0.50\pt 
-        "2"    "\\quartball"   -0.00\pt        6.61\pt -2.75\pt        2.75\pt 
-        "2l"   "\\quartledger" -1.65\pt        8.26\pt -0.50\pt        0.50\pt 
-        }
-    "scripts"   = \table {
-        "ufermata"     "\\ufermata"    -6.63\pt        6.63\pt -0.38\pt        7.25\pt 
-        "dfermata"     "\\dfermata"    -6.63\pt        6.63\pt -7.25\pt        0.38\pt 
-        "sforzato"     "\\sforzatoaccent"      -4.50\pt        4.50\pt -2.50\pt        2.50\pt 
-        "staccato"     "\\staccato"    -0.75\pt        0.75\pt -0.75\pt        0.75\pt 
-        "ustaccatissimo"       "\\ustaccatissimo"      -1.00\pt        1.00\pt -0.20\pt        5.00\pt 
-        "dstaccatissimo"       "\\dstaccatissimo"      -1.00\pt        1.00\pt -5.00\pt        0.20\pt 
-        "tenuto"       "\\tenuto"      -4.50\pt        4.50\pt -0.30\pt        0.30\pt 
-        "umarcato"     "\\umarcato"    -2.50\pt        2.50\pt -0.00\pt        5.50\pt 
-        "dmarcato"     "\\dmarcato"    -2.50\pt        2.50\pt -5.50\pt        0.00\pt 
-        "open" "\\ouvert"      -2.00\pt        2.00\pt -2.50\pt        2.50\pt 
-        "stopped"      "\\plusstop"    -2.75\pt        2.75\pt -2.75\pt        2.75\pt 
-        "upbow"        "\\upbow"       -3.25\pt        3.25\pt -0.00\pt        10.40\pt        
-        "downbow"      "\\downbow"     -3.75\pt        3.75\pt -0.00\pt        6.67\pt 
-        "turn" "\\turn"        -5.47\pt        5.47\pt -2.65\pt        2.65\pt 
-        "trill"        "\\trill"       -0.00\pt        10.00\pt        -0.00\pt        11.25\pt        
-        "pedalheel"    "\\pedalheel"   -2.50\pt        2.50\pt -2.50\pt        3.33\pt 
-        "pedaltoe"     "\\pedaltoe"    -2.50\pt        2.50\pt -0.00\pt        7.50\pt 
-        }
-    "flags"     = \table {
-        "u3"   "\\eighthflag"  -0.25\pt        5.13\pt -15.33\pt       0.25\pt 
-        "u4"   "\\sixteenthflag"       -0.25\pt        5.13\pt -17.83\pt       0.25\pt 
-        "u5"   "\\thirtysecondflag"    -0.25\pt        5.13\pt -21.58\pt       0.25\pt 
-        "u6"   "\\sixtyfourthflag"     -0.25\pt        5.13\pt -26.58\pt       0.25\pt 
-        "d3"   "\\deighthflag" -0.25\pt        5.68\pt -0.25\pt        14.58\pt        
-        "d4"   "\\dsixteenthflag"      -0.25\pt        5.68\pt -0.25\pt        15.33\pt        
-        "d5"   "\\dthirtysecondflag"   -0.25\pt        5.68\pt -0.25\pt        19.58\pt        
-        "d6"   "\\dsixtyfourthflag"    -0.25\pt        5.68\pt -0.25\pt        22.08\pt        
-        }
-    %  } % $name

diff --git a/init/table16.ly b/init/table16.ly
index f95cb2fdccdf59a7409334172c27c7238b4f8a8e..506c9f78b89e1b50e031cee5a8bcfc729467b585 100644 (file)
--- a/init/table16.ly
+++ b/init/table16.ly
@@ -10,21 +10,6 @@ table_sixteen=
    \texid      "\input lilyponddefs \musixsixteendefs"
    % index TeXstring,  xmin xmax ymin ymax
 
-
-       %{ 
-       "back" "\backorfront"           0.0\pt  6.0\pt  0.0\pt  3.0\pt
-       "-front" "\backorfront"         0.0\pt  6.0\pt  0.0\pt  3.0\pt
-       "heel" "\heel"                  0.0\pt  6.0\pt  -1.0\pt 5.0\pt
-       "toe" "\\toe"                   0.0\pt  6.0\pt  -1.0\pt 5.0\pt
-       "bheel" "\bheel"                        0.0\pt  6.0\pt  -1.0\pt 5.0\pt
-       "btoe" "\btoe"                  0.0\pt  6.0\pt  -1.0\pt 5.0\pt
-       "fheel" "\fheel"                        0.0\pt  6.0\pt  -1.0\pt 5.0\pt
-       "ftoe" "\ftoe"                  0.0\pt  6.0\pt  -1.0\pt 5.0\pt
-       "-back" "\backorfront"          0.0\pt  6.0\pt  0.0\pt  3.0\pt
-       "front" "\backorfront"          0.0\pt  6.0\pt  0.0\pt  3.0\pt
-       "turn"  "\\turn"                        -2.0\pt 7.0\pt  0.0\pt  4.0\pt
-       %}
-
      "style" = \table {
                "roman" "\settext{%}"   0.0\pt  7.50\pt 0.0\pt  8.0\pt
                "italic"        "\setitalic{%}" 0.0\pt  0.0\pt  0.0\pt  8.0\pt
@@ -51,27 +36,11 @@ table_sixteen=
                "1"     "\rightalign{%}"
        }
 
-     "clefs" = \table {
-       "violin"        "\violinclef"           0.0\pt  12.8\pt -10.0\pt        18.0\pt
-       "bass"  "\bassclef"             -1.0\pt 12.8\pt 0.0\pt  16.0\pt
-       "alto"  "\altoclef"             0.0\pt  12.8\pt 0.0\pt  16.0\pt
-       "tenor" "\altoclef"             0.0\pt  12.8\pt 0.0\pt  16.0\pt
-       "violin_change" "\cviolinclef"  0.0\pt  11.2\pt -12.0\pt        12.0\pt
-       "bass_change"   "\cbassclef"    0.0\pt  11.2\pt 0.0\pt  16.0\pt
-       "alto_change"   "\caltoclef"    0.0\pt  11.2\pt 0.0\pt  16.0\pt
-       "tenor_change"  "\caltoclef"    0.0\pt  11.2\pt 0.0\pt  16.0\pt
-     }
-
      "slur" = \table {
        "whole" "\slurchar%{%}"
        "half"  "\hslurchar%{%}"
      }
 
-     "streepjes" = \table {
-       "toplines"      "\\topledgerlines{%}{%}"        -1.0\pt 7.0\pt  0.0\pt  0.0\pt
-       "botlines"      "\\botledgerlines{%}{%}"        -1.0\pt 7.0\pt  0.0\pt  0.0\pt
-     }
-
      "bars" = \table {
        "empty" "\emptybar"
        ""      ""                      0.0\pt  0.0\pt  0.0\pt  16.0\pt
@@ -94,7 +63,6 @@ table_sixteen=
      "param" = \table {
        "brace" "\pianobrace{%}"        0.0\pt  0.0\pt  0.0\pt  0.0\pt
        "meter" "\generalmeter{%}{%}"   0.0\pt  10.0\pt -8.0\pt 8.0\pt
-       "linestaf"      "\linestafsym{%}{%}"
        "stem"  "\stem{%}{%}"
        "fill"  "\hbox{}"
        % ugh. 8pt
@@ -107,6 +75,6 @@ table_sixteen=
        "slope"         "\beamslope{%}{%}"  2.0\pt 64.0\pt 0.0\pt 0.0\pt
        "horizontal"    "\rulesym{%}{%}"        
      }
-     \include "font-en-tja16.ly"
+     \include "feta16.ly"
 }
 

diff --git a/init/table20.ly b/init/table20.ly
index 305b2c35724cdc16900f5f69366f9761c71a8c68..abe4eadecbd731ed8b4a21a7a943bb0bf9bc6b23 100644 (file)
--- a/init/table20.ly
+++ b/init/table20.ly
@@ -16,6 +16,7 @@ table_twenty =
                "italic"        "\setitalic{%}" 0.0\pt  0.0\pt  0.0\pt  8.0\pt
                "dynamic"       "\setdynamic{%}"        0.0\pt  0.0\pt  0.0\pt  8.0\pt
      }
+
      "dynamics" = \table {
 
        "mf" "\dynmf"
@@ -38,17 +39,6 @@ table_twenty =
        }
 
 
-    "clefs" = \table {
-       "violin"        "\violinclef"   0.0\pt  16.0\pt -12.5\pt        22.5\pt
-       "bass"  "\bassclef"             0.0\pt  16.0\pt 0.0\pt  20.0\pt
-       "alto"  "\altoclef"             0.0\pt  16.0\pt 0.0\pt  20.0\pt
-       "tenor" "\altoclef"             0.0\pt  16.0\pt 0.0\pt  20.0\pt
-       "violin_change" "\cviolinclef"  0.0\pt  16.0\pt -12.5\pt        22.5\pt
-       "bass_change"   "\cbassclef"    0.0\pt  16.0\pt 0.0\pt  20.0\pt
-       "alto_change"   "\caltoclef"    0.0\pt  16.0\pt 0.0\pt  20.0\pt
-       "tenor_change"  "\caltoclef"    0.0\pt  16.0\pt 0.0\pt  20.0\pt
-    }
-
 
     "slur" = \table {
        "whole" "\slurchar%{%}" 0.0\pt  0.0\pt  0.0\pt  0.0\pt
@@ -56,11 +46,6 @@ table_twenty =
     }
 
 
-    "streepjes" = \table {
-       "toplines"      "\\topledgerlines{%}{%}"        -3.0\pt 9.0\pt  0.0\pt  0.0\pt
-       "botlines"      "\botledgerlines{%}{%}" -3.0\pt 9.0\pt  0.0\pt  0.0\pt
-    }
-
     "bars" = \table {
        "empty" "\emptybar"
        ""      ""                      0.0\pt  0.0\pt  0.0\pt  16.0\pt
@@ -82,7 +67,6 @@ table_twenty =
     "param" = \table {
         "brace"    "\pianobrace{%}"    0.0\pt  0.0\pt  0.0\pt  0.0\pt
         "meter"        "\generalmeter{%}{%}"   0.0\pt  10.0\pt -5.0\pt 5.0\pt
-        "linestaf"     "\linestafsym{%}{%}"
         "stem" "\stem{%}{%}"
         "fill" "\hbox{}"
        % ugh. 8\pt
@@ -96,6 +80,6 @@ table_twenty =
      }
      
     % ugh what's our outdir called?
-    \include "font-en-tja20.ly"
+    \include "feta20.ly"
 }
 

diff --git a/input/font.ly b/input/font.ly
index 76e2a8e5bf5f44058416e7d992edae1a4ac52099..4a5c7a399818bbf80d278f118716146d5dd317d3 100644 (file)
--- a/input/font.ly
+++ b/input/font.ly
@@ -15,7 +15,7 @@ TestedFeatures =       "This file tests the Feta music-font"
                \multi 2  < { \stemup e'\longa a\breve | }
                { \stemdown
                c1 \clef "bass"; ''b \clef "violin"; c' a'
-               c2 g c' a'
+               c2 \clef "alto"; g c' \clef "violin"; a'
                } >
                \stemboth
                c4 g c' a' \bar ":|";

diff --git a/lily/VERSION b/lily/VERSION
index 24d753660d02161d8f979afea819a415e1b61bec..83291dceb34c44440a8327b50a723a391b845c0e 100644 (file)
--- a/lily/VERSION
+++ b/lily/VERSION
@@ -1,4 +1,4 @@
 MAJOR_VERSION = 0
 MINOR_VERSION = 1
-PATCH_LEVEL = 31
+PATCH_LEVEL = 32
 MY_PATCH_LEVEL =

diff --git a/lily/clef-grav.cc b/lily/clef-grav.cc
index cf63067597abd683419ce7e2ada64c33cf8c4dc8..78f6aab7bd2dd24bf65c9deaf0d40bd219a272b7 100644 (file)
--- a/lily/clef-grav.cc
+++ b/lily/clef-grav.cc
@@ -1,5 +1,5 @@
 /*
-  clef.cc -- implement  Clef_engraver
+  clef.cc -- implement Clef_engraver
 
   source file of the GNU LilyPond music typesetter
 
@@ -60,10 +60,17 @@ Clef_engraver::read_req (Clef_change_req*c_l)
   if (!set_type (c_l->clef_str_))
     c_l->error (_("unknown clef type "));
 }
+
+
+/** 
+  Generate a clef at the start of a measure. (when you see a Bar,
+  ie. a breakpoint) 
+  */
 void
 Clef_engraver::acknowledge_element (Score_elem_info info)
 {
-  if (info.elem_l_->name() == Bar::static_name () && clef_type_str_.length_i())
+  if (info.elem_l_->is_type_b (Bar::static_name ()) 
+      && clef_type_str_.length_i())
     {
       create_clef();
       if (!clef_req_l_)

diff --git a/lily/dynamic-grav.cc b/lily/dynamic-grav.cc
index d4b9544e3a5282b8a51c4e9b0c83254fe8942504..62dec7ba99e8b7a91f224ef8aade51464d2eeed8 100644 (file)
--- a/lily/dynamic-grav.cc
+++ b/lily/dynamic-grav.cc
@@ -150,7 +150,7 @@ Dynamic_engraver::do_removal_processing ()
 void
 Dynamic_engraver::acknowledge_element (Score_elem_info i)
 {
-  if (i.elem_l_->name() == Note_column::static_name ())
+  if (i.elem_l_->is_type_b (Note_column::static_name ()))
     {
       if (dynamic_p_) dynamic_p_->add_support (i.elem_l_);
       if (to_end_cresc_p_)

diff --git a/lily/key-grav.cc b/lily/key-grav.cc
index f8d47a0830923b2c7a33af978507d51d3a3c73f8..3abc16b6730e942f3ddda593c573de89800e7743 100644 (file)
--- a/lily/key-grav.cc
+++ b/lily/key-grav.cc
@@ -63,7 +63,7 @@ Key_engraver::acknowledge_element (Score_elem_info info)
     {
        create_key();
     }
-  else if (info.elem_l_->name() == Bar::static_name ()) 
+  else if (info.elem_l_->is_type_b (Bar::static_name ())) 
     {
        if (!keyreq_l_)
            default_key_b_ = true;

diff --git a/lily/local-key-grav.cc b/lily/local-key-grav.cc
index ab566e121673af972ff7ea6d7199a64c0e719ff8..7201acf173020b1664d7e2f14ceb3d23a5f5e0bd 100644 (file)
--- a/lily/local-key-grav.cc
+++ b/lily/local-key-grav.cc
@@ -95,13 +95,13 @@ Local_key_engraver::acknowledge_element (Score_elem_info info)
       key_C_ = &key_grav_l->key_;
       local_key_ = *key_C_;
     }
-  else if (elem_l->name() == Key_item::static_name ()) 
+  else if (elem_l->is_type_b (Key_item::static_name ())) 
     {
       Key_engraver * key_grav_l =
        (Key_engraver*)info.origin_grav_l_arr_[0];
       key_C_ = &key_grav_l->key_;
     }
-  else if (elem_l->name() == Tie::static_name ()) 
+  else if (elem_l->is_type_b (Tie::static_name ())) 
     {
       Tie * tie_l = (Tie*)elem_l->spanner();
       if (tie_l->same_pitch_b_)

diff --git a/lily/rest-collision-grav.cc b/lily/rest-collision-grav.cc
index 4aa0607aca38811ad2f24ab4935904fd1c117325..119adcf2b7495182bc0cb8485605f9f6f8139a31 100644 (file)
--- a/lily/rest-collision-grav.cc
+++ b/lily/rest-collision-grav.cc
@@ -24,7 +24,7 @@ Rest_collision_engraver::Rest_collision_engraver()
 void
 Rest_collision_engraver::acknowledge_element (Score_elem_info i)
 {
-  if (i.elem_l_->name()== Note_column::static_name()) 
+  if (i.elem_l_->is_type_b (Note_column::static_name())) 
     {
       // what should i do, what should _engraver do?
       if (!rest_collision_p_) 

diff --git a/lily/score-align-gravs.cc b/lily/score-align-gravs.cc
index 4745a44191d606aee2fdf2f42b8984e1e03cee87..28bb70bcc81473a935fe7a76464fc0f6e6c2c673 100644 (file)
--- a/lily/score-align-gravs.cc
+++ b/lily/score-align-gravs.cc
@@ -30,6 +30,6 @@ IMPLEMENT_IS_TYPE_B1(C ## _align_engraver, Type_align_engraver)       ;
 
 IMPLEMENT_ALIGN_GRAV(Key,Key_item,3);
 IMPLEMENT_ALIGN_GRAV(Clef,Clef_item,2);
-IMPLEMENT_ALIGN_GRAV(Meter,Meter,4);
-IMPLEMENT_ALIGN_GRAV(Normal_bar, Normal_bar,5);
+IMPLEMENT_ALIGN_GRAV(Normal_bar, Normal_bar,4);
+IMPLEMENT_ALIGN_GRAV(Meter,Meter,5);
 IMPLEMENT_ALIGN_GRAV(Score_bar, Score_bar,0);

diff --git a/lily/slur-grav.cc b/lily/slur-grav.cc
index 83da2c3166851ec29bafe0a13ae8b79ea5fa41f8..25b53201be42813825843f9a71776d96f4aa3ffb 100644 (file)
--- a/lily/slur-grav.cc
+++ b/lily/slur-grav.cc
@@ -26,7 +26,7 @@ Slur_engraver::do_try_request (Request *req_l)
 void
 Slur_engraver::acknowledge_element (Score_elem_info info)
 {
-  if (info.elem_l_->name() == Note_column::static_name ())
+  if (info.elem_l_->is_type_b (Note_column::static_name ()))
     {
       Note_column *col_l =(Note_column*) info.elem_l_->item() ;// ugh
       for (int i = 0; i < slur_l_stack_.size(); i++)

diff --git a/lily/stem.cc b/lily/stem.cc
index f72d3068ef17438c945790b3a01232d5fb7bad52..814eb6af83f0126b1584bb2f4d3661ac14d324a1 100644 (file)
--- a/lily/stem.cc
+++ b/lily/stem.cc
@@ -28,7 +28,7 @@ Stem::Stem ()
 {
   /*
     TODO: staff-size
-   */
+    */
   abbrev_flag_i_ = 0;
   beam_l_ = 0;
   beams_left_i_ = 0;
@@ -190,10 +190,7 @@ Stem::set_default_extents ()
   if (!stem_length_f ())
     set_default_stemlen ();
 
-  /*  set_stemend ((dir_< 0) ?
-              head_positions()[BIGGER]-stem_length_f (): 
-              head_positions()[SMALLER] + stem_length_f ());
-              */
+
   if (dir_ == UP)
     stem_xdir_ = RIGHT;
   if (invisible_b ())
@@ -289,6 +286,7 @@ Stem::abbrev_mol () const
   Molecule beams;
   Atom a (paper ()->lookup_l ()->beam (slope, w));
   a.translate (Offset(- w / 2, stem_end_f () - (w / 2 * slope)));
+  
   // ugh
   if (!beams_i)
     a.translate_axis (dy + beamdy - dir_ * dy, Y_AXIS);
@@ -305,7 +303,7 @@ Stem::abbrev_mol () const
   return beams;
 }
 
-const Real ANGLE = 20* (2.0*M_PI/360.0);
+const Real ANGLE = 20* (2.0*M_PI/360.0); // ugh!
 
 Molecule*
 Stem::brew_molecule_p () const

diff --git a/lily/symtable.cc b/lily/symtable.cc
index 16c48dfb5f7d95ca0cbb116c215a4ee373db3d7d..d247fa649473b75a63dc8c69d8a9762369ea8b21 100644 (file)
--- a/lily/symtable.cc
+++ b/lily/symtable.cc
@@ -53,7 +53,10 @@ Symtables::operator()(String s)
 {
   if (!elt_b (s))
     {
-      warning ("Symtables `" + s + _("\' unknown"));
+      error ("Symtable `" + s + _("\' unknown"));
+      /* 
+        We can't return, because we'll dump core anyway.
+       */
       return 0;
     }
   else

diff --git a/lily/tie-grav.cc b/lily/tie-grav.cc
index ac7f776b50b518ea6a4ed63c0d92e748d501c182..c3ea8c1e363a716ded4c4bbe69b463223555f532 100644 (file)
--- a/lily/tie-grav.cc
+++ b/lily/tie-grav.cc
@@ -72,7 +72,7 @@ Tie_engraver::do_process_requests()
 void
 Tie_engraver::acknowledge_element (Score_elem_info i)
 {
-  if (i.elem_l_->name() == Note_head::static_name ())
+  if (i.elem_l_->is_type_b (Note_head::static_name ()))
     {
       if (tie_p_)
        {

diff --git a/lily/timing-translator.cc b/lily/timing-translator.cc
index 44a61739f37a8320346af15fd6966265b4b7b99d..c7e4e0303230c1de699b988f95b063e904b182a4 100644 (file)
--- a/lily/timing-translator.cc
+++ b/lily/timing-translator.cc
@@ -12,7 +12,7 @@
 #include "translator-group.hh"
 #include "global-translator.hh"
 
-Timing_translator::Timing_translator()
+Timing_translator::Timing_translator ()
 {
   default_grouping_ = Rhythmic_grouping (MInterval (0,4),4); // ugh
 }

diff --git a/make/Targets.make b/make/Targets.make
index aeb43521ac99cf259cbb1e0e904416eb9258b4f8..4ea4098ba5fa0dcd1e0e3d6343a899720df13ed1 100644 (file)
--- a/make/Targets.make
+++ b/make/Targets.make
@@ -243,6 +243,10 @@ rpm: check-rpm-doc-deps
 check-rpm-doc-deps: 
        $(MAKE) -C $(depth)/Documentation gifs
 
+check-mf-deps:
+       $(MAKE) -C $(depth)/mf
+
+
 
 installexe:
        $(INSTALL) -d $(bindir)

diff --git a/make/Toplevel.make.in b/make/Toplevel.make.in
index 769b19fda0bfd122744370ff6cebb20d1d261799..9493966c26913eee2040c52640cced2c4457a72b 100644 (file)
--- a/make/Toplevel.make.in
+++ b/make/Toplevel.make.in
@@ -51,10 +51,11 @@ include ./$(depth)/make/Rules.make
 
 localdist: configure
 
-INSTALL.text: check-doc-deps
+INSTALL.text: check-doc-deps check-mf-deps
        rm -f INSTALL.text
        ln `$(FIND) ./ -name INSTALL.text|head -1` .
 
+
 # all machine generated junk resides in out/
 distclean: 
        set -e; for i in `find -type d -name 'out'`; do \

diff --git a/make/lelievijver.lsm b/make/lelievijver.lsm
index 76ce89a784b15bf6b9839d3bbd97404721c0ea21..0299de5e37285a67cfe4e836a19efa12f9a5a4e3 100644 (file)
--- a/make/lelievijver.lsm
+++ b/make/lelievijver.lsm
@@ -1,7 +1,7 @@
 Begin3
 Titel: LilyPond
-Versie: 0.1.31
-Inschrijf datum: 18NOV97
+Versie: 0.1.32
+Inschrijf datum: 19NOV97
 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: 
@@ -16,8 +16,8 @@ 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.31.tar.gz 
+       395k lilypond-0.1.32.tar.gz 
 Oorspronkelijke plek: pcnov095.win.tue.nl /pub/lilypond/
-       395k lilypond-0.1.31.tar.gz 
+       395k lilypond-0.1.32.tar.gz 
 Copi"eer politie: GPL
 End

diff --git a/make/lilypond.lsm b/make/lilypond.lsm
index d46f62129edf74700e52d9336594aa455b108c5a..544298520504a0d98949060d21881b31bffb73b0 100644 (file)
--- a/make/lilypond.lsm
+++ b/make/lilypond.lsm
@@ -1,7 +1,7 @@
 Begin3
 Title: LilyPond
-Version: 0.1.31
-Entered-date: 18NOV97
+Version: 0.1.32
+Entered-date: 19NOV97
 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 
@@ -14,8 +14,8 @@ Author: hanwen@stack.nl (Han-Wen Nienhuys)
        jan@digicash.com (Jan Nieuwenhuizen)
 Maintained-by: hanwen@stack.nl (Han-Wen Nienhuys)
 Primary-site: sunsite.unc.edu /pub/Linux/apps/sound/convert
-       440k lilypond-0.1.31.tar.gz 
+       440k lilypond-0.1.32.tar.gz 
 Original-site: pcnov095.win.tue.nl /pub/lilypond/development/
-       440k lilypond-0.1.31.tar.gz 
+       440k lilypond-0.1.32.tar.gz 
 Copying-policy: GPL
 End

diff --git a/make/lilypond.spec b/make/lilypond.spec
index d95261c1f782ff355c5c3ae83641104cbb6b1d0a..071343255001e77a66f356a0783bb7fa14976e66 100644 (file)
--- a/make/lilypond.spec
+++ b/make/lilypond.spec
@@ -1,9 +1,9 @@
 Name: lilypond
-Version: 0.1.31
+Version: 0.1.32
 Release: 1
 Copyright: GPL
 Group: Applications/Publishing
-Source0: alpha.gnu.org:/gnu/lilypond/development/lilypond-0.1.31.tar.gz
+Source0: alpha.gnu.org:/gnu/lilypond/development/lilypond-0.1.32.tar.gz
 Summary: A program for typesetting music.
 URL: http://www.stack.nl/~hanwen/lilypond
 Packager: Han-Wen Nienhuys <hanwen@stack.nl>

diff --git a/mf/TODO b/mf/TODO
index 8269df3241c26cf4c24e22094c016be4cf21313d..c94d227b8648c5892c819b8e23ab19bddea51137 100644 (file)
--- a/mf/TODO
+++ b/mf/TODO
@@ -1,5 +1,6 @@
 
        - design macro for penstroke with rounded endings
+       - design decent macro for bulbed endings
        - y-refpoint for rests should be the 4th staffline (gclef: b')
        - versioning    
        - lo-res fixes.

diff --git a/mf/feta-banier.mf b/mf/feta-banier.mf
index 46cb11b300268bc0db143c5770b169dca2e56055..b4b41e9e40e975b1d536c9679325d092dc7c9c5a 100644 (file)
--- a/mf/feta-banier.mf
+++ b/mf/feta-banier.mf
@@ -15,9 +15,10 @@ downflag_width# = .833 black_notehead_width# + stemthickness#/2;
 % so they have less slant.
 
 %
-% Because of optical illusion, the utmost flag 
-% (bottom for down-pointing, top  
-% for up-pointing) should be smaller than the other flags 
+% Because of optical illusion, the utmost flag (bottom for
+% down-pointing, top for up-pointing) should be smaller than the other
+% flags.  Adobe Sonata doesn't do this correctly.  (Instead they have an 
+% extension flag. Yuck)
 %
 
 save hip_thickness, foot_thickness;
@@ -29,7 +30,6 @@ foot_thickness# =  hip_thickness#;
 % for example, see POSTSCRIPT Language -- program design, 
 % page 119, and [Wanske], p 41,42
 %
-
 def draw_flag(expr center, flare, 
        dims, hip_depth, foot_wid, hip_thickness, foot_thickness)=
        clearxy;

diff --git a/mf/feta-beams16.mf b/mf/feta-beams16.mf
index 75d3675ba7608040f0c736997902b38be0bacb8a..62eff2731584be0658c440b2beec62e46fe69bcf 100644 (file)
--- a/mf/feta-beams16.mf
+++ b/mf/feta-beams16.mf
@@ -8,6 +8,6 @@ font_size 16;
 mode_setup;
 
 staffsize#:=16pt#;
-input wat-zie-ik;
+input feta-watzieik;
 end.
 

diff --git a/mf/feta-beams20.mf b/mf/feta-beams20.mf
index d40314017937d1e90826d810be84a57e7b449b95..0340e3e057b5fb100cf540746c6006c45f76601f 100644 (file)
--- a/mf/feta-beams20.mf
+++ b/mf/feta-beams20.mf
@@ -10,5 +10,5 @@ mode_setup;
 
 staffsize#:=20pt#;
 
-input wat-zie-ik;
+input feta-watzieik;
 end.

diff --git a/mf/feta-klef.mf b/mf/feta-klef.mf
index b168f4477391f5f83d56954fc713d330213ca96d..3ac2ba1b77d34809b4141b69c6c74596e69ff313 100644 (file)
--- a/mf/feta-klef.mf
+++ b/mf/feta-klef.mf
@@ -6,7 +6,7 @@
 % (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>,
 % Jan Nieuwenhuizen <jan@digicash.com>
 
-fet_begingroup("klef");
+fet_begingroup("clefs");
 
 def draw_staff(expr first, last)=
        pickup pencircle scaled stafflinethickness;
@@ -158,7 +158,6 @@ fet_endchar;
 % FIXME bulb should curve (see bass clef)
 % FIXME start (inside) should be little thinner
 % FIXME parametrise.
-% FIXME should be a bit more upright
 %
 
 % Beste lezers, kijk,
@@ -185,20 +184,20 @@ def draw_gclef (expr exact_center, reduction)=
        downstroke_dir = (14, -75);
        breapth_factor = 11/7;
        inner_thick_end = 45;
-       inner_start_angle = angle(-1,-2);
+       inner_start_angle = downstroke_angle - 43;
        thickness = .4 reduced_il - hair;
 
        thinnib = thinness - hair;
        thinpen = thinness;
-       set_char_box(-xpart exact_center + breapth_factor* reduced_il#, 
+       set_char_box(-xpart exact_center + 1.1 * breapth_factor* reduced_il#, 
                xpart exact_center + .66 breapth_factor* reduced_il#,
                -ypart exact_center + 3 * reduced_il#,
                ypart exact_center + 5 * reduced_il#);
        
        pickup pencircle scaled hair;
-
        downstroke_angle = angle downstroke_dir;
-       z1 = center + whatever * dir inner_start_angle;
+
+       z1 = center + whatever * dir (inner_start_angle);
        x1 = xpart center -.28 reduced_il;
        
        top z2r = center + (0,reduced_il + stafflinethickness/2);
@@ -280,10 +279,10 @@ fet_beginchar("G clef", "violin", "violinclef")
        if test = 1:
                draw_staff(-1,3);
        fi;
-       draw_gclef((1.6 interline#,0), 1.0);
+       draw_gclef((1.7 interline#,0), 1.0);
 fet_endchar;
 fet_beginchar("G clef", "violin_change", "cviolinclef")
        draw_gclef((1.3 interline#,0), .8);
 fet_endchar;
 
-fet_endgroup("klef");
+fet_endgroup("clefs");

diff --git a/mf/feta-watzieik.mf b/mf/feta-watzieik.mf
new file mode 100644 (file)
index 0000000..8bcdf19
--- /dev/null
+++ b/mf/feta-watzieik.mf
@@ -0,0 +1,29 @@
+% wat-zie-ik.mf
+% part of LilyPond's pretty-but-neat music font
+% beams: plat en steil
+
+input feta-params;
+
+beamheight#:=0.48interline#;
+
+define_pixels(beamheight);
+
+pen beam_pen;
+beam_pen:=penrazor scaled beamheight rotated 90;
+
+ELEM_TAN:=0.05;
+SLOPES:=20;
+LENGTHS:=6;
+ELEM_FACTOR := 2;
+ELEM_INITIAL_LEN:=2;
+
+for i := -SLOPES upto SLOPES:
+       width:= ELEM_INITIAL_LEN;
+       for j:=1 upto LENGTHS:
+               beginchar(128 + i * LENGTHS + j -1 ,width,0,0);
+                       pickup beam_pen;
+                       draw origin--(lft w,w*i*ELEM_TAN);
+                       endchar;
+               width:=ELEM_FACTOR *width;
+               endfor;
+       endfor;

diff --git a/mf/feta20.mf b/mf/feta20.mf
index b45af8ed3443ab71a24e1e4acbeb2adab48ef943..5364504155adcdb4a9fe66b53b73677b04447fe7 100644 (file)
--- a/mf/feta20.mf
+++ b/mf/feta20.mf
@@ -6,6 +6,7 @@ staffsize#:=20pt#;
 input autometric;
 fet_beginfont("feta", 20);
 
+% AFBLIJVEN! Gebruik feta-test16/20, anders verneuk je de distributie.
 test := 0;
 
 input feta-generic;

diff --git a/mf/wat-zie-ik.mf b/mf/wat-zie-ik.mf
deleted file mode 100644 (file)
index 8bcdf19..0000000
--- a/mf/wat-zie-ik.mf
+++ /dev/null
@@ -1,29 +0,0 @@
-% wat-zie-ik.mf
-% part of LilyPond's pretty-but-neat music font
-% beams: plat en steil
-
-input feta-params;
-
-beamheight#:=0.48interline#;
-
-define_pixels(beamheight);
-
-pen beam_pen;
-beam_pen:=penrazor scaled beamheight rotated 90;
-
-ELEM_TAN:=0.05;
-SLOPES:=20;
-LENGTHS:=6;
-ELEM_FACTOR := 2;
-ELEM_INITIAL_LEN:=2;
-
-for i := -SLOPES upto SLOPES:
-       width:= ELEM_INITIAL_LEN;
-       for j:=1 upto LENGTHS:
-               beginchar(128 + i * LENGTHS + j -1 ,width,0,0);
-                       pickup beam_pen;
-                       draw origin--(lft w,w*i*ELEM_TAN);
-                       endchar;
-               width:=ELEM_FACTOR *width;
-               endfor;
-       endfor;

diff --git a/tex/feta16.tex b/tex/feta16.tex
index 038711bf04bfd95ef8048057e455f48a641a2c1c..a575ac9a45bd11e49ca24b9f04403199cc811316 100644 (file)
--- a/tex/feta16.tex
+++ b/tex/feta16.tex
@@ -1,5 +1,5 @@
 % generated automatically by mf-to-table.py version 0.4
-% on Tue Nov 18 23:42:04 1997
+% on Wed Nov 19 11:44:45 1997
 % Do not edit
 % input from out/feta16.log
 % name
@@ -67,7 +67,7 @@
 \fetdef\dthirtysecondflag{50}
 \fetdef\dsixtyfourthflag{51}
 
-% klef
+% clefs
 \fetdef\altoclef{52}
 \fetdef\caltoclef{53}
 \fetdef\bassclef{54}

diff --git a/tex/feta20.tex b/tex/feta20.tex
index db65be50e8a5a6bd59fe2b936f393fa85f29f94e..d5b64756dfffa070ea5edeba175104d2552ae9f5 100644 (file)
--- a/tex/feta20.tex
+++ b/tex/feta20.tex
@@ -1,5 +1,5 @@
 % generated automatically by mf-to-table.py version 0.4
-% on Tue Nov 18 23:42:28 1997
+% on Wed Nov 19 11:44:54 1997
 % Do not edit
 % input from out/feta20.log
 % name
@@ -67,7 +67,7 @@
 \fetdef\dthirtysecondflag{50}
 \fetdef\dsixtyfourthflag{51}
 
-% klef
+% clefs
 \fetdef\altoclef{52}
 \fetdef\caltoclef{53}
 \fetdef\bassclef{54}