From: Han-Wen Nienhuys Date: Wed, 5 Nov 1997 23:39:02 +0000 (+0100) Subject: release: 0.1.29 X-Git-Tag: release/0.1.29 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=cba278ebaa31472841ff4ada5dc4942e4c7924f6;p=lilypond.git release: 0.1.29 --- diff --git a/AUTHORS.text b/AUTHORS.text index 2049a8e89a..dfec8605b5 100644 --- a/AUTHORS.text +++ b/AUTHORS.text @@ -61,6 +61,6 @@ CCCCOOOONNNNTTTTRRRRIIIIBBBBUUUUTTTTOOOORRRRSS -27/Oct/97 LilyPond 0.1.27 1 +27/Oct/97 LilyPond 0.1.29 1 diff --git a/Documentation/gnu-music.pod b/Documentation/gnu-music.pod index f13431ded6..a2a9ee0f05 100644 --- a/Documentation/gnu-music.pod +++ b/Documentation/gnu-music.pod @@ -40,6 +40,10 @@ arranging performing +=item * + +Metacomposing + =back These systems should encourage laymen to take up composing, in the @@ -228,3 +232,6 @@ This history note is probably biased in some way, because I wrote it. The rest of this document is also entirely mine, and is not meant to reflect anyone else's opinion. + +For metacomposing, see New Scientist, aug 9 1997, or +http://art.ucsc.edu/faculty/cope/home diff --git a/Documentation/literature.pod b/Documentation/literature.pod index b749a49fa4..06f900901c 100644 --- a/Documentation/literature.pod +++ b/Documentation/literature.pod @@ -1,6 +1,6 @@ =head1 NAME -Lily Literature -- reading on music engraving/typesetting/etc. +Literature -- reading on music engraving, typesetting, etc. =head1 DESCRIPTION @@ -40,7 +40,7 @@ Gardner Read. ``Modern Rhythmic Notation.'' Indiana University Press, avant-garde composers HWN] Gardner Read. ``Music Notation: a Manual of Modern Practice'' (2nd -edition). Taplinger Publishing, New York. +edition). Taplinger Publishing, New York. (Out of print) [This is as close to the ``standard'' reference work for music notation issues as one is likely to get. MB] diff --git a/Documentation/other-packages.pod b/Documentation/other-packages.pod index 7d79155446..38063a3eb7 100644 --- a/Documentation/other-packages.pod +++ b/Documentation/other-packages.pod @@ -88,7 +88,6 @@ Schofer & Andrea Steinbach. With some fonts A NeXT package by William F. Clocksin. Requires Adobe fonts. - =back =head2 Proprietary @@ -143,6 +142,10 @@ A shareware windows package =item Musicator +=item Noteworthy, http://www.ntworthy.com + +Shareware. + =item WolfGang, http://www.unige.ch/lettres/armus/music/wolfgang.html =item Amadeus, Jerker.Elsgard@abc.se diff --git a/INSTALL.text b/INSTALL.text index e1d63e3117..aaed4e5d25 100644 --- a/INSTALL.text +++ b/INSTALL.text @@ -61,7 +61,7 @@ RRRRUUUUNNNNNNNNIIIINNNNGGGG -20/Oct/97 LilyPond 0.1.27 1 +20/Oct/97 LilyPond 0.1.29 1 @@ -127,7 +127,7 @@ CCCCOOOONNNNFFFFIIIIGGGGUUUURRRRIIIINNNNGGGG a -20/Oct/97 LilyPond 0.1.27 2 +20/Oct/97 LilyPond 0.1.29 2 @@ -193,7 +193,7 @@ INSTALL(1) LilyPond documentation INSTALL(1) -20/Oct/97 LilyPond 0.1.27 3 +20/Oct/97 LilyPond 0.1.29 3 @@ -259,7 +259,7 @@ IIIINNNNSSSSTTTTAAAALLLLLLLLIIIINNNNGGGG -20/Oct/97 LilyPond 0.1.27 4 +20/Oct/97 LilyPond 0.1.29 4 @@ -325,7 +325,7 @@ RRRREEEEDDDDHHHHAAAATTTT LLLLIIIINNNNUUUUXXXX -20/Oct/97 LilyPond 0.1.27 5 +20/Oct/97 LilyPond 0.1.29 5 @@ -391,6 +391,6 @@ AAAAUUUUTTTTHHHHOOOORRRRSSSS -20/Oct/97 LilyPond 0.1.27 6 +20/Oct/97 LilyPond 0.1.29 6 diff --git a/NEWS b/NEWS index 1ced8d4693..0868b00741 100644 --- a/NEWS +++ b/NEWS @@ -1,10 +1,14 @@ -pl 28.jcn1 - - bit nicer + renamed feta-din10 +pl 29 + - feta: bass clef, bf: dynamics, bf: 64th flag + + +******** +oct 30 pl 28 - revised Staff_symbol::brew_molecule_p () - naming: \makelilytitle - - fixes for TeX titledefs (thanks, (?)) + - fixes for TeX titledefs (JAF) - junked some obsolete pedal stuff. pl 27.om-je-te-helpen-met-je-ps-spul.jcn1 @@ -17,7 +21,7 @@ pl 27.om-je-te-helpen-met-je-ps-spul.jcn1 * postscript macro: draw_slur ******** -oct 28 +oct 29 pl 27 - -t/--test switch for experimental stuff. - bf: debian optimize is not with 'z' diff --git a/VERSION b/VERSION index 7d600c63f7..db68ff0c0d 100644 --- a/VERSION +++ b/VERSION @@ -1,7 +1,7 @@ TOPLEVEL_MAJOR_VERSION = 0 TOPLEVEL_MINOR_VERSION = 1 -TOPLEVEL_PATCH_LEVEL = 28 -TOPLEVEL_MY_PATCH_LEVEL = jcn1 +TOPLEVEL_PATCH_LEVEL = 29 +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/clean-fonts.sh b/bin/clean-fonts.sh index 5fc9164525..0610fba7e3 100644 --- a/bin/clean-fonts.sh +++ b/bin/clean-fonts.sh @@ -2,7 +2,7 @@ # remove possibly stale .pk/.tfm files echo> /tmp/cleaning-font -FILES=`find /var/lib/texmf/ -name 'font-en-tja*' -o -name 'feta-*'` +FILES=`find /var/lib/texmf/ -name 'font-en-tja*' -o -name 'feta*'` # FILES=`find /var/lib/texmf/ -name 'font-en-tja*' -o name 'feta-*" -o -name 'vette-beam*' -o -name 'dyn10*'` echo removing $FILES rm $FILES /tmp/cleaning-font diff --git a/init/feta16.ly b/init/feta16.ly index 9a928c1eca..fe4aff5ab3 100644 --- a/init/feta16.ly +++ b/init/feta16.ly @@ -1,5 +1,5 @@ % generated automatically by mf-to-table.py version 0.4 -% on Fri Oct 31 08:26:30 1997 +% on Wed Nov 5 23:51:17 1997 % Do not edit % input from out/feta16.log % name=\symboltables { @@ -66,4 +66,8 @@ "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 { + "bass" "\\bassclef" -0.00\pt 10.80\pt -10.00\pt 4.00\pt + "bass_change" "\\cbassclef" -0.00\pt 8.64\pt -8.00\pt 3.20\pt + } % } % $name diff --git a/init/feta20.ly b/init/feta20.ly index fb21ad2d5f..144f3f45f0 100644 --- a/init/feta20.ly +++ b/init/feta20.ly @@ -1,5 +1,5 @@ % generated automatically by mf-to-table.py version 0.4 -% on Fri Oct 31 08:26:34 1997 +% on Wed Nov 5 23:51:26 1997 % Do not edit % input from out/feta20.log % name=\symboltables { @@ -66,4 +66,8 @@ "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 { + "bass" "\\bassclef" -0.00\pt 13.50\pt -12.50\pt 5.00\pt + "bass_change" "\\cbassclef" -0.00\pt 10.80\pt -10.00\pt 4.00\pt + } % } % $name diff --git a/lily/VERSION b/lily/VERSION index 85bbfcd535..c66f32fc18 100644 --- a/lily/VERSION +++ b/lily/VERSION @@ -1,4 +1,4 @@ MAJOR_VERSION = 0 MINOR_VERSION = 1 -PATCH_LEVEL = 28 +PATCH_LEVEL = 29 MY_PATCH_LEVEL = diff --git a/make/lelievijver.lsm b/make/lelievijver.lsm index 2cbe781e3b..a9436ed3e8 100644 --- a/make/lelievijver.lsm +++ b/make/lelievijver.lsm @@ -1,7 +1,7 @@ Begin3 Titel: LilyPond -Versie: 0.1.28 -Inschrijf datum: 30OCT97 +Versie: 0.1.29 +Inschrijf datum: 06NOV97 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.28.tar.gz + 395k lilypond-0.1.29.tar.gz Oorspronkelijke plek: pcnov095.win.tue.nl /pub/lilypond/ - 395k lilypond-0.1.28.tar.gz + 395k lilypond-0.1.29.tar.gz Copi"eer politie: GPL End diff --git a/make/lilypond.lsm b/make/lilypond.lsm index 8309de7edc..d3085da434 100644 --- a/make/lilypond.lsm +++ b/make/lilypond.lsm @@ -1,7 +1,7 @@ Begin3 Title: LilyPond -Version: 0.1.28 -Entered-date: 30OCT97 +Version: 0.1.29 +Entered-date: 06NOV97 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 - 440k lilypond-0.1.28.tar.gz + 440k lilypond-0.1.29.tar.gz Original-site: pcnov095.win.tue.nl /pub/lilypond/ - 440k lilypond-0.1.28.tar.gz + 440k lilypond-0.1.29.tar.gz Copying-policy: GPL End diff --git a/make/lilypond.spec b/make/lilypond.spec index 2e181faa08..714757289c 100644 --- a/make/lilypond.spec +++ b/make/lilypond.spec @@ -1,9 +1,9 @@ Name: lilypond -Version: 0.1.28 +Version: 0.1.29 Release: 1 Copyright: GPL Group: Applications/Publishing -Source0: alpha.gnu.org:/gnu/lilypond/development/lilypond-0.1.28.tar.gz +Source0: alpha.gnu.org:/gnu/lilypond/development/lilypond-0.1.29.tar.gz Summary: A program for typesetting music. URL: http://www.stack.nl/~hanwen/lilypond Packager: Han-Wen Nienhuys diff --git a/mf/dyn10.mf b/mf/dyn10.mf deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/mf/feta-banier.mf b/mf/feta-banier.mf index 6f80e3d3d1..46cb11b300 100644 --- a/mf/feta-banier.mf +++ b/mf/feta-banier.mf @@ -370,8 +370,8 @@ fet_beginchar("64th (down)", "d6", "dsixtyfourthflag") add_flag(flagspace, flare, .97, 1.10, 1.175, hip_thickness, foot_thickness); - add_flag(flagspace, flare, - .95, 1.03, 1.175, hip_thickness, foot_thickness); + add_flag(.98 flagspace, flare, + .91, 1.05, 1.2, hip_thickness, foot_thickness); diff --git a/mf/feta-generic.mf b/mf/feta-generic.mf index 886fbaa771..c710d56da2 100644 --- a/mf/feta-generic.mf +++ b/mf/feta-generic.mf @@ -23,11 +23,11 @@ if test = 0: input feta-bolletjes; input feta-schrift; input feta-banier; -% input feta-klef; + input feta-klef; else: input feta-bolletjes; - input feta-bant; + input feta-banier; % input feta-eindelijk; -% input feta-klef; + input feta-klef; fi diff --git a/mf/feta-klef.mf b/mf/feta-klef.mf index 92935b4ce1..077971baba 100644 --- a/mf/feta-klef.mf +++ b/mf/feta-klef.mf @@ -31,12 +31,7 @@ def draw_bass_clef(expr reduction, center) = z1r = (center, 0); z5 = (x3l + dot_sep * dot_size * interline, .5 interline); - % - % [Wanske] says that the extreme x point should be exactly between - % the dots, but her picture shows that the extreme is ~ 0.2 ss lower - % hence 170 (and not 180). (.2 is a big amount, but because of - % the near vertical shape, it is not very clear. - % + penpos3(right_fat * reduced_il, 180); penlabels(1,3); @@ -56,13 +51,66 @@ def draw_bass_clef(expr reduction, center) = enddef; -fet_beginchar("F clef", "bass", "ughbassclef") - draw_bass_clef(1.0, .5 interline); % .5 -> silly hack to accomodate - % motex -fet_endchar; +% +% Inspired by Baerenreiter, Auf dem Strom +% +% FIXME: dims +% FIXME: right vertical tangent seems to be lower than the F-line +% FIXME: bulb curve smoothly into "long curve" on the inside +% +% +% [Wanske] says that the extreme x point should be exactly between +% the dots, but her picture shows that the extreme is ~ 0.2 ss lower + +def draw_bass_klef(expr reduction) = + save reduced_il, left_tilt, left_thick; + reduced_il# = interline# * reduction; + left_tilt = 10; + + define_pixels(reduced_il); + left_thick = .25 reduced_il; + + set_char_box(0, 2.7 reduced_il#, 2.5 reduced_il#, reduced_il#); + x1r - x1l = left_thick; + x1l = 0; + y1l = 0; + + y2 = reduced_il; + + x3r = x1l + 12/7 reduced_il; + x2 = .5 [x1,x3]; + x3l - x3r = .48 reduced_il; + y3l = -0.05 interline; + x4 = x1l - stafflinethickness; + y4 = -2.2 reduced_il; + z5 = (x3l + 1/3 reduced_il, .5 reduced_il); + + penpos1(whatever, left_tilt); + penpos2(1.2 stafflinethickness, -90); + penpos3(whatever, 185); + penpos4(stafflinethickness, 135); -fet_beginchar("reduced F clef", "bass_change", "ughcbassclef") - draw_bass_clef(.8, .5 interline); + draw_bulb(1, z1r, z1l, .45 reduced_il, 1.0); + + + fill z1r{up} .. z2r{right} .. tension .9 .. z3r{down} .. {curl 0} + simple_serif(z4r, z4l, 90) {curl 0} + .. z3l{up} .. tension .9 .. z2l{left} + .. z1l{dir (-90 + left_tilt)} -- cycle; + labels(2,4); + penlabels(1,2,3,4); + + pickup pencircle scaled (1/3 reduced_il); + draw z5; + draw z5 yscaled -1; +enddef; + +fet_beginchar("F clef ", "bass", "bassclef") + draw_bass_klef(1.0); fet_endchar; +fet_beginchar("F clef (reduced)", "bass_change", "cbassclef") + draw_bass_klef(0.8); +fet_endchar; + fet_endgroup("klef"); diff --git a/mf/feta-macros.mf b/mf/feta-macros.mf index 3e03a9cfee..d7708f7932 100644 --- a/mf/feta-macros.mf +++ b/mf/feta-macros.mf @@ -158,17 +158,17 @@ enddef; % center_factor: typically .5, the larger, the larger the radius of the bulb % radius factor: how much the bulb curves inward % -def draw_bulb(expr turndir, zl, zr, center_factor, radius_factor)= +def draw_bulb(expr turndir, zl, zr, bulb_rad, radius_factor)= begingroup; clearxy; save rad, ang; ang = angle(zr-zl); - z0 = center_factor [zr, zl]; - rad = length(zr - z0); - + z0 = zr + bulb_rad * (zl-zr)/length(zr -zl); + rad = bulb_rad; + z1 = z0 + radius_factor* rad * dir(ang + turndir* 100); - z2 = z0 + rad * dir(ang + turndir*270); + z2 = z0 + rad * dir(ang + turndir*300); labels(0,1,2); fill zr{dir (ang + turndir* 90)} .. z1 .. z2 -- cycle; diff --git a/mf/feta-schrift.mf b/mf/feta-schrift.mf index 16987fa681..ad274d6a8c 100644 --- a/mf/feta-schrift.mf +++ b/mf/feta-schrift.mf @@ -356,7 +356,7 @@ fet_beginchar("Trill (`tr')","trill","trill") ex# = 1.5 interline#; kerning# = .75 ex#; start_nib_angle = 20; - + bulb_size = 0.47; define_pixels(ex, ascender_extra, ascender, kerning); t_overshoot = 0.03 ex; @@ -365,7 +365,7 @@ fet_beginchar("Trill (`tr')","trill","trill") r_fatness = .75 fatness; uitschieter = 21/40 ex; hair_thick = blot_diameter; - bulb_size = 0.47; + slant = .2; local_copy(transform)(currenttransform); @@ -446,7 +446,8 @@ fet_beginchar("Trill (`tr')","trill","trill") fill z11r{dir 70} .. z13r{down} -- z13l{up} .. z11l{dir 250} -- cycle; penlabels(range 1 thru 15); - draw_bulb(-1, z13r, z13l, bulb_size, 1.5); + + draw_bulb(-1, z13r, z13l, bulb_size * r_fatness, 1.5); fet_endchar; fet_beginchar("organ-heel", "pedalheel", "pedalheel") diff --git a/tex/dyn10.tex b/tex/dyn10.tex deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/tex/feta16.tex b/tex/feta16.tex index 932e349df8..1dd3f19865 100644 --- a/tex/feta16.tex +++ b/tex/feta16.tex @@ -1,5 +1,5 @@ % generated automatically by mf-to-table.py version 0.4 -% on Fri Oct 31 08:26:30 1997 +% on Wed Nov 5 23:51:17 1997 % Do not edit % input from out/feta16.log % name @@ -66,3 +66,7 @@ \fetdef\dthirtysecondflag{49} \fetdef\dsixtyfourthflag{50} +% klef +\fetdef\bassclef{51} +\fetdef\cbassclef{52} + diff --git a/tex/feta20.tex b/tex/feta20.tex index 9e1dcd0591..5a820d00bb 100644 --- a/tex/feta20.tex +++ b/tex/feta20.tex @@ -1,5 +1,5 @@ % generated automatically by mf-to-table.py version 0.4 -% on Fri Oct 31 08:26:34 1997 +% on Wed Nov 5 23:51:26 1997 % Do not edit % input from out/feta20.log % name @@ -66,3 +66,7 @@ \fetdef\dthirtysecondflag{49} \fetdef\dsixtyfourthflag{50} +% klef +\fetdef\bassclef{51} +\fetdef\cbassclef{52} + diff --git a/tex/fetdefs.tex b/tex/fetdefs.tex index 87b240f818..f3d5ccba99 100644 --- a/tex/fetdefs.tex +++ b/tex/fetdefs.tex @@ -129,7 +129,14 @@ \edef\embedid{feta-sleur-\number\embedcount} \immediate\openout\embedfile=\embedid.mf \global\advance\embedcount by 1 + +% should write ``automatically generated.'' +% \immediate\write\embedfile{\def\ +% +% } + \immediate\write\embedfile{#1} + \immediate\closeout\embedfile \font\expandafter\embedid\expandafter=\embedid \embedid\char0 @@ -140,9 +147,9 @@ \def\nometafont{\def\embeddedmf##1{}} % dat heb je handig gedaan, lieverd! -%\nometafont +\nometafont \nopostscript -\notex +%\notex \def\EndLilyPondOutput{ \storeembedcount diff --git a/tex/font-en-tja16.tex b/tex/font-en-tja16.tex deleted file mode 100644 index 80ca21d7c6..0000000000 --- a/tex/font-en-tja16.tex +++ /dev/null @@ -1,68 +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 -% rests -\fetdef\wholerest{0} -\fetdef\halfrest{1} -\fetdef\outsidewholerest{2} -\fetdef\outsidehalfrest{3} -\fetdef\quartrest{4} -\fetdef\eighthrest{5} -\fetdef\sixteenthrest{6} -\fetdef\thirtysecondrest{7} -\fetdef\sixtyfourthrest{8} -\fetdef\hundredtwentyeighthrest{9} - -% accidentals -\fetdef\sharp{10} -\fetdef\natural{11} -\fetdef\flat{12} -\fetdef\flatflat{13} -\fetdef\sharpsharp{14} - -% dots -\fetdef\dot{15} - -% balls -\fetdef\brevisball{16} -\fetdef\brevisledger{17} -\fetdef\longaball{18} -\fetdef\longaledger{19} -\fetdef\wholeball{20} -\fetdef\wholeledger{21} -\fetdef\halfball{22} -\fetdef\halfledger{23} -\fetdef\quartball{24} -\fetdef\quartledger{25} - -% scripts -\fetdef\ufermata{26} -\fetdef\dfermata{27} -\fetdef\sforzatoaccent{28} -\fetdef\staccato{29} -\fetdef\ustaccatissimo{30} -\fetdef\dstaccatissimo{31} -\fetdef\tenuto{32} -\fetdef\umarcato{33} -\fetdef\dmarcato{34} -\fetdef\ouvert{35} -\fetdef\plusstop{36} -\fetdef\upbow{37} -\fetdef\downbow{38} -\fetdef\turn{39} -\fetdef\trill{40} -\fetdef\pedalheel{41} -\fetdef\pedaltoe{42} - -% flags -\fetdef\eighthflag{43} -\fetdef\sixteenthflag{44} -\fetdef\thirtysecondflag{45} -\fetdef\sixtyfourthflag{46} -\fetdef\deighthflag{47} -\fetdef\dsixteenthflag{48} -\fetdef\dthirtysecondflag{49} -\fetdef\dsixtyfourthflag{50} - diff --git a/tex/font-en-tja20.tex b/tex/font-en-tja20.tex deleted file mode 100644 index 7cdab66158..0000000000 --- a/tex/font-en-tja20.tex +++ /dev/null @@ -1,68 +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 -% rests -\fetdef\wholerest{0} -\fetdef\halfrest{1} -\fetdef\outsidewholerest{2} -\fetdef\outsidehalfrest{3} -\fetdef\quartrest{4} -\fetdef\eighthrest{5} -\fetdef\sixteenthrest{6} -\fetdef\thirtysecondrest{7} -\fetdef\sixtyfourthrest{8} -\fetdef\hundredtwentyeighthrest{9} - -% accidentals -\fetdef\sharp{10} -\fetdef\natural{11} -\fetdef\flat{12} -\fetdef\flatflat{13} -\fetdef\sharpsharp{14} - -% dots -\fetdef\dot{15} - -% balls -\fetdef\brevisball{16} -\fetdef\brevisledger{17} -\fetdef\longaball{18} -\fetdef\longaledger{19} -\fetdef\wholeball{20} -\fetdef\wholeledger{21} -\fetdef\halfball{22} -\fetdef\halfledger{23} -\fetdef\quartball{24} -\fetdef\quartledger{25} - -% scripts -\fetdef\ufermata{26} -\fetdef\dfermata{27} -\fetdef\sforzatoaccent{28} -\fetdef\staccato{29} -\fetdef\ustaccatissimo{30} -\fetdef\dstaccatissimo{31} -\fetdef\tenuto{32} -\fetdef\umarcato{33} -\fetdef\dmarcato{34} -\fetdef\ouvert{35} -\fetdef\plusstop{36} -\fetdef\upbow{37} -\fetdef\downbow{38} -\fetdef\turn{39} -\fetdef\trill{40} -\fetdef\pedalheel{41} -\fetdef\pedaltoe{42} - -% flags -\fetdef\eighthflag{43} -\fetdef\sixteenthflag{44} -\fetdef\thirtysecondflag{45} -\fetdef\sixtyfourthflag{46} -\fetdef\deighthflag{47} -\fetdef\dsixteenthflag{48} -\fetdef\dthirtysecondflag{49} -\fetdef\dsixtyfourthflag{50} - diff --git a/tex/lilyponddefs.tex b/tex/lilyponddefs.tex index 71c7001f76..d7b9be267a 100644 --- a/tex/lilyponddefs.tex +++ b/tex/lilyponddefs.tex @@ -188,7 +188,8 @@ \def\brace#1{\count0=148\advance\count0 by #1\musicdraw\char\count0} \def\crescendosym#1{\count0=84\advance\count0 by #1\musicdraw\char\count0} \def\decrescendosym#1{\count0=116\advance\count0 by #1\musicdraw\char\count0} -\def\rulesym#1#2{\vrule height #1 width #2} +\def\rulesym#1#2{\dimen0=#1% + \vrule height .5\dimen0 depth .5\dimen0 width #2} \def\settext#1{\normaltextfont #1} \def\setitalic#1{\italicfont #1} \def\setdynamic#1{\dynfont #1} diff --git a/tex/titledefs.tex b/tex/titledefs.tex index 000cb6f1f6..37ed8eb9ba 100644 --- a/tex/titledefs.tex +++ b/tex/titledefs.tex @@ -1,3 +1,35 @@ +% +% ideally, we should create a LaTeX/TeX class +% for setting music in different sizes. +% +\input lilyponddefs +\def\EndLilyPondOutput{\endinput} +% +\def\thetitle{} +\def\thesubtitle{} +\def\thecomposer{} +\def\thearranger{} +\def\theinstrument{} +% +\def\title#1{\def\thetitle{#1\\}} +\def\subtitle#1{\def\thesubtitle{#1}} +\def\composer#1{\def\thecomposer{#1}} +\def\arranger#1{\def\thearranger{#1}} +\def\instrument#1{\def\theinstrument{#1}} +% +\def\makelilytitle{ + \begin{center} + {\huge\bfseries\thetitle}{\large\bfseries\thesubtitle} + \end{center} + {\hfill\scshape\thecomposer}{\flushleft\theinstrument}{\hfill\thearranger} + %\bigskip + } + + + + +\endinput + % % ideally, we should create a LaTeX/TeX class % for setting music in different sizes.