From a0a2265e998de797121d8feb51eb07f561012e6a Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Thu, 30 Oct 1997 11:26:01 +0100 Subject: [PATCH] release: 0.1.28 --- BUGS | 1 + NEWS | 10 ++++ README | 7 ++- VERSION | 4 +- bin/make-docxx.sh | 2 +- init/feta16.ly | 2 +- input/gallina.tex | 2 +- input/scsii-menuetto.tex | 7 +-- input/standchen-16.tex | 10 ++-- input/standchen-20.tex | 13 +++-- input/standchen.ly | 3 +- lily/VERSION | 2 +- lily/include/lookup.hh | 76 ++++++++++++------------ lily/include/paper-def.hh | 6 ++ lily/lookup.cc | 65 +++++++-------------- lily/staff-sym.cc | 16 ++++- lily/tex-beam.cc | 6 +- lily/tex-slur.cc | 12 ++-- make/lelievijver.lsm | 8 +-- make/lilypond.lsm | 8 +-- make/lilypond.lsm.in | 4 +- make/lilypond.spec | 4 +- tex/fetdefs.tex | 119 +++++++++++++++++++------------------- tex/lilyponddefs.tex | 50 ---------------- tex/titledefs.tex | 18 +++++- 25 files changed, 214 insertions(+), 241 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/NEWS b/NEWS index f36c11d214..94c3a8d315 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,11 @@ + + +pl 28 + - revised Staff_symbol::brew_molecule_p () + - naming: \makelilytitle + - fixes for TeX titledefs (thanks, (?)) + - junked some obsolete pedal stuff. + pl 27.om-je-te-helpen-met-je-ps-spul.jcn1 - embedded slurs: * bf: placements @@ -7,6 +15,8 @@ pl 27.om-je-te-helpen-met-je-ps-spul.jcn1 * fixed mf: draw_slur * postscript macro: draw_slur +******** +oct 28 pl 27 - -t/--test switch for experimental stuff. - bf: debian optimize is not with 'z' 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/VERSION b/VERSION index 624560da3b..69a8453d2c 100644 --- a/VERSION +++ b/VERSION @@ -1,7 +1,7 @@ TOPLEVEL_MAJOR_VERSION = 0 TOPLEVEL_MINOR_VERSION = 1 -TOPLEVEL_PATCH_LEVEL = 27 -TOPLEVEL_MY_PATCH_LEVEL = jcn1 +TOPLEVEL_PATCH_LEVEL = 28 +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/make-docxx.sh b/bin/make-docxx.sh index b74572e399..17abe50efb 100644 --- a/bin/make-docxx.sh +++ b/bin/make-docxx.sh @@ -5,4 +5,4 @@ then fi p1=`find $LILYTOP -name '*.hh' |egrep -v out/` p2=`find $LILYTOP -name '*.cc' |egrep -v out/` -doc++ -d out/ -S -k -p $p1 $p2 +doc++ -d docxx/ -S -k -p $p1 $p2 diff --git a/init/feta16.ly b/init/feta16.ly index 7a6f1c99f8..14ac847ee3 100644 --- a/init/feta16.ly +++ b/init/feta16.ly @@ -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/input/scsii-menuetto.tex b/input/scsii-menuetto.tex index dc5daa4fcd..be358aa063 100644 --- a/input/scsii-menuetto.tex +++ b/input/scsii-menuetto.tex @@ -1,9 +1,8 @@ \documentclass{article} %UGH \usepackage{a4} -\oddsidemargin-1in\advance\oddsidemargin7.5mm +\advance\oddsidemargin-15mm \evensidemargin\oddsidemargin -\hsize210mm\vsize297mm % so what does a4 do, anyway? -\textwidth\hsize\advance\textwidth-15mm +\advance\textwidth30mm \begin{document} \input lilyponddefs \musixsixteendefs @@ -16,6 +15,6 @@ % \tempo{Moderato} % \metron{4=120} \instrument{Menuetto I} % heu -\maketit +\makelilytitle \input scsii-menuetto.out \end{document} diff --git a/input/standchen-16.tex b/input/standchen-16.tex index 7f7ab47f17..50081e7f9a 100644 --- a/input/standchen-16.tex +++ b/input/standchen-16.tex @@ -1,11 +1,9 @@ \documentclass{article} %UGH \usepackage{a4} -\oddsidemargin0mm +\advance\oddsidemargin-15mm \evensidemargin\oddsidemargin -\hsize210mm\vsize297mm % so what does a4 do, anyway? -\textwidth160mm -\topmargin0mm%\advance\topmargin10mm -\textheight\vsize\advance\textheight-50mm +\advance\textwidth30mm + %\pagestyle{empty} \begin{document} \input lilyponddefs @@ -16,7 +14,7 @@ \composer{Franz Schubert (1797-1828)} \instrument{M\"a\ss ig} % heu %#%\tempo{M\"a\ss ig} -\maketit +\makelilytitle \input{standchen-16.out} %\input lelie.tex \end{document} diff --git a/input/standchen-20.tex b/input/standchen-20.tex index b38054c5ab..f7af3f5151 100644 --- a/input/standchen-20.tex +++ b/input/standchen-20.tex @@ -1,11 +1,12 @@ \documentclass{article} %UGH \usepackage{a4} -\oddsidemargin-1in\advance\oddsidemargin7.5mm + +% +% UGH UGH +\advance\oddsidemargin-25mm \evensidemargin\oddsidemargin -\hsize210mm\vsize297mm % so what does a4 do, anyway? -\textwidth\hsize\advance\textwidth-15mm -\topmargin-1in\advance\topmargin10mm -\textheight\vsize\advance\textheight-35mm +\advance\textwidth30mm +\addtolength{\textheight}{20mm} \pagestyle{empty} \begin{document} \input lilyponddefs @@ -16,7 +17,7 @@ \composer{Franz Schubert (1797-1828)} \instrument{M\"a\ss ig} % heu %#%\tempo{M\"a\ss ig} -\maketit +\makelilytitle \input{standchen-20.out} %\input lelie.tex \end{document} diff --git a/input/standchen.ly b/input/standchen.ly index 8f70db6ba6..756a6c218d 100644 --- a/input/standchen.ly +++ b/input/standchen.ly @@ -493,7 +493,8 @@ themusic = \paper{ \paper_twenty % 20pt music uses whole pagewidth - linewidth= 195.\mm; + % ja Vette Pech. Koop maar aan A4 printer + linewidth= 185.\mm; gourlay_maxmeasures = 9.; \output "standchen-20.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/lily/include/lookup.hh b/lily/include/lookup.hh index d0616359e2..31f496a4b4 100644 --- a/lily/include/lookup.hh +++ b/lily/include/lookup.hh @@ -17,45 +17,45 @@ /** handy interface to symbol table */ struct Lookup { - Paper_def * paper_l_; - Symtables *symtables_; - String texsetting; - /* *************** */ - void add (String, Symtable*); - void print() const; - - Atom linestaff (int n, Real ss, Real w) const; - Atom fill (Box b) const; - Atom beam_element (int,int,Real=0) const; - - /// round slope to closest TeXslope - Atom beam (Real&,Real) const; - - Atom streepje (int type) const; - - Atom vbrace (Real &dy) const; - Atom meter (Array) const; - Atom stem (Real y1_pos, Real y2_pos) const; - Atom rule_symbol (Real height, Real width) const; - Atom accidental (int) const; - Atom ball (int) const; - Atom flag (int, Direction) const; - Atom rest (int, bool outside) const; - Atom clef (String) const; - Atom bar (String, Real height) const; + Paper_def * paper_l_; + Symtables *symtables_p_; + String texsetting; + + Lookup(); + Lookup (Lookup const &); + ~Lookup(); + + void add (String, Symtable*); + void print() const; + + Atom fill (Box b) const; + Atom beam_element (int,int,Real=0) const; + + /// round slope to closest TeXslope + Atom beam (Real&,Real) const; + + Atom streepje (int type) const; + + Atom vbrace (Real &dy) const; + Atom meter (Array) const; + Atom stem (Real y1_pos, Real y2_pos) const; + Atom rule_symbol (Real height, Real width) const; + Atom accidental (int) const; + Atom ball (int) const; + Atom flag (int, Direction) const; + Atom rest (int, bool outside) const; + Atom clef (String) const; + Atom bar (String, Real height) const; - Atom dots () const; - Atom slur (int dy, Real &dx, Direction dir) const; - Atom half_slur (int dy, Real &dx, Direction dir, int xpart) const; - Atom half_slur_middlepart (Real &dx, Direction dir) const; - Atom big_slur (int dy, Real &dx, Direction dir) const; - Atom text (String style, String text, int align = 1) const; - Atom script (String idx) const; - Atom hairpin (Real & width, bool decresc) const; - Atom dynamic (String) const; - Lookup(); - Lookup (Lookup const &); - ~Lookup(); + Atom dots () const; + Atom slur (int dy, Real &dx, Direction dir) const; + Atom half_slur (int dy, Real &dx, Direction dir, int xpart) const; + Atom half_slur_middlepart (Real &dx, Direction dir) const; + Atom big_slur (int dy, Real &dx, Direction dir) const; + Atom text (String style, String text, int align = 1) const; + Atom script (String idx) const; + Atom hairpin (Real & width, bool decresc) const; + Atom dynamic (String) const; }; #endif diff --git a/lily/include/paper-def.hh b/lily/include/paper-def.hh index e73959e435..d87a5e637d 100644 --- a/lily/include/paper-def.hh +++ b/lily/include/paper-def.hh @@ -42,7 +42,13 @@ public: virtual ~Paper_def(); DECLARE_MY_RUNTIME_TYPEINFO; + /** + Set or overwrite a variable + */ void set_var (String, Real); + /** + Read a variable. Crash if it doesn't exist. + */ Real get_var (String) const; void reinit(); Paper_def(); diff --git a/lily/lookup.cc b/lily/lookup.cc index bf432c3d11..0943b21e7e 100644 --- a/lily/lookup.cc +++ b/lily/lookup.cc @@ -24,24 +24,24 @@ Lookup::Lookup() { paper_l_ = 0; texsetting = "\\unknowntexsetting"; - symtables_ = new Symtables; + symtables_p_ = new Symtables; } Lookup::Lookup (Lookup const &s) { paper_l_ = s.paper_l_; texsetting = s.texsetting; - symtables_ = new Symtables (*s.symtables_); + symtables_p_ = new Symtables (*s.symtables_p_); } Lookup::~Lookup() { - delete symtables_; + delete symtables_p_; } void Lookup::add (String s, Symtable*p) { - symtables_->add (s, p); + symtables_p_->add (s, p); } void @@ -49,7 +49,7 @@ Lookup::print() const { #ifndef NPRINT DOUT << "Lookup: " << texsetting << " {\n"; - symtables_->print(); + symtables_p_->print(); DOUT << "}\n"; #endif } @@ -60,10 +60,10 @@ Lookup::text (String style, String text, int dir) const Array a; a.push (text); - Atom tsym = (*symtables_)("style")->lookup (style); + Atom tsym = (*symtables_p_)("style")->lookup (style); a[0] = substitute_args (tsym.tex_,a); - Atom s = (*symtables_)("align")->lookup (dir); + Atom s = (*symtables_p_)("align")->lookup (dir); s.tex_ = substitute_args (s.tex_,a); s.dim_ = tsym.dim_; return s; @@ -77,20 +77,20 @@ Lookup::ball (int j) const if (j > 2) j = 2; - Symtable * st = (*symtables_)("balls"); + Symtable * st = (*symtables_p_)("balls"); return st->lookup (String (j)); } Atom Lookup::rest (int j, bool o) const { - return (*symtables_)("rests")->lookup (String (j) + (o ? "o" : "")); + return (*symtables_p_)("rests")->lookup (String (j) + (o ? "o" : "")); } Atom Lookup::fill (Box b) const { - Atom s ((*symtables_)("param")->lookup ("fill")); + Atom s ((*symtables_p_)("param")->lookup ("fill")); s.dim_ = b; return s; } @@ -98,7 +98,7 @@ Lookup::fill (Box b) const Atom Lookup::accidental (int j) const { - return (*symtables_)("accidentals")->lookup (String (j)); + return (*symtables_p_)("accidentals")->lookup (String (j)); } @@ -107,7 +107,7 @@ Lookup::bar (String s, Real h) const { Array a; a.push (print_dimen (h)); - Atom ret=(*symtables_)("bars")->lookup (s);; + Atom ret=(*symtables_p_)("bars")->lookup (s);; ret.tex_ = substitute_args (ret.tex_, a); ret.dim_.y() = Interval (0, h); return ret; @@ -116,32 +116,32 @@ Lookup::bar (String s, Real h) const Atom Lookup::script (String s) const { - return (*symtables_)("scripts")->lookup (s); + return (*symtables_p_)("scripts")->lookup (s); } Atom Lookup::dynamic (String s) const { - return (*symtables_)("dynamics")->lookup (s); + return (*symtables_p_)("dynamics")->lookup (s); } Atom Lookup::clef (String s) const { - return (*symtables_)("clefs")->lookup (s); + return (*symtables_p_)("clefs")->lookup (s); } Atom Lookup::dots () const { - return (*symtables_)("dots")->lookup ("dot"); + return (*symtables_p_)("dots")->lookup ("dot"); } Atom Lookup::flag (int j, Direction d) const { char c = (d == UP) ? 'u' : 'd'; - return (*symtables_)("flags")->lookup (c + String (j)); + return (*symtables_p_)("flags")->lookup (c + String (j)); } Atom @@ -150,7 +150,7 @@ Lookup::streepje (int type) const if (type > 2) type = 2; - Symtable * st = (*symtables_)("balls"); + Symtable * st = (*symtables_p_)("balls"); return st->lookup (String (type) + 'l'); } @@ -162,7 +162,7 @@ Lookup::hairpin (Real &wid, bool decresc) const if (!idx) idx ++; wid = idx*6 PT; String idxstr = (decresc)? "decrescendosym" : "crescendosym"; - Atom ret=(*symtables_)("param")->lookup (idxstr); + Atom ret=(*symtables_p_)("param")->lookup (idxstr); Array a; a.push (idx); @@ -171,31 +171,10 @@ Lookup::hairpin (Real &wid, bool decresc) const return ret; } -Atom -Lookup::linestaff (int lines, Real interline_f, Real wid) const -{ - Atom s; - Real dy = (lines >0) ? (lines-1)*interline_f : 0; - s.dim_ = Box (Interval (0,wid), Interval (0,dy)); - - Array a; - a.push (lines); - a.push (print_dimen (wid)); - - s.tex_ = (*symtables_)("param")->lookup ("linestaf").tex_; - s.tex_ = substitute_args (s.tex_, a); - - - s.translate_axis (-s.extent ()[Y_AXIS].center (), Y_AXIS); - - return s; -} - - Atom Lookup::meter (Array a) const { - Atom s((*symtables_)("param")->lookup ("meter")); + Atom s((*symtables_p_)("param")->lookup ("meter")); s.tex_ = substitute_args (s.tex_,a); return s; } @@ -219,7 +198,7 @@ Lookup::stem (Real y1,Real y2) const a.push (print_dimen (y1)); a.push (print_dimen (y2)); - String src = (*symtables_)("param")->lookup ("stem").tex_; + String src = (*symtables_p_)("param")->lookup ("stem").tex_; s.tex_ = substitute_args (src,a); return s; } @@ -243,7 +222,7 @@ Lookup::vbrace (Real &y) const int idx = int (rint ((y/2.0 - 20) + 148)); - Atom s = (*symtables_)("param")->lookup ("brace"); + Atom s = (*symtables_p_)("param")->lookup ("brace"); { Array a; a.push (idx); diff --git a/lily/staff-sym.cc b/lily/staff-sym.cc index eda2e2b608..ebacee46f7 100644 --- a/lily/staff-sym.cc +++ b/lily/staff-sym.cc @@ -33,8 +33,20 @@ Staff_symbol::do_print() const Molecule* Staff_symbol::brew_molecule_p() const { - Atom a = paper()->lookup_l ()->linestaff (no_lines_i_, paper ()->interline_f(), width ().length ()); - return new Molecule (a); + Paper_def * p = paper(); + Atom rule = p->lookup_l ()->rule_symbol (p->get_var ("rule_thickness"), + width ().length ()); + Real inter = p->interline_f (); + Real height = (no_lines_i_-1) * inter/2; + Molecule * m = new Molecule; + for (int i=0; i < no_lines_i_; i++) + { + Atom a (rule); + a.translate_axis (height - i * inter, Y_AXIS); + m->add (a); + } + + return m; } Real diff --git a/lily/tex-beam.cc b/lily/tex-beam.cc index 6553e17868..e26b1c481d 100644 --- a/lily/tex-beam.cc +++ b/lily/tex-beam.cc @@ -24,7 +24,7 @@ Atom Lookup::beam_element (int sidx, int widx, Real slope) const { String name = String("slope"); - Atom bs=(*symtables_)("beamslopes")->lookup (name); + Atom bs=(*symtables_p_)("beamslopes")->lookup (name); Array args; args.push (sidx); @@ -41,7 +41,7 @@ Lookup::beam_element (int sidx, int widx, Real slope) const Atom Lookup::rule_symbol (Real height, Real width) const { - Atom bs=(*symtables_)("beamslopes")->lookup ("horizontal"); + Atom bs=(*symtables_p_)("beamslopes")->lookup ("horizontal"); Array args; args.push (print_dimen (height)); args.push (print_dimen (width)); @@ -64,7 +64,7 @@ Lookup::beam (Real &slope, Real width) const sidx = int (rint (slope * 20.0)); slope = sidx / 20.0; - Interval xdims = (*symtables_)("beamslopes")->lookup ("slope").dim_[X_AXIS]; + Interval xdims = (*symtables_p_)("beamslopes")->lookup ("slope").dim_[X_AXIS]; Real min_wid = xdims[LEFT]; Real max_wid = xdims[RIGHT]; assert(max_wid > 0); diff --git a/lily/tex-slur.cc b/lily/tex-slur.cc index 081869d058..05ff03a089 100644 --- a/lily/tex-slur.cc +++ b/lily/tex-slur.cc @@ -157,17 +157,17 @@ Lookup::slur (int dy , Real &dx, Direction dir) const Real fdx = dx; String ps = "\\embeddedps{\n"; // ugh, how bout " /draw_slur { ... } def " - ps += String_convert::int_str (fdx) + " " - + String_convert::int_str (fdy) + " " - + String_convert::int_str (dir) + + ps += String_convert::double_str (fdx) + " " + + String_convert::double_str (fdy) + " " + + String_convert::double_str (dir) + " draw_slur}"; String mf = "\\embeddedmf{\n"; mf += "input feta-sleur;\n"; mf += "draw_slur((0,0),"; - mf += "(" + String_convert::int_str (fdx) + "," - + String_convert::int_str (fdy) + "),"; - mf += String_convert::int_str (dir) + ");\n"; + mf += "(" + String_convert::double_str (fdx) + "," + + String_convert::double_str (fdy) + "),"; + mf += String_convert::double_str (dir) + ");\n"; mf += "end.\n"; mf += "}\n"; diff --git a/make/lelievijver.lsm b/make/lelievijver.lsm index 178d919856..2cbe781e3b 100644 --- a/make/lelievijver.lsm +++ b/make/lelievijver.lsm @@ -1,7 +1,7 @@ Begin3 Titel: LilyPond -Versie: 0.1.27 -Inschrijf datum: 28OCT97 +Versie: 0.1.28 +Inschrijf datum: 30OCT97 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.27.tar.gz + 395k lilypond-0.1.28.tar.gz Oorspronkelijke plek: pcnov095.win.tue.nl /pub/lilypond/ - 395k lilypond-0.1.27.tar.gz + 395k lilypond-0.1.28.tar.gz Copi"eer politie: GPL End diff --git a/make/lilypond.lsm b/make/lilypond.lsm index ea3783a607..8309de7edc 100644 --- a/make/lilypond.lsm +++ b/make/lilypond.lsm @@ -1,7 +1,7 @@ Begin3 Title: LilyPond -Version: 0.1.27 -Entered-date: 28OCT97 +Version: 0.1.28 +Entered-date: 30OCT97 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 - 430k lilypond-0.1.27.tar.gz + 440k lilypond-0.1.28.tar.gz Original-site: pcnov095.win.tue.nl /pub/lilypond/ - 430k lilypond-0.1.27.tar.gz + 440k lilypond-0.1.28.tar.gz Copying-policy: GPL End diff --git a/make/lilypond.lsm.in b/make/lilypond.lsm.in index fe77c29887..fc173051cf 100644 --- a/make/lilypond.lsm.in +++ b/make/lilypond.lsm.in @@ -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 - 430k lilypond-@TOPLEVEL_VERSION@.tar.gz + 440k lilypond-@TOPLEVEL_VERSION@.tar.gz Original-site: pcnov095.win.tue.nl /pub/lilypond/ - 430k lilypond-@TOPLEVEL_VERSION@.tar.gz + 440k lilypond-@TOPLEVEL_VERSION@.tar.gz Copying-policy: GPL End diff --git a/make/lilypond.spec b/make/lilypond.spec index 256b29664d..2e181faa08 100644 --- a/make/lilypond.spec +++ b/make/lilypond.spec @@ -1,9 +1,9 @@ Name: lilypond -Version: 0.1.27 +Version: 0.1.28 Release: 1 Copyright: GPL Group: Applications/Publishing -Source0: alpha.gnu.org:/gnu/lilypond/development/lilypond-0.1.27.tar.gz +Source0: alpha.gnu.org:/gnu/lilypond/development/lilypond-0.1.28.tar.gz Summary: A program for typesetting music. URL: http://www.stack.nl/~hanwen/lilypond Packager: Han-Wen Nienhuys diff --git a/tex/fetdefs.tex b/tex/fetdefs.tex index 86f366e260..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} @@ -67,73 +64,73 @@ /thin 0.2 def /thick thin 5 mul def /draw_slur { - % up or down? + % up or down? /dir exch def -% -% for mo*tex shift -% exch -% 1 copy /dx exch def -% exch +% +% 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 + % 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 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 + % 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 + % 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 + 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: @beginspecial @setspecial #1 @endspecial} + \special{ps: @beginspecial @setspecial #1 @endspecial} } \def\embeddedmf#1{ - \edef\embedid{feta-sleur-\number\embedcount} - \immediate\openout\embedfile=\embedid.mf - \global\advance\embedcount by 1 - \immediate\write\embedfile{#1} - \immediate\closeout\embedfile - \font\expandafter\embedid\expandafter=\embedid - \embedid\char0 + \edef\embedid{feta-sleur-\number\embedcount} + \immediate\openout\embedfile=\embedid.mf + \global\advance\embedcount by 1 + \immediate\write\embedfile{#1} + \immediate\closeout\embedfile + \font\expandafter\embedid\expandafter=\embedid + \embedid\char0 } \def\notex{\def\embeddedtex##1{}} @@ -141,9 +138,9 @@ \def\nometafont{\def\embeddedmf##1{}} % dat heb je handig gedaan, lieverd! -\nometafont +%\nometafont \nopostscript -%\notex +\notex \def\EndLilyPondOutput{ \storeembedcount diff --git a/tex/lilyponddefs.tex b/tex/lilyponddefs.tex index 4bd3ab3d5d..71c7001f76 100644 --- a/tex/lilyponddefs.tex +++ b/tex/lilyponddefs.tex @@ -51,7 +51,6 @@ \parindent=0pt \newdimen\smallspace \newdimen\interlinedist -\newdimen\ledgerlinethickness \newdimen\stemthickness \newcount\n \newdimen\balkheight @@ -106,7 +105,6 @@ % We know better \staffrulethickness=0.1\interlinedist \stemthickness=\staffrulethickness - \ledgerlinethickness=2\staffrulethickness } % stacked numbers; may be overruled in fetdefs @@ -121,29 +119,6 @@ \input taupindefs %\input eglerdefs -\musicmathdef\cup{91} % \cup -\musicmathdef\wedge{94} % \wedge -\musicmathdef\striepke{0} % heu? - -%% custom characters --- this should go: add to (meta!) font -% \def\myheel{\kern-.5ex\vbox{\cup}\kern-.5ex} -% \def\mytoe{\kern-.5ex\vbox{\wedge}\kern-.5ex} -\def\myheel{\vbox{\cup}} -\def\mytoe{\vbox{\wedge}} -% \def\mystriepke{\kern-1.1ex\vbox{\hbox{\kern-.05em\striepke}}\kern-1.1ex} -\def\mystriepke{\kern-1.8ex\vbox{\hbox{\kern-.05em\striepke}}\kern-1.8ex} - -\def\heel{\vbox{\myheel}} -\def\toe{\vbox{\mytoe}} -\def\backorfront{\mystriepke} - -\def\bheel{\vbox{\myheel\mystriepke}} -\def\btoe{\vbox{\mytoe\mystriepke}} -\def\fheel{\vbox{\mystriepke\myheel}} -\def\ftoe{\vbox{\mystriepke\mytoe}} -\def\heeltoe{\vbox{\myheel\mytoe}} -\def\toeheel{\vbox{\mytoe\myheel}} -%% \def\emptybar{} @@ -202,31 +177,6 @@ \def\hslurcharu#1{{\hslurufont\char#1}} \def\hslurchard#1{{\hslurdfont\char#1}} -\def\lines#1#2#3{% - \vbox{\kern-\interstaffrule - \n=0\nointerlineskip% - \loop\ifnum\n<#1\advance\n by1% - \kern\interstaffrule - \nointerlineskip - \vbox to 0pt{\hrule height .5#3 depth .5#3 width#2% - \vss}\nointerlineskip - \repeat - }} - -%% -% Ugh. Need to redo this. Wish we had PS. -% -\def\topledgerlines#1#2{\dist#1 - \topalign{\hbox{\kern-.25\dist\lines{#2}{1.5\dist}{\ledgerlinethickness}}}} - -\def\botledgerlines#1#2{\dist#1 - \botalign{\hbox{\kern-.25\dist\lines{#2}{1.5\dist}{\ledgerlinethickness}}}} - -% -% a staffsymbol with #1 lines, width #2 -% bottom at baseline -\def\linestafsym#1#2{\leftalign{\botalign{\lines{#1}{#2}{\staffrulethickness}}}} - \def\stem#1#2{\hbox{\kern -.5\stemthickness \vrule width\stemthickness height#2 depth-#1}} diff --git a/tex/titledefs.tex b/tex/titledefs.tex index 314d675968..000cb6f1f6 100644 --- a/tex/titledefs.tex +++ b/tex/titledefs.tex @@ -6,16 +6,30 @@ \def\EndLilyPondOutput{\endinput} \def\thetitle{} \def\thecomposer{} +\def\thearranger{} \def\theinstrument{} +\def\theLineOne{} +\def\theLineTwo{} +\def\theLineThree{} +\def\lineOne#1{\def\theLineOne{#1}} +\def\lineTwo#1{\def\theLineTwo{#1}} +\def\lineThree#1{\def\theLineThree{#1}} \def\title#1{\def\thetitle{#1}} \def\composer#1{\def\thecomposer{#1}} +\def\arranger#1{\def\thearranger{#1}} \def\instrument#1{\def\theinstrument{#1}} -\def\maketit{ +\def\makelilytitle{ \begin{center} {\Large\bfseries\thetitle}\\ \vskip12pt - {\bfseries\theinstrument}\hfill{\scshape\thecomposer} + {\scshape\theLineOne} + {\hfill\scshape\thecomposer} + \vskip4pt + {\bfseries\theLineTwo} + {\bfseries\thearranger} \end{center} + \bfseries\theLineThree + \bfseries\theinstrument \bigskip } -- 2.39.5