From: fred Date: Sun, 24 Mar 2002 20:11:17 +0000 (+0000) Subject: lilypond-0.1.58 X-Git-Tag: release/1.5.59~3122 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=997f6a69b2cad09a3a93b444110d7b61b3c2fb82;p=lilypond.git lilypond-0.1.58 --- diff --git a/lily/tex-slur.cc b/lily/tex-slur.cc deleted file mode 100644 index ab86f271fa..0000000000 --- a/lily/tex-slur.cc +++ /dev/null @@ -1,341 +0,0 @@ -/* - tex-slur.cc -- implement Lookup::*slur - - source file of the GNU LilyPond music typesetter - - (c) 1996,1997 Han-Wen Nienhuys -*/ - -#include -#include "main.hh" -#include "misc.hh" -#include "lookup.hh" -#include "molecule.hh" -#include "dimen.hh" -#include "debug.hh" -#include "paper-def.hh" -#include "string-convert.hh" -#include "main.hh" - -static char -direction_char (Direction y_sign) -{ - char c='#'; - switch (y_sign) - { - case DOWN: - c = 'd'; - break; - case CENTER: - c = 'h'; - break; - case UP: - c = 'u'; - break; - default: - assert (false); - } - return c; -} - -Atom -Lookup::half_slur_middlepart (Real &dx, Direction dir) const -{ - // todo - if (dx >= 400 PT) - { - WARN<<_("halfslur too large") <= 96 PT) - { - WARN << _("Slur half too wide.") << print_dimen (orig_dx) << _(" shrinking (ugh)\n"); - dx = 96 PT; - } - - widx = int (rint (dx/12.0)); - dx = widx*12.0; - if (widx) - widx --; - else - { - WARN << _("slur too narrow ") << print_dimen (orig_dx)<<"\n"; - } - - Atom s; - s.dim_[X_AXIS] = Interval (0, dx); - s.dim_[Y_AXIS] = Interval (min (0, dy), max (0, dy)); - - - String f = String ("\\hslurchar"); - - f+= direction_char (dir); - - int hidx = dy; - if (hidx <0) - hidx = -hidx; - hidx --; - int idx =-1; - - idx = widx * 16 + hidx; - if (xpart < 0) - idx += 128; - - assert (idx < 256); - f+=String ("{") + String (idx) + "}"; - - s.tex_ = f; - - return s; -} - -Atom -Lookup::ps_slur (Real dy , Real dx, Real ht, Real dir) const -{ - String ps = "\\embeddedps{\n"; - - ps += String_convert::double_str (dx) + " " - + String_convert::double_str (dy) + " " - + String_convert::double_str (ht) + " " - + String_convert::double_str (dir) + - " draw_slur}"; - - /* - slurs are rarely wider than 100pt: - precision of 3 yields maximum (slur spanning page) - error of: 1%% * 6*72pt === 0.4pt = 0.14 mm - */ - String dx_str = String_convert::precision_str (dx, 4); - String dy_str = String_convert::precision_str (dy, 3); - String ht_str = String_convert::precision_str (ht, 3); - String dir_str = String_convert::int_str ((int)dir); - String name = "feta-sleur-" + dx_str + "-" + dy_str + "-" + ht_str + "-" + dir_str; - int i = name.index_i ('.'); - while (i != -1) - { - *(name.ch_l () + i) = 'x'; - i = name.index_i ('.'); - } - - String mf = "\\embeddedmf{" + name + "}{\n"; - mf += "mode_setup;\n"; - mf += "staffsize\\#:=" - + String_convert::int_str ((int)paper_l_->get_var ("barsize"), "%d") - + "pt\\#;\n"; - mf += "interline#:=staffsize#/4;\n"; - mf += "stafflinethickness#:=0.1interline#;\n"; - mf += "input feta-sleur;\n"; - mf += "slurchar(" + dx_str + "," + dy_str + "," + ht_str + "," + dir_str + ");\n"; - mf += "end.\n"; - mf += "}\n"; - - Atom s; - s.tex_ = ps; - if (embedded_mf_global_b) - s.tex_ += mf; - return s; -} - -Atom -Lookup::tex_slur (int dy , Real &dx, Direction dir) const -{ - assert (abs ((int)dir) <= 1); - Atom s; - Direction y_sign = (Direction) sign (dy); - - bool large = abs (dy) > 8; - - if (y_sign) - { - large |= dx>= 4*16 PT; - } - else - large |= dx>= 4*54 PT; - - if (large) - { - s = big_slur (dy, dx, dir); - return s; - } - Real orig_dx = dx; - int widx = int (floor (dx/4.0)); // slurs better too small.. - dx = 4.0 * widx; - if (widx) - widx --; - else - { - WARN << _("slur too narrow: ") << print_dimen (orig_dx) << "\n"; - } - - int hidx = dy; - if (hidx <0) - hidx = -hidx; - hidx --; - if (hidx > 8) - { - WARN<<_("slur to steep: ") << dy << _(" shrinking (ugh)\n"); - } - - String f = String ("\\slurchar") + String (direction_char (y_sign)); - - int idx=-1; - if (y_sign) - { - idx = hidx * 16 + widx; - if (dir < 0) - idx += 128; - } - else - { - if (dx >= 4*54 PT) - { - WARN << _("slur too wide: ") << print_dimen (dx) << - _(" shrinking (ugh)\n"); - dx = 4*54 PT; - } - idx = widx; - if (dir < 0) - idx += 54; - } - - assert (idx < 256); - f+=String ("{") + String (idx) + "}"; - s.tex_ = f; - s.translate_axis (dx/2, X_AXIS); - return s; -} - -Atom -Lookup::big_slur (int dy , Real &dx, Direction dir) const -{ - if (dx < 24 PT) - { - warning (_("big_slur too small ") + print_dimen (dx) + _(" (stretching)")); - dx = 24 PT; - } - - Real slur_extra =abs (dy) /2.0 + 2; - int l_dy = int (Real (dy)/2 + slur_extra*dir); - int r_dy = dy - l_dy; - - Real internote_f = paper_l_->internote_f(); - Real left_wid = dx/4.0; - Real right_wid = left_wid; - - Atom l = half_slur (l_dy, left_wid, dir, -1); - - - Atom r = half_slur (r_dy, right_wid, dir, 1); - Real mid_wid = dx - left_wid - right_wid; - - Molecule mol; - mol.add (l); - Atom a (half_slur (0, mid_wid, dir, 0)); - mol.add_at_edge (X_AXIS, RIGHT, a); - mol.add_at_edge (X_AXIS, RIGHT, r); - - mol.translate_axis (l_dy * internote_f, Y_AXIS); - Atom s; - s.tex_ = mol.TeX_string(); - s.dim_ = mol.extent(); - return s; -} - - -Atom -Lookup::slur (Real &dy_f , Real &dx, Real ht, Direction dir) const -{ - if (dx < 0) - { - warning (_("Negative slur/tie length: ") + print_dimen (dx)); - dx = 4.0 PT; - } - Atom s; - - if (postscript_global_b) - s = ps_slur (dy_f, dx, ht, dir); - else - { - Real nh = paper_l_->internote_f (); - int dy_i = (int) rint(dy_f / nh); - - s = tex_slur (dy_i, dx, dir); - dy_f = dy_i * nh; - } - - s.dim_[X_AXIS] = Interval (0, dx); - s.dim_[Y_AXIS] = Interval (0 ? dy_f); - return s; -} - -Atom -Lookup::control_slur (Array controls, Real dx, Real dy) const -{ - assert (postscript_global_b); - assert (controls.size () == 8); - - String ps = "\\embeddedps{\n"; - - for (int i = 1; i < 4; i++) - ps += String_convert::double_str (controls[i].x ()) + " " - + String_convert::double_str (controls[i].y ()) + " "; - - for (int i = 5; i < 8; i++) -// ps += String_convert::double_str (controls[i].x () + controls[0].x () - controls[3].x ()) + " " -// + String_convert::double_str (controls[i].y () - controls[0].y () + controls[3].y ()) + " "; - ps += String_convert::double_str (controls[i].x () - dx) + " " - + String_convert::double_str (controls[i].y () - dy) + " "; - - ps += " draw_control_slur}"; - - Atom s; - s.tex_ = ps; - - s.dim_[X_AXIS] = Interval (0, dx); - s.dim_[Y_AXIS] = Interval (0 ? dy); - return s; -} - diff --git a/make/Configure_variables.make.in b/make/Configure_variables.make.in deleted file mode 100644 index b6b2fa7b28..0000000000 --- a/make/Configure_variables.make.in +++ /dev/null @@ -1,40 +0,0 @@ -# -*-Makefile-*- - -# @configure_input@ - -INSTALL = @INSTALL@ -USER_CXXFLAGS = @CXXFLAGS@ @CPPFLAGS@ -USER_LDFLAGS = - -CXX = @CXX@ -POD2HTML= @POD2HTML@ -POD2MAN = @POD2MAN@ -ICFLAGS = @ICFLAGS@ -ILDFLAGS = @ILDFLAGS@ -libdir = @libdir@ -prefix = @prefix@ -TEXPREFIX = @TEXPREFIX@ -TEXDIR = @TEXDIR@ -TAR= @TAR@ -MFDIR = @MFDIR@ -mandir = @mandir@ -exec_prefix = @exec_prefix@ -bindir = @bindir@ -includedir = @includedir@ -datadir = @datadir@ -EXTRA_LIBES = @EXTRA_LIBES@ -RANLIB = @RANLIB@ -DEFS = @DEFS@ -#SET_MAKE = @SET_MAKE@ -DEFINES = @DEFINES@ -FIND = @FIND@ -COMPILEINFO = @COMPILEINFO@ -BISON = @BISON@ -FLEX = @FLEX@ -LN = @LN@ -ZIP = @ZIP@ -PERL = @PERL@ -PYTHON = @PYTHON@ -OUTDIR_NAME = @OUTDIR_NAME@ - - diff --git a/make/header-directory.make b/make/header-directory.make deleted file mode 100644 index 9017ad8327..0000000000 --- a/make/header-directory.make +++ /dev/null @@ -1,4 +0,0 @@ -# identify module: -# -include ./$(depth)/make/Include.make - diff --git a/make/lelievijver.lsm b/make/lelievijver.lsm deleted file mode 100644 index 067c6612b1..0000000000 --- a/make/lelievijver.lsm +++ /dev/null @@ -1,23 +0,0 @@ -Begin3 -Titel: LilyPond -Versie: 0.1.57 -Inschrijf datum: 19APR98 -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: - voor bladmuziek wordt typeset informatie naar een - TeX file geschreven, voor een (mechanische) uitvoering - wordt een MIDI file geschreven. Enkele kunstjes zijn - verscheidene notenbalken, maatsoorten, sleutels, - toonsoorten, teksten, krachtige invoer taal, cadensen, - balken, boogjes, triolen. -Trefwoorden: muziek typezetten midi notatie -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.57.tar.gz -Oorspronkelijke plek: pcnov095.win.tue.nl /pub/lilypond/ - 395k lilypond-0.1.57.tar.gz -Copi"eer politie: GPL -End diff --git a/make/lilypond.lsm b/make/lilypond.lsm deleted file mode 100644 index 43f26e11cb..0000000000 --- a/make/lilypond.lsm +++ /dev/null @@ -1,22 +0,0 @@ -Begin3 -Title: LilyPond -Version: 0.1.57 -Entered-date: 19APR98 -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 - 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. - It includes a nice font of musical symbols. -Keywords: music notation typesetting midi fonts -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 - 470k lilypond-0.1.57.tar.gz -Original-site: pcnov095.win.tue.nl /pub/lilypond/development/ - 470k lilypond-0.1.57.tar.gz -Copying-policy: GPL -End diff --git a/make/lilypond.spec b/make/lilypond.spec deleted file mode 100644 index 17a85ac5fc..0000000000 --- a/make/lilypond.spec +++ /dev/null @@ -1,53 +0,0 @@ -Name: lilypond -Version: 0.1.57 -Release: 1 -Copyright: GPL -Group: Applications/Publishing -Source0: alpha.gnu.org:/gnu/lilypond/development/lilypond-0.1.57.tar.gz -Summary: A program for typesetting music. -URL: http://www.stack.nl/~hanwen/lilypond -Packager: Han-Wen Nienhuys -Icon: lelie_icon.gif -Buildroot: /tmp/lilypond-install - -%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 -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. -It includes a nice font of musical symbols. - -%prep -%setup -%build -./configure --disable-checking --disable-debugging --enable-printing --prefix=/usr --enable-optimise --enable-shared -make all -%install -rm -rf $RPM_BUILD_ROOT -strip lily/out/lilypond mi2mu/out/mi2mu -make -C Documentation gifs -make prefix="$RPM_BUILD_ROOT/usr" install -%files -%doc Documentation/out/AUTHORS.txt Documentation/out/CodingStyle.txt Documentation/out/INSTALL.txt Documentation/out/MANIFESTO.txt Documentation/out/PATCHES.txt Documentation/out/convert-mudela.txt Documentation/out/faq.txt Documentation/out/gnu-music.txt Documentation/out/index.txt Documentation/out/internals.txt Documentation/out/language.txt Documentation/out/lilypond.txt Documentation/out/links.txt Documentation/out/literature.txt Documentation/out/ly2dvi.txt Documentation/out/mi2mu.txt Documentation/out/mudela-book.txt Documentation/out/mutopia.txt Documentation/out/other-packages.txt BUGS TODO NEWS DEDICATION ANNOUNCE README -%doc input/abbrev.ly input/beam-bug.ly input/beams.ly input/cadenza.ly input/collisions.ly input/coriolan-alto.ly input/denneboom.ly input/dummy.tex input/font-body.ly input/font.ly input/font11.ly input/font13.ly input/font16.ly input/font20.ly input/font26.ly input/gourlay.ly input/keys.ly input/kortjakje.ly input/multi.ly input/pedal.ly input/praeludium-fuga-E.ly input/rhythm.ly input/scales.ly input/scripts.ly input/sleur.ly input/slur-bug.ly input/slurs.ly input/spacing.ly input/stem.ly input/test-lyrics.ly input/tril.ly input/twinkle-pop.ly input/twinkle.ly Documentation/mudela-man.doc Documentation/mudela.doc -%doc Documentation/out/lelie_logo.gif -/usr/bin/convert-mudela -/usr/bin/mudela-book -/usr/bin/lilypond -/usr/lib/libflower.so -/usr/bin/mi2mu -/usr/man/man1/mi2mu.1 -/usr/man/man1/lilypond.1 -/usr/man/man1/mudela-book.1 -/usr/man/man1/convert-mudela.1 -/usr/lib/texmf/texmf/tex/lilypond/ -/usr/lib/texmf/texmf/fonts/source/public/lilypond -/usr/share/lilypond/ -%post - -texhash # takes some time... -rm `find /var/lib/texmf -name 'feta*pk' -or -name 'feta*tfm'` - diff --git a/mf/feta-beams16.mf b/mf/feta-beams16.mf deleted file mode 100644 index 27968efe98..0000000000 --- a/mf/feta-beams16.mf +++ /dev/null @@ -1,11 +0,0 @@ -% vette-beams16.mf -% part of LilyPond's pretty-but-neat music font - -font_identifier:="vette-beams16"; -font_size 16; -mode_setup; - -staffsize#:=16pt#; -input feta-watzieik; -end. - diff --git a/mf/feta-beams20.mf b/mf/feta-beams20.mf deleted file mode 100644 index 0340e3e057..0000000000 --- a/mf/feta-beams20.mf +++ /dev/null @@ -1,14 +0,0 @@ -% (this was vette-beams16.mf) -% part of LilyPond's pretty-but-neat music font - -% -% - -font_identifier:="feta-beams20"; -font_size 20; -mode_setup; - -staffsize#:=20pt#; - -input feta-watzieik; -end. diff --git a/mf/feta-beams26.mf b/mf/feta-beams26.mf deleted file mode 100644 index 4cb1defc32..0000000000 --- a/mf/feta-beams26.mf +++ /dev/null @@ -1,14 +0,0 @@ -% (this was vette-beams16.mf) -% part of LilyPond's pretty-but-neat music font - -% -% - -font_identifier:="feta-beams26"; -font_size 26; -mode_setup; - -staffsize#:=26pt#; - -input feta-watzieik; -end. diff --git a/mf/feta-watzieik.mf b/mf/feta-watzieik.mf deleted file mode 100644 index a3676cc41c..0000000000 --- a/mf/feta-watzieik.mf +++ /dev/null @@ -1,30 +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; - -max_slope:=0.6; -slopes:=20; -elem_tan:=max_slope/slopes; -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;