From be6b7669873b8b227c224e9ff1e1e101c43426df Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Thu, 30 Aug 2001 16:48:57 +0200 Subject: [PATCH] release: 1.5.8 ========== * reinclude input/bugs/*.ly * Mensural flags (Juergen Reuter) * Fixed problem with hanging Xdvi from redhat 7.x. See also http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=52089 * Bugfix: don't crash if kpse_find_file returns 0. * Bugfix: don't allocate \outputscale for every file. * Bugfix: mixing different rhythms on one staff doesn't muck up the spacing that much. 1.5.7.h --- AUTHORS.txt | 2 + CHANGES | 42 +-- Documentation/footer.html.in | 4 +- Documentation/header.html.in | 15 +- Documentation/index.texi | 22 +- Documentation/topdocs/AUTHORS.texi | 4 +- Documentation/topdocs/INSTALL.texi | 7 - Documentation/topdocs/README.texi | 5 +- Documentation/topdocs/index.tely | 8 + Documentation/user/GNUmakefile | 2 +- Documentation/user/refman.itely | 25 -- INSTALL.txt | 7 - README.txt | 5 +- VERSION | 4 +- buildscripts/lys-to-tely.py | 8 +- input/bugs/GNUmakefile | 2 +- input/bugs/crescendo-short.ly | 20 -- input/emacs-lily.fly | 2 - input/regression/arpeggio.ly | 37 +-- input/test/ancient-font.ly | 9 +- lily/all-font-metrics.cc | 4 +- lily/arpeggio.cc | 35 +-- lily/break-algorithm.cc | 2 +- lily/global-translator.cc | 2 +- lily/include/kpath.hh | 2 +- lily/kpath.cc | 29 +- lily/new-spacing-spanner.cc | 77 +++-- lily/stem.cc | 63 +++- lilypond-mode.el | 21 ++ ly/a4-init.ly | 5 - ly/accordion-defs-init.ly | 56 ---- ly/book-init-init.ly | 14 - ly/catalan.ly | 74 ----- ly/center-init.ly | 15 - ly/chord-modifiers-init.ly | 17 -- ly/declarations-init.ly | 56 ---- ly/deutsch.ly | 52 ---- ly/drumpitch-init.ly | 160 ----------- ly/dynamic-scripts-init.ly | 27 -- ly/english.ly | 82 ------ ly/engraver-init.ly | 415 -------------------------- ly/generate-documentation.ly | 6 - ly/generate-interface-doc-init.ly | 5 - ly/generic-paper-init.ly | 8 - ly/german-chords-init.ly | 41 --- ly/grace-init.ly | 45 --- ly/init-as.fly | 43 --- ly/init.ly | 8 - ly/italiano.ly | 51 ---- ly/ledger-init.ly | 8 - ly/legal-init.ly | 5 - ly/letter-init.ly | 7 - ly/midi-init.ly | 7 - ly/nederlands.ly | 49 ---- ly/norsk.ly | 107 ------- ly/paper-as5-init.ly | 17 -- ly/paper-as9-init.ly | 16 -- ly/paper-init.ly | 15 - ly/paper11-init.ly | 12 - ly/paper11.ly | 2 - ly/paper13-init.ly | 14 - ly/paper13.ly | 2 - ly/paper16-init.ly | 12 - ly/paper16.ly | 2 - ly/paper20-init.ly | 13 - ly/paper20.ly | 2 - ly/paper23-init.ly | 12 - ly/paper23.ly | 2 - ly/paper26-init.ly | 12 - ly/paper26.ly | 2 - ly/params-as-init.ly | 30 -- ly/params-init.ly | 48 ---- ly/part-paper-init.ly | 10 - ly/performer-init.ly | 124 -------- ly/property-init.ly | 167 ----------- ly/scale-definitions-init.ly | 100 ------- ly/script-init.ly | 47 --- ly/spanners-init.ly | 53 ---- ly/svenska.ly | 43 --- make/lilypond-vars.make | 3 + make/ly-vars.make | 7 +- make/lysdoc-rules.make | 2 +- make/lysdoc-vars.make | 3 - make/mutopia-vars.make | 10 +- make/out/lilypond.lsm | 8 +- make/out/lilypond.mandrake.spec | 2 +- make/out/lilypond.redhat.spec | 4 +- make/out/lilypond.suse.spec | 4 +- mf/feta-banier.mf | 447 +++++++++++++++++++++++++++-- mf/feta-bolletjes.mf | 28 +- mf/feta-schrift.mf | 75 ----- ps/lilyponddefs.ps | 1 - ps/music-drawing-routines.ps | 5 + scm/generic-property.scm | 1 + scm/grob-description.scm | 1 - scm/grob-property-description.scm | 7 +- scm/interface-description.scm | 2 +- scm/tex.scm | 2 +- scripts/GNUmakefile | 2 +- scripts/lilypond-book.py | 2 +- scripts/ly2dvi.py | 1 + tex/lily-ps-defs.tex | 5 +- tex/lilyponddefs.tex | 2 +- 103 files changed, 733 insertions(+), 2476 deletions(-) delete mode 100644 input/bugs/crescendo-short.ly delete mode 100644 input/emacs-lily.fly delete mode 100644 ly/a4-init.ly delete mode 100644 ly/accordion-defs-init.ly delete mode 100644 ly/book-init-init.ly delete mode 100644 ly/catalan.ly delete mode 100644 ly/center-init.ly delete mode 100644 ly/chord-modifiers-init.ly delete mode 100644 ly/declarations-init.ly delete mode 100644 ly/deutsch.ly delete mode 100644 ly/drumpitch-init.ly delete mode 100644 ly/dynamic-scripts-init.ly delete mode 100644 ly/english.ly delete mode 100644 ly/engraver-init.ly delete mode 100644 ly/generate-documentation.ly delete mode 100644 ly/generate-interface-doc-init.ly delete mode 100644 ly/generic-paper-init.ly delete mode 100644 ly/german-chords-init.ly delete mode 100644 ly/grace-init.ly delete mode 100644 ly/init-as.fly delete mode 100644 ly/init.ly delete mode 100644 ly/italiano.ly delete mode 100644 ly/ledger-init.ly delete mode 100644 ly/legal-init.ly delete mode 100644 ly/letter-init.ly delete mode 100644 ly/midi-init.ly delete mode 100644 ly/nederlands.ly delete mode 100644 ly/norsk.ly delete mode 100644 ly/paper-as5-init.ly delete mode 100644 ly/paper-as9-init.ly delete mode 100644 ly/paper-init.ly delete mode 100644 ly/paper11-init.ly delete mode 100644 ly/paper11.ly delete mode 100644 ly/paper13-init.ly delete mode 100644 ly/paper13.ly delete mode 100644 ly/paper16-init.ly delete mode 100644 ly/paper16.ly delete mode 100644 ly/paper20-init.ly delete mode 100644 ly/paper20.ly delete mode 100644 ly/paper23-init.ly delete mode 100644 ly/paper23.ly delete mode 100644 ly/paper26-init.ly delete mode 100644 ly/paper26.ly delete mode 100644 ly/params-as-init.ly delete mode 100644 ly/params-init.ly delete mode 100644 ly/part-paper-init.ly delete mode 100644 ly/performer-init.ly delete mode 100644 ly/property-init.ly delete mode 100644 ly/scale-definitions-init.ly delete mode 100644 ly/script-init.ly delete mode 100644 ly/spanners-init.ly delete mode 100644 ly/svenska.ly diff --git a/AUTHORS.txt b/AUTHORS.txt index def7b3af77..8c55c0faa4 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -30,6 +30,8 @@ list is alphabetically ordered. * Neil Jerram . parts of Documentation/Vocab* + * Heikki Junes . Finnish note names + * Donald Ervin Knuth, `http://www-cs-staff.stanford.edu/~knuth/' mf/ital-*.mf (these were taken from the CM fonts) diff --git a/CHANGES b/CHANGES index a4e58973ac..7ce58318f5 100644 --- a/CHANGES +++ b/CHANGES @@ -1,9 +1,28 @@ -1.5.7 -===== +1.5.7.hwn1 +========== + +* reinclude input/bugs/*.ly + +* Mensural flags (Juergen Reuter) + +* Fixed problem with hanging Xdvi from redhat 7.x. See also +http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=52089 + +* Bugfix: don't crash if kpse_find_file returns 0. + +* Bugfix: don't allocate \outputscale for every file. + +* Bugfix: mixing different rhythms on one staff doesn't muck up the +spacing that much. + +1.5.7.hjj2 +========== + +* Add PS-compilation, PS-viewing and MIDI-play in LilyPond +-Emacs-mode. (Heikki Johannes Junes). + +* Add common finnish names for notes -* Arpeggios can now have arrows on the top or bottom to determine - their direction, and a chord can be bracketed to indicate no - arpeggio. (Chris Jackson) 1.5.6.jcn2 ========= @@ -20,7 +39,7 @@ missing from 1.5.5 distribution. * Add short crescendo bug to input/bugs. * Update and bit more verbose download instructions in INSTALL, - fix some links on ftp.lilypond.org. +fix some links on ftp.lilypond.org. 1.5.6.hwn1 @@ -44,17 +63,6 @@ Changes were made to 1.5.6 ===== -* Loose column support: clef changes, key changes may be folded -underneath notes in a different staff; changes made to - - - Separating_group_spanner: decide which columns are loose - - - Simple_spacer, New_spacing_spanner: only look at non-loose columns. - - - Line_of_score: set horizontal positions for loose columns. - - - 1.4.6.mb1 ========= diff --git a/Documentation/footer.html.in b/Documentation/footer.html.in index d71ff8d1ad..8a96551d0c 100644 --- a/Documentation/footer.html.in +++ b/Documentation/footer.html.in @@ -19,8 +19,8 @@ Go back to index of LilyPond.

Please send GNU LilyPond questions and comments to - -gnu-music-discuss@gnu.org. + +lilypond-user@gnu.org.

Please send comments on these web pages to diff --git a/Documentation/header.html.in b/Documentation/header.html.in index 45f93fb319..13cee14734 100644 --- a/Documentation/header.html.in +++ b/Documentation/header.html.in @@ -24,17 +24,17 @@ which substitutes some @AT_VARIABLES@ as well. - - -
+ [icon] +

GNU LilyPond

Welcome to the home of the GNU Music Typesetter
+ - +
@@ -76,12 +76,15 @@ which substitutes some @AT_VARIABLES@ as well. Announcements

Sites
External sites
- Website
+ Development version
+ Stable version
WikiWiki
FTP site
+ Mutopia archive
+
- 		+ diff --git a/Documentation/index.texi b/Documentation/index.texi index 3a78e88b82..1cd8739665 100644 --- a/Documentation/index.texi +++ b/Documentation/index.texi @@ -194,28 +194,30 @@ Frequently Asked Questions} first. @itemize @bullet -@item @uref{http://mail.gnu.org/mailman/listinfo/gnu-music-discuss,gnu-music-discuss@@gnu.org} -This list is for discussions concerning LilyPond. +@item @uref{http://mail.gnu.org/mailman/listinfo/lilypond-devel,lilypond-devel@@gnu.org} +This list is for discussions concerning the development release of +LilyPond. Searchable archives are available from -@uref{http://www.mail-archive.com/gnu-music-discuss@@gnu.org}. +@uref{http://www.mail-archive.com/lilypond-devel@@gnu.org}. -@item @uref{http://mail.gnu.org/mailman/listinfo/info-gnu-music,info-gnu-music@@gnu.org} +@item @uref{http://mail.gnu.org/mailman/listinfo/info-lilypond,info-lilypond@@gnu.org} is a low-volume list for information on the GNU Music project. This list is moderated; ask @email{drl@@gnu.org, David R. Linn} or @email{hanwen@@cs.uu.nl, Han-Wen} to send announcements for this list. Searchable archives are available from -@uref{http://www.mail-archive.com/info-gnu-music@@gnu.org}. +@uref{http://www.mail-archive.com/info-lilypond@@gnu.org}. -@item @uref{http://mail.gnu.org/mailman/listinfo/help-gnu-music,help-gnu-music@@gnu.org} - For help with using LilyPond. +@item @uref{http://mail.gnu.org/mailman/listinfo/lilypond-user,lilypond-user@@gnu.org} + For discussing every-day use of LilyPond, in particular the +stable releases.. Searchable archives are available from -@uref{http://www.mail-archive.com/help-gnu-music@@gnu.org}. +@uref{http://www.mail-archive.com/lilypond-user@@gnu.org}. -@item @uref{http://mail.gnu.org/mailman/listinfo/bug-gnu-music,bug-gnu-music@@gnu.org} +@item @uref{http://mail.gnu.org/mailman/listinfo/bug-lilypond,bug-lilypond@@gnu.org} If you have bugreports, you should send them to this list. @@ -226,7 +228,7 @@ they tend to be very big and don't help with describing the problem. Searchable archives are available from -@uref{http://www.mail-archive.com/bug-gnu-music@@gnu.org}. +@uref{http://www.mail-archive.com/bug-lilypond@@gnu.org}. @end itemize diff --git a/Documentation/topdocs/AUTHORS.texi b/Documentation/topdocs/AUTHORS.texi index 67b08d605f..bd444931a4 100644 --- a/Documentation/topdocs/AUTHORS.texi +++ b/Documentation/topdocs/AUTHORS.texi @@ -33,10 +33,10 @@ list is alphabetically ordered. American chord names, gnu-windows testing @item @email{bjoern.jacke@@gmx.de, Bjoern Jacke} German glossary stuff. -@item @email{chris-lilypond@@fluffhouse.org.uk, Chris Jackson} - Directed arpeggios and chord brackets. @item @email{nj104@@cus.cam.ac.uk, Neil Jerram}. parts of Documentation/Vocab* +@item @email{heikki.junes@@hut.fi, Heikki Junes}. + Finnish note names @item Donald Ervin Knuth, @uref{http://www-cs-staff.stanford.edu/~knuth/} mf/ital-*.mf (these were taken from the CM fonts) @item @email{m.krause@@tu-harburg.de, Michael Krause}, diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi index dee4bec5f1..915e710048 100644 --- a/Documentation/topdocs/INSTALL.texi +++ b/Documentation/topdocs/INSTALL.texi @@ -351,13 +351,6 @@ guile-devel, flex, bison, texinfo, tetex-devel, groff, libgr-progs. -@b{Warning} - -There appears to be a problem with the Xdvi shipped with Red Hat 7.1. -Symptoms: Xdvi responds very sluggishly or hangs while viewing -lilypond output. The cause for this problem is unknown; you are advised -to recompile Xdvi from source. - @subsection LinuxPPC diff --git a/Documentation/topdocs/README.texi b/Documentation/topdocs/README.texi index 210352eaaf..dadd6967f5 100644 --- a/Documentation/topdocs/README.texi +++ b/Documentation/topdocs/README.texi @@ -102,9 +102,8 @@ a script to do this for you is in @file{buildscripts/clean-fonts.sh} @section Bugs Send bug reports to @email{bug-lilypond@@gnu.org}. For help and -questions use @email{help-lilypond@@gnu.org} and -@email{lilypond-discuss@@gnu.org}. Please consult the FAQ and -installation instructions before mailing your problems. +questions use @email{lilypond-user@@gnu.org}. Please consult the FAQ +and installation instructions before mailing your problems. diff --git a/Documentation/topdocs/index.tely b/Documentation/topdocs/index.tely index 1b26344f9e..e04df17b4e 100644 --- a/Documentation/topdocs/index.tely +++ b/Documentation/topdocs/index.tely @@ -41,6 +41,14 @@ LilyPond is @b{free software}. It is part of the Public License, so you can use, modify and redistribute the program with almost no restrictions. + +LilyPond has a development version and a stable version. This webpage is +for the @b{development} release. This release contains experimental and +often buggy code, so use it only if you need special new features. On +the other hand, stable releases don't change much, and are essentially +bug-free. You can access the website for the stable releases +@uref{http://lilypond.org/stable, here}. + @unnumberedsec Want to know more? If you want to know more, visit the diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile index 566c3b2c1c..2c30d360d4 100644 --- a/Documentation/user/GNUmakefile +++ b/Documentation/user/GNUmakefile @@ -8,7 +8,7 @@ LATEX_FILES =$(wildcard *.latex) # todo: add latex. DVI_FILES = $(addprefix $(outdir)/, $(TELY_FILES:.tely=.dvi)) -EXTRA_DIST_FILES= $(LATEX_FILES) $(wildcard *.itexi *.itely) +EXTRA_DIST_FILES= $(LATEX_FILES) HTML_FILES = $(addprefix $(outdir)/, $(TELY_FILES:.tely=.html)) diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely index 63e051ab69..1c9d14271e 100644 --- a/Documentation/user/refman.itely +++ b/Documentation/user/refman.itely @@ -1879,31 +1879,6 @@ to the chords in both staves, and set This command creates @code{Voice.Arpeggio} grobs. Cross staff arpeggios are @code{PianoStaff.Arpeggio}. -To add an arrow head to explicitly specify the direction of the -arpeggio, you should set the arpeggio grob property -@code{arpeggio-type}. - -@lilypond[fragment,relative,verbatim] - \context Voice { - \property Voice.Arpeggio \override #'arpeggio-type = #'up - - \property Voice.Arpeggio \override #'arpeggio-type = #'down - - } -@end lilypond - -A square bracket on the left indicates that the player should not -arpeggiate the chord. - -@lilypond[fragment,relative,verbatim] - \context PianoStaff < - \property PianoStaff.connectArpeggios = ##t - \property PianoStaff.Arpeggio \override #'arpeggio-type = #'bracket - \context Voice = one { } - \context Voice = other { \clef bass } - > -@end lilypond - @refbugs It is not possible to mix connected arpeggios and unconnected arpeggios diff --git a/INSTALL.txt b/INSTALL.txt index 65765b509d..373eb96146 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -332,13 +332,6 @@ addition to the those needed for running: glibc-devel, gcc-c++, libstdc++-devel, guile-devel, flex, bison, texinfo, tetex-devel, groff, libgr-progs. - Warning - - There appears to be a problem with the Xdvi shipped with Red Hat 7.1. -Symptoms: Xdvi responds very sluggishly or hangs while viewing lilypond -output. The cause for this problem is unknown; you are advised to -recompile Xdvi from source. - LinuxPPC -------- diff --git a/README.txt b/README.txt index ba79af36ac..b044f51b8f 100644 --- a/README.txt +++ b/README.txt @@ -92,7 +92,6 @@ Bugs ==== Send bug reports to . For help and questions -use and . Please -consult the FAQ and installation instructions before mailing your -problems. +use . Please consult the FAQ and installation +instructions before mailing your problems. diff --git a/VERSION b/VERSION index f7a846ab78..fcf5101fb3 100644 --- a/VERSION +++ b/VERSION @@ -1,8 +1,8 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=5 -PATCH_LEVEL=7 -MY_PATCH_LEVEL=jcn2 +PATCH_LEVEL=8 +MY_PATCH_LEVEL= # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/buildscripts/lys-to-tely.py b/buildscripts/lys-to-tely.py index eac92934e8..22343a77a7 100644 --- a/buildscripts/lys-to-tely.py +++ b/buildscripts/lys-to-tely.py @@ -65,7 +65,7 @@ if files: if string.find (n, '+') >= 0: s = "@lilypondfile{%s}" % n else: - s = "@lilypondfile[printfilename]{%s}" % n + s = "@lilypondfile[printfilename,verbatim]{%s}" % n return s s = s + string.join (map (lambda x: name2line (x), files), "\n") @@ -76,4 +76,8 @@ if files: h.write (s) h.close () sys.stderr.write ('\n') - +else: + # not Unix philosophy, but hey, at least we notice when + # we don't distribute any .ly files. + sys.stderr.write ("No files specified. Doing nothing") + diff --git a/input/bugs/GNUmakefile b/input/bugs/GNUmakefile index 51c90c814c..4b14cadb54 100644 --- a/input/bugs/GNUmakefile +++ b/input/bugs/GNUmakefile @@ -1,7 +1,7 @@ depth = ../.. STEPMAKE_TEMPLATES=documentation texinfo tex -LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc +LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc EXTRA_DIST_FILES=README include $(depth)/make/stepmake.make diff --git a/input/bugs/crescendo-short.ly b/input/bugs/crescendo-short.ly deleted file mode 100644 index f7a7cf507a..0000000000 --- a/input/bugs/crescendo-short.ly +++ /dev/null @@ -1,20 +0,0 @@ -\include "paper23.ly" - -\score { - \notes \relative c'' { - \clef "treble" - \time 4/4 - \partial 4 - \property Voice.Slur \override - #'attachment-offset = #'((-0.5 . 0.75) . (0 . 0.75)) - \property Voice.DynamicText \override #'padding = #-2 - \property Voice.DynamicLineSpanner \override #'padding = #2 - [e,8-"."-\pp-\cr-\upbow ( )f-"."-\rc] | - ges4-\decr ( ) f8-\rced r8 r2 \bar "||" - - - } - \paper { - linewidth=9.0\cm - } -} diff --git a/input/emacs-lily.fly b/input/emacs-lily.fly deleted file mode 100644 index fefa8e317e..0000000000 --- a/input/emacs-lily.fly +++ /dev/null @@ -1,2 +0,0 @@ -\ -cpp -P -traditional -o l-fake.ly -DFAKE_GRACE les-nereides.ly diff --git a/input/regression/arpeggio.ly b/input/regression/arpeggio.ly index 82080d31c1..1f956f90a0 100644 --- a/input/regression/arpeggio.ly +++ b/input/regression/arpeggio.ly @@ -2,40 +2,23 @@ \header{ texidoc=" Arpeggios are supported, both cross-staff and broken single staff. -Directed arpeggios are indicated by arrows, while a square bracket -to the left prevents arpeggiation. " } -\score { - \context PianoStaff < - \context Staff=one \notes\relative c'{ - \context Voice { - < a4 d fis-\arpeggio a > - \property Voice.Arpeggio \override #'arpeggio-type = #'bracket - < d fis-\arpeggio a d > - %%\property PianoStaff.SpanArpeggio \override #'connect = ##t +\score{ + \context PianoStaff < + \context Staff=one \notes\relative c''{ + \context Voice < fis,-\arpeggio d a > + %%\property PianoStaff.SpanArpeggio \override #'connect = ##t \property PianoStaff.connectArpeggios = ##t - - \property PianoStaff.Arpeggio \override #'arpeggio-type = #'bracket - - \property PianoStaff.connectArpeggios = ##f - \property Voice.Arpeggio \override #'arpeggio-type = #'down - - - } + } - \context Staff=two \notes\relative c { + \context Staff=two \notes\relative c{ \clef bass - \context Voice { - r4 r - - - \property Voice.Arpeggio \override #'arpeggio-type = #'up - - } - } + \context Voice < g b d-\arpeggio > + + } > } diff --git a/input/test/ancient-font.ly b/input/test/ancient-font.ly index 2e9cd0c3f9..5afabdbd26 100644 --- a/input/test/ancient-font.ly +++ b/input/test/ancient-font.ly @@ -107,6 +107,7 @@ lowerVoice = \context Staff = lowerNotes < #'line-count = #5 \notes \transpose c' { + \property Voice.noAutoBeaming = ##t \property Staff.KeySignature \override #'style = #'mensural \property Staff.Accidentals \override #'style = #'mensural \property Staff.Custos \override #'style = #'mensural @@ -131,7 +132,11 @@ lowerVoice = \context Staff = lowerNotes < e d c1 \bar "|" \property Voice.NoteHead \override #'style = #'mensural + \property Voice.Stem \override #'style = #'mensural + \property Voice.Stem \override #'thickness = #1.0 \clef "petrucci_f" + c8 b, c16 b, c32 b, c64 b, c b, + d8 e d16 e d32 e d64 e d e c2 d e f g \property Staff.forceClef = ##t \clef "petrucci_f" @@ -171,14 +176,14 @@ lowerVoice = \context Staff = lowerNotes < % \paperTwentysix linewidth = 17.25\cm textheight = 26.0\cm -% stafflinethickness = \staffspace / 5.0 + stafflinethickness = \staffspace / 5.0 indent = 0.0 \translator { \StaffContext \consists Custos_engraver % Custos \override #'style = #'mensural \remove Time_signature_engraver - StaffSymbol \override #'thickness = #2.0 +% StaffSymbol \override #'thickness = #2.0 % StaffSymbol \override #'line-count = #4 } } diff --git a/lily/all-font-metrics.cc b/lily/all-font-metrics.cc index 61a66c33bc..b198384426 100644 --- a/lily/all-font-metrics.cc +++ b/lily/all-font-metrics.cc @@ -52,8 +52,8 @@ All_font_metrics::find_afm (String name) if (path.empty_b ()) { - char * p = ly_find_afm (name.ch_C ()); - if (p) + String p = ly_find_afm (name.ch_C ()); + if (p.length_i ()) path = p; } diff --git a/lily/arpeggio.cc b/lily/arpeggio.cc index 2df39d285b..900949224c 100644 --- a/lily/arpeggio.cc +++ b/lily/arpeggio.cc @@ -67,40 +67,15 @@ Arpeggio::brew_molecule (SCM smob) return SCM_EOL; } - SCM s = me->get_grob_property ("arpeggio-type"); - String arpegtype = ly_scm2string (scm_symbol_to_string (s)); - Molecule arpegbottom = ( (arpegtype=="bracket") ? - Font_interface::get_default_font (me)->find_by_name ("scripts-bracebottom") : - ((arpegtype=="down") ? - Font_interface::get_default_font (me)->find_by_name ("scripts-arrowdown") : - Font_interface::get_default_font (me)->find_by_name ("scripts-arpeggio")) - ); - Molecule arpegmiddle = ( (arpegtype=="bracket") ? - Font_interface::get_default_font (me)->find_by_name ("scripts-braceseg") : - Font_interface::get_default_font (me)->find_by_name ("scripts-arpeggio") ); - Molecule arpegtop = ( (arpegtype=="bracket") ? - Font_interface::get_default_font (me)->find_by_name ("scripts-bracetop") : - ((arpegtype=="up") ? - Font_interface::get_default_font (me)->find_by_name ("scripts-arrowup") : - Font_interface::get_default_font (me)->find_by_name ("scripts-arpeggio")) - ); - Molecule mol; + Molecule arpeggio = Font_interface::get_default_font (me)->find_by_name ("scripts-arpeggio"); + Real y = heads[LEFT]; - - mol.add_at_edge (Y_AXIS, UP, arpegbottom, 0.0); - y+= arpegbottom. extent (Y_AXIS).length (); - - Grob * stem = unsmob_grob (gh_car ( me->get_grob_property ("stems") )); - Grob * ss = Staff_symbol_referencer::staff_symbol_l (stem); - - while (y < heads[RIGHT] - Staff_symbol::staff_space (ss)) + while (y < heads[RIGHT]) { - mol.add_at_edge (Y_AXIS, UP, arpegmiddle, 0.0); - y+= arpegmiddle. extent (Y_AXIS).length (); + mol.add_at_edge (Y_AXIS, UP,arpeggio, 0.0); + y+= arpeggio. extent (Y_AXIS).length (); } - mol.add_at_edge (Y_AXIS, UP, arpegtop, 0.0); - mol.translate_axis (heads[LEFT], Y_AXIS); return mol.smobbed_copy () ; diff --git a/lily/break-algorithm.cc b/lily/break-algorithm.cc index e845133d63..ca9007b926 100644 --- a/lily/break-algorithm.cc +++ b/lily/break-algorithm.cc @@ -62,7 +62,7 @@ Break_algorithm::generate_spacing_problem (Link_array curline, Interval li /* this is hardcoded, but this shouldn't happen anyway. - used to be g et_var ("loose_column_distance"); + used to be get_var ("loose_column_distance"); */ sp->default_space_f_ = 1.0; diff --git a/lily/global-translator.cc b/lily/global-translator.cc index 4e4208bd82..d66b6f05e9 100644 --- a/lily/global-translator.cc +++ b/lily/global-translator.cc @@ -98,7 +98,7 @@ Global_translator::run_iterator_on_me (Music_iterator * iter) w = sneaky_insert_extra_moment (w); - // cout << "Proccing " << w << endl; + cout << "Proccing " << w << endl; if (first) diff --git a/lily/include/kpath.hh b/lily/include/kpath.hh index accc1f610a..02528c3e25 100644 --- a/lily/include/kpath.hh +++ b/lily/include/kpath.hh @@ -12,7 +12,7 @@ source file of the GNU LilyPond music typesetter -char * ly_find_afm (char const * name); +String ly_find_afm (char const * name); String ly_find_tfm (char const * name); void ly_init_kpath (char *av0); diff --git a/lily/kpath.cc b/lily/kpath.cc index 0e39e0c1ff..62e0186c05 100644 --- a/lily/kpath.cc +++ b/lily/kpath.cc @@ -26,15 +26,27 @@ extern "C" { #include "main.hh" #include "kpath.hh" #include "lily-version.hh" +#include "warn.hh" - -char * +String ly_find_afm (char const * name) { #if (KPATHSEA && HAVE_KPSE_FIND_FILE) - return kpse_find_file (name, kpse_afm_format, true); + char * name_ptr = kpse_find_file (name, kpse_afm_format, true); + + if(!name_ptr) + { + /* + don't mutter about afms, since we try to find them first, and lots of + TFMs don't have AFMs. + */ + // warning (_f("kpathsea couldn't find AFM file `%s'", name)); + } + else + return name_ptr; + #endif - return 0; + return ""; } String @@ -46,7 +58,14 @@ ly_find_tfm (char const * name) return p; #if (KPATHSEA && HAVE_KPSE_FIND_FILE) - return kpse_find_file (name, kpse_tfm_format, true); + char * name_ptr = kpse_find_file (name, kpse_tfm_format, true); + if(!name_ptr) + { + warning (_f("Kpathsea couldn't find TFM file `%s'", name)); + } + else + return name_ptr; + #endif return ""; } diff --git a/lily/new-spacing-spanner.cc b/lily/new-spacing-spanner.cc index 4ed9c7afde..760651efee 100644 --- a/lily/new-spacing-spanner.cc +++ b/lily/new-spacing-spanner.cc @@ -41,14 +41,13 @@ New_spacing_spanner::set_interface (Grob*me) void New_spacing_spanner::do_measure (Grob*me, Link_array *cols) { - Moment shortest; - Moment mean_shortest; + Moment shortest_in_measure; /* space as if this duration is present. */ Moment base_shortest_duration = *unsmob_moment (me->get_grob_property ("maximum-duration-for-spacing")); - shortest.set_infinite (1); + shortest_in_measure.set_infinite (1); for (int i = cols->size(); i--;) { @@ -71,12 +70,7 @@ New_spacing_spanner::do_measure (Grob*me, Link_array *cols) SCM st = cols->elem (i)->get_grob_property ("shortest-starter-duration"); Moment this_shortest = *unsmob_moment (st); - shortest = shortest get_grob_property ("arithmetic-multiplier")); + + SCM seq = lc->get_grob_property ("spacing-sequence"); + + Moment dt = Paper_column::when_mom (r) - Paper_column::when_mom (l); - for (SCM s = lc->get_grob_property ("spacing-sequence"); gh_pair_p (s); s = gh_cdr (s)) + /* + hinterfleisch = hind-meat = amount of space following a note. + + + We adjust the space following a note only if the next note + happens after the current note (this is set in the grob + property SPACING-SEQUENCE. */ + + Real stretch_distance = note_space; + if (shortest_in_measure <= dt) { - Grob *lm = unsmob_grob (gh_caar (s)); - Grob *rm = unsmob_grob (gh_cdar (s)); + /* + currently SPACING-SEQUENCE is set in + Separating_group_spanner::find_musical_sequences (), which + works neatly for one-voice-per staff, however, - // TODO; configgable. - hinterfleisch += -headwid + Separation_item::my_width (lm)[RIGHT] - - 0.5 * Separation_item::my_width (rm)[LEFT]; + it can't find out the actual duration of the notes on a + staff, so when putting tuplets and normal patterns it gets + confused, (ie. believes that < { c8 c8 } { d8 d8 d8 }*2/3 + > contains 1/12 notes. ). + here we kludge, by checking if the distance we're spacing + for is less than the shortest note. + + TODO: + + Move SPACING-SEQUENCE detection into a voice + level-engraver --or-- make sure that every column has + access to the note head. - /* - UGH: KLUDGE! */ - - // if (delta_t > Moment (Rational (1,32))) - hinterfleisch += stem_dir_correction (me, l, r); - } + for (SCM s = seq; gh_pair_p (s); s = gh_cdr (s)) + { + Grob *lm = unsmob_grob (gh_caar (s)); + Grob *rm = unsmob_grob (gh_cdar (s)); + + // TODO; configgable. + hinterfleisch += -headwid + Separation_item::my_width (lm)[RIGHT] - + 0.5 * Separation_item::my_width (rm)[LEFT]; - Real stretch_distance = note_space - headwid; + + hinterfleisch += stem_dir_correction (me, l, r); + } + + // ? why. + if (gh_pair_p (seq)) + stretch_distance -= headwid; + } Spring s; s.distance_f_ = hinterfleisch; s.strength_f_ = 1 / stretch_distance; @@ -311,7 +338,7 @@ New_spacing_spanner::stretch_to_regularity (Grob *me, */ Real New_spacing_spanner::default_bar_spacing (Grob*me, Grob *lc, Grob *rc, - Moment shortest) + Moment shortest) { Real symbol_distance = lc->extent (lc,X_AXIS)[RIGHT] ; Real durational_distance = 0; @@ -358,7 +385,7 @@ New_spacing_spanner::note_spacing (Grob*me, Grob *lc, Grob *rc, Moment shortest_playing_len = 0; SCM s = lc->get_grob_property ("shortest-playing-duration"); - // SCM s = lc->get_grob_property ("mean-playing-duration"); + if (unsmob_moment (s)) shortest_playing_len = *unsmob_moment (s); diff --git a/lily/stem.cc b/lily/stem.cc index 1e229e1f0f..03d2c07ef8 100644 --- a/lily/stem.cc +++ b/lily/stem.cc @@ -461,18 +461,65 @@ Stem::set_spacing_hints (Grob*me) Molecule Stem::flag (Grob*me) { - String style; - SCM st = me->get_grob_property ("flag-style"); - if (gh_string_p (st)) + // TODO: rename flag-style into something more appropriate, + // e.g. "stroke-style", maybe with values "" (i.e. no stroke), + // "single" and "double". Needs more discussion. + String style, fstyle, stafflineOffs; + SCM fst = me->get_grob_property ("flag-style"); + if (gh_string_p (fst)) { - style = ly_scm2string (st); + fstyle = ly_scm2string (fst); } + SCM st = me->get_grob_property ("style"); + if (gh_symbol_p (st)) + { + style = (ly_scm2string (scm_symbol_to_string (st))); + } + else + { + style = ""; + } + if (String::compare_i (style, "mensural") == 0) + // Mensural notation: For notes on staff lines, use different + // flags than for notes between staff lines. The idea is that + // flags are always vertically aligned with the staff lines, + // regardless if the note head is on a staff line or between two + // staff lines. In other words, the inner end of a flag always + // touches a staff line. + { + // Urrgh! We have to detect wether this stem ends on a staff + // line or between two staff lines. But we can not call + // stem_end_position(me) or get_default_stem_end_position(me), + // since this encounters the flag and hence results in an + // infinite recursion. However, in pure mensural notation, + // there are no multiple note heads attached to a single stem, + // neither is there usually need for using the stem_shorten + // property (except for 32th and 64th notes, but that is not a + // problem since the stem length in this case is augmented by + // an integral multiple of staff_space). Hence, it should be + // sufficient to just take the first note head, assume it's + // the only one, look if it's on a staff line, and select the + // flag's shape accordingly. In the worst case, the shape + // looks slightly misplaced, but that will usually be the + // programmer's fault (e.g. when trying to attach multiple + // note heads to a single stem in mensural notation). + Grob *firstHead = first_head(me); + int sz = Staff_symbol_referencer::line_count (me)-1; + int p = (int)rint (Staff_symbol_referencer::position_f (firstHead)); + stafflineOffs = (((p ^ sz) & 0x1) == 0) ? "1" : "0"; + } + else + { + stafflineOffs = ""; + } char c = (get_direction (me) == UP) ? 'u' : 'd'; - Molecule m = Font_interface::get_default_font (me)->find_by_name (String ("flags-") + to_str (c) + - to_str (flag_i (me))); - if (!style.empty_b ()) - m.add_molecule (Font_interface::get_default_font (me)->find_by_name (String ("flags-") + to_str (c) + style)); + Molecule m = + Font_interface::get_default_font (me)-> + find_by_name (String ("flags-") + style + to_str (c) + stafflineOffs + + to_str (flag_i (me))); + if (!fstyle.empty_b ()) + m.add_molecule (Font_interface::get_default_font (me)->find_by_name (String ("flags-") + to_str (c) + fstyle)); return m; } diff --git a/lilypond-mode.el b/lilypond-mode.el index 8ea8cf8b7d..e0b7de1c76 100644 --- a/lilypond-mode.el +++ b/lilypond-mode.el @@ -4,6 +4,9 @@ ;;; source file of the GNU LilyPond music typesetter ;;; ;;; (c) 1999--2001 Jan Nieuwenhuizen +;;; +;;; Changed 29th Aug 2001 Heikki Junes +;;; * Add PS-compilation, PS-viewing and MIDI-play ;;; Inspired on auctex @@ -132,6 +135,18 @@ in LilyPond-include-path." :group 'LilyPond :type 'string) +(defcustom LilyPond-gv-command "gv -watch" + "Command used to display PS files." + + :group 'LilyPond + :type 'string) + +(defcustom LilyPond-midi-command "timidity" + "Command used to play MIDI files." + + :group 'LilyPond + :type 'string) + ;; This is the major configuration variable. (defcustom LilyPond-command-alist `( @@ -139,6 +154,7 @@ in LilyPond-include-path." ("TeX" . ("tex '\\nonstopmode\\input %t'" . "View")) ("2Dvi" . ("ly2dvi %s" . "View")) + ("2PS" . ("ly2dvi -P %s" . "View")) ("Book" . ("lilypond-book %x" . "LaTeX")) ("LaTeX" . ("latex '\\nonstopmode\\input %l'" . "View")) @@ -148,6 +164,10 @@ in LilyPond-include-path." ;; refreshes when kicked USR1 ("View" . (,(concat LilyPond-xdvi-command " %d") . "LilyPond")) + + ("ViewPS" . (,(concat LilyPond-gv-command " %p") . "LilyPond")) + + ("Midi" . (,(concat LilyPond-midi-command " %m") . "LilyPond")) ) "AList of commands to execute on the current document. @@ -180,6 +200,7 @@ LilyPond-expand-list. ("%p" . ".ps") ("%l" . ".latex") ("%x" . ".tely") + ("%m" . ".midi") ) "Alist of expansion strings for LilyPond command names." diff --git a/ly/a4-init.ly b/ly/a4-init.ly deleted file mode 100644 index 8c729c5f5b..0000000000 --- a/ly/a4-init.ly +++ /dev/null @@ -1,5 +0,0 @@ -\version "1.3.146" -% a4.ly - -hsize = 210.0 \mm -vsize = 296.9 \mm diff --git a/ly/accordion-defs-init.ly b/ly/accordion-defs-init.ly deleted file mode 100644 index f363efc71d..0000000000 --- a/ly/accordion-defs-init.ly +++ /dev/null @@ -1,56 +0,0 @@ -\version "1.3.146" -% Symbols needed to print accordion music -% -% 2' = T -% 4' = F -% 8' = E -% 16' = S -% - -accDiscant = \script "accDiscant" -accDiscantF = \script "accDiscantF" -accDiscantE = \script "accDiscantE" -accDiscantEh = \script "accDiscantEh" -accDiscantFE = \script "accDiscantFE" -accDiscantFEh = \script "accDiscantFEh" -accDiscantEE = \script "accDiscantEE" -accDiscantFEE = \script "accDiscantFEE" -accDiscantEEE = \script "accDiscantEEE" -accDiscantFEEE = \script "accDiscantFEEE" -accDiscantS = \script "accDiscantS" -accDiscantFS = \script "accDiscantFS" -accDiscantES = \script "accDiscantES" -accDiscantEhS = \script "accDiscantEhS" -accDiscantFES = \script "accDiscantFES" -accDiscantFEhS = \script "accDiscantFEhS" -accDiscantEES = \script "accDiscantEES" -accDiscantFEES = \script "accDiscantFEES" -accDiscantEEES = \script "accDiscantEEES" -accDiscantFEEES = \script "accDiscantFEEES" -accDiscantSS = \script "accDiscantSS" -accDiscantESS = \script "accDiscantESS" -accDiscantEESS = \script "accDiscantEESS" -accDiscantEEESS = \script "accDiscantEEESS" - -accFreebase = \script "accFreebase" -accFreebaseF = \script "accFreebaseF" -accFreebaseE = \script "accFreebaseE" -accFreebaseFE = \script "accFreebaseFE" - -accBayanbase = \script "accBayanbase" -accBayanbaseT = \script "accBayanbaseT" -accBayanbaseE = \script "accBayanbaseE" -accBayanbaseTE = \script "accBayanbaseTE" -accBayanbaseEE = \script "accBayanbaseEE" -accBayanbaseTEE = \script "accBayanbaseTEE" - -accStdbase = \script "accStdbase" -accStdbaseFE = \script "accStdbaseFE" -accStdbaseTFE = \script "accStdbaseTFE" -accStdbaseMES = \script "accStdbaseMES" -accStdbaseTFMES = \script "accStdbaseTFMES" - -accSB = \script "accSB" -accBB = \script "accBB" -accOldEE = \script "accOldEE" -accOldEES = \script "accOldEES" diff --git a/ly/book-init-init.ly b/ly/book-init-init.ly deleted file mode 100644 index f12fc8683b..0000000000 --- a/ly/book-init-init.ly +++ /dev/null @@ -1,14 +0,0 @@ -% Toplevel initialisation file. - -\version "1.3.146" - - -\include "declarations-init.ly" -\include "paper16-init.ly" - - \paper{ - \paperSixteen -} - - -\maininput diff --git a/ly/catalan.ly b/ly/catalan.ly deleted file mode 100644 index 74d42851d1..0000000000 --- a/ly/catalan.ly +++ /dev/null @@ -1,74 +0,0 @@ -%{ - - Common catalan names for notes. "b" means flat (bemoll), "d" means sharp (diesi). - Also "s" is included for sharp (sostingut). Both "diesi" and "sostingut" are approved - by "Diccionari de la Llengua Catalana" from "Institut d'Estudis Catalans". - - Adapted from italiano.ly. - - English: a b c d e f g - Catalan: la si do re mi fa sol - - For spanish naming just use the sharp sign "s" (sostenido) instead of "s" -(sostenido) . -%} - -% contributed by Jaume Obrador - - -% For using "sostingut" notation, which is also correct -\pitchnames #`( - (dobb . ,(make-pitch -1 0 -2 )) - (dob . ,(make-pitch -1 0 -1 )) - (do . ,(make-pitch -1 0 0 )) - (dod . ,(make-pitch -1 0 1 )) - (dodd . ,(make-pitch -1 0 2 )) - (rebb . ,(make-pitch -1 1 -2 )) - (reb . ,(make-pitch -1 1 -1 )) - (re . ,(make-pitch -1 1 0 )) - (red . ,(make-pitch -1 1 1 )) - (redd . ,(make-pitch -1 1 2 )) - (mibb . ,(make-pitch -1 2 -2 )) - (mib . ,(make-pitch -1 2 -1 )) - (mi . ,(make-pitch -1 2 0 )) - (mid . ,(make-pitch -1 2 1 )) - (midd . ,(make-pitch -1 2 2 )) - (fabb . ,(make-pitch -1 3 -2 )) - (fab . ,(make-pitch -1 3 -1 )) - (fa . ,(make-pitch -1 3 0 )) - (fad . ,(make-pitch -1 3 1 )) - (fadd . ,(make-pitch -1 3 2 )) - (solbb . ,(make-pitch -1 4 -2 )) - (solb . ,(make-pitch -1 4 -1 )) - (sol . ,(make-pitch -1 4 0 )) - (sold . ,(make-pitch -1 4 1 )) - (soldd . ,(make-pitch -1 4 2 )) - (labb . ,(make-pitch -1 5 -2 )) - (lab . ,(make-pitch -1 5 -1 )) - (la . ,(make-pitch -1 5 0 )) - (lad . ,(make-pitch -1 5 1 )) - (ladd . ,(make-pitch -1 5 2 )) - (sibb . ,(make-pitch -1 6 -2 )) - (sib . ,(make-pitch -1 6 -1 )) - (si . ,(make-pitch -1 6 0 )) - (sid . ,(make-pitch -1 6 1 )) - (sidd . ,(make-pitch -1 6 2 )) - (dos . ,(make-pitch -1 0 1 )) - (doss . ,(make-pitch -1 0 2 )) - (res . ,(make-pitch -1 1 1 )) - (ress . ,(make-pitch -1 1 2 )) - (mis . ,(make-pitch -1 2 1 )) - (miss . ,(make-pitch -1 2 2 )) - (fas . ,(make-pitch -1 3 1 )) - (fass . ,(make-pitch -1 3 2 )) - (sols . ,(make-pitch -1 4 1 )) - (solss . ,(make-pitch -1 4 2 )) - (las . ,(make-pitch -1 5 1 )) - (lass . ,(make-pitch -1 5 2 )) - (sis . ,(make-pitch -1 6 1 )) - (siss . ,(make-pitch -1 6 2 )) -) - - - -\version "1.3.146" diff --git a/ly/center-init.ly b/ly/center-init.ly deleted file mode 100644 index 72ecace841..0000000000 --- a/ly/center-init.ly +++ /dev/null @@ -1,15 +0,0 @@ -% Toplevel initialisation file. - -\version "1.3.146" - - -\include "declarations-init.ly" -\include "paper16-init.ly" - - \paper { - \paperSixteen -% linewidth = 7.\cm - linewidth = 11.\cm -} - -\maininput diff --git a/ly/chord-modifiers-init.ly b/ly/chord-modifiers-init.ly deleted file mode 100644 index dd82fdb331..0000000000 --- a/ly/chord-modifiers-init.ly +++ /dev/null @@ -1,17 +0,0 @@ -\version "1.3.146" - -% urg! -% -\chordmodifiers #`( - (m . ,(make-pitch 0 2 -1 )) - (min . ,(make-pitch 0 2 -1 )) - (aug . ,(make-pitch 0 4 1 )) - ;; (dim . ,(make-pitch -100 4 -1 )) - (dim . ,(make-pitch -100 2 -1 )) - ;; urg, not actually a chord-modifier, but it works - ;; c7 -> , c 7+ -> c b - (maj . ,(make-pitch 0 6 1 )) - ;; sus4 should delete 2 too... - (sus . ,(make-pitch 0 3 0 )) -) - diff --git a/ly/declarations-init.ly b/ly/declarations-init.ly deleted file mode 100644 index c200465244..0000000000 --- a/ly/declarations-init.ly +++ /dev/null @@ -1,56 +0,0 @@ - -\version "1.3.146" -breve = \duration #(make-duration -1 0) -longa = \duration #(make-duration -2 0 ) -maxima = \duration #(make-duration -3 0) - -\include "nederlands.ly" % dutch -\include "chord-modifiers-init.ly" -\include "script-init.ly" - -% declarations for standard directions -left = -1 -right = 1 -up = 1 -down = -1 -start = -1 -stop = 1 -smaller = -1 -bigger = 1 -center=0 - -break = \penalty #-10000 -noBreak = \penalty #10000 -\include "scale-definitions-init.ly" - -melisma = \property Staff.melismaBusy = ##t -melismaEnd = \property Staff.melismaBusy = ##f - - -\include "engraver-init.ly" -\include "grace-init.ly" - -singleLine = \paper { linewidth = 1. } - -% ugh -\include "midi-init.ly" - -papersize = "a4" -paperfile = \papersize + "-init.ly" - -\include "generic-paper-init.ly" -\include "paper20-init.ly" - - -\include "dynamic-scripts-init.ly" -\include "spanners-init.ly" - -\include "property-init.ly" - - - -% reset default duration -unusedEntry = \notes { c4 } - -% music = "\melodic\relative c" - diff --git a/ly/deutsch.ly b/ly/deutsch.ly deleted file mode 100644 index 8476b59531..0000000000 --- a/ly/deutsch.ly +++ /dev/null @@ -1,52 +0,0 @@ -% common german names for notes. "es" means flat, "is" means sharp -% -% by Roland Meier -% based on swedish.ly by Mats Bengtsson. - -% 1999/06/09 Bjoern Jacke -% added asas and marked ases as `unusual' - - -\pitchnames #`( - (ceses . ,(make-pitch -1 0 -2 )) - (ces . ,(make-pitch -1 0 -1 )) - (c . ,(make-pitch -1 0 0 )) - (cis . ,(make-pitch -1 0 1 )) - (cisis . ,(make-pitch -1 0 2 )) - (deses . ,(make-pitch -1 1 -2 )) - (des . ,(make-pitch -1 1 -1 )) - (d . ,(make-pitch -1 1 0 )) - (dis . ,(make-pitch -1 1 1 )) - (disis . ,(make-pitch -1 1 2 )) - (eses . ,(make-pitch -1 2 -2 )) - (es . ,(make-pitch -1 2 -1 )) - (e . ,(make-pitch -1 2 0 )) - (eis . ,(make-pitch -1 2 1 )) - (eisis . ,(make-pitch -1 2 2 )) - (feses . ,(make-pitch -1 3 -2 )) - (fes . ,(make-pitch -1 3 -1 )) - (f . ,(make-pitch -1 3 0 )) - (fis . ,(make-pitch -1 3 1 )) - (fisis . ,(make-pitch -1 3 2 )) - (geses . ,(make-pitch -1 4 -2 )) - (ges . ,(make-pitch -1 4 -1 )) - (g . ,(make-pitch -1 4 0 )) - (gis . ,(make-pitch -1 4 1 )) - (gisis . ,(make-pitch -1 4 2 )) - (asas . ,(make-pitch -1 5 -2 )) - (ases . ,(make-pitch -1 5 -2 )) ;;non-standard name for asas - (as . ,(make-pitch -1 5 -1 )) - (a . ,(make-pitch -1 5 0 )) - (ais . ,(make-pitch -1 5 1 )) - (aisis . ,(make-pitch -1 5 2 )) - (heses . ,(make-pitch -1 6 -2 )) - (b . ,(make-pitch -1 6 -1 )) - (h . ,(make-pitch -1 6 0 )) - (his . ,(make-pitch -1 6 1 )) - (hisis . ,(make-pitch -1 6 2 )) -) - - - - -\version "1.3.146" diff --git a/ly/drumpitch-init.ly b/ly/drumpitch-init.ly deleted file mode 100644 index b55e8bb1f4..0000000000 --- a/ly/drumpitch-init.ly +++ /dev/null @@ -1,160 +0,0 @@ -% GM drum pitches. -% I use different accidentals to distinguish drums at the same GM pitch. -% Always accidental 0 (white keys) or 1 (black keys) to get the "correct" gm name. -% i.e. fis, for closed highat ges, for highat. - -% 2001/03/25 Rune Zedeler - - -%% TODO: don't pollute global namespace in this way . - - -#(define drum-pitch-names `( - (acousticbassdrum bda ,(make-pitch -3 6 0 )) - (bassdrum bd ,(make-pitch -2 0 0 )) - (hisidestick ssh ,(make-pitch -3 6 2)) - (sidestick ss ,(make-pitch -2 0 1)) - (losidestick ssl ,(make-pitch -2 1 -1)) - (acousticsnare sna ,(make-pitch -2 1 0)) - (snare sn ,(make-pitch -2 2 -2)) - (handclap hc ,(make-pitch -2 1 1)) - (electricsnare sne ,(make-pitch -2 2 0)) - (lowfloortom tomfl ,(make-pitch -2 3 0)) - (closedhihat hhc ,(make-pitch -2 3 1)) - (hihat hh ,(make-pitch -2 4 -1)) - (highfloortom tomfh ,(make-pitch -2 4 0)) - (pedalhihat hhp ,(make-pitch -2 4 1)) - (lowtom toml ,(make-pitch -2 5 0)) - (openhihat hho ,(make-pitch -2 5 1)) - (halfopenhihat hhho ,(make-pitch -2 5 1)) - (lowmidtom tomml ,(make-pitch -2 6 0)) - (himidtom tommh ,(make-pitch -1 0 0)) - (crashcymbala cymca ,(make-pitch -1 0 1)) - (crashcymbal cymc ,(make-pitch -1 1 -1)) - (hightom tomh ,(make-pitch -1 1 0)) - (ridecymbala cymra ,(make-pitch -1 1 1)) - (ridecymbal cymr ,(make-pitch -1 2 -1)) - (chinesecymbal cymch ,(make-pitch -1 2 0)) - (ridebell rb ,(make-pitch -1 3 0)) - (tambourine tamb ,(make-pitch -1 3 1)) - (splashcymbal cyms ,(make-pitch -1 4 0)) - (cowbell cb ,(make-pitch -1 4 1)) - (crashcymbalb cymcb ,(make-pitch -1 5 0)) - (vibraslap vibs ,(make-pitch -1 5 1)) - (ridecymbalb cymrb ,(make-pitch -1 6 0)) - (hibongo boh ,(make-pitch 0 0 0)) - (lobongo bol ,(make-pitch 0 0 1)) - (mutehiconga cghm ,(make-pitch 0 1 0)) - (openhiconga cgho ,(make-pitch 0 1 1)) - (hiconga cgh ,(make-pitch 0 2 -1)) - (openloconga cglo ,(make-pitch 0 1 2)) - (loconga cgl ,(make-pitch 0 2 0)) - (hitimbale timh ,(make-pitch 0 3 0)) - (lotimbale timl ,(make-pitch 0 3 1)) - (hiagogo agh ,(make-pitch 0 4 0)) - (loagogo agl ,(make-pitch 0 4 1)) - (cabasa cab ,(make-pitch 0 5 0)) - (maracas mar ,(make-pitch 0 5 1)) - (shortwhistle whs ,(make-pitch 0 6 0)) - (longwhistle whl ,(make-pitch 1 0 0)) - (shortguiro guis ,(make-pitch 1 0 1)) - (longguiro guil ,(make-pitch 1 1 0)) - (guiro gui ,(make-pitch 1 0 2)) - (claves cl ,(make-pitch 1 1 1)) - (hiwoodblock wbh ,(make-pitch 1 2 0)) - (lowoodblock wbl ,(make-pitch 1 3 0)) - (mutecuica cuim ,(make-pitch 1 3 1)) - (opencuica cuio ,(make-pitch 1 4 0)) - (mutetriangle trim ,(make-pitch 1 4 1)) - (triangle tri ,(make-pitch 1 4 2)) - (opentriangle trio ,(make-pitch 1 5 0)) - ;; "transposing" pitches: - (oneup ua ,(make-pitch 0 1 0)) - (twoup ub ,(make-pitch 0 2 0)) - (threeup uc ,(make-pitch 0 3 0)) - (fourup ud ,(make-pitch 0 4 0)) - (fiveup ue ,(make-pitch 0 5 0)) - (onedown da ,(make-pitch -1 6 0)) - (twodown db ,(make-pitch -1 5 0)) - (threedown dc ,(make-pitch -1 4 0)) - (fourdown dd ,(make-pitch -1 3 0)) - (fivedown de ,(make-pitch -1 2 0)) -)) - -#(define drums `( - (acousticbassdrum default ,#f ,(make-pitch -1 4 0)) - (bassdrum default ,#f ,(make-pitch -1 4 0)) - (sidestick cross ,#f ,(make-pitch 0 1 0)) - (acousticsnare default ,#f ,(make-pitch 0 1 0)) - (snare default ,#f ,(make-pitch 0 1 0)) - (handclap triangle ,#f ,(make-pitch 0 1 0)) - (electricsnare default ,#f ,(make-pitch 0 1 0)) - (lowfloortom default ,#f ,(make-pitch -1 3 0)) - (closedhihat cross "stopped" ,(make-pitch 0 3 0)) - (hihat cross ,#f ,(make-pitch 0 3 0)) - (highfloortom default ,#f ,(make-pitch -1 5 0)) - (pedalhihat cross ,#f ,(make-pitch -1 2 0)) - (lowtom default ,#f ,(make-pitch 0 0 0)) - (openhihat cross "open" ,(make-pitch 0 3 0)) - (halfopenhihat xcircle ,#f ,(make-pitch 0 3 0)) - (lowmidtom default ,#f ,(make-pitch 0 1 0)) - (himidtom default ,#f ,(make-pitch 0 2 0)) - (crashcymbala xcircle ,#f ,(make-pitch 0 5 0)) - (crashcymbal xcircle ,#f ,(make-pitch 0 5 0)) - (hightom default ,#f ,(make-pitch 0 4 0)) - (ridecymbala cross ,#f ,(make-pitch 0 5 0)) - (ridecymbal cross ,#f ,(make-pitch 0 5 0)) - (chinesecymbal mensural ,#f ,(make-pitch 0 5 0)) - (ridebell default ,#f ,(make-pitch 0 5 0)) - (splashcymbal diamond ,#f ,(make-pitch 0 5 0)) - (cowbell triangle ,#f ,(make-pitch 0 5 0)) - (crashcymbalb cross ,#f ,(make-pitch 0 5 0)) - (vibraslap diamond ,#f ,(make-pitch 0 4 0)) - (ridecymbalb cross ,#f ,(make-pitch 0 5 0)) - )) - -#(define timbales `( - (losidestick cross ,#f ,(make-pitch -1 6 0)) - (lotimbale default ,#f ,(make-pitch -1 6 0)) - (cowbell triangle ,#f ,(make-pitch 0 0 0)) - (hisidestick cross ,#f ,(make-pitch 0 1 0)) - (hitimbale default ,#f ,(make-pitch 0 1 0)) - )) - -#(define congas `( - (losidestick cross ,#f ,(make-pitch -1 6 0)) - (loconga default ,#f ,(make-pitch -1 6 0)) - (openloconga default ,"open" ,(make-pitch -1 6 0)) - (hisidestick cross ,#f ,(make-pitch 0 1 0)) - (hiconga default ,#f ,(make-pitch 0 1 0)) - (openhiconga default "open" ,(make-pitch 0 1 0)) - (mutehiconga default "stopped" ,(make-pitch 0 1 0)) - - )) - -#(define bongos `( - (lobongo default ,#f ,(make-pitch -1 6 0)) - (hibongo default ,#f ,(make-pitch 0 1 0)) - )) - -#(define guiro `( - (shortguiro default "staccato",(make-pitch 0 0 0)) - (longguiro default "tenuto" ,(make-pitch 0 0 0)) - (guiro default ,#f ,(make-pitch 0 0 0)) - )) - -#(define triangle `( - (opentriangle cross "open" ,(make-pitch 0 0 0)) - (mutetriangle cross "stopped" ,(make-pitch 0 0 0)) - (triangle cross ,#f ,(make-pitch 0 0 0)) - )) - - - -\pitchnames -#(append (map (lambda (x) (cons (car x) (caddr x))) drum-pitch-names) - (map (lambda (x) (cons (cadr x) (caddr x))) drum-pitch-names) - ) - - -\version "1.3.146" diff --git a/ly/dynamic-scripts-init.ly b/ly/dynamic-scripts-init.ly deleted file mode 100644 index 0f2f3e6b24..0000000000 --- a/ly/dynamic-scripts-init.ly +++ /dev/null @@ -1,27 +0,0 @@ -\version "1.3.146" - -% -% declare the standard dynamic identifiers. -% -ppppp = \dynamicscript #"ppppp" -pppp = \dynamicscript #"pppp" -ppp = \dynamicscript #"ppp" -pp = \dynamicscript #"pp" -p = \dynamicscript #"p" -mp = \dynamicscript #"mp" -mf = \dynamicscript #"mf" -f = \dynamicscript #"e" % see feta-din layout -ff = \dynamicscript #"ff" -fff = \dynamicscript #"fff" -ffff = \dynamicscript #"ffff" -fp = \dynamicscript #"fp" - -sf = \dynamicscript #"sf" -sfp = \dynamicscript #"sfp" -sff = \dynamicscript #"sff" -sfz = \dynamicscript #"sfz" -fz = \dynamicscript #"fz" -sp = \dynamicscript #"sp" -spp = \dynamicscript #"spp" -rfz = \dynamicscript #"rfz" - diff --git a/ly/english.ly b/ly/english.ly deleted file mode 100644 index 9afeff28f6..0000000000 --- a/ly/english.ly +++ /dev/null @@ -1,82 +0,0 @@ -%{ - English note names spelled out in full, and abbreviated - with s for sharp and f for flat. -%} - -\pitchnames #`( - (cflatflat . ,(make-pitch -1 0 -2 )) - (cflat . ,(make-pitch -1 0 -1 )) - (c . ,(make-pitch -1 0 0 )) - (csharp . ,(make-pitch -1 0 1 )) - (csharpsharp . ,(make-pitch -1 0 2 )) - (dflatflat . ,(make-pitch -1 1 -2 )) - (dflat . ,(make-pitch -1 1 -1 )) - (d . ,(make-pitch -1 1 0 )) - (dsharp . ,(make-pitch -1 1 1 )) - (dsharpsharp . ,(make-pitch -1 1 2 )) - (eflatflat . ,(make-pitch -1 2 -2 )) - (eflat . ,(make-pitch -1 2 -1 )) - (e . ,(make-pitch -1 2 0 )) - (esharp . ,(make-pitch -1 2 1 )) - (esharpsharp . ,(make-pitch -1 2 2 )) - (fflatflat . ,(make-pitch -1 3 -2 )) - (fflat . ,(make-pitch -1 3 -1 )) - (f . ,(make-pitch -1 3 0 )) - (fsharp . ,(make-pitch -1 3 1 )) - (fsharpsharp . ,(make-pitch -1 3 2 )) - (gflatflat . ,(make-pitch -1 4 -2 )) - (gflat . ,(make-pitch -1 4 -1 )) - (g . ,(make-pitch -1 4 0 )) - (gsharp . ,(make-pitch -1 4 1 )) - (gsharpsharp . ,(make-pitch -1 4 2 )) - (aflatflat . ,(make-pitch -1 5 -2 )) - (aflat . ,(make-pitch -1 5 -1 )) - (a . ,(make-pitch -1 5 0 )) - (asharp . ,(make-pitch -1 5 1 )) - (asharpsharp . ,(make-pitch -1 5 2 )) - (bflatflat . ,(make-pitch -1 6 -2 )) - (bflat . ,(make-pitch -1 6 -1 )) - (b . ,(make-pitch -1 6 0 )) - (bsharp . ,(make-pitch -1 6 1 )) - (bsharpsharp . ,(make-pitch -1 6 2 )) - - (cff . ,(make-pitch -1 0 -2 )) - (cf . ,(make-pitch -1 0 -1 )) - (c . ,(make-pitch -1 0 0 )) - (cs . ,(make-pitch -1 0 1 )) - (css . ,(make-pitch -1 0 2 )) - (dff . ,(make-pitch -1 1 -2 )) - (df . ,(make-pitch -1 1 -1 )) - (d . ,(make-pitch -1 1 0 )) - (ds . ,(make-pitch -1 1 1 )) - (dss . ,(make-pitch -1 1 2 )) - (eff . ,(make-pitch -1 2 -2 )) - (ef . ,(make-pitch -1 2 -1 )) - (e . ,(make-pitch -1 2 0 )) - - (es . ,(make-pitch -1 2 1 )) - (ess . ,(make-pitch -1 2 2 )) - (fff . ,(make-pitch -1 3 -2 )) - (ff . ,(make-pitch -1 3 -1 )) - (f . ,(make-pitch -1 3 0 )) - (fs . ,(make-pitch -1 3 1 )) - (fss . ,(make-pitch -1 3 2 )) - (gff . ,(make-pitch -1 4 -2 )) - (gf . ,(make-pitch -1 4 -1 )) - (g . ,(make-pitch -1 4 0 )) - (gs . ,(make-pitch -1 4 1 )) - (gss . ,(make-pitch -1 4 2 )) - (aff . ,(make-pitch -1 5 -2 )) - (af . ,(make-pitch -1 5 -1 )) - (a . ,(make-pitch -1 5 0 )) - (as . ,(make-pitch -1 5 1 )) - (ass . ,(make-pitch -1 5 2 )) - (bff . ,(make-pitch -1 6 -2 )) - (bf . ,(make-pitch -1 6 -1 )) - (b . ,(make-pitch -1 6 0 )) - (bs . ,(make-pitch -1 6 1 )) - (bss . ,(make-pitch -1 6 2 )) -) - -\version "1.3.146" - diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly deleted file mode 100644 index 9717e3c5e2..0000000000 --- a/ly/engraver-init.ly +++ /dev/null @@ -1,415 +0,0 @@ -\version "1.3.146" - -% -% setup for Request->Element conversion. Guru-only -% - -StaffContext=\translator { - \type "Engraver_group_engraver" - \name Staff - \consists "Output_property_engraver" - Generic_property_list = #generic-staff-properties - - \consists "Bar_engraver" - % Bar_engraver must be first so default bars aren't overwritten -% with empty ones. - \consists "Font_size_engraver" - -% \consists "Repeat_engraver" - \consists "Volta_engraver" - \consists "Separating_line_group_engraver" - - - - \consists "Clef_engraver" - \consists "Key_engraver" - \consists "Time_signature_engraver" - \consists "Staff_symbol_engraver" - \consists "Collision_engraver" - \consists "Rest_collision_engraver" - \consists "Local_key_engraver" - \consists "Piano_pedal_engraver" - \consists "Instrument_name_engraver" - - \consistsend "Axis_group_engraver" - - MinimumVerticalExtent = #'(-4 . 4) - ExtraVerticalExtent = ##f - VerticalExtent = ##f - - % explicitly set instrument, so we don't get - % weird effects when doing instrument names for - % piano staves - - instrument = ##f - instr = ##f - - \accepts "Voice" -} - - -StaffContainerContext = \translator { - \type Engraver_group_engraver - \consists "Axis_group_engraver" - MinimumVerticalExtent = ##f - ExtraVerticalExtent = ##f - VerticalExtent = ##f - - \accepts Staff - \name StaffContainer -} - -InnerChoirStaffContext = \translator { - \type "Engraver_group_engraver" - \name InnerChoirStaff - alignmentReference = #0 - \consists "System_start_delimiter_engraver" - SystemStartDelimiter \override #'glyph = #'bracket - - \accepts "Staff" - \accepts "RhythmicStaff" - \accepts "GrandStaff" - \accepts "PianoStaff" - \accepts "Lyrics" - \accepts "ChordNames" -} -ChoirStaffContext = \translator { - \InnerChoirStaffContext - \name ChoirStaff - \accepts "InnerChoirStaff" - \accepts "InnerStaffGroup" -} - - -RhythmicStaffContext=\translator{ - \type "Engraver_group_engraver" - - \consists "Output_property_engraver" - - Generic_property_list = #generic-staff-properties - MinimumVerticalExtent = ##f - ExtraVerticalExtent = ##f - VerticalExtent = ##f - - \consists "Pitch_squash_engraver" - \consists "Separating_line_group_engraver" - \name RhythmicStaff - \alias "Staff" - - Bar \override #'bar-size = #4 - VoltaBracket \override #'minimum-space = #15 % urg, in \pt - VoltaBracket \override #'padding = #5 % urg, in \pt - StaffSymbol \override #'line-count = #1 - -% \consists "Repeat_engraver" - \consists "Volta_engraver" - \consists "Bar_engraver" - \consists "Time_signature_engraver" - \consists "Staff_symbol_engraver" - \consistsend "Axis_group_engraver" - \accepts "Voice" -} - - -VoiceContext = \translator { - \type "Engraver_group_engraver" - \name Voice - - Generic_property_list = #generic-voice-properties - \consists "Font_size_engraver" - - % must come before all - \consists "Voice_devnull_engraver" - \consists "Output_property_engraver" - \consists "Arpeggio_engraver" - \consists "Multi_measure_rest_engraver" - \consists "Text_spanner_engraver" - - \consists "Breathing_sign_engraver" - % \consists "Rest_engraver" - \consists "Dot_column_engraver" - \consists "Stem_engraver" - \consists "Beam_engraver" - \consists "Auto_beam_engraver" - - \consists "Chord_tremolo_engraver" - \consists "Percent_repeat_engraver" - \consists "Melisma_engraver" - -%{ - Must come before text_engraver, but after note_column engraver. - -%} - \consists "Dynamic_engraver" - \consists "Text_engraver" - - \consists "Script_engraver" - \consists "Script_column_engraver" - \consists "Rhythmic_column_engraver" - \consists "Phrasing_slur_engraver" - \consists "Slur_engraver" - \consists "Tie_engraver" - \consists "Tuplet_engraver" - \consists "A2_engraver" - - \consists "Skip_req_swallow_translator" - \accepts Thread % bug if you leave out this! -} - -ThreadContext = \translator{ - \type Engraver_group_engraver - \name Thread - - \consists "Font_size_engraver" - \consists "Thread_devnull_engraver" - \consists "Note_heads_engraver" - \consists "Rest_engraver" - \consists "Note_head_line_engraver" - \consists "Output_property_engraver" - Generic_property_list = #generic-thread-properties -} - -GrandStaffContext=\translator{ - \type "Engraver_group_engraver" - \name GrandStaff - \consists "Span_bar_engraver" - \consists "Span_arpeggio_engraver" - \consists "System_start_delimiter_engraver" - SystemStartDelimiter \override #'glyph = #'brace - - Generic_property_list = #generic-grand-staff-properties - \accepts "Staff" -} - -PianoStaffContext = \translator{ - \GrandStaffContext - \name "PianoStaff" - - \consists "Vertical_align_engraver" - \consists "Instrument_name_engraver" - - instrument = ##f - instr = ##f - - verticalAlignmentChildCallback = #Align_interface::fixed_distance_alignment_callback - VerticalAlignment \override #'forced-distance = #12 - VerticalAlignment \override #'self-alignment-Y = #0 -% \consistsend "Axis_group_engraver" -} - -InnerStaffGroupContext= \translator { - \type "Engraver_group_engraver" - \name InnerStaffGroup - - \consists "Span_bar_engraver" - \consists "Span_arpeggio_engraver" - \consists "Output_property_engraver" - SystemStartDelimiter \override #'glyph = #'bracket - - \consists "System_start_delimiter_engraver" - \accepts "Staff" - \accepts "RhythmicStaff" - \accepts "GrandStaff" - \accepts "PianoStaff" - - \accepts "Lyrics" - \accepts "ChordNames" -} -StaffGroupContext = \translator { - \InnerStaffGroupContext - \name StaffGroup - \accepts "InnerChoirStaff" - \accepts "ChoirStaff" - \accepts "InnerStaffGroup" -} - - -% UGH! JUNKME -LyricsVoiceContext= \translator{ - \type "Engraver_group_engraver" - \consistsend "Axis_group_engraver" - MinimumVerticalExtent = #(cons -1.2 1.2) - ExtraVerticalExtent = ##f - VerticalExtent = ##f - \name LyricsVoice - \consists "Separating_line_group_engraver" - \consists "Lyric_engraver" - \consists "Extender_engraver" - \consists "Hyphen_engraver" - \consists "Stanza_number_engraver" - phrasingPunctuation = #".,:!?\"" - -} -NoteNamesContext = \translator { - \type "Engraver_group_engraver" - \name NoteNames - \consistsend "Axis_group_engraver" - - MinimumVerticalExtent = ##f - ExtraVerticalExtent = ##f - VerticalExtent = ##f - - - \consists "Note_name_engraver" - \consists "Separating_line_group_engraver" -} - -LyricsContext = \translator { - \type "Engraver_group_engraver" - \name Lyrics - \consists Vertical_align_engraver %need this for getting folded repeats right. - Generic_property_list = #generic-lyrics-properties - - \consistsend "Axis_group_engraver" - MinimumVerticalExtent = ##f - ExtraVerticalExtent = ##f - VerticalExtent = ##f - - \accepts "LyricsVoice" -} - - -ChordNamesContext = \translator { - \type "Engraver_group_engraver" - \name ChordNames - - Generic_property_list = #generic-chord-staff-properties - - - \consists "Output_property_engraver" - \consists "Separating_line_group_engraver" - \consists "Chord_name_engraver" - \consists "Skip_req_swallow_translator" - \consistsend "Axis_group_engraver" - MinimumVerticalExtent = ##f - ExtraVerticalExtent = ##f - VerticalExtent = ##f - - VerticalAxisGroup \override #'invisible-staff = ##t - } - - - -StupidScore = \translator { - \type "Score_engraver" - \name Score - \consists "Note_heads_engraver" -} - - - - -HaraKiriStaffContext = \translator { - \StaffContext - \remove "Axis_group_engraver" - \consistsend "Hara_kiri_engraver" - \consists "Instrument_name_engraver" - \accepts "Voice" -} -%{ - The HaraKiriStaffContexts doesn't override \name, - so it is still named `Staff'. - - %\translator { \HaraKiriStaffContext } -%} - - - - -ScoreContext = \translator { - \type Score_engraver - \name Score - - - \consists "Repeat_acknowledge_engraver" - \consists "Timing_engraver" - \consists "Output_property_engraver" - \consists "System_start_delimiter_engraver" - \consists "Mark_engraver" - \consists "Break_align_engraver" - \consists "Spacing_engraver" - \consists "Vertical_align_engraver" - - \consists "Lyric_phrasing_engraver" - \consists "Bar_number_engraver" - \consists "Span_arpeggio_engraver" - - \accepts "Staff" - \accepts "StaffContainer" - \accepts "StaffGroup" - \accepts "RhythmicStaff" - \accepts "Lyrics" - \accepts "ChordNames" - \accepts "GrandStaff" - \accepts "ChoirStaff" - \accepts "PianoStaff" - \accepts "NoteNames" - - soloText = #"Solo" - soloIIText = #"Solo II" - aDueText = #"a2" - soloADue = ##t - splitInterval = #'(0 . 1) - changeMoment = #`(,(make-moment 0 0) . ,(make-moment 1 512)) - - barAuto = ##t - voltaVisibility = ##t - % name, glyph id, clef position - % where is c0 in this clef? - - clefGlyph = #"clefs-G" - clefPosition = #-2 - centralCPosition = #-6 - - automaticPhrasing = ##t - alignmentReference = #-1 % \down - defaultBarType = #"|" - - explicitClefVisibility = #all-visible - explicitKeySignatureVisibility = #all-visible - - scriptDefinitions = #default-script-alist - - verticalAlignmentChildCallback = #Align_interface::alignment_callback - - pedalSustainStrings = #'("Ped." "*Ped." "*") - pedalUnaCordaStrings = #'("una corda" "" "tre corde") - pedalSostenutoStrings = #'() % FIXME - - tupletNumberFormatFunction = #denominator-tuplet-formatter - - keyAccidentalOrder = #'( - (6 . -1) (2 . -1) (5 . -1 ) (1 . -1) (4 . -1) (0 . -1) (3 . -1) - (3 . 1) (0 . 1) (4 . 1) (1 . 1) (5 . 1) (2 . 1) (6 . 1) - (6 . -2) (2 . -2) (5 . -2 ) (1 . -2) (4 . -2) (0 . -2) (3 . -2) - (3 . 2) (0 . 2) (4 . 2) (2 . 2) (5 . 2) (2 . 2) (6 . 2) - ) - breakAlignOrder = #'( - Instrument_name - Left_edge_item - Span_bar - Breathing_sign - Clef_item - Key_item - Staff_bar - Time_signature - Custos - ) - - - \elementdescriptions #all-grob-descriptions -} - -OrchestralScoreContext= \translator { - \ScoreContext -} -EasyNotation = \translator { - \ScoreContext - NoteHead \override #'molecule-callback = #Note_head::brew_ez_molecule - easyPlay = ##t -} - -% retain for compatibility reasons (FIXME: convert-ly) -GraceContext = \translator { - \type "Engraver_group_engraver" -} diff --git a/ly/generate-documentation.ly b/ly/generate-documentation.ly deleted file mode 100644 index 104d57efeb..0000000000 --- a/ly/generate-documentation.ly +++ /dev/null @@ -1,6 +0,0 @@ -\version "1.3.146" - -% -% Running LilyPond on this file generates the documentation -% -#(eval-string (ly-gulp-file "generate-documentation.scm")) diff --git a/ly/generate-interface-doc-init.ly b/ly/generate-interface-doc-init.ly deleted file mode 100644 index a50eeaf3d0..0000000000 --- a/ly/generate-interface-doc-init.ly +++ /dev/null @@ -1,5 +0,0 @@ - -% -% Running LilyPond on this file generates the short interface doc -% -#(eval-string (ly-gulp-file "generate-interface-doc.scm")) diff --git a/ly/generic-paper-init.ly b/ly/generic-paper-init.ly deleted file mode 100644 index df96f2abcd..0000000000 --- a/ly/generic-paper-init.ly +++ /dev/null @@ -1,8 +0,0 @@ -\version "1.3.146" - -\paper { - texsetting = "" - pssetting = "" - scmsetting = "(lilyponddefs.ps) findlibfile {exch pop //systemdict /run get exec} { /undefinedfilename signalerror } ifelse\n"% UGH. - -} diff --git a/ly/german-chords-init.ly b/ly/german-chords-init.ly deleted file mode 100644 index cb741eba14..0000000000 --- a/ly/german-chords-init.ly +++ /dev/null @@ -1,41 +0,0 @@ -\version "1.3.148" - -% german-chords.ly: -% german/norwegian/danish? - -% To get Bb instead of B, use -% \include "german-chords.ly" -% #(set! german-Bb #t) - -#(define german-Bb #f) - -#(define (pitch->chord-name-text-banter pitch steps) - (let ((dopitch (if (member (cdr pitch) '((6 -1) (6 -2))) - (list 7 (+ (if german-Bb 0 1) (caddr pitch))) - (cdr pitch) - ))) - (cons - (list-ref '("C" "D" "E" "F" "G" "A" "H" "B") (car dopitch)) - (accidental->text-super (cadr dopitch)) - ) - ) - ) - - - -#(define (pitch->note-name-text-banter pitch) - (let ((dopitch (if (member (cdr pitch) '((6 -1) (6 -2))) - (list 7 (+ 1 (caddr pitch))) - (cdr pitch) - ))) - (list - (string-append - (list-ref '("c" "d" "e" "f" "g" "a" "h" "b") (car dopitch)) - (if (or (equal? (car dopitch) 2) (equal? (car dopitch) 5)) - (list-ref '( "ses" "s" "" "is" "isis") (+ 2 (cadr dopitch))) - (list-ref '("eses" "es" "" "is" "isis") (+ 2 (cadr dopitch))) - ) - ) - ) - ) - ) diff --git a/ly/grace-init.ly b/ly/grace-init.ly deleted file mode 100644 index 691498d1bd..0000000000 --- a/ly/grace-init.ly +++ /dev/null @@ -1,45 +0,0 @@ - -#(define (grace-beam-space-function multiplicity) - (* (if (<= multiplicity 3) 0.816 0.844) 0.8)) - - -startGraceMusic = { - \property Voice.Stem \override #'direction = #1 - \property Voice.Stem \override #'length = #6 - \property Voice.Stem \override #'lengths = - #(map (lambda (x) (* 0.8 x)) '(3.5 3.5 3.5 4.5 5.0)) - \property Voice.Stem \override #'beamed-lengths = - #(map (lambda (x) (* 0.8 x)) '(0.0 2.5 2.0 1.5)) - \property Voice.Stem \override #'beamed-minimum-lengths = - #(map (lambda (x) (* 0.8 x)) '(0.0 1.5 1.25 1.0)) - \property Voice.Stem \override #'no-stem-extend = ##t - \property Voice.Stem \override #'flag-style = #"grace" - - \property Voice.Beam \override #'space-function = #grace-beam-space-function - \property Voice.Beam \override #'thickness = #0.384 - - % Can't use Staff.fontSize, since time sigs, keys sigs, etc. will - % be smaller as well. - - \property Voice.fontSize = #-2 - \property Staff.Accidentals \override #'font-relative-size = #-2 -} - -stopGraceMusic = { - \property Voice.Beam \revert #'space-function - \property Voice.Beam \revert #'thickness - - \property Voice.Stem \revert #'flag-style - \property Voice.Stem \revert #'no-stem-extend - \property Voice.Stem \revert #'beamed-lengths - \property Voice.Stem \revert #'beamed-minimum-lengths - \property Voice.Stem \revert #'lengths - \property Voice.Stem \revert #'length - \property Voice.Stem \revert #'direction - - % Can't use Staff.fontSize, since time sigs, keys sigs, etc. will - % be smaller as well. - - \property Voice.fontSize \unset - \property Staff.LocalKeyItem \revert #'font-relative-size -} diff --git a/ly/init-as.fly b/ly/init-as.fly deleted file mode 100644 index 757ca7c47e..0000000000 --- a/ly/init-as.fly +++ /dev/null @@ -1,43 +0,0 @@ -% Toplevel AsciiScript initialisation file. - -\version "1.3.146" - -\include "declarations-as.ly" - -% burp. need to override lily.scm -#(define cmr-alist - '(("bold" . "as-dummy") - ("brace" . "as-braces") - ("default" . "as-dummy") - ("dynamic" . "as-dummy") - ("feta" . "feta") - ("feta-1" . "feta") - ("feta-2" . "feta") - ("finger" . "as-number") - ("typewriter" . "as-dummy") - ("italic" . "as-dummy") - ("roman" . "as-dummy") - ("script" . "as-dummy") - ("large" . "as-dummy") - ("Large" . "as-dummy") - ("mark" . "as-number") - ("number" . "as-number") - ("timesig" . "as-number") - ("volta" . "as-number")) -) - -\score { - \context Voice \notes\relative c { - \maininput - } - \paper { - \paper_as_nine - %linewidth=-1.0 - %indent = 0.0 - \translator { \StaffContext barSize = \staffheight } - - % no beam-slope - %\translator { \VoiceContext beamHeight = #0 } - } - %\midi{ } -} diff --git a/ly/init.ly b/ly/init.ly deleted file mode 100644 index 0ddb2db3a9..0000000000 --- a/ly/init.ly +++ /dev/null @@ -1,8 +0,0 @@ -% Toplevel initialisation file. - - -\version "1.3.146" - -\include "declarations-init.ly" - -\maininput diff --git a/ly/italiano.ly b/ly/italiano.ly deleted file mode 100644 index 263d2bfab9..0000000000 --- a/ly/italiano.ly +++ /dev/null @@ -1,51 +0,0 @@ -%{ - Common italian names for notes. "b" means flat (bemolle), "d" means sharp (diesis) - Adapted from dutch.ly. - - English: a b c d e f g - Italian: la si do re mi fa sol - - For french naming just change 'do' in 'ut'. -%} - -% contributed by Paolo Zuliani - -\pitchnames #`( - (dobb . ,(make-pitch -1 0 -2 )) - (dob . ,(make-pitch -1 0 -1 )) - (do . ,(make-pitch -1 0 0 )) - (dod . ,(make-pitch -1 0 1 )) - (dodd . ,(make-pitch -1 0 2 )) - (rebb . ,(make-pitch -1 1 -2 )) - (reb . ,(make-pitch -1 1 -1 )) - (re . ,(make-pitch -1 1 0 )) - (red . ,(make-pitch -1 1 1 )) - (redd . ,(make-pitch -1 1 2 )) - (mibb . ,(make-pitch -1 2 -2 )) - (mib . ,(make-pitch -1 2 -1 )) - (mi . ,(make-pitch -1 2 0 )) - (mid . ,(make-pitch -1 2 1 )) - (midd . ,(make-pitch -1 2 2 )) - (fabb . ,(make-pitch -1 3 -2 )) - (fab . ,(make-pitch -1 3 -1 )) - (fa . ,(make-pitch -1 3 0 )) - (fad . ,(make-pitch -1 3 1 )) - (fadd . ,(make-pitch -1 3 2 )) - (solbb . ,(make-pitch -1 4 -2 )) - (solb . ,(make-pitch -1 4 -1 )) - (sol . ,(make-pitch -1 4 0 )) - (sold . ,(make-pitch -1 4 1 )) - (soldd . ,(make-pitch -1 4 2 )) - (labb . ,(make-pitch -1 5 -2 )) - (lab . ,(make-pitch -1 5 -1 )) - (la . ,(make-pitch -1 5 0 )) - (lad . ,(make-pitch -1 5 1 )) - (ladd . ,(make-pitch -1 5 2 )) - (sibb . ,(make-pitch -1 6 -2 )) - (sib . ,(make-pitch -1 6 -1 )) - (si . ,(make-pitch -1 6 0 )) - (sid . ,(make-pitch -1 6 1 )) - (sidd . ,(make-pitch -1 6 2 )) -) - -\version "1.3.146" diff --git a/ly/ledger-init.ly b/ly/ledger-init.ly deleted file mode 100644 index e1b774d343..0000000000 --- a/ly/ledger-init.ly +++ /dev/null @@ -1,8 +0,0 @@ -\version "1.3.146" - -% ledger.ly - -hsize = 11.0 \in -vsize = 17.0 \in - - diff --git a/ly/legal-init.ly b/ly/legal-init.ly deleted file mode 100644 index 47f413c0d3..0000000000 --- a/ly/legal-init.ly +++ /dev/null @@ -1,5 +0,0 @@ -\version "1.3.146" -% legal-init.ly - -hsize = 8.5 \in -vsize = 14.0 \in diff --git a/ly/letter-init.ly b/ly/letter-init.ly deleted file mode 100644 index 1ae8c499db..0000000000 --- a/ly/letter-init.ly +++ /dev/null @@ -1,7 +0,0 @@ -\version "1.3.146" -% letter-init.ly - -hsize = 8.5 \in -vsize = 11.0 \in - - diff --git a/ly/midi-init.ly b/ly/midi-init.ly deleted file mode 100644 index 730d92a483..0000000000 --- a/ly/midi-init.ly +++ /dev/null @@ -1,7 +0,0 @@ -\version "1.3.146" -\midi { - \tempo 4=60 - \include "performer-init.ly" -% unfold_all = "1" -} - diff --git a/ly/nederlands.ly b/ly/nederlands.ly deleted file mode 100644 index bba3d0ad31..0000000000 --- a/ly/nederlands.ly +++ /dev/null @@ -1,49 +0,0 @@ -\version "1.3.146" -%{ - common dutch names for notes. es means flat, is means sharp -%} - -\pitchnames #`( - (ceses . ,(make-pitch -1 0 -2)) - (ces . ,(make-pitch -1 0 -1 )) - (c . ,(make-pitch -1 0 0 )) - (cis . ,(make-pitch -1 0 1 )) - (cisis . ,(make-pitch -1 0 2 )) - (deses . ,(make-pitch -1 1 -2 )) - (des . ,(make-pitch -1 1 -1 )) - (d . ,(make-pitch -1 1 0 )) - (dis . ,(make-pitch -1 1 1 )) - (disis . ,(make-pitch -1 1 2 )) - (eeses . ,(make-pitch -1 2 -2 )) - (eses . ,(make-pitch -1 2 -2 )) - (ees . ,(make-pitch -1 2 -1 )) - (es . ,(make-pitch -1 2 -1 )) - (e . ,(make-pitch -1 2 0 )) - (eis . ,(make-pitch -1 2 1 )) - (eisis . ,(make-pitch -1 2 2 )) - (feses . ,(make-pitch -1 3 -2 )) - (fes . ,(make-pitch -1 3 -1 )) - (f . ,(make-pitch -1 3 0 )) - (fis . ,(make-pitch -1 3 1 )) - (fisis . ,(make-pitch -1 3 2 )) - (geses . ,(make-pitch -1 4 -2 )) - (ges . ,(make-pitch -1 4 -1 )) - (g . ,(make-pitch -1 4 0 )) - (gis . ,(make-pitch -1 4 1 )) - (gisis . ,(make-pitch -1 4 2 )) - (aeses . ,(make-pitch -1 5 -2 )) - (ases . ,(make-pitch -1 5 -2 )) - (aes . ,(make-pitch -1 5 -1 )) - (as . ,(make-pitch -1 5 -1 )) - (a . ,(make-pitch -1 5 0 )) - (ais . ,(make-pitch -1 5 1 )) - (aisis . ,(make-pitch -1 5 2 )) - (beses . ,(make-pitch -1 6 -2 )) - (bes . ,(make-pitch -1 6 -1 )) - (b . ,(make-pitch -1 6 0 )) - (bis . ,(make-pitch -1 6 1 )) - (bisis . ,(make-pitch -1 6 2 )) -) - - - diff --git a/ly/norsk.ly b/ly/norsk.ly deleted file mode 100644 index f6630bab93..0000000000 --- a/ly/norsk.ly +++ /dev/null @@ -1,107 +0,0 @@ - -% Idx norsk.ly,v 1.1 1998/03/25 11:38:28 arvidg Exp arvidg $ - -%{ - - Common norwegian names for notes, including versions without the - double s-es to save typing, as well as the traditional names with - them not to confuse musicians. "es" or "ess" means flat, "is" or - "iss" means sharp. - - Otherwise, the main difference from the dutch names is the that the - "b" is called "h" in norwegian, while the dutch "bes" is a norwegian - "b". - - Staying within the (proud?) naming convention for norwegian language - setup used in LaTeX, this file is called "norsk.ly" instead of - "norwegian.ly", even if all other languages' files use the english - name. - - This file is based on "dutch.ly". Basically, I copied "dutch.ly", - duplicated all lines containing at least one "is" or "es", changed - every other "is" into an "iss" and every other "es" into an "ess", - added "ass" et al, and made some b->h-related changes. There may be - bugs in here please tell me (or send patches) if you find any. - - Arvid Gr=F8tting - -%} - -\pitchnames #`( - (ceses . ,(make-pitch -1 0 -2 )) - (cessess . ,(make-pitch -1 0 -2 )) - (ces . ,(make-pitch -1 0 -1 )) - (cess . ,(make-pitch -1 0 -1 )) - (c . ,(make-pitch -1 0 0 )) - (cis . ,(make-pitch -1 0 1 )) - (ciss . ,(make-pitch -1 0 1 )) - (cisis . ,(make-pitch -1 0 2 )) - (cississ . ,(make-pitch -1 0 2 )) - (deses . ,(make-pitch -1 1 -2 )) - (dessess . ,(make-pitch -1 1 -2 )) - (des . ,(make-pitch -1 1 -1 )) - (dess . ,(make-pitch -1 1 -1 )) - (d . ,(make-pitch -1 1 0 )) - (dis . ,(make-pitch -1 1 1 )) - (diss . ,(make-pitch -1 1 1 )) - (disis . ,(make-pitch -1 1 2 )) - (dississ . ,(make-pitch -1 1 2 )) - (eeses . ,(make-pitch -1 2 -2 )) - (eessess . ,(make-pitch -1 2 -2 )) - (eses . ,(make-pitch -1 2 -2 )) - (essess . ,(make-pitch -1 2 -2 )) - (ees . ,(make-pitch -1 2 -1 )) - (eess . ,(make-pitch -1 2 -1 )) - (es . ,(make-pitch -1 2 -1 )) - (ess . ,(make-pitch -1 2 -1 )) - (e . ,(make-pitch -1 2 0 )) - (eis . ,(make-pitch -1 2 1 )) - (eiss . ,(make-pitch -1 2 1 )) - (eisis . ,(make-pitch -1 2 2 )) - (eississ . ,(make-pitch -1 2 2 )) - (feses . ,(make-pitch -1 3 -2 )) - (fessess . ,(make-pitch -1 3 -2 )) - (fes . ,(make-pitch -1 3 -1 )) - (fess . ,(make-pitch -1 3 -1 )) - (f . ,(make-pitch -1 3 0 )) - (fis . ,(make-pitch -1 3 1 )) - (fiss . ,(make-pitch -1 3 1 )) - (fisis . ,(make-pitch -1 3 2 )) - (fississ . ,(make-pitch -1 3 2 )) - (geses . ,(make-pitch -1 4 -2 )) - (gessess . ,(make-pitch -1 4 -2 )) - (ges . ,(make-pitch -1 4 -1 )) - (gess . ,(make-pitch -1 4 -1 )) - (g . ,(make-pitch -1 4 0 )) - (g . ,(make-pitch -1 4 0 )) - (gis . ,(make-pitch -1 4 1 )) - (giss . ,(make-pitch -1 4 1 )) - (gisis . ,(make-pitch -1 4 2 )) - (gississ . ,(make-pitch -1 4 2 )) - (aeses . ,(make-pitch -1 5 -2 )) - (aessess . ,(make-pitch -1 5 -2 )) - (ases . ,(make-pitch -1 5 -2 )) - (assess . ,(make-pitch -1 5 -2 )) - (aes . ,(make-pitch -1 5 -1 )) - (aess . ,(make-pitch -1 5 -1 )) - (as . ,(make-pitch -1 5 -1 )) - (ass . ,(make-pitch -1 5 -1 )) - (a . ,(make-pitch -1 5 0 )) - (ais . ,(make-pitch -1 5 1 )) - (aiss . ,(make-pitch -1 5 1 )) - (aisis . ,(make-pitch -1 5 2 )) - (aississ . ,(make-pitch -1 5 2 )) - (bes . ,(make-pitch -1 6 -2 )) - (bess . ,(make-pitch -1 6 -2 )) - (b . ,(make-pitch -1 6 -1 )) - (b . ,(make-pitch -1 6 -1 )) - (h . ,(make-pitch -1 6 0 )) - (his . ,(make-pitch -1 6 1 )) - (hiss . ,(make-pitch -1 6 1 )) - (hisis . ,(make-pitch -1 6 2 )) - (hississ . ,(make-pitch -1 6 2 )) -) - - - -\version "1.3.146" diff --git a/ly/paper-as5-init.ly b/ly/paper-as5-init.ly deleted file mode 100644 index f7f58a3a3d..0000000000 --- a/ly/paper-as5-init.ly +++ /dev/null @@ -1,17 +0,0 @@ -% paper-as5-init.ly - -\version "1.3.146" - -paperAsFive = \paper { - staffheight = 5.\char - - \stylesheet #(as-make-style-sheet 'as5) - - \translator { \StaffContext barSize = #5 } - - % no beam-slope - %\translator { \VoiceContext beamHeight = #0 } - \include "params-as-init.ly" -} - -\paper { \paperAsFive } diff --git a/ly/paper-as9-init.ly b/ly/paper-as9-init.ly deleted file mode 100644 index 86866b0eff..0000000000 --- a/ly/paper-as9-init.ly +++ /dev/null @@ -1,16 +0,0 @@ -% paper-as9-init.ly - -\version "1.3.146" - -paperAsNine = \paper { - staffheight = 9.\char - - %\translator { \StaffContext barSize = \staffheight } - - \stylesheet #(as-make-style-sheet 'as9) - - \include "params-as-init.ly" - -} - -\paper { \paperAsNine } diff --git a/ly/paper-init.ly b/ly/paper-init.ly deleted file mode 100644 index f6ac488597..0000000000 --- a/ly/paper-init.ly +++ /dev/null @@ -1,15 +0,0 @@ -\version "1.3.146" -% paper-init.ly - -%% Why som complicated? /MB -%linewidth20 = \hsize - 2.5 * \staffheight -%textheight20 = \vsize - 5.0 * \staffheight -%linewidth = \staffheight/20.0 * \linewidth20 -%textheight = \staffheight/20.0 * \textheight20 - -linewidth = \hsize - 2.\cm -% Leave the textheight calculation to the geometry package. /MB -%textheight = \vsize - 4.\cm - -indent = \linewidth / 14.0 - diff --git a/ly/paper11-init.ly b/ly/paper11-init.ly deleted file mode 100644 index 2cc39133f3..0000000000 --- a/ly/paper11-init.ly +++ /dev/null @@ -1,12 +0,0 @@ -% paper11-init.ly - -\version "1.3.146" - -paperEleven = \paper { - staffheight = 11.0\pt - \stylesheet #(make-style-sheet 'paper11) - - \include "params-init.ly" -} - -\paper { \paperEleven } diff --git a/ly/paper11.ly b/ly/paper11.ly deleted file mode 100644 index 313d25a0e4..0000000000 --- a/ly/paper11.ly +++ /dev/null @@ -1,2 +0,0 @@ - -\include "paper11-init.ly" diff --git a/ly/paper13-init.ly b/ly/paper13-init.ly deleted file mode 100644 index d053f1e440..0000000000 --- a/ly/paper13-init.ly +++ /dev/null @@ -1,14 +0,0 @@ -% paper13-init.ly - - -\version "1.3.146" - -paperThirteen = \paper { - staffheight = 13.0\pt - - \stylesheet #(make-style-sheet 'paper13) - - \include "params-init.ly" -} - -\paper { \paperThirteen } diff --git a/ly/paper13.ly b/ly/paper13.ly deleted file mode 100644 index 7ecec51bbb..0000000000 --- a/ly/paper13.ly +++ /dev/null @@ -1,2 +0,0 @@ - -\include "paper13-init.ly" diff --git a/ly/paper16-init.ly b/ly/paper16-init.ly deleted file mode 100644 index c747eac11d..0000000000 --- a/ly/paper16-init.ly +++ /dev/null @@ -1,12 +0,0 @@ -% paper16-init.ly - -\version "1.3.146" - -paperSixteen = \paper { - staffheight = 16.0\pt - \stylesheet #(make-style-sheet 'paper16) - - \include "params-init.ly" -} - -\paper {\paperSixteen } diff --git a/ly/paper16.ly b/ly/paper16.ly deleted file mode 100644 index 2621cae3e6..0000000000 --- a/ly/paper16.ly +++ /dev/null @@ -1,2 +0,0 @@ - -\include "paper16-init.ly" diff --git a/ly/paper20-init.ly b/ly/paper20-init.ly deleted file mode 100644 index 13a67f0809..0000000000 --- a/ly/paper20-init.ly +++ /dev/null @@ -1,13 +0,0 @@ -% paper20-init.ly - - -\version "1.3.146" - -paperTwenty = \paper { - staffheight = 20.0\pt - \stylesheet #(make-style-sheet 'paper20) - - \include "params-init.ly" -} - -\paper { \paperTwenty } diff --git a/ly/paper20.ly b/ly/paper20.ly deleted file mode 100644 index 4511cff2ad..0000000000 --- a/ly/paper20.ly +++ /dev/null @@ -1,2 +0,0 @@ - -\include "paper20-init.ly" diff --git a/ly/paper23-init.ly b/ly/paper23-init.ly deleted file mode 100644 index bbb55106e0..0000000000 --- a/ly/paper23-init.ly +++ /dev/null @@ -1,12 +0,0 @@ -% paper23-init.ly - - -\version "1.3.146" - -paperTwentythree = \paper { - staffheight = 23.0\pt - \stylesheet #(make-style-sheet 'paper23) - \include "params-init.ly" -} - -\paper { \paperTwentythree } diff --git a/ly/paper23.ly b/ly/paper23.ly deleted file mode 100644 index 61dfc7fc1b..0000000000 --- a/ly/paper23.ly +++ /dev/null @@ -1,2 +0,0 @@ - -\include "paper23-init.ly" diff --git a/ly/paper26-init.ly b/ly/paper26-init.ly deleted file mode 100644 index e64eba6a54..0000000000 --- a/ly/paper26-init.ly +++ /dev/null @@ -1,12 +0,0 @@ -% paper26-init.ly - -\version "1.3.146" - -paperTwentysix = \paper { - staffheight = 26.0\pt - \stylesheet #(make-style-sheet 'paper26) - - \include "params-init.ly" -} - -\paper { \paperTwentysix } diff --git a/ly/paper26.ly b/ly/paper26.ly deleted file mode 100644 index c874b34f25..0000000000 --- a/ly/paper26.ly +++ /dev/null @@ -1,2 +0,0 @@ - -\include "paper26-init.ly" diff --git a/ly/params-as-init.ly b/ly/params-as-init.ly deleted file mode 100644 index b9928df8b1..0000000000 --- a/ly/params-as-init.ly +++ /dev/null @@ -1,30 +0,0 @@ -\version "1.3.146" -% params-as-init.ly -% generic paper parameters - -outputscale = \staffheight / 4.0 - -linewidth = 60.0 \char -textheight = 60.0 \char -indent = 8.0\char - -staffspace = (\staffheight - 1.0 ) / 4.0 -stafflinethickness = \staffspace / 2.0 - -\translator { \NoteNamesContext } -\translator { \ScoreContext } -\translator { \ChoirStaffContext } -\translator { \GraceContext } -\translator { \RhythmicStaffContext} -\translator { \StaffContext } -\translator { \VoiceContext } -\translator { \StaffGroupContext } -\translator { \ChordNamesContext } -\translator { \GrandStaffContext } -\translator { \LyricsContext } -\translator { \ThreadContext } -\translator { \PianoStaffContext } -\translator { \LyricsVoiceContext } -\translator { \StaffContainerContext } - - diff --git a/ly/params-init.ly b/ly/params-init.ly deleted file mode 100644 index f406588183..0000000000 --- a/ly/params-init.ly +++ /dev/null @@ -1,48 +0,0 @@ -\version "1.3.146" -% JUNKME. - -%% deprecated -papersizename = \papersize - -% ly2dvi now uses `papersize' internally (and on cmd line) -papersize = \papersize - -% FIXME -% direct PostScript line height for single line staves -lineheight = 14 - -paperfile = \papersize + "-init.ly" - -% paperfile = "a4-init.ly" - -\include \paperfile -\include "paper-init.ly" - -staffspace = \staffheight / 4.0 -stafflinethickness = \staffspace / 10.0 -outputscale = \staffheight / 4.0 - -blotdiameter = 0.4 / \outputscale - -\translator { \NoteNamesContext } -\translator { \ScoreContext } -\translator { \ChoirStaffContext} -\translator { \InnerChoirStaffContext} - -\translator { \RhythmicStaffContext} -\translator { \StaffContext } -\translator { \VoiceContext} -\translator { \StaffGroupContext } -\translator { \InnerStaffGroupContext } -\translator { \ChordNamesContext } -\translator { \GrandStaffContext} -\translator { \LyricsContext } -\translator { \ThreadContext} -\translator { \PianoStaffContext} -\translator { \LyricsVoiceContext } -\translator { \StaffContainerContext } - - - - - diff --git a/ly/part-paper-init.ly b/ly/part-paper-init.ly deleted file mode 100644 index 4e8fea418f..0000000000 --- a/ly/part-paper-init.ly +++ /dev/null @@ -1,10 +0,0 @@ -\version "1.3.146" - -% JUNKME -%part-paper-init.ly - -\paper { - \translator { \OrchestralPartStaffContext } - \translator { \ScoreContext skipBars = ##t } -} - diff --git a/ly/performer-init.ly b/ly/performer-init.ly deleted file mode 100644 index 97c6638c15..0000000000 --- a/ly/performer-init.ly +++ /dev/null @@ -1,124 +0,0 @@ -\version "1.3.146" -% -% setup for Request->Element conversion. Guru-only -% -StaffContext = \translator { - \type "Staff_performer" - \name Staff - \accepts Voice - - \consists "Key_performer" - \consists "Tempo_performer" - \consists "Time_signature_performer" - dynamicStyle = #"dynamic" -} -\translator { \StaffContext } -\translator { \StaffContext - \name RhythmicStaff -} - - -VoiceContext = \translator { - \type "Performer_group_performer" - \name Voice - \consists "Dynamic_performer" - \consists "Span_dynamic_performer" - \consists "Piano_pedal_performer" - \accepts "Thread" -} -\translator { \VoiceContext } - -ThreadContext = \translator { - \type "Performer_group_performer" - \name Thread - \consists "Note_performer" - \consists "Tie_performer" -} -\translator { \ThreadContext } - -% retain for compatibility reasons (FIXME: convert-ly) -\translator { - \type "Performer_group_performer" - \name Grace -} - -\translator -{ - \type "Performer_group_performer" - \name VoiceTwo\consists "Note_performer" - -} - -GrandStaffContext = \translator { - \type "Performer_group_performer" - \name GrandStaff - \accepts RhythmicStaff - \accepts Staff -} -\translator { \GrandStaffContext } - -PianoStaffContext = \translator { - \type "Performer_group_performer" - \name "PianoStaff" - \accepts Staff -} -\translator { \PianoStaffContext } - -\translator { - \type "Performer_group_performer" - \consists "Lyric_performer" - \name LyricsVoice -} - -\translator{ - \type "Performer_group_performer" - \name ChoirStaff - \accepts Staff -} -\translator { - \type "Staff_performer" - \accepts LyricsVoice - \name Lyrics - \consists "Time_signature_performer" - \consists "Tempo_performer" -} - -\translator { - \type "Staff_performer" - \accepts ChordNameVoice - \name ChordNames -} - -\translator { - \type Performer_group_performer - \consists Note_performer - \name ChordNameVoice -} - -\translator { - \type Performer_group_performer - - \name StaffGroup - \accepts Staff -} - -ScoreContext = \translator { - \type "Score_performer" - - \name Score - instrument = #"bright acoustic" - \accepts Staff - \accepts GrandStaff - \accepts PianoStaff - \accepts Lyrics - \accepts StaffGroup - \accepts ChoirStaff - \accepts RhythmicStaff - \accepts ChordNames - \consists "Swallow_performer" - - dynamicAbsoluteVolumeFunction = #default-dynamic-absolute-volume - instrumentEqualizer = #default-instrument-equalizer -} -\translator { \ScoreContext } - diff --git a/ly/property-init.ly b/ly/property-init.ly deleted file mode 100644 index 83ea32eb9a..0000000000 --- a/ly/property-init.ly +++ /dev/null @@ -1,167 +0,0 @@ -% property-init.ly - -\version "1.3.146" - -stemUp = \property Voice.Stem \set #'direction = #1 -stemDown = \property Voice.Stem \set #'direction = #-1 -stemBoth= \property Voice.Stem \revert #'direction - -slurUp = \property Voice.Slur \override #'direction = #1 -slurDown = \property Voice.Slur \override #'direction = #-1 -slurBoth = \property Voice.Slur \revert #'direction -shiftOn = \property Voice.NoteColumn \override #'horizontal-shift = #1 -shiftOnn = \property Voice.NoteColumn \override #'horizontal-shift = #2 -shiftOnnn = \property Voice.NoteColumn \override #'horizontal-shift = #3 -shiftOff = \property Voice.NoteColumn \revert #'horizontal-shift - -tieUp = \property Voice.Tie \override #'direction = #1 -tieDown = \property Voice.Tie \override #'direction = #-1 -tieBoth = \property Voice.Tie \revert #'direction - -dynamicUp = { - \property Voice.DynamicText \override #'direction = #1 - \property Voice.DynamicLineSpanner \override #'direction = #1 -} -dynamicDown = { - \property Voice.DynamicText \override #'direction = #-1 - \property Voice.DynamicLineSpanner \override #'direction = #-1 -} -dynamicBoth = { - \property Voice.DynamicText \revert #'direction - \property Voice.DynamicLineSpanner \revert #'direction -} - -scriptUp = { - \property Voice.TextScript \override #'direction = #1 - \property Voice.Script \override #'direction = #1 -} -scriptDown = { - \property Voice.TextScript \override #'direction = #-1 - \property Voice.Script \override #'direction = #-1 -} -scriptBoth = { - \property Voice.TextScript \revert #'direction - \property Voice.Script \revert #'direction -} - -dotsUp = \property Voice.Dots \override #'direction = #1 -dotsDown = \property Voice.Dots \override #'direction = #-1 -dotsBoth = \property Voice.Dots \revert #'direction - -% why doubly? -tupletUp = { - \property Voice.TupletBracket \override #'direction = #1 - \property Voice.TupletBracket \override #'direction = #1 -} -tupletDown = { - \property Voice.TupletBracket \override #'direction = #-1 - \property Voice.TupletBracket \override #'direction = #-1 -} -tupletBoth = { - \property Voice.TupletBracket \revert #'direction - \property Voice.TupletBracket \revert #'direction -} - - - -cadenzaOn = \property Score.timing = ##f -cadenzaOff = { - \property Score.timing = ##t - \property Score.measurePosition = #(make-moment 0 1) -} - -newpage = { - \break - % urg, only works for TeX output - \context Score \outputproperty #(make-type-checker 'paper-column-interface) - #'between-system-string = #"\\newpage" -} - -% dynamic dir? text script, articulation script dir? -oneVoice = { - \stemBoth - \slurBoth - \tieBoth - \shiftOff -} - -voiceOne = { - \stemUp - \slurUp - \tieUp - \dotsUp -} - -voiceTwo = { - \stemDown - \slurDown - \tieDown - \dotsDown - -} - -voiceThree = { - \stemUp - \slurUp - \tieUp - \shiftOn - \dotsUp -} - -voiceFour = { - \stemDown - \slurDown - \tieDown - \shiftOn - \dotsDown -} - -% There's also dash, but setting dash period/length should be fixed. -slurDotted = \property Voice.Slur \override #'dashed = #1 -slurSolid = \property Voice.Slur \revert #'dashed -tieDotted = \property Voice.Tie \override #'dashed = #1 -tieSolid = \property Voice.Tie \revert #'dashed - - -tiny = - \property Voice.fontSize= -2 - - -small = - \property Voice.fontSize= -1 - - -normalsize = { - \property Voice.fontSize= 0 -} - -normalkey = { - \property Staff.keyOctaviation = ##f -} - -specialkey = { - \property Staff.keyOctaviation = ##t -} - -% End the incipit and print a ``normal line start''. -endincipit = \notes{ - \partial 16 s16 % Hack to handle e.g. \bar ".|" \endincipit - \context Staff \outputproperty #(make-type-checker 'clef-interface) #'full-size-change = ##t - \context Staff \outputproperty #(make-type-checker 'clef-interface) #'non-default = ##t - \bar "" -} - -autoBeamOff = \property Voice.noAutoBeaming = ##t -autoBeamOn = \property Voice.noAutoBeaming = ##f - -emptyText = \property Voice.textNonEmpty = ##f -fatText = \property Voice.textNonEmpty = ##t - -showStaffSwitch = \property PianoStaff.followVoice = ##t -hideStaffSwitch = \property PianoStaff.followVoice = ##f - - -% To remove a Volta bracet or some other graphical object, -% set it to turnOff. Example: \property Staff.VoltaBracket = \turnOff - -turnOff = #'((meta . ((interfaces . ())))) diff --git a/ly/scale-definitions-init.ly b/ly/scale-definitions-init.ly deleted file mode 100644 index b3268ffef9..0000000000 --- a/ly/scale-definitions-init.ly +++ /dev/null @@ -1,100 +0,0 @@ -\version "1.3.146" - - -major = #'( - (0 . 0) - (1 . 0) - (2 . 0) - (3 . 0) - (4 . 0) - (5 . 0) - (6 . 0) - ) - -minor = #'( - (0 . 0) - (1 . 0) - (2 . -1) - (3 . 0) - (4 . 0) - (5 . -1) - (6 . -1) - ) - - -ionian = #'( - (0 . 0) - (1 . 0) - (2 . 0) - (3 . 0) - (4 . 0) - (5 . 0) - (6 . 0) - ) - - -locrian = #'( - (0 . 0) - (1 . -1) - (2 . -1) - (3 . 0) - (4 . -1) - (5 . -1) - (6 . -1) - ) - - -aeolian = #'( - (0 . 0) - (1 . 0) - (2 . -1) - (3 . 0) - (4 . 0) - (5 . -1) - (6 . -1) - ) - - -mixolydian = #'( - (0 . 0) - (1 . 0) - (2 . 0) - (3 . 0) - (4 . 0) - (5 . 0) - (6 . -1) - ) - - -lydian = #'( - (0 . 0) - (1 . 0) - (2 . 0) - (3 . 1) - (4 . 0) - (5 . 0) - (6 . 0) - ) - - -phrygian = #'( - (0 . 0) - (1 . -1) - (2 . -1) - (3 . 0) - (4 . 0) - (5 . -1) - (6 . -1) -) - - -dorian = #'( - (0 . 0) - (1 . 0) - (2 . -1) - (3 . 0) - (4 . 0) - (5 . 0) - (6 . -1) - ) - diff --git a/ly/script-init.ly b/ly/script-init.ly deleted file mode 100644 index b0fcedd3dc..0000000000 --- a/ly/script-init.ly +++ /dev/null @@ -1,47 +0,0 @@ -\version "1.3.146" - - -dashHat= "marcato" -dashPlus= "stopped" -dashDash= "tenuto" -dashBar= "staccatissimo" -dashLarger= "accent" -dashDot= "staccato" - - -thumb = \script "thumb" -accent = \script "accent" -marcato = \script "marcato" -staccatissimo = \script "staccatissimo" - -% portato is indicated -% either by -% * slurred & dotted notes. -%or by -% * slur and dash notes. -% Neither are really supported, but c4-.-- should work. -% portato = \script "portato" - -fermata = \script "fermata" -stopped = \script "stopped" -staccato = \script "staccato" -tenuto = \script "tenuto" -upbow = \script "upbow" -downbow = \script "downbow" -lheel = \script "lheel" -rheel = \script "rheel" -ltoe = \script "ltoe" -rtoe = \script "rtoe" -turn = \script "turn" -open = \script "open" -flageolet = \script "flageolet" -reverseturn = \script "reverseturn" -trill = \script "trill" -prall = \script "prall" -mordent = \script "mordent" -prallprall = \script "prallprall" -prallmordent = \script "prallmordent" -upprall = \script "upprall" -downprall = \script "downprall" -segno = \script "segno" -coda = \script "coda" diff --git a/ly/spanners-init.ly b/ly/spanners-init.ly deleted file mode 100644 index 3fdf1b7b31..0000000000 --- a/ly/spanners-init.ly +++ /dev/null @@ -1,53 +0,0 @@ -\version "1.3.146" - -cr = \spanrequest \start "crescendo" -decr = \spanrequest \start "decrescendo" -rc = \spanrequest \stop "crescendo" -rced = \spanrequest \stop "decrescendo" - -cresc = \notes { - \commandspanrequest \start "crescendo" - \property Voice.crescendoText = #"cresc." - \property Voice.crescendoSpanner = #'dashed-line -} - -% ah, this is handy: maybe drop resetting of properties in -% dynamic-engraver ? -endcresc = \notes { - \commandspanrequest \stop "crescendo" - \property Voice.crescendoText \unset - \property Voice.crescendoSpanner \unset -} - -dim = \notes { - \commandspanrequest \start "decrescendo" - \property Voice.decrescendoText = #"dim." - \property Voice.decrescendoSpanner = #'dashed-line -} - -enddim = \notes { - \commandspanrequest \stop "decrescendo" - \property Voice.decrescendoText \unset - \property Voice.decrescendoSpanner \unset -} - -%{ - -cresc = \spanrequest \start "crescendo" -endcresc = \spanrequest \stop "crescendo" - -%} - -% better name sustainstart/stop? -sustainDown = \spanrequest \start "Sustain" -sustainUp = \spanrequest \stop "Sustain" - -unaCorda = \spanrequest \start "UnaCorda" -treCorde = \spanrequest \stop "UnaCorda" - -sostenutoDown = \spanrequest \start "Sostenuto" -sostenutoUp = \spanrequest \stop "Sostenuto" - -%crescpoco = \property Voice.crescendoText = "cresc. poco a poco" -%decresc = \property Voice.crescendoText = "decr." -%dim = \property Voice.crescendoText = "dim." diff --git a/ly/svenska.ly b/ly/svenska.ly deleted file mode 100644 index c9b54987e9..0000000000 --- a/ly/svenska.ly +++ /dev/null @@ -1,43 +0,0 @@ -% -% common Swedish names for notes. "ess" means flat, "iss" means sharp -% -% by Mats Bengtsson. - -\pitchnames #`( - (cessess . ,(make-pitch -1 0 -2 )) - (cess . ,(make-pitch -1 0 -1 )) - (c . ,(make-pitch -1 0 0 )) - (ciss . ,(make-pitch -1 0 1 )) - (cississ . ,(make-pitch -1 0 2 )) - (dessess . ,(make-pitch -1 1 -2 )) - (dess . ,(make-pitch -1 1 -1 )) - (d . ,(make-pitch -1 1 0 )) - (diss . ,(make-pitch -1 1 1 )) - (dississ . ,(make-pitch -1 1 2 )) - (essess . ,(make-pitch -1 2 -2 )) - (ess . ,(make-pitch -1 2 -1 )) - (e . ,(make-pitch -1 2 0 )) - (eiss . ,(make-pitch -1 2 1 )) - (eississ . ,(make-pitch -1 2 2 )) - (fessess . ,(make-pitch -1 3 -2 )) - (fess . ,(make-pitch -1 3 -1 )) - (f . ,(make-pitch -1 3 0 )) - (fiss . ,(make-pitch -1 3 1 )) - (fississ . ,(make-pitch -1 3 2 )) - (gessess . ,(make-pitch -1 4 -2 )) - (gess . ,(make-pitch -1 4 -1 )) - (g . ,(make-pitch -1 4 0 )) - (giss . ,(make-pitch -1 4 1 )) - (gississ . ,(make-pitch -1 4 2 )) - (assess . ,(make-pitch -1 5 -2 )) - (ass . ,(make-pitch -1 5 -1 )) - (a . ,(make-pitch -1 5 0 )) - (aiss . ,(make-pitch -1 5 1 )) - (aississ . ,(make-pitch -1 5 2 )) - (hessess . ,(make-pitch -1 6 -2 )) - (b . ,(make-pitch -1 6 -1 )) - (h . ,(make-pitch -1 6 0 )) - (hiss . ,(make-pitch -1 6 1 )) - (hississ . ,(make-pitch -1 6 2 )) -) -\version "1.3.146" diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make index 55162760aa..3395536e9f 100644 --- a/make/lilypond-vars.make +++ b/make/lilypond-vars.make @@ -1,3 +1,6 @@ +## +## settings to run LilyPond + export PATH:=$(topdir)/lily/out:$(topdir)/buildscripts/out:$(PATH) diff --git a/make/ly-vars.make b/make/ly-vars.make index 2d18629cfb..0dc3e4695c 100644 --- a/make/ly-vars.make +++ b/make/ly-vars.make @@ -1,9 +1,14 @@ +# rules for directories with LilyPond files. + # empty + +# huh ? these are for documentation?! TELY_FILES := $(wildcard *.tely) ITELY_FILES := $(wildcard *.itely) ITEXI_FILES := $(wildcard *.itexi) +LY_FILES := $(wildcard *.ly) TEXINFO_SOURCES += $(TELY_FILES) $(ITELY_FILES) $(ITEXI_FILES) -EXTRA_DIST_FILES += $(TELY_FILES) +EXTRA_DIST_FILES += $(TELY_FILES) $(LY_FILES) $(ITEXI_FILES) $(ITELY_FILES) diff --git a/make/lysdoc-rules.make b/make/lysdoc-rules.make index 5c77bbd8bd..6c7f72bdf2 100644 --- a/make/lysdoc-rules.make +++ b/make/lysdoc-rules.make @@ -1,3 +1,3 @@ $(outdir)/$(NAME).tely: $(LY_FILES) - $(PYTHON) ../../buildscripts/lys-to-tely.py --name=$(outdir)/$(NAME) --title="$(TITLE)" $(LY_FILES) \ No newline at end of file + $(PYTHON) ../../buildscripts/lys-to-tely.py --name=$(outdir)/$(NAME) --title="$(TITLE)" $(LY_FILES) diff --git a/make/lysdoc-vars.make b/make/lysdoc-vars.make index 765b796074..a000053989 100644 --- a/make/lysdoc-vars.make +++ b/make/lysdoc-vars.make @@ -1,7 +1,4 @@ TITLE=LYs Doc -LY_FILES = $(wildcard *.ly) - -EXTRA_DIST_FILES += $(LY_FILES) NAME=$(notdir $(pwd)) diff --git a/make/mutopia-vars.make b/make/mutopia-vars.make index edecfad30b..0eb68b09db 100644 --- a/make/mutopia-vars.make +++ b/make/mutopia-vars.make @@ -2,15 +2,13 @@ # UGH UGH include $(make-dir)/lilypond-vars.make -LY_FILES = $(wildcard *.ly) -SCORE_LY_FILES = $(shell fgrep -l score *.ly) +# LY_FILES is defined the LY make template. -FLY_FILES = $(wildcard *.fly) -SLY_FILES = $(wildcard *.sly) +SCORE_LY_FILES = $(shell fgrep -l score *.ly) M4_FILES = $(wildcard *.m4) LYM4_FILES = $(wildcard *.lym4) -EXTRA_DIST_FILES += $(FLY_FILES) $(SLY_FILES) $(LY_FILES) $(M4_FILES) $(LYM4_FILES) +EXTRA_DIST_FILES += $(M4_FILES) $(LYM4_FILES) ly_examples=$(addprefix $(outdir)/, $(addsuffix .ly.txt, $(examples))) fly_examples=$(addprefix $(outdir)/, $(addsuffix .fly.txt, $(flexamples))) @@ -30,4 +28,4 @@ name-stem= $(notdir $(basename $<)) OUT_FILES = $(addprefix $(outdir)/,$(M4_FILES:%.m4=%)) \ $(addprefix $(outdir)/,$(LYM4_FILES:%.lym4=%.ly)) -score_ps = $(addprefix $(outdir)/, $(addsuffix .ps.gz, $($SCORE_LY_FILES))) \ No newline at end of file +score_ps = $(addprefix $(outdir)/, $(addsuffix .ps.gz, $($SCORE_LY_FILES))) diff --git a/make/out/lilypond.lsm b/make/out/lilypond.lsm index e04509eff2..c20e4bec2e 100644 --- a/make/out/lilypond.lsm +++ b/make/out/lilypond.lsm @@ -1,15 +1,15 @@ Begin3 Title: LilyPond -Version: 1.5.7 -Entered-date: 17AUG01 +Version: 1.5.8 +Entered-date: 30AUG01 Description: @BLURB@ Keywords: music notation typesetting midi fonts engraving Author: hanwen@cs.uu.nl (Han-Wen Nienhuys) janneke@gnu.org (Jan Nieuwenhuizen) Maintained-by: hanwen@stack.nl (Han-Wen Nienhuys) Primary-site: sunsite.unc.edu /pub/Linux/apps/sound/convert - 1000k lilypond-1.5.7.tar.gz + 1000k lilypond-1.5.8.tar.gz Original-site: ftp.cs.uu.nl /pub/GNU/LilyPond/development/ - 1000k lilypond-1.5.7.tar.gz + 1000k lilypond-1.5.8.tar.gz Copying-policy: GPL End diff --git a/make/out/lilypond.mandrake.spec b/make/out/lilypond.mandrake.spec index 471b69a0da..b5595d928d 100644 --- a/make/out/lilypond.mandrake.spec +++ b/make/out/lilypond.mandrake.spec @@ -1,5 +1,5 @@ %define name lilypond -%define version 1.5.7 +%define version 1.5.8 %define release 1mdk Name: %{name} diff --git a/make/out/lilypond.redhat.spec b/make/out/lilypond.redhat.spec index c45927288b..db5c4ebb6d 100644 --- a/make/out/lilypond.redhat.spec +++ b/make/out/lilypond.redhat.spec @@ -1,11 +1,11 @@ %define info yes Name: lilypond -Version: 1.5.7 +Version: 1.5.8 Release: 1 License: GPL Group: Applications/Publishing -Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.5.7.tar.gz +Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.5.8.tar.gz Summary: Create and print music notation URL: http://www.lilypond.org/ BuildRoot: /tmp/lilypond-install diff --git a/make/out/lilypond.suse.spec b/make/out/lilypond.suse.spec index c181554716..a5c1627454 100644 --- a/make/out/lilypond.suse.spec +++ b/make/out/lilypond.suse.spec @@ -14,11 +14,11 @@ Distribution: SuSE Linux 7.0 (i386) Name: lilypond -Version: 1.5.7 +Version: 1.5.8 Release: 2 Copyright: GPL Group: Applications/Publishing -Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.5.7.tar.gz +Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.5.8.tar.gz # music notation software for.. ? Summary: A program for printing sheet music. URL: http://www.lilypond.org/ diff --git a/mf/feta-banier.mf b/mf/feta-banier.mf index 4795c82513..2bb37f8d65 100644 --- a/mf/feta-banier.mf +++ b/mf/feta-banier.mf @@ -229,29 +229,6 @@ fet_beginchar("64th Flag (up)", "u6", "sixtyfourthflag") draw (0, 0) .. (0,-2 staff_space); fet_endchar; -fet_beginchar("grace dash (up)", "ugrace", "gracedash") - save flare, - hip_depth_ratio, hip_width, - foot_depth; - - flare# = 1.0 staff_space#; - hip_depth_ratio = .72; - hip_width# = upflag_width# - hip_thickness#/2; - - foot_depth# = 3 staff_space#; - - define_pixels(flare, hip_width, hip_thickness, - foot_depth, foot_thickness); - - set_char_box(hip_width# * hip_depth_ratio, - hip_width# + stemthickness#/2 + right_upflag_space#, - foot_depth# * hip_depth_ratio, -flare#) - - pickup pencircle scaled 1.5 stemthickness; - draw (-b ,-d) .. - (w, h); -fet_endchar; - fet_beginchar("8th (down)", "d3", "deighthflag") save flare, hip_depth_ratio, hip_width, @@ -280,6 +257,218 @@ fet_beginchar("8th (down)", "d3", "deighthflag") (hip_width, foot_depth), hip_depth_ratio,foot_width_ratio, hip_thickness, foot_thickness); +%%%%%%%% +% +% +% +% Mensural Notation +% +% +% + +def draw_mensural_outermost_flag_i = + define_pixels(stafflinethickness, staff_space) + + pickup pencircle + xscaled 1.00 stafflinethickness + yscaled 0.22 staff_space + rotated -35; + + save za, zb, zc, zd, ze; + pair za, zb, zc, zd, ze; + + za = (+0.00 staff_space, -0.00 staff_space); + zb = (+0.15 staff_space, -0.00 staff_space); + zc = (+0.45 staff_space, -0.35 staff_space); + zd = (+0.45 staff_space, -0.85 staff_space); + ze = (+0.00 staff_space, -2.00 staff_space); + + draw za .. zb -- zc{zc-zb} .. {ze-zd}zd -- ze; +enddef; + +def draw_mensural_outermost_flag_ii = + define_pixels(stafflinethickness, staff_space) + + pickup pencircle + xscaled 1.00 stafflinethickness + yscaled 0.22 staff_space + rotated -35; + + save za, zb, zc, zd, ze; + pair za, zb, zc, zd, ze; + + za = (+0.00 staff_space, -0.00 staff_space); + zb = (+0.15 staff_space, -0.00 staff_space); + zc = (+0.20 staff_space, -0.05 staff_space); + zd = (+0.20 staff_space, -1.15 staff_space); + ze = (+0.00 staff_space, -1.40 staff_space); + + draw za .. zb -- zc{zc-zb} .. {ze-zd}zd -- ze; +enddef; + +def draw_mensural_inner_flag(expr il_shift) = + define_pixels(stafflinethickness, staff_space) + + pickup pencircle + xscaled 1.00 stafflinethickness + yscaled 0.22 staff_space + rotated -35; + + save zs, za, zb, zc, zd; + pair zs, za, zb, zc, zd; + + zs = (0, -il_shift * staff_space); + za = zs + (+0.00 staff_space, -0.10 staff_space); + zb = zs + (+0.33 staff_space, -0.30 staff_space); + zc = zs + (+0.33 staff_space, -0.70 staff_space); + zd = zs + (+0.00 staff_space, -0.90 staff_space); + + draw za{2,1} .. zb .. zc .. {-2,-1}zd; +enddef; + +fet_beginchar("8th Mensural Flag (up)", "mensuralu03", "menseighthflag") + set_char_box(0, 0.60 staff_space#, 2.00 staff_space#, 0) + draw_mensural_outermost_flag_i +fet_endchar; + +fet_beginchar("8th Mensural Flag (up)", "mensuralu13", "mens1eighthflag") + set_char_box(0, 0.60 staff_space#, 1.50 staff_space#, 0) + draw_mensural_outermost_flag_ii +fet_endchar; + +fet_beginchar("8th Mensural Flag (down)", "mensurald03", "mensdeighthflag") + set_char_box(0.60 staff_space#, 0, 0, 2.00 staff_space#) + draw_mensural_outermost_flag_i + currentpicture := currentpicture xscaled -1 yscaled -1; +fet_endchar; + +fet_beginchar("8th Mensural Flag (down)", "mensurald13", "mensd1eighthflag") + set_char_box(0.60 staff_space#, 0, 0, 1.50 staff_space#) + draw_mensural_outermost_flag_ii + currentpicture := currentpicture xscaled -1 yscaled -1; +fet_endchar; + +fet_beginchar("16th Mensural Flag (up)", "mensuralu04", "menssixteenthflag") + set_char_box(0, 0.60 staff_space#, 3.00 staff_space#, 0) + draw_mensural_outermost_flag_i + draw_mensural_inner_flag(2.0) +fet_endchar; + +fet_beginchar("16th Mensural Flag (up)", "mensuralu14", "mens1sixteenthflag") + set_char_box(0, 0.60 staff_space#, 3.00 staff_space#, 0) + draw_mensural_outermost_flag_ii + draw_mensural_inner_flag(1.5) +fet_endchar; + +fet_beginchar("16th Mensural Flag (down)", "mensurald04", "mensdsixteenthflag") + set_char_box(0, 0.60 staff_space#, 3.00 staff_space#, 0) + draw_mensural_outermost_flag_i + draw_mensural_inner_flag(2.0) + currentpicture := currentpicture xscaled -1 yscaled -1; +fet_endchar; + +fet_beginchar("16th Mensural Flag (down)", "mensurald14", "mensd1sixteenthflag") + set_char_box(0, 0.60 staff_space#, 3.00 staff_space#, 0) + draw_mensural_outermost_flag_ii + draw_mensural_inner_flag(1.5) + currentpicture := currentpicture xscaled -1 yscaled -1; +fet_endchar; + +fet_beginchar("32th Mensural Flag (up)", "mensuralu05", "mensthirtysecondflag") + set_char_box(0, 0.60 staff_space#, 3.00 staff_space#, 0) + draw_mensural_outermost_flag_i + draw_mensural_inner_flag(2.0) + draw_mensural_inner_flag(3.0) +fet_endchar; + +fet_beginchar("32th Mensural Flag (up)", "mensuralu15", "mens1thirtysecondflag") + set_char_box(0, 0.60 staff_space#, 3.00 staff_space#, 0) + draw_mensural_outermost_flag_ii + draw_mensural_inner_flag(1.5) + draw_mensural_inner_flag(2.5) +fet_endchar; + +fet_beginchar("32th Mensural Flag (down)", "mensurald05", "mensdthirtysecondflag") + set_char_box(0, 0.60 staff_space#, 3.00 staff_space#, 0) + draw_mensural_outermost_flag_i + draw_mensural_inner_flag(2.0) + draw_mensural_inner_flag(3.0) + currentpicture := currentpicture xscaled -1 yscaled -1; +fet_endchar; + +fet_beginchar("32th Mensural Flag (down)", "mensurald15", "mensd1thirtysecondflag") + set_char_box(0, 0.60 staff_space#, 3.00 staff_space#, 0) + draw_mensural_outermost_flag_ii + draw_mensural_inner_flag(1.5) + draw_mensural_inner_flag(2.5) + currentpicture := currentpicture xscaled -1 yscaled -1; +fet_endchar; + +fet_beginchar("64th Mensural Flag (up)", "mensuralu06", "menssixtyfourthflag") + set_char_box(0, 0.60 staff_space#, 3.00 staff_space#, 0) + draw_mensural_outermost_flag_i + draw_mensural_inner_flag(1.5) + draw_mensural_inner_flag(2.5) + draw_mensural_inner_flag(3.5) +fet_endchar; + +fet_beginchar("64th Mensural Flag (up)", "mensuralu16", "mens1sixtyfourthflag") + set_char_box(0, 0.60 staff_space#, 3.00 staff_space#, 0) + draw_mensural_outermost_flag_ii + draw_mensural_inner_flag(1.17) + draw_mensural_inner_flag(2.08) + draw_mensural_inner_flag(3.00) +fet_endchar; + +fet_beginchar("64th Mensural Flag (down)", "mensurald06", "mensdsixtyfourthflag") + set_char_box(0, 0.60 staff_space#, 3.00 staff_space#, 0) + draw_mensural_outermost_flag_i + draw_mensural_inner_flag(1.5) + draw_mensural_inner_flag(2.5) + draw_mensural_inner_flag(3.5) + currentpicture := currentpicture xscaled -1 yscaled -1; +fet_endchar; + +fet_beginchar("64th Mensural Flag (down)", "mensurald16", "mensd1sixtyfourthflag") + set_char_box(0, 0.60 staff_space#, 3.00 staff_space#, 0) + draw_mensural_outermost_flag_ii + draw_mensural_inner_flag(1.17) + draw_mensural_inner_flag(2.08) + draw_mensural_inner_flag(3.00) + currentpicture := currentpicture xscaled -1 yscaled -1; +fet_endchar; + +%%%%%%%% +% +% +% +% Single Stroke for Short Appogiatura +% +% +% + +fet_beginchar("grace dash (up)", "ugrace", "gracedash") + save flare, + hip_depth_ratio, hip_width, + foot_depth; + + flare# = 1.0 staff_space#; + hip_depth_ratio = .72; + hip_width# = upflag_width# - hip_thickness#/2; + + foot_depth# = 3 staff_space#; + + define_pixels(flare, hip_width, hip_thickness, + foot_depth, foot_thickness); + + set_char_box(hip_width# * hip_depth_ratio, + hip_width# + stemthickness#/2 + right_upflag_space#, + foot_depth# * hip_depth_ratio, -flare#) + + pickup pencircle scaled 1.5 stemthickness; + draw (-b ,-d) .. + (w, h); +fet_endchar; pickup pencircle scaled stemthickness; draw (0, 0) .. (0,-2 staff_space); @@ -404,6 +593,218 @@ fet_beginchar("64th (down)", "d6", "dsixtyfourthflag") y_mirror_char; fet_endchar; +%%%%%%%% +% +% +% +% Mensural Notation +% +% +% + +def draw_mensural_outermost_flag_i = + define_pixels(stafflinethickness, staff_space) + + pickup pencircle + xscaled 1.00 stafflinethickness + yscaled 0.22 staff_space + rotated -35; + + save za, zb, zc, zd, ze; + pair za, zb, zc, zd, ze; + + za = (+0.00 staff_space, -0.00 staff_space); + zb = (+0.15 staff_space, -0.00 staff_space); + zc = (+0.45 staff_space, -0.35 staff_space); + zd = (+0.45 staff_space, -0.85 staff_space); + ze = (+0.00 staff_space, -2.00 staff_space); + + draw za .. zb -- zc{zc-zb} .. {ze-zd}zd -- ze; +enddef; + +def draw_mensural_outermost_flag_ii = + define_pixels(stafflinethickness, staff_space) + + pickup pencircle + xscaled 1.00 stafflinethickness + yscaled 0.22 staff_space + rotated -35; + + save za, zb, zc, zd, ze; + pair za, zb, zc, zd, ze; + + za = (+0.00 staff_space, -0.00 staff_space); + zb = (+0.15 staff_space, -0.00 staff_space); + zc = (+0.20 staff_space, -0.05 staff_space); + zd = (+0.20 staff_space, -1.15 staff_space); + ze = (+0.00 staff_space, -1.40 staff_space); + + draw za .. zb -- zc{zc-zb} .. {ze-zd}zd -- ze; +enddef; + +def draw_mensural_inner_flag(expr il_shift) = + define_pixels(stafflinethickness, staff_space) + + pickup pencircle + xscaled 1.00 stafflinethickness + yscaled 0.22 staff_space + rotated -35; + + save zs, za, zb, zc, zd; + pair zs, za, zb, zc, zd; + + zs = (0, -il_shift * staff_space); + za = zs + (+0.00 staff_space, -0.10 staff_space); + zb = zs + (+0.33 staff_space, -0.30 staff_space); + zc = zs + (+0.33 staff_space, -0.70 staff_space); + zd = zs + (+0.00 staff_space, -0.90 staff_space); + + draw za{2,1} .. zb .. zc .. {-2,-1}zd; +enddef; + +fet_beginchar("8th Mensural Flag (up)", "mensuralu03", "menseighthflag") + set_char_box(0, 0.60 staff_space#, 2.00 staff_space#, 0) + draw_mensural_outermost_flag_i +fet_endchar; + +fet_beginchar("8th Mensural Flag (up)", "mensuralu13", "mens1eighthflag") + set_char_box(0, 0.60 staff_space#, 1.50 staff_space#, 0) + draw_mensural_outermost_flag_ii +fet_endchar; + +fet_beginchar("8th Mensural Flag (down)", "mensurald03", "mensdeighthflag") + set_char_box(0.60 staff_space#, 0, 0, 2.00 staff_space#) + draw_mensural_outermost_flag_i + currentpicture := currentpicture xscaled -1 yscaled -1; +fet_endchar; + +fet_beginchar("8th Mensural Flag (down)", "mensurald13", "mensd1eighthflag") + set_char_box(0.60 staff_space#, 0, 0, 1.50 staff_space#) + draw_mensural_outermost_flag_ii + currentpicture := currentpicture xscaled -1 yscaled -1; +fet_endchar; + +fet_beginchar("16th Mensural Flag (up)", "mensuralu04", "menssixteenthflag") + set_char_box(0, 0.60 staff_space#, 3.00 staff_space#, 0) + draw_mensural_outermost_flag_i + draw_mensural_inner_flag(2.0) +fet_endchar; + +fet_beginchar("16th Mensural Flag (up)", "mensuralu14", "mens1sixteenthflag") + set_char_box(0, 0.60 staff_space#, 3.00 staff_space#, 0) + draw_mensural_outermost_flag_ii + draw_mensural_inner_flag(1.5) +fet_endchar; + +fet_beginchar("16th Mensural Flag (down)", "mensurald04", "mensdsixteenthflag") + set_char_box(0, 0.60 staff_space#, 3.00 staff_space#, 0) + draw_mensural_outermost_flag_i + draw_mensural_inner_flag(2.0) + currentpicture := currentpicture xscaled -1 yscaled -1; +fet_endchar; + +fet_beginchar("16th Mensural Flag (down)", "mensurald14", "mensd1sixteenthflag") + set_char_box(0, 0.60 staff_space#, 3.00 staff_space#, 0) + draw_mensural_outermost_flag_ii + draw_mensural_inner_flag(1.5) + currentpicture := currentpicture xscaled -1 yscaled -1; +fet_endchar; + +fet_beginchar("32th Mensural Flag (up)", "mensuralu05", "mensthirtysecondflag") + set_char_box(0, 0.60 staff_space#, 3.00 staff_space#, 0) + draw_mensural_outermost_flag_i + draw_mensural_inner_flag(2.0) + draw_mensural_inner_flag(3.0) +fet_endchar; + +fet_beginchar("32th Mensural Flag (up)", "mensuralu15", "mens1thirtysecondflag") + set_char_box(0, 0.60 staff_space#, 3.00 staff_space#, 0) + draw_mensural_outermost_flag_ii + draw_mensural_inner_flag(1.5) + draw_mensural_inner_flag(2.5) +fet_endchar; + +fet_beginchar("32th Mensural Flag (down)", "mensurald05", "mensdthirtysecondflag") + set_char_box(0, 0.60 staff_space#, 3.00 staff_space#, 0) + draw_mensural_outermost_flag_i + draw_mensural_inner_flag(2.0) + draw_mensural_inner_flag(3.0) + currentpicture := currentpicture xscaled -1 yscaled -1; +fet_endchar; + +fet_beginchar("32th Mensural Flag (down)", "mensurald15", "mensd1thirtysecondflag") + set_char_box(0, 0.60 staff_space#, 3.00 staff_space#, 0) + draw_mensural_outermost_flag_ii + draw_mensural_inner_flag(1.5) + draw_mensural_inner_flag(2.5) + currentpicture := currentpicture xscaled -1 yscaled -1; +fet_endchar; + +fet_beginchar("64th Mensural Flag (up)", "mensuralu06", "menssixtyfourthflag") + set_char_box(0, 0.60 staff_space#, 3.00 staff_space#, 0) + draw_mensural_outermost_flag_i + draw_mensural_inner_flag(1.5) + draw_mensural_inner_flag(2.5) + draw_mensural_inner_flag(3.5) +fet_endchar; + +fet_beginchar("64th Mensural Flag (up)", "mensuralu16", "mens1sixtyfourthflag") + set_char_box(0, 0.60 staff_space#, 3.00 staff_space#, 0) + draw_mensural_outermost_flag_ii + draw_mensural_inner_flag(1.17) + draw_mensural_inner_flag(2.08) + draw_mensural_inner_flag(3.00) +fet_endchar; + +fet_beginchar("64th Mensural Flag (down)", "mensurald06", "mensdsixtyfourthflag") + set_char_box(0, 0.60 staff_space#, 3.00 staff_space#, 0) + draw_mensural_outermost_flag_i + draw_mensural_inner_flag(1.5) + draw_mensural_inner_flag(2.5) + draw_mensural_inner_flag(3.5) + currentpicture := currentpicture xscaled -1 yscaled -1; +fet_endchar; + +fet_beginchar("64th Mensural Flag (down)", "mensurald16", "mensd1sixtyfourthflag") + set_char_box(0, 0.60 staff_space#, 3.00 staff_space#, 0) + draw_mensural_outermost_flag_ii + draw_mensural_inner_flag(1.17) + draw_mensural_inner_flag(2.08) + draw_mensural_inner_flag(3.00) + currentpicture := currentpicture xscaled -1 yscaled -1; +fet_endchar; + +%%%%%%%% +% +% +% +% Single Stroke for Short Appogiatura +% +% +% + +fet_beginchar("grace dash (up)", "ugrace", "gracedash") + save flare, + hip_depth_ratio, hip_width, + foot_depth; + + flare# = 1.0 staff_space#; + hip_depth_ratio = .72; + hip_width# = upflag_width# - hip_thickness#/2; + + foot_depth# = 3 staff_space#; + + define_pixels(flare, hip_width, hip_thickness, + foot_depth, foot_thickness); + + set_char_box(hip_width# * hip_depth_ratio, + hip_width# + stemthickness#/2 + right_upflag_space#, + foot_depth# * hip_depth_ratio, -flare#) + + pickup pencircle scaled 1.5 stemthickness; + draw (-b ,-d) .. + (w, h); +fet_endchar; fet_beginchar("grace dash (down)", "dgrace", "dgracedash") save flare, hip_depth_ratio, hip_width, foot_depth; diff --git a/mf/feta-bolletjes.mf b/mf/feta-bolletjes.mf index 6947dda34d..c9273f1dd4 100644 --- a/mf/feta-bolletjes.mf +++ b/mf/feta-bolletjes.mf @@ -164,27 +164,33 @@ fet_endchar; def draw_mensural_head (expr wid, open) = save head_width; head_width# = wid; - set_char_box (0, head_width#, + set_char_box (head_width#/2, head_width#/2, noteheight#/2, noteheight#/2); define_pixels(head_width, noteheight); - x2 = head_width/2; - y2 = 1.1 noteheight/2; - y1 = 0; - (x2 - x1) / (y2 - y1) = tand(30); - z3 = (2x2 - x1, y1); - z4 = z3 + z1 - z2; + x1 = -x3; + y1 = x2 = y3 = x4 = 0; + y4 = -y2; + y2 = 1.4 noteheight/2; + tand(30) = x3 / y2; pickup pencircle - xscaled 0.18 head_width - yscaled 0.36 head_width + xscaled 0.15 head_width + yscaled 0.30 head_width rotated -30; + % pencircle width correction + save zc, zd; pair zc, zd; + zc = (+0.150 head_width * sind(30), +0.150 head_width * cosd(30)); + zd = (+0.075 head_width * sind(30), -0.075 head_width * cosd(30)); + if open: - draw z1 -- z2 -- z3 -- z4 -- cycle; + draw (z1+zc+zd) -- (z2-zc+zd) -- + (z3-zc-zd) -- (z4+zc-zd) -- cycle; else: - filldraw z1 -- z2 -- z3 -- z4 -- cycle; + filldraw (z1+zc+zd) -- (z2-zc+zd) -- + (z3-zc-zd) -- (z4+zc-zd) -- cycle; fi; enddef; diff --git a/mf/feta-schrift.mf b/mf/feta-schrift.mf index 95c0a7a3df..bdb0ef8757 100644 --- a/mf/feta-schrift.mf +++ b/mf/feta-schrift.mf @@ -766,81 +766,6 @@ fet_beginchar("Arpeggio","arpeggio","arpeggio"); draw_arpeggio; fet_endchar; -% Arrowhead nestles underneath / on top of the arpeggio symbol - -def draw_arpeggio_arrow = - save thinness, height, width, overshoot, se, sw, ne, nw, alpha; - pair ne, nw, se, sw; - height# = staff_space#; - width# = 0.8height#; - overshoot# = 0.25 staff_space#; - define_pixels (height,overshoot,width); - set_char_box(0, width#, 0, height#); - alpha := -40; - nw = dir (alpha+180); - sw = dir (alpha-90); se = dir alpha; - - penpos1(rthin, alpha+90); - penpos2(5/4rthick, alpha); - penpos3(rthin, alpha); - - z1 = (width/2, height) - overshoot*se; % numbering is consistent with the arpeggio symbol - z2 = 2[z4,(width/2,height/2)]; - z3 = (0.5 width, 0.5 height); - z4 = (0.25 staff_space, rthin); - z6 = z2l + 1/2rthin*sw; - z9 = (width/2, height) + overshoot*se; - - z10 = (0.5w, -0.5h); - z11 = (0, 0); - z12 = (w, 0); - - fill z1l {se}..{se} z6 .. z3l .. z3r.. z9{nw} ..{nw} z1r.. cycle; - - pickup pencircle scaled rthin; - draw z3 -- z10 -- z11; - draw z10 -- z12; - enddef; - -fet_beginchar("Arpeggio arrow down", "arrowdown", "arrowdown"); - draw_arpeggio_arrow; -fet_endchar; - -fet_beginchar("Arpeggio arrow up", "arrowup", "arrowup"); - draw_arpeggio_arrow; - currentpicture := currentpicture scaled -1 shifted (0.8staff_space, staff_space); -fet_endchar; - - -def draw_chordbrace_end = - save thinness; - set_char_box(0, staff_space#, 0, staff_space#); - pickup pencircle scaled stemthickness; - bot rt z1 = (w, -h); - bot lft z2 = (0, -h); - top lft z3 = (0, h); - draw z1 -- z2 -- z3; -enddef; - -fet_beginchar("Bottom of chord brace", "bracebottom", "bracebottom"); - draw_chordbrace_end; - labels (1, 2, 3); -fet_endchar; - -fet_beginchar("Top of chord brace", "bracetop", "bracetop"); - draw_chordbrace_end; - y_mirror_char; -fet_endchar; - -%% Same as a note stem, but only a staff-space long. -fet_beginchar("chord brace segment (up)", "braceseg", "braceseg") - set_char_box(stemthickness#/2, stemthickness#/2, 0, staff_space#); - pickup pencircle scaled stemthickness; - bot lft z1 = (0, 0); - top lft z2 = (0, h); - draw z1 -- z2; -fet_endchar; - % Extendable Trill symbol. % Not yet used % Rename me to Trill, rename Trill to Tr? diff --git a/ps/lilyponddefs.ps b/ps/lilyponddefs.ps index 69112106cb..2ff908e420 100644 --- a/ps/lilyponddefs.ps +++ b/ps/lilyponddefs.ps @@ -20,7 +20,6 @@ % fixed base line skip value, for single line staves /base-line-skip lilypondpaperlineheight def - /init-paper { gsave .1 setlinewidth diff --git a/ps/music-drawing-routines.ps b/ps/music-drawing-routines.ps index d2f3bac4c6..a4c8311465 100644 --- a/ps/music-drawing-routines.ps +++ b/ps/music-drawing-routines.ps @@ -4,6 +4,10 @@ /blot-diameter { lilypondpaperblotdiameter } bind def +% fucking redhat xdvi patch. +/skeel { scale } bind def + + /set_tex_dimen { cvr def } bind def @@ -13,6 +17,7 @@ 1 copy mul exch 1 copy mul add sqrt } bind def +/skeel { scale } bind def % FIXME. translate to middle of box. % Nice rectangle with rounded corners /draw_box % breapth width depth height diff --git a/scm/generic-property.scm b/scm/generic-property.scm index 740f0a641a..f5aba1fcc9 100644 --- a/scm/generic-property.scm +++ b/scm/generic-property.scm @@ -39,6 +39,7 @@ (list 'verticalDirection dir? 'direction) (list 'stemLength number? 'length) (list 'flagStyle string? 'flag-style) + (list 'style symbol? 'style) (list 'noStemExtend boolean? 'no-stem-extend) (list 'stemShorten number? 'shorten) )) diff --git a/scm/grob-description.scm b/scm/grob-description.scm index 2ba7901255..dc0fbd7a07 100644 --- a/scm/grob-description.scm +++ b/scm/grob-description.scm @@ -28,7 +28,6 @@ (X-offset-callbacks . (,Side_position_interface::aligned_side)) (direction . -1) (staff-position . 0.0) - (arpeggio-type . plain) (meta . ,(grob-description "Arpeggio" arpeggio-interface side-position-interface font-interface)) )) diff --git a/scm/grob-property-description.scm b/scm/grob-property-description.scm index c32ecc7633..f5ea904733 100644 --- a/scm/grob-property-description.scm +++ b/scm/grob-property-description.scm @@ -41,11 +41,6 @@ This procedure is called (using dependency resolution) after line breaking. Retu (grob-property-description 'arch-width number? "width of the hook of a system brace.") (grob-property-description 'arithmetic-basicspace number? "see @ref{spacing-spanner-interface}.") (grob-property-description 'arithmetic-multiplier number? "see @ref{spacing-spanner-interface}.") -(grob-property-description 'arpeggio-type symbol? "Type of arpeggio. -up: a squiggly line with upward arrow, -down: a squiggly line with upward arrow, -bracket: a square bracket, -plain: a plain squiggly line (default)") (grob-property-description 'attachment pair? "cons of symbols, '(LEFT-TYPE . RIGHT-TYPE), where both types may be alongside-stem, stem, head or loose-end.") (grob-property-description 'stem-attachment-function procedure? "Where @@ -155,7 +150,7 @@ typesetting engine is completely oblivious to it. slur dir) -> attachment to determine the attachment (see above). If procedure returns #t, attachment is used. Otherwise, the next procedure is tried.") -(grob-property-description 'flag-style string? "style for flag (hook of a stem).") +(grob-property-description 'flag-style string? "turn stroke through stem on/off.") (grob-property-description 'flag-width-function procedure? "Procedure that computes the width of a half-beam (a non-connecting beam.).") (grob-property-description 'font-family symbol? "partial font definition: music roman braces dynamic math ...") diff --git a/scm/interface-description.scm b/scm/interface-description.scm index 99cf6c7128..3dd45314c4 100644 --- a/scm/interface-description.scm +++ b/scm/interface-description.scm @@ -134,7 +134,7 @@ support-head heads direction - stem-length + length style flag-style dir-forced diff --git a/scm/tex.scm b/scm/tex.scm index fa3411bed5..1a1ec47cf6 100644 --- a/scm/tex.scm +++ b/scm/tex.scm @@ -106,7 +106,7 @@ (ly-gulp-file "music-drawing-routines.ps")) (if (defined? 'ps-testing) "/testing true def%\n" "") "}" - "\\input lilyponddefs\\newdimen\\outputscale \\outputscale=\\lilypondpaperoutputscale pt\\turnOnPostScript")) + "\\input lilyponddefs \\outputscale=\\lilypondpaperoutputscale pt\\turnOnPostScript")) ;; Note: this string must match the string in ly2dvi.py!!! (define (header creator generate) diff --git a/scripts/GNUmakefile b/scripts/GNUmakefile index 318e463cc7..eb0687f223 100644 --- a/scripts/GNUmakefile +++ b/scripts/GNUmakefile @@ -1,12 +1,12 @@ # bin/Makefile depth = .. + SEXECUTABLES=convert-ly lilypond-book ly2dvi abc2ly as2text etf2ly musedata2ly pmx2ly mup2ly STEPMAKE_TEMPLATES=script help2man po HELP2MAN_EXECS = $(SEXECUTABLES) include $(depth)/make/stepmake.make - include $(stepdir)/executable-targets.make diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py index e70fe1037f..a2f447694d 100644 --- a/scripts/lilypond-book.py +++ b/scripts/lilypond-book.py @@ -365,7 +365,7 @@ output_dict= { 'output-default-pre': "\\def\preLilypondExample{}\n", 'usepackage-graphics': '\\usepackage{graphics}\n', 'output-eps': '\\noindent\\parbox{\\lilypondepswidth{%(fn)s.eps}}{\includegraphics{%(fn)s.eps}}', - 'output-tex': '\\preLilypondExample \\input %(fn)s.tex \\postLilypondExample\n', + 'output-tex': '{\\preLilypondExample \\input %(fn)s.tex \\postLilypondExample\n}', 'pagebreak': r'\pagebreak', }, 'texi' : {'output-lilypond': """@lilypond[%s] diff --git a/scripts/ly2dvi.py b/scripts/ly2dvi.py index 702c961171..6d74809fda 100644 --- a/scripts/ly2dvi.py +++ b/scripts/ly2dvi.py @@ -66,6 +66,7 @@ import __main__ import operator import tempfile import traceback +import resource datadir = '@datadir@' sys.path.append (datadir + '/python') diff --git a/tex/lily-ps-defs.tex b/tex/lily-ps-defs.tex index ab5ad6b434..79cb916235 100644 --- a/tex/lily-ps-defs.tex +++ b/tex/lily-ps-defs.tex @@ -16,8 +16,9 @@ \def\embeddedps##1{% \special{ps\string: @beginspecial @setspecial \lilypondpaperoutputscale\lilySpace - \lilypondpaperoutputscale\lilySpace scale - ##1 @endspecial}% + \lilypondpaperoutputscale\lilySpace + % FUCKING REDHAT XDVI -- ARG! + skeel ##1 @endspecial}% } } \def\PSsetTeXdimen#1{\expandafter\special{! /#1 (\csname #1\endcsname) set_tex_dimen}} diff --git a/tex/lilyponddefs.tex b/tex/lilyponddefs.tex index 78efb4bc8b..0b00c76eb1 100644 --- a/tex/lilyponddefs.tex +++ b/tex/lilyponddefs.tex @@ -78,5 +78,5 @@ \csname% nolilyfooter\texsuffix\endcsname \fi - +\newdimen\outputscale \endinput -- 2.39.2