From c2e08a97ea475f43a0884dac9490ee1e48a87f16 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Wed, 24 Sep 1997 12:27:25 +0200 Subject: [PATCH] release: 0.1.17 --- AUTHORS.text | 8 +- BUGS | 2 +- Documentation/AUTHORS.pod | 5 +- Documentation/gnu-music.pod | 3 +- NEWS | 14 +-- TODO | 13 ++- VERSION | 4 +- bin/Makefile | 2 +- bin/clean-fonts | 5 ++ init/dyn10.ly | 2 +- init/font-en-tja16.ly | 13 +-- init/font-en-tja20.ly | 13 +-- init/table16.ly | 5 +- init/table20.ly | 3 +- input/font.ly | 4 +- input/toccata-fuga-E.ly | 14 +-- lily/VERSION | 2 +- lily/include/symbol.hh | 2 - lily/lookup.cc | 4 +- lily/symtable.cc | 8 +- lily/tex-beam.cc | 31 ++++--- make/lilypond.lsm | 8 +- make/lilypond.spec | 6 +- mf/Makefile | 4 +- mf/dimen.tex | 2 +- mf/eindelijk.mf | 175 ------------------------------------ mf/font-en-tja16.mf | 1 - mf/font-en-tja20.mf | 1 - tex/eglerdefs.tex | 50 +++++++---- tex/fetdefs.tex | 21 +++++ tex/lilyponddefs.tex | 13 ++- tex/taupindefs.tex | 32 +++---- 32 files changed, 164 insertions(+), 306 deletions(-) create mode 100755 bin/clean-fonts delete mode 100644 lily/include/symbol.hh delete mode 100644 mf/eindelijk.mf create mode 100644 tex/fetdefs.tex diff --git a/AUTHORS.text b/AUTHORS.text index 7de007d522..c37d5dfba1 100644 --- a/AUTHORS.text +++ b/AUTHORS.text @@ -25,7 +25,7 @@ AAAAUUUUTTTTHHHHOOOORRRRSSSS Documentation/mudela.pod, lib/*source-file*, lib/duration.cc, lib/source*, flower/*{list,cursor}*, lily/rest-collision*, lily/*abbreviation*, conflily, - cygnus w32 stuff, lily/*perf*, some input files + cygnus w32 stuff, lily/*perf*, some input files, mf/* and corresponding header files. @@ -52,8 +52,8 @@ CCCCOOOONNNNTTTTRRRRIIIIBBBBUUUUTTTTOOOORRRRSS look at the SMALLISH PROJECTS section of in the file _T_O_D_O. Some do not involve coding C++ - [And of course, J.S.Bach, F.Schubert, T. Merula and - W.A.Mozart] + [And of course we sincerely thank J.S.Bach, F.Schubert, T. + Merula and W.A.Mozart for their beautiful music] @@ -61,6 +61,6 @@ CCCCOOOONNNNTTTTRRRRIIIIBBBBUUUUTTTTOOOORRRRSS -11/Sep/97 LilyPond 0.1.14 1 +23/Sep/97 LilyPond 0.1.17 1 diff --git a/BUGS b/BUGS index 433d3c5f3f..95493cbd7d 100644 --- a/BUGS +++ b/BUGS @@ -1,6 +1,6 @@ Document Really Ugly Bugs (coredumps, assert fails, etc) -[Solaris] +[Solaris, fixed in pl13] Stack frame overwrite on Solaris 2.x (this will produce a seg fault, signal 11). Stacktrace diff --git a/Documentation/AUTHORS.pod b/Documentation/AUTHORS.pod index 313befdca0..16f62c203f 100644 --- a/Documentation/AUTHORS.pod +++ b/Documentation/AUTHORS.pod @@ -24,7 +24,7 @@ lily/midi-*, mi2mu/*, parts flower/string*.cc, make/*.make, */Makefile parts of Documentation/mudela.pod, lib/*source-file*, lib/duration.cc, lib/source*, flower/*{list,cursor}*, lily/rest-collision*, lily/*abbreviation*, conflily, cygnus w32 stuff, lily/*perf*, some -input files +input files, mf/* and corresponding header files. @@ -68,4 +68,5 @@ Your name could be here! If you want to help, then take a look at the SMALLISH PROJECTS section of in the file F. Some do not involve coding C++ -[And of course, J.S.Bach, F.Schubert, T. Merula and W.A.Mozart] +[And of course we sincerely thank J.S.Bach, F.Schubert, T. Merula and +W.A.Mozart for their beautiful music] diff --git a/Documentation/gnu-music.pod b/Documentation/gnu-music.pod index 07e30ba4ab..21a6385130 100644 --- a/Documentation/gnu-music.pod +++ b/Documentation/gnu-music.pod @@ -95,8 +95,7 @@ of use and power. Preferably in Metafont, suited to both screen display and use on paper; This is needed because -1. the copyright heritage of -{Opus,Musix}tex is unclear. +1. the copyright heritage of {Opus,Musix}tex is unclear. 2. We don't have any legal papers which make these fonts free (to use and alter) diff --git a/NEWS b/NEWS index a7d1e77cd4..296386883b 100644 --- a/NEWS +++ b/NEWS @@ -1,7 +1,9 @@ +pl 17 + - bf: ledgerline width + - bf: toccata-fuga-E + - took out some hardwiring of tex-beam + pl 16.jcn2 - - 8-128 rests - -pl 16.jcn1 - mf-to-table.in: generate mozarella metric info tables - autometric.mf: write metric info to mf logfile - ital-r.mf, smaller ital-m.mf @@ -10,16 +12,18 @@ pl 16.jcn1 - even more pronounced bolletjes -- how 'bout this wendy? - quarter and half note after drawings (a/b less distinct) +***** +sep 19 pl 16 - - bf: doco about {Mus*,Opus}TeX + - revised mudela-man a bit - ; optional after \musicidentifier + - bf: doco about {Mus*,Opus}TeX - bf: configure: MFDIR - bf: String::operator bool () removed - bf: String::operator char const * () removed - bf: Line_spacer::~Line_spacer () added: plugged memleak - bf: Line_of_score::do_unlink () call Spanner::do_unlink - bf: rests in beams - - bfs: mudela-man - bf: textnatural - bf: 20 pt flags - bf: longarest diff --git a/TODO b/TODO index 67b807a4c2..9caea67497 100644 --- a/TODO +++ b/TODO @@ -6,19 +6,20 @@ done, or is an idea that I want to think about Most of the items are marked in the code as well, with full explanation. grep for TODO and ugh/ugr + * Make general "spanning"-elements and "placer"-elements + - naming Mozarella, Madeira, Muella, Fontaigna? - bf: abbrevs over whole note - scoping for properties - { \multi 2 < { \stemup .. } { \stemdown .. } > + { c4 + \multi 2 < { \stemup .. } { \stemdown .. } > c2 } this modifies \stem for the c2 - * Fix ledgerlines - * use properties for: - Text_style - default_octave @@ -37,6 +38,8 @@ grep for TODO and ugh/ugr * give Items/Spanners access to unbroken originals + * Score_bar/Piano_braces, are *not* ordinary bars + 3RD PARTY BUGS: * ICE: spring-spacer::calcideal() @@ -183,8 +186,6 @@ languages: * Redo fonts - adapt for multiple font sizes. - - hack up mf sources for decent spacing info (and then - read AFM/TFM directly, for text too) * Font support: - mixed fontsizes @@ -414,5 +415,3 @@ Mudela. - 1 thread per Translator * Use hooks/dependency graphs for properties - - * Make general "spanning"-elements and "placer"-elements diff --git a/VERSION b/VERSION index be1ba52802..fabc29c721 100644 --- a/VERSION +++ b/VERSION @@ -1,6 +1,6 @@ TOPLEVEL_MAJOR_VERSION = 0 TOPLEVEL_MINOR_VERSION = 1 -TOPLEVEL_PATCH_LEVEL = 16 +TOPLEVEL_PATCH_LEVEL = 17 # use to send patches, always empty for released version: -TOPLEVEL_MY_PATCH_LEVEL = .jcn2 +TOPLEVEL_MY_PATCH_LEVEL = diff --git a/bin/Makefile b/bin/Makefile index bfee282e45..87c5cb3bcc 100644 --- a/bin/Makefile +++ b/bin/Makefile @@ -5,7 +5,7 @@ include $(depth)/make/Include.make # list of distribution files: SCRIPTS = clearlily cpgento make-patch lily.efence \ - make-version release conflily + make-version release conflily clean-fonts PERL_SCRIPTS_IN = $(wildcard *.in) PERL_SCRIPTS = $(addprefix $(outdir)/, $(PERL_SCRIPTS_IN:.in=)) EXTRA_DISTFILES = $(SCRIPTS) $(PERL_SCRIPTS_IN) diff --git a/bin/clean-fonts b/bin/clean-fonts new file mode 100755 index 0000000000..ae65586662 --- /dev/null +++ b/bin/clean-fonts @@ -0,0 +1,5 @@ +#!/bin/sh + +# remove possibly stale .pk/.tfm files + +rm `locate font-en-tja| egrep '.*pk$|.*tfm$'` diff --git a/init/dyn10.ly b/init/dyn10.ly index 78f4e3b7e9..6819259da4 100644 --- a/init/dyn10.ly +++ b/init/dyn10.ly @@ -1,4 +1,4 @@ -% generated at Wed Sep 24 02:26:26 1997 from out/dyn10.log +% generated at Mon Sep 22 21:28:05 1997 from out/dyn10.log % changes will be lost % dyn=\symboltables { % } % dyn diff --git a/init/font-en-tja16.ly b/init/font-en-tja16.ly index 48655cbee9..906985ce02 100644 --- a/init/font-en-tja16.ly +++ b/init/font-en-tja16.ly @@ -1,18 +1,11 @@ -% generated at Wed Sep 24 02:26:34 1997 from out/font-en-tja16.log +% generated at Mon Sep 22 22:26:51 1997 from out/font-en-tja16.log % changes will be lost % font-en-tja=\symboltables { "balls" = \table { "0" "\wholeball" 0.00\pt 8.64\pt 4.80\pt 0.00\pt - "1" "\halfball" 0.00\pt 6.01\pt 4.80\pt 0.00\pt - "2" "\quartball" 0.00\pt 5.76\pt 4.80\pt 0.00\pt + "1" "\halfball" 0.00\pt 5.97\pt 4.80\pt 0.00\pt + "2" "\quartball" 0.00\pt 5.88\pt 4.80\pt 0.00\pt "-1" "\breveball" 0.00\pt 9.60\pt 4.80\pt 0.00\pt "-2" "\longaball" 0.00\pt 9.60\pt 4.80\pt 0.00\pt } - "almostrests" = \table { - "-2" "\eighthrest" 0.00\pt 4.40\pt 6.60\pt 0.00\pt - "-2" "\sixteenthrest" 0.00\pt 4.40\pt 10.27\pt 0.00\pt - "-2" "\thirtysecondrest" 0.00\pt 4.40\pt 13.93\pt 0.00\pt - "-2" "\sixtyfourthrest" 0.00\pt 4.40\pt 17.60\pt 0.00\pt - "-2" "\hundredtwentyeighthrest" 0.00\pt 4.40\pt 21.27\pt 0.00\pt - } % } % font-en-tja diff --git a/init/font-en-tja20.ly b/init/font-en-tja20.ly index 4b55a59965..c5e308b694 100644 --- a/init/font-en-tja20.ly +++ b/init/font-en-tja20.ly @@ -1,18 +1,11 @@ -% generated at Wed Sep 24 02:26:42 1997 from out/font-en-tja20.log +% generated at Mon Sep 22 22:28:11 1997 from out/font-en-tja20.log % changes will be lost % font-en-tja=\symboltables { "balls" = \table { "0" "\wholeball" 0.00\pt 10.44\pt 5.80\pt 0.00\pt - "1" "\halfball" 0.00\pt 7.26\pt 5.80\pt 0.00\pt - "2" "\quartball" 0.00\pt 6.97\pt 5.80\pt 0.00\pt + "1" "\halfball" 0.00\pt 7.21\pt 5.80\pt 0.00\pt + "2" "\quartball" 0.00\pt 7.10\pt 5.80\pt 0.00\pt "-1" "\breveball" 0.00\pt 11.60\pt 5.80\pt 0.00\pt "-2" "\longaball" 0.00\pt 11.60\pt 5.80\pt 0.00\pt } - "almostrests" = \table { - "-2" "\eighthrest" 0.00\pt 5.40\pt 8.10\pt 0.00\pt - "-2" "\sixteenthrest" 0.00\pt 5.40\pt 12.60\pt 0.00\pt - "-2" "\thirtysecondrest" 0.00\pt 5.40\pt 17.10\pt 0.00\pt - "-2" "\sixtyfourthrest" 0.00\pt 5.40\pt 21.60\pt 0.00\pt - "-2" "\hundredtwentyeighthrest" 0.00\pt 5.40\pt 26.10\pt 0.00\pt - } % } % font-en-tja diff --git a/init/table16.ly b/init/table16.ly index 6785bf7569..99a3a295a2 100644 --- a/init/table16.ly +++ b/init/table16.ly @@ -166,8 +166,9 @@ table_sixteen= } "beamslopes" = \table { - "slope" "\beamslope{%}{%}" - "horizontal" "\rulesym{%}{%}" + "uslope" "\beamuslope{%}{%}" 2.0\pt 64.0\pt 0.0\pt 0.0\pt + "dslope" "\beamdslope{%}{%}" 2.0\pt 64.0\pt 0.0\pt 0.0\pt + "horizontal" "\rulesym{%}{%}" } } diff --git a/init/table20.ly b/init/table20.ly index 849e453c4f..c2a8f02bca 100644 --- a/init/table20.ly +++ b/init/table20.ly @@ -166,7 +166,8 @@ table_twenty = } "beamslopes" = \table { - "slope" "\beamslope{%}{%}" + "uslope" "\beamuslope{%}{%}" 2.0\pt 64.0\pt 0.0\pt 0.0\pt + "dslope" "\beamdslope{%}{%}" 2.0\pt 64.0\pt 0.0\pt 0.0\pt "horizontal" "\rulesym{%}{%}" } } diff --git a/input/font.ly b/input/font.ly index afda043a58..4e3a499da1 100644 --- a/input/font.ly +++ b/input/font.ly @@ -10,8 +10,8 @@ TestedFeatures font-en-tja \melodic{ \octave c'; \meter 4/4; - a\longa - a\breve + % \longa + % \breve % \brevis c1 g c' a' c2 g c' a' c4 g c' a' diff --git a/input/toccata-fuga-E.ly b/input/toccata-fuga-E.ly index 9b9bb6fc92..091aa71c11 100644 --- a/input/toccata-fuga-E.ly +++ b/input/toccata-fuga-E.ly @@ -139,12 +139,16 @@ break = \melodic{ % these should be two separate scores... \score{ - < - \type Grandstaff \multi 3 < - { \toccata_right \break \fuga2_right } - { \toccata_left \break \fuga2_left } + \type Score < + \type Grandstaff < + \type Staff=treble { + \toccata_right \break \fuga2_right + } + \type Staff=bass { + \toccata_left \break \fuga2_left + } > - \type Staff { \toccata_pedal \break \fuga2_pedal } + \type Staff=pedal { \toccata_pedal \break \fuga2_pedal } > \paper{} \midi{ diff --git a/lily/VERSION b/lily/VERSION index bb30177899..c905573ecc 100644 --- a/lily/VERSION +++ b/lily/VERSION @@ -1,6 +1,6 @@ MAJOR_VERSION = 0 MINOR_VERSION = 1 -PATCH_LEVEL = 15 +PATCH_LEVEL = 17 # use to send patches, always empty for released version: # include separator: ".postfix", "-pl" makes rpm barf diff --git a/lily/include/symbol.hh b/lily/include/symbol.hh deleted file mode 100644 index 65296f8106..0000000000 --- a/lily/include/symbol.hh +++ /dev/null @@ -1,2 +0,0 @@ - -#error diff --git a/lily/lookup.cc b/lily/lookup.cc index ae35e4082f..f67efd08bb 100644 --- a/lily/lookup.cc +++ b/lily/lookup.cc @@ -169,9 +169,7 @@ Lookup::streepjes (int type, int i) const } // ugh - Real w = paper_l_->note_width (); - if (type <= 0) - w *= 1.46; + Real w = ball (type).dim_[X_AXIS].length (); Atom ret = (*symtables_)("streepjes")->lookup (idx); diff --git a/lily/symtable.cc b/lily/symtable.cc index 9098e18ad4..f04ac53df5 100644 --- a/lily/symtable.cc +++ b/lily/symtable.cc @@ -51,7 +51,13 @@ Symtable::lookup (String s) const Symtable* Symtables::operator()(String s) { - return Dictionary::operator[](s); + if (!elt_b (s)) + { + warning ("Symtables `" + s + "\' unknown"); + return 0; + } + else + return Dictionary::operator[](s); } void Symtables::print() const diff --git a/lily/tex-beam.cc b/lily/tex-beam.cc index 5bc8ebbfcc..193e6d4e6f 100644 --- a/lily/tex-beam.cc +++ b/lily/tex-beam.cc @@ -18,11 +18,14 @@ #include "dimen.hh" #include "debug.hh" #include "lookup.hh" +#include "misc.hh" Atom Lookup::beam_element (int sidx, int widx, Real slope) const { - Atom bs=(*symtables_)("beamslopes")->lookup ("slope"); + char dir_char = slope >0 ? 'u' : 'd'; + String name = dir_char + String("slope"); + Atom bs=(*symtables_)("beamslopes")->lookup (name); Array args; args.push (sidx); @@ -39,7 +42,7 @@ Lookup::beam_element (int sidx, int widx, Real slope) const static int slope_index (Real &s) { - if (abs (s) > 0.5) + if (abs (s) > 0.5) { WARN << "beam steeper than 0.5 (" << s << ")\n"; s = sign (s) * 0.5; @@ -49,9 +52,9 @@ slope_index (Real &s) s = i/20.0; if (s>0) - return 6*i +122; + return 6*i; else - return -6 * i+ 186; + return -6 * i; } Atom @@ -73,13 +76,18 @@ Lookup::beam (Real &slope, Real width) const int sidx = slope_index (slope); if (!slope) return rule_symbol (2 PT, width); - if (width < 2 PT) + + Interval xdims = (*symtables_)("beamslopes")->lookup ("uslope").dim_[X_AXIS]; + Real min_wid = xdims[LEFT]; + Real max_wid = xdims[RIGHT]; + + if (width < min_wid) { WARN<<"Beam too narrow. (" << print_dimen (width) <<")\n"; - width = 2 PT; + width = min_wid; } - Real elemwidth = 64 PT; - int widx = 5; + Real elemwidth = max_wid; + int widx = intlog2 (int (max_wid/min_wid)); Molecule m; @@ -92,16 +100,15 @@ Lookup::beam (Real &slope, Real width) const Real last_x = width - elemwidth; Real x = overlap; Atom elem (beam_element (sidx, widx, slope)); - Atom a (elem); - m.add (a); + m.add (elem); while (x < last_x) { - a=elem; + Atom a(elem); a.translate (Offset (x-overlap, (x-overlap)*slope)); m.add (a); x += elemwidth - overlap; } - a=elem; + Atom a(elem); a.translate (Offset (last_x, (last_x) * slope)); m.add (a); diff --git a/make/lilypond.lsm b/make/lilypond.lsm index db9a106acb..41a21342ba 100644 --- a/make/lilypond.lsm +++ b/make/lilypond.lsm @@ -1,7 +1,7 @@ Begin3 Title: LilyPond -Version: 0.1.16 -Entered-date: 18SEP97 +Version: 0.1.17 +Entered-date: 24SEP97 Description: LilyPond is the GNU Project music typesetter. This program converts music definition files into visual or auditive output: it can typeset formatted @@ -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 - 395k lilypond-0.1.16.tar.gz + 395k lilypond-0.1.17.tar.gz Original-site: pcnov095.win.tue.nl /pub/lilypond/ - 395k lilypond-0.1.16.tar.gz + 395k lilypond-0.1.17.tar.gz Copying-policy: GPL End diff --git a/make/lilypond.spec b/make/lilypond.spec index cde899ab22..b9415b39bd 100644 --- a/make/lilypond.spec +++ b/make/lilypond.spec @@ -1,9 +1,9 @@ Name: lilypond -Version: 0.1.16 +Version: 0.1.17 Release: 1 Copyright: GPL Group: Applications/Publishing -Source0: pcnov095.win.tue.nl:/pub/lilypond/lilypond-0.1.16.tar.gz +Source0: pcnov095.win.tue.nl:/pub/lilypond/lilypond-0.1.17.tar.gz Summary: A preprocessor to make TeX typeset music. URL: http://www.stack.nl/~hanwen/lilypond Packager: Han-Wen Nienhuys @@ -29,7 +29,7 @@ make -C Documentation gifs make prefix="$RPM_BUILD_ROOT/usr" install %files %doc Documentation/out/AUTHORS.text Documentation/out/CodingStyle.text Documentation/out/INSTALL.text Documentation/out/MANIFESTO.text Documentation/out/convert-mudela.text Documentation/out/faq.text Documentation/out/gnu-music.text Documentation/out/index.text Documentation/out/internals.text Documentation/out/language.text Documentation/out/lilypond.text Documentation/out/links.text Documentation/out/literature.text Documentation/out/mi2mu.text Documentation/out/mudela-book.text Documentation/out/mutopia.text Documentation/out/other-packages.text BUGS TODO NEWS DEDICATION ANNOUNCE README -%doc input/abbrev.ly input/beams.ly input/cadenza.ly input/collisions.ly input/coriolan-alto.ly input/font.ly input/gallina.ly input/gallina.tex input/header.ly input/keys.ly input/kortjakje.ly input/multi.ly input/pedal.ly input/rhythm.ly input/scales.ly input/scripts.ly input/scsii-menuetto.ly input/scsii-menuetto.tex input/slurs.ly input/standchen-16.tex input/standchen-20.tex input/standchen.ly input/toccata-fuga-E.ly input/twinkle-pop.ly input/twinkle.ly input/wtk1-fugue1.ly input/wtk1-fugue2.ly input/wtk1-prelude1.ly Documentation/mudela-course.doc Documentation/mudela-man.doc +%doc input/abbrev.ly input/beams.ly input/cadenza.ly input/collisions.ly input/coriolan-alto.ly input/font.ly input/gallina.ly input/gallina.tex input/header.ly input/keys.ly input/kortjakje.ly input/multi.ly input/pedal.ly input/rhythm.ly input/scales.ly input/scripts.ly input/scsii-menuetto.ly input/scsii-menuetto.tex input/slurs.ly input/standchen-16.ly input/standchen-16.tex input/standchen-20.ly input/standchen-20.tex input/standchen.ly input/toccata-fuga-E.ly input/twinkle-pop.ly input/twinkle.ly input/wtk1-fugue1.ly input/wtk1-fugue2.ly input/wtk1-prelude1.ly Documentation/mudela-course.doc Documentation/mudela-man.doc %doc Documentation/out/lelie_logo.gif /usr/bin/convert-mudela /usr/bin/mudela-book diff --git a/mf/Makefile b/mf/Makefile index 2a318c4c73..556d777dd7 100644 --- a/mf/Makefile +++ b/mf/Makefile @@ -44,8 +44,8 @@ localuninstall: # dependencies: # $(tableout)/dyn10.ly: autometric.mf ital-f.mf ital-m.mf ital-p.mf ital-r.mf ital-s.mf ital-z.mf dyn10.mf -$(tableout)/font-en-tja16.ly: autometric.mf bolletjes.mf eindelijk.mf font-en-tja16.mf -$(tableout)/font-en-tja20.ly: autometric.mf bolletjes.mf eindelijk.mf font-en-tja20.mf +$(tableout)/font-en-tja16.ly: autometric.mf bolletjes.mf font-en-tja16.mf +$(tableout)/font-en-tja20.ly: autometric.mf bolletjes.mf font-en-tja20.mf # diff --git a/mf/dimen.tex b/mf/dimen.tex index 9134edf382..dd1df884d6 100644 --- a/mf/dimen.tex +++ b/mf/dimen.tex @@ -2,7 +2,7 @@ % A tex file to help determine dims. % -\font\musicfont=opus20 %musix16 +\font\musicfont=musix16 \font\slurfont=xslu16 \font\specfont=musixspx \def\thefont{\musicfont} diff --git a/mf/eindelijk.mf b/mf/eindelijk.mf deleted file mode 100644 index eb5cb06e58..0000000000 --- a/mf/eindelijk.mf +++ /dev/null @@ -1,175 +0,0 @@ -% eindelijk.mf -% LilyPond's own rest(s) - - -interline#:=staffsize#/(stafflines-1)+stafflinethickness#; -% ugh -define_pixels(interline); -nhh#:=interline#; -nhw#:=6/5*interline#; -define_pixels(nhh,nhw); - - -if false: -beginchar(62, 0, 4nhh#, 0); "quarter rest"; -% rthin:= 1/8 nhh; % .1 -% rthick:= 2 thick+rthin; % .2 - alpha:= -50; % .3 - penpos1(rthin, 90+alpha); % .4 - penpos5(rthin, alpha); % .5,10 - penpos2(rthick, alpha); % .6 - penpos4(rthick, alpha); % - penpos3(3/4rthick, alpha); % .7 - penpos6(4/3thick, alpha); - penpos7(rthin, 45); - y1l = 4nhh - 1/2nhh; - x1l = 1/2nhh; - z2r = z1 +(nhh* right) rotated alpha; - z3 = 1/2[z2,z4]; - z4 = (nhw,4nhh) scaled .55; - z5 = z4l+(nhh* right) rotated alpha; - x6l = x4l; y6r = 1.45nhh; - x7 = .9nhw; y7= nhh-1/8nhh; - z10 = z5r shifted (sqrt(2)*rthin/4,sqrt(2)*rthin/4); - - pickup penrazor scaled rthin rotated 45; - draw z1--z2r; draw z4l--z10; - penstroke z2e..z3e..z4e; - penstroke z5e..z6e..z7e; - penlabels(1,2,3,4,5,6,7,10); - shift_pic (-.2nhw, 0); -endchar; - -fi - - -rthin:=1/8interline; -rthick:=2rthin; - -med#:=1/33designsize; -thick#:=1/16designsize; -define_blacker_pixels(med); -pen med_pen; -med_pen:= pencircle scaled med; - -def shift_pic (expr pone, ptwo) = - currentpicture:=currentpicture shifted (round(pone),round(ptwo)) -enddef; - -fet_begingroup("almostrests"); - -stem#:=interline#/8; -flare#:=interline#/2; -define_pixels(stem,flare); - -def crook(expr a,w) = - begingroup; - save x,y; - penpos1(flare/2,-90); - penpos2(flare/2,0); - penpos3(flare/2,90); - penpos4(flare/2,180); - x4r=xpart a-w; y3r=ypart a+flare/4; - x1l=x2l=x3l=x4l; - y1l=y2l=y3l=y4l; - penpos5(stem,250); - x5=x4r+9/8flare; y5r=y1r; - penpos6(stem,260); - x6l=xpart a; y6l=ypart a; - penstroke z1e..z2e..z3e..z4e..z1e..z5e{right}..z6e; - penlabels(1,2,3,4,5,6); - endgroup; - enddef; - -def brush(expr a,w,b,v) = - begingroup; - save x,y; - z1=a; z2=b; - penpos3(w,angle(z2-z1)+90); - penpos4(w,angle(z2-z1)); - penpos5(v,angle(z1-z2)+90); - penpos6(v,angle(z1-z2)); - x3=x4=x1; y3=y4=y1; - x5=x6=x2; y5=y6=y2; - fill z3r{z1-z2}..z4l..{z2-z1}z3l..z5r{z2-z1}..z6l..{z1-z2}z5l..cycle; - penlabels(1,2,3,4,5,6); - endgroup; - enddef; - -fet_beginchar(incr code,interline#,1.5interline#,0,"Eighth rest","-2","eighthrest"); - save x,y; - x1=w-stem/6; y1=h-flare/4; - crook (z1,w-stem/6); - z2-z1=whatever*dir70; - y2=stem/2; - brush (z1,stem/3,z2,stem); - endchar; - -fet_beginchar(incr code,interline#,1.5interline#+5/3flare#,0,"Sixteenth rest","-2","sixteenthrest"); - save x,y; - x1=w-stem/6; y1=h-flare/4; - crook (z1,7/8w); - z3-z1=whatever*dir74; - y3=y1-5/3flare; - crook (z3,7/8w); - z2-z1=whatever*dir74; - y2=stem/2; - brush (z1,stem/3,z2,stem); - endchar; - -fet_beginchar(incr code,interline#,1.5interline#+10/3flare#,0,"Thirtysecond rest","-2","thirtysecondrest"); - save x,y; - x1=w-stem/6; y1=h-flare/4; - z2-z1=whatever*dir76; - y2=stem/2; - brush (z1,stem/3,z2,stem); - crook (z1,7/8w); - z3-z1=whatever*dir76; - y3=y1-5/3flare; - crook (z3,7/8w); - z4-z1=whatever*dir76; - y4=y1-10/3flare; - crook (z4,7/8w); - endchar; - -fet_beginchar(incr code,interline#,1.5interline#+15/3flare#,0,"Sixtyfourth rest","-2","sixtyfourthrest"); - save x,y; - x1=w-stem/6; y1=h-flare/4; - z2-z1=whatever*dir78; - y2=stem/2; - brush (z1,stem/3,z2,stem); - crook (z1,7/8w); - z3-z1=whatever*dir78; - y3=y1-5/3flare; - crook (z3,7/8w); - z4-z1=whatever*dir78; - y4=y1-10/3flare; - crook (z4,7/8w); - z5-z1=whatever*dir78; - y5=y1-15/3flare; - crook (z5,7/8w); - endchar; - -fet_beginchar(incr code,interline#,1.5interline#+20/3flare#,0,"Hundredtwentyeighth rest","-2","hundredtwentyeighthrest"); - save x,y; - x1=w-stem/6; y1=h-flare/4; - z2-z1=whatever*dir80; - y2=stem/2; - brush (z1,stem/3,z2,stem); - crook (z1,7/8w); - z3-z1=whatever*dir80; - y3=y1-5/3flare; - crook (z3,7/8w); - z4-z1=whatever*dir80; - y4=y1-10/3flare; - crook (z4,7/8w); - z5-z1=whatever*dir80; - y5=y1-15/3flare; - crook (z5,7/8w); - z6-z1=whatever*dir80; - y6=y1-20/3flare; - crook (z6,7/8w); - endchar; - -fet_endgroup("rests"); - diff --git a/mf/font-en-tja16.mf b/mf/font-en-tja16.mf index c4bec4c8b9..aa75cc4d16 100644 --- a/mf/font-en-tja16.mf +++ b/mf/font-en-tja16.mf @@ -17,7 +17,6 @@ stafflinethickness#:=0.4pt#; code:=-1; input bolletjes; -input eindelijk; fet_endfont("font-en-tja"); diff --git a/mf/font-en-tja20.mf b/mf/font-en-tja20.mf index f58aedfb62..f7dcf17232 100644 --- a/mf/font-en-tja20.mf +++ b/mf/font-en-tja20.mf @@ -15,7 +15,6 @@ stafflinethickness#:=0.4pt#; code:=-1; input bolletjes; -input eindelijk; fet_endfont("font-en-tja"); diff --git a/tex/eglerdefs.tex b/tex/eglerdefs.tex index 76a3e31561..71857b6f13 100644 --- a/tex/eglerdefs.tex +++ b/tex/eglerdefs.tex @@ -1,12 +1,13 @@ % % Has to be fixed. Exercise for the reader. % - +\input fetdefs \def\musixtwentyfonts{ - \font\normaltextfont=cmr10 - \font\meterfont=cmbx12 + \font\normaltextfont=cmr10 + \font\meterfont=cmbx15 \font\slurufont=oslu20 + \font\smalltextfont=cmr8 \font\slurdfont=osld20 \font\slurhfont=oslz20 \font\hslurufont=oslhu20 @@ -17,10 +18,12 @@ \font\italicfont=cmti10 \font\dynfont=cmbxti10 scaled \magstep1 \font\musicmathfont=cmsy10 + \fettwentydefs } \def\musixsixteenfonts{ + \font\smalltextfont=cmr6 \font\normaltextfont=cmr8 \font\meterfont=cmbx12 \font\italicfont=cmti8 @@ -34,27 +37,28 @@ \font\dynfont=cmbxti12 \font\musicdraw=opussps \font\musicmathfont=cmsy8 + \fetsixteendefs } + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % provide interface to musixtex fonts %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\musicdef\quartball{26} -\musicdef\halfball{27} -\musicdef\wholeball{28} -\musicdef\halfrest{13} -\musicdef\wholerest{12} +\musicdef\halfrest{10} +\musicdef\outsidehalfrest{11} +\musicdef\wholerest{13} +\musicdef\outsidewholerest{12} \musicdef\quartrest{14} \musicdef\eighthrest{15} \musicdef\sixteenthrest{16} \musicdef\thirtysecondrest{17} \musicdef\sixtyfourthrest{18} -%\musicdef\hundredtwentyeighthrest{67} \musicdef\sharp{93} \musicdef\flat{91} \musicdef\natural{95} \musicdef\sharpsharp{94} \musicdef\flatflat{92} + \musicdef\singledot{'00} \musicdef\doubledot{'01} \musicdef\tripledot{'02} @@ -67,18 +71,18 @@ \musicdef\cbassclef{68} \musicdef\caltoclef{70} -\musicdef\deighthflag{32} -\musicdef\dsixteenthflag{46} -\musicdef\dthirtysecondflag{47} -\musicdef\dsixtyfourthflag{48} -\musicdef\dhundredtwentyeighthflag{49} +\musicdef\deighthflag{37} +\musicdef\dsixteenthflag{38} +\musicdef\dthirtysecondflag{39} +\musicdef\dsixtyfourthflag{40} +\musicdef\dhundredtwentyeighthflag{41} % pointing up -\musicdef\ueighthflag{40} -\musicdef\usixteenthflag{41} -\musicdef\uthirtysecondflag{42} -\musicdef\usixtyfourthflag{43} -\musicdef\uhundredtwentyeighthflag{44} +\musicdef\ueighthflag{32} +\musicdef\usixteenthflag{33} +\musicdef\uthirtysecondflag{34} +\musicdef\usixtyfourthflag{35} +\musicdef\uhundredtwentyeighthflag{36} \maccentdef\repeatcolon{55}{2/1} \def\eighthflag{\topalign{\ueighthflag}} @@ -116,3 +120,11 @@ \musicdef\ispicato{29} \musicdef\upbow{23} \musicdef\downbow{22} + +\def\beamuslope#1#2{{\count0=#2\advance\count0 by#1 + \advance\count0 by 132 + \musicfnt\char\count0}} +\def\beamdslope#1#2{{\count0=#2\advance\count0 by#1 + \advance\count0 by 186 + \musicfnt\char\count0}} + diff --git a/tex/fetdefs.tex b/tex/fetdefs.tex new file mode 100644 index 0000000000..7ec690ab1f --- /dev/null +++ b/tex/fetdefs.tex @@ -0,0 +1,21 @@ + +\def\fetsixteendefs{ + \font\fontentja=font-en-tja16 +} +\def\fettwentydefs{ + \font\fontentja=font-en-tja20 +} + + +% \def\fetdef#1#2{\def#1{\fetchar{#2}}} +% ugh, linewidth, ugh, tablexx.ly balldims not used! +\def\fetdef#1#2{\def#1{\lower.5\staffrulethickness\hbox{\fetchar{#2}}}} +\def\fetchar#1{\fontentja\char#1} +\fetdef\quartball{'002} +\fetdef\halfball{'001} +\fetdef\wholeball{'000} +% \fetdef\breveball{'003} +% \fetdef\longaball{'004} +% \musicdef\quartball{'007} +% \musicdef\halfball{'010} +% \musicdef\wholeball{'011} diff --git a/tex/lilyponddefs.tex b/tex/lilyponddefs.tex index 3d3d33237d..20986c443f 100644 --- a/tex/lilyponddefs.tex +++ b/tex/lilyponddefs.tex @@ -103,6 +103,7 @@ \input dyndefs \input taupindefs +%\input eglerdefs \musicmathdef\cup{91} % \cup \musicmathdef\wedge{94} % \wedge @@ -182,14 +183,11 @@ %% % Ugh. Need to redo this. Wish we had PS. % -\def\toplines#1#2{ % why space needed here? - \dist#1 - % ugh, lily still uses "notewith" for all heads - \topalign{\hbox{\kern-.50\notewidth\kern-.25\dist\lines{#2}{1.5\dist}{2\staffrulethickness}}}} +\def\toplines#1#2{\dist#1 + \topalign{\hbox{\kern-.25\dist\lines{#2}{1.5\dist}{2\staffrulethickness}}}} -\def\botlines#1#2{ % idem ditto - \dist#1 - \botalign{\hbox{\kern-.50\notewidth\kern-.25\dist\lines{#2}{1.5\dist}{2\staffrulethickness}}}} +\def\botlines#1#2{\dist#1 + \botalign{\hbox{\kern-.25\dist\lines{#2}{1.5\dist}{2\staffrulethickness}}}} % % a staffsymbol with #1 lines, width #2 @@ -203,7 +201,6 @@ } -\def\beamslope#1#2{{\count0=#2\advance\count0 by#1\musicfnt\char\count0}} \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} diff --git a/tex/taupindefs.tex b/tex/taupindefs.tex index bd08318c06..290e711cb9 100644 --- a/tex/taupindefs.tex +++ b/tex/taupindefs.tex @@ -1,8 +1,8 @@ - +\input fetdefs \def\musixtwentyfonts{ \font\normaltextfont=cmr10 %\textfont is a primitive \font\smalltextfont=cmr8 - \font\meterfont=cmbx12 + \font\meterfont=cmbx15 \font\slurufont=xslu20 \font\slurdfont=xsld20 \font\slurhfont=xslz20 @@ -14,7 +14,7 @@ \font\italicfont=cmti10 \font\dynfont=dyn10 scaled \magstep2 \font\musicmathfont=cmsy10 - \font\fontentja=font-en-tja20 + \fettwentydefs } @@ -33,25 +33,13 @@ \font\dynfont=dyn10 scaled \magstep1 \font\musicdraw=musixsps \font\musicmathfont=cmsy8 - \font\fontentja=font-en-tja16 + \fetsixteendefs } %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % provide interface to musixtex fonts %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% \def\fetdef#1#2{\def#1{\fetchar{#2}}} -% ugh, linewidth, ugh, tablexx.ly balldims not used! -\def\fetdef#1#2{\def#1{\lower.5\staffrulethickness\hbox{\fetchar{#2}}}} -\def\fetchar#1{\fontentja\char#1} -% \musicdef\quartball{'007} -% \musicdef\halfball{'010} -% \musicdef\wholeball{'011} -% \musicdef\breveball{'040} -% \musicdef\longaball{'047} -\fetdef\quartball{'002} -\fetdef\halfball{'001} -\fetdef\wholeball{'000} -\fetdef\breveball{'003} -\fetdef\longaball{'004} +\musicdef\breveball{'040} +\musicdef\longaball{'047} \musicdef\halfrest{'074} \musicdef\wholerest{'075} \musicdef\breverest{'072} @@ -136,3 +124,11 @@ \musicdef\downbow{22} \def\tr{{\it tr}} + +\def\beamuslope#1#2{{\count0=#2\advance\count0 by#1 + \advance\count0 by 122 + \musicfnt\char\count0}} +\def\beamdslope#1#2{{\count0=#2\advance\count0 by#1 + \advance\count0 by 186 + \musicfnt\char\count0}} + -- 2.39.5