From a041f64bee76121700150af4283e59fcb35e16e9 Mon Sep 17 00:00:00 2001 From: fred Date: Sun, 24 Mar 2002 19:59:47 +0000 Subject: [PATCH] lilypond-0.1.11 --- Documentation/Vocab-British | 21 -- Documentation/Vocab-French | 237 -------------- Documentation/Vocab-German | 8 - input/standchen-16.ly | 20 -- input/standchen-20.ly | 22 -- input/standchen-part.ly | 484 ----------------------------- lib/file-storage.cc | 101 ------ lily/include/spanner-elem-group.hh | 25 -- lily/include/stem-beam-grav.hh | 40 --- lily/spanner-elem-group.cc | 30 -- lily/stem-beam-grav.cc | 193 ------------ lily/text-grav.cc | 76 ----- 12 files changed, 1257 deletions(-) delete mode 100644 Documentation/Vocab-British delete mode 100644 Documentation/Vocab-French delete mode 100644 Documentation/Vocab-German delete mode 100644 input/standchen-16.ly delete mode 100644 input/standchen-20.ly delete mode 100644 input/standchen-part.ly delete mode 100644 lib/file-storage.cc delete mode 100644 lily/include/spanner-elem-group.hh delete mode 100644 lily/include/stem-beam-grav.hh delete mode 100644 lily/spanner-elem-group.cc delete mode 100644 lily/stem-beam-grav.cc delete mode 100644 lily/text-grav.cc diff --git a/Documentation/Vocab-British b/Documentation/Vocab-British deleted file mode 100644 index d2b666a42f..0000000000 --- a/Documentation/Vocab-British +++ /dev/null @@ -1,21 +0,0 @@ -# Musical vocabulary, correspondance from British. -# Copyright (C) 1993 Free Software Foundation, Inc. -# Neil Jerram , 1993. - -British American - -breve double whole note -crotchet quarter note -crotchet rest quarter rest -demisemiquaver thirty-second note -demisemiquaver rest thirty-second rest -hemidemisemiquaver sixty-fourth note -hemidemisemiquaver rest sixty-fourth rest -minim half note -minim rest half rest -quaver eighth note -quaver rest eighth rest -semibreve whole note -semibreve rest whole rest -semiquaver sixteenth note -semiquaver rest sixteenth rest diff --git a/Documentation/Vocab-French b/Documentation/Vocab-French deleted file mode 100644 index 74e46227a2..0000000000 --- a/Documentation/Vocab-French +++ /dev/null @@ -1,237 +0,0 @@ -# Musical vocabulary, correspondance from French. -# Copyright (C) 1993 Free Software Foundation, Inc. -# Francois Pinard , 1993. - -# Thanks to Neil Jerram . - -French American - -accentuation accentuation -accolade brace -accord chord -accord de neuvième dominante chord of the dominant ninth -accord de septième dominante chord of the dominant seventh -accord parfait majeur perfect major chord -accord parfait mineur perfect minor chord -alto alto -altération accidentelle accident; accidental alteration -altération essentielle essential alteration -appogiature appoggiatura -appogiature brève short appoggiatura -appogiature double double appoggiatura -appogiature longue long appoggiatura -appogiature simple simple appoggiatura -armature [de la clé] key signature -armure [de la clé] key signature -arpège arpeggio -augmenté (intervalle) augmented (interval) -bariton baritone -barre de mesure bar line -barre de reprise repeat -basse bass -blanche half note -bâton de pause (arbitrary number of bars' rest) -bâton de pause four-bar rest -bâton de pause two-bar rest -bécarre natural sign -bémol flat -cadence cadence -cadence harmonique harmonic cadence -cadence mélodique melodic cadence -caractère character -chaîne de trilles chain of trills -chevron chevron -chiffrage time signature -chiffre inférieur lower number -chiffre supérieur upper number -chiffres indicateurs time signature -clé clef -clé d'octave octave line -clé d'ut middle C clef -clé de fa bass clef -clé de sol treble clef -comma comma -comma enharmonique -comma pythagoricien -comma syntonique -consonance consonant interval; consonance -contralto contralto -contre-temps contro-time -contre-temps irrégulier irregular contro-time -contre-temps régulier regular contro-time -coulé slur -courbe rythmique rythmic curve -cresendo opening angular bracket -croche eighth note -decrescendo closing angular bracket -degré [de la gamme] degree [of the scale] -demi-pause half rest -demi-soupir eighth rest -demi-ton semitone -demi-ton chromatique chromatic semitone -demi-ton diatonique diatonic semitone -diapason pitch pipe; tuning fork -diminué (intervalle) diminished (interval) -dissonance dissonant interval; dissonance -dièse sharp -do C -do central middle C -doigté -doigté de pédale -dominante dominant -double barre double bar line -double bémol double flat -double croche sixteenth note -double dièse double sharp -double triolet double triplet -duolet duplet -durée duration -échelle d'octave octave line -échelle musicale Musical Ladder -enharmonie enharmony -espace space -extension d'intervalle extension of interval -fa F -figure de note kind of note -figure de silence kind of rest -fioriture cadenza -forme du mode mineur ancien ancient form (diatonic minor scale) -forme harmonique harmonic form (diatonic minor scale) -forme mélodique melodic form (diatonic minor scale) -gamme scale -gamme chromatique chromatic scale -gamme diatonique majeure diatonic major scale -gamme diatonique mineure diatonic minor scale -gammes enharmoniques enharmonic scales -gammes relatives relative scales -genre chromatique chromatic type -genre diatonique diatonic type -genre enharmonique enharmonic type -groupe irrégulier irregular group -grupetto turn; gruppetto -hauteur pitch -huitième de soupir thirty-second rest -incise motive -indication de pédale -indication métronomique metronomic indication -intervalle interval -intervalle ascendant ascending interval -intervalle composé compound interval -intervalle descendant descending interval -intervalle harmonique harmonic interval -intervalle simple simple interval -intervalles enharmoniques enharmonic intervals -juste (intervalle) perfect (interval) -la A -liaison tie -liaison rythmique legato curve -ligne line -ligne supplémentaire ledger line -majeur (intervalle) major (interval) -membre de phrase phrase member -mesure bar; measure -mesure artificielle artificial measure -mesure composée compound measure -mesure incomplète incomplete measure -mesure irrégulière irregular measure -mesure simple simple measure -mezzo-soprano mezzo-soprano -mi E -mineur (intervalle) minor (interval) -mode mode -mode ecclésiastique -mode majeur major mode -mode mineur minor mode -modulation modulation -mordant mordent -mouvement tempo; movement -mouvement conjoint conjunct movement -mouvement disjoint disjunct movement -mouvement lent slow tempo -mouvement modéré moderate tempo -mouvement rapide fast tempo -médiante mediant -métronome metronome -noire quarter note -note note -note doublement pointée double dotted note -note modale modal note -note pointée dotted note -note tonale tonal note -notes enharmoniques enharmonic notes -nuance shading -octave octave -ornement embellishment; accessory -partition score -pause whole rest -phrase phrase -phrasé phrasing -pizzicato dash over/below -point dot -point d'orgue pause -point et liaison combinés dot and curved line combined -pointillés -portamento underline over/below -portée staff -portées staves -quadruple croche sixty-fourth note -quart de soupir sixteenth rest -quarte fourth -quartolet quadruplet -quinte fifth -registre register -renversement d'intervalle inversion of interval -renvoi return sign -respiration artificial rest -ronde whole note -rythme rythm -ré D -seconde second -seizième de soupir sixty-fourth rest -sensible leading note -septième seventh -sextolet sextuplet -si B -signes indicateurs de nuance shading signs -silence rest -sixain sextuplet -sixte sixth -sol G -soprano soprano -soupir quarter rest -sous-dominante subdominant -sous-tonique subtonic -staccato dot over/below -sus-dominante superdominant -sus-tonique supertonic -syncope syncopation; upbeat -syncope irrégulière irregular syncopation -syncope régulière regular syncopation -temps beat -temps binaire binary beat -temps faible weak beat -temps fort strong beat -temps ternaire ternary beat -tempérament mésotonique meantone tuning -tempérament égal tempered tuning -tierce third -ton tone -tonalité tonality -tonique tonic -tons relatifs relative scales -tons voisins adjacent keys -transposition transposition -transposition chromatique chromatic transposition -transposition enharmonique enharmonic transposition -trille trill; shake -trille double double trill -triolet triplet -triple croche thirty-second note -triton tritone -ténor tenor -tétracorde tetrachord -unisson unison -unité de mesure unit of measure -unité de temps unit of beat -ut C -voix voice diff --git a/Documentation/Vocab-German b/Documentation/Vocab-German deleted file mode 100644 index 488c4f0c49..0000000000 --- a/Documentation/Vocab-German +++ /dev/null @@ -1,8 +0,0 @@ -# Musical vocabulary, correspondance from German. -# Copyright (C) 1993 Free Software Foundation, Inc. -# Francois Pinard , 1993. - -German American - -B B flat -H B diff --git a/input/standchen-16.ly b/input/standchen-16.ly deleted file mode 100644 index 191760b3ca..0000000000 --- a/input/standchen-16.ly +++ /dev/null @@ -1,20 +0,0 @@ -%{ -16-point version of "leise flehen meine lieder" -%} - -\include "standchen-part.ly" - -\score{ - \themusic - \paper{ - % 16pt mustn't use whole page width - linewidth= 160.\mm; - % we want gourlay, don't set geometric - % geometric= 1.4; - gourlay_maxmeasures = 9.; - \output "standchen.out"; - } - \midi{ - \tempo 4 = 54; - } -} diff --git a/input/standchen-20.ly b/input/standchen-20.ly deleted file mode 100644 index 5a9eb1b6da..0000000000 --- a/input/standchen-20.ly +++ /dev/null @@ -1,22 +0,0 @@ -%{ -20-point version of "leise flehen meine lieder" -%} - -\include "standchen-part.ly" - -\score{ - \themusic - \paper{ - \paper_twenty - % 20pt music uses whole pagewidth - linewidth= 195.\mm; - - % we want gourlay, don't set geometric - % geometric= 1.4; - gourlay_maxmeasures = 9.; - \output "standchen.out"; - } - \midi{ - \tempo 4 = 54; - } -} diff --git a/input/standchen-part.ly b/input/standchen-part.ly deleted file mode 100644 index e1e86247ac..0000000000 --- a/input/standchen-part.ly +++ /dev/null @@ -1,484 +0,0 @@ -\header{ -filename standchen-part.ly -title St\"andchen (Serenade) "Leise flehen meine Lieder" -opus D. 957 No. 4 -composers Franz Schubert (1797-1828) - Text by Ludwig Rellstab (1799-1860) -enteredby JCN -copyright public domain -} -%{ - Tested Features: multivoice, accents, lyrics, chords, piano music -%} - -\version "0.1.1"; - -commands = \melodic{ - \skip 2.*4; - \bar "|:"; - \skip 2.*24; -% volta1 - \skip 2.*8; -% volta2 - \bar ":|"; - \skip 2.*22; - \bar "|."; - } - -melodie = \melodic{ - \meter 3/4; - \clef "violin"; - \key bes; - \octave c'; - \duration 8; - r \pp < [ d 'a-| > f-| < d 'a-| > f-| < d 'a-| ] > | -%%2 - r < [ d 'bes-| > f-| < d 'bes-| > f-| < d 'bes-| ] > | -%%3 - \textstyle "italic"; - r_"simile" < [ d 'bes > e < d 'bes > e < d 'bes ] >| - \textstyle "roman"; - -%%4 - r < [ 'a cis > e < 'a cis > e < 'a cis ] > | -%%5 - [2/3 a~ bes a ]1/1 d'4. a | -%%6 - [2/3 g~ a g ]1/1 d'4 g r | - -%%7 - a4.^> g [2/3 g~ f e ]1/1 | -%%8 - f2 r4 | -%%9 - - < { a'4.~ g' [2/3 g'( f' )e' ]1/1 } - { cis'4. e'_"dolce" \plet 2/3; e' \plet 1/1; } > | -%%10 - < f'2. d'2. > | -%%11 - [2/3 a ~ bes a ]1/1 f'4. a | -%%12 - [2/3 g~ a g ]1/1 e'4. d' | -%%13 - c'4. bes [2/3 bes~ a g ]1/1 | -%%14 - a2 r - < { d'~ c'4. g [2/3 bes a g ]1/1 } - { f \p ~ e4._"dolce" bes - \plet 2/3; g - \plet 1/1; - } > | -%%16 - < a2. f2. > | -%%17 - \textstyle "italic"; - [ a8._"cresc." cis'16 ] f'4. e' - \textstyle "roman";| -%%18 - [ d'8. a16 ] f4. d | -%%19 -%#% c'\grace\stemup - [2/3 bes ~ a bes ]1/1 d'4. bes | -%%20 - a2. | -%%21 -%#% a\grace - [2/3 g~ fis g ]1/1 bes4.^> g | -%%22 - f!2. | -%%23 - [ a8. \mf cis'16 ] f'4. e' | -%%24 - [ d'8. a16 ] fis4. d | -%%25 - [2/3 b \mf~ ais b ]1/1 d'4. b | -%%26 - < a2. fis2. > | -%%27 - [2/3 e' \f~ dis' e' ]1/1 g'4. cis' | -%%28 - < d'2. fis2. > | -%#%\volta1 -%%29 - < { bes2( [ d'8.~ )bes16 ] } - { g2 \mf [ bes8. g16 ] } > | -%%30 - < { a4. [ a-. a-. a-. ] } - { fis4. [ fis-.( fis-. )fis-. ] } > | -%%31 - < { a4. [ a-. a-. a-. ] } - { g4. [ cis-.( e-. )g-. ] } > | -%%32 - < a2 fis2 \pp > < a4 fis4 > | -%%33 - < { b2( [ d'8.~ )b16 ] } - { g2 [ b8. g16 ] } > | -%%34 - < { a4. [ a-. a-. a-. ] } - { fis4. [ fis-.( fis-. )fis-. ] } > | -%%35 - < { a4. [ a-. a-. a-. ] } - { g4. [ cis-.( e-. )g-. ] } > | -%%36 - < a2. fis2. > | -%#%\volta2 -%%37 - [ a8. a16 ] [ cis'8. cis'16 ] [ e'8. e'16 ] | -%%38 - d'4~ cis'4 r4 | -%%39 -%#% > a4. [ cis' e'8. >! d'16 ] | - a4. \> [ cis' e'8. \! d'16 ] | -%%40 - cis'2 r4 | -%%41 - < fis'4. \> cis'4. \f > e' [2/3 e'~ d' \! cis' ]1/1 | -%%42 - [ b8. cis'16 ] d'4^> b r | -%%43 - - [ b8. \f cis'16 ] d'4^> b r | -%%44 - [ b8. \> cis'16 ] d'4^> b \! r | -%%45 - [2/3 b \p ~ ais b ]1/1 d'4. b | -%%46 - | -%%47 - [2/3 e' \f~ dis' e' ]1/1 g'4.^> cis' | -%%48 - \textstyle "italic"; - < - { fis2.~ - %\group "+1"; - \stem \down; f2. } - { d'2. ~ \stem \up; - d'4 r4_"decresc." d'4 } - > - \textstyle "roman"; | -%%50 - < bes2. e2. > | -%%51 - < a2. cis2. > | -%%52 - < fis2 d2 > < a4 fis4 \pp > | -%%53 - - < bes2 g2 > < [ d'8.^> bes8. > < bes16 g16 ] > | -%%54 - < { a4. [ a-. a-. a-. ] } - { fis4. [ fis-.( fis-. )fis-.] } > | -%%55 - < { a4. [ a-. a-. a-. ] } - { g4. [ cis-.( e-. )g-. ] } > | -%%56 - \textstyle "italic"; - < a2. fis2._"dim." > - \textstyle "roman"; | -%%57 - < a2. fis2. > | -%%58 - < a2.^\fermata fis2. > | -%#%\tighten -} - -begeleiding = \melodic{ - \meter 3/4; - \clef"bass"; - \key bes; - \octave c'; - \duration 2; - 'd r4 | -%%2 - ''bes r4 | - -%%3 - ''g r4 | - -%%4 - ''a r4 | -%%5 -\duration 8; - < \multi 2; { \stem \up; - [ 'f 'a d 'a d 'a ] - [ 'd 'e 'g 'e 'g 'e ] - [ 'cis 'e 'g 'e 'g 'e ] - [ 'd 'a d 'a d 'a ] - } - { \stem \down; - 'd2 r4 - ''bes2 r4 - ''a2 r4 - 'd2 r4 - } > -%%9 - \stem 0; - [ 'a e g e g e ] | -%%10 - [ 'd 'a d 'a d 'a ] | -%%11 - < \multi 2; - { \stem \up; - [ 'f 'a d 'a d 'a ] - [ 'd 'e 'g 'e 'g 'e ] - [ 'e 'g 'bes 'g 'bes 'g ] - [ 'a c f c f c ] - } { \stem \down; - 'd2 r4 - ''bes2 r4 - 'c2 r4 - 'f2 r4 } - > -%%15 - \stem 0; - [ 'c 'g 'bes 'g 'bes 'g ] | -%%16 - [ ''f 'c 'f 'c 'f 'c ] | - < \multi 2; - { \stem \up; - [ ''a 'e 'g 'e 'g 'e ][ 'd 'a d 'a d 'a ] - [ ''bes 'f 'bes 'f 'bes 'f ][ ''f 'c 'f 'c 'f 'c ] } - { \stem \down; - ''a2 r4 - 'd2 r4 - ''bes2 r4 - ''f2 r4 - } > -%%21 - \stem 0; - < [ 'e 'c > 'g c 'g c 'g ] | -%%22 - [ 'f 'a c 'a 'f 'c ] | - < \multi 2; { - \stem \up; - [ ''a 'e 'g 'e 'g 'e ] - [ 'd 'fis 'a 'fis 'a 'fis ] - [ ''g 'd 'b 'd 'b 'd ] - [ 'd 'a d 'a d 'a ] - } - {\stem \down; - ''a2 r4 - 'd2 r4 - ''g2 r4 - 'd2 r4 - } - > - \stem 0; - < [ 'cis ''a > 'e 'a 'e 'a 'e ] | -%%28 - [ 'd 'a d 'a d 'a ] | -%%29 - [ 'd 'g 'bes 'g 'bes 'g ] | -%#%\volta1 -%%30 - [ 'd 'fis 'a 'fis 'a 'fis ] | -%%31 - [ ''a 'e 'a 'e 'a 'e ] | -%%32 - [ 'd 'fis 'a 'fis 'a 'fis ] | -%%33 - [ 'd 'g 'b 'g 'b 'g ] | -%%34 - [ 'd 'fis 'a 'fis 'a 'fis ] | -%%35 - [ ''a 'e 'a 'e 'a 'e ] | -%%36 - [ 'd 'fis 'a 'fis 'a 'fis ] | -%#%\volta2 -%%37 - [ ''a 'e 'g 'e ''bes^> 'e ] | -%%38 - [ ''a < e cis 'a > < e cis 'a > < e cis 'a > < e cis 'a > < e cis 'a ] > | -%%39 - [ ''a 'e 'g 'e ''bes^> 'e ] | -%%40 - [ ''a < e cis 'a > < e cis 'a > < e cis 'a > < e cis 'a > < e cis 'a ] > | -%%41 - [ ''ais 'e 'fis 'e 'fis 'e ] | -%%42 - < [ 'd ''b > 'fis 'b 'fis 'b 'fis ] | -%%43 - < [ 'e ''b > 'g 'b 'g 'b 'g ] | -%%44 - < [ 'd ''b > 'fis 'b 'fis 'b 'fis ] | -%%45 - < \multi 2; { \stem \up; - [ ''g 'd 'b 'd 'b 'd ] - [ 'd 'a d 'a d 'a ] - } { - \stem \down; - ''g2 r4 - 'd2 r4 - } > - -%%47 - \stem 0; - < [ 'cis ''a > 'e 'a 'e 'a 'e ] | -%%48 - [ 'd 'fis 'a 'fis 'a 'fis ] | -%%49 - [ 'd 'a d 'a d 'a ] | -%%50 - [ ''g 'e 'g 'e 'g 'e ] | -%%51 - [ ''a 'e 'g 'e 'g 'e ] | -%%52 - [ ''d 'd 'fis 'd 'fis 'd ] | -%%53 - [ 'd 'g 'bes 'g 'bes 'g ] | -%%54 - [ 'd 'fis 'a 'fis 'a 'fis ] | -%%55 - [ ''a 'e 'g 'e 'g 'e ] | -%%56 - [ ''d ''a 'd ''a 'd ''a ] | -%%57 - [ ''d ''a 'd ''a 'd ''a ] -%%58 - < 'd2.^\fermata ''d2. > | - } - - -tekstI = \lyric{ - \meter 3/4; - \duration 4; - _ _ _ - _ _ _ - _ _ _ - _ _ _ -% 5 - [2/3 Lei- se8 ]1/1 fleh-4. en8 - [2/3 mei- ne8 ]1/1 Lie- der8 _8 - Durch4. die8 [2/3 Nacht zu8 ]1/1 - dir;2 _ - _ _ _ - _ _ _ -% 11 - [2/3 In den8 ]1/1 stil-4. len8 - [2/3 Hain her-8 ]1/1 nie-4. der,8 - Lieb4. chen,8 [2/3 komm zu8 ]1/1 - mir!2 _ - _ _ _ - _ _ _ - -% 17 - Fl\"us-8. ternd16 schlan-4. ke8 - Wip-8. fel16 rau-4. schen8 - [2/3 In des8 ]1/1 Mon-4. des8 - Licht;2. - _ _ _ - _ _ _ - -% 23 - Des8. Ver-16 r\"a-4. ters8 - feind-8. lich16 Lau-4. schen8 - [2/3 F\"urch- te,8 ]1/1 Hol-4. de,8 - nicht.2. - _ _ _ - _ _ _ - -% volta 1 -% 29 - _ _ _ _ _ _ - _ _ _ _ _ _ - _ _ _ _ _ _ - _ _ _ _ _ _ - -% volta 2 -% 37 - La\ss8. auch16 dir8. die16 Brust8. be-16 - we- gen, _ - Lieb-4. chen,8 h\"o-8. re16 - mich!2 _ - Be-8. bend16 harr' ich8 _8 - dir8. ent-16 ge- gen!8 _8 - [2/3 Komm, be-8 ]1/1 gl\"u4. cke8 - mich!2. - _ _ _ _ _ _ -% 47 - _ _ _ _ _ _ - _ _ _ _ _ _ - _ _ _ _ _ _ - _ _ _ _ _ _ - _ _ _ _ _ _ -% 57 - _ _ _ _ _ _ - -} - -tekstII = \lyric{ - \meter 3/4; - \duration 4; - _ _ _ - _ _ _ - _ _ _ - _ _ _ -% 5 - [2/3 H\"orst die8 ]1/1 Nach-4. ti-8 - [2/3 gal- len8 ]1/1 schla- gen?8 _8 - Ach!4. sie8 [2/3 fleh- en8 ]1/1 - dich,2 _ - _ _ _ - _ _ _ - -% 11 - [2/3 Mit der8 ]1/1 T\"o-4. ne8 - [2/3 s\"u\ss- en8 ]1/1 Kla-4. gen8 - Fleh-4. en8 [2/3 sie f\"ur8 ]1/1 - mich.2 _ - _ _ _ - _ _ _ - -% 17 - Sie-8. ver-16 stehn4. des8 - Bus-8. ens16 Seh-4. nen,8 - [2/3 Ken- nen8 ]1/1 Lieb-4. es-8 - schmerz,2. - _ _ _ - _ _ _ - -% 23 - R\"uh-8. ren16 mit4. den8 - Sil-8. ber-16 t\"o-4. nen8 - [2/3 Jed- es8 ]1/1 wei-4. che8 - Herz.2. - _ _ _ - _ _ _ -% volta 1 -% 29 - _ _ _ _ _ _ - _ _ _ _ _ _ - _ _ _ _ _ _ - _ _ _ _ _ _ - -% volta 2 -% 37 - _ _ _ _ _ _ - _ _ _ _ _ _ - _ _ _ _ _ _ - _ _ _ _ _ _ - _ _ _ _ _ _ -% 47 - _ _ _ _ _ _ - _ _ _ _ _ _ - _ _ _ _ _ _ - _ _ _ _ _ _ - _ _ _ _ _ _ -% 57 - _ _ _ _ _ _ - -} - -themusic = - < - < \id "Lyric" "1"; - \tekstI - \tekstII - > - < \id "Piano" ""; - \multi 2; - \melodic < \melodie \commands > - \melodic < \begeleiding \commands > - > - > diff --git a/lib/file-storage.cc b/lib/file-storage.cc deleted file mode 100644 index 849c27c994..0000000000 --- a/lib/file-storage.cc +++ /dev/null @@ -1,101 +0,0 @@ -/* - file-storage.cc -- implement Mapped_file_storage - - source file of the GNU LilyPond music typesetter - - (c) 1997 Han-Wen Nienhuys - Jan Nieuwenhuizen -*/ -#include // open, mmap -#include // open -#include // mmap -#include // INT_MAX -#include // open -#include // close, stat -#include // fdopen -#include // strerror -#include // errno - - - -#include "string.hh" -#include "proto.hh" -#include "warn.hh" -#include "file-storage.hh" - -Mapped_file_storage::Mapped_file_storage(String s) -{ - data_caddr_ = 0; - fildes_i_ = 0; - size_off_ = 0; - open(s); -} - -char const* -Mapped_file_storage::ch_C()const -{ - return (char const*)data_caddr_; -} - -void -Mapped_file_storage::map() -{ - if ( fildes_i_ == -1 ) - return; - - data_caddr_ = (caddr_t)mmap( (void*)0, size_off_, PROT_READ, MAP_SHARED, fildes_i_, 0 ); - - if ( (int)data_caddr_ == -1 ) - warning( String( "can't map: error no: " ) + strerror( errno )); -} - - -void -Mapped_file_storage::open(String name_str) -{ - fildes_i_ = ::open( name_str, O_RDONLY ); - - if ( fildes_i_ == -1 ) - { - warning( String( "can't open: " ) + name_str + String( ": " ) + strerror( errno )); - return; - } - - struct stat file_stat; - fstat( fildes_i_, &file_stat ); - size_off_ = file_stat.st_size; - map(); -} - -void -Mapped_file_storage::unmap() -{ - if ( data_caddr_ ) - { - munmap( data_caddr_, size_off_ ); - data_caddr_ = 0; - size_off_ = 0; - } -} - -void -Mapped_file_storage::close() -{ - unmap(); - if ( fildes_i_ ) - { - ::close( fildes_i_ ); - fildes_i_ = 0; - } -} - -int -Mapped_file_storage::length_i()const -{ - return size_off_; -} - -Mapped_file_storage::~Mapped_file_storage() -{ - close(); -} diff --git a/lily/include/spanner-elem-group.hh b/lily/include/spanner-elem-group.hh deleted file mode 100644 index 2f65af207b..0000000000 --- a/lily/include/spanner-elem-group.hh +++ /dev/null @@ -1,25 +0,0 @@ -/* - spanner-elem-group.hh -- declare Spanner_elem_group - - source file of the GNU LilyPond music typesetter - - (c) 1997 Han-Wen Nienhuys -*/ - - -#ifndef SPANNER_ELEM_GROUP_HH -#define SPANNER_ELEM_GROUP_HH - -#include "spanner.hh" -#include "elem-group.hh" - -class Spanner_elem_group : public Spanner, public Horizontal_vertical_group_element { - -protected: - virtual Interval do_width()const; - virtual void do_print() const; - SCORE_ELEM_CLONE(Spanner_elem_group); -public: - DECLARE_MY_RUNTIME_TYPEINFO; -}; -#endif // SPANNER_ELEM_GROUP_HH diff --git a/lily/include/stem-beam-grav.hh b/lily/include/stem-beam-grav.hh deleted file mode 100644 index c7fe5ff4e8..0000000000 --- a/lily/include/stem-beam-grav.hh +++ /dev/null @@ -1,40 +0,0 @@ -/* - stem-beam-grav.hh -- part of GNU LilyPond - - (c) 1997 Han-Wen Nienhuys -*/ - - -#ifndef STEMBEAMGRAV_HH -#define STEMBEAMGRAV_HH -#include "engraver.hh" - -/** - TODO: - override default_grouping if setting a n-plet - - */ -class Stem_beam_engraver : public Engraver { - Stem * stem_p_; - Beam * beam_p_; - Beam_req * beam_req_l_; - Stem_req * stem_req_l_; - Beam_req * start_req_l_; - bool end_beam_b_; - Rhythmic_grouping *current_grouping; - int default_dir_i_; -public: - /* *************** */ - DECLARE_MY_RUNTIME_TYPEINFO; - Stem_beam_engraver(); - -protected: - ~Stem_beam_engraver(); - virtual void set_feature (Feature dir_i_); - virtual bool do_try_request (Request*); - virtual void do_process_requests(); - virtual void acknowledge_element (Score_elem_info); - virtual void do_pre_move_processing(); - virtual void do_post_move_processing(); -}; -#endif // STEMBEAMGRAV_HH diff --git a/lily/spanner-elem-group.cc b/lily/spanner-elem-group.cc deleted file mode 100644 index 3eb1f94f77..0000000000 --- a/lily/spanner-elem-group.cc +++ /dev/null @@ -1,30 +0,0 @@ -/* - spanner-elem-group.cc -- implement Spanner_elem_group - - source file of the GNU LilyPond music typesetter - - (c) 1997 Han-Wen Nienhuys -*/ - -#include "p-col.hh" -#include "spanner-elem-group.hh" - - - -IMPLEMENT_IS_TYPE_B2(Spanner_elem_group,Spanner,Horizontal_vertical_group_element); - -Interval -Spanner_elem_group::do_width() const -{ - return Spanner::do_width(); -} - -void -Spanner_elem_group::do_print() const -{ -#ifndef NPRINT - Spanner::do_print(); - Horizontal_vertical_group_element::do_print(); -#endif -} - diff --git a/lily/stem-beam-grav.cc b/lily/stem-beam-grav.cc deleted file mode 100644 index 01564cd929..0000000000 --- a/lily/stem-beam-grav.cc +++ /dev/null @@ -1,193 +0,0 @@ -/* - stem-beam-reg.cc -- part of GNU LilyPond - - (c) 1997 Han-Wen Nienhuys -*/ - -#include "musical-request.hh" -#include "stem-beam-grav.hh" -#include "beam.hh" -#include "stem.hh" -#include "grouping.hh" -#include "text-spanner.hh" -#include "debug.hh" -#include "grouping.hh" -#include "note-head.hh" -#include "time-description.hh" -#include "duration-convert.hh" - -Stem_beam_engraver::Stem_beam_engraver() -{ - do_post_move_processing(); - - current_grouping = 0; - beam_p_ = 0; - default_dir_i_ =0; - start_req_l_ = 0; -} - -bool -Stem_beam_engraver::do_try_request (Request*req_l) -{ - - Musical_req* mus_l = req_l->musical(); - /* Debiele puntkomma's. Laat je er eentje per ongeluk achter een - if (..) staan, lijkt het net op een luis in gcc. - - (ofwel Python rules) - */ - if (!mus_l) - return false; - - - if ( mus_l->beam()) - { - if (bool (beam_p_) == bool (mus_l->beam()->spantype == Span_req::START)) - return false; - - if (beam_req_l_ && beam_req_l_ ->equal_b (mus_l)) - return false; - - beam_req_l_ = mus_l->beam(); - return true; - } - - if ( mus_l->stem()) - { - if (current_grouping && !current_grouping->child_fit_b ( - get_staff_info().time_C_->whole_in_measure_)) - return false; - - if (stem_req_l_ && !stem_req_l_->equal_b (mus_l) ) - return false; - - stem_req_l_ = mus_l->stem(); - return true; - } - return false; -} - -void -Stem_beam_engraver::do_process_requests() -{ - if (beam_req_l_) - { - if (beam_req_l_->spantype == Span_req::STOP) - { - end_beam_b_ = true; - start_req_l_ = 0; - } - else - { - beam_p_ = new Beam; - start_req_l_ = beam_req_l_; - beam_p_->left_col_l_ = get_staff_info().musical_pcol_l (); - current_grouping = new Rhythmic_grouping; - if (beam_req_l_->nplet) - { - Text_spanner* t = new Text_spanner(); - Text_def *defp = new Text_def; - t->set_support (beam_p_); - defp->align_i_ = 0; - defp->text_str_ = beam_req_l_->nplet; - defp->style_str_="italic"; - t->spec_p_ = defp; - announce_element (Score_elem_info (t,0)); - typeset_element (t); - } - announce_element ( Score_elem_info (beam_p_, 0)); - - } - } - - if (stem_req_l_) - { - stem_p_ = new Stem (8); - if (current_grouping) - current_grouping->add_child ( - get_staff_info().time_C_->whole_in_measure_, - stem_req_l_->duration()); - - stem_p_->flag_i_ = Duration_convert::type2_i - (stem_req_l_->duration_.durlog_i_); // should change rep. of flags too. - - if (beam_p_) - { - if (stem_req_l_->duration_.durlog_i_<= 2) - stem_req_l_->warning ("stem doesn't fit in Beam"); - else - beam_p_->add (stem_p_); - stem_p_->print_flag_b_ = false; - } - else - { - stem_p_->print_flag_b_ = true; - } - - announce_element (Score_elem_info (stem_p_, stem_req_l_)); - } -} - -void -Stem_beam_engraver::acknowledge_element (Score_elem_info info) -{ - if (!stem_p_) - return; - - if (info.elem_l_->name() == Note_head::static_name () && - stem_req_l_->duration() - == info.req_l_->musical()->rhythmic ()->duration ()) - { - Note_head * n_l= (Note_head*)info.elem_l_->item(); - stem_p_->add (n_l); - } -} -void -Stem_beam_engraver::do_pre_move_processing() -{ - if (stem_p_) - { - if (default_dir_i_) - stem_p_->dir_i_ = default_dir_i_; - - typeset_element (stem_p_); - stem_p_ = 0; - } - if (beam_p_ && end_beam_b_) - { - Rhythmic_grouping const * rg_C = get_staff_info().rhythmic_C_; - rg_C->extend (current_grouping->interval()); - beam_p_->set_grouping (*rg_C, *current_grouping); - beam_p_->right_col_l_ = get_staff_info().musical_pcol_l (); - typeset_element (beam_p_); - delete current_grouping; - current_grouping = 0; - beam_p_ = 0; - } - end_beam_b_ = false; -} -void -Stem_beam_engraver::do_post_move_processing() -{ - stem_p_ = 0; - beam_req_l_ = 0; - stem_req_l_ = 0; - end_beam_b_ = false; -} - -Stem_beam_engraver::~Stem_beam_engraver() -{ - if (beam_p_) - start_req_l_->warning ("unterminated beam"); -} - -void -Stem_beam_engraver::set_feature (Feature i) -{ - if (i.type_ == "vdir") - default_dir_i_ = i.value_; -} - - -IMPLEMENT_IS_TYPE_B1(Stem_beam_engraver,Engraver); -ADD_THIS_ENGRAVER(Stem_beam_engraver); diff --git a/lily/text-grav.cc b/lily/text-grav.cc deleted file mode 100644 index 4abff4f444..0000000000 --- a/lily/text-grav.cc +++ /dev/null @@ -1,76 +0,0 @@ -/* - text-reg.cc -- implement Text_engraver - - (c) 1997 Han-Wen Nienhuys - - Obsolete. -*/ -#include "note-column.hh" -#include "musical-request.hh" -#include "text-grav.hh" -#include "text-item.hh" - -Text_engraver::Text_engraver() -{ - text_p_ = 0; - dir_i_ =0; - do_post_move_processing(); -} - -bool -Text_engraver::do_try_request (Request*req_l) -{ - Musical_req *m = req_l->musical(); - if (!m || ! m->text()) - return false; - if (text_req_l_ && text_req_l_->equal_b (m)) - return false; - - text_req_l_ = m->text(); - return true; -} -void -Text_engraver::acknowledge_element (Score_elem_info i) -{ - if (text_p_ && i.elem_l_->name() == Note_column::static_name ()) - { - text_p_->add_support (i.elem_l_); - } -} -void -Text_engraver::do_process_requests() -{ - if (text_req_l_) - { - text_p_ = new Text_item (text_req_l_->tdef_p_, text_req_l_->dir_i_); // ugh - announce_element (Score_elem_info (text_p_, text_req_l_)); - } -} -void -Text_engraver::do_pre_move_processing() -{ - if (text_p_) - { - if (dir_i_ && !text_p_->dir_i_) - text_p_->dir_i_ = dir_i_; - Staff_symbol* s_l = get_staff_info().staff_sym_l_; - text_p_->set_staffsym (s_l); - typeset_element (text_p_); - - text_p_ = 0; - } -} -void -Text_engraver::set_feature (Feature i) -{ - if (i.type_ == "vdir") - dir_i_ = i.value_; -} -void -Text_engraver::do_post_move_processing() -{ - text_req_l_ = 0; -} - -IMPLEMENT_IS_TYPE_B1(Text_engraver,Engraver); -ADD_THIS_ENGRAVER(Text_engraver); -- 2.39.5