From f6d39d5ac42b2fd79d2204a8c0d753faf9096cce Mon Sep 17 00:00:00 2001 From: fred Date: Sun, 24 Mar 2002 20:01:27 +0000 Subject: [PATCH] lilypond-0.1.28 --- BUGS | 1 + README | 7 ++- init/feta16.ly | 4 +- input/gallina.tex | 2 +- lily/VERSION | 2 +- tex/fetdefs.tex | 108 ++++++++++++++++++++++++++++++---------------- 6 files changed, 81 insertions(+), 43 deletions(-) diff --git a/BUGS b/BUGS index 80cf443194..3f88eb3e38 100644 --- a/BUGS +++ b/BUGS @@ -30,6 +30,7 @@ in hints what might be wrong. This problem has only been identified with libc-5.3 and libc-5.4 platforms, so you might try upgrading to 6.0, ie. GNU libc-2. + [Linux Intel] A problem resembling the previous: usage of libg++.2.8.x with the diff --git a/README b/README index 4a359b0efd..1f3b542c66 100644 --- a/README +++ b/README @@ -66,5 +66,10 @@ The website also contains the complete documentation 7. CAVEATS -Please read the file BUGS for some ugly bugs. This especially applies +* Please read the file BUGS for some ugly bugs. This especially applies Linux-Intel unix users. + +* If you have installed a previous version, be sure to remove old font +files, eg + + rm `find /var/lib/texmf/fonts -name 'feta*'` diff --git a/init/feta16.ly b/init/feta16.ly index d6b1849499..14ac847ee3 100644 --- a/init/feta16.ly +++ b/init/feta16.ly @@ -1,5 +1,5 @@ % generated automatically by mf-to-table.py version 0.4 -% on Wed Oct 29 09:54:00 1997 +% on Wed Oct 29 16:41:31 1997 % Do not edit % input from out/feta16.log % name=\symboltables { @@ -35,7 +35,7 @@ "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 + "2l" "\\quartledger" 0.\pt 0.\pt -0.40\pt 0.40\pt } "scripts" = \table { "ufermata" "\\ufermata" -5.30\pt 5.30\pt -0.30\pt 5.80\pt diff --git a/input/gallina.tex b/input/gallina.tex index 5edf749d49..01d95b9f79 100644 --- a/input/gallina.tex +++ b/input/gallina.tex @@ -18,7 +18,7 @@ \composer{Tarquinio Merula (1594/95-1665)} %\instrument{M\"a\ss ig} % heu %#%\tempo{M\"a\ss ig} -\maketit +\makelilytitle \input{gallina.out} diff --git a/lily/VERSION b/lily/VERSION index c445970c56..85bbfcd535 100644 --- a/lily/VERSION +++ b/lily/VERSION @@ -1,4 +1,4 @@ MAJOR_VERSION = 0 MINOR_VERSION = 1 -PATCH_LEVEL = 27 +PATCH_LEVEL = 28 MY_PATCH_LEVEL = diff --git a/tex/fetdefs.tex b/tex/fetdefs.tex index 854441bb68..66c37178e3 100644 --- a/tex/fetdefs.tex +++ b/tex/fetdefs.tex @@ -11,12 +11,9 @@ \font\vetfont=feta-beams20 \font\fetanummer=feta-nummer10 } - -% \def\fetdef#1#2{\def#1{\fetchar{#2}}} -% ugh, linewidth, ugh, tablexx.ly balldims not used! -\def\fetdef#1#2{% +\def\fetdef#1#2{\def#1{% % what the fuck is this? - \def#1{\lower.3884\staffrulethickness + %\lower.3884\staffrulethickness \hbox{\fetchar{#2}}}} \def\fetchar#1{\fontentja\char#1} @@ -44,7 +41,6 @@ \openin\checkexists #1 \ifeof\checkexists \closein\checkexists - \relax \else \closein\checkexists \input #1 @@ -60,40 +56,72 @@ \immediate\closeout\embedfile } \def\turnOnExperimentalFeatures{ -% -% yeah. By far not finished yet. -% Don't do this by default. gs takes a long time to start in xdvi -% -\special{ps: /drawslur { - currentpoint /texoriginy exch def - /texoriginx exch def + +% draw a slur in embedded postscript +\special{ps: +/xbow 1 3 div def +/ybow 1 4 div def +/thin 0.2 def +/thick thin 5 mul def +/draw_slur { + % up or down? /dir exch def - /lift 30 def - /desty exch def - /destx exch def - /slurfactor .4 def - destx slurfactor mul - texoriginx add - desty slurfactor mul - texoriginy add - lift dir mul add - destx 1 slurfactor sub mul - texoriginx add - desty 1 slurfactor sub mul - texoriginy add - lift dir mul add - destx - texoriginx add - desty - texoriginy add - curveto - stroke -} def -} +% +% for mo*tex shift +% exch +% 1 copy /dx exch def +% exch +% + % calc angle alpha + 2 copy exch atan /alpha exch def + % calc len(gth) + 2 exp exch 2 exp add sqrt /len exch def +% + % add and calc z2, z3 + len xbow mul + len ybow mul dir mul + 1 xbow sub len mul + len ybow mul dir mul +% + % add z4, z1 + len 0 + 0 0 +% + % add and calc z5..z8 + 8 copy + thin dir mul sub + 8 2 roll + thin dir mul sub + 8 2 roll + thick dir mul sub + 8 2 roll + thick dir mul sub +% + % reverse order, must be cycle + 8 6 roll + 6 2 roll + 4 2 roll + 8 6 roll +% + % set z1..z4 + 16 8 roll +% + alpha rotate +% silly mo*tex convention +% dx 2 div -1 mul 0 translate + % draw z1..z4 + moveto curveto + % draw z5..z8 + lineto curveto + % cycle + 0 0 lineto + fill +} def } } +\def\embeddedtex#1{#1} \def\embeddedps#1{ - \special{ps: #1} + \special{ps: @beginspecial @setspecial #1 @endspecial} } \def\embeddedmf#1{ \edef\embedid{feta-sleur-\number\embedcount} @@ -102,13 +130,17 @@ \immediate\write\embedfile{#1} \immediate\closeout\embedfile \font\expandafter\embedid\expandafter=\embedid - \hbox{\embedid\char0} + \embedid\char0 } +\def\notex{\def\embeddedtex##1{}} \def\nopostscript{\def\embeddedps##1{}} \def\nometafont{\def\embeddedmf##1{}} -\nometafont +% dat heb je handig gedaan, lieverd! +%\nometafont +\nopostscript +\notex \def\EndLilyPondOutput{ \storeembedcount -- 2.39.5