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
+
+
+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
* 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'
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*'`
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
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
"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
\composer{Tarquinio Merula (1594/95-1665)}
%\instrument{M\"a\ss ig} % heu
%#%\tempo{M\"a\ss ig}
-\maketit
+\makelilytitle
\input{gallina.out}
\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
% \tempo{Moderato}
% \metron{4=120}
\instrument{Menuetto I} % heu
-\maketit
+\makelilytitle
\input scsii-menuetto.out
\end{document}
\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
\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}
\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
\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}
\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";
MAJOR_VERSION = 0
MINOR_VERSION = 1
-PATCH_LEVEL = 27
+PATCH_LEVEL = 28
MY_PATCH_LEVEL =
/** 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<Scalar>) 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<Scalar>) 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
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();
{
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
{
#ifndef NPRINT
DOUT << "Lookup: " << texsetting << " {\n";
- symtables_->print();
+ symtables_p_->print();
DOUT << "}\n";
#endif
}
Array<String> 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;
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;
}
Atom
Lookup::accidental (int j) const
{
- return (*symtables_)("accidentals")->lookup (String (j));
+ return (*symtables_p_)("accidentals")->lookup (String (j));
}
{
Array<String> 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;
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
if (type > 2)
type = 2;
- Symtable * st = (*symtables_)("balls");
+ Symtable * st = (*symtables_p_)("balls");
return st->lookup (String (type) + 'l');
}
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<String> a;
a.push (idx);
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<String> 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<Scalar> a) const
{
- Atom s((*symtables_)("param")->lookup ("meter"));
+ Atom s((*symtables_p_)("param")->lookup ("meter"));
s.tex_ = substitute_args (s.tex_,a);
return s;
}
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;
}
int idx = int (rint ((y/2.0 - 20) + 148));
- Atom s = (*symtables_)("param")->lookup ("brace");
+ Atom s = (*symtables_p_)("param")->lookup ("brace");
{
Array<String> a;
a.push (idx);
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
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<String> args;
args.push (sidx);
Atom
Lookup::rule_symbol (Real height, Real width) const
{
- Atom bs=(*symtables_)("beamslopes")->lookup ("horizontal");
+ Atom bs=(*symtables_p_)("beamslopes")->lookup ("horizontal");
Array<String> args;
args.push (print_dimen (height));
args.push (print_dimen (width));
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);
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";
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:
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
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
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
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
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 <hanwen@stack.nl>
\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}
/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{}}
\def\nometafont{\def\embeddedmf##1{}}
% dat heb je handig gedaan, lieverd!
-\nometafont
+%\nometafont
\nopostscript
-%\notex
+\notex
\def\EndLilyPondOutput{
\storeembedcount
\parindent=0pt
\newdimen\smallspace
\newdimen\interlinedist
-\newdimen\ledgerlinethickness
\newdimen\stemthickness
\newcount\n
\newdimen\balkheight
% We know better
\staffrulethickness=0.1\interlinedist
\stemthickness=\staffrulethickness
- \ledgerlinethickness=2\staffrulethickness
}
% stacked numbers; may be overruled in fetdefs
\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{}
\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}}
\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
}
projects / lilypond.git / commitdiff