From 5ee919dfb13182f88a79942662cee927e4a2aa1a Mon Sep 17 00:00:00 2001 From: fred Date: Sun, 24 Mar 2002 19:27:52 +0000 Subject: [PATCH] lilypond-0.0.23 --- clean | 4 ++++ hdr/accidental.hh | 2 +- hdr/bar.hh | 2 +- hdr/beam.hh | 2 +- hdr/break.hh | 2 +- hdr/clef.hh | 2 +- hdr/clefitem.hh | 2 +- hdr/directionalspanner.hh | 2 +- hdr/getcommand.hh | 2 +- hdr/grouping.hh | 5 ++++- hdr/idealspacing.hh | 2 +- hdr/identifier.hh | 2 +- hdr/identparent.hh | 2 +- hdr/inputmusic.hh | 2 +- hdr/key.hh | 2 +- hdr/keyitem.hh | 2 +- hdr/keyword.hh | 2 +- hdr/leastsquares.hh | 2 +- hdr/localkeyitem.hh | 2 +- hdr/lookup.hh | 2 +- hdr/melodicstaff.hh | 2 +- hdr/meter.hh | 2 +- hdr/notehead.hh | 2 +- hdr/notename.hh | 2 +- hdr/offset.hh | 2 +- hdr/rest.hh | 2 +- hdr/rhythmstaff.hh | 2 +- hdr/sccol.hh | 2 +- hdr/scoreline.hh | 2 +- hdr/script.hh | 2 +- hdr/scriptdef.hh | 2 +- hdr/simplewalker.hh | 2 +- hdr/slur.hh | 2 +- hdr/spanner.hh | 2 +- hdr/staffcommands.hh | 2 +- hdr/staffelem.hh | 7 ++++++- hdr/staffline.hh | 2 +- hdr/stcol.hh | 2 +- hdr/stem.hh | 2 +- hdr/swalker.hh | 2 +- hdr/symtable.hh | 2 +- hdr/textdef.hh | 2 +- hdr/textitem.hh | 2 +- hdr/textspanner.hh | 2 +- 44 files changed, 55 insertions(+), 43 deletions(-) create mode 100755 clean diff --git a/clean b/clean new file mode 100755 index 0000000000..34eb6c982d --- /dev/null +++ b/clean @@ -0,0 +1,4 @@ +#!/bin/sh + +# unclobber current dir. +rm -v *.aux *.log `grep -li "^% Creator: LilyPond" *.out` *.orig *~ \ No newline at end of file diff --git a/hdr/accidental.hh b/hdr/accidental.hh index 8c601863ae..a1c5d80d30 100644 --- a/hdr/accidental.hh +++ b/hdr/accidental.hh @@ -1,7 +1,7 @@ /* accidental.hh -- part of LilyPond - (c) 1996 Han-Wen Nienhuys + (c) 1996,97 Han-Wen Nienhuys */ #ifndef ACCIDENTAL_HH diff --git a/hdr/bar.hh b/hdr/bar.hh index 634940121e..2a360b0d73 100644 --- a/hdr/bar.hh +++ b/hdr/bar.hh @@ -1,7 +1,7 @@ /* bar.hh -- part of LilyPond - (c) 1996 Han-Wen Nienhuys + (c) 1996,97 Han-Wen Nienhuys */ #ifndef BAR_HH diff --git a/hdr/beam.hh b/hdr/beam.hh index 912f47dc72..96c65b12b0 100644 --- a/hdr/beam.hh +++ b/hdr/beam.hh @@ -1,7 +1,7 @@ /* beam.hh -- part of LilyPond - (c) 1996 Han-Wen Nienhuys + (c) 1996,97 Han-Wen Nienhuys */ #ifndef BEAM_HH diff --git a/hdr/break.hh b/hdr/break.hh index 4475e7d173..2f471fd4fd 100644 --- a/hdr/break.hh +++ b/hdr/break.hh @@ -1,7 +1,7 @@ /* break.hh -- part of LilyPond - (c) 1996 Han-Wen Nienhuys + (c) 1996,97 Han-Wen Nienhuys */ #ifndef BREAK_HH diff --git a/hdr/clef.hh b/hdr/clef.hh index 3b61ca3bc7..2c56cb497e 100644 --- a/hdr/clef.hh +++ b/hdr/clef.hh @@ -1,7 +1,7 @@ /* clef.hh -- part of LilyPond - (c) 1996 Han-Wen Nienhuys + (c) 1996,97 Han-Wen Nienhuys */ #ifndef CLEF_HH diff --git a/hdr/clefitem.hh b/hdr/clefitem.hh index 525aa0aeb0..ccedc4e9a7 100644 --- a/hdr/clefitem.hh +++ b/hdr/clefitem.hh @@ -2,7 +2,7 @@ /* clefitem.hh -- part of LilyPond - (c) 1996 Han-Wen Nienhuys + (c) 1996,97 Han-Wen Nienhuys */ #ifndef CLEFITEM_HH diff --git a/hdr/directionalspanner.hh b/hdr/directionalspanner.hh index 3c734b3474..f0e4716432 100644 --- a/hdr/directionalspanner.hh +++ b/hdr/directionalspanner.hh @@ -1,7 +1,7 @@ /* directionalspanner.hh -- part of LilyPond - (c) 1996 Han-Wen Nienhuys + (c) 1996,97 Han-Wen Nienhuys */ #ifndef DIRECTIONALSPANNER_HH diff --git a/hdr/getcommand.hh b/hdr/getcommand.hh index e2ce456cf7..77123e85dc 100644 --- a/hdr/getcommand.hh +++ b/hdr/getcommand.hh @@ -1,7 +1,7 @@ /* getcommand.hh -- part of LilyPond - (c) 1996 Han-Wen Nienhuys + (c) 1996,97 Han-Wen Nienhuys */ #ifndef GETCOMMAND_HH diff --git a/hdr/grouping.hh b/hdr/grouping.hh index 6e13f3217e..6f89456d8b 100644 --- a/hdr/grouping.hh +++ b/hdr/grouping.hh @@ -1,7 +1,7 @@ /* grouping.hh -- part of LilyPond - (c) 1996 Han-Wen Nienhuys + (c) 1996,97 Han-Wen Nienhuys */ #ifndef GROUPING_HH @@ -44,6 +44,9 @@ struct Rhythmic_grouping { Array generate_beams(Array, int&); + /// multiply self to span #i# + void extend(MInterval i); + void translate(Moment); private: void init(); void junk(); diff --git a/hdr/idealspacing.hh b/hdr/idealspacing.hh index 801818e7a3..05f58ba9c8 100644 --- a/hdr/idealspacing.hh +++ b/hdr/idealspacing.hh @@ -1,7 +1,7 @@ /* idealspacing.hh -- part of LilyPond - (c) 1996 Han-Wen Nienhuys + (c) 1996,97 Han-Wen Nienhuys */ #ifndef IDEALSPACING_HH diff --git a/hdr/identifier.hh b/hdr/identifier.hh index f634e216dc..04bee62255 100644 --- a/hdr/identifier.hh +++ b/hdr/identifier.hh @@ -2,7 +2,7 @@ /* identifier.hh -- part of LilyPond - (c) 1996 Han-Wen Nienhuys + (c) 1996,97 Han-Wen Nienhuys */ #ifndef IDENTIFIER_HH diff --git a/hdr/identparent.hh b/hdr/identparent.hh index f4e1705d41..c74be844c8 100644 --- a/hdr/identparent.hh +++ b/hdr/identparent.hh @@ -1,7 +1,7 @@ /* identparent.hh -- part of LilyPond - (c) 1996 Han-Wen Nienhuys + (c) 1996,97 Han-Wen Nienhuys */ #ifndef IDENTPARENT_HH diff --git a/hdr/inputmusic.hh b/hdr/inputmusic.hh index 5b6da2968a..4ef8eebb46 100644 --- a/hdr/inputmusic.hh +++ b/hdr/inputmusic.hh @@ -1,7 +1,7 @@ /* inputmusic.hh -- part of LilyPond - (c) 1996 Han-Wen Nienhuys + (c) 1996,97 Han-Wen Nienhuys */ #ifndef INPUTMUSIC_HH diff --git a/hdr/key.hh b/hdr/key.hh index 791c0861cf..a0ea3e833d 100644 --- a/hdr/key.hh +++ b/hdr/key.hh @@ -1,7 +1,7 @@ /* key.hh -- part of LilyPond - (c) 1996 Han-Wen Nienhuys + (c) 1996,97 Han-Wen Nienhuys */ #ifndef KEY_HH diff --git a/hdr/keyitem.hh b/hdr/keyitem.hh index 43ce9ca0a7..72f9680e1a 100644 --- a/hdr/keyitem.hh +++ b/hdr/keyitem.hh @@ -1,7 +1,7 @@ /* keyitem.hh -- part of LilyPond - (c) 1996 Han-Wen Nienhuys + (c) 1996,97 Han-Wen Nienhuys */ #ifndef KEYITEM_HH diff --git a/hdr/keyword.hh b/hdr/keyword.hh index b081df3a62..152d9dc15d 100644 --- a/hdr/keyword.hh +++ b/hdr/keyword.hh @@ -1,7 +1,7 @@ /* keyword.hh -- part of LilyPond - (c) 1996 Han-Wen Nienhuys + (c) 1996,97 Han-Wen Nienhuys */ #ifndef KEYWORD_HH diff --git a/hdr/leastsquares.hh b/hdr/leastsquares.hh index e7368e398b..4d3931ee94 100644 --- a/hdr/leastsquares.hh +++ b/hdr/leastsquares.hh @@ -1,7 +1,7 @@ /* leastsquare.hh -- part of LilyPond - (c) 1996 Han-Wen Nienhuys + (c) 1996,97 Han-Wen Nienhuys */ #ifndef LEASTSQUARE_HH diff --git a/hdr/localkeyitem.hh b/hdr/localkeyitem.hh index 6276977b77..c8cca9d7c1 100644 --- a/hdr/localkeyitem.hh +++ b/hdr/localkeyitem.hh @@ -1,7 +1,7 @@ /* localkeyitem.hh -- part of LilyPond - (c) 1996 Han-Wen Nienhuys + (c) 1996,97 Han-Wen Nienhuys */ #ifndef LOCALKEYITEM_HH diff --git a/hdr/lookup.hh b/hdr/lookup.hh index f947a7d734..ac479b8549 100644 --- a/hdr/lookup.hh +++ b/hdr/lookup.hh @@ -1,5 +1,5 @@ /* - lilypond, (c) 1996 Han-Wen Nienhuys + lilypond, (c) 1996,97 Han-Wen Nienhuys */ #ifndef LOOKUPSYMS_HH #define LOOKUPSYMS_HH diff --git a/hdr/melodicstaff.hh b/hdr/melodicstaff.hh index db7dd88b83..e3a5ff1f61 100644 --- a/hdr/melodicstaff.hh +++ b/hdr/melodicstaff.hh @@ -1,7 +1,7 @@ /* rhythmstaf.hh -- part of LilyPond - (c) 1996 Han-Wen Nienhuys + (c) 1996,97 Han-Wen Nienhuys */ #ifndef MELODICSTAFF_HH diff --git a/hdr/meter.hh b/hdr/meter.hh index ca364cf59c..11166232ad 100644 --- a/hdr/meter.hh +++ b/hdr/meter.hh @@ -1,7 +1,7 @@ /* meter.hh -- part of LilyPond - (c) 1996 Han-Wen Nienhuys + (c) 1996,97 Han-Wen Nienhuys */ #ifndef METER_HH diff --git a/hdr/notehead.hh b/hdr/notehead.hh index 860d16280d..18612b06c6 100644 --- a/hdr/notehead.hh +++ b/hdr/notehead.hh @@ -1,7 +1,7 @@ /* notehead.hh -- part of LilyPond - (c) 1996 Han-Wen Nienhuys + (c) 1996,97 Han-Wen Nienhuys */ #ifndef NOTEHEAD_HH diff --git a/hdr/notename.hh b/hdr/notename.hh index fc134c926f..b533f4d360 100644 --- a/hdr/notename.hh +++ b/hdr/notename.hh @@ -1,7 +1,7 @@ /* notename.hh -- part of LilyPond - (c) 1996 Han-Wen Nienhuys + (c) 1996,97 Han-Wen Nienhuys */ #ifndef NOTENAME_HH diff --git a/hdr/offset.hh b/hdr/offset.hh index b1867007fa..e0b62bba76 100644 --- a/hdr/offset.hh +++ b/hdr/offset.hh @@ -1,7 +1,7 @@ /* offset.hh -- part of LilyPond - (c) 1996 Han-Wen Nienhuys + (c) 1996,97 Han-Wen Nienhuys */ #ifndef OFFSET_HH diff --git a/hdr/rest.hh b/hdr/rest.hh index 2280611be8..e13c540212 100644 --- a/hdr/rest.hh +++ b/hdr/rest.hh @@ -1,7 +1,7 @@ /* rest.hh -- part of LilyPond - (c) 1996 Han-Wen Nienhuys + (c) 1996,97 Han-Wen Nienhuys */ #ifndef REST_HH diff --git a/hdr/rhythmstaff.hh b/hdr/rhythmstaff.hh index 978594dcd3..741be45e78 100644 --- a/hdr/rhythmstaff.hh +++ b/hdr/rhythmstaff.hh @@ -1,7 +1,7 @@ /* rhythmstaf.hh -- part of LilyPond - (c) 1996 Han-Wen Nienhuys + (c) 1996,97 Han-Wen Nienhuys */ #ifndef RHYTHMSTAF_HH diff --git a/hdr/sccol.hh b/hdr/sccol.hh index 615376309c..75f1bcd89b 100644 --- a/hdr/sccol.hh +++ b/hdr/sccol.hh @@ -1,7 +1,7 @@ /* sccol.hh -- part of LilyPond - (c) 1996 Han-Wen Nienhuys + (c) 1996,97 Han-Wen Nienhuys */ #ifndef SCCOL_HH diff --git a/hdr/scoreline.hh b/hdr/scoreline.hh index 233496932a..26e1285c44 100644 --- a/hdr/scoreline.hh +++ b/hdr/scoreline.hh @@ -1,7 +1,7 @@ /* scoreline.hh -- part of LilyPond - (c) 1996 Han-Wen Nienhuys + (c) 1996,97 Han-Wen Nienhuys */ #ifndef SCORELINE_HH diff --git a/hdr/script.hh b/hdr/script.hh index 01dd75c53d..7b6cf37b24 100644 --- a/hdr/script.hh +++ b/hdr/script.hh @@ -1,7 +1,7 @@ /* script.hh -- part of LilyPond - (c) 1996 Han-Wen Nienhuys + (c) 1996,97 Han-Wen Nienhuys */ #ifndef SCRIPT_HH diff --git a/hdr/scriptdef.hh b/hdr/scriptdef.hh index ea5793e21c..fb1dc4317f 100644 --- a/hdr/scriptdef.hh +++ b/hdr/scriptdef.hh @@ -1,7 +1,7 @@ /* scriptdef.hh -- part of LilyPond - (c) 1996 Han-Wen Nienhuys + (c) 1996,97 Han-Wen Nienhuys */ #ifndef SCRIPTDEF_HH diff --git a/hdr/simplewalker.hh b/hdr/simplewalker.hh index 34403e465c..192419ef2e 100644 --- a/hdr/simplewalker.hh +++ b/hdr/simplewalker.hh @@ -1,7 +1,7 @@ /* simplewalker.hh -- part of LilyPond - (c) 1996 Han-Wen Nienhuys + (c) 1996,97 Han-Wen Nienhuys */ #ifndef SIMPLEWALKER_HH diff --git a/hdr/slur.hh b/hdr/slur.hh index 9a3333f063..8c0cbd4ebe 100644 --- a/hdr/slur.hh +++ b/hdr/slur.hh @@ -1,7 +1,7 @@ /* slur.hh -- part of LilyPond - (c) 1996 Han-Wen Nienhuys + (c) 1996,97 Han-Wen Nienhuys */ #ifndef SLUR_HH diff --git a/hdr/spanner.hh b/hdr/spanner.hh index fd646a4b91..d04f0736a6 100644 --- a/hdr/spanner.hh +++ b/hdr/spanner.hh @@ -1,7 +1,7 @@ /* spanner.hh -- part of LilyPond - (c) 1996 Han-Wen Nienhuys + (c) 1996,97 Han-Wen Nienhuys */ #ifndef SPANNER_HH diff --git a/hdr/staffcommands.hh b/hdr/staffcommands.hh index e0e27be4be..1a25b9bdb4 100644 --- a/hdr/staffcommands.hh +++ b/hdr/staffcommands.hh @@ -1,5 +1,5 @@ /* - lilypond, (c) 1996 Han-Wen Nienhuys + lilypond, (c) 1996,97 Han-Wen Nienhuys */ #ifndef SCORECOMMANDS_HH #define SCORECOMMANDS_HH diff --git a/hdr/staffelem.hh b/hdr/staffelem.hh index bd10f216a8..e48170d4d2 100644 --- a/hdr/staffelem.hh +++ b/hdr/staffelem.hh @@ -1,7 +1,7 @@ /* staffelem.hh -- part of LilyPond - (c) 1996 Han-Wen Nienhuys + (c) 1996,97 Han-Wen Nienhuys */ #ifndef STAFFELEM_HH @@ -63,6 +63,11 @@ private: NULL. */ }; +/** Both Spanner and Item are Staff_elem's. Most Staff_elem's depend + on other Staff_elem's, eg, Beam needs to know and set direction of + Stem. So the Beam has to be calculated *before* Stem. This is + accomplished with the dependencies field of struct Staff_elem. + */ #endif // STAFFELEM_HH diff --git a/hdr/staffline.hh b/hdr/staffline.hh index 663c9584b2..e08aabd17e 100644 --- a/hdr/staffline.hh +++ b/hdr/staffline.hh @@ -1,7 +1,7 @@ /* staffline.hh -- horizontal structures for broken scores. - (c) 1996 Han-Wen Nienhuys + (c) 1996,97 Han-Wen Nienhuys */ #ifndef STAFFLINE_HH diff --git a/hdr/stcol.hh b/hdr/stcol.hh index 2bdd3b8bb9..b9e3a9bba8 100644 --- a/hdr/stcol.hh +++ b/hdr/stcol.hh @@ -1,7 +1,7 @@ /* stcol.hh -- part of LilyPond - (c) 1996 Han-Wen Nienhuys + (c) 1996,97 Han-Wen Nienhuys */ #ifndef STCOL_HH diff --git a/hdr/stem.hh b/hdr/stem.hh index b7d7e05e29..977a719ae9 100644 --- a/hdr/stem.hh +++ b/hdr/stem.hh @@ -1,7 +1,7 @@ /* stem.hh -- - (c) 1996 Han-Wen Nienhuys + (c) 1996,97 Han-Wen Nienhuys */ #ifndef STEM_HH diff --git a/hdr/swalker.hh b/hdr/swalker.hh index 046ded590e..d224477b60 100644 --- a/hdr/swalker.hh +++ b/hdr/swalker.hh @@ -2,7 +2,7 @@ /* swalker.hh -- part of LilyPond - (c) 1996 Han-Wen Nienhuys + (c) 1996,97 Han-Wen Nienhuys */ #ifndef SWALKER_HH diff --git a/hdr/symtable.hh b/hdr/symtable.hh index b4217c12b8..61dc38b42e 100644 --- a/hdr/symtable.hh +++ b/hdr/symtable.hh @@ -1,5 +1,5 @@ /* - lilypond, (c) 1996 Han-Wen Nienhuys + lilypond, (c) 1996,97 Han-Wen Nienhuys */ #ifndef SYMTABLE_HH #define SYMTABLE_HH diff --git a/hdr/textdef.hh b/hdr/textdef.hh index 784420c44b..2befb6bb4d 100644 --- a/hdr/textdef.hh +++ b/hdr/textdef.hh @@ -1,7 +1,7 @@ /* textdef.hh -- part of LilyPond - (c) 1996 Han-Wen Nienhuys + (c) 1996,97 Han-Wen Nienhuys */ #ifndef TEXTDEF_HH diff --git a/hdr/textitem.hh b/hdr/textitem.hh index 1d37be3286..ffeeafbb82 100644 --- a/hdr/textitem.hh +++ b/hdr/textitem.hh @@ -1,7 +1,7 @@ /* text.hh -- part of LilyPond - (c) 1996 Han-Wen Nienhuys + (c) 1996,97 Han-Wen Nienhuys */ #ifndef TEXT_ITEM_HH diff --git a/hdr/textspanner.hh b/hdr/textspanner.hh index 1e9d06d543..4baf832a39 100644 --- a/hdr/textspanner.hh +++ b/hdr/textspanner.hh @@ -1,7 +1,7 @@ /* textspanner.hh -- part of LilyPond - (c) 1996 Han-Wen Nienhuys + (c) 1996,97 Han-Wen Nienhuys */ #ifndef TEXTSPANNER_HH -- 2.39.5