From: Jan Nieuwenhuizen Date: Tue, 14 Oct 1997 07:06:46 +0000 (+0200) Subject: patch::: 0.1.22.jcn1: rust X-Git-Tag: release/0.1.23~1 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=a0486b14b6e6e879a5d9611e2f7e6d21d9552780;p=lilypond.git patch::: 0.1.22.jcn1: rust pl 22.jcn1 - redo of quarter rest - fixes of 8-128 rests --- diff --git a/NEWS b/NEWS index abf20884ef..f5329244d3 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,7 @@ +pl 22.jcn1 + - redo of quarter rest + - fixes of 8-128 rests + pl 22 - bf: lyric 's- Zondags - bf: colliding accidentals: renamed translate(Real,Axis) to translate_axis() diff --git a/VERSION b/VERSION index f54b7cfd6e..1ceb51ba39 100644 --- a/VERSION +++ b/VERSION @@ -1,6 +1,6 @@ TOPLEVEL_MAJOR_VERSION = 0 TOPLEVEL_MINOR_VERSION = 1 TOPLEVEL_PATCH_LEVEL = 22 -TOPLEVEL_MY_PATCH_LEVEL = +TOPLEVEL_MY_PATCH_LEVEL = .jcn1 # use the above to send patches, always empty for released version: diff --git a/bin/clean-fonts.sh b/bin/clean-fonts.sh index 8494ff68a5..cc1c070747 100644 --- a/bin/clean-fonts.sh +++ b/bin/clean-fonts.sh @@ -2,6 +2,7 @@ # remove possibly stale .pk/.tfm files echo> /tmp/cleaning-font -FILES=`find /var/lib/texmf/ -name 'font-en-tja*'` # -or -name 'vette-beam*'` +FILES=`find /var/lib/texmf/ -name 'font-en-tja*'` +# FILES=`find /var/lib/texmf/ -name 'font-en-tja*' -o -name 'vette-beam*' -o -name 'dyn10*'` echo removing $FILES rm $FILES /tmp/cleaning-font diff --git a/input/gourlay.ly b/input/gourlay.ly index fb8e268d01..70569448a8 100644 --- a/input/gourlay.ly +++ b/input/gourlay.ly @@ -1,3 +1,43 @@ +\header{ +enteredby jcn +copyright PD +TestedFeatures This file tests some nasty Gourlay spacings +} + +\version "0.1.6"; + +\score{ +% huh? +% \multi 2 \melodic < \octave c''; + \melodic \multi 2 < \octave c''; + { \stemup; d2 d | d d | d4 d2. | } + \octave c'; + % huh, plet broken? +% { \stemdown; g4 g g g | \plet 2/3; g2 g2 g2 \plet 1/1; | g4. g8 g2 | } + { \stemdown; g4 g g g | g2*2/3 g2*2/3 g2*2/3 | g4. g8 g2 | } + > + \paper{ + linewidth = 20.\cm; + } +} + +\score{ +% huh? +% \multi 2 \melodic < \octave c''; + \melodic \multi 2 < \octave c''; + { \stemup; d2 d | d d | d4 d2. | } + \octave c'; + % huh, plet broken? +% { \stemdown; g4 g g g | \plet 2/3; g2 g2 g2 \plet 1/1; | g4. g8 g2 | } + { \stemdown; g4 g g g | g2*2/3 g2*2/3 g2*2/3 | g4. g8 g2 | } + > + \paper{ + linewidth = 4.\cm; + \output "lelie1.tex"; + } + +} + \header{ enteredby = "jcn"; copyright = "PD"; diff --git a/make/Targets.make b/make/Targets.make index cf8390be0a..8f41109188 100644 --- a/make/Targets.make +++ b/make/Targets.make @@ -235,12 +235,13 @@ $(LIBLILY): dummy # rpm: check-rpm-doc-deps -cp $(depth)/lilypond-$(TOPLEVEL_VERSION).tar.gz $(rpm-sources) - -cp $< $(rpm-sources) +# -cp $(wildcard $(depth)/Documentation/*.xpm) $(rpm-sources) + -cp $(wildcard $(depth)/Documentation/$(outdir)/*.gif) $(rpm-sources) $(MAKE) -C $(make-dir) spec rpm -ba $(makeout)/lilypond.spec check-rpm-doc-deps: - $(MAKE) -C $(depth)/Documentation/ xpms + $(MAKE) -C $(depth)/Documentation gifs installexe: diff --git a/make/debian/control b/make/debian/control index cd13df85ed..f3c4618b2e 100644 --- a/make/debian/control +++ b/make/debian/control @@ -9,10 +9,13 @@ Architecture: any Depends: ${shlibs:Depends} Recommends: tetex-base, musixtex | musixtex-fonts Description: GNU LilyPond -- A preprocessor to make TeX typeset music. - GNU LilyPond is a program which converts a music-script (mudela) into TeX - output, or MIDI to produce multi-staff scores. Features include multiple - meters, clefs, keys, lyrics, versatile input-language, cadenzas beams, - slurs, triplets, multiple voices. +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. . Note: LilyPond uses the fonts from MusiXTeX. Please install the package musixtex or musixtex-fonts when you install lilypond. :) diff --git a/make/lelievijver.lsm b/make/lelievijver.lsm index 99f1bb8260..2e800615f3 100644 --- a/make/lelievijver.lsm +++ b/make/lelievijver.lsm @@ -1,7 +1,7 @@ Begin3 Titel: LilyPond -Versie: 0.1.22 -Inschrijf datum: 10OCT97 +Versie: 0.1.22.jcn1 +Inschrijf datum: 13OCT97 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.22.tar.gz + 395k lilypond-0.1.22.jcn1.tar.gz Oorspronkelijke plek: pcnov095.win.tue.nl /pub/lilypond/ - 395k lilypond-0.1.22.tar.gz + 395k lilypond-0.1.22.jcn1.tar.gz Copi"eer politie: GPL End diff --git a/make/lilypond.spec.in b/make/lilypond.spec.in index a984487a74..2da567e93f 100644 --- a/make/lilypond.spec.in +++ b/make/lilypond.spec.in @@ -11,11 +11,13 @@ Icon: lelie_icon.gif Buildroot: /tmp/lilypond-install %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. +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. %prep %setup diff --git a/mf/autometric.mf b/mf/autometric.mf index 8cddab9100..8c6d3e23d4 100644 --- a/mf/autometric.mf +++ b/mf/autometric.mf @@ -4,13 +4,12 @@ % source file of the Feta (Font-En-Tja) pretty-but-neat music font % % (c) 1997 Han-Wen Nienhuys +% Jan Nieuwenhuizen % % these macros help create ascii logging output % to automate generation of lily tables and tex backend % The output should be parsed by the mf-to-table script - - % font or database? def fet_beginfont(expr name,size) = font_identifier:=name&decimal size; diff --git a/mf/dimen.tex b/mf/dimen.tex index 44c59a4ef4..928a0b7602 100644 --- a/mf/dimen.tex +++ b/mf/dimen.tex @@ -9,8 +9,9 @@ \font\slurs=xslhd16 \font\specfont=musixspx \font\egler=opus16 -\def\thefont{\egler} +%\def\thefont{\egler} %\def\thefont{\specfont} +\def\thefont{\fet} \def\mb#1{{\thefont\char#1}} diff --git a/mf/feta-eindelijk.mf b/mf/feta-eindelijk.mf index 5e9c67b8c6..b3cadcab90 100644 --- a/mf/feta-eindelijk.mf +++ b/mf/feta-eindelijk.mf @@ -14,7 +14,7 @@ define_blacker_pixels(med,thick); pen med_pen; med_pen:= pencircle scaled med; -rthin:=1/8interline; +rthin:=1/8*interline; % rthick:=2rthin; rthick:=2thick+rthin; @@ -27,7 +27,7 @@ enddef; save stem, ball_crook_stem, ball_crook_balldiam, flare; define_pixels(stem,flare); -% stem#:=1/8interline#; +% stem#:=1/8*interline#; stem# = 1/5interline#; ball_crook_stem = stem; ball_crook_balldiam =flare; @@ -91,40 +91,46 @@ fet_beginchar("half rest (outside staff)", "1o", "outsidehalfrest"); draw (-block_rest_y,0) .. (block_rest_x + block_rest_y,0); fet_endchar; -def rest_crook(expr a, w) = - balled_crook(a, w, ball_crook_balldiam, ball_crook_stem) -enddef; - fet_beginchar("Quarter rest","2","quartrest"); + save alpha; alpha:=-50; + save ne,nw,se,sw; pair ne,nw,se,sw; + se=dir alpha; nw=dir (alpha+180); + ne=dir (alpha+90); sw=dir (alpha-90); penpos1(rthin,alpha+90); penpos2(5/4rthick,alpha); penpos4(5/4rthick,alpha); + penpos5(rthin,alpha+90); penpos3(3/4rthick,alpha); - penpos6(rthin,alpha-20); -% penpos6(rthick,alpha-20); -% penpos7(4/3thick,alpha); - penpos7(5/8rthick,alpha); - penpos8(rthin,-10); +% penpos6(5/8rthick,alpha); + penpos6(2/3rthick,alpha); + penpos7(1/2rthin,alpha+90); + + z10=z2l+1/2rthin*sw; +% z11=z4l+1/2rthin*sw; + z11=z4l+1/2rthin*sw+1/2rthin*se; + z12=z4r+1/2rthin*ne; +% z13=z2r+1/2rthin*ne; + z13=z2r+1/2rthin*ne+1/2rthin*nw; + y1l=7/2interline; x1l=1/3interline; - z2r=z1+(interline*right) rotated alpha; + z2r=z1+interline*se; z3=1/2[z2,z4]; x4=3/8interline; y4=2interline; - z6=z4l+(5/4interline*right) rotated alpha; -% x7l=x4l; y7r=y6l; - x7l=x4l; y7l=y4r; - x8=2/5interline; y8= 3/4 interline; - z5=z6r shifted (sqrt(2)*rthin/4,sqrt(2)*rthin/4); - - pickup penrazor scaled rthin rotated 45; - draw z1--z2r; - draw z4l--z5; - penstroke z2e..z3e..z4e; - penstroke z6e..tension1.4..z7e..tension1.4..z8e; - penlabels(1,2,3,4,5,6,7,8); - set_char_box(0, interline#, -3/4 interline#, 7/2 interline#); + z5=z4l+1.3interline*se; + x6l=x4l; y6l=y4r; + x7=2/5interline; y7=3/4interline; + fill z1l{se}..{se}z10..z3l..z11{se}..{se}z5l..z5r{nw}..{nw}z12..z3r..z13{nw}..{nw}z1r.. cycle; + fill z5r{nw}..tension1.4..z6l..tension1.4..{se}z7l..z7r{nw}..tension1.4..z6r..tension1.4..{se}z5l..cycle; + penlabels(1,2,3,4,5,6,7); + penlabels(10,11,12,13); + set_char_box(0, 27/25interline#, -3/4 interline#, 18/5interline#); fet_endchar; +def rest_crook(expr a, w) = + balled_crook(a, w, ball_crook_balldiam, ball_crook_stem) +enddef; + fet_beginchar("8th rest","3","eighthrest"); set_char_box(0, 4/3interline#,-interline#, 8/3interline#+2stafflinethickness#); save x,y, ht; @@ -133,84 +139,108 @@ fet_beginchar("8th rest","3","eighthrest"); rest_crook (z1,w-stem/6); z2-z1=whatever*dir70; y2=stem/2; - brush (z1,stem/3,z2,stem); + brush(z1,2/3stem,z2,stem); % ugh currentpicture:=currentpicture shifted (0,interline); -% currentpicture:=currentpicture shifted (0,interline+2stafflinethickness); fet_endchar; +def tand(expr alpha) = + (sind alpha/cosd alpha); + enddef; + fet_beginchar("16th rest","4","sixteenthrest"); - set_char_box(0,4/3interline#,0, 5/3interline#+interline#+2stafflinethickness#); + save alpha,cw,h,w; + alpha=74; + cw#=7/6interline#; + h#=5/3interline#+interline#+2stafflinethickness#; + w#=cw#+(h#-3/2interline#)/tand(alpha); + set_char_box(0,w#,0,h#); + define_pixels(cw); save x,y; x1=w-stem/6; y1=h-flare/4; - z2-z1=whatever*dir74; + z2-z1=whatever*dir alpha; y2=stem/2; - brush (z1,stem/2,z2,stem); - rest_crook (z1,7/8w); - z3-z1=whatever*dir74; + brush(z1,2/3stem,z2,stem); + rest_crook (z1,cw); + z3-z1=whatever*dir alpha; y3=y1-interline; - rest_crook (z3,7/8w); -% currentpicture:=currentpicture shifted (0,2stafflinethickness); + rest_crook (z3,cw); + penlabels(1,2); fet_endchar; fet_beginchar("32th rest","5","thirtysecondrest"); - set_char_box(0,4/3interline#,0, 5/3interline#+2interline#+2stafflinethickness#); + save alpha,cw,h,w; + alpha=76; + cw#=7/6interline#; + h#=5/3interline#+2interline#+2stafflinethickness#; + w#=cw#+(h#-3/2interline#)/tand(alpha); + set_char_box(0,w#,0,h#); + define_pixels(cw); save x,y; x1=w-stem/6; y1=h-flare/4; - z2-z1=whatever*dir76; + z2-z1=whatever*dir alpha; y2=stem/2; - brush (z1,stem/2,z2,stem); - rest_crook (z1,7/8w); - z3-z1=whatever*dir76; + brush(z1,2/3stem,z2,stem); + rest_crook (z1,cw); + z3-z1=whatever*dir alpha; y3=y1-interline; - rest_crook (z3,7/8w); - z4-z1=whatever*dir76; + rest_crook (z3,cw); + z4-z1=whatever*dir alpha; y4=y1-2interline; - rest_crook (z4,7/8w); -% currentpicture:=currentpicture shifted (0,2stafflinethickness); + rest_crook (z4,cw); fet_endchar; fet_beginchar("64th rest","6","sixtyfourthrest"); - set_char_box(0,4/3interline#,0, 5/3interline#+3interline#+2stafflinethickness#); + save alpha,cw,h,w; + alpha=78; + cw#=7/6interline#; + h#=5/3interline#+3interline#+2stafflinethickness#; + w#=cw#+(h#-3/2interline#)/tand(alpha); + set_char_box(0,w#,0,h#); + define_pixels(cw); save x,y; x1=w-stem/6; y1=h-flare/4; - z2-z1=whatever*dir78; + z2-z1=whatever*dir alpha; y2=stem/2; - brush (z1,stem/2,z2,stem); - rest_crook (z1,7/8w); - z3-z1=whatever*dir78; + brush (z1,2/3stem,z2,stem); + rest_crook (z1,cw); + z3-z1=whatever*dir alpha; y3=y1-interline; - rest_crook (z3,7/8w); - z4-z1=whatever*dir78; + rest_crook (z3,cw); + z4-z1=whatever*dir alpha; y4=y1-2interline; - rest_crook (z4,7/8w); - z5-z1=whatever*dir78; + rest_crook (z4,cw); + z5-z1=whatever*dir alpha; y5=y1-3interline; - rest_crook (z5,7/8w); -% currentpicture:=currentpicture shifted (0,2stafflinethickness); + rest_crook (z5,cw); fet_endchar; fet_beginchar("128th rest","7","hundredtwentyeighthrest"); - set_char_box(0, 4/3interline#, 0, 5/3interline#+4interline#+2stafflinethickness#); + save alpha,cw,h,w; + alpha=78; + cw#=7/6interline#; + h#=5/3interline#+4interline#+2stafflinethickness#; + w#=cw#+(h#-3/2interline#)/tand(alpha); + set_char_box(0,w#,0,h#); + define_pixels(cw); save x,y; x1=w-stem/6; y1=h-flare/4; - z2-z1=whatever*dir80; + z2-z1=whatever*dir alpha; y2=stem/2; - brush (z1,stem/2,z2,stem); - rest_crook (z1,7/8w); - z3-z1=whatever*dir80; + brush (z1,2/3stem,z2,stem); + rest_crook (z1,cw); + z3-z1=whatever*dir alpha; y3=y1-interline; - rest_crook (z3,7/8w); - z4-z1=whatever*dir80; + rest_crook (z3,cw); + z4-z1=whatever*dir alpha; y4=y1-2interline; - rest_crook (z4,7/8w); - z5-z1=whatever*dir80; + rest_crook (z4,cw); + z5-z1=whatever*dir alpha; y5=y1-3interline; - rest_crook (z5,7/8w); - z6-z1=whatever*dir80; + rest_crook (z5,cw); + z6-z1=whatever*dir alpha; y6=y1-4interline; - rest_crook (z6,7/8w); -% currentpicture:=currentpicture shifted (0,2stafflinethickness); + rest_crook (z6,cw); fet_endchar; endgroup;