Hi,
A few fixes to pl5.
Be sure to add $HOME/usr/src/lilypond/ps (or wherever) to $TEXINPUTS.
Have fun,
Jan.
Jan Nieuwenhuizen <[EMAIL PROTECTED]> | GNU LilyPond - The music typesetter
http://www.xs4all.nl/~jantien | http://www.xs4all.nl/~jantien/lilypond
Generated by [EMAIL PROTECTED] using package-diff 0.62,
>From = lilypond-1.1.5, To = lilypond-1.1.5.jcn1
usage
cd lilypond-source-dir; patch -E -p1 < lilypond-1.1.5.jcn1.diff
Patches do not contain automatically generated files
or (urg) empty directories,
i.e., you should rerun autoconf, configure
and possibly make outdirs.
--state
1.1.5
1.1.5.jcn1
++state
diff -urN ../lilypond-1.1.5/NEWS ./NEWS
--- ../lilypond-1.1.5/NEWS Fri Nov 13 20:30:37 1998
+++ ./NEWS Fri Nov 13 21:03:34 1998
@@ -1,3 +1,10 @@
+pl5.jcn1
+ - tex/lily-ps-defs.tex fixes
+ - lily.ps
+
+********
+1.1.5
+
pl4.jcn4
- fixes; preludes, finger
diff -urN ../lilypond-1.1.5/VERSION ./VERSION
--- ../lilypond-1.1.5/VERSION Fri Nov 13 20:30:37 1998
+++ ./VERSION Fri Nov 13 21:01:21 1998
@@ -2,7 +2,7 @@
MAJOR_VERSION=1
MINOR_VERSION=1
PATCH_LEVEL=5
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=jcn1
# use the above to send patches: MY_PATCH_LEVEL is always empty for a
# released version.
diff -urN ../lilypond-1.1.5/buildscripts/set-lily.sh ./buildscripts/set-lily.sh
--- ../lilypond-1.1.5/buildscripts/set-lily.sh Tue Nov 10 16:46:06 1998
+++ ./buildscripts/set-lily.sh Fri Nov 13 21:02:24 1998
@@ -25,7 +25,7 @@
fi
LILYINCLUDE=$LILYPOND_SOURCEDIR/init:$LILYPOND_SOURCEDIR/input:$LILYPOND_SOURCEDIR/mf/out
MFINPUTS=$MFINPUTS:$LILYPOND_SOURCEDIR/mf
- TEXINPUTS=$TEXINPUTS:$LILYPOND_SOURCEDIR/mf/out
+
+TEXINPUTS=$TEXINPUTS:$LILYPOND_SOURCEDIR/mf/out:$LILYPOND_SOURCEDIR/ps:$LILYPOND_SOURCEDIR/tex
export LILYINCLUDE MFINPUTS TEXINPUTS
GS_LIB=$HOME/usr/src/lilypond/ps
GS_FONTPATH=$HOME/usr/src/lilypond/mf/out
@@ -34,7 +34,7 @@
cat <<EOF
LILYINCLUDE=$LILYPOND_SOURCEDIR/init:$LILYPOND_SOURCEDIR/mf/out
MFINPUTS=\$MFINPUTS:\$LILYPOND_SOURCEDIR/mf
- TEXINPUTS=\$TEXINPUTS:\$LILYPOND_SOURCEDIR/mf/out
+
+TEXINPUTS=$TEXINPUTS:$LILYPOND_SOURCEDIR/mf/out:$LILYPOND_SOURCEDIR/ps:$LILYPOND_SOURCEDIR/tex
export LILYINCLUDE MFINPUTS TEXINPUTS
EOF
diff -urN ../lilypond-1.1.5/ps/lily.ps ./ps/lily.ps
--- ../lilypond-1.1.5/ps/lily.ps Thu Jan 1 01:00:00 1970
+++ ./ps/lily.ps Fri Nov 13 20:56:48 1998
@@ -0,0 +1,184 @@
+%!PS-Adobe-1.0: lily.ps
+%
+%staffrulethickness /stafflinethickness exch def
+%
+% round cappings
+1 setlinecap
+%
+/draw_beam % width slope thick
+{
+ 2 div /beam_thick exch def
+ /beam_slope exch def
+ /beam_wd exch def
+ beam_slope beam_wd mul /beam_ht exch def
+ 0 beam_thick neg moveto
+ beam_wd beam_ht rlineto
+ 0 beam_thick 2 mul rlineto
+ 0 beam_thick lineto
+ closepath fill
+} bind def
+%
+/draw_decresc
+{
+ stafflinethickness setlinewidth
+ /cresc_cont exch def
+ /cresc_ht exch def
+ /cresc_wd exch def
+%
+ cresc_wd cresc_cont moveto
+ 0 cresc_ht lineto
+ stroke
+ cresc_wd cresc_cont neg moveto
+ 0 cresc_ht neg lineto
+ stroke
+} bind def
+%
+/draw_cresc
+{
+ stafflinethickness setlinewidth
+ /cresc_cont exch def
+ /cresc_ht exch def
+ /cresc_wd exch def
+%
+ 0 cresc_cont moveto
+ cresc_wd cresc_ht lineto
+ stroke
+ 0 cresc_cont neg moveto
+ cresc_wd cresc_ht neg lineto
+ stroke
+} bind def
+%
+/lily_distance
+{
+ 1 copy mul exch 1 copy mul add sqrt
+} bind def
+%
+stafflinethickness 1.2 mul /plet_t exch def
+/draw_plet
+{
+ plet_t setlinewidth
+% urg: the only Level-2 PS, check effect in print
+% true setstrokeadjust
+ 1 setlinecap
+ 1 setlinejoin
+ /dir exch def
+ /plet_dy exch def
+ /plet_dx exch def
+ staffheight 2 div /plet_gapx exch def
+ plet_dy plet_dx div plet_gapx mul /plet_gapy exch def
+ staffheight 4 div dir mul /plet_h exch def
+%
+ 0 0 moveto
+ 0 plet_h lineto
+ plet_dx plet_gapx sub 2 div
+ plet_dy plet_gapy sub 2 div plet_h add lineto
+ plet_dx plet_gapx add 2 div
+ plet_dy plet_gapy add 2 div plet_h add moveto
+ plet_dx plet_dy plet_h add lineto
+ plet_dx plet_dy lineto
+ stroke
+} bind def
+%
+/draw_slur
+{
+ stafflinethickness setlinewidth
+ moveto
+ curveto
+ lineto
+ curveto
+ gsave
+ fill
+ grestore
+ stroke
+} bind def
+%
+/draw_dashed_slur
+{
+ 1 setlinecap
+ 1 setlinejoin
+ setdash
+ setlinewidth
+ moveto
+ curveto
+ stroke
+} bind def
+%
+staffheight 4 div /interline exch def
+%
+/bracket_traject
+{
+ /traject_ds exch def
+ /traject_alpha exch def
+ traject_ds traject_alpha sin mul add
+ exch
+ traject_ds traject_alpha cos mul add
+ exch
+} bind def
+%
+interline 3 div /bracket_b exch def
+interline 2 mul /bracket_w exch def
+stafflinethickness 2 mul /bracket_t exch def
+interline 1.5 mul /bracket_v exch def
+bracket_v /bracket_u exch def
+50 /bracket_alpha exch def
+%
+/half_bracket
+{
+%6
+ 0 0
+%5a
+ bracket_b bracket_v add bracket_h bracket_t sub bracket_u add
+ bracket_alpha bracket_v -0.15 mul bracket_traject
+%5b
+ 1 bracket_h
+ 0 bracket_v 0.5 mul bracket_traject
+%5c
+ 0 bracket_h
+%4a
+ bracket_b bracket_h bracket_t sub
+ 0 bracket_v 0.4 mul bracket_traject
+%4b
+ bracket_b bracket_v add bracket_h bracket_t sub bracket_u add
+ bracket_alpha bracket_v -0.25 mul bracket_traject
+%4c
+ bracket_b bracket_v add bracket_h bracket_t sub bracket_u add
+%3
+ bracket_b bracket_h bracket_t sub
+%2
+ bracket_b 0
+%1
+ 0 0
+} bind def
+%
+/draw_half_bracket {
+ moveto
+ lineto
+ lineto
+ curveto
+ curveto
+ lineto
+ gsave
+ fill
+ grestore
+} bind def
+%
+/draw_bracket % height
+{
+ 2 div bracket_b add /bracket_h exch def
+ bracket_t setlinewidth
+% urg: the only Level-2 PS, check effect in print
+% true setstrokeadjust
+ 1 setlinecap
+ 1 setlinejoin
+ half_bracket
+ 20 copy
+ 1 -1 scale
+ draw_half_bracket
+ stroke
+ 1 -1 scale
+% ugh, ugh:
+ 0.05 0 translate
+ draw_half_bracket
+ stroke
+} bind def
+%
diff -urN ../lilypond-1.1.5/tex/lily-ps-defs.tex ./tex/lily-ps-defs.tex
--- ../lilypond-1.1.5/tex/lily-ps-defs.tex Fri Nov 13 20:30:38 1998
+++ ./tex/lily-ps-defs.tex Fri Nov 13 21:01:03 1998
@@ -14,8 +14,29 @@
% ``compiles'' operatorname binding in the body of foo, making
% the code faster, and more reliable (less flexible)
+%must come before PSTeXDimen
+\special{!
+% PS helper: convert (0.2pt) to the token 0.2
+/settexdimen
+{
+ /thestring exch def
+ thestring 0 thestring length 2 sub
+ getinterval
+ token
+ pop exch pop
+} def
+%
+/deftexdimen
+{
+ settexdimen
+ def
+} def
+}
% transplant a TeX dimension into the PS output.
\def\PSsetTeXdimen#1{\expandafter\special{! /#1 (\the\csname #1\endcsname)
deftexdimen}}
+% must come before lily.ps
+\PSsetTeXdimen{stafflinethickness}
+\PSsetTeXdimen{staffheight}
{%
\def\par{ }% %Ugh. Don't try this at home, kids!
% neat file-include trick by Piet van Oostrum <[EMAIL PROTECTED]>
@@ -43,23 +64,6 @@
}
-\special{!
-% PS helper: convert (0.2pt) to the token 0.2
-/settexdimen
-{
- /thestring exch def
- thestring 0 thestring length 2 sub
- getinterval
- token
- pop exch pop
-} def
-%
-/deftexdimen
-{
- settexdimen
- def
-} def
-}
\def\turnOnPostScript{%
\PSsetTeXdimen{stafflinethickness}
