From d9b43b93f2c885409bafdb157138158f65cc49aa Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Fri, 1 Feb 2002 19:18:37 +0100 Subject: [PATCH] release: 1.5.29 --- AUTHORS.txt | 5 +- ChangeLog | 37 + Documentation/topdocs/AUTHORS.texi | 2 +- Documentation/user/refman.itely | 12 +- Documentation/user/tutorial.itely | 2 +- GNUmakefile.in | 2 +- VERSION | 4 +- input/regression/note-head-style.ly | 4 +- input/test/ancient-font.ly | 2 +- lily/a2-engraver.cc | 2 +- lily/accidental-engraver.cc | 2 +- lily/afm.cc | 2 +- lily/align-interface.cc | 2 +- lily/all-font-metrics.cc | 2 +- lily/arpeggio-engraver.cc | 2 +- lily/arpeggio.cc | 2 +- lily/audio-column.cc | 2 +- lily/audio-element-info.cc | 2 +- lily/audio-element.cc | 2 +- lily/audio-item.cc | 2 +- lily/audio-staff.cc | 2 +- lily/auto-beam-engraver.cc | 2 +- lily/auto-change-iterator.cc | 2 +- lily/axis-group-engraver.cc | 2 +- lily/axis-group-interface.cc | 2 +- lily/bar-check-iterator.cc | 2 +- lily/bar-engraver.cc | 2 +- lily/bar-number-engraver.cc | 2 +- lily/bar.cc | 8 +- lily/beam-engraver.cc | 2 +- lily/beam.cc | 2 +- lily/beaming-info.cc | 2 +- lily/bezier-bow.cc | 2 +- lily/bezier.cc | 2 +- lily/box.cc | 2 +- lily/break-algorithm.cc | 2 +- lily/break-align-engraver.cc | 2 +- lily/break-align-item.cc | 2 +- lily/change-iterator.cc | 2 +- lily/chord-name-engraver.cc | 2 +- lily/chord-name.cc | 2 +- lily/chord-tremolo-engraver.cc | 2 +- lily/chord-tremolo-iterator.cc | 2 +- lily/chord.cc | 2 +- lily/clef-engraver.cc | 2 +- lily/clef-item.cc | 2 +- lily/collision-engraver.cc | 2 +- lily/collision.cc | 2 +- lily/column-x-positions.cc | 2 +- lily/command-request.cc | 2 +- lily/completion-note-heads-engraver.cc | 2 +- lily/context-specced-music.cc | 2 +- lily/cxx-function-smob.cc | 2 +- lily/dimension-cache.cc | 2 +- lily/directional-element-interface.cc | 2 +- lily/dot-column-engraver.cc | 2 +- lily/dot-column.cc | 2 +- lily/dots.cc | 2 +- lily/duration.cc | 2 +- lily/dynamic-engraver.cc | 2 +- lily/engraver-group-engraver.cc | 2 +- lily/engraver.cc | 2 +- lily/fingering-engraver.cc | 2 +- lily/folded-repeat-iterator.cc | 2 +- lily/font-interface.cc | 2 +- lily/font-metric.cc | 2 +- lily/font-size-engraver.cc | 2 +- lily/global-ctor.cc | 2 +- lily/global-translator.cc | 2 +- lily/gourlay-breaking.cc | 2 +- lily/grace-iterator.cc | 2 +- lily/grace-music.cc | 2 +- lily/grob-info.cc | 2 +- lily/grob-pitch-tuple.cc | 2 +- lily/grob-pq-engraver.cc | 2 +- lily/grob.cc | 2 +- lily/group-interface.cc | 2 +- lily/hairpin.cc | 2 +- lily/hara-kiri-group-spanner.cc | 2 +- lily/includable-lexer.cc | 2 +- lily/include/afm.hh | 2 +- lily/include/align-interface.hh | 2 +- lily/include/all-font-metrics.hh | 2 +- lily/include/arpeggio.hh | 2 +- lily/include/audio-column.hh | 2 +- lily/include/audio-element-info.hh | 2 +- lily/include/audio-element.hh | 2 +- lily/include/audio-item.hh | 2 +- lily/include/audio-staff.hh | 2 +- lily/include/auto-change-iterator.hh | 2 +- lily/include/axis-group-interface.hh | 2 +- lily/include/bar.hh | 2 +- lily/include/beam.hh | 2 +- lily/include/beaming.hh | 2 +- lily/include/bezier-bow.hh | 2 +- lily/include/bezier.hh | 2 +- lily/include/break-algorithm.hh | 2 +- lily/include/break-align-item.hh | 2 +- lily/include/change-iterator.hh | 2 +- lily/include/chord-name.hh | 2 +- lily/include/chord-tremolo-iterator.hh | 2 +- lily/include/chord.hh | 2 +- lily/include/clef.hh | 2 +- lily/include/collision.hh | 2 +- lily/include/column-x-positions.hh | 2 +- lily/include/command-request.hh | 2 +- lily/include/context-specced-music.hh | 2 +- lily/include/cxx-function-smob.hh | 2 +- lily/include/dimension-cache-callback.hh | 2 +- lily/include/dimension-cache.hh | 2 +- lily/include/directional-element-interface.hh | 2 +- lily/include/dot-column.hh | 2 +- lily/include/dots.hh | 2 +- lily/include/duration.hh | 2 +- lily/include/engraver-group-engraver.hh | 2 +- lily/include/engraver.hh | 2 +- lily/include/file-results.hh | 2 +- lily/include/folded-repeat-iterator.hh | 2 +- lily/include/font-interface.hh | 2 +- lily/include/font-metric.hh | 2 +- lily/include/global-ctor.hh | 2 +- lily/include/global-translator.hh | 2 +- lily/include/gourlay-breaking.hh | 2 +- lily/include/grace-iterator.hh | 2 +- lily/include/grace-music.hh | 2 +- lily/include/grob-info.hh | 2 +- lily/include/grob.hh | 2 +- lily/include/group-interface.hh | 2 +- lily/include/hairpin.hh | 2 +- lily/include/hara-kiri-group-spanner.hh | 2 +- lily/include/includable-lexer.hh | 2 +- lily/include/input-smob.hh | 2 +- lily/include/interpretation-context-handle.hh | 2 +- lily/include/item.hh | 2 +- lily/include/key-item.hh | 2 +- lily/include/keyword.hh | 2 +- lily/include/kpath.hh | 2 +- lily/include/least-squares.hh | 2 +- lily/include/lily-guile.hh | 2 +- lily/include/lily-proto.hh | 2 +- lily/include/lily-version.hh | 2 +- lily/include/lilypond-input-version.hh | 2 +- lily/include/line-group-group-engraver.hh | 2 +- lily/include/line-of-score.hh | 2 +- lily/include/line-spanner.hh | 2 +- lily/include/local-key-item.hh | 2 +- lily/include/lookup.hh | 2 +- lily/include/lyric-combine-music-iterator.hh | 2 +- lily/include/lyric-combine-music.hh | 2 +- lily/include/lyric-extender.hh | 2 +- lily/include/main.hh | 2 +- lily/include/midi-def.hh | 2 +- lily/include/midi-item.hh | 2 +- lily/include/midi-stream.hh | 2 +- lily/include/midi-walker.hh | 2 +- lily/include/minterval.hh | 2 +- lily/include/molecule.hh | 2 +- lily/include/moment.hh | 2 +- lily/include/multi-measure-rest.hh | 2 +- lily/include/music-iterator.hh | 2 +- lily/include/music-list.hh | 2 +- lily/include/music-output-def.hh | 2 +- lily/include/music-output.hh | 2 +- lily/include/music-sequence.hh | 2 +- lily/include/music-wrapper-iterator.hh | 2 +- lily/include/music-wrapper.hh | 2 +- lily/include/music.hh | 2 +- lily/include/musical-request.hh | 2 +- lily/include/my-lily-lexer.hh | 2 +- lily/include/my-lily-parser.hh | 2 +- lily/include/note-column.hh | 2 +- lily/include/note-head.hh | 2 +- .../include/output-property-music-iterator.hh | 2 +- lily/include/output-property.hh | 2 +- lily/include/paper-column.hh | 2 +- lily/include/paper-def.hh | 2 +- lily/include/paper-outputter.hh | 2 +- lily/include/paper-score.hh | 2 +- lily/include/part-combine-music-iterator.hh | 2 +- lily/include/part-combine-music.hh | 2 +- lily/include/performance.hh | 2 +- lily/include/performer-group-performer.hh | 2 +- lily/include/performer.hh | 2 +- lily/include/pitch.hh | 2 +- lily/include/property-iterator.hh | 2 +- lily/include/protected-scm.hh | 2 +- lily/include/relative-music.hh | 2 +- lily/include/repeated-music.hh | 2 +- lily/include/request-chord-iterator.hh | 2 +- lily/include/request.hh | 2 +- lily/include/rest-collision.hh | 2 +- lily/include/rest.hh | 2 +- lily/include/rhythmic-head.hh | 2 +- lily/include/rod.hh | 2 +- lily/include/scaled-font-metric.hh | 2 +- lily/include/scm-hash.hh | 2 +- lily/include/scope.hh | 2 +- lily/include/score-engraver.hh | 2 +- lily/include/score-performer.hh | 2 +- lily/include/score.hh | 2 +- lily/include/script-column.hh | 2 +- lily/include/script.hh | 2 +- lily/include/separating-group-spanner.hh | 2 +- lily/include/separation-item.hh | 2 +- lily/include/sequential-music-iterator.hh | 2 +- lily/include/side-position-interface.hh | 2 +- lily/include/simple-music-iterator.hh | 2 +- lily/include/simple-spacer.hh | 2 +- lily/include/simultaneous-music-iterator.hh | 2 +- lily/include/slur-bezier-bow.hh | 2 +- lily/include/slur.hh | 2 +- lily/include/smobs.hh | 2 +- lily/include/spaceable-grob.hh | 2 +- lily/include/spacing-spanner.hh | 2 +- lily/include/span-bar.hh | 2 +- lily/include/spanner.hh | 2 +- lily/include/spring.hh | 2 +- lily/include/staff-symbol-referencer.hh | 2 +- lily/include/staff-symbol.hh | 2 +- lily/include/stem-info.hh | 2 +- lily/include/stem-tremolo.hh | 2 +- lily/include/stem.hh | 2 +- lily/include/swallow-perf.hh | 2 +- lily/include/system-start-delimiter.hh | 2 +- lily/include/text-item.hh | 2 +- lily/include/text-spanner.hh | 2 +- lily/include/tfm-reader.hh | 2 +- lily/include/tfm.hh | 2 +- lily/include/tie-column.hh | 2 +- lily/include/tie.hh | 2 +- lily/include/time-scaled-music-iterator.hh | 2 +- lily/include/time-scaled-music.hh | 2 +- lily/include/time-signature.hh | 2 +- lily/include/timing-translator.hh | 2 +- lily/include/translation-property.hh | 2 +- lily/include/translator-change.hh | 2 +- lily/include/translator-def.hh | 2 +- lily/include/translator-group.hh | 2 +- lily/include/translator.hh | 2 +- lily/include/transposed-music.hh | 2 +- lily/include/tuplet-spanner.hh | 2 +- lily/include/type-swallow-translator.hh | 2 +- lily/include/volta-spanner.hh | 2 +- lily/input-smob.cc | 2 +- lily/instrument-name-engraver.cc | 2 +- lily/interpretation-context-handle.cc | 2 +- lily/item.cc | 2 +- lily/key-engraver.cc | 2 +- lily/key-item.cc | 2 +- lily/key-performer.cc | 2 +- lily/kpath.cc | 2 +- lily/least-squares.cc | 2 +- lily/lily-guile.cc | 2 +- lily/lily-version.cc | 2 +- lily/lilypond-version.cc | 2 +- lily/line-group-group-engraver.cc | 2 +- lily/line-of-score.cc | 2 +- lily/line-spanner.cc | 2 +- lily/local-key-item.cc | 2 +- lily/lookup.cc | 2 +- lily/lyric-combine-music-iterator.cc | 2 +- lily/lyric-combine-music.cc | 2 +- lily/lyric-engraver.cc | 2 +- lily/lyric-extender.cc | 2 +- lily/lyric-performer.cc | 2 +- lily/main.cc | 6 +- lily/mark-engraver.cc | 2 +- lily/melisma-engraver.cc | 2 +- lily/midi-def.cc | 2 +- lily/midi-item.cc | 2 +- lily/midi-stream.cc | 2 +- lily/midi-walker.cc | 2 +- lily/misc.cc | 2 +- lily/molecule.cc | 2 +- lily/moment.cc | 2 +- lily/multi-measure-rest-engraver.cc | 2 +- lily/multi-measure-rest.cc | 2 +- lily/music-constructor.cc | 2 +- lily/music-iterator.cc | 2 +- lily/music-output-def.cc | 2 +- lily/music-sequence.cc | 2 +- lily/music-wrapper-iterator.cc | 2 +- lily/music-wrapper.cc | 2 +- lily/music.cc | 2 +- lily/musical-request.cc | 2 +- lily/my-lily-lexer.cc | 2 +- lily/my-lily-parser.cc | 2 +- lily/new-spacing-spanner.cc | 2 +- lily/note-column.cc | 2 +- lily/note-head-line-engraver.cc | 2 +- lily/note-head.cc | 2 +- lily/note-heads-engraver.cc | 2 +- lily/note-name-engraver.cc | 2 +- lily/note-performer.cc | 2 +- lily/note-spacing.cc | 2 +- lily/output-property-engraver.cc | 2 +- lily/output-property-music-iterator.cc | 2 +- lily/paper-column.cc | 2 +- lily/paper-def.cc | 2 +- lily/paper-outputter.cc | 2 +- lily/paper-score.cc | 2 +- lily/part-combine-music-iterator.cc | 2 +- lily/part-combine-music.cc | 2 +- lily/percent-repeat-engraver.cc | 2 +- lily/percent-repeat-item.cc | 2 +- lily/percent-repeat-iterator.cc | 2 +- lily/performance.cc | 2 +- lily/performer-group-performer.cc | 2 +- lily/performer.cc | 2 +- lily/phrasing-slur-engraver.cc | 2 +- lily/piano-pedal-engraver.cc | 2 +- lily/pitch-squash-engraver.cc | 2 +- lily/pitch.cc | 2 +- lily/porrectus-engraver.cc | 2 +- lily/porrectus.cc | 2 +- lily/property-engraver.cc | 2 +- lily/property-iterator.cc | 2 +- lily/protected-scm.cc | 2 +- lily/regular-spacing-engraver.cc | 2 +- lily/relative-octave-music.cc | 2 +- lily/repeat-acknowledge-engraver.cc | 2 +- lily/repeated-music.cc | 2 +- lily/request-chord-iterator.cc | 2 +- lily/request.cc | 2 +- lily/rest-collision-engraver.cc | 2 +- lily/rest-collision.cc | 2 +- lily/rest-engraver.cc | 2 +- lily/rest.cc | 14 +- lily/rhythmic-column-engraver.cc | 2 +- lily/rhythmic-head.cc | 2 +- lily/rod.cc | 2 +- lily/scaled-font-metric.cc | 2 +- lily/scm-hash.cc | 2 +- lily/scm-option.cc | 2 +- lily/scope.cc | 2 +- lily/score-engraver.cc | 2 +- lily/score-performer.cc | 2 +- lily/score.cc | 2 +- lily/scores.cc | 2 +- lily/script-column-engraver.cc | 2 +- lily/script-column.cc | 2 +- lily/script-engraver.cc | 2 +- lily/script.cc | 2 +- lily/separating-group-spanner.cc | 2 +- lily/separating-line-group-engraver.cc | 2 +- lily/separation-item.cc | 2 +- lily/sequential-music-iterator.cc | 2 +- lily/side-position-interface.cc | 2 +- lily/simple-music-iterator.cc | 2 +- lily/simple-spacer.cc | 2 +- lily/simultaneous-music-iterator.cc | 2 +- lily/slur-bezier-bow.cc | 2 +- lily/slur-engraver.cc | 2 +- lily/slur.cc | 2 +- lily/spaceable-grob.cc | 2 +- lily/spacing-engraver.cc | 2 +- lily/spacing-spanner.cc | 2 +- lily/span-arpeggio-engraver.cc | 2 +- lily/span-bar-engraver.cc | 2 +- lily/span-bar.cc | 2 +- lily/spanner.cc | 2 +- lily/spring.cc | 2 +- lily/staff-collecting-engraver.cc | 2 +- lily/staff-performer.cc | 2 +- lily/staff-spacing.cc | 2 +- lily/staff-symbol-engraver.cc | 2 +- lily/staff-symbol-referencer.cc | 2 +- lily/staff-symbol.cc | 2 +- lily/stanza-number-engraver.cc | 2 +- lily/stem-engraver.cc | 2 +- lily/stem-tremolo.cc | 2 +- lily/stem.cc | 6 +- lily/sustain-pedal.cc | 2 +- lily/swallow-engraver.cc | 2 +- lily/swallow-perf.cc | 2 +- lily/system-start-delimiter-engraver.cc | 2 +- lily/system-start-delimiter.cc | 2 +- lily/template5.cc | 2 +- lily/tempo-performer.cc | 2 +- lily/text-engraver.cc | 2 +- lily/text-item.cc | 2 +- lily/text-spanner-engraver.cc | 2 +- lily/text-spanner.cc | 2 +- lily/tfm-reader.cc | 2 +- lily/tfm.cc | 2 +- lily/third-try.cc | 2 +- lily/thread-devnull-engraver.cc | 2 +- lily/tie-column.cc | 2 +- lily/tie-engraver.cc | 2 +- lily/tie-performer.cc | 2 +- lily/tie.cc | 2 +- lily/time-scaled-music-iterator.cc | 2 +- lily/time-scaled-music.cc | 2 +- lily/time-signature-engraver.cc | 2 +- lily/time-signature-performer.cc | 2 +- lily/time-signature.cc | 2 +- lily/timing-engraver.cc | 2 +- lily/timing-translator.cc | 2 +- lily/translator-ctors.cc | 2 +- lily/translator-def.cc | 2 +- lily/translator-group.cc | 2 +- lily/translator.cc | 2 +- lily/transposed-music.cc | 2 +- lily/tuplet-bracket.cc | 2 +- lily/tuplet-engraver.cc | 2 +- lily/type-swallow-translator.cc | 2 +- lily/un-relativable-music.cc | 2 +- lily/unfolded-repeat-iterator.cc | 2 +- lily/untransposable-music.cc | 2 +- lily/vertical-align-engraver.cc | 2 +- lily/voice-devnull-engraver.cc | 2 +- lily/volta-engraver.cc | 2 +- lily/volta-spanner.cc | 2 +- lily/warn.cc | 2 +- lilypond-indent.el | 316 +++++ ly/property-init.ly | 4 +- 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-autometric.mf | 2 +- mf/feta-banier.mf | 420 ------- mf/feta-beum.mf | 2 +- mf/feta-bolletjes.mf | 678 ++--------- mf/feta-braces0.mf | 2 +- mf/feta-braces1.mf | 2 +- mf/feta-braces2.mf | 2 +- mf/feta-braces3.mf | 2 +- mf/feta-braces4.mf | 2 +- mf/feta-braces5.mf | 2 +- mf/feta-braces6.mf | 2 +- mf/feta-braces7.mf | 2 +- mf/feta-braces8.mf | 2 +- mf/feta-eindelijk.mf | 164 +-- mf/feta-generic.mf | 4 +- mf/feta-klef.mf | 1023 +++-------------- mf/feta-macros.mf | 10 + mf/feta-nummer-code.mf | 2 +- mf/feta-params.mf | 3 + mf/feta-pendaal.mf | 8 +- mf/feta-puntje.mf | 2 +- mf/feta-slag.mf | 2 +- mf/feta-sleur.mf | 2 +- mf/feta-test11.mf | 6 +- mf/feta-test13.mf | 2 +- mf/feta-test26.mf | 2 +- mf/feta-timesig.mf | 124 +- mf/feta-toevallig.mf | 166 +-- .../registry.in => mf/parmesan-accidentals.mf | 0 mf/parmesan-clefs.mf | 828 +++++++++++++ mf/{feta-custodes.mf => parmesan-custodes.mf} | 40 +- mf/parmesan-flags.mf | 471 ++++++++ mf/parmesan-generic.mf | 38 + mf/parmesan-rests.mf | 177 +++ mf/parmesan-timesig.mf | 133 +++ mf/parmesan20.mf | 17 + scm/clef.scm | 1 + scm/output-lib.scm | 1 + scripts/abc2ly.py | 2 +- scripts/etf2ly.py | 2 +- scripts/lilypond-book.py | 2 +- scripts/ly2dvi.py | 2 +- scripts/midi2ly.py | 2 +- scripts/musedata2ly.py | 4 +- scripts/pmx2ly.py | 4 +- scripts/update-lily.py | 2 +- 466 files changed, 2820 insertions(+), 2790 deletions(-) create mode 100644 lilypond-indent.el rename Documentation/windows/registry.in => mf/parmesan-accidentals.mf (100%) create mode 100644 mf/parmesan-clefs.mf rename mf/{feta-custodes.mf => parmesan-custodes.mf} (91%) create mode 100644 mf/parmesan-flags.mf create mode 100644 mf/parmesan-generic.mf create mode 100644 mf/parmesan-rests.mf create mode 100644 mf/parmesan-timesig.mf create mode 100644 mf/parmesan20.mf diff --git a/AUTHORS.txt b/AUTHORS.txt index 2f561d831b..12a58e4a6a 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -17,7 +17,7 @@ list is alphabetically ordered. * Laura Conrad (lconrad@world.std.com) fixes to abc2ly - * Jan Arne Fagertun , TeX + * Jan Arne Fagertun , TeX titling and lytodvi.sh * Anthony Fok , Debian package: debian/* @@ -27,6 +27,9 @@ list is alphabetically ordered. * Bjoern Jacke German glossary stuff. + * Chris Jackson , Emacs mode + indentation, directed arpeggios. + * Neil Jerram . parts of Documentation/Vocab* diff --git a/ChangeLog b/ChangeLog index 60ccfdd920..e8e1505545 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,40 @@ +2002-02-01 Han-Wen Nienhuys + + * VERSION: 1.5.29 released + + * all files: change 2001 to 2002 in headers globally + + * mf/parmesan20.mf: split out ancient notation into parmesan ("old + cheese") font. WARNING: fonts changed. + +2002-02-01 Juergen Reuter + + * mf/*.mf: Fixed some blot_diameter related flaws in some feta symbols + + * mf/*.mf: Added some more vaticana/solesmes style font symbols + + * mf/*.mf: Bugfix: renamed subbipunctum -> inclinatum + + * mf/*.mf: Fixed a few typos in various .mf files + +2002-01-17 Rune Zedeler + + * mf/: added macro soft_penstroke + + softened some glyphs + redrawn triangular noteheads + redrawn tab-clef + added classical quarter rest + + * lily/stem.cc: Bugfix: Stem-attachment when staff_space!=1 + + * lily/bar.cc: Bugfix: repeat dots when even number of staff + lines and staff_space>=2 + + * lily/rest.cc: Use default rests when current style glyphs not + found - this allows + \property Staff.Rest \override #'style = #'classical + 2002-01-30 Jan Nieuwenhuizen * input/bugs/first-tie.ly: New file. diff --git a/Documentation/topdocs/AUTHORS.texi b/Documentation/topdocs/AUTHORS.texi index 158aec9fe9..c465d4a230 100644 --- a/Documentation/topdocs/AUTHORS.texi +++ b/Documentation/topdocs/AUTHORS.texi @@ -29,7 +29,7 @@ list is alphabetically ordered. accidental transposition. @item Laura Conrad (lconrad@@world.std.com) fixes to abc2ly -@item @email{Jan.A.Fagertun@@energy.sintef.no, Jan Arne Fagertun}, +@item @email{Jan.A.Fagertun@@trondheim.online.no, Jan Arne Fagertun}, @TeX{} titling and lytodvi.sh @item @email{foka@@debian.org, Anthony Fok}, Debian package: debian/* diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely index 2dcb351440..9bc3526865 100644 --- a/Documentation/user/refman.itely +++ b/Documentation/user/refman.itely @@ -3977,11 +3977,17 @@ A bar check is entered using the bar symbol, @code{|}: \time 3/4 c2 e4 | g2. @end example + + @cindex skipTypesetting -Bar checks are not affected by @code{skipTypesetting}, so if you are -debugging a large score, you are advised to run it with skipTypesetting -first to correct all overfull and underfull measures. +Failed bar checks are most often caused by entering incorrect +durations. Incorrect durations often completely garble up the score, +especially if it is polyphonic, so you should start correcting the score +by scanning for failed bar checks and incorrect durations. To speed up +this process, you can use @code{skipTypesetting} (See @ref{Skipping +corrected music})). Bar + @c . {Point and click} @node Point and click diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely index fc88448dd4..c4690beb7a 100644 --- a/Documentation/user/tutorial.itely +++ b/Documentation/user/tutorial.itely @@ -1042,7 +1042,7 @@ note have real pitch @code{g'}. The @code{8} represents an eight note. @end example Two more notes, with pitch @code{a} and @code{b}. Because their duration is the same as the @code{g,8}, there is no need to enter the -duration, but you may enter it anyway, i.e., @code{a4 b4} +duration, but you may enter it anyway, i.e., @code{a8 b8} @separate @example diff --git a/GNUmakefile.in b/GNUmakefile.in index 1d8180ac5e..9b7cdd7ed3 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -20,7 +20,7 @@ SCRIPTS = configure aclocal.m4 README_FILES = ChangeLog CHANGES COPYING DEDICATION NEWS README.mandrake ROADMAP README_TXT_FILES = AUTHORS.txt README.txt INSTALL.txt FAQ.txt IN_FILES := $(wildcard *.in) -EXTRA_DIST_FILES = lilypond-font-lock.el lilypond-mode.el lilypond-init.el vimrc VERSION $(README_FILES) $(SCRIPTS) $(IN_FILES) emacsclient.patch lexer-gcc-3.0.patch .cvsignore +EXTRA_DIST_FILES = $(wildcard *.el) vimrc VERSION $(README_FILES) $(SCRIPTS) $(IN_FILES) emacsclient.patch lexer-gcc-3.0.patch .cvsignore NON_ESSENTIAL_DIST_FILES = $(README_TXT_FILES) INSTALLATION_DIR=$(datadir) INSTALLATION_FILES=$(configuration) VERSION diff --git a/VERSION b/VERSION index 5baf504c7f..5577b6f77f 100644 --- a/VERSION +++ b/VERSION @@ -1,8 +1,8 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=5 -PATCH_LEVEL=28 -MY_PATCH_LEVEL=jcn1 +PATCH_LEVEL=29 +MY_PATCH_LEVEL= # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/input/regression/note-head-style.ly b/input/regression/note-head-style.ly index 74db83b406..cd6d7f05f6 100644 --- a/input/regression/note-head-style.ly +++ b/input/regression/note-head-style.ly @@ -11,7 +11,7 @@ either up or down stems. " } -\score { \notes \relative c''{ +\score { \notes \relative c'{ \clef C % \property Voice.Stem \override #'thickness = #5.0 \property Voice.NoteHead \set #'style = #'default c4 c2 c8 c16 c16 c1 c\breve b4 b2 b8 b16 b16 b1 b\breve \break @@ -23,6 +23,8 @@ c4 c2 c8 c16 c16 c1 c\breve b4 b2 b8 b16 b16 b1 b\breve \break c4 c2 c8 c16 c16 c1 c\breve b4 b2 b8 b16 b16 b1 b\breve \break \property Voice.NoteHead \set #'style = #'xcircle c4 c2 c8 c16 c16 c1 c\breve b4 b2 b8 b16 b16 b1 b\breve \break +\property Voice.NoteHead \set #'style = #'triangle +c4 c2 c8 c16 c16 c1 c\breve b4 b2 b8 b16 b16 b1 b\breve \break \property Voice.NoteHead \set #'style = #'slash c4 c2 c8 c16 c16 c1 c\breve b4 b2 b8 b16 b16 b1 b\breve \break \property Voice.NoteHead \set #'style = #'mensural diff --git a/input/test/ancient-font.ly b/input/test/ancient-font.ly index 33e234db23..af95e9305a 100644 --- a/input/test/ancient-font.ly +++ b/input/test/ancient-font.ly @@ -41,7 +41,7 @@ upperVoice = \context Staff = upperVoice < % \property Staff.clefOctavation = #0 \clef "vaticana_do2" - \property Voice.NoteHead \override #'style = #'vaticana_subbipunctum + \property Voice.NoteHead \override #'style = #'vaticana_inclinatum a! b! \property Staff.BarLine \override #'bar-size = #3.0 \bar "|" \property Voice.NoteHead \override #'style = #'vaticana_virga diff --git a/lily/a2-engraver.cc b/lily/a2-engraver.cc index 39a6a9ff3a..a08d9e0765 100644 --- a/lily/a2-engraver.cc +++ b/lily/a2-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2001 Jan Nieuwenhuizen + (c) 2000--2002 Jan Nieuwenhuizen */ #include "engraver.hh" diff --git a/lily/accidental-engraver.cc b/lily/accidental-engraver.cc index 016832382b..ee82be6f1c 100644 --- a/lily/accidental-engraver.cc +++ b/lily/accidental-engraver.cc @@ -1,7 +1,7 @@ /* accidental-engraver.cc -- implement accidental_engraver - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys Modified 2001 by Rune Zedeler */ diff --git a/lily/afm.cc b/lily/afm.cc index 9516115587..4485349e29 100644 --- a/lily/afm.cc +++ b/lily/afm.cc @@ -3,7 +3,7 @@ source file of the Flower Library - (c) 2000--2001 Han-Wen Nienhuys + (c) 2000--2002 Han-Wen Nienhuys */ #include "afm.hh" diff --git a/lily/align-interface.cc b/lily/align-interface.cc index c8ef6c9f4e..15f8ec254b 100644 --- a/lily/align-interface.cc +++ b/lily/align-interface.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2001 Han-Wen Nienhuys + (c) 2000--2002 Han-Wen Nienhuys */ diff --git a/lily/all-font-metrics.cc b/lily/all-font-metrics.cc index b198384426..91fcbcf3de 100644 --- a/lily/all-font-metrics.cc +++ b/lily/all-font-metrics.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Han-Wen Nienhuys + (c) 1999--2002 Han-Wen Nienhuys */ diff --git a/lily/arpeggio-engraver.cc b/lily/arpeggio-engraver.cc index 5a0a67ca1b..d280240411 100644 --- a/lily/arpeggio-engraver.cc +++ b/lily/arpeggio-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2001 Jan Nieuwenhuizen + (c) 2000--2002 Jan Nieuwenhuizen */ #include "engraver.hh" diff --git a/lily/arpeggio.cc b/lily/arpeggio.cc index 931030a16c..73340a4e0f 100644 --- a/lily/arpeggio.cc +++ b/lily/arpeggio.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2001 Jan Nieuwenhuizen + (c) 2000--2002 Jan Nieuwenhuizen */ #include "molecule.hh" diff --git a/lily/audio-column.cc b/lily/audio-column.cc index 59d5730d33..2e176ac50b 100644 --- a/lily/audio-column.cc +++ b/lily/audio-column.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Jan Nieuwenhuizen + (c) 1997--2002 Jan Nieuwenhuizen */ #include "audio-column.hh" diff --git a/lily/audio-element-info.cc b/lily/audio-element-info.cc index b3505fb882..fcd1073e14 100644 --- a/lily/audio-element-info.cc +++ b/lily/audio-element-info.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #include "audio-element-info.hh" diff --git a/lily/audio-element.cc b/lily/audio-element.cc index 6de8b5f247..3c9712680e 100644 --- a/lily/audio-element.cc +++ b/lily/audio-element.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #include "audio-element.hh" diff --git a/lily/audio-item.cc b/lily/audio-item.cc index a35f1b42cf..6b5f43dce7 100644 --- a/lily/audio-item.cc +++ b/lily/audio-item.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Jan Nieuwenhuizen + (c) 1997--2002 Jan Nieuwenhuizen */ #include "debug.hh" #include "audio-item.hh" diff --git a/lily/audio-staff.cc b/lily/audio-staff.cc index f89ebd62d4..73bb4e8ebc 100644 --- a/lily/audio-staff.cc +++ b/lily/audio-staff.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Jan Nieuwenhuizen + (c) 1997--2002 Jan Nieuwenhuizen */ #include "audio-staff.hh" diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc index 54ac1c8ead..e17e98d2e1 100644 --- a/lily/auto-beam-engraver.cc +++ b/lily/auto-beam-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Jan Nieuwenhuizen + (c) 1999--2002 Jan Nieuwenhuizen */ diff --git a/lily/auto-change-iterator.cc b/lily/auto-change-iterator.cc index 59cad0bc07..c0879f90a9 100644 --- a/lily/auto-change-iterator.cc +++ b/lily/auto-change-iterator.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Han-Wen Nienhuys + (c) 1999--2002 Han-Wen Nienhuys */ diff --git a/lily/axis-group-engraver.cc b/lily/axis-group-engraver.cc index e030e09b4b..260742c627 100644 --- a/lily/axis-group-engraver.cc +++ b/lily/axis-group-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Han-Wen Nienhuys + (c) 1999--2002 Han-Wen Nienhuys */ #include "spanner.hh" diff --git a/lily/axis-group-interface.cc b/lily/axis-group-interface.cc index 85e21bda28..d7074ef3a4 100644 --- a/lily/axis-group-interface.cc +++ b/lily/axis-group-interface.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2001 Han-Wen Nienhuys + (c) 2000--2002 Han-Wen Nienhuys */ #include "hara-kiri-group-spanner.hh" diff --git a/lily/bar-check-iterator.cc b/lily/bar-check-iterator.cc index bfcaf62327..bc01898832 100644 --- a/lily/bar-check-iterator.cc +++ b/lily/bar-check-iterator.cc @@ -4,7 +4,7 @@ source file of the GNU LilyPond music typesetter - (c) 2001 Han-Wen Nienhuys + (c) 2001--2002 Han-Wen Nienhuys */ diff --git a/lily/bar-engraver.cc b/lily/bar-engraver.cc index 3e4c5f58d4..cb9c6e216a 100644 --- a/lily/bar-engraver.cc +++ b/lily/bar-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys Jan Nieuwenhuizen */ diff --git a/lily/bar-number-engraver.cc b/lily/bar-number-engraver.cc index b6226d176d..3ab788c928 100644 --- a/lily/bar-number-engraver.cc +++ b/lily/bar-number-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ diff --git a/lily/bar.cc b/lily/bar.cc index 497af0fa3a..7ad1f12693 100644 --- a/lily/bar.cc +++ b/lily/bar.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #include @@ -53,8 +53,9 @@ Bar::compound_barline (Grob*me, String str, Real h) Real fatline = gh_scm2double (me->get_grob_property ("thick-thickness")); Real staffline = me->paper_l ()->get_var ("stafflinethickness"); + Real staff_space = Staff_symbol_referencer::staff_space (me); Real staffspace = me->paper_l ()->get_var ("staffspace") - * Staff_symbol_referencer::staff_space (me); + * staff_space; kern *= staffline; thinkern *= staffline; @@ -65,7 +66,8 @@ Bar::compound_barline (Grob*me, String str, Real h) Molecule thick = simple_barline (me, fatline, h); Molecule colon; Molecule dot = Font_interface::get_default_font (me)->find_by_name ("dots-dot"); - Real dist = (2-(Staff_symbol_referencer::line_count (me) & 1))*staffspace; + Real dist = ( Staff_symbol_referencer::line_count (me) & 1 ? 1 : + staff_space<2 ? 2 : .5 ) * staffspace; dot.translate_axis(dist/2,Y_AXIS); colon.add_molecule(dot); dot.translate_axis(-dist,Y_AXIS); diff --git a/lily/beam-engraver.cc b/lily/beam-engraver.cc index f457e4cebe..9ebcd6ea26 100644 --- a/lily/beam-engraver.cc +++ b/lily/beam-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2001 Han-Wen Nienhuys + (c) 1998--2002 Han-Wen Nienhuys */ #include "engraver-group-engraver.hh" diff --git a/lily/beam.cc b/lily/beam.cc index 3c12f0053f..019f985151 100644 --- a/lily/beam.cc +++ b/lily/beam.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys Jan Nieuwenhuizen */ diff --git a/lily/beaming-info.cc b/lily/beaming-info.cc index 9eaed37763..c9751f049b 100644 --- a/lily/beaming-info.cc +++ b/lily/beaming-info.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Han-Wen Nienhuys + (c) 1999--2002 Han-Wen Nienhuys */ diff --git a/lily/bezier-bow.cc b/lily/bezier-bow.cc index b98b613c1e..c0a87c1552 100644 --- a/lily/bezier-bow.cc +++ b/lily/bezier-bow.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2001 Jan Nieuwenhuizen + (c) 1998--2002 Jan Nieuwenhuizen */ #include diff --git a/lily/bezier.cc b/lily/bezier.cc index edc53318fe..6d22b1d6b6 100644 --- a/lily/bezier.cc +++ b/lily/bezier.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2001 Jan Nieuwenhuizen + (c) 1998--2002 Jan Nieuwenhuizen */ #include diff --git a/lily/box.cc b/lily/box.cc index eb31e83110..03be5e9a0a 100644 --- a/lily/box.cc +++ b/lily/box.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2001 Han-Wen Nienhuys + (c) 1996--2002 Han-Wen Nienhuys */ #include "box.hh" diff --git a/lily/break-algorithm.cc b/lily/break-algorithm.cc index ca9007b926..e14cdcdb4a 100644 --- a/lily/break-algorithm.cc +++ b/lily/break-algorithm.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2001 Han-Wen Nienhuys + (c) 1996--2002 Han-Wen Nienhuys */ #include "paper-column.hh" diff --git a/lily/break-align-engraver.cc b/lily/break-align-engraver.cc index 6cafa97a58..fbe2bdcf40 100644 --- a/lily/break-align-engraver.cc +++ b/lily/break-align-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Han-Wen Nienhuys + (c) 1999--2002 Han-Wen Nienhuys */ #include "engraver.hh" diff --git a/lily/break-align-item.cc b/lily/break-align-item.cc index 69ed53ecf3..fece962363 100644 --- a/lily/break-align-item.cc +++ b/lily/break-align-item.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ diff --git a/lily/change-iterator.cc b/lily/change-iterator.cc index 727cb9b681..ac4b81f787 100644 --- a/lily/change-iterator.cc +++ b/lily/change-iterator.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #include "change-iterator.hh" diff --git a/lily/chord-name-engraver.cc b/lily/chord-name-engraver.cc index 0a78017c8f..cfa35c2621 100644 --- a/lily/chord-name-engraver.cc +++ b/lily/chord-name-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2001 Jan Nieuwenhuizen + (c) 1998--2002 Jan Nieuwenhuizen */ #include "engraver.hh" diff --git a/lily/chord-name.cc b/lily/chord-name.cc index 1cf1cc0a0c..4ddf833c21 100644 --- a/lily/chord-name.cc +++ b/lily/chord-name.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Jan Nieuwenhuizen + (c) 1999--2002 Jan Nieuwenhuizen */ #include "chord-name.hh" diff --git a/lily/chord-tremolo-engraver.cc b/lily/chord-tremolo-engraver.cc index d3ff4fa692..98c42bb9f4 100644 --- a/lily/chord-tremolo-engraver.cc +++ b/lily/chord-tremolo-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2001 Han-Wen Nienhuys + (c) 2000--2002 Han-Wen Nienhuys */ diff --git a/lily/chord-tremolo-iterator.cc b/lily/chord-tremolo-iterator.cc index 2556751e84..e512cda4d9 100644 --- a/lily/chord-tremolo-iterator.cc +++ b/lily/chord-tremolo-iterator.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2001 Han-Wen Nienhuys + (c) 2000--2002 Han-Wen Nienhuys */ diff --git a/lily/chord.cc b/lily/chord.cc index 82bfc297d7..908d8f4432 100644 --- a/lily/chord.cc +++ b/lily/chord.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Jan Nieuwenhuizen + (c) 1999--2002 Jan Nieuwenhuizen */ #include "chord.hh" diff --git a/lily/clef-engraver.cc b/lily/clef-engraver.cc index 6a4646f6cd..92dab534a1 100644 --- a/lily/clef-engraver.cc +++ b/lily/clef-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys , + (c) 1997--2002 Han-Wen Nienhuys , Mats Bengtsson */ diff --git a/lily/clef-item.cc b/lily/clef-item.cc index b1c38317cc..b1cde0874f 100644 --- a/lily/clef-item.cc +++ b/lily/clef-item.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ diff --git a/lily/collision-engraver.cc b/lily/collision-engraver.cc index 379fde5e16..33ad2b1505 100644 --- a/lily/collision-engraver.cc +++ b/lily/collision-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #include "note-column.hh" diff --git a/lily/collision.cc b/lily/collision.cc index 288b2a2fa0..7ae57a8ec6 100644 --- a/lily/collision.cc +++ b/lily/collision.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #include "debug.hh" diff --git a/lily/column-x-positions.cc b/lily/column-x-positions.cc index 8f9067d4fa..b84a7f1ae5 100644 --- a/lily/column-x-positions.cc +++ b/lily/column-x-positions.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #include "column-x-positions.hh" diff --git a/lily/command-request.cc b/lily/command-request.cc index 6bf73e3657..62cbac4fa3 100644 --- a/lily/command-request.cc +++ b/lily/command-request.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #include "command-request.hh" diff --git a/lily/completion-note-heads-engraver.cc b/lily/completion-note-heads-engraver.cc index 6d1157560d..edf7677141 100644 --- a/lily/completion-note-heads-engraver.cc +++ b/lily/completion-note-heads-engraver.cc @@ -1,7 +1,7 @@ /* head-grav.cc -- part of GNU LilyPond - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #include diff --git a/lily/context-specced-music.cc b/lily/context-specced-music.cc index f0373b2dca..620c2e4a39 100644 --- a/lily/context-specced-music.cc +++ b/lily/context-specced-music.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Han-Wen Nienhuys + (c) 1999--2002 Han-Wen Nienhuys */ #include "context-specced-music.hh" diff --git a/lily/cxx-function-smob.cc b/lily/cxx-function-smob.cc index b17c4cb38a..0c4f04aeef 100644 --- a/lily/cxx-function-smob.cc +++ b/lily/cxx-function-smob.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2001 Han-Wen Nienhuys + (c) 2000--2002 Han-Wen Nienhuys */ diff --git a/lily/dimension-cache.cc b/lily/dimension-cache.cc index f92c7e4f68..f3d0226bb4 100644 --- a/lily/dimension-cache.cc +++ b/lily/dimension-cache.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2001 Han-Wen Nienhuys + (c) 1998--2002 Han-Wen Nienhuys */ #include #include "warn.hh" diff --git a/lily/directional-element-interface.cc b/lily/directional-element-interface.cc index b65fe31582..aadc62a4db 100644 --- a/lily/directional-element-interface.cc +++ b/lily/directional-element-interface.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Han-Wen Nienhuys + (c) 1999--2002 Han-Wen Nienhuys */ diff --git a/lily/dot-column-engraver.cc b/lily/dot-column-engraver.cc index f36be6ed05..8233c3ec0b 100644 --- a/lily/dot-column-engraver.cc +++ b/lily/dot-column-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2001 Han-Wen Nienhuys + (c) 1998--2002 Han-Wen Nienhuys */ diff --git a/lily/dot-column.cc b/lily/dot-column.cc index fc6edcb963..a91ffc5f8f 100644 --- a/lily/dot-column.cc +++ b/lily/dot-column.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #include "dots.hh" diff --git a/lily/dots.cc b/lily/dots.cc index 2f8202a465..1805de4cd1 100644 --- a/lily/dots.cc +++ b/lily/dots.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #include "dots.hh" diff --git a/lily/duration.cc b/lily/duration.cc index f6ffb9145b..d04491af59 100644 --- a/lily/duration.cc +++ b/lily/duration.cc @@ -3,7 +3,7 @@ source file of the LilyPond music typesetter - (c) 1997--2001 Jan Nieuwenhuizen + (c) 1997--2002 Jan Nieuwenhuizen Han-Wen Nienhuys */ diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc index 3241671974..a021d21fdf 100644 --- a/lily/dynamic-engraver.cc +++ b/lily/dynamic-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #include "debug.hh" #include "dimensions.hh" diff --git a/lily/engraver-group-engraver.cc b/lily/engraver-group-engraver.cc index e1c251152d..b30a854d16 100644 --- a/lily/engraver-group-engraver.cc +++ b/lily/engraver-group-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #include "flower-proto.hh" diff --git a/lily/engraver.cc b/lily/engraver.cc index 90027d1309..55929a854b 100644 --- a/lily/engraver.cc +++ b/lily/engraver.cc @@ -3,7 +3,7 @@ Sourcefile of GNU LilyPond music type setter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #include "music.hh" diff --git a/lily/fingering-engraver.cc b/lily/fingering-engraver.cc index ec516bb2af..4adba9d571 100644 --- a/lily/fingering-engraver.cc +++ b/lily/fingering-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2001 Han-Wen Nienhuys + (c) 1998--2002 Han-Wen Nienhuys */ diff --git a/lily/folded-repeat-iterator.cc b/lily/folded-repeat-iterator.cc index 58b1decf54..ec30d1b548 100644 --- a/lily/folded-repeat-iterator.cc +++ b/lily/folded-repeat-iterator.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Han-Wen Nienhuys + (c) 1999--2002 Han-Wen Nienhuys */ diff --git a/lily/font-interface.cc b/lily/font-interface.cc index ec7fa8ffa7..79e9f9e38d 100644 --- a/lily/font-interface.cc +++ b/lily/font-interface.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2001 Han-Wen Nienhuys + (c) 2000--2002 Han-Wen Nienhuys */ diff --git a/lily/font-metric.cc b/lily/font-metric.cc index 0fcf96fc11..11f63489e8 100644 --- a/lily/font-metric.cc +++ b/lily/font-metric.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Han-Wen Nienhuys + (c) 1999--2002 Han-Wen Nienhuys Mats Bengtsson (the ugly TeX parsing in text_dimension) */ diff --git a/lily/font-size-engraver.cc b/lily/font-size-engraver.cc index a8554d4453..6ca9eea7ca 100644 --- a/lily/font-size-engraver.cc +++ b/lily/font-size-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2001 Han-Wen Nienhuys + (c) 2001--2002 Han-Wen Nienhuys */ diff --git a/lily/global-ctor.cc b/lily/global-ctor.cc index 27ab068d09..da204ebd86 100644 --- a/lily/global-ctor.cc +++ b/lily/global-ctor.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Han-Wen Nienhuys + (c) 1999--2002 Han-Wen Nienhuys */ #include "global-ctor.hh" diff --git a/lily/global-translator.cc b/lily/global-translator.cc index 7ca91a5ad3..a7fb3e0c3c 100644 --- a/lily/global-translator.cc +++ b/lily/global-translator.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #include "debug.hh" diff --git a/lily/gourlay-breaking.cc b/lily/gourlay-breaking.cc index 4c9ef7c9fa..96728b602a 100644 --- a/lily/gourlay-breaking.cc +++ b/lily/gourlay-breaking.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #include // rint diff --git a/lily/grace-iterator.cc b/lily/grace-iterator.cc index 8357e2c3ad..1b5053fa92 100644 --- a/lily/grace-iterator.cc +++ b/lily/grace-iterator.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Han-Wen Nienhuys + (c) 1999--2002 Han-Wen Nienhuys */ diff --git a/lily/grace-music.cc b/lily/grace-music.cc index 8fd0ff0d0b..3aea71c706 100644 --- a/lily/grace-music.cc +++ b/lily/grace-music.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Han-Wen Nienhuys + (c) 1999--2002 Han-Wen Nienhuys */ diff --git a/lily/grob-info.cc b/lily/grob-info.cc index e1d60b3195..93fb16aeee 100644 --- a/lily/grob-info.cc +++ b/lily/grob-info.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #include "grob-info.hh" diff --git a/lily/grob-pitch-tuple.cc b/lily/grob-pitch-tuple.cc index 9ffca254b7..0fa7d34b31 100644 --- a/lily/grob-pitch-tuple.cc +++ b/lily/grob-pitch-tuple.cc @@ -3,7 +3,7 @@ grob-pitch-tuple.cc -- implement Grob_pitch_tuple source file of the GNU LilyPond music typesetter -(c) 2001 Han-Wen Nienhuys +(c) 2001--2002 Han-Wen Nienhuys */ #include "grob-pitch-tuple.hh" diff --git a/lily/grob-pq-engraver.cc b/lily/grob-pq-engraver.cc index fad29ac48d..ff23b793e2 100644 --- a/lily/grob-pq-engraver.cc +++ b/lily/grob-pq-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2001 Han-Wen Nienhuys + (c) 2001--2002 Han-Wen Nienhuys */ #include "translator-group.hh" diff --git a/lily/grob.cc b/lily/grob.cc index c579990a7e..a9c4766658 100644 --- a/lily/grob.cc +++ b/lily/grob.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ diff --git a/lily/group-interface.cc b/lily/group-interface.cc index 092170d606..9bb660cb6c 100644 --- a/lily/group-interface.cc +++ b/lily/group-interface.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Han-Wen Nienhuys + (c) 1999--2002 Han-Wen Nienhuys */ #include "group-interface.hh" diff --git a/lily/hairpin.cc b/lily/hairpin.cc index 798c0c285d..d0e78f6289 100644 --- a/lily/hairpin.cc +++ b/lily/hairpin.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #include "molecule.hh" diff --git a/lily/hara-kiri-group-spanner.cc b/lily/hara-kiri-group-spanner.cc index 50dd0dbc2e..a8a2d938ae 100644 --- a/lily/hara-kiri-group-spanner.cc +++ b/lily/hara-kiri-group-spanner.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2001 Jan Nieuwenhuizen + (c) 1998--2002 Jan Nieuwenhuizen Han-Wen Nienhuys */ diff --git a/lily/includable-lexer.cc b/lily/includable-lexer.cc index 7da0ba4974..067057b5eb 100644 --- a/lily/includable-lexer.cc +++ b/lily/includable-lexer.cc @@ -3,7 +3,7 @@ source file of the LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #include diff --git a/lily/include/afm.hh b/lily/include/afm.hh index 2f8b07ae02..5679d83279 100644 --- a/lily/include/afm.hh +++ b/lily/include/afm.hh @@ -4,7 +4,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2001 Han-Wen Nienhuys + (c) 1998--2002 Han-Wen Nienhuys */ diff --git a/lily/include/align-interface.hh b/lily/include/align-interface.hh index d7294b990a..b2ebee3b7d 100644 --- a/lily/include/align-interface.hh +++ b/lily/include/align-interface.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2001 Han-Wen Nienhuys + (c) 2000--2002 Han-Wen Nienhuys */ diff --git a/lily/include/all-font-metrics.hh b/lily/include/all-font-metrics.hh index fb32f70ec7..2a3144d0dc 100644 --- a/lily/include/all-font-metrics.hh +++ b/lily/include/all-font-metrics.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2001 Han-Wen Nienhuys + (c) 1998--2002 Han-Wen Nienhuys */ diff --git a/lily/include/arpeggio.hh b/lily/include/arpeggio.hh index 0ae3ccbb13..d397abcfed 100644 --- a/lily/include/arpeggio.hh +++ b/lily/include/arpeggio.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2001 Jan Nieuwenhuizen + (c) 2000--2002 Jan Nieuwenhuizen */ #ifndef ARPEGGIO_HH diff --git a/lily/include/audio-column.hh b/lily/include/audio-column.hh index 4c5b73cb3d..89cfb4ce62 100644 --- a/lily/include/audio-column.hh +++ b/lily/include/audio-column.hh @@ -1,7 +1,7 @@ /* audio-column.hh -- declare Audio_column - (c) 1997--2001 Jan Nieuwenhuizen + (c) 1997--2002 Jan Nieuwenhuizen */ #ifndef AUDIO_COLUMN_HH diff --git a/lily/include/audio-element-info.hh b/lily/include/audio-element-info.hh index e42d4ceeed..be38ba8014 100644 --- a/lily/include/audio-element-info.hh +++ b/lily/include/audio-element-info.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Han-Wen Nienhuys + (c) 1999--2002 Han-Wen Nienhuys */ diff --git a/lily/include/audio-element.hh b/lily/include/audio-element.hh index 21cae00272..5eadcdbec3 100644 --- a/lily/include/audio-element.hh +++ b/lily/include/audio-element.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ diff --git a/lily/include/audio-item.hh b/lily/include/audio-item.hh index 7b07610895..b8acab77c0 100644 --- a/lily/include/audio-item.hh +++ b/lily/include/audio-item.hh @@ -1,7 +1,7 @@ /* audio-item.hh -- declare Audio_items - (c) 1996--2001 Jan Nieuwenhuizen + (c) 1996--2002 Jan Nieuwenhuizen */ #ifndef AUDIO_ITEM_HH diff --git a/lily/include/audio-staff.hh b/lily/include/audio-staff.hh index 23aa6e4b57..1e48087048 100644 --- a/lily/include/audio-staff.hh +++ b/lily/include/audio-staff.hh @@ -1,7 +1,7 @@ /* audio-staff.hh -- declare Audio_staff - (c) 1996--2001 Jan Nieuwenhuizen + (c) 1996--2002 Jan Nieuwenhuizen */ #ifndef AUDIO_STAFF_HH diff --git a/lily/include/auto-change-iterator.hh b/lily/include/auto-change-iterator.hh index 536da00e82..cc54df7dd2 100644 --- a/lily/include/auto-change-iterator.hh +++ b/lily/include/auto-change-iterator.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Han-Wen Nienhuys + (c) 1999--2002 Han-Wen Nienhuys */ diff --git a/lily/include/axis-group-interface.hh b/lily/include/axis-group-interface.hh index 33306c15c1..ed9f991cfb 100644 --- a/lily/include/axis-group-interface.hh +++ b/lily/include/axis-group-interface.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2001 Han-Wen Nienhuys + (c) 2000--2002 Han-Wen Nienhuys */ diff --git a/lily/include/bar.hh b/lily/include/bar.hh index b83bc935e3..5132040ae7 100644 --- a/lily/include/bar.hh +++ b/lily/include/bar.hh @@ -1,7 +1,7 @@ /* bar.hh -- part of GNU LilyPond - (c) 1996--2001 Han-Wen Nienhuys + (c) 1996--2002 Han-Wen Nienhuys */ #ifndef BAR_HH diff --git a/lily/include/beam.hh b/lily/include/beam.hh index 36ad55aec7..eba0901fbe 100644 --- a/lily/include/beam.hh +++ b/lily/include/beam.hh @@ -1,7 +1,7 @@ /* beam.hh -- part of GNU LilyPond - (c) 1996--2001 Han-Wen Nienhuys + (c) 1996--2002 Han-Wen Nienhuys */ #ifndef BEAM_HH diff --git a/lily/include/beaming.hh b/lily/include/beaming.hh index e577f604a9..ab3c4222bc 100644 --- a/lily/include/beaming.hh +++ b/lily/include/beaming.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Han-Wen Nienhuys + (c) 1999--2002 Han-Wen Nienhuys */ diff --git a/lily/include/bezier-bow.hh b/lily/include/bezier-bow.hh index db32ad1d43..c28c6b83c1 100644 --- a/lily/include/bezier-bow.hh +++ b/lily/include/bezier-bow.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Han-Wen Nienhuys + (c) 1999--2002 Han-Wen Nienhuys */ diff --git a/lily/include/bezier.hh b/lily/include/bezier.hh index 318110c742..5a960c4810 100644 --- a/lily/include/bezier.hh +++ b/lily/include/bezier.hh @@ -1,7 +1,7 @@ /* bezier.hh -- declare Bezier and Bezier_bow - (c) 1998--2001 Jan Nieuwenhuizen + (c) 1998--2002 Jan Nieuwenhuizen */ #ifndef BEZIER_HH diff --git a/lily/include/break-algorithm.hh b/lily/include/break-algorithm.hh index c91a00bdaf..da181cceaf 100644 --- a/lily/include/break-algorithm.hh +++ b/lily/include/break-algorithm.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2001 Han-Wen Nienhuys + (c) 1996--2002 Han-Wen Nienhuys */ diff --git a/lily/include/break-align-item.hh b/lily/include/break-align-item.hh index 5321469df9..5dc37f7841 100644 --- a/lily/include/break-align-item.hh +++ b/lily/include/break-align-item.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ diff --git a/lily/include/change-iterator.hh b/lily/include/change-iterator.hh index d98488dc4a..65914db996 100644 --- a/lily/include/change-iterator.hh +++ b/lily/include/change-iterator.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ diff --git a/lily/include/chord-name.hh b/lily/include/chord-name.hh index 1374ea192a..3cf2ac1237 100644 --- a/lily/include/chord-name.hh +++ b/lily/include/chord-name.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Jan Nieuwenhuizen + (c) 1999--2002 Jan Nieuwenhuizen */ #ifndef CHORD_NAME_HH diff --git a/lily/include/chord-tremolo-iterator.hh b/lily/include/chord-tremolo-iterator.hh index 90e3bc23e2..fe35294b9b 100644 --- a/lily/include/chord-tremolo-iterator.hh +++ b/lily/include/chord-tremolo-iterator.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2001 Han-Wen Nienhuys + (c) 2000--2002 Han-Wen Nienhuys */ diff --git a/lily/include/chord.hh b/lily/include/chord.hh index e60fe80483..f9bee640a1 100644 --- a/lily/include/chord.hh +++ b/lily/include/chord.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Jan Nieuwenhuizen + (c) 1999--2002 Jan Nieuwenhuizen */ #ifndef CHORD_HH diff --git a/lily/include/clef.hh b/lily/include/clef.hh index 85be436897..7885205e7e 100644 --- a/lily/include/clef.hh +++ b/lily/include/clef.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2001 Han-Wen Nienhuys + (c) 2000--2002 Han-Wen Nienhuys */ diff --git a/lily/include/collision.hh b/lily/include/collision.hh index 712fe371f9..068f818e18 100644 --- a/lily/include/collision.hh +++ b/lily/include/collision.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ diff --git a/lily/include/column-x-positions.hh b/lily/include/column-x-positions.hh index 830fa867ab..23e27419f8 100644 --- a/lily/include/column-x-positions.hh +++ b/lily/include/column-x-positions.hh @@ -1,7 +1,7 @@ /* column-x-positions.hh -- part of GNU LilyPond - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #ifndef COLUMN_X_POSITIONS_HH diff --git a/lily/include/command-request.hh b/lily/include/command-request.hh index 8a1fe19278..204e93fbd6 100644 --- a/lily/include/command-request.hh +++ b/lily/include/command-request.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ diff --git a/lily/include/context-specced-music.hh b/lily/include/context-specced-music.hh index c68cb9e2c0..e1ca431fcf 100644 --- a/lily/include/context-specced-music.hh +++ b/lily/include/context-specced-music.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Han-Wen Nienhuys + (c) 1999--2002 Han-Wen Nienhuys */ diff --git a/lily/include/cxx-function-smob.hh b/lily/include/cxx-function-smob.hh index 4f0b09a32f..9a99f19848 100644 --- a/lily/include/cxx-function-smob.hh +++ b/lily/include/cxx-function-smob.hh @@ -2,7 +2,7 @@ cxx-function-smob.hh -- source file of the GNU LilyPond music typesetter - (c) 2000--2001 Han-Wen Nienhuys + (c) 2000--2002 Han-Wen Nienhuys */ diff --git a/lily/include/dimension-cache-callback.hh b/lily/include/dimension-cache-callback.hh index a3186ec4e1..2fc18975dc 100644 --- a/lily/include/dimension-cache-callback.hh +++ b/lily/include/dimension-cache-callback.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2001 Han-Wen Nienhuys + (c) 2000--2002 Han-Wen Nienhuys */ diff --git a/lily/include/dimension-cache.hh b/lily/include/dimension-cache.hh index a671878f43..8897dc6fd4 100644 --- a/lily/include/dimension-cache.hh +++ b/lily/include/dimension-cache.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2001 Han-Wen Nienhuys + (c) 1998--2002 Han-Wen Nienhuys */ diff --git a/lily/include/directional-element-interface.hh b/lily/include/directional-element-interface.hh index 233e3d9e44..521062a4a7 100644 --- a/lily/include/directional-element-interface.hh +++ b/lily/include/directional-element-interface.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Han-Wen Nienhuys + (c) 1999--2002 Han-Wen Nienhuys */ diff --git a/lily/include/dot-column.hh b/lily/include/dot-column.hh index 65eb4c5a75..d0319c1539 100644 --- a/lily/include/dot-column.hh +++ b/lily/include/dot-column.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ diff --git a/lily/include/dots.hh b/lily/include/dots.hh index 1f293a9fa3..105c61edf4 100644 --- a/lily/include/dots.hh +++ b/lily/include/dots.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ diff --git a/lily/include/duration.hh b/lily/include/duration.hh index b1ce594db5..bab00a6782 100644 --- a/lily/include/duration.hh +++ b/lily/include/duration.hh @@ -3,7 +3,7 @@ source file of the LilyPond music typesetter - (c) 1997--2001 Jan Nieuwenhuizen + (c) 1997--2002 Jan Nieuwenhuizen */ diff --git a/lily/include/engraver-group-engraver.hh b/lily/include/engraver-group-engraver.hh index fb1f87141f..33d766d7ea 100644 --- a/lily/include/engraver-group-engraver.hh +++ b/lily/include/engraver-group-engraver.hh @@ -4,7 +4,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ diff --git a/lily/include/engraver.hh b/lily/include/engraver.hh index b4b7eec069..be00c3b1f5 100644 --- a/lily/include/engraver.hh +++ b/lily/include/engraver.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2001 Han-Wen Nienhuys + (c) 1996--2002 Han-Wen Nienhuys */ diff --git a/lily/include/file-results.hh b/lily/include/file-results.hh index 3474c2f0f8..7f9e98b1b0 100644 --- a/lily/include/file-results.hh +++ b/lily/include/file-results.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2001 Han-Wen Nienhuys + (c) 1998--2002 Han-Wen Nienhuys */ diff --git a/lily/include/folded-repeat-iterator.hh b/lily/include/folded-repeat-iterator.hh index 5bafa50d5d..5c88ca7dff 100644 --- a/lily/include/folded-repeat-iterator.hh +++ b/lily/include/folded-repeat-iterator.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Han-Wen Nienhuys + (c) 1999--2002 Han-Wen Nienhuys */ diff --git a/lily/include/font-interface.hh b/lily/include/font-interface.hh index 03aa03898c..d377b4d1ff 100644 --- a/lily/include/font-interface.hh +++ b/lily/include/font-interface.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2001 Han-Wen Nienhuys + (c) 2000--2002 Han-Wen Nienhuys */ diff --git a/lily/include/font-metric.hh b/lily/include/font-metric.hh index d3ae05da69..e9f5598ece 100644 --- a/lily/include/font-metric.hh +++ b/lily/include/font-metric.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Han-Wen Nienhuys + (c) 1999--2002 Han-Wen Nienhuys */ diff --git a/lily/include/global-ctor.hh b/lily/include/global-ctor.hh index 05f3a2d8c8..a650c7a022 100644 --- a/lily/include/global-ctor.hh +++ b/lily/include/global-ctor.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Han-Wen Nienhuys + (c) 1999--2002 Han-Wen Nienhuys */ diff --git a/lily/include/global-translator.hh b/lily/include/global-translator.hh index 51c125c9c2..ab59e7bf52 100644 --- a/lily/include/global-translator.hh +++ b/lily/include/global-translator.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ diff --git a/lily/include/gourlay-breaking.hh b/lily/include/gourlay-breaking.hh index 6780025903..b9153028c6 100644 --- a/lily/include/gourlay-breaking.hh +++ b/lily/include/gourlay-breaking.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ diff --git a/lily/include/grace-iterator.hh b/lily/include/grace-iterator.hh index 2ed8a81452..b44bc8c41b 100644 --- a/lily/include/grace-iterator.hh +++ b/lily/include/grace-iterator.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Han-Wen Nienhuys + (c) 1999--2002 Han-Wen Nienhuys */ diff --git a/lily/include/grace-music.hh b/lily/include/grace-music.hh index 20c6e873a9..5c70171f69 100644 --- a/lily/include/grace-music.hh +++ b/lily/include/grace-music.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Han-Wen Nienhuys + (c) 1999--2002 Han-Wen Nienhuys */ diff --git a/lily/include/grob-info.hh b/lily/include/grob-info.hh index 578c20730a..17fda7ff0c 100644 --- a/lily/include/grob-info.hh +++ b/lily/include/grob-info.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ diff --git a/lily/include/grob.hh b/lily/include/grob.hh index aa0d1e13ce..9894f53830 100644 --- a/lily/include/grob.hh +++ b/lily/include/grob.hh @@ -1,7 +1,7 @@ /* grob.hh -- declare Grob - (c) 1996-1999--2001 Han-Wen Nienhuys + (c) 1996-1999--2002 Han-Wen Nienhuys */ #ifndef STAFFELEM_HH diff --git a/lily/include/group-interface.hh b/lily/include/group-interface.hh index 5db7948752..64476d0a0a 100644 --- a/lily/include/group-interface.hh +++ b/lily/include/group-interface.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Han-Wen Nienhuys + (c) 1999--2002 Han-Wen Nienhuys */ diff --git a/lily/include/hairpin.hh b/lily/include/hairpin.hh index 64697548eb..7ad6dd95cf 100644 --- a/lily/include/hairpin.hh +++ b/lily/include/hairpin.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ diff --git a/lily/include/hara-kiri-group-spanner.hh b/lily/include/hara-kiri-group-spanner.hh index 1b2f1b30cd..2aa5ffcf5b 100644 --- a/lily/include/hara-kiri-group-spanner.hh +++ b/lily/include/hara-kiri-group-spanner.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2001 Jan Nieuwenhuizen + (c) 1998--2002 Jan Nieuwenhuizen */ diff --git a/lily/include/includable-lexer.hh b/lily/include/includable-lexer.hh index 2bdfff1f47..f7a8342da2 100644 --- a/lily/include/includable-lexer.hh +++ b/lily/include/includable-lexer.hh @@ -3,7 +3,7 @@ source file of the LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ diff --git a/lily/include/input-smob.hh b/lily/include/input-smob.hh index c38c240edf..8f320feef9 100644 --- a/lily/include/input-smob.hh +++ b/lily/include/input-smob.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2001 Han-Wen Nienhuys + (c) 2000--2002 Han-Wen Nienhuys */ diff --git a/lily/include/interpretation-context-handle.hh b/lily/include/interpretation-context-handle.hh index 8b05d48b84..cca37ff5b8 100644 --- a/lily/include/interpretation-context-handle.hh +++ b/lily/include/interpretation-context-handle.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Han-Wen Nienhuys + (c) 1999--2002 Han-Wen Nienhuys */ diff --git a/lily/include/item.hh b/lily/include/item.hh index 5748fea2bb..6c4aa91bba 100644 --- a/lily/include/item.hh +++ b/lily/include/item.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #ifndef ITEM_HH #define ITEM_HH diff --git a/lily/include/key-item.hh b/lily/include/key-item.hh index 47c9bfdfe6..dd48588463 100644 --- a/lily/include/key-item.hh +++ b/lily/include/key-item.hh @@ -1,7 +1,7 @@ /* key-item.hh -- part of GNU LilyPond - (c) 1996--2001 Han-Wen Nienhuys + (c) 1996--2002 Han-Wen Nienhuys */ #ifndef KEYITEM_HH diff --git a/lily/include/keyword.hh b/lily/include/keyword.hh index 8518f958da..f8f9c75bb3 100644 --- a/lily/include/keyword.hh +++ b/lily/include/keyword.hh @@ -1,7 +1,7 @@ /* keyword.hh -- part of GNU LilyPond - (c) 1996--2001 Han-Wen Nienhuys + (c) 1996--2002 Han-Wen Nienhuys */ #ifndef KEYWORD_HH diff --git a/lily/include/kpath.hh b/lily/include/kpath.hh index 02528c3e25..cfa9a24aed 100644 --- a/lily/include/kpath.hh +++ b/lily/include/kpath.hh @@ -3,7 +3,7 @@ kpath.hh -- declare kpath funcs. source file of the GNU LilyPond music typesetter - (c) 2000--2001 Han-Wen Nienhuys + (c) 2000--2002 Han-Wen Nienhuys */ diff --git a/lily/include/least-squares.hh b/lily/include/least-squares.hh index c7172d8e9f..a7a8b14fec 100644 --- a/lily/include/least-squares.hh +++ b/lily/include/least-squares.hh @@ -1,7 +1,7 @@ /* leastsquare.hh -- part of GNU LilyPond - (c) 1996--2001 Han-Wen Nienhuys + (c) 1996--2002 Han-Wen Nienhuys */ #ifndef LEASTSQUARE_HH diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh index 79bf4ca69e..69eda94276 100644 --- a/lily/include/lily-guile.hh +++ b/lily/include/lily-guile.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2001 Jan Nieuwenhuizen + (c) 1998--2002 Jan Nieuwenhuizen */ #ifndef LILY_GUILE_HH diff --git a/lily/include/lily-proto.hh b/lily/include/lily-proto.hh index 20e4444760..b5451eb06f 100644 --- a/lily/include/lily-proto.hh +++ b/lily/include/lily-proto.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #ifndef LILY_PROTO_HH diff --git a/lily/include/lily-version.hh b/lily/include/lily-version.hh index c8326aae13..0319579617 100644 --- a/lily/include/lily-version.hh +++ b/lily/include/lily-version.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Jan Nieuwenhuizen + (c) 1999--2002 Jan Nieuwenhuizen */ diff --git a/lily/include/lilypond-input-version.hh b/lily/include/lilypond-input-version.hh index bfb2f6a72c..ce8e9f0355 100644 --- a/lily/include/lilypond-input-version.hh +++ b/lily/include/lilypond-input-version.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2001 Jan Nieuwenhuizen + (c) 1998--2002 Jan Nieuwenhuizen */ diff --git a/lily/include/line-group-group-engraver.hh b/lily/include/line-group-group-engraver.hh index e6bbe25b7e..b6fb352802 100644 --- a/lily/include/line-group-group-engraver.hh +++ b/lily/include/line-group-group-engraver.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ diff --git a/lily/include/line-of-score.hh b/lily/include/line-of-score.hh index e2c2fc4b73..61a755e347 100644 --- a/lily/include/line-of-score.hh +++ b/lily/include/line-of-score.hh @@ -1,7 +1,7 @@ /* line-of-score.hh -- part of GNU LilyPond - (c) 1996--2001 Han-Wen Nienhuys + (c) 1996--2002 Han-Wen Nienhuys */ #ifndef SCORELINE_HH diff --git a/lily/include/line-spanner.hh b/lily/include/line-spanner.hh index 55db2e711a..997a75dab6 100644 --- a/lily/include/line-spanner.hh +++ b/lily/include/line-spanner.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2001 Jan Nieuwenhuizen + (c) 2000--2002 Jan Nieuwenhuizen */ diff --git a/lily/include/local-key-item.hh b/lily/include/local-key-item.hh index e1372cf175..8a2dd3199c 100644 --- a/lily/include/local-key-item.hh +++ b/lily/include/local-key-item.hh @@ -1,7 +1,7 @@ /* local-key-item.hh -- part of GNU LilyPond - (c) 1996--2001 Han-Wen Nienhuys + (c) 1996--2002 Han-Wen Nienhuys */ #ifndef LOCALKEYITEM_HH diff --git a/lily/include/lookup.hh b/lily/include/lookup.hh index 8f954757df..9fa1ffce02 100644 --- a/lily/include/lookup.hh +++ b/lily/include/lookup.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys Jan Nieuwenhuizen */ diff --git a/lily/include/lyric-combine-music-iterator.hh b/lily/include/lyric-combine-music-iterator.hh index 8544673a21..1dc586da02 100644 --- a/lily/include/lyric-combine-music-iterator.hh +++ b/lily/include/lyric-combine-music-iterator.hh @@ -4,7 +4,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Han-Wen Nienhuys + (c) 1999--2002 Han-Wen Nienhuys */ diff --git a/lily/include/lyric-combine-music.hh b/lily/include/lyric-combine-music.hh index e9711a1d3c..0997839a78 100644 --- a/lily/include/lyric-combine-music.hh +++ b/lily/include/lyric-combine-music.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Han-Wen Nienhuys + (c) 1999--2002 Han-Wen Nienhuys */ diff --git a/lily/include/lyric-extender.hh b/lily/include/lyric-extender.hh index 1b76b715ac..bbab8028a5 100644 --- a/lily/include/lyric-extender.hh +++ b/lily/include/lyric-extender.hh @@ -2,7 +2,7 @@ /* extender-spanner.hh -- part of GNU LilyPond - (c) 1998--2001 Jan Nieuwenhuizen + (c) 1998--2002 Jan Nieuwenhuizen */ #ifndef EXTENDER_SPANNER_HH diff --git a/lily/include/main.hh b/lily/include/main.hh index 7d2f90174f..69cc315faf 100644 --- a/lily/include/main.hh +++ b/lily/include/main.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #ifndef MAIN_HH #define MAIN_HH diff --git a/lily/include/midi-def.hh b/lily/include/midi-def.hh index 9ec3167720..b1233d7aa7 100644 --- a/lily/include/midi-def.hh +++ b/lily/include/midi-def.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Jan Nieuwenhuizen + (c) 1997--2002 Jan Nieuwenhuizen */ diff --git a/lily/include/midi-item.hh b/lily/include/midi-item.hh index f723164f8e..cbf9a6740f 100644 --- a/lily/include/midi-item.hh +++ b/lily/include/midi-item.hh @@ -1,7 +1,7 @@ /* midi-item.hh -- declare Midi items - (c) 1997--2001 Jan Nieuwenhuizen + (c) 1997--2002 Jan Nieuwenhuizen */ #ifndef MIDI_ITEM_HH diff --git a/lily/include/midi-stream.hh b/lily/include/midi-stream.hh index 599b3a2b16..dfca5cc62f 100644 --- a/lily/include/midi-stream.hh +++ b/lily/include/midi-stream.hh @@ -1,7 +1,7 @@ /* midi-stream.hh -- declare Midi_stream - (c) 1997--2001 Jan Nieuwenhuizen + (c) 1997--2002 Jan Nieuwenhuizen */ #ifndef MIDI_STREAM_HH diff --git a/lily/include/midi-walker.hh b/lily/include/midi-walker.hh index 83024f5dca..ee83933997 100644 --- a/lily/include/midi-walker.hh +++ b/lily/include/midi-walker.hh @@ -1,7 +1,7 @@ /* midi-walker.hh -- declare Midi_walker - (c) 1996--2001 Han-Wen Nienhuys + (c) 1996--2002 Han-Wen Nienhuys Jan Nieuwenhuizen */ diff --git a/lily/include/minterval.hh b/lily/include/minterval.hh index 2c842c3232..d3be32d89b 100644 --- a/lily/include/minterval.hh +++ b/lily/include/minterval.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ diff --git a/lily/include/molecule.hh b/lily/include/molecule.hh index 214e3181a4..76081729ca 100644 --- a/lily/include/molecule.hh +++ b/lily/include/molecule.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #ifndef MOLECULE_HH #define MOLECULE_HH diff --git a/lily/include/moment.hh b/lily/include/moment.hh index 54a8ad9cd7..1b132cb60c 100644 --- a/lily/include/moment.hh +++ b/lily/include/moment.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Han-Wen Nienhuys + (c) 1999--2002 Han-Wen Nienhuys */ diff --git a/lily/include/multi-measure-rest.hh b/lily/include/multi-measure-rest.hh index 887e0b504e..c6f7c94432 100644 --- a/lily/include/multi-measure-rest.hh +++ b/lily/include/multi-measure-rest.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2001 Jan Nieuwenhuizen + (c) 1998--2002 Jan Nieuwenhuizen */ diff --git a/lily/include/music-iterator.hh b/lily/include/music-iterator.hh index bc99f499d3..7bcb40fc8a 100644 --- a/lily/include/music-iterator.hh +++ b/lily/include/music-iterator.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ diff --git a/lily/include/music-list.hh b/lily/include/music-list.hh index a874660322..f69887aac2 100644 --- a/lily/include/music-list.hh +++ b/lily/include/music-list.hh @@ -4,7 +4,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ diff --git a/lily/include/music-output-def.hh b/lily/include/music-output-def.hh index bc7e5c73a0..e585202a6e 100644 --- a/lily/include/music-output-def.hh +++ b/lily/include/music-output-def.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ diff --git a/lily/include/music-output.hh b/lily/include/music-output.hh index 604ff11ce7..19723a0c45 100644 --- a/lily/include/music-output.hh +++ b/lily/include/music-output.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ diff --git a/lily/include/music-sequence.hh b/lily/include/music-sequence.hh index 699098fab4..724ac1689c 100644 --- a/lily/include/music-sequence.hh +++ b/lily/include/music-sequence.hh @@ -5,7 +5,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2001 Han-Wen Nienhuys + (c) 2000--2002 Han-Wen Nienhuys */ diff --git a/lily/include/music-wrapper-iterator.hh b/lily/include/music-wrapper-iterator.hh index 2f401705ef..2c9b259497 100644 --- a/lily/include/music-wrapper-iterator.hh +++ b/lily/include/music-wrapper-iterator.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2001 Han-Wen Nienhuys + (c) 1998--2002 Han-Wen Nienhuys */ diff --git a/lily/include/music-wrapper.hh b/lily/include/music-wrapper.hh index ed2cfe46c5..887182b73f 100644 --- a/lily/include/music-wrapper.hh +++ b/lily/include/music-wrapper.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2001 Han-Wen Nienhuys + (c) 1998--2002 Han-Wen Nienhuys */ diff --git a/lily/include/music.hh b/lily/include/music.hh index c3ece7688b..87b4b93eda 100644 --- a/lily/include/music.hh +++ b/lily/include/music.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ diff --git a/lily/include/musical-request.hh b/lily/include/musical-request.hh index 4b2e2d27dc..17f5446ea2 100644 --- a/lily/include/musical-request.hh +++ b/lily/include/musical-request.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ diff --git a/lily/include/my-lily-lexer.hh b/lily/include/my-lily-lexer.hh index 2c3d405952..9868a3f686 100644 --- a/lily/include/my-lily-lexer.hh +++ b/lily/include/my-lily-lexer.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #ifndef LEXER_HH diff --git a/lily/include/my-lily-parser.hh b/lily/include/my-lily-parser.hh index c4f500cf5e..ddb7038294 100644 --- a/lily/include/my-lily-parser.hh +++ b/lily/include/my-lily-parser.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ diff --git a/lily/include/note-column.hh b/lily/include/note-column.hh index 647ac34cb7..6ec04c2ee6 100644 --- a/lily/include/note-column.hh +++ b/lily/include/note-column.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ diff --git a/lily/include/note-head.hh b/lily/include/note-head.hh index 3b03eae29f..bbf747842e 100644 --- a/lily/include/note-head.hh +++ b/lily/include/note-head.hh @@ -1,7 +1,7 @@ /* note-head.hh -- part of GNU LilyPond - (c) 1996--2001 Han-Wen Nienhuys + (c) 1996--2002 Han-Wen Nienhuys */ #ifndef NOTEHEAD_HH diff --git a/lily/include/output-property-music-iterator.hh b/lily/include/output-property-music-iterator.hh index 3c94f39e8d..6677fb283e 100644 --- a/lily/include/output-property-music-iterator.hh +++ b/lily/include/output-property-music-iterator.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2001 Jan Nieuwenhuizen + (c) 2000--2002 Jan Nieuwenhuizen */ #ifndef OUTPUT_PROPERTY_MUSIC_ITERATOR_HH diff --git a/lily/include/output-property.hh b/lily/include/output-property.hh index 7a91fd7404..be204448b1 100644 --- a/lily/include/output-property.hh +++ b/lily/include/output-property.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2001 Han-Wen Nienhuys + (c) 2000--2002 Han-Wen Nienhuys */ diff --git a/lily/include/paper-column.hh b/lily/include/paper-column.hh index 4a21edaffc..23223452d3 100644 --- a/lily/include/paper-column.hh +++ b/lily/include/paper-column.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ diff --git a/lily/include/paper-def.hh b/lily/include/paper-def.hh index e30aa30e82..0ad02d105b 100644 --- a/lily/include/paper-def.hh +++ b/lily/include/paper-def.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2001 Han-Wen Nienhuys + (c) 1996--2002 Han-Wen Nienhuys */ diff --git a/lily/include/paper-outputter.hh b/lily/include/paper-outputter.hh index 97f8fc2cab..bccde18b7f 100644 --- a/lily/include/paper-outputter.hh +++ b/lily/include/paper-outputter.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ diff --git a/lily/include/paper-score.hh b/lily/include/paper-score.hh index 114754a37b..2e238c4807 100644 --- a/lily/include/paper-score.hh +++ b/lily/include/paper-score.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2001 Han-Wen Nienhuys + (c) 1996--2002 Han-Wen Nienhuys */ diff --git a/lily/include/part-combine-music-iterator.hh b/lily/include/part-combine-music-iterator.hh index 21be315989..9f4799b59d 100644 --- a/lily/include/part-combine-music-iterator.hh +++ b/lily/include/part-combine-music-iterator.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2001 Jan Nieuwenhuizen + (c) 2000--2002 Jan Nieuwenhuizen */ diff --git a/lily/include/part-combine-music.hh b/lily/include/part-combine-music.hh index ef18fb2b78..5284782f2b 100644 --- a/lily/include/part-combine-music.hh +++ b/lily/include/part-combine-music.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2001 Jan Nieuwenhuizen + (c) 2000--2002 Jan Nieuwenhuizen */ diff --git a/lily/include/performance.hh b/lily/include/performance.hh index 376e10ec54..48382aedfb 100644 --- a/lily/include/performance.hh +++ b/lily/include/performance.hh @@ -1,7 +1,7 @@ /* performance.hh -- declare Performance - (c) 1997--2001 Jan Nieuwenhuizen + (c) 1997--2002 Jan Nieuwenhuizen */ #ifndef PERFORMANCE_HH diff --git a/lily/include/performer-group-performer.hh b/lily/include/performer-group-performer.hh index 891271b499..c027dd5a86 100644 --- a/lily/include/performer-group-performer.hh +++ b/lily/include/performer-group-performer.hh @@ -1,7 +1,7 @@ /* performer-group-performer.hh -- declare Performer_group_performer - (c) 1996--2001 Han-Wen Nienhuys + (c) 1996--2002 Han-Wen Nienhuys Jan Nieuwenhuizen */ diff --git a/lily/include/performer.hh b/lily/include/performer.hh index c8b0de3e37..c3e40c4296 100644 --- a/lily/include/performer.hh +++ b/lily/include/performer.hh @@ -1,7 +1,7 @@ /* performer.hh -- declare Performer - (c) 1996--2001 Han-Wen Nienhuys + (c) 1996--2002 Han-Wen Nienhuys Jan Nieuwenhuizen */ diff --git a/lily/include/pitch.hh b/lily/include/pitch.hh index c76b11182e..abc2eba6bc 100644 --- a/lily/include/pitch.hh +++ b/lily/include/pitch.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2001 Han-Wen Nienhuys + (c) 1998--2002 Han-Wen Nienhuys */ diff --git a/lily/include/property-iterator.hh b/lily/include/property-iterator.hh index e1ac8ae2ae..9dd3b2cce0 100644 --- a/lily/include/property-iterator.hh +++ b/lily/include/property-iterator.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ diff --git a/lily/include/protected-scm.hh b/lily/include/protected-scm.hh index 7a13b24b1f..de9159fe00 100644 --- a/lily/include/protected-scm.hh +++ b/lily/include/protected-scm.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2001 Han-Wen Nienhuys + (c) 1998--2002 Han-Wen Nienhuys */ diff --git a/lily/include/relative-music.hh b/lily/include/relative-music.hh index eb782fa9fe..e8576b1bef 100644 --- a/lily/include/relative-music.hh +++ b/lily/include/relative-music.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2001 Han-Wen Nienhuys + (c) 1998--2002 Han-Wen Nienhuys */ diff --git a/lily/include/repeated-music.hh b/lily/include/repeated-music.hh index 4b84bb140e..7c1df168ef 100644 --- a/lily/include/repeated-music.hh +++ b/lily/include/repeated-music.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Han-Wen Nienhuys + (c) 1999--2002 Han-Wen Nienhuys */ diff --git a/lily/include/request-chord-iterator.hh b/lily/include/request-chord-iterator.hh index 664aecadfd..b5176178ff 100644 --- a/lily/include/request-chord-iterator.hh +++ b/lily/include/request-chord-iterator.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ diff --git a/lily/include/request.hh b/lily/include/request.hh index 677be604f9..b612cb76fb 100644 --- a/lily/include/request.hh +++ b/lily/include/request.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #ifndef REQUEST_HH diff --git a/lily/include/rest-collision.hh b/lily/include/rest-collision.hh index e2a20d1050..343c0e1cdd 100644 --- a/lily/include/rest-collision.hh +++ b/lily/include/rest-collision.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ diff --git a/lily/include/rest.hh b/lily/include/rest.hh index 53fe6585f5..648542b26d 100644 --- a/lily/include/rest.hh +++ b/lily/include/rest.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ diff --git a/lily/include/rhythmic-head.hh b/lily/include/rhythmic-head.hh index 73b7890249..7cb64250ca 100644 --- a/lily/include/rhythmic-head.hh +++ b/lily/include/rhythmic-head.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ diff --git a/lily/include/rod.hh b/lily/include/rod.hh index b7c07aa575..bde8351a2e 100644 --- a/lily/include/rod.hh +++ b/lily/include/rod.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2001 Han-Wen Nienhuys + (c) 1998--2002 Han-Wen Nienhuys */ diff --git a/lily/include/scaled-font-metric.hh b/lily/include/scaled-font-metric.hh index 4f7ca65fbc..9192da365b 100644 --- a/lily/include/scaled-font-metric.hh +++ b/lily/include/scaled-font-metric.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Han-Wen Nienhuys + (c) 1999--2002 Han-Wen Nienhuys */ diff --git a/lily/include/scm-hash.hh b/lily/include/scm-hash.hh index ba13e2ef06..54423b6302 100644 --- a/lily/include/scm-hash.hh +++ b/lily/include/scm-hash.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Han-Wen Nienhuys + (c) 1999--2002 Han-Wen Nienhuys */ diff --git a/lily/include/scope.hh b/lily/include/scope.hh index de78dd3352..adabc40499 100644 --- a/lily/include/scope.hh +++ b/lily/include/scope.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2001 Han-Wen Nienhuys + (c) 1998--2002 Han-Wen Nienhuys */ diff --git a/lily/include/score-engraver.hh b/lily/include/score-engraver.hh index f984a5f6cc..7bad0008a6 100644 --- a/lily/include/score-engraver.hh +++ b/lily/include/score-engraver.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ diff --git a/lily/include/score-performer.hh b/lily/include/score-performer.hh index 2539c6d5a4..792ab2d886 100644 --- a/lily/include/score-performer.hh +++ b/lily/include/score-performer.hh @@ -1,7 +1,7 @@ /* score-performer.hh -- declare Score_performer - (c) 1996--2001 Han-Wen Nienhuys + (c) 1996--2002 Han-Wen Nienhuys Jan Nieuwenhuizen */ diff --git a/lily/include/score.hh b/lily/include/score.hh index af1e3caccb..6019c8fa11 100644 --- a/lily/include/score.hh +++ b/lily/include/score.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ diff --git a/lily/include/script-column.hh b/lily/include/script-column.hh index 934c04480d..8d759beba8 100644 --- a/lily/include/script-column.hh +++ b/lily/include/script-column.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Han-Wen Nienhuys + (c) 1999--2002 Han-Wen Nienhuys */ diff --git a/lily/include/script.hh b/lily/include/script.hh index e1e46d5c21..d2d10b8f79 100644 --- a/lily/include/script.hh +++ b/lily/include/script.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Han-Wen Nienhuys + (c) 1999--2002 Han-Wen Nienhuys */ diff --git a/lily/include/separating-group-spanner.hh b/lily/include/separating-group-spanner.hh index 848b429104..38f0e89288 100644 --- a/lily/include/separating-group-spanner.hh +++ b/lily/include/separating-group-spanner.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2001 Han-Wen Nienhuys + (c) 1998--2002 Han-Wen Nienhuys */ diff --git a/lily/include/separation-item.hh b/lily/include/separation-item.hh index 49a50baf45..e8e53539eb 100644 --- a/lily/include/separation-item.hh +++ b/lily/include/separation-item.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ diff --git a/lily/include/sequential-music-iterator.hh b/lily/include/sequential-music-iterator.hh index 37cfbe34be..62a251e22f 100644 --- a/lily/include/sequential-music-iterator.hh +++ b/lily/include/sequential-music-iterator.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #ifndef SEQUENTIAL_MUSIC_ITERATOR_HH diff --git a/lily/include/side-position-interface.hh b/lily/include/side-position-interface.hh index 05973ff1e4..cd5f2a1be1 100644 --- a/lily/include/side-position-interface.hh +++ b/lily/include/side-position-interface.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Han-Wen Nienhuys + (c) 1999--2002 Han-Wen Nienhuys */ diff --git a/lily/include/simple-music-iterator.hh b/lily/include/simple-music-iterator.hh index 9f6348e00a..c969a3ba95 100644 --- a/lily/include/simple-music-iterator.hh +++ b/lily/include/simple-music-iterator.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2001 Han-Wen Nienhuys + (c) 2000--2002 Han-Wen Nienhuys */ #ifndef SIMPLE_MUSIC_ITERATOR_HH diff --git a/lily/include/simple-spacer.hh b/lily/include/simple-spacer.hh index 80fd7f153d..1b963650e0 100644 --- a/lily/include/simple-spacer.hh +++ b/lily/include/simple-spacer.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Han-Wen Nienhuys + (c) 1999--2002 Han-Wen Nienhuys */ diff --git a/lily/include/simultaneous-music-iterator.hh b/lily/include/simultaneous-music-iterator.hh index aec5d6494c..122a4825ad 100644 --- a/lily/include/simultaneous-music-iterator.hh +++ b/lily/include/simultaneous-music-iterator.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ diff --git a/lily/include/slur-bezier-bow.hh b/lily/include/slur-bezier-bow.hh index 01b1304a4e..14e14eba71 100644 --- a/lily/include/slur-bezier-bow.hh +++ b/lily/include/slur-bezier-bow.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2001 Jan Nieuwenhuizen + (c) 2000--2002 Jan Nieuwenhuizen */ #ifndef SLUR_BEZIER_BOW_HH diff --git a/lily/include/slur.hh b/lily/include/slur.hh index 7313ee7e6c..04865f10bb 100644 --- a/lily/include/slur.hh +++ b/lily/include/slur.hh @@ -1,7 +1,7 @@ /* slur.hh -- declare Slur - (c) 1996--2001 Han-Wen Nienhuys + (c) 1996--2002 Han-Wen Nienhuys */ #ifndef SLUR_HH diff --git a/lily/include/smobs.hh b/lily/include/smobs.hh index 437235c9ea..8357df69bb 100644 --- a/lily/include/smobs.hh +++ b/lily/include/smobs.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Han-Wen Nienhuys + (c) 1999--2002 Han-Wen Nienhuys */ diff --git a/lily/include/spaceable-grob.hh b/lily/include/spaceable-grob.hh index 2c40d2e8f5..8260372d8b 100644 --- a/lily/include/spaceable-grob.hh +++ b/lily/include/spaceable-grob.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2001 Han-Wen Nienhuys + (c) 2000--2002 Han-Wen Nienhuys */ diff --git a/lily/include/spacing-spanner.hh b/lily/include/spacing-spanner.hh index f7a43ccd2b..ec088024e2 100644 --- a/lily/include/spacing-spanner.hh +++ b/lily/include/spacing-spanner.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Han-Wen Nienhuys + (c) 1999--2002 Han-Wen Nienhuys */ diff --git a/lily/include/span-bar.hh b/lily/include/span-bar.hh index f59f075a60..a6cd7960d1 100644 --- a/lily/include/span-bar.hh +++ b/lily/include/span-bar.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ diff --git a/lily/include/spanner.hh b/lily/include/spanner.hh index 8f94e79bd8..e2b4a2a1bb 100644 --- a/lily/include/spanner.hh +++ b/lily/include/spanner.hh @@ -1,7 +1,7 @@ /* spanner.hh -- part of GNU LilyPond - (c) 1996--2001 Han-Wen Nienhuys + (c) 1996--2002 Han-Wen Nienhuys */ #ifndef SPANNER_HH diff --git a/lily/include/spring.hh b/lily/include/spring.hh index 236841bcb0..9d8f341e58 100644 --- a/lily/include/spring.hh +++ b/lily/include/spring.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Han-Wen Nienhuys + (c) 1999--2002 Han-Wen Nienhuys */ diff --git a/lily/include/staff-symbol-referencer.hh b/lily/include/staff-symbol-referencer.hh index 9abe4f9d51..aa4affa2ce 100644 --- a/lily/include/staff-symbol-referencer.hh +++ b/lily/include/staff-symbol-referencer.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Han-Wen Nienhuys + (c) 1999--2002 Han-Wen Nienhuys */ diff --git a/lily/include/staff-symbol.hh b/lily/include/staff-symbol.hh index 1968458fad..4043069cbf 100644 --- a/lily/include/staff-symbol.hh +++ b/lily/include/staff-symbol.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ diff --git a/lily/include/stem-info.hh b/lily/include/stem-info.hh index 8230ef9018..25c0a8eec2 100644 --- a/lily/include/stem-info.hh +++ b/lily/include/stem-info.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Jan Nieuwenhuizen + (c) 1997--2002 Jan Nieuwenhuizen */ diff --git a/lily/include/stem-tremolo.hh b/lily/include/stem-tremolo.hh index d76872cce6..1a6d9248e8 100644 --- a/lily/include/stem-tremolo.hh +++ b/lily/include/stem-tremolo.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ diff --git a/lily/include/stem.hh b/lily/include/stem.hh index 6730e25fb1..65e7d238ab 100644 --- a/lily/include/stem.hh +++ b/lily/include/stem.hh @@ -1,7 +1,7 @@ /* stem.hh -- declare Stem - (c) 1996--2001 Han-Wen Nienhuys + (c) 1996--2002 Han-Wen Nienhuys */ #ifndef STEM_HH diff --git a/lily/include/swallow-perf.hh b/lily/include/swallow-perf.hh index 3b40a7dfe0..b5c4d65f9a 100644 --- a/lily/include/swallow-perf.hh +++ b/lily/include/swallow-perf.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ diff --git a/lily/include/system-start-delimiter.hh b/lily/include/system-start-delimiter.hh index 1d6029e15c..88ee130d2e 100644 --- a/lily/include/system-start-delimiter.hh +++ b/lily/include/system-start-delimiter.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2001 Han-Wen Nienhuys + (c) 2000--2002 Han-Wen Nienhuys */ diff --git a/lily/include/text-item.hh b/lily/include/text-item.hh index a579a48794..8cd1430ebe 100644 --- a/lily/include/text-item.hh +++ b/lily/include/text-item.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2001 Han-Wen Nienhuys + (c) 1998--2002 Han-Wen Nienhuys Jan Nieuwenhuizen */ diff --git a/lily/include/text-spanner.hh b/lily/include/text-spanner.hh index 7f1486b143..97b43e4187 100644 --- a/lily/include/text-spanner.hh +++ b/lily/include/text-spanner.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2001 Jan Nieuwenhuizen + (c) 2000--2002 Jan Nieuwenhuizen */ diff --git a/lily/include/tfm-reader.hh b/lily/include/tfm-reader.hh index 09aef4b701..cb3955f96f 100644 --- a/lily/include/tfm-reader.hh +++ b/lily/include/tfm-reader.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Jan Nieuwenhuizen + (c) 1999--2002 Jan Nieuwenhuizen revamped code from GNU Fontutils-0.6 diff --git a/lily/include/tfm.hh b/lily/include/tfm.hh index 8eb633a9e5..5d0d2f1189 100644 --- a/lily/include/tfm.hh +++ b/lily/include/tfm.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Jan Nieuwenhuizen + (c) 1999--2002 Jan Nieuwenhuizen revamped code from GNU Fontutils-0.6 diff --git a/lily/include/tie-column.hh b/lily/include/tie-column.hh index 059d60ac5b..0d7161e70a 100644 --- a/lily/include/tie-column.hh +++ b/lily/include/tie-column.hh @@ -4,7 +4,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2001 Han-Wen Nienhuys + (c) 2000--2002 Han-Wen Nienhuys */ diff --git a/lily/include/tie.hh b/lily/include/tie.hh index 2c4f3a52a4..76592aefa8 100644 --- a/lily/include/tie.hh +++ b/lily/include/tie.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ diff --git a/lily/include/time-scaled-music-iterator.hh b/lily/include/time-scaled-music-iterator.hh index 5c2763293e..2ddcdf298c 100644 --- a/lily/include/time-scaled-music-iterator.hh +++ b/lily/include/time-scaled-music-iterator.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2001 Han-Wen Nienhuys + (c) 1998--2002 Han-Wen Nienhuys */ diff --git a/lily/include/time-scaled-music.hh b/lily/include/time-scaled-music.hh index 5cdf43bbab..2cfc2f1415 100644 --- a/lily/include/time-scaled-music.hh +++ b/lily/include/time-scaled-music.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2001 Han-Wen Nienhuys + (c) 1998--2002 Han-Wen Nienhuys */ diff --git a/lily/include/time-signature.hh b/lily/include/time-signature.hh index f402a67a17..7bd6553252 100644 --- a/lily/include/time-signature.hh +++ b/lily/include/time-signature.hh @@ -1,7 +1,7 @@ /* time_signature.hh -- declare Time_signature - (c) 1996--2001 Han-Wen Nienhuys + (c) 1996--2002 Han-Wen Nienhuys */ #ifndef METER_HH diff --git a/lily/include/timing-translator.hh b/lily/include/timing-translator.hh index a201518067..6770e770c1 100644 --- a/lily/include/timing-translator.hh +++ b/lily/include/timing-translator.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ diff --git a/lily/include/translation-property.hh b/lily/include/translation-property.hh index a3d8151974..cedaf0d32c 100644 --- a/lily/include/translation-property.hh +++ b/lily/include/translation-property.hh @@ -4,7 +4,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ diff --git a/lily/include/translator-change.hh b/lily/include/translator-change.hh index 992fcedf34..3dbaa9090a 100644 --- a/lily/include/translator-change.hh +++ b/lily/include/translator-change.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ diff --git a/lily/include/translator-def.hh b/lily/include/translator-def.hh index fd6d42fd77..5973f9bee1 100644 --- a/lily/include/translator-def.hh +++ b/lily/include/translator-def.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2001 Han-Wen Nienhuys + (c) 2000--2002 Han-Wen Nienhuys */ diff --git a/lily/include/translator-group.hh b/lily/include/translator-group.hh index 50a713be69..092cbab5e1 100644 --- a/lily/include/translator-group.hh +++ b/lily/include/translator-group.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ diff --git a/lily/include/translator.hh b/lily/include/translator.hh index 1e1109d99c..cd4cb58fc3 100644 --- a/lily/include/translator.hh +++ b/lily/include/translator.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ diff --git a/lily/include/transposed-music.hh b/lily/include/transposed-music.hh index e6aa328ad0..b2455e864d 100644 --- a/lily/include/transposed-music.hh +++ b/lily/include/transposed-music.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2001 Han-Wen Nienhuys + (c) 1998--2002 Han-Wen Nienhuys */ diff --git a/lily/include/tuplet-spanner.hh b/lily/include/tuplet-spanner.hh index ebafc2eb19..661bd3aaa4 100644 --- a/lily/include/tuplet-spanner.hh +++ b/lily/include/tuplet-spanner.hh @@ -1,7 +1,7 @@ /* plet-spanner.hh -- part of GNU LilyPond - (c) 1997--2001 Jan Nieuwenhuizen + (c) 1997--2002 Jan Nieuwenhuizen */ #ifndef Tuplet_bracket_HH diff --git a/lily/include/type-swallow-translator.hh b/lily/include/type-swallow-translator.hh index 4179e7cc34..20878b33ca 100644 --- a/lily/include/type-swallow-translator.hh +++ b/lily/include/type-swallow-translator.hh @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ diff --git a/lily/include/volta-spanner.hh b/lily/include/volta-spanner.hh index 97f1e15035..874a62f258 100644 --- a/lily/include/volta-spanner.hh +++ b/lily/include/volta-spanner.hh @@ -1,7 +1,7 @@ /* volta-spanner.hh -- part of GNU LilyPond - (c) 1997--2001 Jan Nieuwenhuizen + (c) 1997--2002 Jan Nieuwenhuizen */ #ifndef VOLTA_SPANNER_HH diff --git a/lily/input-smob.cc b/lily/input-smob.cc index 75d00c25f1..fd904b25be 100644 --- a/lily/input-smob.cc +++ b/lily/input-smob.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2001 Han-Wen Nienhuys + (c) 2000--2002 Han-Wen Nienhuys */ diff --git a/lily/instrument-name-engraver.cc b/lily/instrument-name-engraver.cc index 0f5e9bbbd1..11758a82c8 100644 --- a/lily/instrument-name-engraver.cc +++ b/lily/instrument-name-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2001 Han-Wen Nienhuys + (c) 2000--2002 Han-Wen Nienhuys */ diff --git a/lily/interpretation-context-handle.cc b/lily/interpretation-context-handle.cc index fddebdf9a7..6ba551c34a 100644 --- a/lily/interpretation-context-handle.cc +++ b/lily/interpretation-context-handle.cc @@ -4,7 +4,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Han-Wen Nienhuys + (c) 1999--2002 Han-Wen Nienhuys */ diff --git a/lily/item.cc b/lily/item.cc index 08c2e76de8..e92ac8ac90 100644 --- a/lily/item.cc +++ b/lily/item.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc index 6f331d75c4..566516d297 100644 --- a/lily/key-engraver.cc +++ b/lily/key-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #include "key-item.hh" diff --git a/lily/key-item.cc b/lily/key-item.cc index 47526b042d..39848d7378 100644 --- a/lily/key-item.cc +++ b/lily/key-item.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2001 Han-Wen Nienhuys + (c) 1996--2002 Han-Wen Nienhuys keyplacement by Mats Bengtsson */ diff --git a/lily/key-performer.cc b/lily/key-performer.cc index e1c335ca01..a14edf077b 100644 --- a/lily/key-performer.cc +++ b/lily/key-performer.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Jan Nieuwenhuizen + (c) 1997--2002 Jan Nieuwenhuizen */ #include "lily-guile.hh" diff --git a/lily/kpath.cc b/lily/kpath.cc index 62e0186c05..aed208d5ab 100644 --- a/lily/kpath.cc +++ b/lily/kpath.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2001 Han-Wen Nienhuys + (c) 2000--2002 Han-Wen Nienhuys */ #include diff --git a/lily/least-squares.cc b/lily/least-squares.cc index 8f635b0cd2..d3f44a4463 100644 --- a/lily/least-squares.cc +++ b/lily/least-squares.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2001 Han-Wen Nienhuys + (c) 1996--2002 Han-Wen Nienhuys */ diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc index cf8dff1c2a..3e1abf6765 100644 --- a/lily/lily-guile.cc +++ b/lily/lily-guile.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2001 Jan Nieuwenhuizen + (c) 1998--2002 Jan Nieuwenhuizen Han-Wen Nienhuys */ diff --git a/lily/lily-version.cc b/lily/lily-version.cc index 40220a5532..bc9c2bd876 100644 --- a/lily/lily-version.cc +++ b/lily/lily-version.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Jan Nieuwenhuizen + (c) 1999--2002 Jan Nieuwenhuizen */ #include "config.h" diff --git a/lily/lilypond-version.cc b/lily/lilypond-version.cc index 5af0c899fd..0c51d73c12 100644 --- a/lily/lilypond-version.cc +++ b/lily/lilypond-version.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2001 Jan Nieuwenhuizen + (c) 1998--2002 Jan Nieuwenhuizen */ diff --git a/lily/line-group-group-engraver.cc b/lily/line-group-group-engraver.cc index 958e405ef7..583ab3a36e 100644 --- a/lily/line-group-group-engraver.cc +++ b/lily/line-group-group-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #include "command-request.hh" diff --git a/lily/line-of-score.cc b/lily/line-of-score.cc index 22a9521178..a9e21a06eb 100644 --- a/lily/line-of-score.cc +++ b/lily/line-of-score.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2001 Han-Wen Nienhuys + (c) 1996--2002 Han-Wen Nienhuys */ #include "input-smob.hh" diff --git a/lily/line-spanner.cc b/lily/line-spanner.cc index 391e73f851..ba22052d96 100644 --- a/lily/line-spanner.cc +++ b/lily/line-spanner.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2001 Jan Nieuwenhuizen + (c) 2000--2002 Jan Nieuwenhuizen */ #include "molecule.hh" diff --git a/lily/local-key-item.cc b/lily/local-key-item.cc index 52e7a65f77..f2d03d6e4e 100644 --- a/lily/local-key-item.cc +++ b/lily/local-key-item.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #include "local-key-item.hh" #include "molecule.hh" diff --git a/lily/lookup.cc b/lily/lookup.cc index 40af656ee3..60cc0c6269 100644 --- a/lily/lookup.cc +++ b/lily/lookup.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys Jan Nieuwenhuizen diff --git a/lily/lyric-combine-music-iterator.cc b/lily/lyric-combine-music-iterator.cc index e7e7901e87..9c51b2d177 100644 --- a/lily/lyric-combine-music-iterator.cc +++ b/lily/lyric-combine-music-iterator.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Han-Wen Nienhuys + (c) 1999--2002 Han-Wen Nienhuys */ diff --git a/lily/lyric-combine-music.cc b/lily/lyric-combine-music.cc index b7b6196418..3ab20f6d33 100644 --- a/lily/lyric-combine-music.cc +++ b/lily/lyric-combine-music.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Han-Wen Nienhuys + (c) 1999--2002 Han-Wen Nienhuys */ diff --git a/lily/lyric-engraver.cc b/lily/lyric-engraver.cc index 3b2e7b31c3..2364bd48df 100644 --- a/lily/lyric-engraver.cc +++ b/lily/lyric-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys Jan Nieuwenhuizen */ diff --git a/lily/lyric-extender.cc b/lily/lyric-extender.cc index 5e4750221b..9fc7f8a7a4 100644 --- a/lily/lyric-extender.cc +++ b/lily/lyric-extender.cc @@ -2,7 +2,7 @@ lyric-extender.cc -- implement Lyric_extender source file of the GNU LilyPond music typesetter - (c) 1998--2001 Jan Nieuwenhuizen + (c) 1998--2002 Jan Nieuwenhuizen Han-Wen Nienhuys */ diff --git a/lily/lyric-performer.cc b/lily/lyric-performer.cc index c8e1acac02..fe5ca56d11 100644 --- a/lily/lyric-performer.cc +++ b/lily/lyric-performer.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Jan Nieuwenhuizen + (c) 1997--2002 Jan Nieuwenhuizen */ #include "musical-request.hh" diff --git a/lily/main.cc b/lily/main.cc index 67b85396d8..d1158824c1 100644 --- a/lily/main.cc +++ b/lily/main.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #include @@ -180,7 +180,7 @@ version () "lilypond"); cout << endl; - cout << _f ("Copyright (c) %s by", "1996--2001"); + cout << _f ("Copyright (c) %s by", "1996--2002"); cout << '\n'; cout << " Han-Wen Nienhuys \n"; cout << " Jan Nieuwenhuizen \n"; @@ -192,7 +192,7 @@ notice () cout << '\n'; cout << _ ("GNU LilyPond -- The music typesetter"); cout << '\n'; - cout << _f ("Copyright (c) %s by", "1996--2001"); + cout << _f ("Copyright (c) %s by", "1996--2002"); cout << '\n'; cout << " Han-Wen Nienhuys \n"; cout << " Jan Nieuwenhuizen \n"; diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc index 30384c3929..bb9453a128 100644 --- a/lily/mark-engraver.cc +++ b/lily/mark-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2001 Jan Nieuwenhuizen + (c) 1998--2002 Jan Nieuwenhuizen */ #include diff --git a/lily/melisma-engraver.cc b/lily/melisma-engraver.cc index fab89dcd9c..fc982526ed 100644 --- a/lily/melisma-engraver.cc +++ b/lily/melisma-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Han-Wen Nienhuys + (c) 1999--2002 Han-Wen Nienhuys */ diff --git a/lily/midi-def.cc b/lily/midi-def.cc index a0599d107f..5d76f00341 100644 --- a/lily/midi-def.cc +++ b/lily/midi-def.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Jan Nieuwenhuizen + (c) 1997--2002 Jan Nieuwenhuizen */ #include diff --git a/lily/midi-item.cc b/lily/midi-item.cc index baf6e9ec3c..f894ce7f00 100644 --- a/lily/midi-item.cc +++ b/lily/midi-item.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Jan Nieuwenhuizen + (c) 1997--2002 Jan Nieuwenhuizen */ #include "debug.hh" diff --git a/lily/midi-stream.cc b/lily/midi-stream.cc index 9b3365753c..cbfe7075f1 100644 --- a/lily/midi-stream.cc +++ b/lily/midi-stream.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Jan Nieuwenhuizen + (c) 1997--2002 Jan Nieuwenhuizen */ diff --git a/lily/midi-walker.cc b/lily/midi-walker.cc index 6a568b43fc..58dbb45c8f 100644 --- a/lily/midi-walker.cc +++ b/lily/midi-walker.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys Jan Nieuwenhuizen */ diff --git a/lily/misc.cc b/lily/misc.cc index 45a055f8a6..38154556fd 100644 --- a/lily/misc.cc +++ b/lily/misc.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys Jan Nieuwenhuizen */ diff --git a/lily/molecule.cc b/lily/molecule.cc index c4c46411db..9630568288 100644 --- a/lily/molecule.cc +++ b/lily/molecule.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #include diff --git a/lily/moment.cc b/lily/moment.cc index 5b1f1d9027..c305c9edc4 100644 --- a/lily/moment.cc +++ b/lily/moment.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Han-Wen Nienhuys + (c) 1999--2002 Han-Wen Nienhuys */ diff --git a/lily/multi-measure-rest-engraver.cc b/lily/multi-measure-rest-engraver.cc index 239db9779f..035f5f8924 100644 --- a/lily/multi-measure-rest-engraver.cc +++ b/lily/multi-measure-rest-engraver.cc @@ -1,7 +1,7 @@ /* multi_measure_rest-engraver.cc -- implement Multi_measure_rest_engraver - (c) 1998--2001 Jan Nieuwenhuizen + (c) 1998--2002 Jan Nieuwenhuizen Han-Wen Nienhuys */ diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc index 0ea2cf13f3..ed39337b78 100644 --- a/lily/multi-measure-rest.cc +++ b/lily/multi-measure-rest.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2001 Jan Nieuwenhuizen + (c) 1998--2002 Jan Nieuwenhuizen */ diff --git a/lily/music-constructor.cc b/lily/music-constructor.cc index 2615221615..dc60a9deb4 100644 --- a/lily/music-constructor.cc +++ b/lily/music-constructor.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2001 Han-Wen Nienhuys + (c) 2001--2002 Han-Wen Nienhuys */ diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc index 4135a6c988..b75f1e3281 100644 --- a/lily/music-iterator.cc +++ b/lily/music-iterator.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ /* diff --git a/lily/music-output-def.cc b/lily/music-output-def.cc index df2c404764..10d883e24a 100644 --- a/lily/music-output-def.cc +++ b/lily/music-output-def.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #include "scm-hash.hh" diff --git a/lily/music-sequence.cc b/lily/music-sequence.cc index 5ea3514611..b7e0e56954 100644 --- a/lily/music-sequence.cc +++ b/lily/music-sequence.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2001 Han-Wen Nienhuys + (c) 1998--2002 Han-Wen Nienhuys */ #include "music-list.hh" diff --git a/lily/music-wrapper-iterator.cc b/lily/music-wrapper-iterator.cc index c5f72417c9..fa628ee6b2 100644 --- a/lily/music-wrapper-iterator.cc +++ b/lily/music-wrapper-iterator.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2001 Han-Wen Nienhuys + (c) 1998--2002 Han-Wen Nienhuys */ diff --git a/lily/music-wrapper.cc b/lily/music-wrapper.cc index 2541483ddd..3d58fca2ef 100644 --- a/lily/music-wrapper.cc +++ b/lily/music-wrapper.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2001 Han-Wen Nienhuys + (c) 1998--2002 Han-Wen Nienhuys */ diff --git a/lily/music.cc b/lily/music.cc index 50d20245b2..65b6bd608f 100644 --- a/lily/music.cc +++ b/lily/music.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #include "input-smob.hh" diff --git a/lily/musical-request.cc b/lily/musical-request.cc index 5b9c8bf6ec..147fce3fa2 100644 --- a/lily/musical-request.cc +++ b/lily/musical-request.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #include "musical-request.hh" diff --git a/lily/my-lily-lexer.cc b/lily/my-lily-lexer.cc index 587b5548b2..658b052771 100644 --- a/lily/my-lily-lexer.cc +++ b/lily/my-lily-lexer.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #include diff --git a/lily/my-lily-parser.cc b/lily/my-lily-parser.cc index f5221ad0e3..730a6db343 100644 --- a/lily/my-lily-parser.cc +++ b/lily/my-lily-parser.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys Jan Nieuwenhuizen */ diff --git a/lily/new-spacing-spanner.cc b/lily/new-spacing-spanner.cc index 4107f1deba..8620f085f5 100644 --- a/lily/new-spacing-spanner.cc +++ b/lily/new-spacing-spanner.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Han-Wen Nienhuys + (c) 1999--2002 Han-Wen Nienhuys */ diff --git a/lily/note-column.cc b/lily/note-column.cc index 5c1b664bbe..27fd96730a 100644 --- a/lily/note-column.cc +++ b/lily/note-column.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #include // ceil diff --git a/lily/note-head-line-engraver.cc b/lily/note-head-line-engraver.cc index 52ac159c93..c37e613432 100644 --- a/lily/note-head-line-engraver.cc +++ b/lily/note-head-line-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2001 Jan Nieuwenhuizen + (c) 2000--2002 Jan Nieuwenhuizen */ #include "engraver.hh" diff --git a/lily/note-head.cc b/lily/note-head.cc index 3b322d29dc..f685b4917a 100644 --- a/lily/note-head.cc +++ b/lily/note-head.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #include diff --git a/lily/note-heads-engraver.cc b/lily/note-heads-engraver.cc index 96938212e4..aec4c756c8 100644 --- a/lily/note-heads-engraver.cc +++ b/lily/note-heads-engraver.cc @@ -1,7 +1,7 @@ /* head-grav.cc -- part of GNU LilyPond - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #include diff --git a/lily/note-name-engraver.cc b/lily/note-name-engraver.cc index 6cb890a6d0..076cff6789 100644 --- a/lily/note-name-engraver.cc +++ b/lily/note-name-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Han-Wen Nienhuys + (c) 1999--2002 Han-Wen Nienhuys */ diff --git a/lily/note-performer.cc b/lily/note-performer.cc index a7d2907dae..3b39293e27 100644 --- a/lily/note-performer.cc +++ b/lily/note-performer.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2001 Jan Nieuwenhuizen + (c) 1996--2002 Jan Nieuwenhuizen */ #include "performer.hh" diff --git a/lily/note-spacing.cc b/lily/note-spacing.cc index 4b0d784b18..77365b134d 100644 --- a/lily/note-spacing.cc +++ b/lily/note-spacing.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2001 Han-Wen Nienhuys + (c) 2001--2002 Han-Wen Nienhuys */ diff --git a/lily/output-property-engraver.cc b/lily/output-property-engraver.cc index e852d666fa..25c156f539 100644 --- a/lily/output-property-engraver.cc +++ b/lily/output-property-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2001 Han-Wen Nienhuys + (c) 2000--2002 Han-Wen Nienhuys */ diff --git a/lily/output-property-music-iterator.cc b/lily/output-property-music-iterator.cc index 47ec4d784f..fa8ada0ad1 100644 --- a/lily/output-property-music-iterator.cc +++ b/lily/output-property-music-iterator.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2001 Jan Nieuwenhuizen + (c) 2000--2002 Jan Nieuwenhuizen */ #include "input.hh" diff --git a/lily/paper-column.cc b/lily/paper-column.cc index 789a9cfa73..7296041000 100644 --- a/lily/paper-column.cc +++ b/lily/paper-column.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #include "moment.hh" diff --git a/lily/paper-def.cc b/lily/paper-def.cc index 551a757b71..5813786e62 100644 --- a/lily/paper-def.cc +++ b/lily/paper-def.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #include diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc index 24ed811878..9c28f6dcc8 100644 --- a/lily/paper-outputter.cc +++ b/lily/paper-outputter.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys Jan Nieuwenhuizen */ diff --git a/lily/paper-score.cc b/lily/paper-score.cc index 73a3c2ee16..7971743be4 100644 --- a/lily/paper-score.cc +++ b/lily/paper-score.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2001 Han-Wen Nienhuys + (c) 1996--2002 Han-Wen Nienhuys */ #include "main.hh" diff --git a/lily/part-combine-music-iterator.cc b/lily/part-combine-music-iterator.cc index 16098a4cbe..86ad4b3675 100644 --- a/lily/part-combine-music-iterator.cc +++ b/lily/part-combine-music-iterator.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2001 Jan Nieuwenhuizen + (c) 2000--2002 Jan Nieuwenhuizen */ #include "part-combine-music.hh" diff --git a/lily/part-combine-music.cc b/lily/part-combine-music.cc index 11ccc59f85..8724d86071 100644 --- a/lily/part-combine-music.cc +++ b/lily/part-combine-music.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2001 Jan Nieuwenhuizen + (c) 2000--2002 Jan Nieuwenhuizen */ diff --git a/lily/percent-repeat-engraver.cc b/lily/percent-repeat-engraver.cc index 7dac5fc84d..f818eb9e33 100644 --- a/lily/percent-repeat-engraver.cc +++ b/lily/percent-repeat-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2001 Han-Wen Nienhuys + (c) 2000--2002 Han-Wen Nienhuys */ diff --git a/lily/percent-repeat-item.cc b/lily/percent-repeat-item.cc index 373404428d..68d3bd6c1f 100644 --- a/lily/percent-repeat-item.cc +++ b/lily/percent-repeat-item.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2001 Han-Wen Nienhuys + (c) 2001--2002 Han-Wen Nienhuys */ #include diff --git a/lily/percent-repeat-iterator.cc b/lily/percent-repeat-iterator.cc index 48a81ebe4d..c60877d948 100644 --- a/lily/percent-repeat-iterator.cc +++ b/lily/percent-repeat-iterator.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2001 Han-Wen Nienhuys + (c) 2001--2002 Han-Wen Nienhuys */ diff --git a/lily/performance.cc b/lily/performance.cc index cb16e8f751..9e1b7058c3 100644 --- a/lily/performance.cc +++ b/lily/performance.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Jan Nieuwenhuizen + (c) 1997--2002 Jan Nieuwenhuizen */ #include diff --git a/lily/performer-group-performer.cc b/lily/performer-group-performer.cc index 20f2bc7ff0..8d5b6b7f60 100644 --- a/lily/performer-group-performer.cc +++ b/lily/performer-group-performer.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2001 Han-Wen Nienhuys + (c) 1996--2002 Han-Wen Nienhuys Jan Nieuwenhuizen */ diff --git a/lily/performer.cc b/lily/performer.cc index 321ba9f0c4..9f0e889ce7 100644 --- a/lily/performer.cc +++ b/lily/performer.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2001 Han-Wen Nienhuys + (c) 1996--2002 Han-Wen Nienhuys Jan Nieuwenhuizen */ diff --git a/lily/phrasing-slur-engraver.cc b/lily/phrasing-slur-engraver.cc index f402d74f97..dc3e3f35de 100644 --- a/lily/phrasing-slur-engraver.cc +++ b/lily/phrasing-slur-engraver.cc @@ -1,7 +1,7 @@ /* phrasing-slur-engraver.cc -- implement Phrasing_slur_engraver - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #include "musical-request.hh" diff --git a/lily/piano-pedal-engraver.cc b/lily/piano-pedal-engraver.cc index f8546b7456..a4f5389949 100644 --- a/lily/piano-pedal-engraver.cc +++ b/lily/piano-pedal-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2001 Jan Nieuwenhuizen + (c) 2000--2002 Jan Nieuwenhuizen */ #include "engraver.hh" diff --git a/lily/pitch-squash-engraver.cc b/lily/pitch-squash-engraver.cc index 6ea465e781..3df136ee21 100644 --- a/lily/pitch-squash-engraver.cc +++ b/lily/pitch-squash-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #include "staff-symbol-referencer.hh" diff --git a/lily/pitch.cc b/lily/pitch.cc index df4db48a8c..d160841e9c 100644 --- a/lily/pitch.cc +++ b/lily/pitch.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2001 Han-Wen Nienhuys + (c) 1998--2002 Han-Wen Nienhuys */ #include "pitch.hh" diff --git a/lily/porrectus-engraver.cc b/lily/porrectus-engraver.cc index c35d9afa42..15f86571f7 100644 --- a/lily/porrectus-engraver.cc +++ b/lily/porrectus-engraver.cc @@ -1,7 +1,7 @@ /* porrectus-engraver.cc -- implement Porrectus_engraver - Copyright (C) 2001 Juergen Reuter + Copyright (c) 2001--2002 Juergen Reuter written for the GNU LilyPond music typesetter */ diff --git a/lily/porrectus.cc b/lily/porrectus.cc index 1ef6002699..d141b5267d 100644 --- a/lily/porrectus.cc +++ b/lily/porrectus.cc @@ -1,7 +1,7 @@ /* porrectus.cc -- implement Porrectus - Copyright (C) 2001 Juergen Reuter + Copyright (c) 2001--2002 Juergen Reuter written for the GNU LilyPond music typesetter diff --git a/lily/property-engraver.cc b/lily/property-engraver.cc index 3488f5e880..b2f8c8c392 100644 --- a/lily/property-engraver.cc +++ b/lily/property-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Han-Wen Nienhuys + (c) 1999--2002 Han-Wen Nienhuys */ diff --git a/lily/property-iterator.cc b/lily/property-iterator.cc index 9589804ecf..726a79bf1d 100644 --- a/lily/property-iterator.cc +++ b/lily/property-iterator.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #include "property-iterator.hh" diff --git a/lily/protected-scm.cc b/lily/protected-scm.cc index 7e22baa550..1b6918bcf6 100644 --- a/lily/protected-scm.cc +++ b/lily/protected-scm.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2001 Han-Wen Nienhuys + (c) 1998--2002 Han-Wen Nienhuys */ #include "protected-scm.hh" diff --git a/lily/regular-spacing-engraver.cc b/lily/regular-spacing-engraver.cc index c6590c832e..f7ae93d122 100644 --- a/lily/regular-spacing-engraver.cc +++ b/lily/regular-spacing-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2001 Han-Wen Nienhuys + (c) 2001--2002 Han-Wen Nienhuys */ diff --git a/lily/relative-octave-music.cc b/lily/relative-octave-music.cc index 3f69f920a0..4d7251166d 100644 --- a/lily/relative-octave-music.cc +++ b/lily/relative-octave-music.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2001 Han-Wen Nienhuys + (c) 1998--2002 Han-Wen Nienhuys */ diff --git a/lily/repeat-acknowledge-engraver.cc b/lily/repeat-acknowledge-engraver.cc index 4f75dade55..a62d7a37d1 100644 --- a/lily/repeat-acknowledge-engraver.cc +++ b/lily/repeat-acknowledge-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2001 Han-Wen Nienhuys + (c) 2000--2002 Han-Wen Nienhuys */ #include "engraver.hh" diff --git a/lily/repeated-music.cc b/lily/repeated-music.cc index 550424c5d0..8488259923 100644 --- a/lily/repeated-music.cc +++ b/lily/repeated-music.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Han-Wen Nienhuys + (c) 1999--2002 Han-Wen Nienhuys */ diff --git a/lily/request-chord-iterator.cc b/lily/request-chord-iterator.cc index e9a1038089..6bd81ae335 100644 --- a/lily/request-chord-iterator.cc +++ b/lily/request-chord-iterator.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #include "translator-group.hh" diff --git a/lily/request.cc b/lily/request.cc index 844f942a35..810936918a 100644 --- a/lily/request.cc +++ b/lily/request.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2001 Han-Wen Nienhuys + (c) 1996--2002 Han-Wen Nienhuys */ #include "request.hh" diff --git a/lily/rest-collision-engraver.cc b/lily/rest-collision-engraver.cc index 1569df6784..4e73f1dc46 100644 --- a/lily/rest-collision-engraver.cc +++ b/lily/rest-collision-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #include "debug.hh" diff --git a/lily/rest-collision.cc b/lily/rest-collision.cc index c3caa235c1..f791015c8f 100644 --- a/lily/rest-collision.cc +++ b/lily/rest-collision.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #include // ceil. diff --git a/lily/rest-engraver.cc b/lily/rest-engraver.cc index 04f5f3c871..b64d874fac 100644 --- a/lily/rest-engraver.cc +++ b/lily/rest-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #include "item.hh" #include "staff-symbol-referencer.hh" diff --git a/lily/rest.cc b/lily/rest.cc index 9fa2718b5e..3e2f9539a1 100644 --- a/lily/rest.cc +++ b/lily/rest.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #include "molecule.hh" @@ -60,7 +60,7 @@ Rest::glyph_name (Grob * me, int balltype, String style) ledger_b = ledger_b || (balltype == 1 && (pos <= -rad -2 || pos > rad)); } - + return ("rests-") + to_str (balltype) + (ledger_b ? "o" : "") + style; } @@ -88,8 +88,14 @@ Rest::brew_internal_molecule (SCM smob) style = ly_scm2string (scm_symbol_to_string (style_sym)); } - String idx = glyph_name (me, balltype, style); - return Font_interface::get_default_font (me)->find_by_name (idx).smobbed_copy (); + for(;;) { + String idx = glyph_name (me, balltype, style); + Molecule res = Font_interface::get_default_font (me)->find_by_name (idx); + if(res.empty_b() && style!="") + style=""; + else + return res.smobbed_copy(); + } } SCM diff --git a/lily/rhythmic-column-engraver.cc b/lily/rhythmic-column-engraver.cc index 905af21186..55462e76a9 100644 --- a/lily/rhythmic-column-engraver.cc +++ b/lily/rhythmic-column-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ diff --git a/lily/rhythmic-head.cc b/lily/rhythmic-head.cc index 889b9112c7..16e482d957 100644 --- a/lily/rhythmic-head.cc +++ b/lily/rhythmic-head.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #include "rhythmic-head.hh" diff --git a/lily/rod.cc b/lily/rod.cc index 7fcfcbc52d..1577baa310 100644 --- a/lily/rod.cc +++ b/lily/rod.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2001 Han-Wen Nienhuys + (c) 1998--2002 Han-Wen Nienhuys */ #include "rod.hh" diff --git a/lily/scaled-font-metric.cc b/lily/scaled-font-metric.cc index cf3bb64db0..d911d26e2b 100644 --- a/lily/scaled-font-metric.cc +++ b/lily/scaled-font-metric.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Han-Wen Nienhuys + (c) 1999--2002 Han-Wen Nienhuys */ diff --git a/lily/scm-hash.cc b/lily/scm-hash.cc index 7fc08cd6ef..a8d0488002 100644 --- a/lily/scm-hash.cc +++ b/lily/scm-hash.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Han-Wen Nienhuys + (c) 1999--2002 Han-Wen Nienhuys */ #include diff --git a/lily/scm-option.cc b/lily/scm-option.cc index 525c2e54f3..5e38876b0d 100644 --- a/lily/scm-option.cc +++ b/lily/scm-option.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2001 Han-Wen Nienhuys + (c) 2001--2002 Han-Wen Nienhuys */ diff --git a/lily/scope.cc b/lily/scope.cc index f578433a80..a4a1c34d0a 100644 --- a/lily/scope.cc +++ b/lily/scope.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2001 Han-Wen Nienhuys + (c) 1998--2002 Han-Wen Nienhuys */ diff --git a/lily/score-engraver.cc b/lily/score-engraver.cc index 74ca09b651..76ecf79872 100644 --- a/lily/score-engraver.cc +++ b/lily/score-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #include "debug.hh" diff --git a/lily/score-performer.cc b/lily/score-performer.cc index ea2926c5bc..aee7deaf24 100644 --- a/lily/score-performer.cc +++ b/lily/score-performer.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2001 Jan Nieuwenhuizen + (c) 1996--2002 Jan Nieuwenhuizen */ #include "score-performer.hh" diff --git a/lily/score.cc b/lily/score.cc index 9b8d379999..b31c673f81 100644 --- a/lily/score.cc +++ b/lily/score.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #include "ly-smobs.icc" diff --git a/lily/scores.cc b/lily/scores.cc index 06a65014a9..db3e48736a 100644 --- a/lily/scores.cc +++ b/lily/scores.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #include "config.h" diff --git a/lily/script-column-engraver.cc b/lily/script-column-engraver.cc index 14b665acab..df4ca98b88 100644 --- a/lily/script-column-engraver.cc +++ b/lily/script-column-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Han-Wen Nienhuys + (c) 1999--2002 Han-Wen Nienhuys */ diff --git a/lily/script-column.cc b/lily/script-column.cc index c45ee3c92c..f41264760c 100644 --- a/lily/script-column.cc +++ b/lily/script-column.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Han-Wen Nienhuys + (c) 1999--2002 Han-Wen Nienhuys */ #include "script-column.hh" diff --git a/lily/script-engraver.cc b/lily/script-engraver.cc index 31a9b82f48..1d0977a487 100644 --- a/lily/script-engraver.cc +++ b/lily/script-engraver.cc @@ -1,7 +1,7 @@ /* script-engraver.cc -- implement Script_engraver - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #include "script.hh" diff --git a/lily/script.cc b/lily/script.cc index 1579f0b97a..44ee942f2a 100644 --- a/lily/script.cc +++ b/lily/script.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Han-Wen Nienhuys + (c) 1999--2002 Han-Wen Nienhuys */ diff --git a/lily/separating-group-spanner.cc b/lily/separating-group-spanner.cc index 4b24e99501..6b5e98dbc6 100644 --- a/lily/separating-group-spanner.cc +++ b/lily/separating-group-spanner.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2001 Han-Wen Nienhuys + (c) 1998--2002 Han-Wen Nienhuys */ diff --git a/lily/separating-line-group-engraver.cc b/lily/separating-line-group-engraver.cc index 26e59e6439..b09b79f3d7 100644 --- a/lily/separating-line-group-engraver.cc +++ b/lily/separating-line-group-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2001 Han-Wen Nienhuys + (c) 1998--2002 Han-Wen Nienhuys */ diff --git a/lily/separation-item.cc b/lily/separation-item.cc index ca51ff9c2b..4ae80bab0b 100644 --- a/lily/separation-item.cc +++ b/lily/separation-item.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2001 Han-Wen Nienhuys + (c) 1998--2002 Han-Wen Nienhuys */ diff --git a/lily/sequential-music-iterator.cc b/lily/sequential-music-iterator.cc index 9b8b19c989..57e6ea4899 100644 --- a/lily/sequential-music-iterator.cc +++ b/lily/sequential-music-iterator.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #include "translator-group.hh" diff --git a/lily/side-position-interface.cc b/lily/side-position-interface.cc index a382836e20..2e83ee183c 100644 --- a/lily/side-position-interface.cc +++ b/lily/side-position-interface.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2001 Han-Wen Nienhuys + (c) 1998--2002 Han-Wen Nienhuys */ #include // ceil. diff --git a/lily/simple-music-iterator.cc b/lily/simple-music-iterator.cc index ea9c26d2cd..0497ef770c 100644 --- a/lily/simple-music-iterator.cc +++ b/lily/simple-music-iterator.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2001 Han-Wen Nienhuys + (c) 2000--2002 Han-Wen Nienhuys */ diff --git a/lily/simple-spacer.cc b/lily/simple-spacer.cc index a98188569a..f6052dd08c 100644 --- a/lily/simple-spacer.cc +++ b/lily/simple-spacer.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Han-Wen Nienhuys + (c) 1999--2002 Han-Wen Nienhuys TODO: - add support for different stretch/shrink constants? diff --git a/lily/simultaneous-music-iterator.cc b/lily/simultaneous-music-iterator.cc index ca309ecff8..d2c99bb280 100644 --- a/lily/simultaneous-music-iterator.cc +++ b/lily/simultaneous-music-iterator.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #include "translator-group.hh" diff --git a/lily/slur-bezier-bow.cc b/lily/slur-bezier-bow.cc index 8c1babb399..de18ddd5f6 100644 --- a/lily/slur-bezier-bow.cc +++ b/lily/slur-bezier-bow.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2001 Jan Nieuwenhuizen + (c) 2000--2002 Jan Nieuwenhuizen */ #include "debug.hh" diff --git a/lily/slur-engraver.cc b/lily/slur-engraver.cc index f96a4cb56d..90977e6a55 100644 --- a/lily/slur-engraver.cc +++ b/lily/slur-engraver.cc @@ -1,7 +1,7 @@ /* slur-engraver.cc -- implement Slur_engraver - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #include "musical-request.hh" diff --git a/lily/slur.cc b/lily/slur.cc index 15a8b30ea8..cf4d2897f8 100644 --- a/lily/slur.cc +++ b/lily/slur.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2001 Han-Wen Nienhuys + (c) 1996--2002 Han-Wen Nienhuys Jan Nieuwenhuizen */ diff --git a/lily/spaceable-grob.cc b/lily/spaceable-grob.cc index 3d54aa3723..cbef93ce5a 100644 --- a/lily/spaceable-grob.cc +++ b/lily/spaceable-grob.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2001 Han-Wen Nienhuys + (c) 2000--2002 Han-Wen Nienhuys */ diff --git a/lily/spacing-engraver.cc b/lily/spacing-engraver.cc index f9849da294..678b8da55b 100644 --- a/lily/spacing-engraver.cc +++ b/lily/spacing-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Han-Wen Nienhuys + (c) 1999--2002 Han-Wen Nienhuys */ diff --git a/lily/spacing-spanner.cc b/lily/spacing-spanner.cc index 841fa7ccfb..4e6ac33b70 100644 --- a/lily/spacing-spanner.cc +++ b/lily/spacing-spanner.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Han-Wen Nienhuys + (c) 1999--2002 Han-Wen Nienhuys */ diff --git a/lily/span-arpeggio-engraver.cc b/lily/span-arpeggio-engraver.cc index 9affdec496..e3165de03a 100644 --- a/lily/span-arpeggio-engraver.cc +++ b/lily/span-arpeggio-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2001 Jan Nieuwenhuizen + (c) 2000--2002 Jan Nieuwenhuizen */ #include "engraver.hh" diff --git a/lily/span-bar-engraver.cc b/lily/span-bar-engraver.cc index 43fc872e2f..e3b4778e4e 100644 --- a/lily/span-bar-engraver.cc +++ b/lily/span-bar-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ diff --git a/lily/span-bar.cc b/lily/span-bar.cc index 55b700a9bd..80e7d136a7 100644 --- a/lily/span-bar.cc +++ b/lily/span-bar.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #include "span-bar.hh" diff --git a/lily/spanner.cc b/lily/spanner.cc index 8f9cdd2412..d8c0e49935 100644 --- a/lily/spanner.cc +++ b/lily/spanner.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2001 Han-Wen Nienhuys + (c) 1996--2002 Han-Wen Nienhuys */ #include #include diff --git a/lily/spring.cc b/lily/spring.cc index e63fee0891..6c6e9de6dc 100644 --- a/lily/spring.cc +++ b/lily/spring.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Han-Wen Nienhuys + (c) 1999--2002 Han-Wen Nienhuys */ diff --git a/lily/staff-collecting-engraver.cc b/lily/staff-collecting-engraver.cc index 6efb537360..0b1ca24a89 100644 --- a/lily/staff-collecting-engraver.cc +++ b/lily/staff-collecting-engraver.cc @@ -3,7 +3,7 @@ staff-collecting-engraver.cc -- implement Staff_collecting_engraver source file of the GNU LilyPond music typesetter -(c) 2001 Han-Wen Nienhuys +(c) 2001--2002 Han-Wen Nienhuys */ #include "staff-symbol.hh" diff --git a/lily/staff-performer.cc b/lily/staff-performer.cc index a0ff443430..57ffc8efd3 100644 --- a/lily/staff-performer.cc +++ b/lily/staff-performer.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Jan Nieuwenhuizen + (c) 1997--2002 Jan Nieuwenhuizen */ #include "translator-group.hh" diff --git a/lily/staff-spacing.cc b/lily/staff-spacing.cc index 38c2b7072c..f0f0fe371e 100644 --- a/lily/staff-spacing.cc +++ b/lily/staff-spacing.cc @@ -3,7 +3,7 @@ staff-spacing.cc -- implement Staff_spacing source file of the GNU LilyPond music typesetter -(c) 2001 Han-Wen Nienhuys +(c) 2001--2002 Han-Wen Nienhuys */ diff --git a/lily/staff-symbol-engraver.cc b/lily/staff-symbol-engraver.cc index caca0f8034..b12d73b3ae 100644 --- a/lily/staff-symbol-engraver.cc +++ b/lily/staff-symbol-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ diff --git a/lily/staff-symbol-referencer.cc b/lily/staff-symbol-referencer.cc index 13cf324351..57cf6ec0b5 100644 --- a/lily/staff-symbol-referencer.cc +++ b/lily/staff-symbol-referencer.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Han-Wen Nienhuys + (c) 1999--2002 Han-Wen Nienhuys */ #include diff --git a/lily/staff-symbol.cc b/lily/staff-symbol.cc index cbb5784ab1..65c7cca21e 100644 --- a/lily/staff-symbol.cc +++ b/lily/staff-symbol.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #include "lookup.hh" diff --git a/lily/stanza-number-engraver.cc b/lily/stanza-number-engraver.cc index 833241cb53..a80f0141ef 100644 --- a/lily/stanza-number-engraver.cc +++ b/lily/stanza-number-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2001 Han-Wen Nienhuys , Glen Prideaux + (c) 2000--2002 Han-Wen Nienhuys , Glen Prideaux Similar to (and derived from) Instrument_name_engraver. */ diff --git a/lily/stem-engraver.cc b/lily/stem-engraver.cc index aba73c027f..3d7d879bb8 100644 --- a/lily/stem-engraver.cc +++ b/lily/stem-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #include "staff-symbol-referencer.hh" diff --git a/lily/stem-tremolo.cc b/lily/stem-tremolo.cc index eaf6bd962f..a4389db481 100644 --- a/lily/stem-tremolo.cc +++ b/lily/stem-tremolo.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ diff --git a/lily/stem.cc b/lily/stem.cc index 304c382a81..f02c00598a 100644 --- a/lily/stem.cc +++ b/lily/stem.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2001 Han-Wen Nienhuys + (c) 1996--2002 Han-Wen Nienhuys Jan Nieuwenhuizen TODO: This is way too hairy @@ -563,7 +563,7 @@ Stem::brew_molecule (SCM smob) // dy? Real dy = Staff_symbol_referencer::staff_space (me) * 0.5; - + if (Grob *hed = support_head (me)) { /* @@ -573,7 +573,7 @@ Stem::brew_molecule (SCM smob) Real y_attach = Note_head::stem_attachment_coordinate ( hed, Y_AXIS); y_attach = head_height.linear_combination (y_attach); - stem_y[Direction (-d)] += d * 2*y_attach; + stem_y[Direction (-d)] += d * y_attach/dy; } if (!invisible_b (me)) diff --git a/lily/sustain-pedal.cc b/lily/sustain-pedal.cc index 0d8c21fe41..8c0cbed08f 100644 --- a/lily/sustain-pedal.cc +++ b/lily/sustain-pedal.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2001 Han-Wen Nienhuys + (c) 2000--2002 Han-Wen Nienhuys */ #include "grob.hh" diff --git a/lily/swallow-engraver.cc b/lily/swallow-engraver.cc index 5a3dcfdfbe..bda9d59b14 100644 --- a/lily/swallow-engraver.cc +++ b/lily/swallow-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #include "engraver.hh" diff --git a/lily/swallow-perf.cc b/lily/swallow-perf.cc index 7b2884b9fa..c374d78675 100644 --- a/lily/swallow-perf.cc +++ b/lily/swallow-perf.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #include "performer.hh" diff --git a/lily/system-start-delimiter-engraver.cc b/lily/system-start-delimiter-engraver.cc index 8f09785c38..2b509be6ac 100644 --- a/lily/system-start-delimiter-engraver.cc +++ b/lily/system-start-delimiter-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2001 Han-Wen Nienhuys + (c) 2000--2002 Han-Wen Nienhuys */ diff --git a/lily/system-start-delimiter.cc b/lily/system-start-delimiter.cc index ef0b23afee..e2c4f02d87 100644 --- a/lily/system-start-delimiter.cc +++ b/lily/system-start-delimiter.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2001 Han-Wen Nienhuys + (c) 2000--2002 Han-Wen Nienhuys */ #include diff --git a/lily/template5.cc b/lily/template5.cc index 15ed4d4c66..362acdd01e 100644 --- a/lily/template5.cc +++ b/lily/template5.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #include diff --git a/lily/tempo-performer.cc b/lily/tempo-performer.cc index fa2f0fd37c..3c37f69de6 100644 --- a/lily/tempo-performer.cc +++ b/lily/tempo-performer.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Jan Nieuwenhuizen + (c) 1997--2002 Jan Nieuwenhuizen */ #include "command-request.hh" diff --git a/lily/text-engraver.cc b/lily/text-engraver.cc index c6e668e4cc..e795c9e677 100644 --- a/lily/text-engraver.cc +++ b/lily/text-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2001 Han-Wen Nienhuys + (c) 1998--2002 Han-Wen Nienhuys */ diff --git a/lily/text-item.cc b/lily/text-item.cc index 1f83982d06..21b8729c1c 100644 --- a/lily/text-item.cc +++ b/lily/text-item.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2001 Han-Wen Nienhuys + (c) 1998--2002 Han-Wen Nienhuys Jan Nieuwenhuizen */ #include diff --git a/lily/text-spanner-engraver.cc b/lily/text-spanner-engraver.cc index 8698c945a2..043a9affa0 100644 --- a/lily/text-spanner-engraver.cc +++ b/lily/text-spanner-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2001 Jan Nieuwenhuizen + (c) 2000--2002 Jan Nieuwenhuizen */ #include "dimensions.hh" diff --git a/lily/text-spanner.cc b/lily/text-spanner.cc index b7b7bfc9c7..3376c8f016 100644 --- a/lily/text-spanner.cc +++ b/lily/text-spanner.cc @@ -4,7 +4,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2001 Jan Nieuwenhuizen + (c) 2000--2002 Jan Nieuwenhuizen */ #include "molecule.hh" diff --git a/lily/tfm-reader.cc b/lily/tfm-reader.cc index 7f816afc2a..c6a7952f9a 100644 --- a/lily/tfm-reader.cc +++ b/lily/tfm-reader.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Jan Nieuwenhuizen + (c) 1999--2002 Jan Nieuwenhuizen some code shamelessly copied from GNU fontutils-0.6/tfm/tfm_input.c diff --git a/lily/tfm.cc b/lily/tfm.cc index 6a8afd6e56..01b26efaba 100644 --- a/lily/tfm.cc +++ b/lily/tfm.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Jan Nieuwenhuizen + (c) 1999--2002 Jan Nieuwenhuizen some code shamelessly copied from GNU fontutils-0.6/tfm/tfm_input.c diff --git a/lily/third-try.cc b/lily/third-try.cc index 45f356073f..5816ce6d86 100644 --- a/lily/third-try.cc +++ b/lily/third-try.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Han-Wen Nienhuys + (c) 1999--2002 Han-Wen Nienhuys */ #include "line-of-score.hh" diff --git a/lily/thread-devnull-engraver.cc b/lily/thread-devnull-engraver.cc index 5fcbda14fb..bcdc487725 100644 --- a/lily/thread-devnull-engraver.cc +++ b/lily/thread-devnull-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2001 Jan Nieuwenhuizen + (c) 2000--2002 Jan Nieuwenhuizen */ #include "engraver.hh" diff --git a/lily/tie-column.cc b/lily/tie-column.cc index fa588acdcf..9c46164bb6 100644 --- a/lily/tie-column.cc +++ b/lily/tie-column.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2001 Han-Wen Nienhuys + (c) 2000--2002 Han-Wen Nienhuys */ diff --git a/lily/tie-engraver.cc b/lily/tie-engraver.cc index b725b64a4b..aa2bee3ae6 100644 --- a/lily/tie-engraver.cc +++ b/lily/tie-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2001 Han-Wen Nienhuys + (c) 1998--2002 Han-Wen Nienhuys */ diff --git a/lily/tie-performer.cc b/lily/tie-performer.cc index 53460fae9c..413e65fabc 100644 --- a/lily/tie-performer.cc +++ b/lily/tie-performer.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Jan Nieuwenhuizen + (c) 1999--2002 Jan Nieuwenhuizen */ diff --git a/lily/tie.cc b/lily/tie.cc index 7ba15e3491..2dea2b8846 100644 --- a/lily/tie.cc +++ b/lily/tie.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #include diff --git a/lily/time-scaled-music-iterator.cc b/lily/time-scaled-music-iterator.cc index df242b03ff..db0c669030 100644 --- a/lily/time-scaled-music-iterator.cc +++ b/lily/time-scaled-music-iterator.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2001 Han-Wen Nienhuys + (c) 1998--2002 Han-Wen Nienhuys */ diff --git a/lily/time-scaled-music.cc b/lily/time-scaled-music.cc index 62eed79c98..2b79cc390b 100644 --- a/lily/time-scaled-music.cc +++ b/lily/time-scaled-music.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2001 Han-Wen Nienhuys + (c) 1998--2002 Han-Wen Nienhuys */ diff --git a/lily/time-signature-engraver.cc b/lily/time-signature-engraver.cc index b7a2b26448..f352b498f0 100644 --- a/lily/time-signature-engraver.cc +++ b/lily/time-signature-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #include "time-signature.hh" diff --git a/lily/time-signature-performer.cc b/lily/time-signature-performer.cc index cb3f1322a9..71a20bafea 100644 --- a/lily/time-signature-performer.cc +++ b/lily/time-signature-performer.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Jan Nieuwenhuizen + (c) 1997--2002 Jan Nieuwenhuizen */ #include "audio-item.hh" diff --git a/lily/time-signature.cc b/lily/time-signature.cc index 2f96d04f7e..4a6f592934 100644 --- a/lily/time-signature.cc +++ b/lily/time-signature.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1996--2001 Han-Wen Nienhuys + (c) 1996--2002 Han-Wen Nienhuys */ diff --git a/lily/timing-engraver.cc b/lily/timing-engraver.cc index 88a54c93b9..d3aa30bb96 100644 --- a/lily/timing-engraver.cc +++ b/lily/timing-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #include "translator-group.hh" #include "command-request.hh" diff --git a/lily/timing-translator.cc b/lily/timing-translator.cc index 8158bb1831..2504cd7398 100644 --- a/lily/timing-translator.cc +++ b/lily/timing-translator.cc @@ -4,7 +4,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #include "debug.hh" diff --git a/lily/translator-ctors.cc b/lily/translator-ctors.cc index 0f41169106..9f2f4aa317 100644 --- a/lily/translator-ctors.cc +++ b/lily/translator-ctors.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #include "translator.hh" diff --git a/lily/translator-def.cc b/lily/translator-def.cc index 6d90f320be..2533c486cc 100644 --- a/lily/translator-def.cc +++ b/lily/translator-def.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2001 Han-Wen Nienhuys + (c) 2000--2002 Han-Wen Nienhuys */ diff --git a/lily/translator-group.cc b/lily/translator-group.cc index 34e8d0c63e..5ddf433ef9 100644 --- a/lily/translator-group.cc +++ b/lily/translator-group.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #include "music-output-def.hh" diff --git a/lily/translator.cc b/lily/translator.cc index fc40096331..f570543917 100644 --- a/lily/translator.cc +++ b/lily/translator.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ diff --git a/lily/transposed-music.cc b/lily/transposed-music.cc index 9efae9e62a..86c9b84849 100644 --- a/lily/transposed-music.cc +++ b/lily/transposed-music.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2001 Han-Wen Nienhuys + (c) 1998--2002 Han-Wen Nienhuys */ diff --git a/lily/tuplet-bracket.cc b/lily/tuplet-bracket.cc index efc2e33681..d53a5170ea 100644 --- a/lily/tuplet-bracket.cc +++ b/lily/tuplet-bracket.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Jan Nieuwenhuizen + (c) 1997--2002 Jan Nieuwenhuizen */ #include diff --git a/lily/tuplet-engraver.cc b/lily/tuplet-engraver.cc index 1aaa75a3c8..dc42574c38 100644 --- a/lily/tuplet-engraver.cc +++ b/lily/tuplet-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1998--2001 Han-Wen Nienhuys + (c) 1998--2002 Han-Wen Nienhuys */ diff --git a/lily/type-swallow-translator.cc b/lily/type-swallow-translator.cc index abc1540d77..194bd605b3 100644 --- a/lily/type-swallow-translator.cc +++ b/lily/type-swallow-translator.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #include "type-swallow-translator.hh" diff --git a/lily/un-relativable-music.cc b/lily/un-relativable-music.cc index f15bfa72a8..fc3b9a03b0 100644 --- a/lily/un-relativable-music.cc +++ b/lily/un-relativable-music.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2001 Han-Wen Nienhuys + (c) 2001--2002 Han-Wen Nienhuys */ diff --git a/lily/unfolded-repeat-iterator.cc b/lily/unfolded-repeat-iterator.cc index 7e8b12fbcd..cbdf210071 100644 --- a/lily/unfolded-repeat-iterator.cc +++ b/lily/unfolded-repeat-iterator.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1999--2001 Han-Wen Nienhuys + (c) 1999--2002 Han-Wen Nienhuys */ diff --git a/lily/untransposable-music.cc b/lily/untransposable-music.cc index d04127f4ac..4f1ea7f016 100644 --- a/lily/untransposable-music.cc +++ b/lily/untransposable-music.cc @@ -3,7 +3,7 @@ untransposable-music.cc -- implement Untransposable_music source file of the GNU LilyPond music typesetter -(c) 2001 Han-Wen Nienhuys +(c) 2001--2002 Han-Wen Nienhuys */ diff --git a/lily/vertical-align-engraver.cc b/lily/vertical-align-engraver.cc index cb4df699ce..3faa77f3d0 100644 --- a/lily/vertical-align-engraver.cc +++ b/lily/vertical-align-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #include "translator-group.hh" #include "paper-column.hh" diff --git a/lily/voice-devnull-engraver.cc b/lily/voice-devnull-engraver.cc index 0a27f98ca1..5fbcbe171e 100644 --- a/lily/voice-devnull-engraver.cc +++ b/lily/voice-devnull-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2001 Jan Nieuwenhuizen + (c) 2000--2002 Jan Nieuwenhuizen */ #include "engraver.hh" diff --git a/lily/volta-engraver.cc b/lily/volta-engraver.cc index e9026e63f5..d83272ba2b 100644 --- a/lily/volta-engraver.cc +++ b/lily/volta-engraver.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2001 Han-Wen Nienhuys + (c) 2000--2002 Han-Wen Nienhuys */ diff --git a/lily/volta-spanner.cc b/lily/volta-spanner.cc index bf6805ef56..8b3faa777b 100644 --- a/lily/volta-spanner.cc +++ b/lily/volta-spanner.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Jan Nieuwenhuizen + (c) 1997--2002 Jan Nieuwenhuizen */ #include diff --git a/lily/warn.cc b/lily/warn.cc index 1bead33c1d..721cdb1eb8 100644 --- a/lily/warn.cc +++ b/lily/warn.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 1997--2001 Han-Wen Nienhuys + (c) 1997--2002 Han-Wen Nienhuys */ #include "debug.hh" diff --git a/lilypond-indent.el b/lilypond-indent.el new file mode 100644 index 0000000000..5c2e3be458 --- /dev/null +++ b/lilypond-indent.el @@ -0,0 +1,316 @@ +;;; lilypond-indent.el --- Auto-indentation for lilypond code +;;; +;;; Chris Jackson +;;; some code is taken from ESS (Emacs Speaks Statistics) S-mode by A.J.Rossini + +;;; Variables for customising indentation style + +(defcustom LilyPond-indent-level 4 + "*Indentation of lilypond statements with respect to containing block.") + +(defcustom LilyPond-brace-offset 0 + "*Extra indentation for open braces. +Compares with other text in same context.") + +(defcustom LilyPond-angle-offset 0 + "*Extra indentation for open angled brackets . +Compares with other text in same context.") + +(defcustom LilyPond-scheme-paren-offset 0 + "*Extra indentation for open scheme parens . +Compares with other text in same context.") + +(defcustom LilyPond-close-brace-offset 0 + "*Extra indentation for closing braces.") + +(defcustom LilyPond-close-angle-offset 0 + "*Extra indentation for closing angle brackets.") + +(defcustom LilyPond-close-scheme-paren-offset 0 + "*Extra indentation for closing scheme parens.") + +(defcustom LilyPond-fancy-comments t + "*Non-nil means distiguish between %, %%, and %%% for indentation.") + + +(defun LilyPond-calculate-indent () + "Return appropriate indentation for current line as lilypond code. +In usual case returns an integer: the column to indent to. +Returns nil if line starts inside a string" + (save-excursion + (beginning-of-line) + (let ((indent-point (point)) + (case-fold-search nil) + state) + (setq containing-sexp (save-excursion (LilyPond-beginning-of-containing-sexp))) + (beginning-of-defun) + (while (< (point) indent-point) + (setq state (parse-partial-sexp (point) indent-point 0))) + ;; (setq containing-sexp (car (cdr state))) is the traditional way for languages + ;; with simpler parenthesis delimiters + (cond ((nth 3 state) + ;; point is in the middle of a string + nil) + ((nth 4 state) + ;; point is in the middle of a block comment + (LilyPond-calculate-indent-within-blockcomment)) + ((null containing-sexp) + ;; Line is at top level - no indent + (beginning-of-line) + 0) + (t + ;; Find previous non-comment character. + (goto-char indent-point) + (LilyPond-backward-to-noncomment containing-sexp) + ;; Now we get the answer. + ;; Position following last unclosed open. + (goto-char containing-sexp) + (or + ;; Is line first statement after an open brace or bracket? + ;; If no, find that first statement and indent like it. + (save-excursion + (forward-char 1) + ;; Skip over comments following open brace. + (skip-chars-forward " \t\n") + (cond ((looking-at "%{") + (while (progn + (and (not (looking-at "%}")) + (< (point) (point-max)))) + (forward-line 1) + (skip-chars-forward " \t\n")) + (forward-line 1) + (skip-chars-forward " \t\n")) + ((looking-at "%") + (while (progn (skip-chars-forward " \t\n") + (looking-at "%")) + (forward-line 1)))) + ;; The first following code counts + ;; if it is before the line we want to indent. + (and (< (point) indent-point) + (current-column))) + ;; If no previous statement, + ;; indent it relative to line brace is on. + ;; For open brace in column zero, don't let statement + ;; start there too. If LilyPond-indent-level is zero, use + ;; LilyPond-brace-offset instead + (+ (if (and (bolp) (zerop LilyPond-indent-level)) + (cond ((= (following-char) ?{) + LilyPond-brace-offset) + ((= (following-char) ?<) + LilyPond-angle-offset) + ((= (following-char) ?\)) + LilyPond-scheme-paren-offset) + (t + 0)) + LilyPond-indent-level) + (progn + (skip-chars-backward " \t") + (current-indentation))))))))) + + + +(defun LilyPond-indent-line () + "Indent current line as lilypond code. +Return the amount the indentation changed by." + (let ((indent (LilyPond-calculate-indent)) + beg shift-amt + (case-fold-search nil) + (pos (- (point-max) (point)))) + (beginning-of-line) + (setq beg (point)) + (cond ((eq indent nil) + (setq indent (current-indentation))) + (t + (skip-chars-forward " \t") + (if (and LilyPond-fancy-comments (looking-at "%%%\\|%{\\|%}")) + (setq indent 0)) + (if (and LilyPond-fancy-comments + (looking-at "%") + (not (looking-at "%%\\|%{\\|%}"))) + (setq indent comment-column) + (if (eq indent t) (setq indent 0)) + (if (listp indent) (setq indent (car indent))) + (cond + ((= (following-char) ?}) + (setq indent (+ indent (- LilyPond-close-brace-offset LilyPond-indent-level)))) + ((= (following-char) ?>) + (setq indent (+ indent (- LilyPond-close-angle-offset LilyPond-indent-level)))) + ((and (= (following-char) ?\)) (LilyPond-inside-scheme-p)) + (setq indent (+ indent (- LilyPond-close-scheme-paren-offset LilyPond-indent-level)))) + ((= (following-char) ?{) + (setq indent (+ indent LilyPond-brace-offset))) + ((= (following-char) ?<) + (setq indent (+ indent LilyPond-angle-offset))) + ((and (= (following-char) ?\() (LilyPond-inside-scheme-p)) + (setq indent (+ indent LilyPond-scheme-paren-offset))) + )))) + (skip-chars-forward " \t") + (setq shift-amt (- indent (current-column))) + (if (zerop shift-amt) + (if (> (- (point-max) pos) (point)) + (goto-char (- (point-max) pos))) + (delete-region beg (point)) + (indent-to indent) + ;; If initial point was within line's indentation, + ;; position after the indentation. + ;; Else stay at same point in text. + (if (> (- (point-max) pos) (point)) + (goto-char (- (point-max) pos)))) + shift-amt)) + + +(defun LilyPond-inside-comment-p () + "Return non-nil if point is inside a line or block comment" + (setq this-point (point)) + (or (save-excursion (beginning-of-line) + (skip-chars-forward " \t") + (looking-at "%")) + (save-excursion + ;; point is in the middle of a block comment + (setq lastopen (save-excursion (re-search-backward "%{[ \\t]*" (point-min) t))) + (setq lastclose (save-excursion (re-search-backward "%}[ \\t]*" (point-min) t))) + (if (or (and (= (char-before) ?%) (= (char-after) ?{)) + (and (= (char-after) ?%) (= (char-after (1+ (point))) ?{))) + (setq lastopen (save-excursion (backward-char) (point)))) + (and + lastopen + (or (not lastclose) + (<= lastclose lastopen)))) + )) + + +(defun LilyPond-inside-string-or-comment-p () + "Test if point is inside a string or a comment" + (setq this-point (point)) + (or (save-excursion (beginning-of-line) + (skip-chars-forward " \t") + (looking-at "%")) + (save-excursion + (beginning-of-defun) + (while (< (point) this-point) + (setq state (parse-partial-sexp (point) this-point 0))) + (cond ((nth 3 state) + ;; point is in the middle of a string + t ) + ((nth 4 state) + ;; point is in the middle of a block comment + t ) + (t + nil))))) + + +(defun LilyPond-backward-over-blockcomments (lim) + "Move point back to closest non-whitespace character not part of a block comment" + (setq lastopen (save-excursion (re-search-backward "%{[ \\t]*" lim t))) + (setq lastclose (save-excursion (re-search-backward "%}[ \\t]*" lim t))) + (if lastopen + (if lastclose + (if (<= lastclose lastopen) + (goto-char lastopen)) + (goto-char lastopen))) + (skip-chars-backward " %\t\n\f")) + + +(defun LilyPond-backward-over-linecomments (lim) + "Move point back to the closest non-whitespace character not part of a line comment. +Argument LIM limit." + (let (opoint stop) + (while (not stop) + (skip-chars-backward " \t\n\f" lim) + (setq opoint (point)) + (beginning-of-line) + (search-forward "%" opoint 'move) + (skip-chars-backward " \t%") + (setq stop (or (/= (preceding-char) ?\n) (<= (point) lim))) + (if stop (point) + (beginning-of-line))))) + + +(defun LilyPond-backward-to-noncomment (lim) + "Move point back to closest non-whitespace character not part of a comment" + (LilyPond-backward-over-linecomments lim) + (LilyPond-backward-over-blockcomments lim)) + + +(defun LilyPond-calculate-indent-within-blockcomment () + "Return the indentation amount for line inside a block comment." + (let (end percent-start) + (save-excursion + (beginning-of-line) + (skip-chars-forward " \t") + (skip-chars-backward " \t\n") + (setq end (point)) + (beginning-of-line) + (skip-chars-forward " \t") + (and (re-search-forward "%{[ \t]*" end t) + (goto-char (1+ (match-beginning 0)))) + (if (and (looking-at "[ \t]*$") (= (preceding-char) ?\%)) + (1+ (current-column)) + (current-column))))) + + +(defconst LilyPond-parens-regexp-alist + `(("[^\\]<" . "[^ \\n\\t_^-]\\s-*>\\|[_^-]\\s-*[-^]\\s-*>") + ;; a b c->, a b c^> and a b c_> are not close-angle-brackets, they're accents + ;; but a b c^-> and a b c^^> are close brackets with tenuto/marcato before them + ;; also \> and \< are hairpins + ("{" . "}"))) + + +(defconst LilyPond-parens-combined-regexp + (concat (mapconcat 'car LilyPond-parens-regexp-alist "\\|") + "\\|" + (mapconcat 'cdr LilyPond-parens-regexp-alist "\\|"))) + + +(defun LilyPond-beginning-of-containing-sexp () + "Move point to the beginning of the deepest parenthesis pair enclosing point." + (interactive) + (let ((level 1)) + (if (LilyPond-inside-scheme-p) + (setq paren-regexp "(\\|)" inside-scheme t) + (setq paren-regexp LilyPond-parens-combined-regexp inside-scheme nil)) + (while (and (> level 0) + (re-search-backward paren-regexp nil t) + (setq match (char-before (match-end 0)))) + (if (not (save-excursion (goto-char (match-end 0)) + (LilyPond-inside-string-or-comment-p))) + (if (memq match '(?} ?> ?\))) + (progn (setq level (1+ level)) + (if (and (= match ?>) + (looking-at ".\\s-+>\\|\\({\\|}\\|<\\|>\\|(\\|)\\)>")) + (forward-char 1))) + (progn (setq level (1- level)) + (if (and (= match ?<) + (looking-at ".\\s-+<\\|\\({\\|}\\|<\\|>\\|(\\|)\\)<")) + (forward-char 1)))))) + (if (looking-at ".<\\|.>") (forward-char 1)) + (if (/= level 1) + (point) + nil))) + + +(defun LilyPond-inside-scheme-p () + "Tests if point is inside embedded Scheme code" + (interactive) + (let ( (test-point (point)) + (level 0) ) + (save-excursion + (if (or (and (= (char-after (point)) ?\() + (or (= (char-after (- (point) 1)) ?#) + (and (= (char-after (- (point) 2)) ?#) + (= (char-after (- (point) 1)) ?`)))) + (and (re-search-backward "#(\\|#`(" nil t) + (progn + (search-forward "(") + (setq level 1) + (while (and (> level 0) + (re-search-forward "(\\|)" test-point t) + (setq match (char-after (match-beginning 0))) + (<= (point) test-point)) + (if (= match ?\() + (setq level (1+ level)) + (setq level (1- level)))) + (> level 0)))) + t + nil)))) diff --git a/ly/property-init.ly b/ly/property-init.ly index 3b40500bb5..4c1eb13019 100644 --- a/ly/property-init.ly +++ b/ly/property-init.ly @@ -156,8 +156,8 @@ 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 +showStaffSwitch = \property Voice.followVoice = ##t +hideStaffSwitch = \property Voice.followVoice = ##f % FIXME: Move this docu (to where?) diff --git a/make/out/lilypond.lsm b/make/out/lilypond.lsm index e2d08dc1f3..fa64366d99 100644 --- a/make/out/lilypond.lsm +++ b/make/out/lilypond.lsm @@ -1,15 +1,15 @@ Begin3 Title: LilyPond -Version: 1.5.28 -Entered-date: 29DEC01 +Version: 1.5.29 +Entered-date: 01FEB02 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.28.tar.gz + 1000k lilypond-1.5.29.tar.gz Original-site: ftp.cs.uu.nl /pub/GNU/LilyPond/development/ - 1000k lilypond-1.5.28.tar.gz + 1000k lilypond-1.5.29.tar.gz Copying-policy: GPL End diff --git a/make/out/lilypond.mandrake.spec b/make/out/lilypond.mandrake.spec index 551d79e308..4cd140015d 100644 --- a/make/out/lilypond.mandrake.spec +++ b/make/out/lilypond.mandrake.spec @@ -1,5 +1,5 @@ %define name lilypond -%define version 1.5.28 +%define version 1.5.29 %define release 1mdk Name: %{name} diff --git a/make/out/lilypond.redhat.spec b/make/out/lilypond.redhat.spec index 5566932b40..85fcdfba5a 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.28 +Version: 1.5.29 Release: 1 License: GPL Group: Applications/Publishing -Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.5.28.tar.gz +Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.5.29.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 eb1ce8bd70..6381982af8 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.28 +Version: 1.5.29 Release: 2 Copyright: GPL Group: Applications/Publishing -Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.5.28.tar.gz +Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.5.29.tar.gz # music notation software for.. ? Summary: A program for printing sheet music. URL: http://www.lilypond.org/ diff --git a/mf/feta-autometric.mf b/mf/feta-autometric.mf index 38f62a7758..2484a23b4a 100644 --- a/mf/feta-autometric.mf +++ b/mf/feta-autometric.mf @@ -4,7 +4,7 @@ % source file of the Feta (not an acronym for Font-En-Tja) % pretty-but-neat music font % -% (c) 1997--2001 Han-Wen Nienhuys +% (c) 1997--2002 Han-Wen Nienhuys % Jan Nieuwenhuizen % % these macros help create ascii logging output diff --git a/mf/feta-banier.mf b/mf/feta-banier.mf index dfa347ef75..045bf314f3 100644 --- a/mf/feta-banier.mf +++ b/mf/feta-banier.mf @@ -262,187 +262,6 @@ fet_beginchar("8th (down)", "d3", "deighthflag") 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; - %%%%%%%% % % @@ -593,245 +412,6 @@ 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; - save flagspace, total_depth, flag_count; - - flag_count = 1; - flare# = .99 staff_space#; - flagspace# = .9 staff_space#; - hip_depth_ratio = .72 ; - hip_width# = downflag_width# - hip_thickness#/2; - total_depth# = 2.85 staff_space#; - (flag_count-1) * flagspace# + foot_depth# = total_depth#; - - foot_width_ratio = .8; - - define_pixels(flare, hip_width, hip_thickness, - flagspace, foot_depth); - - set_char_box(hip_width# * hip_depth_ratio, - hip_width# + stemthickness#/2 + right_downflag_space#, - foot_depth# * hip_depth_ratio, -flare#) - - pickup pencircle scaled 1.5 stemthickness; - draw (-b, -d) .. (w,h); - y_mirror_char; -fet_endchar; - % ustem? % % diff --git a/mf/feta-beum.mf b/mf/feta-beum.mf index 936d9cf680..1f82ff8d25 100644 --- a/mf/feta-beum.mf +++ b/mf/feta-beum.mf @@ -3,7 +3,7 @@ % % source file of LilyPond's pretty-but-neat music font % -% (c) 1997--2001 Jan Nieuwenhuizen +% (c) 1997--2002 Jan Nieuwenhuizen % mode_setup; diff --git a/mf/feta-bolletjes.mf b/mf/feta-bolletjes.mf index c9273f1dd4..b0e2cab0f2 100644 --- a/mf/feta-bolletjes.mf +++ b/mf/feta-bolletjes.mf @@ -3,8 +3,9 @@ % % source file of LilyPond's pretty-but-neat music font % -% (c) 1997--2001 Jan Nieuwenhuizen +% (c) 1997--2002 Jan Nieuwenhuizen % & Han-Wen Nienhuys +% & Juergen Reuter % @@ -21,225 +22,10 @@ fet_begingroup("noteheads"); noteheight#:=staff_space#+ (1 + overdone_heads) *stafflinethickness#; define_pixels(noteheight); - -%%%%%%%% -% -% -% -% MENSURAL NOTATION -% -% -% -brevis_wid# := 2 staff_space#; - -def draw_brevis(expr brevwid) = - save beamheight, head_width; - save holeheight, stem_width; - save serif_size, serif_protrude; - - head_width# = brevwid; - holeheight = 3 stafflinethickness; - stem_width = 1.4 stafflinethickness; - - - define_pixels(head_width); - set_char_box(0, head_width#, noteheight#/2, noteheight#/2); - - 2 beamheight + holeheight = noteheight; - serif_size = (holeheight - stafflinethickness)/2; - serif_protrude = 1.5 serif_size; - penpos1(stem_width, 0); - penpos2(stem_width, 0); - penpos3(beamheight, 90); - penpos4(beamheight, 90); - penpos5(stem_width, 180); - - z1l = (0, 0); - z2l = (0, -stafflinethickness/2); - z3r = z2r + serif_size *(1,-1); - y4r = y3r; - x4r = head_width/2; - z5l = z3l + (-serif_size, -serif_protrude); - - penlabels(1,2,3,4, 5); - fill z1r -- z1l -- z5r{down} .. z5l{up} .. z3l{right} - -- z4l -- z4r -- z3r{left} .. z2r{up} -- cycle; - - addto currentpicture also currentpicture yscaled -1; - show z4r; show z4l; - addto currentpicture also currentpicture - shifted (-x4r,0) xscaled -1 shifted (x4l,0); - -enddef; - - -% -% Some sources (eg Musix/OpusTeX think that the appendage should be on -% the left, some say right. Right wins democratically. % -def draw_longa (expr wid) = - draw_brevis(wid); - save theta; - - x7r = head_width; - y7 = y5; -% z7 = z5; - z6 - z7 = (stem_width/2, -staff_space); - theta = angle(z6-z7)+ 90; - penpos7(stem_width, theta); - penpos6(1.2 stem_width, theta); - - fill z7r .. z6r{z6-z7} .. {z7-z6} z6l -- z7l -- cycle; - penlabels(6,7); -enddef; +%%% TODO: Document these! % -% En wij presenteren U: de opvolgster van Emily -% -% (ze is wel breed) -% -fet_beginchar("Maxima notehead", "-3mensural", "mensuralmaximahead"); - draw_longa (1.3 brevis_wid#) -fet_endchar; - -fet_beginchar("Longa notehead", "-2mensural", "mensurallongahead"); - draw_longa (brevis_wid#) -fet_endchar; - -fet_beginchar("Brevis notehead", "-1mensural", "mensuralbrevishead") - draw_brevis(brevis_wid#); -fet_endchar; - -def draw_neo_mensural_black_head (expr wid) = - save head_width; - head_width# = wid; - set_char_box (0, head_width#, noteheight#/2, noteheight#/2); - - - y3 = y1 =0; - x2 = x4 = (x1 + x3) /2; - define_pixels (head_width); - pickup pencircle scaled blot_diameter; - top y2 = h; - bot y4 = -d; - lft x1 = 0; - rt x3 = w; - - filldraw z1 -- z2 -- z3 -- z4 -- cycle; -enddef; - -def draw_neo_mensural_open_head (expr wid)= - draw_neo_mensural_black_head (wid); - save diamNW, diamSW; - diamNW = length (z2 - z1) + blot_diameter; - diamSW = length (z4 - z1) + blot_diameter; - - save hole_widthNW, hole_widthSW; - hole_widthNW = 0.34 diamNW ; - hole_widthSW + 2.6 stafflinethickness = diamSW; - - (z7 + z5)/2 = (w/2, 0); - (z8 + z6)/2 = (w/2, 0); - (z6 - z5) = hole_widthNW * unitvector (z2 - z1); - (z7 - z6) = hole_widthSW * unitvector (z4 - z1); - - labels (1,2,3,4,5,6,7,8); - - unfill z5 -- z6 -- z7 -- z8 --cycle; -enddef; - -fet_beginchar("Neo-mensural open head","0neo_mensural","neomensuralminimhead") - draw_neo_mensural_open_head (staff_space#); -fet_endchar; - -fet_beginchar("Neo-mensural open head","1neo_mensural","neomensuralsemiminimhead") - draw_neo_mensural_open_head (staff_space#); -fet_endchar; - -fet_beginchar("Neo-mensural black head","2neo_mensural","neofusahead") - draw_neo_mensural_black_head (staff_space#); -fet_endchar; - - -def draw_mensural_head (expr wid, open) = - save head_width; - head_width# = wid; - set_char_box (head_width#/2, head_width#/2, - noteheight#/2, noteheight#/2); - - define_pixels(head_width, noteheight); - - x1 = -x3; - y1 = x2 = y3 = x4 = 0; - y4 = -y2; - y2 = 1.4 noteheight/2; - tand(30) = x3 / y2; - - pickup pencircle - 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+zc+zd) -- (z2-zc+zd) -- - (z3-zc-zd) -- (z4+zc-zd) -- cycle; - else: - filldraw (z1+zc+zd) -- (z2-zc+zd) -- - (z3-zc-zd) -- (z4+zc-zd) -- cycle; - fi; -enddef; - - -fet_beginchar("Mensural open head","0mensural","mensuralminimhead") - draw_mensural_head (staff_space#, true); -fet_endchar; - -fet_beginchar("Mensural open head","1mensural","mensuralsemiminimhead") - draw_mensural_head (staff_space#, true); -fet_endchar; - -fet_beginchar("Mensural black head","2mensural","fusahead") - draw_mensural_head (staff_space#, false); -fet_endchar; - - -%%%%%%%%%%%% -% -% -% ledger (leger) lines -% -fet_beginchar("Ledger ending", "ledgerending", "ledgerending") -set_char_box (5/2 ledgerlinethickness#, 5/2 ledgerlinethickness#, - ledgerlinethickness#/2,ledgerlinethickness#/2); - pickup pencircle scaled 1.3 blot_diameter; - - rt x2 = w; - lft x1 = -b; - x3 = x2; - bot y1 = -d; - y2 = y1; - - top y3 = h; - y4 = y3; - x4 = x1; - - filldraw z1 --- z2 --- z3 --- z4 --- cycle ; -fet_endchar; - - - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% -% -% -% -% -% TODO: Document these! % setup user vars def setup_notehead_vars = @@ -487,47 +273,76 @@ fet_beginchar("Quart diamondhead", "2diamond", "diamondhead") fill black; fet_endchar; -save triangle; path triangle; -triangle = (-sqrt3/4,-1/2) -- (0,1) -- (sqrt3/4,-1/2) -- cycle; + + +begingroup; +def def_triangle = + save triangle,kern; path triangle; + kern = 1/3(x2-x1); + z2 = z1 rotated 120; + z3 = z1 rotated 240; + z12 = caveness[.5[z1,z2],z3]; + z23 = z12 rotated 120; + z31 = z12 rotated 240; + triangle = z1 .. z12 .. z2 .. + z2 .. z23 .. z3 .. + z3 .. z31 .. z1 .. + cycle; + triangle := triangle shifted (-x1+pent/2-kern,0) xscaled xs; + pickup pencircle scaled pent xscaled xs; + hei = max(y1,-y2)+pent/2; + %set_char_box(-kern*xs*fac, ((x3-x1)*fac+pent#)*xs,hei*fac,hei*fac); + set_char_box(0, ((x3-x1-kern)*fac+pent#)*xs,hei*fac,hei*fac); +enddef; +save fac,pent; +fac = noteheight#/noteheight; +pent# = 2stafflinethickness#; +define_pixels(pent); + fet_beginchar("Whole trianglehead", "0triangle", "wholetrianglehead") - set_char_box(0, 2(noteheight#+stafflinethickness#)/sqrt3*7/8, - (noteheight#+stafflinethickness#)/2,(noteheight#+stafflinethickness#)/2); - fill triangle scaled (7h/6) shifted (w/2,-h/6); - unfill triangle scaled 0.72h shifted (w/2,-h/6); + save hei,xs; + z1 = dir(130)*3/4noteheight; + xs = 1.5; + caveness:=0.1; + def_triangle; + draw triangle; fet_endchar; + fet_beginchar("Half trianglehead", "1triangle", "halftrianglehead") - thick := 1.2stafflinethickness; - set_char_box(0, 2noteheight#/sqrt3*7/8,noteheight#/2,noteheight#/2); - fill triangle scaled (7h/6) shifted (w/2,-h/6); - unfill triangle scaled 0.7h shifted (w/2,-h/6); + save hei,xs; + z1 = dir(130)*2/3noteheight; + xs = 1.2; + caveness:=0.1; + def_triangle; + draw triangle; fet_endchar; + fet_beginchar("Quart trianglehead", "2triangle", "trianglehead") - thick := 1.2stafflinethickness; - set_char_box(0, 2noteheight#/sqrt3*7/8,noteheight#/2,noteheight#/2); - fill triangle scaled (7h/6) shifted (w/2,-h/6); + save hei,xs; + z1 = dir(130)*2/3noteheight; + xs = 1.0; + caveness:=0.1; + def_triangle; + filldraw triangle; fet_endchar; +endgroup; + %%% Editable values: slope := 1.7; % slope of slash. From scm/grob-description.scm. How to auto-copy? -slt := 2/3*0.48staff_space; % thickness of lines. quarter notes get 1.5slt width. -slh := 2staff_space; % height of char. +slt# := 2/3*0.48staff_space#; % thickness of lines. quarter notes get 1.5slt width. +slh# := 2staff_space#; % height of char. %%% Calculated values: -sxa := 0; % how much the char exceeds the boundingbox horizontally: -slxt := sqrt(slt*slt+(slt/slope)*(slt/slope)); % Width of hor. pen - with thanks to Pythagoras -slw := slh/slope; % width of sloping part of slash: - -% is this really nessesary? -rz -fac# := staff_space#/staff_space; -slt# := fac#*slt; -slh# := fac#*slh; -sxa# := fac#*sxa; -slxt# := fac#*slxt; -slw# := fac#*slw; - -def draw_slash(expr hwid) = - wid# := slw#+2slxt#+hwid*fac#; +sxa# := 0; % how much the char exceeds the boundingbox horizontally: +slxt# := sqrt(slt#*slt#+(slt#/slope)*(slt#/slope)); % Width of hor. pen - with thanks to Pythagoras +slw# := slh#/slope; % width of sloping part of slash: + +define_pixels(slt,slh,sxa,slxt,slw); + +def draw_slash(expr hwid_hash) = + wid# := slw#+2slxt#+hwid_hash; set_char_box(0,wid#-2sxa#,slh#/2,slh#/2); define_pixels (wid#); pickup penrazor scaled slxt; @@ -539,15 +354,15 @@ def draw_slash(expr hwid) = enddef; fet_beginchar("Whole slashhead","0slash","wholeslashhead") - draw_slash(staff_space); + draw_slash(staff_space#); fet_endchar; fet_beginchar("Half slashhead","1slash","halfslashhead") - draw_slash(0.6staff_space); + draw_slash(0.6staff_space#); fet_endchar; fet_beginchar("Quart slashhead","2slash","quartslashhead") - draw_slash(-slxt/2); + draw_slash(-slxt#/2); fet_endchar; % thick is the distance between the two parallel lines in the cross (distance between centres of lines) @@ -593,10 +408,10 @@ fet_beginchar("Crossed notehead", "2cross", "crossedhead") fet_endchar; fet_beginchar("X-Circled notehead", "2xcircle", "xcircledhead") - wid# := black_notehead_width#; - hei# := noteheight#+stafflinethickness#; + wid# := black_notehead_width#*sqrt(sqrt2); + hei# := noteheight#*sqrt(sqrt2); set_char_box(0, wid#,hei#/2,hei#/2); - cthick := 1.2stafflinethickness; + cthick := (1.2+1/4)*stafflinethickness; cxr := w/2-cthick/2; cyr := h-cthick/2; pickup pencircle scaled cthick; @@ -607,359 +422,30 @@ fet_beginchar("X-Circled notehead", "2xcircle", "xcircledhead") draw (-xpos+w/2,ypos) -- (xpos+w/2,-ypos); fet_endchar; -%%%%%%%% -% -% -% -% EDITIO VATICANA -% -% -% - -% subbipunctum -fet_beginchar("Ed. Vat. subbipunctum", "0vaticana_subbipunctum", - "vatsubbipunctumhead") - save b_h, a_w; - a_b := 1.54; % b_h*a_b/a_w = wd/ht - b_h := 0.85; - a_w := 1.09; - - save a, beta, ht, wd; - ht# = noteheight#; - 2beta# = ht# * b_h; - a# = beta# * a_b; - wd# = 2a# / a_w; - set_char_box(0.3wd#, 0.3wd#, 0.5 ht#, 0.5 ht#); - black_notehead_width# := wd#; - - save za, alpha, size; - pair za; - define_pixels(ht, wd); - alpha = 35; - size = 0.45ht; - pickup pencircle - xscaled 0 - yscaled size rotated -alpha; - za = (0, size) / 2 rotated alpha; - draw -za .. za; - -fet_endchar; - - -% parametrized punctum -def punctum_char (expr verbose_name, internal_name, mudela_name, - left_stem, right_stem, - straight, reverse_convexity, excentric, up_shift, mag) = - - fet_beginchar(verbose_name, internal_name, mudela_name) - save b_h, a_w; - a_b := 1.54; % b_h*a_b/a_w = wd/ht - b_h := 0.85; - a_w := 1.09; - - save a, beta, ht, wd; - ht# = noteheight# * mag; - 2beta# = ht# * b_h; - a# = beta# * a_b; - wd# = 2a# / a_w; - set_char_box(0.25wd#, 0.25wd#, 0.5ht#, 0.5ht#); - black_notehead_width# := wd#; - - save convexity; - if straight: - if reverse_convexity: - convexity# = -0.02ht#; - else: - convexity# = +0.02ht#; - fi; - else: - if reverse_convexity: - convexity# = -0.05ht#; - else: - convexity# = +0.05ht#; - fi; - fi; - - save yoffs; - if up_shift: - yoffs# = 0.08ht#; - else: - yoffs# = 0.00ht#; - fi - - define_pixels(ht, wd, convexity, yoffs); - pickup pencircle scaled stafflinethickness; - - if excentric: - z1 = (0.00wd, yoffs - 1.0convexity); - z2 = (0.08wd, yoffs + 1.4convexity); - z3 = (0.40wd, yoffs); - penpos1(0.50ht, 90); - penpos2(0.50ht, 90); - penpos3(0.50ht, 90); - if reverse_convexity: - penstroke z1e{up} .. z2e{right} .. z3e; - else: - penstroke z1e{down} .. z2e{right} ..z3e; - fi; - else: - z1 = (0.00wd, yoffs); - z2 = (0.20wd, yoffs + convexity); - z3 = (0.40wd, yoffs); - penpos1(0.50ht, 90); - penpos2(0.50ht, 90); - penpos3(0.50ht, 90); - penstroke z1e .. z2e .. z3e; - fi; - - if left_stem: - z5=(0.00wd + 0.5 stafflinethickness, yoffs); - z6=(0.00wd + 0.5 stafflinethickness, yoffs - 1.5ht); - draw z5 -- z6; - elseif right_stem: - z5=(0.40wd - 0.25 stafflinethickness, yoffs); - z6=(0.40wd - 0.25 stafflinethickness, yoffs - 1.5ht); - draw z5 -- z6; - fi; - - fet_endchar; -enddef; - - -% punctum -punctum_char("Ed. Vat. punctum", "0vaticana_punctum", "vatpunctumhead", - false, false, false, false, false, false, 1.0); - -% virga (i.e. right stemmed punctum) -punctum_char("Ed. Vat. virga", "0vaticana_virga", "vatvirgahead", - false, true, false, false, false, false, 1.0); - -% left stemmed punctum as used in clivis (flexa) ligature -punctum_char("Ed. Vat. reverse virga", "0vaticana_rvirga", "vatrvirgahead", - true, false, false, false, false, false, 1.0); - -% pes lower punctum -punctum_char("Ed. Vat. pes lower punctum", "0vaticana_lpes", "vatlpeshead", - false, false, true, true, false, false, 1.0); - -% pes upper punctum -punctum_char("Ed. Vat. pes upper punctum", "0vaticana_upes", "vatupeshead", - false, false, true, false, false, false, 1.0); - -% pes upper punctum (shifted variation) -% -% Note: This note head is used instead of the regular pes upper -% punctum to avoid collision with the lower punctum note of the pes when -% the upper punctum sits directly on top of the lower punctum. -punctum_char("Ed. Vat. var pes upper punctum", "0vaticana_vupes", - "vatvupeshead", - false, false, true, false, false, true, 1.0); - -% small punctum as used in epiphonus/cephalicus -punctum_char("Ed. Vat. plica", "0vaticana_plica", "vatplicahead", - false, false, true, false, false, false, 0.5); - -% excentric punctum as used in epiphonus -punctum_char("Ed. Vat. epiphonus", "0vaticana_epiphonus", "vatepiphonushead", - false, false, false, true, true, false, 1.0); - -% excentric punctum as used in cephalicus -punctum_char("Ed. Vat. cephalicus", "0vaticana_cephalicus", - "vatcephalicushead", - false, false, false, false, true, false, 1.0); - -% quilisma -fet_beginchar("Ed. Vat. quilisma", "0vaticana_quilisma", "vatquilismahead") - save b_h,a_w; - a_b:=1.54; % b_h*a_b/a_w = wd/ht - b_h:=0.85; - a_w:=1.09; - - save a, beta, ht, wd; - ht# =noteheight#; - 2beta#=ht#*b_h; - a# = beta#*a_b; - wd# = 2a# / a_w; - set_char_box(0.1wd#, 0.4wd#, 0.5 ht#, 0.5 ht#); - black_notehead_width# := wd#; - - define_pixels(ht, wd); - pickup pencircle xscaled stafflinethickness yscaled 0.4ht; - z1=(0.00wd,-0.10ht); - z2=(0.00wd,+0.05ht); - z3=(0.15wd,-0.05ht); - z4=(0.15wd,+0.10ht); - z5=(0.30wd,+0.00ht); - z6=(0.30wd,+0.15ht); - draw z1 -- z2 -- z3 -- z4 -- z5 -- z6; -fet_endchar; - -%%%%%%%% -% -% -% -% EDITIO MEDICAEA +%%%%%%%%%%%% % % +% ledger (leger) lines % +fet_beginchar("Ledger ending", "ledgerending", "ledgerending") +set_char_box (5/2 ledgerlinethickness#, 5/2 ledgerlinethickness#, + ledgerlinethickness#/2,ledgerlinethickness#/2); + pickup pencircle scaled 1.3 blot_diameter; -% subbipunctum -fet_beginchar("Ed. Med. subbipunctum", "0medicaea_subbipunctum", - "medsubbipunctumhead") - save b_h, a_w; - a_b := 1.54; % b_h*a_b/a_w = wd/ht - b_h := 0.85; - a_w := 1.09; - - save a, beta, ht, wd; - ht# = noteheight#; - 2beta# = ht# * b_h; - a# = beta# * a_b; - wd# = 2a# / a_w; - set_char_box(wd#/2, wd#/2, 0.5 ht#, 0.5 ht#); - black_notehead_width# := wd#; + rt x2 = w; + lft x1 = -b; + x3 = x2; + bot y1 = -d; + y2 = y1; - save za, alpha, size; - pair za; - define_pixels(ht, wd); - alpha = 35; - size = 0.7ht; - pickup pencircle - xscaled 0 - yscaled size rotated -alpha; - za = (0, size) / 2 rotated alpha; - draw -za .. za; + top y3 = h; + y4 = y3; + x4 = x1; + filldraw z1 --- z2 --- z3 --- z4 --- cycle ; fet_endchar; -% parametrized punctum -def punctum_char (expr verbose_name, internal_name, mudela_name, - left_up_stem, left_down_stem) = - - fet_beginchar(verbose_name, internal_name, mudela_name) - - save a, beta, ht, wd; - ht# = 2 staff_space#; - wd# = ht#; - set_char_box(0.0, 0.4wd#, 0.5ht#, 0.5ht#); - black_notehead_width# := wd#; - - define_pixels(ht, wd); - pickup pencircle scaled stafflinethickness; - - z1 = (0.00wd, 0); - z2 = (0.20wd, 0); - z3 = (0.40wd, 0); - penpos1(0.50ht, 90); - penpos2(0.50ht, 90); - penpos3(0.50ht, 90); - penstroke z1e .. z2e .. z3e; - - if left_down_stem: - z5=(0.00wd + 0.5 stafflinethickness, 0); - z6=(0.00wd + 0.5 stafflinethickness, - 1.25ht); - draw z5 -- z6; - elseif left_up_stem: - z5=(0.00wd + 0.5 stafflinethickness, 0); - z6=(0.00wd + 0.5 stafflinethickness, + 1.25ht); - draw z5 -- z6; - fi; - - fet_endchar; -enddef; - -% punctum -punctum_char("Ed. Med. punctum", "0medicaea_punctum", "medpunctumhead", - false, false); - -% left up-stemmed punctum -punctum_char("Ed. Med. reverse virga", "0medicaea_rvirga", "medrvirgahead", - true, false); - -% virga (i.e. left down-stemmed punctum) -punctum_char("Ed. Med. virga", "0medicaea_virga", "medvirgahead", - false, true); - -%%%%%%%% -% -% -% -% HUFNAGEL -% -% -% - -% punctum -% parametrized punctum -def punctum_char (expr verbose_name, internal_name, mudela_name, - down_stem) = - - fet_beginchar(verbose_name, internal_name, mudela_name) - save b_h, a_w; - a_b := 1.54; % b_h*a_b/a_w = wd/ht - b_h := 0.85; - a_w := 1.09; - - save a, beta, ht, wd; - ht# = noteheight#; - 2beta# = ht# * b_h; - a# = beta# * a_b; - wd# = 2a# / a_w; - set_char_box(wd#/2, wd#/2, 0.5 ht#, 0.5 ht#); - black_notehead_width# := wd#; - - save za, zb, zc, alpha, size; - pair za, zb, zc; - define_pixels(ht, wd); - alpha = 55; - size = 0.7ht; - pickup pencircle - xscaled 0 - yscaled size rotated -alpha; - za = (0, size) / 2 rotated alpha; - draw -za .. za; - - if down_stem: - zb = (0.00wd, 0); - zc = (0.00wd, - 1.25ht); - draw zb -- zc; - fi; - fet_endchar; -enddef; - -% punctum -punctum_char("Hufnagel punctum", "0hufnagel_punctum", "hufpunctumhead", false) - -% virga -punctum_char("Hufnagel virga", "0hufnagel_virga", "hufvirgahead", true) - -% pes lower punctum -fet_beginchar("Hufnagel pes lower punctum", "0hufnagel_lpes", "huflpeshead") - save b_h, a_w; - a_b := 1.54; % b_h*a_b/a_w = wd/ht - b_h := 0.85; - a_w := 1.09; - - save a, beta, ht, wd; - ht# = noteheight#; - 2beta# = ht# * b_h; - a# = beta# * a_b; - wd# = 2a# / a_w; - set_char_box(wd#, wd#, 0.7 ht#, 0.7 ht#); - black_notehead_width# := wd#; - - save za, alpha, size; - pair za; - define_pixels(ht, wd); - alpha = 35; - size = 0.7ht; - pickup pencircle - xscaled 0 - yscaled size rotated -alpha; - za = (size, 0); - draw -za .. za; -fet_endchar; fet_endgroup("noteheads"); define_pixels(black_notehead_width); diff --git a/mf/feta-braces0.mf b/mf/feta-braces0.mf index ddc7665a88..01682e6567 100644 --- a/mf/feta-braces0.mf +++ b/mf/feta-braces0.mf @@ -3,7 +3,7 @@ % % source file of the Feta (Font-En-Tja) music font % -% (c) 1997--2001 Han-Wen Nienhuys +% (c) 1997--2002 Han-Wen Nienhuys % font_count := 0; diff --git a/mf/feta-braces1.mf b/mf/feta-braces1.mf index 9b401026f2..45c1c48dbc 100644 --- a/mf/feta-braces1.mf +++ b/mf/feta-braces1.mf @@ -3,7 +3,7 @@ % % source file of the Feta (Font-En-Tja) music font % -% (c) 1997--2001 Han-Wen Nienhuys +% (c) 1997--2002 Han-Wen Nienhuys % font_count := 1; diff --git a/mf/feta-braces2.mf b/mf/feta-braces2.mf index 1c6b8cf46d..85943ade62 100644 --- a/mf/feta-braces2.mf +++ b/mf/feta-braces2.mf @@ -3,7 +3,7 @@ % % source file of the Feta (Font-En-Tja) music font % -% (c) 1997--2001 Han-Wen Nienhuys +% (c) 1997--2002 Han-Wen Nienhuys % font_count := 2; diff --git a/mf/feta-braces3.mf b/mf/feta-braces3.mf index bc1650059e..a2907051ae 100644 --- a/mf/feta-braces3.mf +++ b/mf/feta-braces3.mf @@ -3,7 +3,7 @@ % % source file of the Feta (Font-En-Tja) music font % -% (c) 1997--2001 Han-Wen Nienhuys +% (c) 1997--2002 Han-Wen Nienhuys % font_count := 3; diff --git a/mf/feta-braces4.mf b/mf/feta-braces4.mf index 3c1ec3d2b7..623705f38f 100644 --- a/mf/feta-braces4.mf +++ b/mf/feta-braces4.mf @@ -3,7 +3,7 @@ % % source file of the Feta (Font-En-Tja) music font % -% (c) 1997--2001 Han-Wen Nienhuys +% (c) 1997--2002 Han-Wen Nienhuys % font_count := 4; diff --git a/mf/feta-braces5.mf b/mf/feta-braces5.mf index e8ed266ab3..d9b32e31cd 100644 --- a/mf/feta-braces5.mf +++ b/mf/feta-braces5.mf @@ -3,7 +3,7 @@ % % source file of the Feta (Font-En-Tja) music font % -% (c) 1997--2001 Han-Wen Nienhuys +% (c) 1997--2002 Han-Wen Nienhuys % font_count := 5; diff --git a/mf/feta-braces6.mf b/mf/feta-braces6.mf index 4fa7a79b87..64bd14092c 100644 --- a/mf/feta-braces6.mf +++ b/mf/feta-braces6.mf @@ -3,7 +3,7 @@ % % source file of the Feta (Font-En-Tja) music font % -% (c) 1997--2001 Han-Wen Nienhuys +% (c) 1997--2002 Han-Wen Nienhuys % font_count := 6; diff --git a/mf/feta-braces7.mf b/mf/feta-braces7.mf index 0cae71d6bd..fa3b730dd0 100644 --- a/mf/feta-braces7.mf +++ b/mf/feta-braces7.mf @@ -3,7 +3,7 @@ % % source file of the Feta (Font-En-Tja) music font % -% (c) 1997--2001 Han-Wen Nienhuys +% (c) 1997--2002 Han-Wen Nienhuys % font_count := 7; diff --git a/mf/feta-braces8.mf b/mf/feta-braces8.mf index a1071c5ffc..d5a6bb740e 100644 --- a/mf/feta-braces8.mf +++ b/mf/feta-braces8.mf @@ -3,7 +3,7 @@ % % source file of the Feta (Font-En-Tja) music font % -% (c) 1997--2001 Han-Wen Nienhuys +% (c) 1997--2002 Han-Wen Nienhuys % font_count := 8; diff --git a/mf/feta-eindelijk.mf b/mf/feta-eindelijk.mf index 24515de89e..55b73ee4a2 100644 --- a/mf/feta-eindelijk.mf +++ b/mf/feta-eindelijk.mf @@ -4,7 +4,7 @@ % % source file of the Feta (not the Font-En-Tja) music font % -% (c) 1997--2001 Jan Nieuwenhuizen +% (c) 1997--2002 Jan Nieuwenhuizen fet_begingroup("rests"); @@ -179,7 +179,7 @@ def rest_crook(expr a, w) = balled_crook(a, w, ball_crook_balldiam, ball_crook_stem) enddef; -fet_beginchar("8th rest","3","eighthrest"); +def draw_eighth_rest = % draw_staff (-2, 2, 0.0); save yshift, ballcorrection; ballcorrection = 0.005 staff_space; @@ -203,7 +203,11 @@ fet_beginchar("8th rest","3","eighthrest"); rest_crook (z1,w-stem/6); z2-z1=whatever*dir70; y2= yshift + stem/2; - brush(z1,2/3stem,z2,stem); + brush(z1,2/3stem,z2,stem); +enddef; + +fet_beginchar("8th rest","3","eighthrest"); + draw_eighth_rest; fet_endchar; @@ -343,8 +347,14 @@ fet_beginchar("128th rest","7","hundredtwentyeighthrest"); fet_endchar; +fet_beginchar("Classical quarter rest","2classical","clasquartrest"); + draw_eighth_rest; + currentpicture := currentpicture xscaled -1 shifted (w,0); + fet_endchar; + endgroup; + %%%%%%%% % % @@ -394,153 +404,5 @@ fet_beginchar("Neo-mensural half rest", "1neo_mensural", "neomensminimahalfrest" neomens_half_block_rest; fet_endchar; -neomensrestsize# = .8staff_space#; - -fet_beginchar("Neo-mensural 4th rest","2neo_mensural","neomenssemiminimarest") - set_char_box(0,neomensrestsize#,0,neomensrestsize#); - pickup pencircle scaled 2 stafflinethickness; - lft x1 = 0; - bot y1 = 0; - lft x2 = 0; - top y2 = h; - rt x3 = w; - bot y3 = h/2; - draw z1 .. z2; - draw z2 .. z3; -fet_endchar - -fet_beginchar("Neo-mensural 8th rest","3neo_mensural","neomensfusarest") - set_char_box(0,neomensrestsize#,0,neomensrestsize#); - pickup pencircle scaled 2 stafflinethickness; - rt x1 = w; - bot y1 = 0; - rt x2 = w; - top y2 = h; - lft x3 = 0; - bot y3 = h/2; - draw z1 .. z2; - draw z2 .. z3; -fet_endchar - -fet_beginchar("Neo-mensural 16th rest","4neo_mensural","neomenssemifusarest") - set_char_box(0,neomensrestsize#,0,staff_space#); - pickup pencircle scaled 2 stafflinethickness; - rt x1 = w; - bot y1 = 0; - rt x2 = w; - top y2 = h; - - draw z1 .. z2; - - pickup pencircle scaled 2 stafflinethickness; - rt x3 = w; - top y3 = h; - lft x4 = 0; - bot y4 = h/2; - rt x5 = w; - top y5 = 5/8h; - lft x6 = 0; - bot y6 = h/8; - - draw z3 .. z4; - draw z5 .. z6; -fet_endchar - -pen_width# = 2/5 staff_space#; -pen_height# = 0; -pen_rotation = 30; -slight_pen_rotation = 15; - -mens_block_rest_y# = 1/1 staff_space#; -mens_half_block_rest_y# = 5/8 staff_space#; - -define_pixels(mens_block_rest_y, mens_half_block_rest_y, - pen_width, pen_height); - -fet_beginchar("Mensural longa rest", "-2mensural", "menslongarest"); - set_char_box(pen_width#/2, pen_width#/2, - mens_block_rest_y#, mens_block_rest_y#); - pickup pencircle - xscaled pen_width - yscaled pen_height - rotated slight_pen_rotation; - draw (0, -mens_block_rest_y) -- (0, mens_block_rest_y); -fet_endchar; - -fet_beginchar("Mensural breve rest", "-1mensural", "mensbreverest"); - set_char_box(pen_width#/2, pen_width#/2, - 0, mens_block_rest_y#); - pickup pencircle - xscaled pen_width - yscaled pen_height - rotated slight_pen_rotation; - draw (0, 0) -- (0, mens_block_rest_y); -fet_endchar; - -fet_beginchar("Mensural whole rest", "0mensural", "menssemibrevisrest"); - set_char_box(pen_width#/2, pen_width#/2, - mens_half_block_rest_y#, 0); - pickup pencircle - xscaled pen_width - yscaled pen_height - rotated slight_pen_rotation; - draw (0, 0) -- (0, -mens_half_block_rest_y); -fet_endchar; - -fet_beginchar("Mensural half rest", "1mensural", "mensminimahalfrest"); - set_char_box(pen_width#/2, pen_width#/2, - 0, mens_half_block_rest_y#); - pickup pencircle - xscaled pen_width - yscaled pen_height - rotated slight_pen_rotation; - draw (0, 0) -- (0, mens_half_block_rest_y); -fet_endchar; - -mensrestsize# = .8staff_space#; - -fet_beginchar("Mensural 4th rest","2mensural","menssemiminimarest") - set_char_box(0,mensrestsize#,0,mensrestsize#); - pickup pencircle - xscaled pen_width - yscaled pen_height - rotated pen_rotation; - lft x1 = 0; y1 = 0; - lft x2 = 0; top y2 = 5/8 h; - rt x3 = 4/8 w; bot y3 = 6/8 h; - rt x4 = 10/8 w; bot y4 = 4/8 h; - draw z1 -- z2 -- z3 -- z4; -fet_endchar - -fet_beginchar("Mensural 8th rest","3mensural","mensfusarest") - set_char_box(0,mensrestsize#,0,mensrestsize#); - pickup pencircle - xscaled pen_width - yscaled pen_height - rotated pen_rotation; - rt x1 = 10/8 w; y1 = 0; - rt x2 = 10/8 w; top y2 = 5/8 h; - lft x3 = 2/8 w; bot y3 = 6/8 h; - lft x4 = 0; bot y4 = 4/8 h; - draw z1 -- z2 -- z3 -- z4; -fet_endchar - -fet_beginchar("Mensural 16th rest","4mensural","menssemifusarest") - set_char_box(0,mensrestsize#,0,staff_space#); - pickup pencircle - xscaled pen_width - yscaled pen_height - rotated pen_rotation; - - rt x1 = 10/8 w; y1 = 0; - rt x2 = 10/8 w; top y2 = 5.5/8 h; - lft x3 = 2/8 w; bot y3 = 6.5/8 h; - lft x4 = 0; bot y4 = 4.5/8 h; - rt x5 = 10/8 w; top y5 = 2.5/8 h; - lft x6 = 2/8 w; bot y6 = 3.5/8 h; - lft x7 = 0; bot y7 = 1.5/8 h; - draw z1 -- z2 -- z3 -- z4; - draw z5 -- z6 -- z7; -fet_endchar fet_endgroup("rests") diff --git a/mf/feta-generic.mf b/mf/feta-generic.mf index 67c702ddff..70920b37e7 100644 --- a/mf/feta-generic.mf +++ b/mf/feta-generic.mf @@ -5,7 +5,7 @@ % source file of the Feta (defintively not an abbreviation for Font-En-Tja) % music font % -% (c) 1997--2001 Han-Wen Nienhuys +% (c) 1997--2002 Han-Wen Nienhuys % @@ -35,7 +35,7 @@ if test = 0: input feta-timesig; input feta-pendaal; input feta-accordion; - input feta-custodes; + else: % input feta-bolletjes; % input feta-banier; diff --git a/mf/feta-klef.mf b/mf/feta-klef.mf index 6ad17211d6..cf05a663a5 100644 --- a/mf/feta-klef.mf +++ b/mf/feta-klef.mf @@ -4,9 +4,9 @@ % % source file of the Feta (not the Font-En-Tja) music font % -% (c) 1997--2001 Han-Wen Nienhuys , +% (c) 1997--2002 Han-Wen Nienhuys , % Jan Nieuwenhuizen , -% Juergen Reuter +% Juergen Reuter fet_begingroup("clefs"); @@ -309,875 +309,210 @@ fet_beginchar("G clef", "G_change", "ctrebleclef") draw_gclef((1.3 staff_space#,0), .8); fet_endchar; -%%%%%%%% +%%%% +% PERCUSSION % % -% -% Editio Vaticana -% -% -% -def draw_vaticana_do_clef(expr exact_center, reduction) = - save reduced_il; - - reduced_il# = staff_space# * reduction; - - set_char_box(0.4reduced_il#, 0.4reduced_il#, 0, reduced_il#); - - define_pixels(reduced_il); - - pickup pencircle xscaled stafflinethickness yscaled 0.6reduced_il; - - save za, zb, zc, zd, ze, zf; - pair za, zb, zc, zd, ze, zf; - - za = exact_center + (-0.0reduced_il, -.45reduced_il); - zb = exact_center + (-0.2reduced_il, -.50reduced_il); - zc = exact_center + (-0.4reduced_il, -.25reduced_il); - zd = exact_center + (-0.4reduced_il, +.25reduced_il); - ze = exact_center + (-0.2reduced_il, +.50reduced_il); - zf = exact_center + (-0.0reduced_il, +.45reduced_il); - draw za .. zb .. zc -- % lower punctum - zd .. ze .. zf; % upper punctum -enddef; - - -fet_beginchar("Ed. Vat. do clef", "vaticana_do", "vatdoclef") - if test = 1: - draw_staff(-1,3, 0.0); - fi; - draw_vaticana_do_clef((0,0), 1.0); -fet_endchar; -fet_beginchar("Ed. Vat. do clef", "vaticana_do_change", "vatcdoclef") - draw_vaticana_do_clef((0,0), 1.0); % no reduction -fet_endchar; - - -def draw_vaticana_fa_clef(expr exact_center, reduction) = - - save reduced_il, z; - reduced_il# = staff_space# * reduction; - define_pixels(reduced_il); - - save za, zb, zc, zd, ze; - pair za, zb, zc, zd, ze; - - %stem - pickup pencircle scaled stafflinethickness; - xpart za = xpart zb = - xpart exact_center + 0.4reduced_il; - ypart za = ypart exact_center = ypart zb + 1.5reduced_il; - draw za .. zb; - - %left-handed punctum - pickup pencircle xscaled stafflinethickness yscaled 0.5reduced_il; - zc = exact_center + - (+0.4reduced_il, -0.05reduced_il); - zd = exact_center + - (+0.2reduced_il, +0.05reduced_il); - ze = exact_center + - (+0.0reduced_il, +0.00reduced_il); - draw zc .. zd .. ze; - - %right-handed puncta as in do clef - draw_vaticana_do_clef( - exact_center + - (+0.8reduced_il + 1.25stafflinethickness, 0), - reduction); - - set_char_box(0.5reduced_il#, 1.5reduced_il#, 0, reduced_il#); -enddef; -fet_beginchar("Ed. Vat. fa clef", "vaticana_fa", "vatfaclef") - if test = 1: - draw_staff(-1,3, 0.0); - fi; - draw_vaticana_fa_clef((0,0), 1.0); -fet_endchar; -fet_beginchar("Ed. Vat. fa clef", "vaticana_fa_change", "vatcfaclef") - draw_vaticana_fa_clef((0,0), 1.0); % no reduction -fet_endchar; - -%%%%%%%% -% -% -% -% Editio Medicaea -% -% -% -def draw_medicaea_do_clef(expr exact_center, reduction) = - save reduced_il, reduced_slt; - reduced_il# = staff_space# * reduction; - reduced_slt# = stafflinethickness# * reduction; - define_pixels(reduced_il); - define_pixels(reduced_slt); - - save flag_height; - flag_height# = 0.5 reduced_il#; - define_pixels(flag_height); - - %lower flag - save za, zb; - pair za, zb; - pickup pencircle xscaled reduced_slt yscaled flag_height; - xpart exact_center - = xpart za + 0.5 reduced_il - = xpart zb - 0.5 reduced_il; - ypart za = ypart exact_center - 0.5 flag_height - - 0.5 (staff_space - reduced_il); - ypart zb = ypart za - reduced_il + flag_height; - draw za .. zb; - - %upper flag - save za, zb; - pair za, zb; - pickup pencircle xscaled reduced_slt yscaled flag_height; - xpart exact_center - = xpart za + 0.5 reduced_il - = xpart zb - 0.5 reduced_il; - ypart za = ypart exact_center - 0.5 flag_height - - 0.5 (staff_space - reduced_il) - + staff_space; - ypart zb = ypart za - reduced_il + flag_height; - draw za .. zb; - - %stem - save za, zb; - pair za, zb; - pickup pencircle scaled reduced_slt; - xpart za = xpart zb = xpart exact_center - 0.5 reduced_il; - ypart exact_center - = ypart za + 1.5 reduced_il - = ypart zb - 1.5 reduced_il; - draw za .. zb; - - set_char_box(0.5reduced_il#, 1.5reduced_il#, - 1.5reduced_il#, 1.5reduced_il#); -enddef; - - -fet_beginchar("Ed. Med. do clef", "medicaea_do", "meddoclef") - if test = 1: - draw_staff(-1,3, 0.0); - fi; - draw_medicaea_do_clef((0,0), 1.0); -fet_endchar; -fet_beginchar("Ed. Med. do clef", "medicaea_do_change", "cmeddoclef") - draw_medicaea_do_clef((0,0), .8); -fet_endchar; - - -def draw_medicaea_fa_clef(expr exact_center, reduction) = - % inspired by Regensburger Edition of Medicaea (1885/86), in: - % MGG, volume 2, col. 1327 ("Choralreform"), fig. 2. - - save reduced_il, reduced_slt; - reduced_il# = staff_space# * reduction; - reduced_slt# = stafflinethickness# * reduction; - define_pixels(reduced_il); - define_pixels(reduced_slt); - - save za, zb, zc, zd, ze; - pair za, zb, zc, zd, ze; - - %stem - pickup pencircle scaled stafflinethickness; - xpart za = xpart zb = - xpart exact_center + 0.4reduced_il; - ypart za = ypart exact_center = ypart zb + 1.5reduced_il; - draw za -- zb; - - %left-handed punctum - pickup pencircle xscaled reduced_slt yscaled reduced_il; - zc = exact_center + - (+0.4reduced_il, 0); - zd = exact_center + - (+0.0reduced_il, 0); - draw zc -- zd; - - %right-handed puncta as in do clef - draw_medicaea_do_clef( - exact_center + - (+1.1reduced_il + 1.25stafflinethickness, 0), - reduction); - - set_char_box(reduced_il#/2, 2.6reduced_il#, 0, reduced_il#); -enddef; - - -fet_beginchar("Ed. Med. fa clef", "medicaea_fa", "medfaclef") - if test = 1: - draw_staff(-1,3, 0.0); - fi; - draw_medicaea_fa_clef((0,0), 1.0); -fet_endchar; -fet_beginchar("Ed. Med. fa clef", "medicaea_fa_change", "cmedfaclef") - draw_medicaea_fa_clef((0,0), .8); -fet_endchar; - - -%%%%%%%% -% -% -% -% Mensural Notation -% -% -% -brevis_wid# := 2 staff_space#; - -def draw_brevis(expr exact_center, reduction, small_width, small_height) = - % - % inspired by function draw_brevis of - % feta-bolletjes.mf - % - save reduced_slt, reduced_nht; - save stem_width, head_width; - save serif_size, serif_protrude; - save holeheight, beamheight; - - reduced_slt# = stafflinethickness# * reduction; - reduced_nht# = noteheight# * reduction; - stem_width# = 1.4 reduced_slt#; - if small_width: - head_width# = 0.5brevis_wid# * reduction; - else: - head_width# = brevis_wid# * reduction; - fi; - if small_height: - serif_size# = 0.64 reduced_slt#; - serif_protrude# = 0.96 serif_size#; - holeheight# = 3 reduced_slt#; - beamheight# = 0.32(reduced_nht# - holeheight#); - else: - serif_size# = 1.0 reduced_slt#; - serif_protrude# = 1.5 serif_size#; - holeheight# = 3 reduced_slt#; - beamheight# = 0.5(reduced_nht# - holeheight#); - fi; - define_pixels(reduced_slt); - define_pixels(stem_width); - define_pixels(head_width); - define_pixels(serif_size); - define_pixels(serif_protrude); - define_pixels(beamheight); - - penpos1(stem_width, 0); - penpos2(stem_width, 0); - penpos3(beamheight, 90); - penpos4(beamheight, 90); - penpos5(stem_width, 180); - - z1l = exact_center; - z2l = z1l + (0, -reduced_slt/2); - z3r = z2r + serif_size*(1,-1); - y4r = y3r; - x4l = x1l + head_width/2; - z5l = z3l + (-serif_size, -serif_protrude); - - penlabels(1,2,3,4,5); - fill z1r -- z1l -- z5r{down} .. z5l{up} .. z3l{right} - -- z4l -- z4r -- z3r{left} .. z2r{up} -- cycle; -enddef; - - -def draw_neo_mensural_c_clef(expr exact_center, reduction) = - draw_brevis(exact_center, reduction, false, false); - - save reduced_il, reduced_slt; - save stem_width; - - reduced_il# = staff_space# * reduction; - reduced_slt# = stafflinethickness# * reduction; - stem_width# = 1.4 reduced_slt#; - - define_pixels(reduced_il); - define_pixels(reduced_slt); - define_pixels(stem_width); - - penpos6(stem_width, 0); - penpos7(stem_width, 0); - z6l = exact_center; - z7l = z6l + (0, -2reduced_il); - fill z6l -- z7l -- z7r -- z6r -- cycle; - penpos8(stem_width, 0); - penpos9(stem_width, 0); - z8l = z6l + (-3reduced_slt, 0); - z9l = z8l + (0, -2reduced_il); - fill z8l -- z9l -- z9r -- z8r -- cycle; - - addto currentpicture also currentpicture - yscaled -1 shifted (0, 2*(ypart exact_center)); - addto currentpicture also currentpicture - xscaled -1 shifted (2x4l,0); - - set_char_box(0, 2head_width#, - 6reduced_slt#*reduction, 6reduced_slt#*reduction); -enddef; - - -fet_beginchar("neo-mensural c clef", "neo_mensural_c", "neomenscclef") - if test = 1: - draw_staff(-1,3, 0.0); - fi; - draw_neo_mensural_c_clef((0,0), 1.0); -fet_endchar; -fet_beginchar("neo-mensural c clef", "neo_mensural_c_change", "cneomenscclef") - draw_neo_mensural_c_clef((1.3 staff_space#,0), .8); -fet_endchar; - - -def draw_petrucci_c_clef(expr exact_center, reduction) = - % inspired by Josquin Desprez, "Stabat Mater", Libro tertio, - % 1519, printed by Petrucci, in: MGG, volume 7, Table 11. - draw_brevis(exact_center, reduction, true, true); - - save reduced_il, reduced_slt; - save stem_width, interline; - - reduced_il# = staff_space# * reduction; - reduced_slt# = stafflinethickness# * reduction; - stem_width# = 1.4 reduced_slt#; - interline# = staff_space#; - - define_pixels(reduced_il); - define_pixels(reduced_slt); - define_pixels(stem_width); - define_pixels(interline); - - addto currentpicture also currentpicture - yscaled -1 shifted (0, 2*(ypart exact_center) - interline); - - penpos6(stem_width, 0); - penpos7(stem_width, 0); - z6l = exact_center + (0, 0); - z7l = z6l + (0, -2.2reduced_il); - fill z6l -- z7l -- z7r -- z6r -- cycle; - - addto currentpicture also currentpicture - xscaled -1 shifted (2x4l,0); - - penpos8(stem_width, 0); - penpos9(stem_width, 0); - z8l = exact_center + (0, 0); - z9l = z8l + (0, -3.2reduced_il); - fill z8l -- z9l -- z9r -- z8r -- cycle; - - addto currentpicture also currentpicture - yscaled -1 shifted (0, 4*(ypart exact_center)); - - set_char_box(0, 2head_width#, - noteheight#*4*reduction, noteheight#*4*reduction); -enddef; - - -fet_beginchar("petrucci c clef", "petrucci_c", "petruccicclef") - if test = 1: - draw_staff(-1,3, 0.0); - fi; - draw_petrucci_c_clef((0,0), 1.0); -fet_endchar; -fet_beginchar("petrucci c clef", "petrucci_c_change", "cpetruccicclef") - draw_petrucci_c_clef((1.3 staff_space#,0), .8); -fet_endchar; - - -def draw_mensural_c_clef(expr exact_center, reduction) = - % inspired by Ockeghem, "Missa Prolationum", in: MGG, volume - % 9, table 94. - draw_petrucci_c_clef(exact_center, reduction); - - addto currentpicture also currentpicture - shifted (0, -interline); - - set_char_box(0, 2head_width#, - noteheight#*6*reduction, noteheight#*6*reduction); -enddef; - - -fet_beginchar("mensural c clef", "mensural_c", "menscclef") - if test = 1: - draw_staff(-1,3, 0.0); - fi; - draw_mensural_c_clef((0,0), 1.0); -fet_endchar; -fet_beginchar("mensural c clef", "mensural_c_change", "cmenscclef") - draw_mensural_c_clef((0,0), .8); -fet_endchar; - -def draw_diamond(expr exact_center, reduction) = - save stem_width, reduced_il, reduced_nht, holeheight, beamheight; - save rh_height, rh_width; - - stem_width# = 1.4 reduced_slt#; - reduced_il# = staff_space# * reduction; - reduced_nht# = noteheight# * reduction; - holeheight# = 3 reduced_slt#; - beamheight# = 0.4(reduced_nht# - holeheight#); - - rh_height# = 1.2reduced_il#; - rh_width# / rh_height# = 0.58; % tan(30) - - define_pixels(beamheight); - define_pixels(stem_width); - define_pixels(rh_height); - define_pixels(rh_width); - - pickup pencircle - xscaled beamheight - yscaled stem_width - rotated 45; - - draw - exact_center + (-rh_width/2, 0) -- - exact_center + (0, rh_height/2) -- - exact_center + (+rh_width/2, 0) -- - exact_center + (0, -rh_height/2) -- - cycle; -enddef; - -def draw_petrucci_f_clef(expr exact_center, reduction) = - % inspired by L'homme arme super voces musicales in Misse - % Josquin, 1502, Petrucci, in: MGG, volume 7, col. 200; also - % inspired by Gaspar van Weerbeke, "Virgo Maria" (1502), in: - % MGG, volume 9, col. 653 ("Motette"), fig. 3.; also by Andr'e - % Campra, "Entr'ee des s'er'enades" (1710), in: MGG, volume 2, - % col. 1649 ("Contredanse"), fig. 2. - % - draw_brevis(exact_center, reduction, true, false); - - save reduced_il, reduced_slt; - save stem_width, interline; - - reduced_il# = staff_space# * reduction; - reduced_slt# = stafflinethickness# * reduction; - stem_width# = 1.4 reduced_slt#; - interline# = staff_space#; - - define_pixels(reduced_il); - define_pixels(reduced_slt); - define_pixels(stem_width); - define_pixels(interline); - - addto currentpicture also currentpicture - yscaled -1 shifted (0, 2*(ypart exact_center)); - addto currentpicture also currentpicture - xscaled -1 shifted (2x4l,0); - - penpos6(stem_width, 0); - penpos7(stem_width, 0); - z6r = exact_center + (2x4l, 0); - z7r = z6r + (0, -4reduced_il); - fill z6l -- z7l -- z7r -- z6r -- cycle; - - draw_diamond(exact_center + - (1.6interline*reduction, interline/2), reduction); - - % upper stem - penpos8(stem_width, 0); - penpos9(stem_width, 0); - z8l = exact_center + (1.6interline*reduction, interline*reduction); - z9l = z8l + (0, 1.5interline*reduction); - fill z8l -- z9l -- z9r -- z8r -- cycle; - - draw_diamond(exact_center + - (1.6interline*reduction, -interline/2), reduction); - penpos10(stem_width, 0); - penpos11(stem_width, 0); - z10r = exact_center + (1.6interline*reduction, -interline*reduction); - z11r = z10r + (0, -3.5interline*reduction); - fill z10l -- z11l -- z11r -- z10r -- cycle; - - set_char_box(0, 3head_width#, - 3.5noteheight#*reduction, 1.5noteheight#*reduction); -enddef; - - -fet_beginchar("petrucci f clef", "petrucci_f", "petruccifclef") - if test = 1: - draw_staff(-1,3, 0.0); - fi; - draw_petrucci_f_clef((0,0), 1.0); -fet_endchar; -fet_beginchar("petrucci f clef", "petrucci_f_change", "cpetruccifclef") - draw_petrucci_f_clef((0,0), .8); -fet_endchar; - - -def draw_mensural_f_clef(expr exact_center, reduction) = - % - % inspired by Philippe le Duc, "Dite Signori" (1590), in: MGG, - % volume 3, col. 848 ("Duc"); also by John Dowland, "The First - % Booke of Songes" (1597), in: MGG, volume 3, col. 721 - % ("Dowland"), fig. 3. - - save reduced_slt, stem_width, reduced_nht, holeheight, beamheight; - - reduced_slt# = stafflinethickness# * reduction; - stem_width# = 1.4 reduced_slt#; - reduced_nht# = noteheight# * reduction; - holeheight# = 3 reduced_slt#; - beamheight# = 0.4(reduced_nht# - holeheight#); - - define_pixels(beamheight, stem_width, staff_space); - - pickup pencircle - xscaled beamheight - yscaled stem_width - rotated 45; - - draw - exact_center + (1.0 staff_space, 0.6 staff_space) -- - exact_center + (1.25 staff_space, 0.4 staff_space); - - draw - exact_center + (1.0 staff_space, -0.4 staff_space) -- - exact_center + (1.25 staff_space, -0.6 staff_space); - - draw halfcircle scaled 1.2 staff_space rotated -90 - shifted (-exact_center + (+0.1 staff_space, 0)); - - set_char_box(0, 3staff_space#, 3staff_space#, 0); -enddef; - -fet_beginchar("mensural f clef", "mensural_f", "mensfclef") - if test = 1: - draw_staff(-1,3, 0.0); - fi; - draw_mensural_f_clef((0,0), 1.0); -fet_endchar; -fet_beginchar("mensural f clef", "mensural_f_change", "cmensfclef") - draw_mensural_f_clef((0,0), .8); -fet_endchar; - - -def draw_mensural_g_clef(expr exact_center, reduction) = - % - % inspired by Francisco Guerrero, "Lib. 1. Missarum" (1566), - % in: MGG, volume 3, col. 858 ("Ducis"); also by Stefano - % Fabri, "Quam speciosa veteranis" (1611), in: MGG, volume 3, - % col. 1698 ("Fabri"); also by Philippus Dulichius, - % "Fasciculus novus ..." (1598), in: MGG, volume 3, col. 919 - % ("Dulichius"), fig. 1; also by Noe Faignient, "Ic sal de - % Heer myn God gebenedye" (1568), in: MGG, volume 3, col. 1735 - % ("Faignient"). - % - % Metafont code partially inspired by Schwabacher 'G' of yswab - % font. - - save reduced_il, stem_width, height, width, apex_o, hair; - - reduced_il#=staff_space#*reduction; - - set_char_box(0.5reduced_il#, 1.5reduced_il#, - 1.5reduced_il#, 1.5reduced_il#); - - stem_width# = 0.17 reduced_il#; - height# = 1.5 reduced_il#; - width# = 1.13 reduced_il#; - apex_o# = 0.02 reduced_il#; - hair# = 3 stafflinethickness#; - define_pixels(reduced_il, stem_width, height, width, apex_o, hair); - - penpos1(2 stem_width, -142); - z1l = (0.715 width, 0.742 height); - penpos1'(hair, -90); - z1'l = z1r; - penpos2(1.179 stem_width, -142); - z2l = (width, 0.466 height); - penpos3(hair, 77); - z3 = (0.764 width, 0.067 height); - z4 = (0.59 width, -apex_o); - penpos5(1.179 stem_width, 32); - z5l=(0, 0.457 height); - penpos6(hair, -56.5); - z7 = (x4 - 0.843 stem_width, height + apex_o); - z7 - z6l = whatever * dir33.5; - penpos8(1.286 stem_width, -130); - z8r = (0.715 width, 0.742 height) + (-apex_o, apex_o); - z6r - z8r = whatever * (z7 - z8l); - filldraw - z1'r{dir45} .. z2r{down} .. z3r{dir207} .. z5r{up} .. - z6r{z7-z6l} & z6r -- z8r -- z8l -- z7 --- z6l ... - z5l{down} .. z4{right} .. z3l{dir27} .. z2l{up} .. - z1l{1/3[z6l,z7]-z1l} & z1l -- z1r -- z1'r & cycle - shifted (-exact_center + (0, -0.75reduced_il)); - - penpos9(stem_width, 0); - x9r = x4; y9 = 0.3 height; - - pickup pencircle - scaled stem_width - rotated 45; - draw z9 -- (z9 + (0, -0.4reduced_il)) - shifted (-exact_center + (0, -0.75reduced_il)); - - pickup pencircle - xscaled stem_width - yscaled hair - rotated 30; - - draw halfcircle - scaled 0.5 reduced_il - rotated -90 - shifted z8 - shifted (0, 0.25reduced_il) - shifted (-exact_center + (0, -0.75reduced_il)); - - draw halfcircle - scaled 0.4 reduced_il - rotated 90 - shifted (z8 + (0, 0.45 reduced_il)) - shifted (0, 0.25reduced_il) - shifted (-exact_center + (0, -0.75reduced_il)); -enddef; - - -fet_beginchar("mensural g clef", "mensural_g", "mensgclef") - if test = 1: - draw_staff(-1,3, 0.0); - fi; - draw_mensural_g_clef((0,0), 1.0); -fet_endchar; -fet_beginchar("mensural g clef", "mensural_g_change", "cmensgclef") - draw_mensural_g_clef((0,0), .8); -fet_endchar; - - - -def draw_petrucci_g_clef(expr exact_center, reduction) = - % inspired by Josquin Desprez, "Stabat Mater", Libro tertio, - % 1519, printed by Petrucci, in: MGG, volume 7, Table 11. - - set_char_box(0.6 staff_space#, 0.8 staff_space#, 0.6 staff_space#, - 4.0 staff_space#); - - save reduced_il, reduced_slt; - - reduced_il# = staff_space# * reduction; - reduced_slt# = stafflinethickness# * reduction; - define_pixels(reduced_il, reduced_slt); - - save za, zb, zc, zd, ze, zf, zg, zh, zi, zj; - pair za, zb, zc, zd, ze, zf, zg, zh, zi, zj; - - pickup pencircle - xscaled 0.50 reduced_slt - yscaled 0.22 reduced_il - rotated -35; - - za = exact_center + (+0.00 reduced_il, +0.00 reduced_il); - zb = exact_center + (+0.20 reduced_il, +1.20 reduced_il); - zc = exact_center + (-0.10 reduced_il, +2.00 reduced_il); - zd = exact_center + (-0.50 reduced_il, +3.00 reduced_il); - ze = exact_center + (+0.00 reduced_il, +3.70 reduced_il); - zf = exact_center + (+0.20 reduced_il, +3.00 reduced_il); - zg = exact_center + (-0.20 reduced_il, +2.00 reduced_il); - zh = exact_center + (-0.50 reduced_il, +1.70 reduced_il); - zi = exact_center + (-0.80 reduced_il, +0.75 reduced_il); - zj = exact_center + (-0.60 reduced_il, +0.60 reduced_il); - - draw za{-1,2} .. zb .. zc .. zd .. ze .. zf .. zg .. zh .. zi .. zj; - - save za, zb, zc, zd, ze, zf; - pair za, zb, zc, zd, ze, zf; - - pickup pencircle - xscaled 0.75 reduced_slt - yscaled 0.33 reduced_il - rotated -35; - - za = exact_center + (+0.25 reduced_il, +0.45 reduced_il); - zb = exact_center + (-0.25 reduced_il, +0.45 reduced_il); - zc = exact_center + (-0.25 reduced_il, -0.45 reduced_il); - zd = exact_center + (+0.25 reduced_il, -0.45 reduced_il); - ze = exact_center + (+0.30 reduced_il, +0.00 reduced_il); - zf = exact_center + (+0.00 reduced_il, +0.00 reduced_il); - - draw za .. zb .. zc .. zd .. {up}ze -- zf; -enddef; - - -fet_beginchar("petrucci g clef", "petrucci_g", "petruccigclef") - if test = 1: - draw_staff(-1,3, 0.0); - fi; - draw_petrucci_g_clef((0,0), 1.0); -fet_endchar; -fet_beginchar("petrucci g clef", "petrucci_g_change", "cpetruccigclef") - draw_petrucci_g_clef((0,0), .8); -fet_endchar; - - - -%%%%%%%% -% -% -% -% Hufnagel -% -% -% -def draw_hufnagel_do_clef(expr exact_center, reduction) = - % - % inspired by Graduale of Friedrich Zollner (1442), in: MGG, - % volume 9, col. 1413 ("Neustift"), fig. 1. - % - save reduced_il; - - reduced_il# = staff_space# * reduction; - - define_pixels(reduced_il); - - pickup pencircle - xscaled (0.60reduced_il) - yscaled (0.10reduced_il) - rotated 40; - save za, zb, zc, zd, ze, zf; - pair za, zb, zc, zd, ze, zf; - - za = exact_center + (+0.30reduced_il, +.45reduced_il); - zb = exact_center + (+0.20reduced_il, +.45reduced_il); - zc = exact_center + (-0.10reduced_il, +.60reduced_il); - zd = exact_center + (-0.40reduced_il, +.45reduced_il); - ze = exact_center + (-0.40reduced_il, -.45reduced_il); - zf = exact_center + (-0.20reduced_il, -.55reduced_il); - draw za .. zb .. zc -- zd -- ze -- zf; - - set_char_box(0.5reduced_il#, 0.5reduced_il#, 0, reduced_il#); -enddef; - - -fet_beginchar("Hufnagel do clef", "hufnagel_do", "hufnageldoclef") - if test = 1: - draw_staff(-1,3, 0.0); - fi; - draw_hufnagel_do_clef((0,0), 1.0); -fet_endchar; -fet_beginchar("Hufnagel do clef", "hufnagel_do_change", "chufnageldoclef") - draw_hufnagel_do_clef((1.3 staff_space#,0), .8); -fet_endchar; - - -def draw_hufnagel_fa_clef(expr exact_center, reduction) = - % - % inspired by Bamberger Manuscript (15th century), in: - % MGG, volume 2, table 59. - % - save reduced_il; - - reduced_il# = staff_space# * reduction; - - define_pixels(reduced_il); - - pickup pencircle - xscaled (0.60reduced_il) - yscaled (0.10reduced_il) - rotated 40; - save za, zb, zc, zd, ze, zf; - pair za, zb, zc, zd, ze, zf; - - za = exact_center + (+0.30reduced_il, +0.70reduced_il); - zb = exact_center + (+0.20reduced_il, +0.70reduced_il); - zc = exact_center + (-0.10reduced_il, +0.85reduced_il); - zd = exact_center + (-0.40reduced_il, +0.70reduced_il); - ze = exact_center + (-0.40reduced_il, -1.10reduced_il); - draw za .. zb .. zc -- zd -- ze; - - save zg, zh, zi, zj; - pair zg, zh, zi, zj; - - zg = exact_center + (+0.30reduced_il, -0.05reduced_il); - zh = exact_center + (+0.20reduced_il, -0.05reduced_il); - zi = exact_center + (-0.10reduced_il, +0.10reduced_il); - zj = exact_center + (-0.40reduced_il, -0.05reduced_il); - draw zg .. zh .. zi -- zj; - - set_char_box(0.5reduced_il#, 0.5reduced_il#, 0, reduced_il#); -enddef; - - -fet_beginchar("Hufnagel fa clef", "hufnagel_fa", "hufnagelfaclef") - if test = 1: - draw_staff(-1,3, 0.0); - fi; - draw_hufnagel_fa_clef((0,0), 1.0); -fet_endchar; -fet_beginchar("Hufnagel fa clef", "hufnagel_fa_change", "chufnagelfaclef") - draw_hufnagel_fa_clef((0,0), .8); -fet_endchar; - - -def draw_hufnagel_do_fa_clef(expr exact_center, reduction) = - draw_hufnagel_do_clef(exact_center, reduction); - draw_hufnagel_fa_clef(exact_center + (0, -2staff_space), reduction); -enddef; - - -fet_beginchar("Hufnagel do/fa clef", "hufnagel_do_fa", "hufnageldofaclef") - if test = 1: - draw_staff(-1,3, 0.0); - fi; - draw_hufnagel_do_fa_clef((0,0), 1.0); -fet_endchar; -fet_beginchar("Hufnagel do/fa clef", "hufnagel_do_fa_change", - "chufnageldofaclef") - draw_hufnagel_do_fa_clef((0,0), .8); -fet_endchar; - def draw_percussion_clef(expr reduction) = save reduced_il; reduced_il# = staff_space# * reduction; define_pixels(reduced_il); set_char_box(-.67reduced_il#,2.0reduced_il#,reduced_il#,reduced_il#); razt := 0.45reduced_il; - pickup penrazor scaled razt; - draw (-b+razt/2,h) -- (-b+razt/2,-d); - draw (w-razt/2,h) -- (w-razt/2,-d); + draw_block((-b,-d),(-b+razt,h)); + draw_block((w-razt,-d),(w,h)); enddef; fet_beginchar("percussion clef", "percussion", "percussionclef") draw_percussion_clef(1.0); fet_endchar; -fet_beginchar("percussion clef", "percussion_change", "cpercussionclef") +fet_beginchar("percussion clef (reduced)", "percussion_change", "cpercussionclef") draw_percussion_clef(.8); fet_endchar; +def draw_tab_T(expr pos, siz, slant) = + begingroup; + clearxy; + pair vx,vy; + vx=(xpart siz) * dir 0; + vy=(ypart siz) * dir 90; + + penpos1(.75penh, 100); + z1=z2+(1/6*vx-.15*vy); + penpos2(.9penw, 0); + z2l = pos+.75vy; + penpos3(penh,-100); + z3l = pos+.4vx+vy; + penpos4(penh,-90); + z4=-.1vy+.5[z3,z5]; + penpos5(.8penh,-30); + x5r=xpart (pos+siz); + y5l=ypart (pos+siz); + + penpos10(penw,170); + z10=pos+.55vx+.85vy; + penpos11(.75[penh,penw],170); + z11=z10-.5vy+.025vx; + penpos12(penh,100); + z12l=(xpart .5[z13,z11],ypart (pos-.025*siz)); + penpos13(.75penh,60); + z13=pos +.2vx+.15vy; + + % penlabels (1,2,3,4,5,10,11,12,13); + + soft_penstroke (z1e..tension 1.1 + ..z2e + ..z3e{right}..tension 1.5 + ..z4e + ..z5e + ) slanted slant shifted (slant*-ypart pos,0); + + soft_penstroke (z10e..tension 1.5 + ..z11e + ..z12e..tension 1.1 + ..z13e{(z13r-z13l) rotated 90} + ) slanted slant shifted (slant*-ypart pos,0); + endgroup; +enddef; + +def draw_tab_A(expr pos, siz, slant) = + begingroup; + clearxy; + pair vx,vy; + vx=(xpart siz) * dir 0; + vy=(ypart siz) * dir 90; + + penpos1(.75penh,-110); + z1r=pos+.07vy; + penpos2(penh,-75); + z2r=(.5[x1,x3],ypart pos); + penpos3(.25[penh,penw],-30); + z3=(.45[x2,x4],.15[y2,y4]); + penpos4(1[penh,penw],0); + z4=pos+.5vx+.975vy; + + penpos5(1[penh,penw],-180); + z5=z4; + penpos6(.2[penh,penw],-150); + z6l=(.8[x5l,x7l],.9[y5l,y7l]); + penpos7(penh,-90); + z7r=(.5[x6,x8],ypart pos); + penpos8(.75penh,-70); + z8r=(xpart(pos+siz),y7r+.075ypart(siz)); + + penpos10(penh,-105); + z10=.2[z3,z4]; + penpos11(.9penh,-90); + z11=.4[z10,z6]-0.05vy; + penpos12(.75penh,-75); + z12=.3[z11,z6]+0.02vy; + + % penlabels(1,2,3,4,5,6,7,8,10,11,12); + + soft_penstroke (z1e {(z1r-z1l) rotated 90} + ..z2e + ..z3e + ..z4e + ) slanted slant shifted (slant*-ypart pos,0); + + soft_penstroke (z5e + ..z6e + ..z7e + ..z8e {(z8r-z8l) rotated 90} + ) slanted slant shifted (slant*-ypart pos,0); + + soft_penstroke (z10e + ..z11e + ..z12e + ) slanted slant shifted (slant*-ypart pos,0); + + endgroup; +enddef; + +def draw_tab_B(expr pos, siz, slant) = + begingroup; + clearxy; + pair vx,vy; + vx=(xpart siz) * dir 0; + vy=(ypart siz) * dir 90; + + penpos1(.75penh, 100); + z1=z2+(.15*vx-.1*vy); + penpos2(.9penw, 0); + z2l = pos+.75vy; + penpos3(penh,-100); + z3l = pos+.4vx+1.05vy; + penpos4(.8[penh,penw],-180); + z4=(xpart(pos+.75siz),.5[y3,y5]); + penpos5(.8penh,90); + z5=(.5[x10,x4],ypart (pos+.55siz)); + + penpos6(.8penh,270); + z6=z5; + penpos7(penw,180); + z7l=(xpart(pos+siz),.5[y6,y8]); + penpos8(.8penh,45); + z8=.5[z12l,z11l]+.15vx-.05vy; + + penpos10(.75[penh,penw],170); + z10=pos+.375vx+.95vy; + penpos11(.8[penh,penw],150); + z11=z10-.5vy+.04vx; + penpos12(penh,100); + z12l=(xpart .5[z13,z11],ypart pos); + penpos13(.75penh,60); + z13=pos+.1vx+.15vy; + + % penlabels (1,2,3,4,5,6,7,8,10,11,12,13); + + soft_penstroke (z1e..tension 1.1 + ..z2e + ..z3e + ..z4e + ..z5e{left} + ) slanted slant shifted (slant*-ypart pos,0); + + soft_penstroke (z6e{right} + ..z7e + ..z8e{(z8r-z8l) rotated 90} + ) slanted slant shifted (slant*-ypart pos,0); + + soft_penstroke (z10e.. tension 1.5 + ..z11e + ..z12e..tension 1.1 + ..z13e{(z13r-z13l) rotated 90} + ) slanted slant shifted (slant*-ypart pos,0); + endgroup; +enddef; + def draw_tab_clef(expr reduction) = - save reduced_il; + save reduced_il,vx,vy,letterheight,penw,penh; reduced_il# = staff_space# * reduction; - define_pixels(reduced_il); - set_char_box(-.5reduced_il#,1.8reduced_il#,2.25reduced_il#,2.25reduced_il#); - bs := -d+0.65reduced_il; - cx := 0.5(-b+w); - xp := 0.32 reduced_il; - yp := 0.25reduced_il; - pickup pensquare xscaled xp yscaled yp; - - draw (-b,h) -- (w,h); - draw (cx,h) -- (cx,h-1.2reduced_il); - - pickup penrazor scaled yp rotated 90; - draw (-0.85b+0.15w,-0.25reduced_il) -- (-0.15b+0.85w,-0.25reduced_il); - pickup penrazor scaled xp; - draw (-b,-0.6reduced_il-yp/2) -- (cx,0.6reduced_il+yp/2) -- (w,-0.6reduced_il-yp/2); - - - pickup pensquare xscaled xp yscaled yp; - draw (-b,-d+1.2reduced_il) -- (-b,-d); - pickup pencircle xscaled xp yscaled yp; - draw (-b,-d) --- (cx,-d) .. (w,0.5(bs-d)) .. (cx,bs) --- (-b,bs) --- (cx,bs) - .. (0.3cx+0.7w,0.5(bs-d+1.2reduced_il)) .. (cx,-d+1.2reduced_il) --- (-b,-d+1.2reduced_il) + letterheight# = 1.8*reduced_il#; + define_pixels(reduced_il,letterheight); + set_char_box(-.2*reduced_il#,2.8*reduced_il#,1.6*letterheight#,1.6*letterheight#); + + %draw_staff (-3,2, 0.5); + + penw = .45reduced_il; + penh = .2reduced_il; + + draw_tab_T((-b+.15reduced_il,h-letterheight), + (2.1*reduced_il,letterheight),0.2); + draw_tab_A((-b-.05reduced_il,-.5letterheight +.15reduced_il), + (2.2*reduced_il,letterheight),0.4); + draw_tab_B((-b+.025reduced_il,-d), + (2.1*reduced_il,letterheight),0.25); enddef; fet_beginchar("tab clef", "tab", "tabclef") draw_tab_clef(1.0); fet_endchar; -fet_beginchar("tab clef", "tab_change", "ctabclef") +fet_beginchar("tab clef (reduced)", "tab_change", "ctabclef") draw_tab_clef(.8); fet_endchar; diff --git a/mf/feta-macros.mf b/mf/feta-macros.mf index 814c82a16d..6fa8d3a3e6 100644 --- a/mf/feta-macros.mf +++ b/mf/feta-macros.mf @@ -95,6 +95,15 @@ enddef; % drawing % +def soft_penstroke text t = + forsuffixes e = l,r: path_.e:=t; endfor + if cycle path_.l: + cyclestroke_ + else: + fill path_.l .. tension1.5 .. reverse path_.r .. tension1.5 .. cycle + fi +enddef; + def simple_serif(expr p,q, a)= p{dir(angle(q-p) -a)} .. q{ - dir(angle(p -q) + a)} enddef; @@ -192,6 +201,7 @@ begingroup; endgroup; enddef; + def y_mirror_char = currentpicture := currentpicture yscaled -1; set_char_box(charbp, charwd, charht, chardp); diff --git a/mf/feta-nummer-code.mf b/mf/feta-nummer-code.mf index 1cd8e52acc..4065b66651 100644 --- a/mf/feta-nummer-code.mf +++ b/mf/feta-nummer-code.mf @@ -4,7 +4,7 @@ % % source file of the Feta (not the Font-En-Tja) music font % -% (c) 1997--2001 Jan Nieuwenhuizen +% (c) 1997--2002 Jan Nieuwenhuizen fet_begingroup("number") diff --git a/mf/feta-params.mf b/mf/feta-params.mf index 34c91ff0c2..b9c9d9924b 100644 --- a/mf/feta-params.mf +++ b/mf/feta-params.mf @@ -1,5 +1,8 @@ stafflines = 5; +% [reuter] URG! This is not always true. One of the effects of +% keeping this a constant is that, for notation with less stafflines, +% stafflinethickness gets too small. staff_space#:=staffsize#/(stafflines-1); diff --git a/mf/feta-pendaal.mf b/mf/feta-pendaal.mf index 2fa526a135..c6905779a6 100644 --- a/mf/feta-pendaal.mf +++ b/mf/feta-pendaal.mf @@ -127,7 +127,7 @@ def draw_pedal_P = y11 = 1/5h; penlabels (1,2,3,4,5,6,7,8,9,10,11); - penstroke z1e..tension 2.5 .. z2e.. tension 1.5 .. z3e ..tension 2.5 + soft_penstroke z1e..tension 2.5 .. z2e.. tension 1.5 .. z3e ..tension 2.5 ..z4e..tension 1.5 ..z5e..z6e..tension 1.5 ..z7e..tension 1.5 @@ -148,7 +148,7 @@ def draw_pedal_P = y16r = y2r; penlabels (12,13,14,15,16); - penstroke z12e{down}..tension 1.1 + soft_penstroke z12e{down}..tension 1.1 ..z13e{dir (180-pedbeta)}..tension 1.1 ..z14e{right}..tension 1.1 ..z15e{dir (180+pedbeta)}..tension 1.1 @@ -177,7 +177,7 @@ def draw_pedal_d = penlabels (1,2,3,4,5); - penstroke z1e{dir (-70-90)}..tension 1.1 + soft_penstroke z1e{dir (-70-90)}..tension 1.1 ..z2e{down}..tension 1.1 ..z3e{right}..tension 1.1 ..z4e{dir (90+10)}..tension 1.1 @@ -217,7 +217,7 @@ def draw_pedal_e = y8 = 1/5pedalh; penlabels (1,2,3,4,5,6,7,8); - penstroke z1e{dir pedalpha} + soft_penstroke z1e{dir pedalpha} ..z2e{dir pedalpha}.. tension 1.1 %urg ..z3e..tension 1.05 diff --git a/mf/feta-puntje.mf b/mf/feta-puntje.mf index 5ad45c1951..ad04883de9 100644 --- a/mf/feta-puntje.mf +++ b/mf/feta-puntje.mf @@ -6,7 +6,7 @@ define_pixels(dot_diam); fet_beginchar("duration dot","dot", "dot") pickup pencircle scaled dot_diam; - draw (dot_diam/2,0); + drawdot (dot_diam/2,0); set_char_box(0, dot_diam#, dot_diam#/2, dot_diam#/2); fet_endchar; diff --git a/mf/feta-slag.mf b/mf/feta-slag.mf index df3ae8d0cb..c94d379dd8 100644 --- a/mf/feta-slag.mf +++ b/mf/feta-slag.mf @@ -4,7 +4,7 @@ % source file of the Feta (defintively not an abbreviation for Font-En-Tja) % music font % -% (c) 1998--2001 Jan Nieuwenhuizen +% (c) 1998--2002 Jan Nieuwenhuizen % % this file is included by feta-scripts.mf diff --git a/mf/feta-sleur.mf b/mf/feta-sleur.mf index fc6298daa6..aead9a66c1 100644 --- a/mf/feta-sleur.mf +++ b/mf/feta-sleur.mf @@ -3,7 +3,7 @@ % % source file of LilyPond's pretty-but-neat music font % -% (c) 1997--2001 Jan Nieuwenhuizen +% (c) 1997--2002 Jan Nieuwenhuizen % & Han-Wen Nienhuys % % see Documentation/fonts.tex diff --git a/mf/feta-test11.mf b/mf/feta-test11.mf index eaaa862fc5..1568c9d5aa 100644 --- a/mf/feta-test11.mf +++ b/mf/feta-test11.mf @@ -1,9 +1,9 @@ -% feta-test16 +% feta-test11 % part of LilyPond's pretty-but-neat music font input feta-autometric; -fet_beginfont("feta-test", 23); -staffsize#:=23pt#; +fet_beginfont("feta-test", 11); +staffsize#:=11pt#; test:=1; % smoked cheese diff --git a/mf/feta-test13.mf b/mf/feta-test13.mf index ce1e04cf85..fc79ef990c 100644 --- a/mf/feta-test13.mf +++ b/mf/feta-test13.mf @@ -1,4 +1,4 @@ -% feta-test16 +% feta-test13 % part of LilyPond's pretty-but-neat music font input feta-autometric; diff --git a/mf/feta-test26.mf b/mf/feta-test26.mf index 212d63fa4a..09f34025bd 100644 --- a/mf/feta-test26.mf +++ b/mf/feta-test26.mf @@ -1,4 +1,4 @@ -% feta-test16 +% feta-test26 % part of LilyPond's pretty-but-neat music font input feta-autometric; diff --git a/mf/feta-timesig.mf b/mf/feta-timesig.mf index cc22ca8ab9..190bbe4d8f 100644 --- a/mf/feta-timesig.mf +++ b/mf/feta-timesig.mf @@ -3,7 +3,7 @@ % % source file of the Feta (not an abbreviation of Font-En-Tja) music font % -% (c) 1998--2001 Mats Bengtsson , +% (c) 1998--2002 Mats Bengtsson , % Christian Mondrup fet_begingroup("timesig"); @@ -69,126 +69,4 @@ fet_beginchar ("2/2 meter", "C2/2", "allabreve") draw_block((- .75 stafflinethickness, -d) + excentricity, (.75 stafflinethickness , h) + excentricity); fet_endchar; -path threequartercircle; -threequartercircle = halfcircle & quartercircle rotated 180; - -save Cdiameter,Cthickness; -Cdiameter# := 3/2 staff_space#; -Cthickness# := 2 stafflinethickness#; -define_pixels(Cdiameter,Cthickness); - -%% tempus imperfectum cum prolatione imperfecta -fet_beginchar ("Mensural 4/4 meter", "old4/4", "oldfourfourmeter") - set_char_box(.5 Cdiameter# + staff_space#, .5 Cdiameter# + staff_space#, - .5 Cdiameter#, .5 Cdiameter#); - - pickup pencircle scaled Cthickness; - draw threequartercircle rotated 45 scaled Cdiameter; -fet_endchar; - -%% tempus imperfectum cum prolatione imperfecta proportio dupla -fet_beginchar ("Mensural 2/2 meter", "old2/2", "oldallabreve") - set_char_box(.5 Cdiameter# + staff_space#, .5 Cdiameter# + staff_space#, - staff_space#, staff_space#); - - pickup pencircle scaled Cthickness; - draw threequartercircle rotated 45 scaled Cdiameter; - draw_block((-Cthickness, -d), (0, h)); -fet_endchar; - -%% tempus perfectum cum prolatione imperfecta -fet_beginchar ("Mensural 3/2 meter", "old3/2", "oldthreetwometer") - set_char_box(.5 Cdiameter# + staff_space#, .5 Cdiameter# + staff_space#, - .5 Cdiameter#, .5 Cdiameter#); - - pickup pencircle scaled Cthickness; - draw fullcircle scaled Cdiameter; -fet_endchar; - -%% tempus imperfectum cum prolatione perfecta -fet_beginchar ("Mensural 6/4 meter", "old6/4", "oldsixfourmeter") - set_char_box(.5 Cdiameter# + staff_space#, .5 Cdiameter# + staff_space#, - .5 Cdiameter#, .5 Cdiameter#); - - pickup pencircle scaled Cthickness; - draw threequartercircle rotated 45 scaled Cdiameter; - pickup pencircle scaled 4 stafflinethickness; - draw (0,0); -fet_endchar; - -%% tempus perfectum cum prolatione perfecta -fet_beginchar ("Mensural 9/4 meter", "old9/4", "oldninefourmeter") - set_char_box(.5 Cdiameter# + staff_space#, .5 Cdiameter# + staff_space#, - .5 Cdiameter#, .5 Cdiameter#); - - pickup pencircle scaled Cthickness; - draw fullcircle scaled Cdiameter; - pickup pencircle scaled 4 stafflinethickness; - draw (0,0); -fet_endchar; - -%% tempus perfectum cum prolatione imperfecta proportio dupla -fet_beginchar ("Mensural 3/4 meter", "old3/4", "oldthreefourmeter") - set_char_box(.5 Cdiameter# + staff_space#, .5 Cdiameter# + staff_space#, - staff_space#, staff_space#); - - pickup pencircle scaled Cthickness; - draw fullcircle scaled Cdiameter; - draw_block((-Cthickness/2, -d), (Cthickness/2, h)); -fet_endchar; - -%% tempus imperfectum cum prolatione perfecta proportio dupla -fet_beginchar ("Mensural 6/8 meter", "old6/8", "oldsixeightmeter") - set_char_box(.5 Cdiameter# + staff_space#, .5 Cdiameter# + staff_space#, - staff_space#, staff_space#); - - pickup pencircle scaled Cthickness; - draw threequartercircle rotated 45 scaled Cdiameter; - pickup pencircle scaled 4 stafflinethickness; - draw (0,0); - draw_block((-Cthickness/2, -d), (Cthickness/2, h)); -fet_endchar; - -%% tempus perfectum cum prolatione perfecta proportio dupla -fet_beginchar ("Mensural 9/8 meter", "old9/8", "oldnineeight") - set_char_box(.5 Cdiameter# + staff_space#, .5 Cdiameter# + staff_space#, - staff_space#, staff_space#); - - pickup pencircle scaled Cthickness; - draw fullcircle scaled Cdiameter; - pickup pencircle scaled 4 stafflinethickness; - draw (0,0); - draw_block((-Cthickness/2, -d), (Cthickness/2, h)); -fet_endchar; - -%% tempus imperfectum cum prolatione imperfecta diminutio simplex -fet_beginchar ("Mensural 4/8 meter", "old4/8", "oldfoureightmeter") - set_char_box(.5 Cdiameter# + staff_space#, .5 Cdiameter# + staff_space#, - .5 Cdiameter#, .5 Cdiameter#); - - pickup pencircle scaled Cthickness; - draw threequartercircle rotated 225 scaled Cdiameter; -fet_endchar; - -%% tempus imperfectum cum prolatione perfecta diminutio simplex -fet_beginchar ("Mensural 6/8 meter", "old6/8alt", "oldsixeightmeteralt") - set_char_box(.5 Cdiameter# + staff_space#, .5 Cdiameter# + staff_space#, - .5 Cdiameter#, .5 Cdiameter#); - - pickup pencircle scaled Cthickness; - draw threequartercircle rotated 225 scaled Cdiameter; - pickup pencircle scaled 4 stafflinethickness; - draw (0,0); -fet_endchar; - -%% tempus imperfectum cum prolatione imperfecta diminutio duplex -fet_beginchar ("Mensural 2/4 meter", "old2/4", "oldtwofourmeter") - set_char_box(.5 Cdiameter# + staff_space#, .5 Cdiameter# + staff_space#, - staff_space#, staff_space#); - - pickup pencircle scaled Cthickness; - draw threequartercircle rotated 225 scaled Cdiameter; - draw_block((-Cthickness, -d), (0, h)); -fet_endchar; - fet_endgroup("timesig"); diff --git a/mf/feta-toevallig.mf b/mf/feta-toevallig.mf index 3ff3269f2b..a71a57aaab 100644 --- a/mf/feta-toevallig.mf +++ b/mf/feta-toevallig.mf @@ -3,7 +3,7 @@ % % source file of the Feta (Font-En-Tja) music font % -% (c) 1997--2001 Han-Wen Nienhuys +% (c) 1997--2002 Han-Wen Nienhuys % @@ -280,169 +280,5 @@ fet_beginchar("Left Parenthesis", "(", "leftparen") set_char_box(charwd, charbp, chardp, charht); fet_endchar; -%%%%%%%% -% -% -% -% EDITIO MEDICAEA -% -% -% -fet_beginchar("Ed. Med. Flat" , "medicaea-1", "medicaeaflat"); - set_char_box(0, 0.8 staff_space#, 0.6 staff_space#, - 2.0 staff_space#); - - pickup pencircle - xscaled 0.50 stafflinethickness - yscaled 0.22 staff_space; - - save za, zb; - pair za, zb; - - za = (0.00 staff_space, +0.90 staff_space); - zb = (0.00 staff_space, -0.50 staff_space); - draw za -- zb; - - pickup pencircle - xscaled 0.50 stafflinethickness - yscaled 0.22 staff_space - rotated -63; - - save zc, zd, ze; - pair zc, zd, ze; - - zc = (0.10 staff_space, -0.50 staff_space); - zd = (0.40 staff_space, +0.40 staff_space); - ze = (0.10 staff_space, +0.40 staff_space); - - draw zc{(1,2)} .. zd .. ze{(-1,-1)}; - - fet_endchar; - -%%%%%%%% -% -% -% -% EDITIO VATICANA -% -% -% -fet_beginchar("Ed. Vat. Flat" , "vaticana-1", "vaticanaflat"); - set_char_box(0, 0.7 staff_space#, 0.6 staff_space#, - 2.0 staff_space#); - define_pixels (stafflinethickness, staff_space); - - save za, zb, zc, zd, ze, zf, zg; - pair za, zb, zc, zd, ze, zf, zg; - za = (0.00 staff_space, +0.80 staff_space); - zb = (0.00 staff_space, -0.03 staff_space); - zc = (0.25 staff_space, -0.23 staff_space); - zd = (0.50 staff_space, -0.23 staff_space); - ze = (0.50 staff_space, +0.00 staff_space); - zf = (0.25 staff_space, +0.20 staff_space); - zg = (0.15 staff_space, +0.26 staff_space); - - pickup pencircle - xscaled 0.50 stafflinethickness - yscaled 0.22 staff_space; - draw za{down} .. {down}zb .. zc .. zd{up} .. {up}ze .. zf .. zg; - fet_endchar; - -fet_beginchar("Ed. Vat. Natural" , "vaticana0", "vaticananatural"); - set_char_box(0, 0.6 staff_space#, 0.6 staff_space#, - 2.0 staff_space#); - define_pixels (stafflinethickness, staff_space); - - save za, zb, zc, zd; - pair za, zb, zc, zd; - pickup pencircle - xscaled 0.80 stafflinethickness - yscaled 0.22 staff_space; - za = (0.00 staff_space, +0.65 staff_space); - zb = (0.00 staff_space, -0.35 staff_space); - zc = (0.00 staff_space, -0.30 staff_space); - zd = (0.40 staff_space, -0.08 staff_space); - draw za -- zb; - draw zc -- zd; - - addto currentpicture also currentpicture - xscaled -1 - yscaled -1 - shifted (0.40 staff_space, 0.0 staff_space); - - fet_endchar; - -%%%%%%%% -% -% -% -% MENSURAL NOTATION -% -% -% -fet_beginchar("Mensural Sharp" , "mensural1", "mensuralsharp"); - set_char_box(0.4 staff_space#, 0.6 staff_space#, 0.5 staff_space#, - 0.5 staff_space#); - save stemthick; - define_pixels (stemthick, staff_space); - stemthick# = stafflinethickness#; - - save za, zb; - pair za, zb; - pickup pencircle scaled 0.8 stemthick; - za = 0.4 * staff_space * (0.8, 1); - za = -zb; - draw za .. zb; - - addto currentpicture also currentpicture xscaled -1; - addto currentpicture also currentpicture shifted (0.20 staff_space, 0); - - fet_endchar; - -fet_beginchar("Mensural Flat" , "mensural-1", "mensuralflat"); - set_char_box(0.1 staff_space#, 0.7 staff_space#, 0.4 staff_space#, - 1.8 staff_space#); - save stemthick; - define_pixels (stemthick, staff_space); - stemthick# = stafflinethickness#; - - save za, zb, zc, zd, ze; - pair za, zb, zc, zd, ze; - pickup pencircle - xscaled 1.4 stemthick - yscaled 0.6 stemthick - rotated 45; - - za = (0.00 staff_space, +1.80 staff_space); - zb = (0.00 staff_space, -0.25 staff_space); - zc = (0.35 staff_space, -0.25 staff_space); - zd = (0.35 staff_space, +0.25 staff_space); - ze = (0.00 staff_space, +0.25 staff_space); - draw za -- zb .. zc .. zd .. ze; - fet_endchar; - -fet_beginchar("Hufnagel Flat" , "hufnagel-1", "hufnagelflat"); - set_char_box(0.5 staff_space#, 0.7 staff_space#, 0.4 staff_space#, - 1.8 staff_space#); - save stemthick; - define_pixels (stemthick, staff_space); - stemthick# = stafflinethickness#; - - save za, zb, zc, zd, ze, zf; - pair za, zb, zc, zd, ze, zf; - pickup pencircle - xscaled 2.4 stemthick - yscaled 0.4 stemthick - rotated 45; - - za = (0.00 staff_space, +1.80 staff_space); - zb = (0.00 staff_space, -0.15 staff_space); - zc = (0.25 staff_space, -0.30 staff_space); - zd = (0.50 staff_space, +0.00 staff_space); - ze = (0.30 staff_space, +0.30 staff_space); - zf = (0.00 staff_space, +0.15 staff_space); - draw za -- zb -- zc .. zd .. ze -- zf; - fet_endchar; - fet_endgroup("accidentals"); diff --git a/Documentation/windows/registry.in b/mf/parmesan-accidentals.mf similarity index 100% rename from Documentation/windows/registry.in rename to mf/parmesan-accidentals.mf diff --git a/mf/parmesan-clefs.mf b/mf/parmesan-clefs.mf new file mode 100644 index 0000000000..b6d5de2c5d --- /dev/null +++ b/mf/parmesan-clefs.mf @@ -0,0 +1,828 @@ +% feta-klef.mf -- implement Clefs -*-Fundamental-*- +% +% part of LilyPond's pretty-but-neat music font +% +% source file of the Feta (not the Font-En-Tja) music font +% +% (c) 1997--2002 Han-Wen Nienhuys , +% Jan Nieuwenhuizen , +% Juergen Reuter + + +fet_begingroup("clefs"); + +%%%%%%%% +% +% +% +% Editio Vaticana +% +% +% +def draw_vaticana_do_clef(expr exact_center, reduction) = + save reduced_il; + + reduced_il# = staff_space# * reduction; + + set_char_box(0.4reduced_il#, 0.4reduced_il#, 0, reduced_il#); + + define_pixels(reduced_il); + + pickup pencircle xscaled stafflinethickness yscaled 0.6reduced_il; + + save za, zb, zc, zd, ze, zf; + pair za, zb, zc, zd, ze, zf; + + za = exact_center + (-0.0reduced_il, -.45reduced_il); + zb = exact_center + (-0.2reduced_il, -.50reduced_il); + zc = exact_center + (-0.4reduced_il, -.25reduced_il); + zd = exact_center + (-0.4reduced_il, +.25reduced_il); + ze = exact_center + (-0.2reduced_il, +.50reduced_il); + zf = exact_center + (-0.0reduced_il, +.45reduced_il); + draw za .. zb .. zc -- % lower punctum + zd .. ze .. zf; % upper punctum +enddef; + + +fet_beginchar("Ed. Vat. do clef", "vaticana_do", "vatdoclef") + if test = 1: + draw_staff(-1,3, 0.0); + fi; + draw_vaticana_do_clef((0,0), 1.0); +fet_endchar; +fet_beginchar("Ed. Vat. do clef", "vaticana_do_change", "vatcdoclef") + draw_vaticana_do_clef((0,0), 1.0); % no reduction +fet_endchar; + + +def draw_vaticana_fa_clef(expr exact_center, reduction) = + + save reduced_il, z; + reduced_il# = staff_space# * reduction; + define_pixels(reduced_il); + + save za, zb, zc, zd, ze; + pair za, zb, zc, zd, ze; + + %stem + pickup pencircle scaled stafflinethickness; + xpart za = xpart zb = + xpart exact_center + 0.4reduced_il; + ypart za = ypart exact_center = ypart zb + 1.5reduced_il; + draw za .. zb; + + %left-handed punctum + pickup pencircle xscaled stafflinethickness yscaled 0.5reduced_il; + zc = exact_center + + (+0.4reduced_il, -0.05reduced_il); + zd = exact_center + + (+0.2reduced_il, +0.05reduced_il); + ze = exact_center + + (+0.0reduced_il, +0.00reduced_il); + draw zc .. zd .. ze; + + %right-handed puncta as in do clef + draw_vaticana_do_clef( + exact_center + + (+0.8reduced_il + 1.25stafflinethickness, 0), + reduction); + + set_char_box(0.5reduced_il#, 1.5reduced_il#, 0, reduced_il#); +enddef; + + +fet_beginchar("Ed. Vat. fa clef", "vaticana_fa", "vatfaclef") + if test = 1: + draw_staff(-1,3, 0.0); + fi; + draw_vaticana_fa_clef((0,0), 1.0); +fet_endchar; +fet_beginchar("Ed. Vat. fa clef", "vaticana_fa_change", "vatcfaclef") + draw_vaticana_fa_clef((0,0), 1.0); % no reduction +fet_endchar; + +%%%%%%%% +% +% +% +% Editio Medicaea +% +% +% +def draw_medicaea_do_clef(expr exact_center, reduction) = + save reduced_il, reduced_slt; + reduced_il# = staff_space# * reduction; + reduced_slt# = stafflinethickness# * reduction; + define_pixels(reduced_il); + define_pixels(reduced_slt); + + save flag_height; + flag_height# = 0.5 reduced_il#; + define_pixels(flag_height); + + %lower flag + save za, zb; + pair za, zb; + pickup pencircle xscaled reduced_slt yscaled flag_height; + xpart exact_center + = xpart za + 0.5 reduced_il + = xpart zb - 0.5 reduced_il; + ypart za = ypart exact_center - 0.5 flag_height + - 0.5 (staff_space - reduced_il); + ypart zb = ypart za - reduced_il + flag_height; + draw za .. zb; + + %upper flag + save za, zb; + pair za, zb; + pickup pencircle xscaled reduced_slt yscaled flag_height; + xpart exact_center + = xpart za + 0.5 reduced_il + = xpart zb - 0.5 reduced_il; + ypart za = ypart exact_center - 0.5 flag_height + - 0.5 (staff_space - reduced_il) + + staff_space; + ypart zb = ypart za - reduced_il + flag_height; + draw za .. zb; + + %stem + save za, zb; + pair za, zb; + pickup pencircle scaled reduced_slt; + xpart za = xpart zb = xpart exact_center - 0.5 reduced_il; + ypart exact_center + = ypart za + 1.5 reduced_il + = ypart zb - 1.5 reduced_il; + draw za .. zb; + + set_char_box(0.5reduced_il#, 1.5reduced_il#, + 1.5reduced_il#, 1.5reduced_il#); +enddef; + + +fet_beginchar("Ed. Med. do clef", "medicaea_do", "meddoclef") + if test = 1: + draw_staff(-1,3, 0.0); + fi; + draw_medicaea_do_clef((0,0), 1.0); +fet_endchar; +fet_beginchar("Ed. Med. do clef", "medicaea_do_change", "cmeddoclef") + draw_medicaea_do_clef((0,0), .8); +fet_endchar; + + +def draw_medicaea_fa_clef(expr exact_center, reduction) = + % inspired by Regensburger Edition of Medicaea (1885/86), in: + % MGG, volume 2, col. 1327 ("Choralreform"), fig. 2. + + save reduced_il, reduced_slt; + reduced_il# = staff_space# * reduction; + reduced_slt# = stafflinethickness# * reduction; + define_pixels(reduced_il); + define_pixels(reduced_slt); + + save za, zb, zc, zd, ze; + pair za, zb, zc, zd, ze; + + %stem + pickup pencircle scaled stafflinethickness; + xpart za = xpart zb = + xpart exact_center + 0.4reduced_il; + ypart za = ypart exact_center = ypart zb + 1.5reduced_il; + draw za -- zb; + + %left-handed punctum + pickup pencircle xscaled reduced_slt yscaled reduced_il; + zc = exact_center + + (+0.4reduced_il, 0); + zd = exact_center + + (+0.0reduced_il, 0); + draw zc -- zd; + + %right-handed puncta as in do clef + draw_medicaea_do_clef( + exact_center + + (+1.1reduced_il + 1.25stafflinethickness, 0), + reduction); + + set_char_box(reduced_il#/2, 2.6reduced_il#, 0, reduced_il#); +enddef; + + +fet_beginchar("Ed. Med. fa clef", "medicaea_fa", "medfaclef") + if test = 1: + draw_staff(-1,3, 0.0); + fi; + draw_medicaea_fa_clef((0,0), 1.0); +fet_endchar; +fet_beginchar("Ed. Med. fa clef", "medicaea_fa_change", "cmedfaclef") + draw_medicaea_fa_clef((0,0), .8); +fet_endchar; + + +%%%%%%%% +% +% +% +% Mensural Notation +% +% +% +brevis_wid# := 2 staff_space#; + +def draw_brevis(expr exact_center, reduction, small_width, small_height) = + % + % inspired by function draw_brevis of + % feta-bolletjes.mf + % + save reduced_slt, reduced_nht; + save stem_width, head_width; + save serif_size, serif_protrude; + save holeheight, beamheight; + + reduced_slt# = stafflinethickness# * reduction; + reduced_nht# = noteheight# * reduction; + stem_width# = 1.4 reduced_slt#; + if small_width: + head_width# = 0.5brevis_wid# * reduction; + else: + head_width# = brevis_wid# * reduction; + fi; + if small_height: + serif_size# = 0.64 reduced_slt#; + serif_protrude# = 0.96 serif_size#; + holeheight# = 3 reduced_slt#; + beamheight# = 0.32(reduced_nht# - holeheight#); + else: + serif_size# = 1.0 reduced_slt#; + serif_protrude# = 1.5 serif_size#; + holeheight# = 3 reduced_slt#; + beamheight# = 0.5(reduced_nht# - holeheight#); + fi; + define_pixels(reduced_slt); + define_pixels(stem_width); + define_pixels(head_width); + define_pixels(serif_size); + define_pixels(serif_protrude); + define_pixels(beamheight); + + penpos1(stem_width, 0); + penpos2(stem_width, 0); + penpos3(beamheight, 90); + penpos4(beamheight, 90); + penpos5(stem_width, 180); + + z1l = exact_center; + z2l = z1l + (0, -reduced_slt/2); + z3r = z2r + serif_size*(1,-1); + y4r = y3r; + x4l = x1l + head_width/2; + z5l = z3l + (-serif_size, -serif_protrude); + + penlabels(1,2,3,4,5); + fill z1r -- z1l -- z5r{down} .. z5l{up} .. z3l{right} + -- z4l -- z4r -- z3r{left} .. z2r{up} -- cycle; +enddef; + + +def draw_neo_mensural_c_clef(expr exact_center, reduction) = + draw_brevis(exact_center, reduction, false, false); + + save reduced_il, reduced_slt; + save stem_width; + + reduced_il# = staff_space# * reduction; + reduced_slt# = stafflinethickness# * reduction; + stem_width# = 1.4 reduced_slt#; + + define_pixels(reduced_il); + define_pixels(reduced_slt); + define_pixels(stem_width); + + pickup pencircle xscaled stem_width yscaled blot_diameter; + z6 = exact_center + (stem_width/2, 0); + z7 = z6 + (0, -2reduced_il); + z8 = z6 + (-3reduced_slt, 0); + z9 - z8 = z7 - z6; + draw z6 .. z7; + draw z8 .. z9; + + addto currentpicture also currentpicture + yscaled -1 shifted (0, 2*(ypart exact_center)); + addto currentpicture also currentpicture + xscaled -1 shifted (2x4l,0); + + set_char_box(0, 2head_width#, + 6reduced_slt#*reduction, 6reduced_slt#*reduction); +enddef; + + +fet_beginchar("neo-mensural c clef", "neo_mensural_c", "neomenscclef") + if test = 1: + draw_staff(-1,3, 0.0); + fi; + draw_neo_mensural_c_clef((0,0), 1.0); +fet_endchar; +fet_beginchar("neo-mensural c clef", "neo_mensural_c_change", "cneomenscclef") + draw_neo_mensural_c_clef((1.3 staff_space#,0), .8); +fet_endchar; + + +def draw_petrucci_c_clef(expr exact_center, reduction) = + % inspired by Josquin Desprez, "Stabat Mater", Libro tertio, + % 1519, printed by Petrucci, in: MGG, volume 7, Table 11. + draw_brevis(exact_center, reduction, true, true); + + save reduced_il, reduced_slt; + save stem_width, interline; + + reduced_il# = staff_space# * reduction; + reduced_slt# = stafflinethickness# * reduction; + stem_width# = 1.4 reduced_slt#; + interline# = staff_space#; + + define_pixels(reduced_il); + define_pixels(reduced_slt); + define_pixels(stem_width); + define_pixels(interline); + + addto currentpicture also currentpicture + yscaled -1 shifted (0, 2*(ypart exact_center) - interline); + + pickup pencircle xscaled stem_width yscaled blot_diameter; + z6 = exact_center + (stem_width/2, 0); + z7 = z6 + (0, -2.2reduced_il); + draw z6 .. z7; + + addto currentpicture also currentpicture + xscaled -1 shifted (2x4l,0); + + z8 = exact_center + (stem_width/2, 0); + z9 = z8 + (0, -3.2reduced_il); + draw z8 .. z9; + + addto currentpicture also currentpicture + yscaled -1 shifted (0, 4*(ypart exact_center)); + + set_char_box(0, 2head_width#, + noteheight#*4*reduction, noteheight#*4*reduction); +enddef; + + +fet_beginchar("petrucci c clef", "petrucci_c", "petruccicclef") + if test = 1: + draw_staff(-1,3, 0.0); + fi; + draw_petrucci_c_clef((0,0), 1.0); +fet_endchar; +fet_beginchar("petrucci c clef", "petrucci_c_change", "cpetruccicclef") + draw_petrucci_c_clef((1.3 staff_space#,0), .8); +fet_endchar; + + +def draw_mensural_c_clef(expr exact_center, reduction) = + % inspired by Ockeghem, "Missa Prolationum", in: MGG, volume + % 9, table 94. + draw_petrucci_c_clef(exact_center, reduction); + + addto currentpicture also currentpicture + shifted (0, -interline); + + set_char_box(0, 2head_width#, + noteheight#*6*reduction, noteheight#*6*reduction); +enddef; + + +fet_beginchar("mensural c clef", "mensural_c", "menscclef") + if test = 1: + draw_staff(-1,3, 0.0); + fi; + draw_mensural_c_clef((0,0), 1.0); +fet_endchar; +fet_beginchar("mensural c clef", "mensural_c_change", "cmenscclef") + draw_mensural_c_clef((0,0), .8); +fet_endchar; + +def draw_diamond(expr exact_center, reduction) = + save stem_width, reduced_il, reduced_nht, holeheight, beamheight; + save rh_height, rh_width; + + stem_width# = 1.4 reduced_slt#; + reduced_il# = staff_space# * reduction; + reduced_nht# = noteheight# * reduction; + holeheight# = 3 reduced_slt#; + beamheight# = 0.4(reduced_nht# - holeheight#); + + rh_height# = 1.2reduced_il#; + rh_width# / rh_height# = 0.58; % tan(30) + + define_pixels(beamheight); + define_pixels(stem_width); + define_pixels(rh_height); + define_pixels(rh_width); + + pickup pencircle + xscaled beamheight + yscaled stem_width + rotated 45; + + draw + exact_center + (-rh_width/2, 0) -- + exact_center + (0, rh_height/2) -- + exact_center + (+rh_width/2, 0) -- + exact_center + (0, -rh_height/2) -- + cycle; +enddef; + +def draw_petrucci_f_clef(expr exact_center, reduction) = + % inspired by L'homme arme super voces musicales in Misse + % Josquin, 1502, Petrucci, in: MGG, volume 7, col. 200; also + % inspired by Gaspar van Weerbeke, "Virgo Maria" (1502), in: + % MGG, volume 9, col. 653 ("Motette"), fig. 3.; also by Andr'e + % Campra, "Entr'ee des s'er'enades" (1710), in: MGG, volume 2, + % col. 1649 ("Contredanse"), fig. 2. + % + draw_brevis(exact_center, reduction, true, false); + + save reduced_il, reduced_slt; + save stem_width, interline; + + reduced_il# = staff_space# * reduction; + reduced_slt# = stafflinethickness# * reduction; + stem_width# = 1.4 reduced_slt#; + interline# = staff_space#; + + define_pixels(reduced_il); + define_pixels(reduced_slt); + define_pixels(stem_width); + define_pixels(interline); + + addto currentpicture also currentpicture + yscaled -1 shifted (0, 2*(ypart exact_center)); + addto currentpicture also currentpicture + xscaled -1 shifted (2x4l,0); + + + % brevis stem + pickup pencircle xscaled stem_width yscaled blot_diameter; + z6 = exact_center + (2x4l - stem_width/2, 0); + z7 = z6 + (0, -4reduced_il); + draw z6 .. z7; + + % upper diamond + draw_diamond(exact_center + (1.6interline*reduction, interline/2), + reduction); + pickup pencircle xscaled stem_width yscaled blot_diameter; + z8 = exact_center + + (1.6interline*reduction + stem_width/2, interline*reduction); + z9 = z8 + (0, 1.5interline*reduction); + draw z8 .. z9; % diamond stem + + % lower diamond + draw_diamond(exact_center + (1.6interline*reduction, -interline/2), + reduction); + pickup pencircle xscaled stem_width yscaled blot_diameter; + z10 = exact_center + + (1.6interline*reduction - stem_width/2, -interline*reduction); + z11 = z10 + (0, -3.5interline*reduction); + draw z10 .. z11; % diamond stem + + set_char_box(0, 3head_width#, + 3.5noteheight#*reduction, 1.5noteheight#*reduction); +enddef; + + +fet_beginchar("petrucci f clef", "petrucci_f", "petruccifclef") + if test = 1: + draw_staff(-1,3, 0.0); + fi; + draw_petrucci_f_clef((0,0), 1.0); +fet_endchar; +fet_beginchar("petrucci f clef", "petrucci_f_change", "cpetruccifclef") + draw_petrucci_f_clef((0,0), .8); +fet_endchar; + + +def draw_mensural_f_clef(expr exact_center, reduction) = + % + % inspired by Philippe le Duc, "Dite Signori" (1590), in: MGG, + % volume 3, col. 848 ("Duc"); also by John Dowland, "The First + % Booke of Songes" (1597), in: MGG, volume 3, col. 721 + % ("Dowland"), fig. 3. + + save reduced_slt, stem_width, reduced_nht, holeheight, beamheight; + + reduced_slt# = stafflinethickness# * reduction; + stem_width# = 1.4 reduced_slt#; + reduced_nht# = noteheight# * reduction; + holeheight# = 3 reduced_slt#; + beamheight# = 0.4(reduced_nht# - holeheight#); + + define_pixels(beamheight, stem_width, staff_space); + + pickup pencircle + xscaled beamheight + yscaled stem_width + rotated 45; + + draw + exact_center + (1.0 staff_space, 0.6 staff_space) -- + exact_center + (1.25 staff_space, 0.4 staff_space); + + draw + exact_center + (1.0 staff_space, -0.4 staff_space) -- + exact_center + (1.25 staff_space, -0.6 staff_space); + + draw halfcircle scaled 1.2 staff_space rotated -90 + shifted (-exact_center + (+0.1 staff_space, 0)); + + set_char_box(0, 3staff_space#, 3staff_space#, 0); +enddef; + +fet_beginchar("mensural f clef", "mensural_f", "mensfclef") + if test = 1: + draw_staff(-1,3, 0.0); + fi; + draw_mensural_f_clef((0,0), 1.0); +fet_endchar; +fet_beginchar("mensural f clef", "mensural_f_change", "cmensfclef") + draw_mensural_f_clef((0,0), .8); +fet_endchar; + + +def draw_mensural_g_clef(expr exact_center, reduction) = + % + % inspired by Francisco Guerrero, "Lib. 1. Missarum" (1566), + % in: MGG, volume 3, col. 858 ("Ducis"); also by Stefano + % Fabri, "Quam speciosa veteranis" (1611), in: MGG, volume 3, + % col. 1698 ("Fabri"); also by Philippus Dulichius, + % "Fasciculus novus ..." (1598), in: MGG, volume 3, col. 919 + % ("Dulichius"), fig. 1; also by Noe Faignient, "Ic sal de + % Heer myn God gebenedye" (1568), in: MGG, volume 3, col. 1735 + % ("Faignient"). + % + % Metafont code partially inspired by Schwabacher 'G' of yswab + % font. + + save reduced_il, stem_width, height, width, apex_o, hair; + + reduced_il#=staff_space#*reduction; + + set_char_box(0.5reduced_il#, 1.5reduced_il#, + 1.5reduced_il#, 1.5reduced_il#); + + stem_width# = 0.17 reduced_il#; + height# = 1.5 reduced_il#; + width# = 1.13 reduced_il#; + apex_o# = 0.02 reduced_il#; + hair# = 3 stafflinethickness#; + define_pixels(reduced_il, stem_width, height, width, apex_o, hair); + + penpos1(2 stem_width, -142); + z1l = (0.715 width, 0.742 height); + penpos1'(hair, -90); + z1'l = z1r; + penpos2(1.179 stem_width, -142); + z2l = (width, 0.466 height); + penpos3(hair, 77); + z3 = (0.764 width, 0.067 height); + z4 = (0.59 width, -apex_o); + penpos5(1.179 stem_width, 32); + z5l=(0, 0.457 height); + penpos6(hair, -56.5); + z7 = (x4 - 0.843 stem_width, height + apex_o); + z7 - z6l = whatever * dir33.5; + penpos8(1.286 stem_width, -130); + z8r = (0.715 width, 0.742 height) + (-apex_o, apex_o); + z6r - z8r = whatever * (z7 - z8l); + filldraw + z1'r{dir45} .. z2r{down} .. z3r{dir207} .. z5r{up} .. + z6r{z7-z6l} & z6r -- z8r -- z8l -- z7 --- z6l ... + z5l{down} .. z4{right} .. z3l{dir27} .. z2l{up} .. + z1l{1/3[z6l,z7]-z1l} & z1l -- z1r -- z1'r & cycle + shifted (-exact_center + (0, -0.75reduced_il)); + + penpos9(stem_width, 0); + x9r = x4; y9 = 0.3 height; + + pickup pencircle + scaled stem_width + rotated 45; + draw z9 -- (z9 + (0, -0.4reduced_il)) + shifted (-exact_center + (0, -0.75reduced_il)); + + pickup pencircle + xscaled stem_width + yscaled hair + rotated 30; + + draw halfcircle + scaled 0.5 reduced_il + rotated -90 + shifted z8 + shifted (0, 0.25reduced_il) + shifted (-exact_center + (0, -0.75reduced_il)); + + draw halfcircle + scaled 0.4 reduced_il + rotated 90 + shifted (z8 + (0, 0.45 reduced_il)) + shifted (0, 0.25reduced_il) + shifted (-exact_center + (0, -0.75reduced_il)); +enddef; + + +fet_beginchar("mensural g clef", "mensural_g", "mensgclef") + if test = 1: + draw_staff(-1,3, 0.0); + fi; + draw_mensural_g_clef((0,0), 1.0); +fet_endchar; +fet_beginchar("mensural g clef", "mensural_g_change", "cmensgclef") + draw_mensural_g_clef((0,0), .8); +fet_endchar; + + + +def draw_petrucci_g_clef(expr exact_center, reduction) = + % inspired by Josquin Desprez, "Stabat Mater", Libro tertio, + % 1519, printed by Petrucci, in: MGG, volume 7, Table 11. + + set_char_box(0.6 staff_space#, 0.8 staff_space#, 0.6 staff_space#, + 4.0 staff_space#); + + save reduced_il, reduced_slt; + + reduced_il# = staff_space# * reduction; + reduced_slt# = stafflinethickness# * reduction; + define_pixels(reduced_il, reduced_slt); + + save za, zb, zc, zd, ze, zf, zg, zh, zi, zj; + pair za, zb, zc, zd, ze, zf, zg, zh, zi, zj; + + pickup pencircle + xscaled 0.50 reduced_slt + yscaled 0.22 reduced_il + rotated -35; + + za = exact_center + (+0.00 reduced_il, +0.00 reduced_il); + zb = exact_center + (+0.20 reduced_il, +1.20 reduced_il); + zc = exact_center + (-0.10 reduced_il, +2.00 reduced_il); + zd = exact_center + (-0.50 reduced_il, +3.00 reduced_il); + ze = exact_center + (+0.00 reduced_il, +3.70 reduced_il); + zf = exact_center + (+0.20 reduced_il, +3.00 reduced_il); + zg = exact_center + (-0.20 reduced_il, +2.00 reduced_il); + zh = exact_center + (-0.50 reduced_il, +1.70 reduced_il); + zi = exact_center + (-0.80 reduced_il, +0.75 reduced_il); + zj = exact_center + (-0.60 reduced_il, +0.60 reduced_il); + + draw za{-1,2} .. zb .. zc .. zd .. ze .. zf .. zg .. zh .. zi .. zj; + + save za, zb, zc, zd, ze, zf; + pair za, zb, zc, zd, ze, zf; + + pickup pencircle + xscaled 0.75 reduced_slt + yscaled 0.33 reduced_il + rotated -35; + + za = exact_center + (+0.25 reduced_il, +0.45 reduced_il); + zb = exact_center + (-0.25 reduced_il, +0.45 reduced_il); + zc = exact_center + (-0.25 reduced_il, -0.45 reduced_il); + zd = exact_center + (+0.25 reduced_il, -0.45 reduced_il); + ze = exact_center + (+0.30 reduced_il, +0.00 reduced_il); + zf = exact_center + (+0.00 reduced_il, +0.00 reduced_il); + + draw za .. zb .. zc .. zd .. {up}ze -- zf; +enddef; + + +fet_beginchar("petrucci g clef", "petrucci_g", "petruccigclef") + if test = 1: + draw_staff(-1,3, 0.0); + fi; + draw_petrucci_g_clef((0,0), 1.0); +fet_endchar; +fet_beginchar("petrucci g clef", "petrucci_g_change", "cpetruccigclef") + draw_petrucci_g_clef((0,0), .8); +fet_endchar; + + + +%%%%%%%% +% +% +% +% Hufnagel +% +% +% +def draw_hufnagel_do_clef(expr exact_center, reduction) = + % + % inspired by Graduale of Friedrich Zollner (1442), in: MGG, + % volume 9, col. 1413 ("Neustift"), fig. 1. + % + save reduced_il; + + reduced_il# = staff_space# * reduction; + + define_pixels(reduced_il); + + pickup pencircle + xscaled (0.60reduced_il) + yscaled (0.10reduced_il) + rotated 40; + save za, zb, zc, zd, ze, zf; + pair za, zb, zc, zd, ze, zf; + + za = exact_center + (+0.30reduced_il, +.45reduced_il); + zb = exact_center + (+0.20reduced_il, +.45reduced_il); + zc = exact_center + (-0.10reduced_il, +.60reduced_il); + zd = exact_center + (-0.40reduced_il, +.45reduced_il); + ze = exact_center + (-0.40reduced_il, -.45reduced_il); + zf = exact_center + (-0.20reduced_il, -.55reduced_il); + draw za .. zb .. zc -- zd -- ze -- zf; + + set_char_box(0.5reduced_il#, 0.5reduced_il#, 0, reduced_il#); +enddef; + + +fet_beginchar("Hufnagel do clef", "hufnagel_do", "hufnageldoclef") + if test = 1: + draw_staff(-1,3, 0.0); + fi; + draw_hufnagel_do_clef((0,0), 1.0); +fet_endchar; +fet_beginchar("Hufnagel do clef", "hufnagel_do_change", "chufnageldoclef") + draw_hufnagel_do_clef((1.3 staff_space#,0), .8); +fet_endchar; + + +def draw_hufnagel_fa_clef(expr exact_center, reduction) = + % + % inspired by Bamberger Manuscript (15th century), in: + % MGG, volume 2, table 59. + % + save reduced_il; + + reduced_il# = staff_space# * reduction; + + define_pixels(reduced_il); + + pickup pencircle + xscaled (0.60reduced_il) + yscaled (0.10reduced_il) + rotated 40; + save za, zb, zc, zd, ze, zf; + pair za, zb, zc, zd, ze, zf; + + za = exact_center + (+0.30reduced_il, +0.70reduced_il); + zb = exact_center + (+0.20reduced_il, +0.70reduced_il); + zc = exact_center + (-0.10reduced_il, +0.85reduced_il); + zd = exact_center + (-0.40reduced_il, +0.70reduced_il); + ze = exact_center + (-0.40reduced_il, -1.10reduced_il); + draw za .. zb .. zc -- zd -- ze; + + save zg, zh, zi, zj; + pair zg, zh, zi, zj; + + zg = exact_center + (+0.30reduced_il, -0.05reduced_il); + zh = exact_center + (+0.20reduced_il, -0.05reduced_il); + zi = exact_center + (-0.10reduced_il, +0.10reduced_il); + zj = exact_center + (-0.40reduced_il, -0.05reduced_il); + draw zg .. zh .. zi -- zj; + + set_char_box(0.5reduced_il#, 0.5reduced_il#, 0, reduced_il#); +enddef; + + +fet_beginchar("Hufnagel fa clef", "hufnagel_fa", "hufnagelfaclef") + if test = 1: + draw_staff(-1,3, 0.0); + fi; + draw_hufnagel_fa_clef((0,0), 1.0); +fet_endchar; +fet_beginchar("Hufnagel fa clef", "hufnagel_fa_change", "chufnagelfaclef") + draw_hufnagel_fa_clef((0,0), .8); +fet_endchar; + + +def draw_hufnagel_do_fa_clef(expr exact_center, reduction) = + draw_hufnagel_do_clef(exact_center, reduction); + draw_hufnagel_fa_clef(exact_center + (0, -2staff_space), reduction); +enddef; + + +fet_beginchar("Hufnagel do/fa clef", "hufnagel_do_fa", "hufnageldofaclef") + if test = 1: + draw_staff(-1,3, 0.0); + fi; + draw_hufnagel_do_fa_clef((0,0), 1.0); +fet_endchar; +fet_beginchar("Hufnagel do/fa clef", "hufnagel_do_fa_change", + "chufnageldofaclef") + draw_hufnagel_do_fa_clef((0,0), .8); +fet_endchar; + + +fet_endgroup("clefs"); diff --git a/mf/feta-custodes.mf b/mf/parmesan-custodes.mf similarity index 91% rename from mf/feta-custodes.mf rename to mf/parmesan-custodes.mf index ad405ad4b1..f61f2449f6 100644 --- a/mf/feta-custodes.mf +++ b/mf/parmesan-custodes.mf @@ -3,7 +3,7 @@ % % source file of LilyPond's pretty-but-neat music font % -% (C) 2000 Juergen Reuter +% (C) 2000, 2002 Juergen Reuter % save black_notehead_width; @@ -102,17 +102,18 @@ fet_beginchar("Custos Med.", "medicaea", "medicaea") black_notehead_width# := wd#; define_pixels(ht, wd); - pickup pencircle scaled stafflinethickness; - z1 = (0.0wd, +0.0ht); - z2 = (1.0wd + 0.5stafflinethickness, +0.0ht); - penpos1(1.0ht, 90); - penpos2(1.0ht, 90); - penstroke z1e{z2 - z1} .. {right}z2e; + % head + pickup pencircle xscaled blot_diameter yscaled 1.0ht; + z1 = (0.0wd, 0.0ht); + z2 = z1 + (1.0wd - blot_diameter/2, 0); + draw z1 .. z2; - z3=(1.0wd, +0.0ht); - z4=(1.0wd, +1.0ht); - draw z3 -- z4; + % stem + pickup pencircle scaled stafflinethickness; + z3 = (1.0wd - stafflinethickness/2, 0.0ht); + z4 = z3 + (0, +1.0ht); + draw z3 .. z4; fet_endchar; @@ -132,17 +133,18 @@ fet_beginchar("Reverse Custos Med.", "rmedicaea", "rmedicaea") black_notehead_width# := wd#; define_pixels(ht, wd); - pickup pencircle scaled stafflinethickness; - z1 = (0.0wd, +0.0ht); - z2 = (1.0wd + 0.5stafflinethickness, -0.0ht); - penpos1(1.0ht, 90); - penpos2(1.0ht, 90); - penstroke z1e{z2 - z1} .. {right}z2e; + % head + pickup pencircle xscaled blot_diameter yscaled 1.0ht; + z1 = (0.0wd, 0.0ht); + z2 = z1 + (1.0wd - blot_diameter/2, 0); + draw z1 .. z2; - z3=(1.0wd, -0.0ht); - z4=(1.0wd, -1.0ht); - draw z3 -- z4; + % stem + pickup pencircle scaled stafflinethickness; + z3 = (1.0wd - stafflinethickness/2, 0.0ht); + z4 = z3 + (0, -1.0ht); + draw z3 .. z4; fet_endchar; diff --git a/mf/parmesan-flags.mf b/mf/parmesan-flags.mf new file mode 100644 index 0000000000..3e381e4516 --- /dev/null +++ b/mf/parmesan-flags.mf @@ -0,0 +1,471 @@ +% flags +% + + +fet_begingroup("flags") +save outer_path; +path outer_path; +% Flags pointing down overlap with the notehead (in x-direction), so +% the down-flag can be bigger +upflag_width# = .750 black_notehead_width# + stemthickness#/2; +downflag_width# = .833 black_notehead_width# + stemthickness#/2; + +right_upflag_space# = .2 upflag_width#; +right_downflag_space# = .2 downflag_width#; + +% +% Flags pointing down cannot overlap with the notehead in y-direction, +% so they have less slant. + +% Because of optical illusion, the utmost flag (bottom for +% down-pointing, top for up-pointing) should be smaller than the other +% flags. Adobe Sonata doesn't do this correctly. (Instead they have +% an extension flag, which looks less elegant) +% + +save hip_thickness, foot_thickness; +hip_thickness# = 1.3 stemthickness#; +foot_thickness# = hip_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; + +%%%%%%%% +% +% +% +% 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; + save flagspace, total_depth, flag_count; + + flag_count = 1; + flare# = .99 staff_space#; + flagspace# = .9 staff_space#; + hip_depth_ratio = .72 ; + hip_width# = downflag_width# - hip_thickness#/2; + total_depth# = 2.85 staff_space#; + (flag_count-1) * flagspace# + foot_depth# = total_depth#; + + foot_width_ratio = .8; + + define_pixels(flare, hip_width, hip_thickness, + flagspace, foot_depth); + + set_char_box(hip_width# * hip_depth_ratio, + hip_width# + stemthickness#/2 + right_downflag_space#, + foot_depth# * hip_depth_ratio, -flare#) + + pickup pencircle scaled 1.5 stemthickness; + draw (-b, -d) .. (w,h); + y_mirror_char; +fet_endchar; + +% ustem? +% +% +% Stem characters so we can compose metronome markings with Feta +% entirely. +% + +fet_beginchar("stem (up)", "stem", "stem") + set_char_box(stemthickness#/2, stemthickness#/2, 0, 3.5staff_space#); + pickup pencircle scaled stemthickness; + draw (0, 0.2staff_space) .. (0, 3.5staff_space); +fet_endchar; + +% do we want this? +fet_beginchar("stem (down)", "dstem", "dstem") + set_char_box(stemthickness#/2, stemthickness#/2, 3.5staff_space#, 0); + pickup pencircle scaled stemthickness; + draw (0, -0.2staff_space) .. (0, -3.5staff_space); +fet_endchar; + + +fet_endgroup("flags"); diff --git a/mf/parmesan-generic.mf b/mf/parmesan-generic.mf new file mode 100644 index 0000000000..94a5c52f26 --- /dev/null +++ b/mf/parmesan-generic.mf @@ -0,0 +1,38 @@ +% +% feta-generic.mf -- implement generic stuff: include lots of files, but don't +% set dims. +% +% source file of the Feta (defintively not an abbreviation for Font-En-Tja) +% music font +% +% (c) 1997--2002 Han-Wen Nienhuys +% + + +if test = -1: + mode := smoke; +fi + +mode_setup; +% + +input feta-macros; + +make_pen_stack; +make_picture_stack; +input feta-params; + +font_x_height staff_space#; + +if test = 0: + input parmesan-rests; + input parmesan-heads; + input parmesan-clefs; + input parmesan-custodes + input parmesan-accidentals; + input parmesan-flags; + input parmesan-timesig; + +else: + +fi diff --git a/mf/parmesan-rests.mf b/mf/parmesan-rests.mf new file mode 100644 index 0000000000..ec448e60ef --- /dev/null +++ b/mf/parmesan-rests.mf @@ -0,0 +1,177 @@ +% +% feta-toevallig.mf -- implement Accidentals +% +% source file of the Feta (Font-En-Tja) music font +% +% (c) 1997--2002 Han-Wen Nienhuys +% + +fet_begingroup("accidentals"); + + + +%%%%%%%% +% +% +% +% EDITIO MEDICAEA +% +% +% +fet_beginchar("Ed. Med. Flat" , "medicaea-1", "medicaeaflat"); + set_char_box(0, 0.8 staff_space#, 0.6 staff_space#, + 2.0 staff_space#); + + pickup pencircle + xscaled 0.50 stafflinethickness + yscaled 0.22 staff_space; + + save za, zb; + pair za, zb; + + za = (0.00 staff_space, +0.90 staff_space); + zb = (0.00 staff_space, -0.50 staff_space); + draw za -- zb; + + pickup pencircle + xscaled 0.50 stafflinethickness + yscaled 0.22 staff_space + rotated -63; + + save zc, zd, ze; + pair zc, zd, ze; + + zc = (0.10 staff_space, -0.50 staff_space); + zd = (0.40 staff_space, +0.40 staff_space); + ze = (0.10 staff_space, +0.40 staff_space); + + draw zc{(1,2)} .. zd .. ze{(-1,-1)}; + + fet_endchar; + +%%%%%%%% +% +% +% +% EDITIO VATICANA +% +% +% +fet_beginchar("Ed. Vat. Flat" , "vaticana-1", "vaticanaflat"); + set_char_box(0, 0.7 staff_space#, 0.6 staff_space#, + 2.0 staff_space#); + define_pixels (stafflinethickness, staff_space); + + save za, zb, zc, zd, ze, zf, zg; + pair za, zb, zc, zd, ze, zf, zg; + za = (0.00 staff_space, +0.80 staff_space); + zb = (0.00 staff_space, -0.03 staff_space); + zc = (0.25 staff_space, -0.23 staff_space); + zd = (0.50 staff_space, -0.23 staff_space); + ze = (0.50 staff_space, +0.00 staff_space); + zf = (0.25 staff_space, +0.20 staff_space); + zg = (0.15 staff_space, +0.26 staff_space); + + pickup pencircle + xscaled 0.50 stafflinethickness + yscaled 0.22 staff_space; + draw za{down} .. {down}zb .. zc .. zd{up} .. {up}ze .. zf .. zg; + fet_endchar; + +fet_beginchar("Ed. Vat. Natural" , "vaticana0", "vaticananatural"); + set_char_box(0, 0.6 staff_space#, 0.6 staff_space#, + 2.0 staff_space#); + define_pixels (stafflinethickness, staff_space); + + save za, zb, zc, zd; + pair za, zb, zc, zd; + pickup pencircle + xscaled 0.80 stafflinethickness + yscaled 0.22 staff_space; + za = (0.00 staff_space, +0.65 staff_space); + zb = (0.00 staff_space, -0.35 staff_space); + zc = (0.00 staff_space, -0.30 staff_space); + zd = (0.40 staff_space, -0.08 staff_space); + draw za -- zb; + draw zc -- zd; + + addto currentpicture also currentpicture + xscaled -1 + yscaled -1 + shifted (0.40 staff_space, 0.0 staff_space); + + fet_endchar; + +%%%%%%%% +% +% +% +% MENSURAL NOTATION +% +% +% +fet_beginchar("Mensural Sharp" , "mensural1", "mensuralsharp"); + set_char_box(0.4 staff_space#, 0.6 staff_space#, 0.5 staff_space#, + 0.5 staff_space#); + save stemthick; + define_pixels (stemthick, staff_space); + stemthick# = stafflinethickness#; + + save za, zb; + pair za, zb; + pickup pencircle scaled 0.8 stemthick; + za = 0.4 * staff_space * (0.8, 1); + za = -zb; + draw za .. zb; + + addto currentpicture also currentpicture xscaled -1; + addto currentpicture also currentpicture shifted (0.20 staff_space, 0); + + fet_endchar; + +fet_beginchar("Mensural Flat" , "mensural-1", "mensuralflat"); + set_char_box(0.1 staff_space#, 0.7 staff_space#, 0.4 staff_space#, + 1.8 staff_space#); + save stemthick; + define_pixels (stemthick, staff_space); + stemthick# = stafflinethickness#; + + save za, zb, zc, zd, ze; + pair za, zb, zc, zd, ze; + pickup pencircle + xscaled 1.4 stemthick + yscaled 0.6 stemthick + rotated 45; + + za = (0.00 staff_space, +1.80 staff_space); + zb = (0.00 staff_space, -0.25 staff_space); + zc = (0.35 staff_space, -0.25 staff_space); + zd = (0.35 staff_space, +0.25 staff_space); + ze = (0.00 staff_space, +0.25 staff_space); + draw za -- zb .. zc .. zd .. ze; + fet_endchar; + +fet_beginchar("Hufnagel Flat" , "hufnagel-1", "hufnagelflat"); + set_char_box(0.5 staff_space#, 0.7 staff_space#, 0.4 staff_space#, + 1.8 staff_space#); + save stemthick; + define_pixels (stemthick, staff_space); + stemthick# = stafflinethickness#; + + save za, zb, zc, zd, ze, zf; + pair za, zb, zc, zd, ze, zf; + pickup pencircle + xscaled 2.4 stemthick + yscaled 0.4 stemthick + rotated 45; + + za = (0.00 staff_space, +1.80 staff_space); + zb = (0.00 staff_space, -0.15 staff_space); + zc = (0.25 staff_space, -0.30 staff_space); + zd = (0.50 staff_space, +0.00 staff_space); + ze = (0.30 staff_space, +0.30 staff_space); + zf = (0.00 staff_space, +0.15 staff_space); + draw za -- zb -- zc .. zd .. ze -- zf; + fet_endchar; + +fet_endgroup ("accidentals") diff --git a/mf/parmesan-timesig.mf b/mf/parmesan-timesig.mf new file mode 100644 index 0000000000..ef1e075a49 --- /dev/null +++ b/mf/parmesan-timesig.mf @@ -0,0 +1,133 @@ +% +% feta-timesig.mf -- implement Time Signatures +% +% source file of the Feta (not an abbreviation of Font-En-Tja) music font +% +% (c) 1998--2002 Mats Bengtsson , +% Christian Mondrup + +fet_begingroup("timesig"); + +path threequartercircle; +threequartercircle = halfcircle & quartercircle rotated 180; + +save Cdiameter,Cthickness; +Cdiameter# := 3/2 staff_space#; +Cthickness# := 2 stafflinethickness#; +define_pixels(Cdiameter,Cthickness); + +%% tempus imperfectum cum prolatione imperfecta +fet_beginchar ("Mensural 4/4 meter", "old4/4", "oldfourfourmeter") + set_char_box(.5 Cdiameter# + staff_space#, .5 Cdiameter# + staff_space#, + .5 Cdiameter#, .5 Cdiameter#); + + pickup pencircle scaled Cthickness; + draw threequartercircle rotated 45 scaled Cdiameter; +fet_endchar; + +%% tempus imperfectum cum prolatione imperfecta proportio dupla +fet_beginchar ("Mensural 2/2 meter", "old2/2", "oldallabreve") + set_char_box(.5 Cdiameter# + staff_space#, .5 Cdiameter# + staff_space#, + staff_space#, staff_space#); + + pickup pencircle scaled Cthickness; + draw threequartercircle rotated 45 scaled Cdiameter; + draw_block((-Cthickness, -d), (0, h)); +fet_endchar; + +%% tempus perfectum cum prolatione imperfecta +fet_beginchar ("Mensural 3/2 meter", "old3/2", "oldthreetwometer") + set_char_box(.5 Cdiameter# + staff_space#, .5 Cdiameter# + staff_space#, + .5 Cdiameter#, .5 Cdiameter#); + + pickup pencircle scaled Cthickness; + draw fullcircle scaled Cdiameter; +fet_endchar; + +%% tempus imperfectum cum prolatione perfecta +fet_beginchar ("Mensural 6/4 meter", "old6/4", "oldsixfourmeter") + set_char_box(.5 Cdiameter# + staff_space#, .5 Cdiameter# + staff_space#, + .5 Cdiameter#, .5 Cdiameter#); + + pickup pencircle scaled Cthickness; + draw threequartercircle rotated 45 scaled Cdiameter; + pickup pencircle scaled 4 stafflinethickness; + draw (0,0); +fet_endchar; + +%% tempus perfectum cum prolatione perfecta +fet_beginchar ("Mensural 9/4 meter", "old9/4", "oldninefourmeter") + set_char_box(.5 Cdiameter# + staff_space#, .5 Cdiameter# + staff_space#, + .5 Cdiameter#, .5 Cdiameter#); + + pickup pencircle scaled Cthickness; + draw fullcircle scaled Cdiameter; + pickup pencircle scaled 4 stafflinethickness; + draw (0,0); +fet_endchar; + +%% tempus perfectum cum prolatione imperfecta proportio dupla +fet_beginchar ("Mensural 3/4 meter", "old3/4", "oldthreefourmeter") + set_char_box(.5 Cdiameter# + staff_space#, .5 Cdiameter# + staff_space#, + staff_space#, staff_space#); + + pickup pencircle scaled Cthickness; + draw fullcircle scaled Cdiameter; + draw_block((-Cthickness/2, -d), (Cthickness/2, h)); +fet_endchar; + +%% tempus imperfectum cum prolatione perfecta proportio dupla +fet_beginchar ("Mensural 6/8 meter", "old6/8", "oldsixeightmeter") + set_char_box(.5 Cdiameter# + staff_space#, .5 Cdiameter# + staff_space#, + staff_space#, staff_space#); + + pickup pencircle scaled Cthickness; + draw threequartercircle rotated 45 scaled Cdiameter; + pickup pencircle scaled 4 stafflinethickness; + draw (0,0); + draw_block((-Cthickness/2, -d), (Cthickness/2, h)); +fet_endchar; + +%% tempus perfectum cum prolatione perfecta proportio dupla +fet_beginchar ("Mensural 9/8 meter", "old9/8", "oldnineeight") + set_char_box(.5 Cdiameter# + staff_space#, .5 Cdiameter# + staff_space#, + staff_space#, staff_space#); + + pickup pencircle scaled Cthickness; + draw fullcircle scaled Cdiameter; + pickup pencircle scaled 4 stafflinethickness; + draw (0,0); + draw_block((-Cthickness/2, -d), (Cthickness/2, h)); +fet_endchar; + +%% tempus imperfectum cum prolatione imperfecta diminutio simplex +fet_beginchar ("Mensural 4/8 meter", "old4/8", "oldfoureightmeter") + set_char_box(.5 Cdiameter# + staff_space#, .5 Cdiameter# + staff_space#, + .5 Cdiameter#, .5 Cdiameter#); + + pickup pencircle scaled Cthickness; + draw threequartercircle rotated 225 scaled Cdiameter; +fet_endchar; + +%% tempus imperfectum cum prolatione perfecta diminutio simplex +fet_beginchar ("Mensural 6/8 meter", "old6/8alt", "oldsixeightmeteralt") + set_char_box(.5 Cdiameter# + staff_space#, .5 Cdiameter# + staff_space#, + .5 Cdiameter#, .5 Cdiameter#); + + pickup pencircle scaled Cthickness; + draw threequartercircle rotated 225 scaled Cdiameter; + pickup pencircle scaled 4 stafflinethickness; + draw (0,0); +fet_endchar; + +%% tempus imperfectum cum prolatione imperfecta diminutio duplex +fet_beginchar ("Mensural 2/4 meter", "old2/4", "oldtwofourmeter") + set_char_box(.5 Cdiameter# + staff_space#, .5 Cdiameter# + staff_space#, + staff_space#, staff_space#); + + pickup pencircle scaled Cthickness; + draw threequartercircle rotated 225 scaled Cdiameter; + draw_block((-Cthickness, -d), (0, h)); +fet_endchar; + +fet_endgroup("timesig"); diff --git a/mf/parmesan20.mf b/mf/parmesan20.mf new file mode 100644 index 0000000000..5846868a3b --- /dev/null +++ b/mf/parmesan20.mf @@ -0,0 +1,17 @@ +% feta20.mf +% part of LilyPond's pretty-but-neat music font + +staffsize#:=20pt#; + +input feta-autometric; +fet_beginfont("feta", 20); + +% AFBLIJVEN! Gebruik feta-test16/20, anders verneuk je de distributie. +test := 0; + +input parmesan-generic; + +fet_endfont("feta"); + +end. + diff --git a/scm/clef.scm b/scm/clef.scm index e4203218f6..f4e77dde07 100644 --- a/scm/clef.scm +++ b/scm/clef.scm @@ -66,6 +66,7 @@ ("clefs-C" . 0) ("clefs-F" . 4) ("clefs-percussion" . 0) + ("clefs-tab" . 0 ) ("clefs-vaticana_do" . 0) ("clefs-vaticana_fa" . 4) ("clefs-medicaea_do" . 0) diff --git a/scm/output-lib.scm b/scm/output-lib.scm index d9123c436e..fb053465de 100644 --- a/scm/output-lib.scm +++ b/scm/output-lib.scm @@ -88,6 +88,7 @@ centered, X==1 is at the right, X == -1 is at the left." ((transparent) '(1.0 . 1.0)) ((slash) '(1.0 . 1.0)) ((harmonic) '(1.0 0.0)) + ((triangle) '(0.75 . 0.15)) (else '(1.0 . 0.0) ))) diff --git a/scripts/abc2ly.py b/scripts/abc2ly.py index af8cbf877c..eac86759a2 100644 --- a/scripts/abc2ly.py +++ b/scripts/abc2ly.py @@ -1271,7 +1271,7 @@ This program converts ABC music files (see http://www.gre.ac.uk/~c.walshaw/abc2mtex/abc.txt) To LilyPond input. -Report bugs to bug-gnu-music@gnu.org +Report bugs to bug-lilypond@gnu.org Written by Han-Wen Nienhuys , Laura Conrad , Roy Rankin diff --git a/scripts/etf2ly.py b/scripts/etf2ly.py index 36976017a4..4219f1d8df 100644 --- a/scripts/etf2ly.py +++ b/scripts/etf2ly.py @@ -1101,7 +1101,7 @@ Enigma Transport Format is a format used by Coda Music Technology's Finale product. This program will convert a subset of ETF to a ready-to-use lilypond file. -Report bugs to bug-gnu-music@gnu.org +Report bugs to bug-lilypond@gnu.org Written by Han-Wen Nienhuys """) diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py index fb3e5df785..2eb4a0c5f2 100644 --- a/scripts/lilypond-book.py +++ b/scripts/lilypond-book.py @@ -1157,7 +1157,7 @@ Options: -Report bugs to bug-gnu-music@gnu.org. +Report bugs to bug-lilypond@gnu.org. Written by Tom Cato Amundsen and Han-Wen Nienhuys diff --git a/scripts/ly2dvi.py b/scripts/ly2dvi.py index 90fa4d6032..43dd994891 100644 --- a/scripts/ly2dvi.py +++ b/scripts/ly2dvi.py @@ -96,7 +96,7 @@ def identify (): def warranty (): identify () sys.stdout.write ('\n') - sys.stdout.write (_ ('Copyright (c) %s by' % ' 2001')) + sys.stdout.write (_ ('Copyright (c) %s by' % ' 2001--2002')) sys.stdout.write ('\n') sys.stdout.write (' Han-Wen Nienhuys') sys.stdout.write (' Jan Nieuwenhuizen') diff --git a/scripts/midi2ly.py b/scripts/midi2ly.py index f43ae51921..0ddc1aa56f 100644 --- a/scripts/midi2ly.py +++ b/scripts/midi2ly.py @@ -131,7 +131,7 @@ def identify (): def warranty (): identify () sys.stdout.write ('\n') - sys.stdout.write (_ ('Copyright (c) %s by' % ' 2001')) + sys.stdout.write (_ ('Copyright (c) %s by' % ' 2001--2002')) sys.stdout.write ('\n') sys.stdout.write (' Han-Wen Nienhuys') sys.stdout.write (' Jan Nieuwenhuizen') diff --git a/scripts/musedata2ly.py b/scripts/musedata2ly.py index 9f1a3d1699..97a3e36a21 100644 --- a/scripts/musedata2ly.py +++ b/scripts/musedata2ly.py @@ -519,7 +519,7 @@ encoded in so-called Musedata format musedata2ly converts a set of musedata files to one .ly file, and will include a \header field if a .ref file is supplied -Report bugs to bug-gnu-music@gnu.org. +Report bugs to bug-lilypond@gnu.org. Written by Han-Wen Nienhuys """) @@ -532,7 +532,7 @@ This is free software. It is covered by the GNU General Public License, and you are welcome to change it and/or distribute copies of it under certain conditions. Invoke as `midi2ly --warranty' for more information. -Copyright (c) 2000 by Han-Wen Nienhuys +Copyright (c) 2000--2002 by Han-Wen Nienhuys """ % version) def identify(): sys.stderr.write ("%s from LilyPond %s\n" % (program_name, version)) diff --git a/scripts/pmx2ly.py b/scripts/pmx2ly.py index ed02750ebf..412906db09 100644 --- a/scripts/pmx2ly.py +++ b/scripts/pmx2ly.py @@ -791,7 +791,7 @@ Options: PMX is a Musixtex preprocessor written by Don Simons, see http://www.gmd.de/Misc/Music/musixtex/software/pmx/ -Report bugs to bug-gnu-music@gnu.org. +Report bugs to bug-lilypond@gnu.org. Written by Han-Wen Nienhuys """) @@ -804,7 +804,7 @@ This is free software. It is covered by the GNU General Public License, and you are welcome to change it and/or distribute copies of it under certain conditions. Invoke as `midi2ly --warranty' for more information. -Copyright (c) 2000 by Han-Wen Nienhuys +Copyright (c) 2000--2002 by Han-Wen Nienhuys """ % version) def identify(): sys.stderr.write ("%s from LilyPond %s\n" % (program_name, version)) diff --git a/scripts/update-lily.py b/scripts/update-lily.py index 3ff0442234..e1a51d4a3c 100644 --- a/scripts/update-lily.py +++ b/scripts/update-lily.py @@ -119,7 +119,7 @@ def identify (): def warranty (): identify () sys.stdout.write ('\n') - sys.stdout.write (_ ('Copyright (c) %s by' % ' 2001')) + sys.stdout.write (_ ('Copyright (c) %s by' % ' 2001--2002')) sys.stdout.write ('\n') sys.stdout.write (' Han-Wen Nienhuys') sys.stdout.write (' Jan Nieuwenhuizen') -- 2.39.2