From 2d15ed5f550100cc7427ed4585625216d35708d6 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Fri, 5 Dec 1997 12:09:12 +0100 Subject: [PATCH] release: 0.1.35 --- .dstreamrc | 6 ++--- AUTHORS.text | 2 +- Documentation/lilypond.pod | 4 +-- INSTALL.text | 12 ++++----- NEWS | 9 +++++++ README | 6 +++-- TODO | 5 +++- VERSION | 4 +-- bin/clean-fonts.sh | 15 ++++++++--- configure | 2 +- configure.in | 4 +-- init/feta16.ly | 12 ++++----- init/feta20.ly | 12 ++++----- init/{symbol.ly => lily-init.ly} | 0 init/r20.ly | 7 ----- init/table16.ly | 3 ++- init/table20.ly | 3 ++- input/font.ly | 3 ++- input/scsii-menuetto.ly | 4 +++ input/standchen-16.tex | 3 +-- input/wtk1-fugue2.ly | 2 +- lily/VERSION | 2 +- lily/include/text-def.hh | 2 +- lily/lookup.cc | 27 ++++++++++++-------- lily/main.cc | 2 +- lily/parser.y | 4 ++- lily/text-def.cc | 2 +- make/lelievijver.lsm | 8 +++--- make/lilypond.lsm | 8 +++--- make/lilypond.lsm.in | 4 +-- make/lilypond.spec | 4 +-- mf/TODO | 1 - mf/feta-beugel.mf | 44 ++++++++++++++++++++++++++++++++ mf/feta-braces16.mf | 17 ++++++++++++ mf/feta-braces20.mf | 15 +++++++++++ mf/feta-klef.mf | 4 ++- mf/feta-watzieik.mf | 22 ++++++++-------- tex/feta16.tex | 2 +- tex/feta20.tex | 2 +- tex/fetdefs.tex | 10 ++++++-- tex/lilyponddefs.tex | 1 - tex/taupindefs.tex | 1 + tex/titledefs.tex | 3 ++- 43 files changed, 207 insertions(+), 96 deletions(-) rename init/{symbol.ly => lily-init.ly} (100%) delete mode 100644 init/r20.ly create mode 100644 mf/feta-beugel.mf create mode 100644 mf/feta-braces16.mf create mode 100644 mf/feta-braces20.mf diff --git a/.dstreamrc b/.dstreamrc index 178573bd1a..636a2a37df 100644 --- a/.dstreamrc +++ b/.dstreamrc @@ -10,13 +10,13 @@ InitDeclarations 1 Declarations 1 # FlexLexer debug InitLexer 1 -Lexer 0 +Lexer 1 # flower lib File_path 1 -Matrix 0 -Vector 0 +Matrix 1 +Vector 1 # lily Atom 0 diff --git a/AUTHORS.text b/AUTHORS.text index b71a96a7df..d5bbbea66e 100644 --- a/AUTHORS.text +++ b/AUTHORS.text @@ -61,6 +61,6 @@ CCCCOOOONNNNTTTTRRRRIIIIBBBBUUUUTTTTOOOORRRRSS -25/Nov/97 LilyPond 0.1.34 1 +25/Nov/97 LilyPond 0.1.35 1 diff --git a/Documentation/lilypond.pod b/Documentation/lilypond.pod index 20f75f4b82..970bef1dee 100644 --- a/Documentation/lilypond.pod +++ b/Documentation/lilypond.pod @@ -51,7 +51,7 @@ Show a summary of usage. =item B<-i,--init=>F, -Set init file to F (default: F). +Set init file to F (default: F). =item B<--include, -I>=F, @@ -197,7 +197,7 @@ Than it would help if you send a dump of the Interval and the Item =over 5 -=item F +=item F The initialisation file with symbol tables etc. It includes files from the directory F. diff --git a/INSTALL.text b/INSTALL.text index e92908767e..4e80e3a572 100644 --- a/INSTALL.text +++ b/INSTALL.text @@ -61,7 +61,7 @@ RRRRUUUUNNNNNNNNIIIINNNNGGGG -2/Dec/97 LilyPond 0.1.34 1 +2/Dec/97 LilyPond 0.1.35 1 @@ -127,7 +127,7 @@ CCCCOOOONNNNFFFFIIIIGGGGUUUURRRRIIIINNNNGGGG a -2/Dec/97 LilyPond 0.1.34 2 +2/Dec/97 LilyPond 0.1.35 2 @@ -193,7 +193,7 @@ INSTALL(1) LilyPond documentation INSTALL(1) -2/Dec/97 LilyPond 0.1.34 3 +2/Dec/97 LilyPond 0.1.35 3 @@ -259,7 +259,7 @@ IIIINNNNSSSSTTTTAAAALLLLLLLLIIIINNNNGGGG -2/Dec/97 LilyPond 0.1.34 4 +2/Dec/97 LilyPond 0.1.35 4 @@ -325,7 +325,7 @@ RRRREEEEDDDDHHHHAAAATTTT LLLLIIIINNNNUUUUXXXX -2/Dec/97 LilyPond 0.1.34 5 +2/Dec/97 LilyPond 0.1.35 5 @@ -391,6 +391,6 @@ AAAAUUUUTTTTHHHHOOOORRRRSSSS -2/Dec/97 LilyPond 0.1.34 6 +2/Dec/97 LilyPond 0.1.35 6 diff --git a/NEWS b/NEWS index 6e6df564d1..1c5b06fafb 100644 --- a/NEWS +++ b/NEWS @@ -1,8 +1,17 @@ + +pl 35 + - naming: lily-init iso symbol.ly + - mf braces + - center textscripts. + pl 34.jcn1 - mf: nicening of dyn, klef, rest - fingerfont - bf: 12/8 + +******** +dec 2 pl 34 - bf: mf: numbers and alto clef - bf: scsi-menuet diff --git a/README b/README index 34d7ec4532..82740ef2da 100644 --- a/README +++ b/README @@ -56,7 +56,7 @@ the mailing lists. See Documentation/links.pod for more info 6. DOZE If you have received this file as part of a DOS/Window32 distribution -(lilypond-*.zip ), then it is advisable to also download the source +(lilypond-*.zip), then it is advisable to also download the source package, since it might contain more documentation ftp://pcnov095.win.tue.nl/pub/lilypond/ (Europe) @@ -67,7 +67,7 @@ The website also contains the complete documentation http://www.stack.nl/~hanwen/lilypond/index.html If you decide to build LilyPond from source, please read the INSTALL -document first, esp. the Windows NT/95 section. +document first, especially the Windows NT/95 section. 7. CAVEATS @@ -78,3 +78,5 @@ Linux-Intel unix users. files, eg rm `find /var/lib/texmf/fonts -name 'feta*'` + +a script to do this for you is in bin/cleanfonts.sh diff --git a/TODO b/TODO index 0566fb41f0..1d54876a95 100644 --- a/TODO +++ b/TODO @@ -7,6 +7,10 @@ Most of the items are marked in the code as well, with full explanation. grep for TODO and ugh/ugr 0.2: + * handle ^C for tmp/file creation. + + * PS for beams. + * add a screenshot to the website. :) * fix stdin input @@ -407,7 +411,6 @@ Mudela. * pushgroup/popgroup - * multi threading? - 1 thread per element/ 1 thread per line - 1 thread per Translator diff --git a/VERSION b/VERSION index 8b2e671a47..6244dccf3d 100644 --- a/VERSION +++ b/VERSION @@ -1,7 +1,7 @@ TOPLEVEL_MAJOR_VERSION = 0 TOPLEVEL_MINOR_VERSION = 1 -TOPLEVEL_PATCH_LEVEL = 34 -TOPLEVEL_MY_PATCH_LEVEL = jcn1 +TOPLEVEL_PATCH_LEVEL = 35 +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 0610fba7e3..07814d664e 100644 --- a/bin/clean-fonts.sh +++ b/bin/clean-fonts.sh @@ -1,8 +1,15 @@ #!/bin/sh +case $# in +0) + WHAT="" ;; +1) + WHAT=$1;; +esac + # 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-*" -o -name 'vette-beam*' -o -name 'dyn10*'` +echo> /tmp/cleaning-font-dummy +FILES=`find /var/lib/texmf/ -name "feta*$WHAT*"` + echo removing $FILES -rm $FILES /tmp/cleaning-font +rm $FILES /tmp/cleaning-font-dummy diff --git a/configure b/configure index 9e40e3a6da..dfc33d3ad9 100755 --- a/configure +++ b/configure @@ -674,7 +674,7 @@ if test x$MINGWPREFIX != xno; then fi if test $optimise_b = yes; then - DEFINES="$DEFINES -O2 -DSTRING_UTILS_INLINED" + DEFINES="$DEFINES -finline-functions -O2 -DSTRING_UTILS_INLINED" fi if test "x$OSTYPE" = "xWindows_NT"; then diff --git a/configure.in b/configure.in index 0efe69bab0..ee5bc6a4f7 100644 --- a/configure.in +++ b/configure.in @@ -95,7 +95,7 @@ if test x$MINGWPREFIX != xno; then fi if test $optimise_b = yes; then - DEFINES="$DEFINES -O2 -DSTRING_UTILS_INLINED" + DEFINES="$DEFINES -finline-functions -O2 -DSTRING_UTILS_INLINED" fi if test "x$OSTYPE" = "xWindows_NT"; then @@ -171,7 +171,7 @@ AC_JUNK_ARGS( [if test "x$MFDIR" = xauto; then ) AC_CHECK_SEARCH_RESULT($MAKE, GNU make, You should install GNU make) -AC_CHECK_SEARCH_RESULT( $BISON, bison, Please install Bison, 1.25 or better) +AC_CHECK_SEARCH_RESULT($BISON, bison, Please install Bison, 1.25 or better) AC_CHECK_SEARCH_RESULT($PERL, perl, You should install Perl, version 5 or better) AC_CHECK_SEARCH_RESULT($PYTHON, python, You should install Python) AC_CHECK_SEARCH_RESULT($PODMAN, pod, You should install Perl, version 5 or better) diff --git a/init/feta16.ly b/init/feta16.ly index 083ff06cca..826e96a29b 100644 --- a/init/feta16.ly +++ b/init/feta16.ly @@ -1,5 +1,5 @@ % generated automatically by mf-to-table.py version 0.4 -% on Thu Dec 4 23:42:11 1997 +% on Fri Dec 5 11:52:40 1997 % Do not edit % input from out/feta16.log % name=\symboltables { @@ -9,11 +9,11 @@ "0o" "\\outsidewholerest" -2.50\pt 8.50\pt -2.50\pt 0.40\pt "1o" "\\outsidehalfrest" -2.50\pt 8.50\pt -0.40\pt 2.50\pt "2" "\\quartrest" -0.00\pt 4.32\pt 3.00\pt 14.40\pt - "3" "\\eighthrest" -0.00\pt 5.33\pt 4.00\pt 11.47\pt - "4" "\\sixteenthrest" -0.00\pt 6.23\pt -0.00\pt 11.47\pt - "5" "\\thirtysecondrest" -0.00\pt 7.03\pt -0.00\pt 15.47\pt - "6" "\\sixtyfourthrest" -0.00\pt 7.53\pt -0.00\pt 19.47\pt - "7" "\\hundredtwentyeighthrest" -0.00\pt 8.38\pt -0.00\pt 23.47\pt + "3" "\\eighthrest" -0.00\pt 5.33\pt 4.00\pt 11.27\pt + "4" "\\sixteenthrest" -0.00\pt 6.18\pt -0.00\pt 11.27\pt + "5" "\\thirtysecondrest" -0.00\pt 6.98\pt -0.00\pt 15.27\pt + "6" "\\sixtyfourthrest" -0.00\pt 7.49\pt -0.00\pt 19.27\pt + "7" "\\hundredtwentyeighthrest" -0.00\pt 8.34\pt -0.00\pt 23.27\pt } "accidentals" = \table { "1" "\\sharp" -0.00\pt 4.40\pt -6.00\pt 6.00\pt diff --git a/init/feta20.ly b/init/feta20.ly index 4accbaf1c6..01297a8189 100644 --- a/init/feta20.ly +++ b/init/feta20.ly @@ -1,5 +1,5 @@ % generated automatically by mf-to-table.py version 0.4 -% on Thu Dec 4 23:42:34 1997 +% on Fri Dec 5 11:52:42 1997 % Do not edit % input from out/feta20.log % name=\symboltables { @@ -9,11 +9,11 @@ "0o" "\\outsidewholerest" -3.13\pt 10.62\pt -3.13\pt 0.50\pt "1o" "\\outsidehalfrest" -3.13\pt 10.62\pt -0.50\pt 3.13\pt "2" "\\quartrest" -0.00\pt 5.40\pt 3.75\pt 18.00\pt - "3" "\\eighthrest" -0.00\pt 6.67\pt 5.00\pt 14.33\pt - "4" "\\sixteenthrest" -0.00\pt 7.79\pt -0.00\pt 14.33\pt - "5" "\\thirtysecondrest" -0.00\pt 8.78\pt -0.00\pt 19.33\pt - "6" "\\sixtyfourthrest" -0.00\pt 9.41\pt -0.00\pt 24.33\pt - "7" "\\hundredtwentyeighthrest" -0.00\pt 10.47\pt -0.00\pt 29.33\pt + "3" "\\eighthrest" -0.00\pt 6.67\pt 5.00\pt 14.08\pt + "4" "\\sixteenthrest" -0.00\pt 7.72\pt -0.00\pt 14.08\pt + "5" "\\thirtysecondrest" -0.00\pt 8.72\pt -0.00\pt 19.08\pt + "6" "\\sixtyfourthrest" -0.00\pt 9.36\pt -0.00\pt 24.08\pt + "7" "\\hundredtwentyeighthrest" -0.00\pt 10.42\pt -0.00\pt 29.08\pt } "accidentals" = \table { "1" "\\sharp" -0.00\pt 5.50\pt -7.50\pt 7.50\pt diff --git a/init/symbol.ly b/init/lily-init.ly similarity index 100% rename from init/symbol.ly rename to init/lily-init.ly diff --git a/init/r20.ly b/init/r20.ly deleted file mode 100644 index e935658170..0000000000 --- a/init/r20.ly +++ /dev/null @@ -1,7 +0,0 @@ -% generated at Mon Sep 22 22:23:19 1997 from out/r20.log -% changes will be lost -% font-en-tja=\symboltables { - "rests" = \table { - "-2" "\eighthrest" 0.00\pt 5.40\pt 17.55\pt 0.00\pt - } - % } % font-en-tja diff --git a/init/table16.ly b/init/table16.ly index 91b8bda16c..644f0c0ac3 100644 --- a/init/table16.ly +++ b/init/table16.ly @@ -62,7 +62,8 @@ table_sixteen= % dims ignored for this table "param" = \table { - "brace" "\pianobrace{%}" 0.0\pt 0.0\pt 0.0\pt 0.0\pt +% "brace" "\pianobrace{%}" 0.0\pt 0.0\pt 0.0\pt 0.0\pt + "brace" "\pianobrace{%}" 0.0\pt 0.0\pt 32.0\pt 80.0\pt "meter" "\generalmeter{%}{%}" 0.0\pt 10.0\pt -8.0\pt 8.0\pt "stem" "\stem{%}{%}" "fill" "\hbox{}" diff --git a/init/table20.ly b/init/table20.ly index b4f6a19f28..7015bf914a 100644 --- a/init/table20.ly +++ b/init/table20.ly @@ -66,7 +66,8 @@ table_twenty = % dims ignored for this table "param" = \table { - "brace" "\pianobrace{%}" 0.0\pt 0.0\pt 0.0\pt 0.0\pt +% "brace" "\pianobrace{%}" 0.0\pt 0.0\pt 0.0\pt 0.0\pt + "brace" "\pianobrace{%}" 0.0\pt 0.0\pt 40.0\pt 100.0\pt "meter" "\generalmeter{%}{%}" 0.0\pt 10.0\pt -5.0\pt 5.0\pt "stem" "\stem{%}{%}" "fill" "\hbox{}" diff --git a/input/font.ly b/input/font.ly index d92a906734..ac54e3e36a 100644 --- a/input/font.ly +++ b/input/font.ly @@ -2,7 +2,7 @@ title= "The Feta font"; subtitle = "proofsheet"; enteredby = "jcn"; -copyright = "PD"; +copyright = "public domain"; TestedFeatures = "This file tests the Feta music-font" "(Feta definitively is not an abbreviation of Font-En-TjA)"; } @@ -44,6 +44,7 @@ TestedFeatures = "This file tests the Feta music-font" c4^"1" d^"2" e^"3" f^"4" g^"5" < bes4^"1" e_"2" c_"4" > a'^"0" + % ugh, \flageolet is like open, but maybe a perfect circle a^\open \textstyle "roman"; diff --git a/input/scsii-menuetto.ly b/input/scsii-menuetto.ly index 60c57179ee..889c56e124 100644 --- a/input/scsii-menuetto.ly +++ b/input/scsii-menuetto.ly @@ -37,8 +37,11 @@ IImenuetto = \melodic{ \duration 8; < a2 f2 d2 \f > bes4-. | %%2 + \textstyle "finger"; % ugh. + < [ bes8^"1" e8 c8_"2"_"4" > a8 bes8-. g8-. ] a4-.^"4" | + %%3 < d4 'bes4-. > g4-. [ f8-. e8-. ] | %%4 @@ -100,6 +103,7 @@ IImenuetto = \melodic{ %%23 [ 'g8 g8 ] < e4. 'a4. > d8-\upbow | %%24 + \textstyle "roman"; % ugh < d2.^"fine" 'a2. 'd2._"3 mins."> \bar ":|"; } diff --git a/input/standchen-16.tex b/input/standchen-16.tex index 50081e7f9a..9ad6f3a77d 100644 --- a/input/standchen-16.tex +++ b/input/standchen-16.tex @@ -4,11 +4,10 @@ \evensidemargin\oddsidemargin \advance\textwidth30mm +\input titledefs %\pagestyle{empty} \begin{document} -\input lilyponddefs \musixsixteendefs -\input titledefs \def\interscoreline{\vskip3mm} \title{St\"andchen\normalsize\\[2ex](Serenade)} \composer{Franz Schubert (1797-1828)} diff --git a/input/wtk1-fugue2.ly b/input/wtk1-fugue2.ly index cd62181c6d..3c9e2f9391 100644 --- a/input/wtk1-fugue2.ly +++ b/input/wtk1-fugue2.ly @@ -22,7 +22,7 @@ global = \meter 4/4; % should be \meter C \keyCminor \skip 1*32; - \bar "|."; + \bar "|."; | } dux = diff --git a/lily/VERSION b/lily/VERSION index 5f9cd128f2..4a2e61f939 100644 --- a/lily/VERSION +++ b/lily/VERSION @@ -1,4 +1,4 @@ MAJOR_VERSION = 0 MINOR_VERSION = 1 -PATCH_LEVEL = 34 +PATCH_LEVEL = 35 MY_PATCH_LEVEL = diff --git a/lily/include/text-def.hh b/lily/include/text-def.hh index d40a4c7b27..78dd152e9a 100644 --- a/lily/include/text-def.hh +++ b/lily/include/text-def.hh @@ -23,7 +23,7 @@ public: -1 = raggedright, 0 = center, 1 = raggedleft */ - int align_i_; + Direction align_i_; String text_str_; String style_str_; diff --git a/lily/lookup.cc b/lily/lookup.cc index 5c304c2cb2..d2e4c12d90 100644 --- a/lily/lookup.cc +++ b/lily/lookup.cc @@ -227,27 +227,32 @@ Lookup::stem (Real y1,Real y2) const Atom Lookup::vbrace (Real &y) const { - if (y < 2* 20 PT) + Atom brace = (*symtables_p_)("param")->lookup ("brace"); + Interval ydims = brace.dim_[Y_AXIS]; + Real min_y = ydims[LEFT]; + Real max_y = ydims[RIGHT]; + Real step = 2.0 PT; + + if (y < min_y) { warning (_("piano brace too small (") + print_dimen (y)+ ")"); - y = 2*20 PT; + y = min_y; } - if (y > 67 * 2 PT) + if (y > max_y) { warning (_("piano brace too big (") + print_dimen (y)+ ")"); - y = 67 *2 PT; + y = max_y; } - int idx = int (rint ((y/2.0 - 20) + 148)); - - Atom s = (*symtables_p_)("param")->lookup ("brace"); + + int idx = int (rint ((y- min_y)/step)) + 1; + { Array a; a.push (idx); - s.tex_ = substitute_args (s.tex_,a); - s.dim_.y() = Interval (-y/2,y/2); + brace.tex_ = substitute_args (brace.tex_,a); + brace.dim_[Y_AXIS] = Interval (-y/2,y/2); } - - return s; + return brace; } diff --git a/lily/main.cc b/lily/main.cc index b059da1607..f88d3a20af 100644 --- a/lily/main.cc +++ b/lily/main.cc @@ -158,7 +158,7 @@ main (int argc, char **argv) Getopt_long oparser (argc, argv,theopts); cout << get_version_str() << endl; - String init_str ("symbol.ly"); + String init_str ("lily-init.ly"); while (Long_option_init const * opt = oparser()) { diff --git a/lily/parser.y b/lily/parser.y index 9f02016a41..b4f85ba14c 100644 --- a/lily/parser.y +++ b/lily/parser.y @@ -902,7 +902,9 @@ script_req: ; gen_script_def: - text_def { $$ = $1; } + text_def { $$ = $1; + ((Text_def*) $$)->align_i_ = CENTER; /* UGH */ + } | mudela_script { $$ = $1; $$-> set_spot (THIS->here_input ()); } diff --git a/lily/text-def.cc b/lily/text-def.cc index c41bfeb58a..1e75aa83ae 100644 --- a/lily/text-def.cc +++ b/lily/text-def.cc @@ -34,7 +34,7 @@ Text_def::do_print() const Text_def::Text_def() { - align_i_ = 1; // right + align_i_ = RIGHT; style_str_ = "roman"; } diff --git a/make/lelievijver.lsm b/make/lelievijver.lsm index 0ec4bb236e..895a607207 100644 --- a/make/lelievijver.lsm +++ b/make/lelievijver.lsm @@ -1,7 +1,7 @@ Begin3 Titel: LilyPond -Versie: 0.1.34 -Inschrijf datum: 03DEC97 +Versie: 0.1.35 +Inschrijf datum: 05DEC97 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.34.tar.gz + 395k lilypond-0.1.35.tar.gz Oorspronkelijke plek: pcnov095.win.tue.nl /pub/lilypond/ - 395k lilypond-0.1.34.tar.gz + 395k lilypond-0.1.35.tar.gz Copi"eer politie: GPL End diff --git a/make/lilypond.lsm b/make/lilypond.lsm index 3c14c25a17..5c18142039 100644 --- a/make/lilypond.lsm +++ b/make/lilypond.lsm @@ -1,7 +1,7 @@ Begin3 Title: LilyPond -Version: 0.1.34 -Entered-date: 03DEC97 +Version: 0.1.35 +Entered-date: 05DEC97 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/sound/convert - 440k lilypond-0.1.34.tar.gz + 460k lilypond-0.1.35.tar.gz Original-site: pcnov095.win.tue.nl /pub/lilypond/development/ - 440k lilypond-0.1.34.tar.gz + 460k lilypond-0.1.35.tar.gz Copying-policy: GPL End diff --git a/make/lilypond.lsm.in b/make/lilypond.lsm.in index bc3e34ed5d..b98fc8e244 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/sound/convert - 440k lilypond-@TOPLEVEL_VERSION@.tar.gz + 460k lilypond-@TOPLEVEL_VERSION@.tar.gz Original-site: pcnov095.win.tue.nl /pub/lilypond/development/ - 440k lilypond-@TOPLEVEL_VERSION@.tar.gz + 460k lilypond-@TOPLEVEL_VERSION@.tar.gz Copying-policy: GPL End diff --git a/make/lilypond.spec b/make/lilypond.spec index 8e3d32b7d8..a3b3567d0a 100644 --- a/make/lilypond.spec +++ b/make/lilypond.spec @@ -1,9 +1,9 @@ Name: lilypond -Version: 0.1.34 +Version: 0.1.35 Release: 1 Copyright: GPL Group: Applications/Publishing -Source0: alpha.gnu.org:/gnu/lilypond/development/lilypond-0.1.34.tar.gz +Source0: alpha.gnu.org:/gnu/lilypond/development/lilypond-0.1.35.tar.gz Summary: A program for typesetting music. URL: http://www.stack.nl/~hanwen/lilypond Packager: Han-Wen Nienhuys diff --git a/mf/TODO b/mf/TODO index c94d227b86..13465460b9 100644 --- a/mf/TODO +++ b/mf/TODO @@ -8,7 +8,6 @@ - more symbols * some scripts: * piano pedals, - * braces. * trills * maxima notehead * coda signs. diff --git a/mf/feta-beugel.mf b/mf/feta-beugel.mf new file mode 100644 index 0000000000..df625dc0c3 --- /dev/null +++ b/mf/feta-beugel.mf @@ -0,0 +1,44 @@ +input feta-macros; +input feta-params; + +save code; +code :=0; + + +def draw_brace( expr height_sharp, width_sharp) = + save pendir, height, width, thin, thick; + save penangle; + height# := height_sharp; + width# := width_sharp; + + beginchar(incr code, width#, height#/2, height#/2); + + define_pixels (height, width); + thin = 2 stafflinethickness; + thick = .5 interline; + + z2 = .5 [z1, z3]; + y3 = y1 + height/2; + x3 = x1 + width; + y1 =0; + x3 = - width / 2; + + pair pendir; + pendir = unitvector(x3 - x1, y3/6 - y1); + penangle = angle pendir - 90; + penpos3(thin, penangle); + penpos2(thick, angle(z3 -z1) -90 ); + penpos1(2/3 thin, penangle); + + penlabels(1,2,3); + fill z2r .. simple_serif (z3r, z3l, 90) + .. z2l .. simple_serif (z1l, z1r, 90) ..cycle; + + addto currentpicture also currentpicture yscaled -1; +endchar; +enddef; + + +for h := 2 staffsize# step 2 pt# until (6 * staffsize#): + draw_brace(h, interline# ); +endfor diff --git a/mf/feta-braces16.mf b/mf/feta-braces16.mf new file mode 100644 index 0000000000..c5748c1aba --- /dev/null +++ b/mf/feta-braces16.mf @@ -0,0 +1,17 @@ + +% +% feta-braces16.mf -- implement +% +% source file of the Feta (Font-En-Tja) music font +% +% (c) 1997 Han-Wen Nienhuys +% + +font_identifier:="feta-braces16"; +font_size 16; +mode_setup; + +staffsize#:=16pt#; +input feta-beugel; +end. + diff --git a/mf/feta-braces20.mf b/mf/feta-braces20.mf new file mode 100644 index 0000000000..a3a3d6c6b7 --- /dev/null +++ b/mf/feta-braces20.mf @@ -0,0 +1,15 @@ +% +% feta-braces20.mf -- implement +% +% source file of the Feta (Font-En-Tja) music font +% +% (c) 1997 Han-Wen Nienhuys +% + +font_identifier:="feta-braces16"; +font_size 20; +mode_setup; + +staffsize#:=20pt#; +input feta-beugel; +end. diff --git a/mf/feta-klef.mf b/mf/feta-klef.mf index 385f6dffb3..bd9eb4f542 100644 --- a/mf/feta-klef.mf +++ b/mf/feta-klef.mf @@ -130,7 +130,9 @@ def draw_bass_klef(expr exact_center, reduction) = labels(2,4); penlabels(1,2,3,4); - pickup pencircle scaled (.35 reduced_il); + save dot_diam; + 2 dot_diam = reduction* (interline - stafflinethickness); + pickup pencircle scaled dot_diam; draw z5; draw z5 yscaled -1; enddef; diff --git a/mf/feta-watzieik.mf b/mf/feta-watzieik.mf index 8bcdf19bc8..b87363a983 100644 --- a/mf/feta-watzieik.mf +++ b/mf/feta-watzieik.mf @@ -11,19 +11,19 @@ define_pixels(beamheight); pen beam_pen; beam_pen:=penrazor scaled beamheight rotated 90; -ELEM_TAN:=0.05; -SLOPES:=20; -LENGTHS:=6; -ELEM_FACTOR := 2; -ELEM_INITIAL_LEN:=2; +elem_tan:=0.05; +slopes:=20; +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); +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); + draw origin--(lft w,w*i*elem_tan); endchar; - width:=ELEM_FACTOR *width; + width:=elem_factor *width; endfor; endfor; diff --git a/tex/feta16.tex b/tex/feta16.tex index d47d5aa631..f80938b853 100644 --- a/tex/feta16.tex +++ b/tex/feta16.tex @@ -1,5 +1,5 @@ % generated automatically by mf-to-table.py version 0.4 -% on Thu Dec 4 23:42:11 1997 +% on Fri Dec 5 11:52:40 1997 % Do not edit % input from out/feta16.log % name diff --git a/tex/feta20.tex b/tex/feta20.tex index 8ccf31e844..3b2ee96e3e 100644 --- a/tex/feta20.tex +++ b/tex/feta20.tex @@ -1,5 +1,5 @@ % generated automatically by mf-to-table.py version 0.4 -% on Thu Dec 4 23:42:34 1997 +% on Fri Dec 5 11:52:42 1997 % Do not edit % input from out/feta20.log % name diff --git a/tex/fetdefs.tex b/tex/fetdefs.tex index 96ee2494cf..0301959589 100644 --- a/tex/fetdefs.tex +++ b/tex/fetdefs.tex @@ -6,15 +6,18 @@ \font\vetfont=feta-beams16 \font\fetanummer=feta-nummer8 \font\dynfont=feta-din10 scaled \magstep1 - \font\fingerfont=feta-nummer4 + \font\bracefont=feta-braces16 + \font\fingerfont=feta-nummer4 } \def\fettwentydefs{ \font\fontentja=feta20 \font\vetfont=feta-beams20 \font\fetanummer=feta-nummer10 \font\dynfont=feta-din10 scaled \magstep2 - \font\fingerfont=feta-nummer5 + \font\bracefont=feta-braces20 + \font\fingerfont=feta-nummer5 } + \def\fetdef#1#2{\def#1{% \hbox{\fetchar{#2}}}} @@ -37,6 +40,8 @@ \hbox to0.45\balkheight{\hss\fetanummer #2\hss}% \vss}} +\def\pianobrace#1{{\bracefont\char #1}} + \newcount\embedcount\embedcount=0 \newwrite\checkexists \newwrite\embedfile @@ -197,3 +202,4 @@ } + diff --git a/tex/lilyponddefs.tex b/tex/lilyponddefs.tex index 49a0f3e3c4..3e2300989e 100644 --- a/tex/lilyponddefs.tex +++ b/tex/lilyponddefs.tex @@ -171,7 +171,6 @@ \def\startbar#1{\leftalign{\thickbar{#1}\kern\smallspace\thinbar{#1}}} \def\finishbar#1{\rightalign{\thinbar{#1}\kern\smallspace\thickbar{#1}}} -\def\pianobrace#1{{\musicdraw\char#1}} \def\slurcharh#1{{\slurhfont\char#1}} \def\slurcharu#1{{\slurufont\char#1}} \def\slurchard#1{{\slurdfont\char#1}} diff --git a/tex/taupindefs.tex b/tex/taupindefs.tex index f65eff62b8..582c4dcd90 100644 --- a/tex/taupindefs.tex +++ b/tex/taupindefs.tex @@ -126,6 +126,7 @@ \musicdef\downbow{22} \def\tr{{\it tr}} +\def\pianobrace#1{{\musicdraw\char#1}} % \def\beamuslope#1#2{{\count0=#2\advance\count0 by#1 % \advance\count0 by 122 diff --git a/tex/titledefs.tex b/tex/titledefs.tex index 9cd871e4d9..f134e99e2a 100644 --- a/tex/titledefs.tex +++ b/tex/titledefs.tex @@ -13,7 +13,8 @@ \def\thearranger{} \def\theinstrument{} % -\newcommand*{\title}[1]{\def\thetitle{#1\\}} +% duh. LaTeX has a \title too. +\renewcommand*{\title}[1]{\def\thetitle{#1\\}} \newcommand*{\subtitle}[1]{\def\thesubtitle{#1\\}} \newcommand*{\composer}[1]{\def\thecomposer{#1\\}} \newcommand*{\arranger}[1]{\def\thearranger{#1}} -- 2.39.2